mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-08 21:16:40 +00:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
Project579 2022-06-11 19:23:44 +02:00
parent cf0af87c80
commit 5446571aec
10 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/opencs/model/doc/document.hpp
View file

@ -2,7 +2,6 @@
#define CSM_DOC_DOCUMENT_H #define CSM_DOC_DOCUMENT_H
#include <string> #include <string>
#include <filesystem>
#include <QUndoStack> #include <QUndoStack>
#include <QObject> #include <QObject>

1
apps/opencs/model/doc/documentmanager.hpp
View file

@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <filesystem>
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>

3
apps/opencs/model/doc/runner.hpp
View file

@ -3,7 +3,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include <filesystem>
#include <QObject> #include <QObject>
#include <QProcess> #include <QProcess>
@ -11,6 +10,8 @@
#include <components/esm3/debugprofile.hpp> #include <components/esm3/debugprofile.hpp>
#include <filesystem>
class QTemporaryFile; class QTemporaryFile;
namespace CSMDoc namespace CSMDoc

2
apps/opencs/model/doc/saving.hpp
View file

@ -1,8 +1,6 @@
#ifndef CSM_DOC_SAVING_H #ifndef CSM_DOC_SAVING_H
#define CSM_DOC_SAVING_H #define CSM_DOC_SAVING_H
#include <filesystem>
#include <components/to_utf8/to_utf8.hpp> #include <components/to_utf8/to_utf8.hpp>
#include "operation.hpp" #include "operation.hpp"

1
apps/opencs/model/tools/tools.hpp
View file

@ -3,7 +3,6 @@
#include <memory> #include <memory>
#include <map> #include <map>
#include <filesystem>
#include <components/to_utf8/to_utf8.hpp> #include <components/to_utf8/to_utf8.hpp>

1
apps/opencs/model/world/data.hpp
View file

@ -3,7 +3,6 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include <filesystem>
#include <QObject> #include <QObject>
#include <QModelIndex> #include <QModelIndex>

3
apps/opencs/view/doc/adjusterwidget.hpp
View file

@ -1,10 +1,11 @@
#ifndef CSV_DOC_ADJUSTERWIDGET_H #ifndef CSV_DOC_ADJUSTERWIDGET_H
#define CSV_DOC_ADJUSTERWIDGET_H #define CSV_DOC_ADJUSTERWIDGET_H
#include <filesystem>
#include <QWidget> #include <QWidget>
#include <filesystem>
class QLabel; class QLabel;
namespace CSVDoc namespace CSVDoc

1
apps/opencs/view/doc/filedialog.hpp
View file

@ -6,7 +6,6 @@
#ifndef Q_MOC_RUN #ifndef Q_MOC_RUN
#include <filesystem>
#include "adjusterwidget.hpp" #include "adjusterwidget.hpp"
#ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED #ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED

4
apps/opencs/view/doc/newgame.hpp
View file

@ -1,11 +1,11 @@
#ifndef CSV_DOC_NEWGAME_H #ifndef CSV_DOC_NEWGAME_H
#define CSV_DOC_NEWGAME_H #define CSV_DOC_NEWGAME_H
#include <filesystem>
#include <QDialog> #include <QDialog>
#include <QMetaType> #include <QMetaType>
#include <filesystem>
#ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED #ifndef CS_QT_BOOST_FILESYSTEM_PATH_DECLARED
#define CS_QT_BOOST_FILESYSTEM_PATH_DECLARED #define CS_QT_BOOST_FILESYSTEM_PATH_DECLARED
Q_DECLARE_METATYPE (std::filesystem::path) Q_DECLARE_METATYPE (std::filesystem::path)

4
components/config/gamesettings.hpp
View file

@ -1,14 +1,14 @@
#ifndef GAMESETTINGS_HPP #ifndef GAMESETTINGS_HPP
#define GAMESETTINGS_HPP #define GAMESETTINGS_HPP
#include <filesystem>
#include <QTextStream> #include <QTextStream>
#include <QStringList> #include <QStringList>
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include <QMultiMap> #include <QMultiMap>
#include <filesystem>
namespace Files namespace Files
{ {
typedef std::vector<std::filesystem::path> PathContainer; typedef std::vector<std::filesystem::path> PathContainer;