Run IWYU on the opencs

7098-improve-post-process-behavior-with-transparent-objects
jvoisin 2 years ago
parent 2091a81e1b
commit 1a326294c0

@ -5,25 +5,36 @@
#include <QLocalSocket>
#include <QMessageBox>
#include <boost/program_options/options_description.hpp>
#include <boost/program_options.hpp>
#include <exception>
#include <apps/opencs/model/doc/document.hpp>
#include <apps/opencs/model/doc/documentmanager.hpp>
#include <apps/opencs/view/doc/adjusterwidget.hpp>
#include <apps/opencs/view/doc/filedialog.hpp>
#include <apps/opencs/view/doc/newgame.hpp>
#include <apps/opencs/view/doc/startup.hpp>
#include <apps/opencs/view/prefs/dialogue.hpp>
#include <apps/opencs/view/tools/merge.hpp>
#ifdef _WIN32
#include <components/windows.hpp>
#endif
#include <components/debug/debugging.hpp>
#include <components/debug/debuglog.hpp>
#include <components/esm3/esmreader.hpp>
#include <components/esm3/loadtes3.hpp>
#include <components/fallback/fallback.hpp>
#include <components/fallback/validate.hpp>
#include <components/files/qtconversion.hpp>
#include <components/misc/rng.hpp>
#include <components/nifosg/nifloader.hpp>
#include <components/settings/settings.hpp>
#include <components/to_utf8/to_utf8.hpp>
#include "view/doc/viewmanager.hpp"
#include "model/doc/document.hpp"
#ifdef _WIN32
#include <components/windows.hpp>
#endif
using namespace Fallback;
CS::Editor::Editor(int argc, char** argv)

@ -1,14 +1,18 @@
#ifndef CS_EDITOR_H
#define CS_EDITOR_H
#include <fstream>
#include <boost/interprocess/sync/file_lock.hpp>
#include <boost/program_options/variables_map.hpp>
#include <QObject>
#include <QString>
#include <filesystem>
#include <fstream>
#include <string>
#include <utility>
#include <vector>
#ifndef Q_MOC_RUN
#include <components/files/configurationmanager.hpp>
#endif
@ -16,15 +20,12 @@
#include <components/files/multidircollection.hpp>
#include "model/doc/documentmanager.hpp"
#include "model/prefs/state.hpp"
#include "view/doc/filedialog.hpp"
#include "view/doc/newgame.hpp"
#include "view/doc/startup.hpp"
#include "view/prefs/dialogue.hpp"
#include "view/tools/merge.hpp"
class QLocalServer;

@ -7,6 +7,7 @@
#include <QIcon>
#include <components/debug/debugging.hpp>
#include <components/debug/debuglog.hpp>
#include <components/platform/platform.hpp>
#include "model/doc/messages.hpp"
@ -18,6 +19,9 @@
Q_DECLARE_METATYPE(std::string)
class QEvent;
class QObject;
class Application : public QApplication
{
private:

@ -1,6 +1,10 @@
#include "blacklist.hpp"
#include <algorithm>
#include <stddef.h>
#include <utility>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/misc/strings/lower.hpp>

@ -2,9 +2,33 @@
#include "state.hpp"
#include <apps/opencs/model/doc/blacklist.hpp>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/doc/operationholder.hpp>
#include <apps/opencs/model/doc/runner.hpp>
#include <apps/opencs/model/doc/saving.hpp>
#include <apps/opencs/model/tools/tools.hpp>
#include <apps/opencs/model/world/data.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/debug/debuglog.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadglob.hpp>
#include <components/esm3/loadgmst.hpp>
#include <components/esm3/loadmgef.hpp>
#include <components/esm3/loadskil.hpp>
#include <components/esm3/variant.hpp>
#include <components/files/conversion.hpp>
#include <algorithm>
#include <filesystem>
#include <fstream>
#include <memory>
#include <stddef.h>
#include <stdexcept>
#include <utility>
#include <variant>
#include "../world/defaultgmsts.hpp"
@ -12,8 +36,10 @@
#include <components/files/configurationmanager.hpp>
#endif
#include <components/debug/debuglog.hpp>
#include <components/files/conversion.hpp>
namespace CSMWorld
{
class IdCompletionManager;
}
void CSMDoc::Document::addGmsts()
{

@ -1,11 +1,16 @@
#ifndef CSM_DOC_DOCUMENT_H
#define CSM_DOC_DOCUMENT_H
#include <string>
#include <QObject>
#include <QUndoStack>
#include <filesystem>
#include <memory>
#include <string>
#include <vector>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>

@ -1,6 +1,12 @@
#include "documentmanager.hpp"
#include <QWaitCondition>
#include <algorithm>
#include <filesystem>
#include <stdexcept>
#include <apps/opencs/model/doc/loader.hpp>
#ifndef Q_MOC_RUN
#include <components/files/configurationmanager.hpp>

@ -1,12 +1,13 @@
#ifndef CSM_DOC_DOCUMENTMGR_H
#define CSM_DOC_DOCUMENTMGR_H
#include <string>
#include <vector>
#include <QObject>
#include <QThread>
#include <filesystem>
#include <string>
#include <vector>
#include <components/files/multidircollection.hpp>
#include <components/to_utf8/to_utf8.hpp>

@ -1,5 +1,13 @@
#include "loader.hpp"
#include <algorithm>
#include <exception>
#include <filesystem>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/world/data.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/files/conversion.hpp>
#include <QTimer>

@ -1,6 +1,8 @@
#ifndef CSM_DOC_LOADER_H
#define CSM_DOC_LOADER_H
#include <string>
#include <utility>
#include <vector>
#include <QMutex>

@ -1,5 +1,7 @@
#include "messages.hpp"
#include <apps/opencs/model/world/universalid.hpp>
CSMDoc::Message::Message()
: mSeverity(Severity_Default)
{

@ -1,6 +1,9 @@
#ifndef CSM_DOC_MESSAGES_H
#define CSM_DOC_MESSAGES_H
#include <QMetaType>
#include <algorithm>
#include <string>
#include <vector>

@ -1,9 +1,13 @@
#include "operation.hpp"
#include <algorithm>
#include <exception>
#include <vector>
#include <QTimer>
#include <apps/opencs/model/doc/messages.hpp>
#include "../world/universalid.hpp"
#include "stage.hpp"

@ -1,6 +1,7 @@
#ifndef CSM_DOC_OPERATION_H
#define CSM_DOC_OPERATION_H
#include <utility>
#include <vector>
#include <QObject>

@ -4,11 +4,10 @@
#include <QObject>
#include <QThread>
#include "messages.hpp"
namespace CSMDoc
{
class Operation;
struct Message;
class OperationHolder : public QObject
{

@ -7,10 +7,12 @@
#include <QDir>
#endif
#include <QProcess>
#include <QString>
#include <QStringList>
#include <QTemporaryFile>
#include <QTextStream>
#include <components/files/conversion.hpp>
#include <components/files/qtconversion.hpp>
#include "operationholder.hpp"

@ -1,5 +1,31 @@
#include "saving.hpp"
#include <algorithm>
#include <variant>
#include <apps/opencs/model/doc/operation.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/scope.hpp>
#include <components/esm3/debugprofile.hpp>
#include <components/esm3/filter.hpp>
#include <components/esm3/loadbody.hpp>
#include <components/esm3/loadbsgn.hpp>
#include <components/esm3/loadclas.hpp>
#include <components/esm3/loadench.hpp>
#include <components/esm3/loadfact.hpp>
#include <components/esm3/loadglob.hpp>
#include <components/esm3/loadgmst.hpp>
#include <components/esm3/loadmgef.hpp>
#include <components/esm3/loadrace.hpp>
#include <components/esm3/loadregn.hpp>
#include <components/esm3/loadscpt.hpp>
#include <components/esm3/loadskil.hpp>
#include <components/esm3/loadsndg.hpp>
#include <components/esm3/loadsoun.hpp>
#include <components/esm3/loadspel.hpp>
#include <components/esm3/loadsscr.hpp>
#include "../world/data.hpp"
#include "../world/idcollection.hpp"

@ -1,11 +1,15 @@
#ifndef CSM_DOC_SAVING_H
#define CSM_DOC_SAVING_H
#include <QObject>
#include <components/to_utf8/to_utf8.hpp>
#include "operation.hpp"
#include "savingstate.hpp"
#include <filesystem>
namespace CSMDoc
{
class Document;

@ -1,10 +1,42 @@
#include "savingstages.hpp"
#include <QUndoStack>
#include <filesystem>
#include <map>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <string>
#include <utility>
#include <vector>
#include <apps/opencs/model/doc/savingstate.hpp>
#include <apps/opencs/model/world/cell.hpp>
#include <apps/opencs/model/world/data.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/info.hpp>
#include <apps/opencs/model/world/land.hpp>
#include <apps/opencs/model/world/landtexture.hpp>
#include <apps/opencs/model/world/metadata.hpp>
#include <apps/opencs/model/world/pathgrid.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/ref.hpp>
#include <apps/opencs/model/world/refcollection.hpp>
#include <apps/opencs/model/world/refidcollection.hpp>
#include <apps/opencs/model/world/refiddata.hpp>
#include <apps/opencs/model/world/subcellcollection.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm/esmcommon.hpp>
#include <components/esm3/cellref.hpp>
#include <components/esm3/esmwriter.hpp>
#include <components/esm3/loadcell.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadinfo.hpp>
#include <components/esm3/loadpgrd.hpp>
#include <components/files/conversion.hpp>
#include <components/misc/strings/lower.hpp>
#include "../world/cellcoordinates.hpp"
#include "../world/infocollection.hpp"

@ -3,17 +3,18 @@
#include "stage.hpp"
#include <deque>
#include "../world/idcollection.hpp"
#include "../world/record.hpp"
#include "../world/scope.hpp"
#include <components/esm/defs.hpp>
#include "savingstate.hpp"
namespace ESM
{
struct Dialogue;
class ESMWriter;
}
namespace CSMWorld
@ -24,7 +25,7 @@ namespace CSMWorld
namespace CSMDoc
{
class Document;
class SavingState;
class Messages;
class OpenSaveStage : public Stage
{

@ -5,6 +5,7 @@
#include <filesystem>
#include <fstream>
#include <map>
#include <string>
#include <components/esm3/esmwriter.hpp>

@ -1,12 +1,9 @@
#ifndef CSM_DOC_STAGE_H
#define CSM_DOC_STAGE_H
#include "messages.hpp"
class QString;
namespace CSMDoc
{
class Messages;
class Stage
{
public:

@ -1,5 +1,8 @@
#include "andnode.hpp"
#include <apps/opencs/model/filter/narynode.hpp>
#include <apps/opencs/model/filter/node.hpp>
CSMFilter::AndNode::AndNode(const std::vector<std::shared_ptr<Node>>& nodes)
: NAryNode(nodes, "and")
{

@ -1,5 +1,10 @@
#include "booleannode.hpp"
namespace CSMWorld
{
class IdTableBase;
}
CSMFilter::BooleanNode::BooleanNode(bool true_)
: mTrue(true_)
{

@ -1,8 +1,16 @@
#ifndef CSM_FILTER_BOOLEANNODE_H
#define CSM_FILTER_BOOLEANNODE_H
#include <map>
#include <string>
#include "leafnode.hpp"
namespace CSMWorld
{
class IdTableBase;
}
namespace CSMFilter
{
class BooleanNode : public LeafNode

@ -1,7 +1,10 @@
#include "narynode.hpp"
#include <algorithm>
#include <sstream>
#include <apps/opencs/model/filter/node.hpp>
CSMFilter::NAryNode::NAryNode(const std::vector<std::shared_ptr<Node>>& nodes, const std::string& name)
: mNodes(nodes)
, mName(name)

@ -1,6 +1,7 @@
#ifndef CSM_FILTER_NARYNODE_H
#define CSM_FILTER_NARYNODE_H
#include <memory>
#include <string>
#include <vector>

@ -1,7 +1,9 @@
#include "textnode.hpp"
#include <memory>
#include <sstream>
#include <stdexcept>
#include <utility>
#include <QRegExp>

@ -1,6 +1,12 @@
#ifndef CSM_FILTER_TEXTNODE_H
#define CSM_FILTER_TEXTNODE_H
#include <map>
#include <string>
#include <vector>
#include <apps/opencs/model/world/idtablebase.hpp>
#include "leafnode.hpp"
namespace CSMFilter

@ -1,5 +1,7 @@
#include "unarynode.hpp"
#include <apps/opencs/model/filter/node.hpp>
CSMFilter::UnaryNode::UnaryNode(std::shared_ptr<Node> child, const std::string& name)
: mChild(child)
, mName(name)

@ -1,6 +1,10 @@
#ifndef CSM_FILTER_UNARYNODE_H
#define CSM_FILTER_UNARYNODE_H
#include <memory>
#include <string>
#include <vector>
#include "node.hpp"
namespace CSMFilter

@ -2,6 +2,7 @@
#include <sstream>
#include <stdexcept>
#include <utility>
#include "../world/columns.hpp"
#include "../world/idtablebase.hpp"

@ -3,6 +3,12 @@
#include "leafnode.hpp"
#include <apps/opencs/model/world/idtablebase.hpp>
#include <map>
#include <string>
#include <vector>
namespace CSMFilter
{
class ValueNode : public LeafNode

@ -5,6 +5,8 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "category.hpp"
#include "state.hpp"

@ -3,10 +3,15 @@
#include "setting.hpp"
#include <string>
#include <utility>
class QCheckBox;
namespace CSMPrefs
{
class Category;
class BoolSetting : public Setting
{
Q_OBJECT

@ -6,6 +6,8 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "../../view/widget/coloreditor.hpp"
#include "category.hpp"

@ -5,6 +5,13 @@
#include <QColor>
#include <string>
#include <utility>
class QMutex;
class QObject;
class QWidget;
namespace CSVWidget
{
class ColorEditor;
@ -12,6 +19,7 @@ namespace CSVWidget
namespace CSMPrefs
{
class Category;
class ColourSetting : public Setting
{
Q_OBJECT

@ -9,6 +9,8 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "category.hpp"
#include "state.hpp"

@ -7,6 +7,8 @@ class QDoubleSpinBox;
namespace CSMPrefs
{
class Category;
class DoubleSetting : public Setting
{
Q_OBJECT

@ -1,4 +1,3 @@
#include "enumsetting.hpp"
#include <QComboBox>
@ -6,6 +5,11 @@
#include <QMutexLocker>
#include <QString>
#include <algorithm>
#include <memory>
#include <apps/opencs/model/prefs/setting.hpp>
#include <components/settings/settings.hpp>
#include "category.hpp"

@ -1,6 +1,8 @@
#ifndef CSM_PREFS_ENUMSETTING_H
#define CSM_PREFS_ENUMSETTING_H
#include <string>
#include <utility>
#include <vector>
#include "setting.hpp"
@ -9,6 +11,8 @@ class QComboBox;
namespace CSMPrefs
{
class Category;
struct EnumValue
{
std::string mValue;

@ -9,6 +9,8 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "category.hpp"
#include "state.hpp"

@ -4,9 +4,14 @@
#include "setting.hpp"
class QSpinBox;
class QMutex;
class QObject;
class QWidget;
namespace CSMPrefs
{
class Category;
class IntSetting : public Setting
{
Q_OBJECT

@ -8,6 +8,9 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "shortcutmanager.hpp"
#include "state.hpp"

@ -3,6 +3,9 @@
#include "setting.hpp"
#include <string>
#include <utility>
class QMutex;
class QObject;
class QWidget;

@ -1,6 +1,7 @@
#include "shortcut.hpp"
#include <cassert>
#include <exception>
#include <QAction>
#include <QWidget>

@ -1,6 +1,8 @@
#include "shortcutmanager.hpp"
#include <algorithm>
#include <string>
#include <utility>
#include <QStringList>

@ -2,6 +2,8 @@
#define CSM_PREFS_SHORTCUTMANAGER_H
#include <map>
#include <string>
#include <utility>
#include <QKeySequence>
#include <QObject>

@ -10,6 +10,9 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "shortcutmanager.hpp"
#include "state.hpp"

@ -1,15 +1,22 @@
#ifndef CSM_PREFS_SHORTCUTSETTING_H
#define CSM_PREFS_SHORTCUTSETTING_H
#include <string>
#include <utility>
#include <QKeySequence>
#include "setting.hpp"
class QEvent;
class QMutex;
class QObject;
class QPushButton;
class QWidget;
namespace CSMPrefs
{
class Category;
class ShortcutSetting : public Setting
{
Q_OBJECT

@ -1,9 +1,20 @@
#include "state.hpp"
#include <QColor>
#include <QKeySequence>
#include <filesystem>
#include <sstream>
#include <stdexcept>
#include <utility>
#include <vector>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/enumsetting.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/prefs/shortcutmanager.hpp>
#include <components/settings/categories.hpp>
#include <components/settings/settings.hpp>
#include "boolsetting.hpp"

@ -6,6 +6,8 @@
#include <components/settings/settings.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include "category.hpp"
#include "state.hpp"

@ -3,10 +3,17 @@
#include "setting.hpp"
#include <string>
#include <utility>
class QLineEdit;
class QMutex;
class QObject;
class QWidget;
namespace CSMPrefs
{
class Category;
class StringSetting : public Setting
{
Q_OBJECT

@ -1,5 +1,15 @@
#include "birthsigncheck.hpp"
#include <string>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/resources.hpp>
#include <components/esm3/loadbsgn.hpp>
#include <components/misc/resourcehelpers.hpp>
#include "../prefs/state.hpp"

@ -1,13 +1,25 @@
#ifndef CSM_TOOLS_BIRTHSIGNCHECK_H
#define CSM_TOOLS_BIRTHSIGNCHECK_H
#include <components/esm3/loadbsgn.hpp>
#include "../world/idcollection.hpp"
#include "../world/resources.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class Resources;
}
namespace ESM
{
struct BirthSign;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that birthsign records are internally consistent

@ -1,5 +1,17 @@
#include "bodypartcheck.hpp"
#include <string>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/resources.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadbody.hpp>
#include "../prefs/state.hpp"
CSMTools::BodyPartCheckStage::BodyPartCheckStage(const CSMWorld::IdCollection<ESM::BodyPart>& bodyParts,

@ -1,14 +1,28 @@
#ifndef CSM_TOOLS_BODYPARTCHECK_H
#define CSM_TOOLS_BODYPARTCHECK_H
#include <components/esm3/loadbody.hpp>
#include <components/esm3/loadrace.hpp>
#include "../world/idcollection.hpp"
#include "../world/resources.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class Resources;
}
namespace ESM
{
struct BodyPart;
struct Race;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that body part records are internally consistent

@ -1,6 +1,15 @@
#include "classcheck.hpp"
#include <map>
#include <string>
#include <utility>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadclas.hpp>
#include <components/esm3/loadskil.hpp>

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_CLASSCHECK_H
#define CSM_TOOLS_CLASSCHECK_H
#include <components/esm3/loadclas.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Class;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that class records are internally consistent

@ -1,5 +1,18 @@
#include "enchantmentcheck.hpp"
#include <stddef.h>
#include <string>
#include <vector>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/esm3/effectlist.hpp>
#include <components/esm3/loadench.hpp>
#include "../prefs/state.hpp"
#include "../world/universalid.hpp"

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_ENCHANTMENTCHECK_H
#define CSM_TOOLS_ENCHANTMENTCHECK_H
#include <components/esm3/loadench.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Enchantment;
}
namespace CSMTools
{
/// \brief Make sure that enchantment records are correct

@ -1,7 +1,17 @@
#include "factioncheck.hpp"
#include <map>
#include <string>
#include <utility>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadfact.hpp>
#include <components/esm3/loadskil.hpp>
#include "../prefs/state.hpp"

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_FACTIONCHECK_H
#define CSM_TOOLS_FACTIONCHECK_H
#include <components/esm3/loadfact.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Faction;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that faction records are internally consistent

@ -1,6 +1,16 @@
#include "gmstcheck.hpp"
#include <sstream>
#include <stddef.h>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadgmst.hpp>
#include "../prefs/state.hpp"

@ -1,12 +1,24 @@
#ifndef CSM_TOOLS_GMSTCHECK_H
#define CSM_TOOLS_GMSTCHECK_H
#include <components/esm3/loadgmst.hpp>
#include <string>
#include <components/esm3/variant.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct GameSetting;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that GMSTs are alright

@ -1,6 +1,23 @@
#include "journalcheck.hpp"
#include <memory>
#include <set>
#include <string>
#include <utility>
#include <variant>
#include <vector>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/info.hpp>
#include <apps/opencs/model/world/infocollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadinfo.hpp>
#include "../prefs/state.hpp"

@ -1,13 +1,25 @@
#ifndef CSM_TOOLS_JOURNALCHECK_H
#define CSM_TOOLS_JOURNALCHECK_H
#include <components/esm3/loaddial.hpp>
#include "../world/idcollection.hpp"
#include "../world/infocollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class InfoCollection;
}
namespace ESM
{
struct Dialogue;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that journal infos are good

@ -1,9 +1,24 @@
#include "magiceffectcheck.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/refidcollection.hpp>
#include <apps/opencs/model/world/refiddata.hpp>
#include <apps/opencs/model/world/resources.hpp>
#include <components/esm3/loadmgef.hpp>
#include <components/misc/resourcehelpers.hpp>
#include "../prefs/state.hpp"
namespace ESM
{
struct Sound;
}
std::string CSMTools::MagicEffectCheckStage::checkObject(
const std::string& id, const CSMWorld::UniversalId& type, const std::string& column) const
{

@ -1,15 +1,33 @@
#ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
#define CSM_TOOLS_MAGICEFFECTCHECK_HPP
#include <components/esm3/loadmgef.hpp>
#include <string>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadsoun.hpp>
#include "../world/idcollection.hpp"
#include "../world/refidcollection.hpp"
#include "../world/resources.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class RefIdCollection;
class Resources;
}
namespace ESM
{
struct MagicEffect;
struct Sound;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that magic effect records are internally consistent

@ -1,9 +1,14 @@
#include "mandatoryid.hpp"
#include <memory>
#include "../world/collectionbase.hpp"
#include "../world/record.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/world/universalid.hpp>
CSMTools::MandatoryIdStage::MandatoryIdStage(const CSMWorld::CollectionBase& idCollection,
const CSMWorld::UniversalId& collectionId, const std::vector<std::string>& ids)
: mIdCollection(idCollection)

@ -8,6 +8,11 @@
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class CollectionBase;

@ -1,6 +1,38 @@
#include "mergeoperation.hpp"
#include <utility>
#include <variant>
#include <apps/opencs/model/doc/operation.hpp>
#include <apps/opencs/model/tools/mergestate.hpp>
#include <apps/opencs/model/world/cell.hpp>
#include <apps/opencs/model/world/data.hpp>
#include <apps/opencs/model/world/info.hpp>
#include <apps/opencs/model/world/infocollection.hpp>
#include <apps/opencs/model/world/pathgrid.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/subcellcollection.hpp>
#include <components/esm3/debugprofile.hpp>
#include <components/esm3/filter.hpp>
#include <components/esm3/loadbody.hpp>
#include <components/esm3/loadbsgn.hpp>
#include <components/esm3/loadclas.hpp>
#include <components/esm3/loaddial.hpp>
#include <components/esm3/loadench.hpp>
#include <components/esm3/loadfact.hpp>
#include <components/esm3/loadglob.hpp>
#include <components/esm3/loadgmst.hpp>
#include <components/esm3/loadmgef.hpp>
#include <components/esm3/loadrace.hpp>
#include <components/esm3/loadregn.hpp>
#include <components/esm3/loadscpt.hpp>
#include <components/esm3/loadskil.hpp>
#include <components/esm3/loadsndg.hpp>
#include <components/esm3/loadsoun.hpp>
#include <components/esm3/loadspel.hpp>
#include <components/esm3/loadsscr.hpp>
#include "../doc/document.hpp"
#include "../doc/state.hpp"

@ -9,6 +9,8 @@
#include "mergestate.hpp"
class QObject;
namespace CSMDoc
{
class Document;

@ -1,5 +1,20 @@
#include "mergestages.hpp"
#include <cstdint>
#include <filesystem>
#include <utility>
#include <vector>
#include <apps/opencs/model/world/land.hpp>
#include <apps/opencs/model/world/landtexture.hpp>
#include <apps/opencs/model/world/metadata.hpp>
#include <apps/opencs/model/world/ref.hpp>
#include <apps/opencs/model/world/refcollection.hpp>
#include <apps/opencs/model/world/refidcollection.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/cellref.hpp>
#include <components/esm3/esmreader.hpp>
#include <components/misc/strings/lower.hpp>
#include "mergestate.hpp"
@ -9,6 +24,11 @@
#include "../world/data.hpp"
#include "../world/idtable.hpp"
namespace CSMDoc
{
class Messages;
}
CSMTools::StartMergeStage::StartMergeStage(MergeState& state)
: mState(state)
{

@ -1,9 +1,13 @@
#ifndef CSM_TOOLS_MERGESTAGES_H
#define CSM_TOOLS_MERGESTAGES_H
#include <algorithm>
#include <map>
#include <memory>
#include <string>
#include <apps/opencs/model/doc/document.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/to_utf8/to_utf8.hpp>
@ -13,6 +17,11 @@
#include "mergestate.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMTools
{
class StartMergeStage : public CSMDoc::Stage

@ -1,8 +1,16 @@
#include "pathgridcheck.hpp"
#include <algorithm>
#include <memory>
#include <sstream>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/esm3/loadpgrd.hpp>
#include "../prefs/state.hpp"
#include "../world/idcollection.hpp"

@ -1,15 +1,23 @@
#ifndef CSM_TOOLS_PATHGRIDCHECK_H
#define CSM_TOOLS_PATHGRIDCHECK_H
#include "../world/collection.hpp"
#include <algorithm>
#include <vector>
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
struct Pathgrid;
template <typename T, typename AT>
class SubCellCollection;
template <typename ESXRecordT>
struct IdAccessor;
}
namespace CSMTools

@ -1,9 +1,18 @@
#include "racecheck.hpp"
#include <string>
#include "../prefs/state.hpp"
#include "../world/universalid.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/esm3/loadrace.hpp>
void CSMTools::RaceCheckStage::performPerRecord(int stage, CSMDoc::Messages& messages)
{
const CSMWorld::Record<ESM::Race>& record = mRaces.getRecord(stage);

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_RACECHECK_H
#define CSM_TOOLS_RACECHECK_H
#include <components/esm3/loadrace.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Race;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that race records are internally consistent

@ -1,5 +1,35 @@
#include "referenceablecheck.hpp"
#include <memory>
#include <stddef.h>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/refiddata.hpp>
#include <apps/opencs/model/world/resources.hpp>
#include <components/esm3/aipackage.hpp>
#include <components/esm3/loadacti.hpp>
#include <components/esm3/loadalch.hpp>
#include <components/esm3/loadappa.hpp>
#include <components/esm3/loadarmo.hpp>
#include <components/esm3/loadbook.hpp>
#include <components/esm3/loadclot.hpp>
#include <components/esm3/loadcont.hpp>
#include <components/esm3/loadcrea.hpp>
#include <components/esm3/loaddoor.hpp>
#include <components/esm3/loadingr.hpp>
#include <components/esm3/loadlevlist.hpp>
#include <components/esm3/loadligh.hpp>
#include <components/esm3/loadlock.hpp>
#include <components/esm3/loadmisc.hpp>
#include <components/esm3/loadnpc.hpp>
#include <components/esm3/loadprob.hpp>
#include <components/esm3/loadrepa.hpp>
#include <components/esm3/loadstat.hpp>
#include <components/esm3/loadweap.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/misc/strings/algorithm.hpp>
@ -8,6 +38,15 @@
#include "../world/record.hpp"
#include "../world/universalid.hpp"
namespace ESM
{
class Script;
struct BodyPart;
struct Class;
struct Faction;
struct Race;
}
CSMTools::ReferenceableCheckStage::ReferenceableCheckStage(const CSMWorld::RefIdData& referenceable,
const CSMWorld::IdCollection<ESM::Race>& races, const CSMWorld::IdCollection<ESM::Class>& classes,
const CSMWorld::IdCollection<ESM::Faction>& faction, const CSMWorld::IdCollection<ESM::Script>& scripts,

@ -1,11 +1,13 @@
#ifndef REFERENCEABLECHECKSTAGE_H
#define REFERENCEABLECHECKSTAGE_H
#include <string>
#include <vector>
#include "../doc/stage.hpp"
#include "../world/idcollection.hpp"
#include "../world/refiddata.hpp"
#include "../world/resources.hpp"
#include <components/esm3/loadbody.hpp>
#include <components/esm3/loadclas.hpp>
@ -13,6 +15,16 @@
#include <components/esm3/loadrace.hpp>
#include <components/esm3/loadscpt.hpp>
namespace CSMWorld
{
class Resources;
}
namespace CSMDoc
{
class Messages;
}
namespace CSMTools
{
class ReferenceableCheckStage : public CSMDoc::Stage

@ -1,9 +1,23 @@
#include "referencecheck.hpp"
#include <string>
#include "../prefs/state.hpp"
#include "../../model/world/cell.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/ref.hpp>
#include <apps/opencs/model/world/refcollection.hpp>
#include <apps/opencs/model/world/refidcollection.hpp>
#include <apps/opencs/model/world/refiddata.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/cellref.hpp>
#include <components/esm3/loadfact.hpp>
CSMTools::ReferenceCheckStage::ReferenceCheckStage(const CSMWorld::RefCollection& references,

@ -3,8 +3,6 @@
#include "../world/idcollection.hpp"
#include "../world/refcollection.hpp"
#include "../world/refidcollection.hpp"
#include "../world/refiddata.hpp"
#include "../doc/stage.hpp"
@ -13,6 +11,18 @@ namespace ESM
struct Faction;
}
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class RefIdCollection;
class RefIdData;
struct Cell;
}
namespace CSMTools
{
class ReferenceCheckStage : public CSMDoc::Stage

@ -1,9 +1,20 @@
#include "regioncheck.hpp"
#include <string>
#include <vector>
#include "../prefs/state.hpp"
#include "../world/universalid.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/esm3/loadregn.hpp>
CSMTools::RegionCheckStage::RegionCheckStage(const CSMWorld::IdCollection<ESM::Region>& regions)
: mRegions(regions)
{

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_REGIONCHECK_H
#define CSM_TOOLS_REGIONCHECK_H
#include <components/esm3/loadregn.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Region;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that region records are internally consistent

@ -1,8 +1,13 @@
#include "reportmodel.hpp"
#include <algorithm>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include "../world/columns.hpp"
CSMTools::ReportModel::ReportModel(bool fieldColumn, bool severityColumn)

@ -5,10 +5,15 @@
#include <vector>
#include <QAbstractTableModel>
#include <QModelIndex>
#include <QVariant>
#include "../doc/messages.hpp"
#include "../world/universalid.hpp"
namespace CSMWorld
{
class UniversalId;
}
namespace CSMTools
{

@ -1,12 +1,23 @@
#include "scriptcheck.hpp"
#include <exception>
#include <sstream>
#include <string>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/scriptcontext.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/compiler/exception.hpp>
#include <components/compiler/extensions0.hpp>
#include <components/compiler/fileparser.hpp>
#include <components/compiler/scanner.hpp>
#include <components/compiler/tokenloc.hpp>
#include <components/esm3/loadscpt.hpp>
#include "../doc/document.hpp"

@ -1,9 +1,13 @@
#ifndef CSM_TOOLS_SCRIPTCHECK_H
#define CSM_TOOLS_SCRIPTCHECK_H
#include <string>
#include <components/compiler/errorhandler.hpp>
#include <components/compiler/extensions.hpp>
#include <apps/opencs/model/doc/messages.hpp>
#include "../doc/stage.hpp"
#include "../world/scriptcontext.hpp"
@ -13,6 +17,11 @@ namespace CSMDoc
class Document;
}
namespace Compiler
{
struct TokenLoc;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that scripts compile

@ -1,7 +1,16 @@
#include "search.hpp"
#include <QModelIndex>
#include <QRegExp>
#include <QString>
#include <memory>
#include <sstream>
#include <stdexcept>
#include <utility>
#include <vector>
#include <apps/opencs/model/world/columns.hpp>
#include "../doc/document.hpp"
#include "../doc/messages.hpp"

@ -6,6 +6,13 @@
#include "../world/data.hpp"
#include "../world/idtablebase.hpp"
#include <vector>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/doc/operation.hpp>
#include <apps/opencs/model/tools/search.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include "searchstage.hpp"
CSMTools::SearchOperation::SearchOperation(CSMDoc::Document& document)

@ -2,8 +2,15 @@
#include "../world/idtablebase.hpp"
#include <apps/opencs/model/tools/search.hpp>
#include "searchoperation.hpp"
namespace CSMDoc
{
class Messages;
}
CSMTools::SearchStage::SearchStage(const CSMWorld::IdTableBase* model)
: mModel(model)
, mOperation(nullptr)

@ -5,6 +5,11 @@
#include "search.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class IdTableBase;

@ -1,9 +1,18 @@
#include "skillcheck.hpp"
#include <string>
#include "../prefs/state.hpp"
#include "../world/universalid.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <components/esm3/loadskil.hpp>
CSMTools::SkillCheckStage::SkillCheckStage(const CSMWorld::IdCollection<ESM::Skill>& skills)
: mSkills(skills)
{

@ -1,12 +1,20 @@
#ifndef CSM_TOOLS_SKILLCHECK_H
#define CSM_TOOLS_SKILLCHECK_H
#include <components/esm3/loadskil.hpp>
#include "../world/idcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace ESM
{
struct Skill;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that skill records are internally consistent

@ -1,9 +1,20 @@
#include "soundcheck.hpp"
#include <string>
#include "../prefs/state.hpp"
#include "../world/universalid.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/resources.hpp>
#include <components/esm3/loadsoun.hpp>
CSMTools::SoundCheckStage::SoundCheckStage(
const CSMWorld::IdCollection<ESM::Sound>& sounds, const CSMWorld::Resources& soundfiles)
: mSounds(sounds)

@ -1,13 +1,25 @@
#ifndef CSM_TOOLS_SOUNDCHECK_H
#define CSM_TOOLS_SOUNDCHECK_H
#include <components/esm3/loadsoun.hpp>
#include "../world/idcollection.hpp"
#include "../world/resources.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class Resources;
}
namespace ESM
{
struct Sound;
}
namespace CSMTools
{
/// \brief VerifyStage: make sure that sound records are internally consistent

@ -1,10 +1,19 @@
#include "soundgencheck.hpp"
#include <string>
#include "../prefs/state.hpp"
#include "../world/refiddata.hpp"
#include "../world/universalid.hpp"
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/refidcollection.hpp>
#include <components/esm3/loadsndg.hpp>
#include <components/esm3/loadsoun.hpp>

@ -2,10 +2,19 @@
#define CSM_TOOLS_SOUNDGENCHECK_HPP
#include "../world/idcollection.hpp"
#include "../world/refidcollection.hpp"
#include "../doc/stage.hpp"
namespace CSMDoc
{
class Messages;
}
namespace CSMWorld
{
class RefIdCollection;
}
namespace ESM
{
struct SoundGenerator;

@ -1,5 +1,14 @@
#include "spellcheck.hpp"
#include <string>
#include <apps/opencs/model/doc/messages.hpp>
#include <apps/opencs/model/prefs/category.hpp>
#include <apps/opencs/model/prefs/setting.hpp>
#include <apps/opencs/model/world/idcollection.hpp>
#include <apps/opencs/model/world/record.hpp>
#include <apps/opencs/model/world/universalid.hpp>
#include <components/esm3/loadspel.hpp>
#include "../prefs/state.hpp"

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save