Mercurial > ldforge / changeset

--- a/src/PropertyMacro.h	Fri Jan 24 22:10:49 2014 +0200
+++ b/src/PropertyMacro.h	Wed Feb 05 06:07:05 2014 +0200
@@ -19,106 +19,185 @@
 #ifndef LDFORGE_PROPERTY_H
 #define LDFORGE_PROPERTY_H
 
-#define PROPERTY( ACCESS, TYPE, NAME, OPS, WRITETYPE )			\
-	private:													\
-		TYPE m_##NAME;											\
-																\
-	public:														\
-		inline TYPE const& GET_READ_METHOD( NAME, OPS ) const	\
-		{														\
-			return m_##NAME; 									\
-		}														\
-																\
-	ACCESS:														\
-		DEFINE_WRITE_METHOD_##WRITETYPE( TYPE, NAME )			\
-		DEFINE_PROPERTY_##OPS( TYPE, NAME )
+// =============================================================================
+//
+// Identifier names
+//
+#define PROPERTY_SET_ACCESSOR(NAME)			set##NAME
+#define PROPERTY_GET_ACCESSOR(NAME)			get##NAME
+#define PROPERTY_IS_ACCESSOR(NAME)			is##NAME // for bool types
+#define PROPERTY_MEMBER_NAME(NAME)			m_##NAME
+
+// Names of operations
+#define PROPERTY_APPEND_OPERATION(NAME)		appendTo##NAME
+#define PROPERTY_PREPEND_OPERATION(NAME)	prependTo##NAME
+#define PROPERTY_REPLACE_OPERATION(NAME)	replaceIn##NAME
+#define PROPERTY_INCREASE_OPERATION(NAME)	increase##NAME
+#define PROPERTY_DECREASE_OPERATION(NAME)	decrease##NAME
+#define PROPERTY_TOGGLE_OPERATION(NAME)		toggle##NAME
+#define PROPERTY_PUSH_OPERATION(NAME)		pushTo##NAME
+#define PROPERTY_REMOVE_OPERATION(NAME)		removeFrom##NAME
+#define PROPERTY_CLEAR_OPERATION(NAME)		clear##NAME
+#define PROPERTY_COUNT_OPERATION(NAME)		count##NAME
+
+// Operation definitions
+// These are the methods of the list type that are called in the operations.
+#define PROPERTY_APPEND_METHOD_NAME			append		// QString::append
+#define PROPERTY_PREPEND_METHOD_NAME		prepend		// QString::prepend
+#define PROPERTY_REPLACE_METHOD_NAME		replace		// QString::replace
+#define PROPERTY_PUSH_METHOD_NAME			append		// QList<T>::append
+#define PROPERTY_REMOVE_METHOD_NAME			removeOne	// QList<T>::removeOne
+#define PROPERTY_CLEAR_METHOD_NAME			clear		// QList<T>::clear
 
-#define GET_READ_METHOD( NAME, OPS ) \
-	GET_READ_METHOD_##OPS( NAME )
+// =============================================================================
+//
+// Main PROPERTY macro
+//
+#define PROPERTY(ACCESS, TYPE, NAME, OPS, WRITETYPE)							\
+	private:																	\
+		TYPE PROPERTY_MEMBER_NAME(NAME);										\
+																				\
+	public:																		\
+		inline TYPE const& PROPERTY_GET_READ_METHOD (NAME, OPS) const			\
+		{																		\
+			return PROPERTY_MEMBER_NAME(NAME); 									\
+		}																		\
+																				\
+	ACCESS:																		\
+		PROPERTY_MAKE_WRITE (TYPE, NAME, WRITETYPE)								\
+		PROPERTY_DEFINE_OPERATIONS (TYPE, NAME, OPS)
 
-#define GET_READ_METHOD_BOOL_OPS( NAME ) is##NAME()
-#define GET_READ_METHOD_NO_OPS( NAME ) get##NAME()
-#define GET_READ_METHOD_STR_OPS( NAME ) get##NAME()
-#define GET_READ_METHOD_NUM_OPS( NAME ) get##NAME()
-#define GET_READ_METHOD_LIST_OPS( NAME ) get##NAME()
+// =============================================================================
+//
+// PROPERTY_GET_READ_METHOD
+//
+// This macro uses the OPS argument to construct the name of the actual
+// macro which returns the name of the get accessor. This is so that the
+// bool properties get is<NAME>() accessors while non-bools get get<NAME>()
+//
+#define PROPERTY_GET_READ_METHOD(NAME, OPS)										\
+	PROPERTY_GET_READ_METHOD_##OPS (NAME)
+
+#define PROPERTY_GET_READ_METHOD_BOOL_OPS(NAME) PROPERTY_IS_ACCESSOR (NAME)()
+#define PROPERTY_GET_READ_METHOD_NO_OPS(NAME) PROPERTY_GET_ACCESSOR (NAME)()
+#define PROPERTY_GET_READ_METHOD_STR_OPS(NAME) PROPERTY_GET_ACCESSOR (NAME)()
+#define PROPERTY_GET_READ_METHOD_NUM_OPS(NAME) PROPERTY_GET_ACCESSOR (NAME)()
+#define PROPERTY_GET_READ_METHOD_LIST_OPS(NAME) PROPERTY_GET_ACCESSOR (NAME)()
 
-#define DEFINE_WRITE_METHOD_STOCK_WRITE( TYPE, NAME )	\
-		inline void set##NAME( TYPE const& NAME##_ )	\
-		{												\
-			m_##NAME = NAME##_;							\
+// =============================================================================
+//
+// PROPERTY_MAKE_WRITE
+//
+// This macro uses the WRITETYPE argument to construct the set accessor of the
+// property. If WRITETYPE is STOCK_WRITE, an inline method is defined to just
+// set the new value of the property. If WRITETYPE is CUSTOM_WRITE, the accessor
+// is merely declared and is left for the user to define.
+//
+#define PROPERTY_MAKE_WRITE(TYPE, NAME, WRITETYPE)								\
+	PROPERTY_MAKE_WRITE_##WRITETYPE (TYPE, NAME)
+
+#define PROPERTY_MAKE_WRITE_STOCK_WRITE(TYPE, NAME)								\
+		inline void set##NAME (TYPE const& new##NAME)							\
+		{																		\
+			PROPERTY_MEMBER_NAME(NAME) = new##NAME;								\
 		}
 
-#define DEFINE_WRITE_METHOD_CUSTOM_WRITE( TYPE, NAME )	\
-		void set##NAME( TYPE const& NAME##_ );			\
+#define PROPERTY_MAKE_WRITE_CUSTOM_WRITE(TYPE, NAME)							\
+		void set##NAME (TYPE const& new##NAME);									\
+
+// =============================================================================
+//
+// PROPERTY_DEFINE_OPERATIONS
+//
+// This macro may expand into methods defining additional operations for the
+// method. 
 
-#define DEFINE_WITH_CB( NAME ) void NAME##Changed();
-#define DEFINE_NO_CB( NAME )
+#define PROPERTY_DEFINE_OPERATIONS(TYPE, NAME, OPS)								\
+	DEFINE_PROPERTY_##OPS (TYPE, NAME)
 
-#define DEFINE_PROPERTY_NO_OPS( TYPE, NAME )
+// =============================================================================
+//
+// DEFINE_PROPERTY_NO_OPS
+//
+// Obviously NO_OPS expands into no operations.
+//
+#define DEFINE_PROPERTY_NO_OPS(TYPE, NAME)
 
-#define DEFINE_PROPERTY_STR_OPS( TYPE, NAME )			\
-		void appendTo##NAME( TYPE a )					\
-		{												\
-			TYPE tmp( m_##NAME );						\
-			tmp.append( a );							\
-			set##NAME( tmp );							\
-		}												\
-														\
-		void prependTo##NAME( TYPE a )					\
-		{												\
-			TYPE tmp( m_##NAME );						\
-			tmp.prepend( a );							\
-			set##NAME( tmp );							\
-		}												\
-														\
-		void replaceIn##NAME( TYPE a, TYPE b )			\
-		{												\
-			TYPE tmp( m_##NAME );						\
-			tmp.replace( a, b );						\
-			set##NAME( tmp );							\
+// =============================================================================
+//
+// DEFINE_PROPERTY_STR_OPS
+//
+#define DEFINE_PROPERTY_STR_OPS(TYPE, NAME)										\
+		void PROPERTY_APPEND_OPERATION(NAME) (const TYPE& a)					\
+		{																		\
+			TYPE tmp (PROPERTY_MEMBER_NAME(NAME));								\
+			tmp.PROPERTY_APPEND_METHOD_NAME (a);								\
+			set##NAME (tmp);													\
+		}																		\
+																				\
+		void PROPERTY_PREPEND_OPERATION(NAME) (const TYPE& a)					\
+		{																		\
+			TYPE tmp (PROPERTY_MEMBER_NAME(NAME));								\
+			tmp.PROPERTY_PREPEND_METHOD_NAME (a);								\
+			set##NAME (tmp);													\
+		}																		\
+																				\
+		void PROPERTY_REPLACE_OPERATION(NAME) (const TYPE& a, const TYPE& b)	\
+		{																		\
+			TYPE tmp (PROPERTY_MEMBER_NAME(NAME));								\
+			tmp.PROPERTY_REPLACE_METHOD_NAME (a, b);							\
+			set##NAME (tmp);													\
 		}
 
-#define DEFINE_PROPERTY_NUM_OPS( TYPE, NAME )			\
-		inline void increase##NAME( TYPE a = 1 )		\
-		{												\
-			set##NAME( m_##NAME + a );					\
-		}												\
-														\
-		inline void decrease##NAME( TYPE a = 1 )		\
-		{												\
-			set##NAME( m_##NAME - a );					\
+// =============================================================================
+//
+// DEFINE_PROPERTY_NUM_OPS
+//
+#define DEFINE_PROPERTY_NUM_OPS(TYPE, NAME)										\
+		inline void PROPERTY_INCREASE_OPERATION(NAME) (TYPE a = 1)				\
+		{																		\
+			set##NAME (PROPERTY_MEMBER_NAME(NAME) + a);							\
+		}																		\
+																				\
+		inline void PROPERTY_DECREASE_OPERATION(NAME) (TYPE a = 1)				\
+		{																		\
+			set##NAME (PROPERTY_MEMBER_NAME(NAME) - a);							\
 		}
 
-#define DEFINE_PROPERTY_BOOL_OPS( TYPE, NAME )				\
-		inline void toggle##NAME()							\
-		{													\
-			set##NAME( !m_##NAME );							\
+// =============================================================================
+//
+// DEFINE_PROPERTY_BOOL_OPS
+//
+#define DEFINE_PROPERTY_BOOL_OPS(TYPE, NAME)									\
+		inline void PROPERTY_TOGGLE_OPERATION(NAME)()							\
+		{																		\
+			set##NAME (!PROPERTY_MEMBER_NAME(NAME));							\
 		}
 
-#define DEFINE_PROPERTY_LIST_OPS( TYPE, NAME )				\
-		void pushTo##NAME( const TYPE::value_type& a )		\
-		{													\
-			TYPE tmp( m_##NAME );							\
-			tmp.push_back( a );								\
-			set##NAME( tmp );								\
-		}													\
-															\
-		void removeFrom##NAME( const TYPE::value_type& a )	\
-		{													\
-			TYPE tmp( m_##NAME );							\
-			tmp.removeOne( a );								\
-			set##NAME( tmp );								\
-		}													\
-															\
-		inline void clear##NAME()							\
-		{													\
-			set##NAME( TYPE() );							\
-		}													\
-															\
-	public:													\
-		inline int count##NAME()							\
-		{													\
-			return get##NAME().size();						\
+// =============================================================================
+//
+// DEFINE_PROPERTY_LIST_OPS
+//
+#define DEFINE_PROPERTY_LIST_OPS(TYPE, NAME)									\
+		void PROPERTY_PUSH_OPERATION(NAME) (const TYPE::value_type& a)			\
+		{																		\
+			PROPERTY_MEMBER_NAME(NAME).PROPERTY_PUSH_METHOD_NAME (a);			\
+		}																		\
+																				\
+		void PROPERTY_REMOVE_OPERATION(NAME) (const TYPE::value_type& a)		\
+		{																		\
+			PROPERTY_MEMBER_NAME(NAME).PROPERTY_REMOVE_METHOD_NAME (a);			\
+		}																		\
+																				\
+		inline void PROPERTY_CLEAR_OPERATION(NAME)()							\
+		{																		\
+			PROPERTY_MEMBER_NAME(NAME).PROPERTY_CLEAR_METHOD_NAME();			\
+		}																		\
+																				\
+	public:																		\
+		inline int PROPERTY_COUNT_OPERATION(NAME)() const						\
+		{																		\
+			return PROPERTY_GET_ACCESSOR (NAME)().size();						\
 		}
 
 #endif // LDFORGE_PROPERTY_H
\ No newline at end of file

--- a/ui/ldforge.ui	Fri Jan 24 22:10:49 2014 +0200
+++ b/ui/ldforge.ui	Wed Feb 05 06:07:05 2014 +0200
@@ -70,7 +70,7 @@
      <x>0</x>
      <y>0</y>
      <width>1010</width>
-     <height>24</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -284,9 +284,6 @@
    <addaction name="actionOpen"/>
    <addaction name="actionSave"/>
    <addaction name="actionSaveAs"/>
-   <addaction name="actionSaveAll"/>
-   <addaction name="actionClose"/>
-   <addaction name="actionCloseAll"/>
   </widget>
   <widget class="QToolBar" name="toolBar_2">
    <property name="windowTitle">
@@ -298,7 +295,6 @@
    <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="actionDownloadFrom"/>
    <addaction name="actionNewSubfile"/>
    <addaction name="actionNewLine"/>
    <addaction name="actionNewTriangle"/>
@@ -333,7 +329,7 @@
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
-    <bool>true</bool>
+    <bool>false</bool>
    </attribute>
    <addaction name="actionSelectAll"/>
    <addaction name="actionSelectByColor"/>
@@ -361,7 +357,7 @@
     <enum>TopToolBarArea</enum>
    </attribute>
    <attribute name="toolBarBreak">
-    <bool>false</bool>
+    <bool>true</bool>
    </attribute>
    <addaction name="actionAxes"/>
    <addaction name="actionWireframe"/>