Circumvent QT MOC bugs by including the filesystem header in a specific order.

3 years ago · 5446571aec
parent cf0af87c80
commit 5446571aec
10 changed files with 8 additions and 13 deletions
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@ -2,7 +2,6 @@
 #define CSM_DOC_DOCUMENT_H

 #include <string>
-#include <filesystem>

 #include <QUndoStack>
 #include <QObject>
--- a/apps/opencs/model/doc/documentmanager.hpp
+++ b/apps/opencs/model/doc/documentmanager.hpp
@ -3,7 +3,6 @@

 #include <vector>
 #include <string>
-#include <filesystem>

 #include <QObject>
 #include <QThread>
--- a/apps/opencs/model/doc/runner.hpp
+++ b/apps/opencs/model/doc/runner.hpp
@ -3,7 +3,6 @@

 #include <vector>
 #include <string>
-#include <filesystem>

 #include <QObject>
 #include <QProcess>
@ -11,6 +10,8 @@

 #include <components/esm3/debugprofile.hpp>

+#include <filesystem>
+
 class QTemporaryFile;

 namespace CSMDoc
--- a/apps/opencs/model/doc/saving.hpp
+++ b/apps/opencs/model/doc/saving.hpp
@ -1,8 +1,6 @@
 #ifndef CSM_DOC_SAVING_H
 #define CSM_DOC_SAVING_H

-#include <filesystem>
-
 #include <components/to_utf8/to_utf8.hpp>

 #include "operation.hpp"
--- a/apps/opencs/model/tools/tools.hpp
+++ b/apps/opencs/model/tools/tools.hpp
@ -3,7 +3,6 @@

 #include <memory>
 #include <map>
-#include <filesystem>

 #include <components/to_utf8/to_utf8.hpp>

--- a/apps/opencs/model/world/data.hpp
+++ b/apps/opencs/model/world/data.hpp
@ -3,7 +3,6 @@

 #include <map>
 #include <vector>
-#include <filesystem>

 #include <QObject>
 #include <QModelIndex>
--- a/apps/opencs/view/doc/adjusterwidget.hpp
+++ b/apps/opencs/view/doc/adjusterwidget.hpp
@ -1,10 +1,11 @@
 #ifndef CSV_DOC_ADJUSTERWIDGET_H
 #define CSV_DOC_ADJUSTERWIDGET_H

-#include <filesystem>

 #include <QWidget>

+#include <filesystem>
+
 class QLabel;

 namespace CSVDoc
--- a/apps/opencs/view/doc/filedialog.hpp
+++ b/apps/opencs/view/doc/filedialog.hpp
@ -6,7 +6,6 @@

 #ifndef Q_MOC_RUN

-#include <filesystem>
 #include "adjusterwidget.hpp"

 #ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED
--- a/apps/opencs/view/doc/newgame.hpp
+++ b/apps/opencs/view/doc/newgame.hpp
@ -1,11 +1,11 @@
 #ifndef CSV_DOC_NEWGAME_H
 #define CSV_DOC_NEWGAME_H

-#include <filesystem>
-
 #include <QDialog>
 #include <QMetaType>

+#include <filesystem>
+
 #ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED
 #define CS_QT_BOOST_FILESYSTEM_PATH_DECLARED
 Q_DECLARE_METATYPE (std::filesystem::path)
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@ -1,14 +1,14 @@
 #ifndef GAMESETTINGS_HPP
 #define GAMESETTINGS_HPP

-#include <filesystem>
-
 #include <QTextStream>
 #include <QStringList>
 #include <QString>
 #include <QFile>
 #include <QMultiMap>

+#include <filesystem>
+
 namespace Files
 {
  typedef std::vector<std::filesystem::path> PathContainer;