[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/formeditor (silent)
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2005-10-04 11:42:01
Message-ID: 1128426121.912522.32564.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467142 by staniek:

SVN_SILENT fix for updated koproperty

 M  +7 -6      formmanager.cpp  
 M  +0 -2      formmanager.h  


--- trunk/koffice/kexi/formeditor/formmanager.cpp #467141:467142
@@ -83,13 +83,15 @@
 class PropertyFactory : public KoProperty::CustomPropertyFactory
 {
 	public:
-		PropertyFactory(FormManager *manager) : KoProperty::CustomPropertyFactory(manager),
-		 m_manager(manager)
+		PropertyFactory(QObject *parent, FormManager *manager) 
+		: KoProperty::CustomPropertyFactory(parent),
+			m_manager(manager)
 		{
 		}
 		virtual ~PropertyFactory() {}
 
-		CustomProperty*  createCustomProperty(Property *parent) { return 0;}
+		CustomProperty* createCustomProperty(Property *) { return 0;}
+
 		Widget* createCustomWidget(Property *prop)
 		{
 			return new KFDPixmapEdit(m_manager, prop);
@@ -142,8 +144,7 @@
 		this, SLOT(slotConnectionCreated(KFormDesigner::Form*, KFormDesigner::Connection&)));
 
 	// register kfd custom editors
-	m_propFactory = new PropertyFactory(this);
-	Factory::self()->registerEditor(KoProperty::Pixmap, m_propFactory);
+	Factory::self()->registerEditor(KoProperty::Pixmap, new PropertyFactory(Factory::self(), this));
 }
 
 FormManager::~FormManager()
@@ -153,7 +154,7 @@
 #ifdef KEXI_SHOW_DEBUG_ACTIONS
 	delete m_uiCodeDialog;
 #endif
-	delete m_propFactory;
+//	delete m_propFactory;
 }
 
 void
--- trunk/koffice/kexi/formeditor/formmanager.h #467141:467142
@@ -54,7 +54,6 @@
 class WidgetLibrary;
 class ObjectTreeView;
 class Connection;
-class PropertyFactory;
 typedef QPtrList<KAction> ActionList;
 
 //! A class to manage (create/load/save) Forms
@@ -464,7 +463,6 @@
 		int m_options; //!< @see Options enum
 		int m_contextMenuKey; //!< Id of context menu key (cached)
 
-		PropertyFactory *m_propFactory;
 		void *m_objectBlockingPropertyEditorUpdating;
 		bool m_isRedoing : 1;
 
[prev in list] [next in list] [prev in thread] [next in thread]