Refactored qtpropertymanager. Re #20288

qt/widgets/common/CMakeLists.txt

@@ -255,6 +255,8 @@ set ( MOC_FILES
   inc/MantidQtWidgets/Common/QtPropertyBrowser/WorkspaceEditorFactory.h
   inc/MantidQtWidgets/Common/QtPropertyBrowser/qtvariantproperty.h
   inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowserutils_p.h
+  inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
+  inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
 )
 
 # Include files aren't required, but this makes them appear in Visual Studio
@@ -470,14 +472,14 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} )
 # instead of qt4_wrap_cpp because the latter produces files with
 # a cxx suffix when QtPropertyBrowser requires cpp
 
-qt4_generate_moc (
-  inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
-  ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertybrowser.cpp
-)
-qt4_generate_moc (
-  inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
-  ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertymanager.cpp
-)
+# qt4_generate_moc (
+  # inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h
+  # ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertybrowser.cpp
+# )
+# qt4_generate_moc (
+  # inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertymanager.h
+  # ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertymanager.cpp
+# )
 qt4_generate_moc (
   inc/MantidQtWidgets/Common/QtPropertyBrowser/qteditorfactory.h
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qteditorfactory.cpp
@@ -495,10 +497,10 @@ qt4_generate_moc (
   inc/MantidQtWidgets/Common/QtPropertyBrowser/qtgroupboxpropertybrowser.h
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qtgroupboxpropertybrowser.cpp
 )
-qt4_generate_moc (
-  src/QtPropertyBrowser/qtpropertymanager.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc
-)
+# qt4_generate_moc (
+  # src/QtPropertyBrowser/qtpropertymanager.cpp
+  # ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc
+# )
 qt4_generate_moc (
   src/QtPropertyBrowser/qteditorfactory.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc
@@ -510,13 +512,13 @@ qt4_generate_moc (
 
 set (
   QTPROPERTYBROWSER_HEADERS_ONLY_MOC
-  ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertybrowser.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertymanager.cpp
+  #${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertybrowser.cpp
+  #${CMAKE_CURRENT_BINARY_DIR}/moc_qtpropertymanager.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qteditorfactory.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qttreepropertybrowser.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qtbuttonpropertybrowser.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/moc_qtgroupboxpropertybrowser.cpp
-  ${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc
+  #${CMAKE_CURRENT_BINARY_DIR}/qtpropertymanager.moc
   ${CMAKE_CURRENT_BINARY_DIR}/qteditorfactory.moc
   ${CMAKE_CURRENT_BINARY_DIR}/qttreepropertybrowser.moc
 )
@@ -548,6 +550,7 @@ find_package (Qt4 REQUIRED QtHelp QtWebKit QtNetwork QUIET)
 include(${QT_USE_FILE})
 
 qt4_wrap_cpp ( MOCCED_FILES ${MOC_FILES} )
+
 set ( ALL_SRC
   ${SRC_FILES}
   ${MOCCED_FILES}

qt/widgets/common/inc/MantidQtWidgets/Common/QtPropertyBrowser/qtpropertybrowser.h

@@ -386,6 +386,40 @@ public:
   QtAbstractPropertyManager *const m_manager;
 };
 
+class QtAbstractPropertyBrowserPrivate
+{
+    QtAbstractPropertyBrowser *q_ptr;
+    Q_DECLARE_PUBLIC(QtAbstractPropertyBrowser)
+public:
+    QtAbstractPropertyBrowserPrivate();
+
+    void insertSubTree(QtProperty *property,
+            QtProperty *parentProperty);
+    void removeSubTree(QtProperty *property,
+            QtProperty *parentProperty);
+    void createBrowserIndexes(QtProperty *property, QtProperty *parentProperty, QtProperty *afterProperty);
+    void removeBrowserIndexes(QtProperty *property, QtProperty *parentProperty);
+    QtBrowserItem *createBrowserIndex(QtProperty *property, QtBrowserItem *parentIndex, QtBrowserItem *afterIndex);
+    void removeBrowserIndex(QtBrowserItem *index);
+    void clearIndex(QtBrowserItem *index);
+
+    void slotPropertyInserted(QtProperty *property,
+            QtProperty *parentProperty, QtProperty *afterProperty);
+    void slotPropertyRemoved(QtProperty *property, QtProperty *parentProperty);
+    void slotPropertyDestroyed(QtProperty *property);
+    void slotPropertyDataChanged(QtProperty *property);
+
+    QList<QtProperty *> m_subItems;
+    QMap<QtAbstractPropertyManager *, QList<QtProperty *> > m_managerToProperties;
+    QMap<QtProperty *, QList<QtProperty *> > m_propertyToParents;
+
+    QMap<QtProperty *, QtBrowserItem *> m_topLevelPropertyToIndex;
+    QList<QtBrowserItem *> m_topLevelIndexes;
+    QMap<QtProperty *, QList<QtBrowserItem *> > m_propertyToIndexes;
+
+    QtBrowserItem *m_currentItem;
+};
+
 #if QT_VERSION >= 0x040400
 QT_END_NAMESPACE
 #endif