Changeset 454b555

Timestamp:

Aug 11, 2025, 5:43:56 PM (2 months ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

5e0f64

Parents:

ce666c

git-author:

Frederik Heber <frederik.heber@…> (08/09/25 12:26:53)

git-committer:

Frederik Heber <frederik.heber@…> (08/11/25 17:43:56)

Message:

Improved includes for Qt classes.

• QT_CFLAGS needs to be set in certain cases. The include folder QtCore is required additionally due to qopenglfunctions.h. However, other includes in our repo are now appended by either QtCore/ or QtGui/.

Files:

• data/icons/Makefile.am (modified) (1 diff)
• src/UIElements/Menu/Qt4/QMenu_tooltip.hpp (modified) (1 diff)
• src/UIElements/Qt4/QtDialog.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/ElementList/QtElementList.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/ElementList/QtObservedAtomObserver.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/MoleculeList/QtObservedMoleculeObserver.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QDebugStream.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtFragmentList.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtGeometryList.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtGeometryList.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtHomologyList.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtInfoBox.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtInfoBox.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtLogBox.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtLogBox.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtNumericalItem.cpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtNumericalItem.hpp (modified) (1 diff)
• src/UIElements/Views/Qt4/QtShapeList.cpp (modified) (1 diff)

data/icons/Makefile.am

@@ -21 +21 @@
 nodist_libicons_la_SOURCES = qrc_icons.cpp
 
+libicons_la_includedir = $(includedir)/MoleCuilder/
+libicons_la_CPPFLAGS = $(AM_CPPFLAGS) 
+libicons_la_LDFLAGS = $(AM_LDFLAGS)
+
 sinclude qrc_icons.d
 CLEANFILES = qrc_icons.cpp qrc_icons.d

src/UIElements/Menu/Qt4/QMenu_tooltip.hpp

@@ -14 +14 @@
 #endif
 
-#include <QEvent>
-#include <QHelpEvent>
-#include <QMenu>
-#include <QToolTip>
+#include <QtCore/QEvent>
+#include <QtGui/QHelpEvent>
+#include <QtGui/QMenu>
+#include <QtGui/QToolTip>
 #include <iostream>
 

src/UIElements/Qt4/QtDialog.hpp

@@ -14 +14 @@
 #endif
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #include "Parameters/Parameter.hpp"

src/UIElements/Views/Qt4/ElementList/QtElementList.cpp

@@ -48 +48 @@
 #include "Element/periodentafel.hpp"
 #include "Descriptors/AtomTypeDescriptor.hpp"
-#include <QAbstractItemView>
+#include <QtGui/QAbstractItemView>
 #include "Actions/SelectionAction/Atoms/AtomByElementAction.hpp"
 #include "Actions/SelectionAction/Atoms/NotAtomByElementAction.hpp"

src/UIElements/Views/Qt4/ElementList/QtObservedAtomObserver.hpp

@@ -15 +15 @@
 #endif
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 #include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp

@@ -14 +14 @@
 #endif
 
-#include <QList>
-#include <QStandardItem>
+#include <QtCore/QList>
+#include <QtGui/QStandardItem>
 
 #include <boost/function.hpp>

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeItemFactory.hpp

@@ -14 +14 @@
 #endif
 
-#include <QList>
+#include <QtCore/QList>
 
 #include <string>

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.cpp

@@ -35 +35 @@
 #include "QtMoleculeList.hpp"
 
-#include <QModelIndex>
-#include <QDebug>
+#include <QtCore/QModelIndex>
+#include <QtCore/QDebug>
 
 #include "UIElements/Views/Qt4/MoleculeList/QtMoleculeItem.hpp"

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeList.hpp

@@ -17 +17 @@
 #include <QtGui/QStandardItem>
 #include <QtGui/QStandardItemModel>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <boost/bimap.hpp>

src/UIElements/Views/Qt4/MoleculeList/QtMoleculeListView.hpp

@@ -14 +14 @@
 #endif
 
-#include <QModelIndex>
-#include <QTreeView>
+#include <QtCore/QModelIndex>
+#include <QtGui/QTreeView>
 
 #include "types.hpp"

src/UIElements/Views/Qt4/MoleculeList/QtObservedMoleculeObserver.hpp

@@ -15 +15 @@
 #endif
 
-#include <QWidget>
+#include <QtGui/QWidget>
 
 #include "UIElements/Qt4/InstanceBoard/QtObservedMolecule.hpp"

src/UIElements/Views/Qt4/QDebugStream.hpp

@@ -14 +14 @@
 #endif
 
-#include <QObject>
-#include <QPlainTextEdit>
-#include <QMutex>
+#include <QtCore/QObject>
+#include <QtGui/QPlainTextEdit>
+#include <QtCore/QMutex>
 
 /**

src/UIElements/Views/Qt4/QtFragmentList.cpp

@@ -36 +36 @@
 #include "Views/Qt4/QtNumericalItem.hpp"
 
-#include <QAbstractItemView>
+#include <QtGui/QAbstractItemView>
 
 #include <iterator>

src/UIElements/Views/Qt4/QtGeometryList.cpp

@@ -44 +44 @@
 #include "Geometry/GeometryRegistry.hpp"
 
-#include <QAbstractItemView>
-#include <QCoreApplication>
+#include <QtGui/QAbstractItemView>
+#include <QtCore/QCoreApplication>
 
 using namespace std;

src/UIElements/Views/Qt4/QtGeometryList.hpp

@@ -16 +16 @@
 
 #include <QtGui/QTreeWidget>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include <boost/thread/recursive_mutex.hpp>

src/UIElements/Views/Qt4/QtHomologyList.cpp

@@ -36 +36 @@
 #include "Views/Qt4/QtNumericalItem.hpp"
 
-#include <QAbstractItemView>
+#include <QtGui/QAbstractItemView>
 #include <QtGui/QTreeWidget>
 #include <QtGui/QTabWidget>

src/UIElements/Views/Qt4/QtInfoBox.cpp

@@ -36 +36 @@
 
 #include <iostream>
-#include <QAbstractItemView>
+#include <QtGui/QAbstractItemView>
 
 //#include "CodePatterns/MemDebug.hpp"

src/UIElements/Views/Qt4/QtInfoBox.hpp

@@ -18 +18 @@
 #include <QtGui/QTabWidget>
 #include <QtGui/QTreeWidget>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include "UIElements/Qt4/InstanceBoard/QtObservedAtom.hpp"

src/UIElements/Views/Qt4/QtLogBox.cpp

@@ -35 +35 @@
 #include "QtLogBox.hpp"
 
-#include <QMouseEvent>
-#include <QTextCursor>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QTextCursor>
 
 //#include "CodePatterns/MemDebug.hpp"

src/UIElements/Views/Qt4/QtLogBox.hpp

@@ -14 +14 @@
 #endif
 
-#include <QPlainTextEdit>
+#include <QtGui/QPlainTextEdit>
 
 #include <iosfwd>

src/UIElements/Views/Qt4/QtNumericalItem.cpp

@@ -36 +36 @@
 #include "QtNumericalItem.hpp"
 
-#include <QTreeWidget>
+#include <QtGui/QTreeWidget>
 
 //#include "CodePatterns/MemDebug.hpp"

src/UIElements/Views/Qt4/QtNumericalItem.hpp

@@ -15 +15 @@
 #endif
 
-#include <QTreeWidgetItem>
+#include <QtGui/QTreeWidgetItem>
 
 #include <vector>

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -44 +44 @@
 #include "Shapes/ShapeRegistry.hpp"
 
-#include <QAbstractItemView>
+#include <QtGui/QAbstractItemView>
 #include "Actions/SelectionAction/Shapes/ShapeByNameAction.hpp"
 #include "Actions/SelectionAction/Shapes/NotShapeByNameAction.hpp"