mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-28 03:09:40 +00:00
Code Issues Releases Wiki Activity

Mark overrided methods by override keyword

Browse source
This commit is contained in:
Andrei Kortunov 2020-10-16 22:18:54 +04:00
parent e5392cabf1
commit 8ca3c3b123
441 changed files with 3661 additions and 3673 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -431,6 +431,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6) if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.6 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.6)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-but-set-parameter")
endif() endif()
if (CMAKE_CXX_COMPILER_ID STREQUAL GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 5.0)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override")
endif()
elseif (MSVC) elseif (MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /FORCE:MULTIPLE")
endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) endif (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)

2
apps/launcher/maindialog.hpp
View file

@ -84,7 +84,7 @@ namespace Launcher
inline bool startProgram(const QString &name, bool detached = false) { return startProgram(name, QStringList(), detached); } inline bool startProgram(const QString &name, bool detached = false) { return startProgram(name, QStringList(), detached); }
bool startProgram(const QString &name, const QStringList &arguments, bool detached = false); bool startProgram(const QString &name, const QStringList &arguments, bool detached = false);
void closeEvent(QCloseEvent *event); void closeEvent(QCloseEvent *event) override;
PlayPage *mPlayPage; PlayPage *mPlayPage;
GraphicsPage *mGraphicsPage; GraphicsPage *mGraphicsPage;

2
apps/launcher/utils/lineedit.hpp
View file

@ -27,7 +27,7 @@ public:
LineEdit(QWidget *parent = 0); LineEdit(QWidget *parent = 0);
protected: protected:
void resizeEvent(QResizeEvent *); void resizeEvent(QResizeEvent *) override;
private slots: private slots:
void updateClearButton(const QString &text); void updateClearButton(const QString &text);

2
apps/launcher/utils/textinputdialog.hpp
View file

@ -21,7 +21,7 @@ namespace Launcher
inline LineEdit *lineEdit() { return mLineEdit; } inline LineEdit *lineEdit() { return mLineEdit; }
void setOkButtonEnabled(bool enabled); void setOkButtonEnabled(bool enabled);
int exec(); int exec() override;
private: private:

2
apps/opencs/main.cpp
View file

@ -22,7 +22,7 @@ class Application : public QApplication
{ {
private: private:
bool notify (QObject *receiver, QEvent *event) bool notify (QObject *receiver, QEvent *event) override
{ {
try try
{ {

48
apps/opencs/model/doc/savingstages.hpp
View file

@ -37,10 +37,10 @@ namespace CSMDoc
OpenSaveStage (Document& document, SavingState& state, bool projectFile); OpenSaveStage (Document& document, SavingState& state, bool projectFile);
///< \param projectFile Saving the project file instead of the content file. ///< \param projectFile Saving the project file instead of the content file.
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -55,10 +55,10 @@ namespace CSMDoc
WriteHeaderStage (Document& document, SavingState& state, bool simple); WriteHeaderStage (Document& document, SavingState& state, bool simple);
///< \param simple Simplified header (used for project files). ///< \param simple Simplified header (used for project files).
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -75,10 +75,10 @@ namespace CSMDoc
WriteCollectionStage (const CollectionT& collection, SavingState& state, WriteCollectionStage (const CollectionT& collection, SavingState& state,
CSMWorld::Scope scope = CSMWorld::Scope_Content); CSMWorld::Scope scope = CSMWorld::Scope_Content);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -125,10 +125,10 @@ namespace CSMDoc
WriteDialogueCollectionStage (Document& document, SavingState& state, bool journal); WriteDialogueCollectionStage (Document& document, SavingState& state, bool journal);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -142,10 +142,10 @@ namespace CSMDoc
WriteRefIdCollectionStage (Document& document, SavingState& state); WriteRefIdCollectionStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -159,10 +159,10 @@ namespace CSMDoc
CollectionReferencesStage (Document& document, SavingState& state); CollectionReferencesStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -175,10 +175,10 @@ namespace CSMDoc
WriteCellCollectionStage (Document& document, SavingState& state); WriteCellCollectionStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -192,10 +192,10 @@ namespace CSMDoc
WritePathgridCollectionStage (Document& document, SavingState& state); WritePathgridCollectionStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -209,10 +209,10 @@ namespace CSMDoc
WriteLandCollectionStage (Document& document, SavingState& state); WriteLandCollectionStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -226,10 +226,10 @@ namespace CSMDoc
WriteLandTextureCollectionStage (Document& document, SavingState& state); WriteLandTextureCollectionStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -241,10 +241,10 @@ namespace CSMDoc
CloseSaveStage (SavingState& state); CloseSaveStage (SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -257,10 +257,10 @@ namespace CSMDoc
FinalSavingStage (Document& document, SavingState& state); FinalSavingStage (Document& document, SavingState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, Messages& messages); void perform (int stage, Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/filter/andnode.hpp
View file

@ -11,8 +11,8 @@ namespace CSMFilter
AndNode (const std::vector<std::shared_ptr<Node> >& nodes); AndNode (const std::vector<std::shared_ptr<Node> >& nodes);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
}; };

6
apps/opencs/model/filter/booleannode.hpp
View file

@ -13,12 +13,12 @@ namespace CSMFilter
BooleanNode (bool true_); BooleanNode (bool true_);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
virtual std::string toString (bool numericColumns) const; std::string toString (bool numericColumns) const override;
///< Return a string that represents this node. ///< Return a string that represents this node.
/// ///
/// \param numericColumns Use numeric IDs instead of string to represent columns. /// \param numericColumns Use numeric IDs instead of string to represent columns.

2
apps/opencs/model/filter/leafnode.hpp
View file

@ -11,7 +11,7 @@ namespace CSMFilter
{ {
public: public:
virtual std::vector<int> getReferencedColumns() const; std::vector<int> getReferencedColumns() const override;
///< Return a list of the IDs of the columns referenced by this node. The column mapping ///< Return a list of the IDs of the columns referenced by this node. The column mapping
/// passed into test as columns must contain all columns listed here. /// passed into test as columns must contain all columns listed here.
}; };

4
apps/opencs/model/filter/narynode.hpp
View file

@ -21,11 +21,11 @@ namespace CSMFilter
const Node& operator[] (int index) const; const Node& operator[] (int index) const;
virtual std::vector<int> getReferencedColumns() const; std::vector<int> getReferencedColumns() const override;
///< Return a list of the IDs of the columns referenced by this node. The column mapping ///< Return a list of the IDs of the columns referenced by this node. The column mapping
/// passed into test as columns must contain all columns listed here. /// passed into test as columns must contain all columns listed here.
virtual std::string toString (bool numericColumns) const; std::string toString (bool numericColumns) const override;
///< Return a string that represents this node. ///< Return a string that represents this node.
/// ///
/// \param numericColumns Use numeric IDs instead of string to represent columns. /// \param numericColumns Use numeric IDs instead of string to represent columns.

4
apps/opencs/model/filter/notnode.hpp
View file

@ -11,8 +11,8 @@ namespace CSMFilter
NotNode (std::shared_ptr<Node> child); NotNode (std::shared_ptr<Node> child);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
}; };

4
apps/opencs/model/filter/ornode.hpp
View file

@ -11,8 +11,8 @@ namespace CSMFilter
OrNode (const std::vector<std::shared_ptr<Node> >& nodes); OrNode (const std::vector<std::shared_ptr<Node> >& nodes);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
}; };

8
apps/opencs/model/filter/textnode.hpp
View file

@ -14,16 +14,16 @@ namespace CSMFilter
TextNode (int columnId, const std::string& text); TextNode (int columnId, const std::string& text);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
virtual std::vector<int> getReferencedColumns() const; std::vector<int> getReferencedColumns() const override;
///< Return a list of the IDs of the columns referenced by this node. The column mapping ///< Return a list of the IDs of the columns referenced by this node. The column mapping
/// passed into test as columns must contain all columns listed here. /// passed into test as columns must contain all columns listed here.
virtual std::string toString (bool numericColumns) const; std::string toString (bool numericColumns) const override;
///< Return a string that represents this node. ///< Return a string that represents this node.
/// ///
/// \param numericColumns Use numeric IDs instead of string to represent columns. /// \param numericColumns Use numeric IDs instead of string to represent columns.

4
apps/opencs/model/filter/unarynode.hpp
View file

@ -18,11 +18,11 @@ namespace CSMFilter
Node& getChild(); Node& getChild();
virtual std::vector<int> getReferencedColumns() const; std::vector<int> getReferencedColumns() const override;
///< Return a list of the IDs of the columns referenced by this node. The column mapping ///< Return a list of the IDs of the columns referenced by this node. The column mapping
/// passed into test as columns must contain all columns listed here. /// passed into test as columns must contain all columns listed here.
virtual std::string toString (bool numericColumns) const; std::string toString (bool numericColumns) const override;
///< Return a string that represents this node. ///< Return a string that represents this node.
/// ///
/// \param numericColumns Use numeric IDs instead of string to represent columns. /// \param numericColumns Use numeric IDs instead of string to represent columns.

8
apps/opencs/model/filter/valuenode.hpp
View file

@ -27,16 +27,16 @@ namespace CSMFilter
ValueNode (int columnId, Type lowerType, Type upperType, double lower, double upper); ValueNode (int columnId, Type lowerType, Type upperType, double lower, double upper);
virtual bool test (const CSMWorld::IdTableBase& table, int row, bool test (const CSMWorld::IdTableBase& table, int row,
const std::map<int, int>& columns) const; const std::map<int, int>& columns) const override;
///< \return Can the specified table row pass through to filter? ///< \return Can the specified table row pass through to filter?
/// \param columns column ID to column index mapping /// \param columns column ID to column index mapping
virtual std::vector<int> getReferencedColumns() const; std::vector<int> getReferencedColumns() const override;
///< Return a list of the IDs of the columns referenced by this node. The column mapping ///< Return a list of the IDs of the columns referenced by this node. The column mapping
/// passed into test as columns must contain all columns listed here. /// passed into test as columns must contain all columns listed here.
virtual std::string toString (bool numericColumns) const; std::string toString (bool numericColumns) const override;
///< Return a string that represents this node. ///< Return a string that represents this node.
/// ///
/// \param numericColumns Use numeric IDs instead of string to represent columns. /// \param numericColumns Use numeric IDs instead of string to represent columns.

4
apps/opencs/model/prefs/boolsetting.hpp
View file

@ -23,9 +23,9 @@ namespace CSMPrefs
BoolSetting& setTooltip (const std::string& tooltip); BoolSetting& setTooltip (const std::string& tooltip);
/// Return label, input widget. /// Return label, input widget.
virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent); std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
virtual void updateWidget(); void updateWidget() override;
private slots: private slots:

4
apps/opencs/model/prefs/coloursetting.hpp
View file

@ -29,9 +29,9 @@ namespace CSMPrefs
ColourSetting& setTooltip (const std::string& tooltip); ColourSetting& setTooltip (const std::string& tooltip);
/// Return label, input widget. /// Return label, input widget.
virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent); std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
virtual void updateWidget(); void updateWidget() override;
private slots: private slots:

4
apps/opencs/model/prefs/doublesetting.hpp
View file

@ -36,9 +36,9 @@ namespace CSMPrefs
DoubleSetting& setTooltip (const std::string& tooltip); DoubleSetting& setTooltip (const std::string& tooltip);
/// Return label, input widget. /// Return label, input widget.
virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent); std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
virtual void updateWidget(); void updateWidget() override;
private slots: private slots:

4
apps/opencs/model/prefs/enumsetting.hpp
View file

@ -54,9 +54,9 @@ namespace CSMPrefs
EnumSetting& addValue (const std::string& value, const std::string& tooltip); EnumSetting& addValue (const std::string& value, const std::string& tooltip);
/// Return label, input widget. /// Return label, input widget.
virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent); std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
virtual void updateWidget(); void updateWidget() override;
private slots: private slots:

4
apps/opencs/model/prefs/intsetting.hpp
View file

@ -32,9 +32,9 @@ namespace CSMPrefs
IntSetting& setTooltip (const std::string& tooltip); IntSetting& setTooltip (const std::string& tooltip);
/// Return label, input widget. /// Return label, input widget.
virtual std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent); std::pair<QWidget *, QWidget *> makeWidgets (QWidget *parent) override;
virtual void updateWidget(); void updateWidget() override;
private slots: private slots:

6
apps/opencs/model/prefs/modifiersetting.hpp
View file

@ -19,13 +19,13 @@ namespace CSMPrefs
ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key, ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
const std::string& label); const std::string& label);
virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent); std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
virtual void updateWidget(); void updateWidget() override;
protected: protected:
bool eventFilter(QObject* target, QEvent* event); bool eventFilter(QObject* target, QEvent* event) override;
private: private:

2
apps/opencs/model/prefs/shortcuteventhandler.hpp
View file

@ -27,7 +27,7 @@ namespace CSMPrefs
protected: protected:
bool eventFilter(QObject* watched, QEvent* event); bool eventFilter(QObject* watched, QEvent* event) override;
private: private:

6
apps/opencs/model/prefs/shortcutsetting.hpp
View file

@ -19,13 +19,13 @@ namespace CSMPrefs
ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key, ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
const std::string& label); const std::string& label);
virtual std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent); std::pair<QWidget*, QWidget*> makeWidgets(QWidget* parent) override;
virtual void updateWidget(); void updateWidget() override;
protected: protected:
bool eventFilter(QObject* target, QEvent* event); bool eventFilter(QObject* target, QEvent* event) override;
private: private:

4
apps/opencs/model/tools/birthsigncheck.hpp
View file

@ -22,10 +22,10 @@ namespace CSMTools
BirthsignCheckStage (const CSMWorld::IdCollection<ESM::BirthSign> &birthsigns, BirthsignCheckStage (const CSMWorld::IdCollection<ESM::BirthSign> &birthsigns,
const CSMWorld::Resources &textures); const CSMWorld::Resources &textures);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/bodypartcheck.hpp
View file

@ -25,10 +25,10 @@ namespace CSMTools
const CSMWorld::Resources &meshes, const CSMWorld::Resources &meshes,
const CSMWorld::IdCollection<ESM::Race> &races ); const CSMWorld::IdCollection<ESM::Race> &races );
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform( int stage, CSMDoc::Messages &messages ); void perform(int stage, CSMDoc::Messages &messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/classcheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes); ClassCheckStage (const CSMWorld::IdCollection<ESM::Class>& classes);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/enchantmentcheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
EnchantmentCheckStage (const CSMWorld::IdCollection<ESM::Enchantment>& enchantments); EnchantmentCheckStage (const CSMWorld::IdCollection<ESM::Enchantment>& enchantments);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };

4
apps/opencs/model/tools/factioncheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions); FactionCheckStage (const CSMWorld::IdCollection<ESM::Faction>& factions);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/gmstcheck.hpp
View file

@ -16,10 +16,10 @@ namespace CSMTools
GmstCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings); GmstCheckStage(const CSMWorld::IdCollection<ESM::GameSetting>& gameSettings);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform(int stage, CSMDoc::Messages& messages); void perform(int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages ///< Messages resulting from this stage will be appended to \a messages
private: private:

4
apps/opencs/model/tools/journalcheck.hpp
View file

@ -18,10 +18,10 @@ namespace CSMTools
JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue>& journals, JournalCheckStage(const CSMWorld::IdCollection<ESM::Dialogue>& journals,
const CSMWorld::InfoCollection& journalInfos); const CSMWorld::InfoCollection& journalInfos);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform(int stage, CSMDoc::Messages& messages); void perform(int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages ///< Messages resulting from this stage will be appended to \a messages
private: private:

4
apps/opencs/model/tools/magiceffectcheck.hpp
View file

@ -32,9 +32,9 @@ namespace CSMTools
const CSMWorld::Resources &icons, const CSMWorld::Resources &icons,
const CSMWorld::Resources &textures); const CSMWorld::Resources &textures);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages &messages); void perform (int stage, CSMDoc::Messages &messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/mandatoryid.hpp
View file

@ -27,10 +27,10 @@ namespace CSMTools
MandatoryIdStage (const CSMWorld::CollectionBase& idCollection, const CSMWorld::UniversalId& collectionId, MandatoryIdStage (const CSMWorld::CollectionBase& idCollection, const CSMWorld::UniversalId& collectionId,
const std::vector<std::string>& ids); const std::vector<std::string>& ids);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

2
apps/opencs/model/tools/mergeoperation.hpp
View file

@ -31,7 +31,7 @@ namespace CSMTools
protected slots: protected slots:
virtual void operationDone(); void operationDone() override;
signals: signals:

36
apps/opencs/model/tools/mergestages.hpp
View file

@ -22,10 +22,10 @@ namespace CSMTools
StartMergeStage (MergeState& state); StartMergeStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -38,10 +38,10 @@ namespace CSMTools
FinishMergedDocumentStage (MergeState& state, ToUTF8::FromType encoding); FinishMergedDocumentStage (MergeState& state, ToUTF8::FromType encoding);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -55,10 +55,10 @@ namespace CSMTools
MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)()); MergeIdCollectionStage (MergeState& state, Collection& (CSMWorld::Data::*accessor)());
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -93,10 +93,10 @@ namespace CSMTools
MergeRefIdsStage (MergeState& state); MergeRefIdsStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -109,10 +109,10 @@ namespace CSMTools
MergeReferencesStage (MergeState& state); MergeReferencesStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -125,10 +125,10 @@ namespace CSMTools
PopulateLandTexturesMergeStage (MergeState& state); PopulateLandTexturesMergeStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -140,10 +140,10 @@ namespace CSMTools
MergeLandStage (MergeState& state); MergeLandStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -157,10 +157,10 @@ namespace CSMTools
FixLandsAndLandTexturesMergeStage (MergeState& state); FixLandsAndLandTexturesMergeStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
@ -174,10 +174,10 @@ namespace CSMTools
CleanupLandTexturesMergeStage (MergeState& state); CleanupLandTexturesMergeStage (MergeState& state);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/pathgridcheck.hpp
View file

@ -32,9 +32,9 @@ namespace CSMTools
PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid, PathgridCheckStage (const CSMWorld::SubCellCollection<CSMWorld::Pathgrid,
CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& pathgrids); CSMWorld::IdAccessor<CSMWorld::Pathgrid> >& pathgrids);
virtual int setup(); int setup() override;
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
}; };
} }

4
apps/opencs/model/tools/racecheck.hpp
View file

@ -24,10 +24,10 @@ namespace CSMTools
RaceCheckStage (const CSMWorld::IdCollection<ESM::Race>& races); RaceCheckStage (const CSMWorld::IdCollection<ESM::Race>& races);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/referenceablecheck.hpp
View file

@ -22,8 +22,8 @@ namespace CSMTools
const CSMWorld::Resources& icons, const CSMWorld::Resources& icons,
const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts); const CSMWorld::IdCollection<ESM::BodyPart>& bodyparts);
virtual void perform(int stage, CSMDoc::Messages& messages); void perform(int stage, CSMDoc::Messages& messages) override;
virtual int setup(); int setup() override;
private: private:
//CONCRETE CHECKS //CONCRETE CHECKS

4
apps/opencs/model/tools/referencecheck.hpp
View file

@ -14,8 +14,8 @@ namespace CSMTools
const CSMWorld::IdCollection<CSMWorld::Cell>& cells, const CSMWorld::IdCollection<CSMWorld::Cell>& cells,
const CSMWorld::IdCollection<ESM::Faction>& factions); const CSMWorld::IdCollection<ESM::Faction>& factions);
virtual void perform(int stage, CSMDoc::Messages& messages); void perform(int stage, CSMDoc::Messages& messages) override;
virtual int setup(); int setup() override;
private: private:
const CSMWorld::RefCollection& mReferences; const CSMWorld::RefCollection& mReferences;

4
apps/opencs/model/tools/regioncheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
RegionCheckStage (const CSMWorld::IdCollection<ESM::Region>& regions); RegionCheckStage (const CSMWorld::IdCollection<ESM::Region>& regions);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

10
apps/opencs/model/tools/reportmodel.hpp
View file

@ -33,15 +33,15 @@ namespace CSMTools
ReportModel (bool fieldColumn = false, bool severityColumn = true); ReportModel (bool fieldColumn = false, bool severityColumn = true);
virtual int rowCount (const QModelIndex & parent = QModelIndex()) const; int rowCount (const QModelIndex & parent = QModelIndex()) const override;
virtual int columnCount (const QModelIndex & parent = QModelIndex()) const; int columnCount (const QModelIndex & parent = QModelIndex()) const override;
virtual QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()); bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
void add (const CSMDoc::Message& message); void add (const CSMDoc::Message& message);

8
apps/opencs/model/tools/scriptcheck.hpp
View file

@ -36,20 +36,20 @@ namespace CSMTools
CSMDoc::Message::Severity getSeverity (Type type); CSMDoc::Message::Severity getSeverity (Type type);
virtual void report (const std::string& message, const Compiler::TokenLoc& loc, Type type); void report (const std::string& message, const Compiler::TokenLoc& loc, Type type) override;
///< Report error to the user. ///< Report error to the user.
virtual void report (const std::string& message, Type type); void report (const std::string& message, Type type) override;
///< Report a file related error ///< Report a file related error
public: public:
ScriptCheckStage (const CSMDoc::Document& document); ScriptCheckStage (const CSMDoc::Document& document);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/searchstage.hpp
View file

@ -24,10 +24,10 @@ namespace CSMTools
SearchStage (const CSMWorld::IdTableBase *model); SearchStage (const CSMWorld::IdTableBase *model);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
void setOperation (const SearchOperation *operation); void setOperation (const SearchOperation *operation);

4
apps/opencs/model/tools/skillcheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
SkillCheckStage (const CSMWorld::IdCollection<ESM::Skill>& skills); SkillCheckStage (const CSMWorld::IdCollection<ESM::Skill>& skills);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/soundcheck.hpp
View file

@ -22,10 +22,10 @@ namespace CSMTools
SoundCheckStage (const CSMWorld::IdCollection<ESM::Sound>& sounds, SoundCheckStage (const CSMWorld::IdCollection<ESM::Sound>& sounds,
const CSMWorld::Resources &soundfiles); const CSMWorld::Resources &soundfiles);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/soundgencheck.hpp
View file

@ -20,10 +20,10 @@ namespace CSMTools
const CSMWorld::IdCollection<ESM::Sound> &sounds, const CSMWorld::IdCollection<ESM::Sound> &sounds,
const CSMWorld::RefIdCollection &objects); const CSMWorld::RefIdCollection &objects);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform(int stage, CSMDoc::Messages &messages); void perform(int stage, CSMDoc::Messages &messages) override;
///< Messages resulting from this stage will be appended to \a messages. ///< Messages resulting from this stage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/spellcheck.hpp
View file

@ -19,10 +19,10 @@ namespace CSMTools
SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells); SpellCheckStage (const CSMWorld::IdCollection<ESM::Spell>& spells);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform (int stage, CSMDoc::Messages& messages); void perform (int stage, CSMDoc::Messages& messages) override;
///< Messages resulting from this tage will be appended to \a messages. ///< Messages resulting from this tage will be appended to \a messages.
}; };
} }

4
apps/opencs/model/tools/startscriptcheck.hpp
View file

@ -21,8 +21,8 @@ namespace CSMTools
StartScriptCheckStage (const CSMWorld::IdCollection<ESM::StartScript>& startScripts, StartScriptCheckStage (const CSMWorld::IdCollection<ESM::StartScript>& startScripts,
const CSMWorld::IdCollection<ESM::Script>& scripts); const CSMWorld::IdCollection<ESM::Script>& scripts);
virtual void perform(int stage, CSMDoc::Messages& messages); void perform(int stage, CSMDoc::Messages& messages) override;
virtual int setup(); int setup() override;
}; };
} }

4
apps/opencs/model/tools/topicinfocheck.hpp
View file

@ -40,10 +40,10 @@ namespace CSMTools
const CSMWorld::RefIdData& referencables, const CSMWorld::RefIdData& referencables,
const CSMWorld::Resources& soundFiles); const CSMWorld::Resources& soundFiles);
virtual int setup(); int setup() override;
///< \return number of steps ///< \return number of steps
virtual void perform(int step, CSMDoc::Messages& messages); void perform(int step, CSMDoc::Messages& messages) override;
///< Messages resulting from this stage will be appended to \a messages ///< Messages resulting from this stage will be appended to \a messages
private: private:

46
apps/opencs/model/world/collection.hpp
View file

@ -120,19 +120,19 @@ namespace CSMWorld
void add (const ESXRecordT& record); void add (const ESXRecordT& record);
///< Add a new record (modified) ///< Add a new record (modified)
virtual int getSize() const; int getSize() const override;
virtual std::string getId (int index) const; std::string getId (int index) const override;
virtual int getIndex (const std::string& id) const; int getIndex (const std::string& id) const override;
virtual int getColumns() const; int getColumns() const override;
virtual QVariant getData (int index, int column) const; QVariant getData (int index, int column) const override;
virtual void setData (int index, int column, const QVariant& data); void setData (int index, int column, const QVariant& data) override;
virtual const ColumnBase& getColumn (int column) const; const ColumnBase& getColumn (int column) const override;
virtual void merge(); virtual void merge();
///< Merge modified into base. ///< Merge modified into base.
@ -140,43 +140,43 @@ namespace CSMWorld
virtual void purge(); virtual void purge();
///< Remove records that are flagged as erased. ///< Remove records that are flagged as erased.
virtual void removeRows (int index, int count) ; void removeRows (int index, int count) override;
virtual void appendBlankRecord (const std::string& id, void appendBlankRecord (const std::string& id,
UniversalId::Type type = UniversalId::Type_None); UniversalId::Type type = UniversalId::Type_None) override;
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual void cloneRecord(const std::string& origin, void cloneRecord(const std::string& origin,
const std::string& destination, const std::string& destination,
const UniversalId::Type type); const UniversalId::Type type) override;
virtual bool touchRecord(const std::string& id); bool touchRecord(const std::string& id) override;
///< Change the state of a record from base to modified, if it is not already. ///< Change the state of a record from base to modified, if it is not already.
/// \return True if the record was changed. /// \return True if the record was changed.
virtual int searchId (const std::string& id) const; int searchId (const std::string& id) const override;
////< Search record with \a id. ////< Search record with \a id.
/// \return index of record (if found) or -1 (not found) /// \return index of record (if found) or -1 (not found)
virtual void replace (int index, const RecordBase& record); void replace (int index, const RecordBase& record) override;
///< If the record type does not match, an exception is thrown. ///< If the record type does not match, an exception is thrown.
/// ///
/// \attention \a record must not change the ID. /// \attention \a record must not change the ID.
virtual void appendRecord (const RecordBase& record, void appendRecord (const RecordBase& record,
UniversalId::Type type = UniversalId::Type_None); UniversalId::Type type = UniversalId::Type_None) override;
///< If the record type does not match, an exception is thrown. ///< If the record type does not match, an exception is thrown.
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual const Record<ESXRecordT>& getRecord (const std::string& id) const; const Record<ESXRecordT>& getRecord (const std::string& id) const override;
virtual const Record<ESXRecordT>& getRecord (int index) const; const Record<ESXRecordT>& getRecord (int index) const override;
virtual int getAppendIndex (const std::string& id, int getAppendIndex (const std::string& id,
UniversalId::Type type = UniversalId::Type_None) const; UniversalId::Type type = UniversalId::Type_None) const override;
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual std::vector<std::string> getIds (bool listDeleted = true) const; std::vector<std::string> getIds (bool listDeleted = true) const override;
///< Return a sorted collection of all IDs ///< Return a sorted collection of all IDs
/// ///
/// \param listDeleted include deleted record in the list /// \param listDeleted include deleted record in the list
@ -190,7 +190,7 @@ namespace CSMWorld
/// If the index is invalid either generally (by being out of range) or for the particular /// If the index is invalid either generally (by being out of range) or for the particular
/// record, an exception is thrown. /// record, an exception is thrown.
virtual bool reorderRows (int baseIndex, const std::vector<int>& newOrder); bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
/// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex). /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
/// ///

8
apps/opencs/model/world/columnbase.hpp
View file

@ -211,13 +211,13 @@ namespace CSMWorld
: Column<ESXRecordT> (id, ColumnBase::Display_NestedHeader, flags), mFixedRows(fixedRows) : Column<ESXRecordT> (id, ColumnBase::Display_NestedHeader, flags), mFixedRows(fixedRows)
{} {}
virtual void set (Record<ESXRecordT>& record, const QVariant& data) void set (Record<ESXRecordT>& record, const QVariant& data) override
{ {
// There is nothing to do here. // There is nothing to do here.
// This prevents exceptions from parent's implementation // This prevents exceptions from parent's implementation
} }
virtual QVariant get (const Record<ESXRecordT>& record) const QVariant get (const Record<ESXRecordT>& record) const override
{ {
// by default editable; also see IdTree::hasChildren() // by default editable; also see IdTree::hasChildren()
if (mFixedRows) if (mFixedRows)
@ -226,7 +226,7 @@ namespace CSMWorld
return QVariant::fromValue(ColumnBase::TableEdit_Full); return QVariant::fromValue(ColumnBase::TableEdit_Full);
} }
virtual bool isEditable() const bool isEditable() const override
{ {
return true; return true;
} }
@ -240,7 +240,7 @@ namespace CSMWorld
NestedChildColumn (int id, NestedChildColumn (int id,
Display display, int flags = ColumnBase::Flag_Dialogue, bool isEditable = true); Display display, int flags = ColumnBase::Flag_Dialogue, bool isEditable = true);
virtual bool isEditable() const; bool isEditable() const override;
private: private:
bool mIsEditable; bool mIsEditable;

508
apps/opencs/model/world/columnimp.hpp
View file

File diff suppressed because it is too large Load diff

38
apps/opencs/model/world/commands.hpp
View file

@ -142,9 +142,9 @@ namespace CSMWorld
ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_, ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
QUndoCommand *parent = 0); QUndoCommand *parent = 0);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class CreateCommand : public QUndoCommand class CreateCommand : public QUndoCommand
@ -175,9 +175,9 @@ namespace CSMWorld
void addNestedValue(int parentColumn, int nestedColumn, const QVariant &value); void addNestedValue(int parentColumn, int nestedColumn, const QVariant &value);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class CloneCommand : public CreateCommand class CloneCommand : public CreateCommand
@ -191,9 +191,9 @@ namespace CSMWorld
const UniversalId::Type type, const UniversalId::Type type,
QUndoCommand* parent = 0); QUndoCommand* parent = 0);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class RevertCommand : public QUndoCommand class RevertCommand : public QUndoCommand
@ -212,9 +212,9 @@ namespace CSMWorld
virtual ~RevertCommand(); virtual ~RevertCommand();
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class DeleteCommand : public QUndoCommand class DeleteCommand : public QUndoCommand
@ -235,9 +235,9 @@ namespace CSMWorld
virtual ~DeleteCommand(); virtual ~DeleteCommand();
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class ReorderRowsCommand : public QUndoCommand class ReorderRowsCommand : public QUndoCommand
@ -250,9 +250,9 @@ namespace CSMWorld
ReorderRowsCommand (IdTable& model, int baseIndex, const std::vector<int>& newOrder); ReorderRowsCommand (IdTable& model, int baseIndex, const std::vector<int>& newOrder);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class CreatePathgridCommand : public CreateCommand class CreatePathgridCommand : public CreateCommand
@ -261,7 +261,7 @@ namespace CSMWorld
CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0); CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
virtual void redo(); void redo() override;
}; };
/// \brief Update cell ID according to x/y-coordinates /// \brief Update cell ID according to x/y-coordinates
@ -281,9 +281,9 @@ namespace CSMWorld
UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = 0); UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = 0);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
@ -318,9 +318,9 @@ namespace CSMWorld
DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0); DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
class AddNestedCommand : public QUndoCommand, private NestedTableStoring class AddNestedCommand : public QUndoCommand, private NestedTableStoring
@ -340,9 +340,9 @@ namespace CSMWorld
AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0); AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
virtual void redo(); void redo() override;
virtual void undo(); void undo() override;
}; };
} }

31
apps/opencs/model/world/idtable.hpp
View file

@ -31,24 +31,23 @@ namespace CSMWorld
virtual ~IdTable(); virtual ~IdTable();
virtual int rowCount (const QModelIndex & parent = QModelIndex()) const; int rowCount (const QModelIndex & parent = QModelIndex()) const override;
virtual int columnCount (const QModelIndex & parent = QModelIndex()) const; int columnCount (const QModelIndex & parent = QModelIndex()) const override;
virtual QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
virtual bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
virtual Qt::ItemFlags flags (const QModelIndex & index) const; Qt::ItemFlags flags (const QModelIndex & index) const override;
virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()); bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
virtual QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
const;
virtual QModelIndex parent (const QModelIndex& index) const; QModelIndex parent (const QModelIndex& index) const override;
void addRecord (const std::string& id, UniversalId::Type type = UniversalId::Type_None); void addRecord (const std::string& id, UniversalId::Type type = UniversalId::Type_None);
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
@ -66,7 +65,7 @@ namespace CSMWorld
std::string getId(int row) const; std::string getId(int row) const;
virtual QModelIndex getModelIndex (const std::string& id, int column) const; QModelIndex getModelIndex (const std::string& id, int column) const override;
void setRecord (const std::string& id, const RecordBase& record, void setRecord (const std::string& id, const RecordBase& record,
UniversalId::Type type = UniversalId::Type_None); UniversalId::Type type = UniversalId::Type_None);
@ -74,10 +73,10 @@ namespace CSMWorld
const RecordBase& getRecord (const std::string& id) const; const RecordBase& getRecord (const std::string& id) const;
virtual int searchColumnIndex (Columns::ColumnId id) const; int searchColumnIndex (Columns::ColumnId id) const override;
///< Return index of column with the given \a id. If no such column exists, -1 is returned. ///< Return index of column with the given \a id. If no such column exists, -1 is returned.
virtual int findColumnIndex (Columns::ColumnId id) const; int findColumnIndex (Columns::ColumnId id) const override;
///< Return index of column with the given \a id. If no such column exists, an exception is ///< Return index of column with the given \a id. If no such column exists, an exception is
/// thrown. /// thrown.
@ -85,14 +84,14 @@ namespace CSMWorld
///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
/// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex). /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
virtual std::pair<UniversalId, std::string> view (int row) const; std::pair<UniversalId, std::string> view (int row) const override;
///< Return the UniversalId and the hint for viewing \a row. If viewing is not ///< Return the UniversalId and the hint for viewing \a row. If viewing is not
/// supported by this table, return (UniversalId::Type_None, ""). /// supported by this table, return (UniversalId::Type_None, "").
/// Is \a id flagged as deleted? /// Is \a id flagged as deleted?
virtual bool isDeleted (const std::string& id) const; bool isDeleted (const std::string& id) const override;
virtual int getColumnId(int column) const; int getColumnId(int column) const override;
protected: protected:

6
apps/opencs/model/world/idtableproxymodel.hpp
View file

@ -39,7 +39,7 @@ namespace CSMWorld
virtual QModelIndex getModelIndex (const std::string& id, int column) const; virtual QModelIndex getModelIndex (const std::string& id, int column) const;
virtual void setSourceModel(QAbstractItemModel *model); void setSourceModel(QAbstractItemModel *model) override;
void setFilter (const std::shared_ptr<CSMFilter::Node>& filter); void setFilter (const std::shared_ptr<CSMFilter::Node>& filter);
@ -47,9 +47,9 @@ namespace CSMWorld
protected: protected:
virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const; bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
virtual bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const; bool filterAcceptsRow (int sourceRow, const QModelIndex& sourceParent) const override;
QString getRecordId(int sourceRow) const; QString getRecordId(int sourceRow) const;

19
apps/opencs/model/world/idtree.hpp
View file

@ -44,22 +44,21 @@ namespace CSMWorld
virtual ~IdTree(); virtual ~IdTree();
virtual int rowCount (const QModelIndex & parent = QModelIndex()) const; int rowCount (const QModelIndex & parent = QModelIndex()) const override;
virtual int columnCount (const QModelIndex & parent = QModelIndex()) const; int columnCount (const QModelIndex & parent = QModelIndex()) const override;
virtual QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
virtual bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
virtual Qt::ItemFlags flags (const QModelIndex & index) const; Qt::ItemFlags flags (const QModelIndex & index) const override;
virtual bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()); bool removeRows (int row, int count, const QModelIndex& parent = QModelIndex()) override;
virtual QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
const;
virtual QModelIndex parent (const QModelIndex& index) const; QModelIndex parent (const QModelIndex& index) const override;
QModelIndex getNestedModelIndex (const std::string& id, int column) const; QModelIndex getNestedModelIndex (const std::string& id, int column) const;
@ -71,7 +70,7 @@ namespace CSMWorld
void addNestedRow (const QModelIndex& parent, int position); void addNestedRow (const QModelIndex& parent, int position);
virtual bool hasChildren (const QModelIndex& index) const; bool hasChildren (const QModelIndex& index) const override;
virtual int searchNestedColumnIndex(int parentColumn, Columns::ColumnId id); virtual int searchNestedColumnIndex(int parentColumn, Columns::ColumnId id);
///< \return the column index or -1 if the requested column wasn't found. ///< \return the column index or -1 if the requested column wasn't found.

6
apps/opencs/model/world/infocollection.hpp
View file

@ -29,11 +29,11 @@ namespace CSMWorld
public: public:
virtual int getAppendIndex (const std::string& id, int getAppendIndex (const std::string& id,
UniversalId::Type type = UniversalId::Type_None) const; UniversalId::Type type = UniversalId::Type_None) const override;
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual bool reorderRows (int baseIndex, const std::vector<int>& newOrder); bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
/// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex). /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
/// ///

10
apps/opencs/model/world/infotableproxymodel.hpp
View file

@ -30,15 +30,15 @@ namespace CSMWorld
public: public:
InfoTableProxyModel(UniversalId::Type type, QObject *parent = 0); InfoTableProxyModel(UniversalId::Type type, QObject *parent = 0);
virtual void setSourceModel(QAbstractItemModel *sourceModel); void setSourceModel(QAbstractItemModel *sourceModel) override;
protected: protected:
virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const; bool lessThan(const QModelIndex &left, const QModelIndex &right) const override;
protected slots: protected slots:
virtual void sourceRowsInserted(const QModelIndex &parent, int start, int end); void sourceRowsInserted(const QModelIndex &parent, int start, int end) override;
virtual void sourceRowsRemoved(const QModelIndex &parent, int start, int end); void sourceRowsRemoved(const QModelIndex &parent, int start, int end) override;
virtual void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) override;
}; };
} }

278
apps/opencs/model/world/nestedcoladapterimp.hpp
View file

@ -30,24 +30,24 @@ namespace CSMWorld
public: public:
PathgridPointListAdapter (); PathgridPointListAdapter ();
virtual void addRow(Record<Pathgrid>& record, int position) const; void addRow(Record<Pathgrid>& record, int position) const override;
virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const; void removeRow(Record<Pathgrid>& record, int rowToRemove) const override;
virtual void setTable(Record<Pathgrid>& record, void setTable(Record<Pathgrid>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const; NestedTableWrapperBase* table(const Record<Pathgrid>& record) const override;
virtual QVariant getData(const Record<Pathgrid>& record, QVariant getData(const Record<Pathgrid>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<Pathgrid>& record, void setData(Record<Pathgrid>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<Pathgrid>& record) const; int getColumnsCount(const Record<Pathgrid>& record) const override;
virtual int getRowsCount(const Record<Pathgrid>& record) const; int getRowsCount(const Record<Pathgrid>& record) const override;
}; };
class PathgridEdgeListAdapter : public NestedColumnAdapter<Pathgrid> class PathgridEdgeListAdapter : public NestedColumnAdapter<Pathgrid>
@ -55,24 +55,24 @@ namespace CSMWorld
public: public:
PathgridEdgeListAdapter (); PathgridEdgeListAdapter ();
virtual void addRow(Record<Pathgrid>& record, int position) const; void addRow(Record<Pathgrid>& record, int position) const override;
virtual void removeRow(Record<Pathgrid>& record, int rowToRemove) const; void removeRow(Record<Pathgrid>& record, int rowToRemove) const override;
virtual void setTable(Record<Pathgrid>& record, void setTable(Record<Pathgrid>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<Pathgrid>& record) const; NestedTableWrapperBase* table(const Record<Pathgrid>& record) const override;
virtual QVariant getData(const Record<Pathgrid>& record, QVariant getData(const Record<Pathgrid>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<Pathgrid>& record, void setData(Record<Pathgrid>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<Pathgrid>& record) const; int getColumnsCount(const Record<Pathgrid>& record) const override;
virtual int getRowsCount(const Record<Pathgrid>& record) const; int getRowsCount(const Record<Pathgrid>& record) const override;
}; };
class FactionReactionsAdapter : public NestedColumnAdapter<ESM::Faction> class FactionReactionsAdapter : public NestedColumnAdapter<ESM::Faction>
@ -80,24 +80,24 @@ namespace CSMWorld
public: public:
FactionReactionsAdapter (); FactionReactionsAdapter ();
virtual void addRow(Record<ESM::Faction>& record, int position) const; void addRow(Record<ESM::Faction>& record, int position) const override;
virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const; void removeRow(Record<ESM::Faction>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Faction>& record, void setTable(Record<ESM::Faction>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const; NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const override;
virtual QVariant getData(const Record<ESM::Faction>& record, QVariant getData(const Record<ESM::Faction>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Faction>& record, void setData(Record<ESM::Faction>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Faction>& record) const; int getColumnsCount(const Record<ESM::Faction>& record) const override;
virtual int getRowsCount(const Record<ESM::Faction>& record) const; int getRowsCount(const Record<ESM::Faction>& record) const override;
}; };
class FactionRanksAdapter : public NestedColumnAdapter<ESM::Faction> class FactionRanksAdapter : public NestedColumnAdapter<ESM::Faction>
@ -105,24 +105,24 @@ namespace CSMWorld
public: public:
FactionRanksAdapter (); FactionRanksAdapter ();
virtual void addRow(Record<ESM::Faction>& record, int position) const; void addRow(Record<ESM::Faction>& record, int position) const override;
virtual void removeRow(Record<ESM::Faction>& record, int rowToRemove) const; void removeRow(Record<ESM::Faction>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Faction>& record, void setTable(Record<ESM::Faction>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const; NestedTableWrapperBase* table(const Record<ESM::Faction>& record) const override;
virtual QVariant getData(const Record<ESM::Faction>& record, QVariant getData(const Record<ESM::Faction>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Faction>& record, void setData(Record<ESM::Faction>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Faction>& record) const; int getColumnsCount(const Record<ESM::Faction>& record) const override;
virtual int getRowsCount(const Record<ESM::Faction>& record) const; int getRowsCount(const Record<ESM::Faction>& record) const override;
}; };
class RegionSoundListAdapter : public NestedColumnAdapter<ESM::Region> class RegionSoundListAdapter : public NestedColumnAdapter<ESM::Region>
@ -130,24 +130,24 @@ namespace CSMWorld
public: public:
RegionSoundListAdapter (); RegionSoundListAdapter ();
virtual void addRow(Record<ESM::Region>& record, int position) const; void addRow(Record<ESM::Region>& record, int position) const override;
virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const; void removeRow(Record<ESM::Region>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Region>& record, void setTable(Record<ESM::Region>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const; NestedTableWrapperBase* table(const Record<ESM::Region>& record) const override;
virtual QVariant getData(const Record<ESM::Region>& record, QVariant getData(const Record<ESM::Region>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Region>& record, void setData(Record<ESM::Region>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Region>& record) const; int getColumnsCount(const Record<ESM::Region>& record) const override;
virtual int getRowsCount(const Record<ESM::Region>& record) const; int getRowsCount(const Record<ESM::Region>& record) const override;
}; };
template<typename ESXRecordT> template<typename ESXRecordT>
@ -156,7 +156,7 @@ namespace CSMWorld
public: public:
SpellListAdapter () {} SpellListAdapter () {}
virtual void addRow(Record<ESXRecordT>& record, int position) const void addRow(Record<ESXRecordT>& record, int position) const override
{ {
ESXRecordT raceOrBthSgn = record.get(); ESXRecordT raceOrBthSgn = record.get();
@ -170,7 +170,7 @@ namespace CSMWorld
record.setModified (raceOrBthSgn); record.setModified (raceOrBthSgn);
} }
virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const void removeRow(Record<ESXRecordT>& record, int rowToRemove) const override
{ {
ESXRecordT raceOrBthSgn = record.get(); ESXRecordT raceOrBthSgn = record.get();
@ -184,7 +184,7 @@ namespace CSMWorld
record.setModified (raceOrBthSgn); record.setModified (raceOrBthSgn);
} }
virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const override
{ {
ESXRecordT raceOrBthSgn = record.get(); ESXRecordT raceOrBthSgn = record.get();
@ -194,13 +194,13 @@ namespace CSMWorld
record.setModified (raceOrBthSgn); record.setModified (raceOrBthSgn);
} }
virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const override
{ {
// deleted by dtor of NestedTableStoring // deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList); return new NestedTableWrapper<std::vector<std::string> >(record.get().mPowers.mList);
} }
virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const override
{ {
ESXRecordT raceOrBthSgn = record.get(); ESXRecordT raceOrBthSgn = record.get();
@ -217,8 +217,8 @@ namespace CSMWorld
} }
} }
virtual void setData(Record<ESXRecordT>& record, const QVariant& value, void setData(Record<ESXRecordT>& record, const QVariant& value,
int subRowIndex, int subColIndex) const int subRowIndex, int subColIndex) const override
{ {
ESXRecordT raceOrBthSgn = record.get(); ESXRecordT raceOrBthSgn = record.get();
@ -239,12 +239,12 @@ namespace CSMWorld
record.setModified (raceOrBthSgn); record.setModified (raceOrBthSgn);
} }
virtual int getColumnsCount(const Record<ESXRecordT>& record) const int getColumnsCount(const Record<ESXRecordT>& record) const override
{ {
return 1; return 1;
} }
virtual int getRowsCount(const Record<ESXRecordT>& record) const int getRowsCount(const Record<ESXRecordT>& record) const override
{ {
return static_cast<int>(record.get().mPowers.mList.size()); return static_cast<int>(record.get().mPowers.mList.size());
} }
@ -256,7 +256,7 @@ namespace CSMWorld
public: public:
EffectsListAdapter () {} EffectsListAdapter () {}
virtual void addRow(Record<ESXRecordT>& record, int position) const void addRow(Record<ESXRecordT>& record, int position) const override
{ {
ESXRecordT magic = record.get(); ESXRecordT magic = record.get();
@ -278,7 +278,7 @@ namespace CSMWorld
record.setModified (magic); record.setModified (magic);
} }
virtual void removeRow(Record<ESXRecordT>& record, int rowToRemove) const void removeRow(Record<ESXRecordT>& record, int rowToRemove) const override
{ {
ESXRecordT magic = record.get(); ESXRecordT magic = record.get();
@ -292,7 +292,7 @@ namespace CSMWorld
record.setModified (magic); record.setModified (magic);
} }
virtual void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const void setTable(Record<ESXRecordT>& record, const NestedTableWrapperBase& nestedTable) const override
{ {
ESXRecordT magic = record.get(); ESXRecordT magic = record.get();
@ -302,13 +302,13 @@ namespace CSMWorld
record.setModified (magic); record.setModified (magic);
} }
virtual NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const NestedTableWrapperBase* table(const Record<ESXRecordT>& record) const override
{ {
// deleted by dtor of NestedTableStoring // deleted by dtor of NestedTableStoring
return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList); return new NestedTableWrapper<std::vector<ESM::ENAMstruct> >(record.get().mEffects.mList);
} }
virtual QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const QVariant getData(const Record<ESXRecordT>& record, int subRowIndex, int subColIndex) const override
{ {
ESXRecordT magic = record.get(); ESXRecordT magic = record.get();
@ -370,8 +370,8 @@ namespace CSMWorld
} }
} }
virtual void setData(Record<ESXRecordT>& record, const QVariant& value, void setData(Record<ESXRecordT>& record, const QVariant& value,
int subRowIndex, int subColIndex) const int subRowIndex, int subColIndex) const override
{ {
ESXRecordT magic = record.get(); ESXRecordT magic = record.get();
@ -415,12 +415,12 @@ namespace CSMWorld
record.setModified (magic); record.setModified (magic);
} }
virtual int getColumnsCount(const Record<ESXRecordT>& record) const int getColumnsCount(const Record<ESXRecordT>& record) const override
{ {
return 8; return 8;
} }
virtual int getRowsCount(const Record<ESXRecordT>& record) const int getRowsCount(const Record<ESXRecordT>& record) const override
{ {
return static_cast<int>(record.get().mEffects.mList.size()); return static_cast<int>(record.get().mEffects.mList.size());
} }
@ -431,24 +431,24 @@ namespace CSMWorld
public: public:
InfoListAdapter (); InfoListAdapter ();
virtual void addRow(Record<Info>& record, int position) const; void addRow(Record<Info>& record, int position) const override;
virtual void removeRow(Record<Info>& record, int rowToRemove) const; void removeRow(Record<Info>& record, int rowToRemove) const override;
virtual void setTable(Record<Info>& record, void setTable(Record<Info>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<Info>& record) const; NestedTableWrapperBase* table(const Record<Info>& record) const override;
virtual QVariant getData(const Record<Info>& record, QVariant getData(const Record<Info>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<Info>& record, void setData(Record<Info>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<Info>& record) const; int getColumnsCount(const Record<Info>& record) const override;
virtual int getRowsCount(const Record<Info>& record) const; int getRowsCount(const Record<Info>& record) const override;
}; };
class InfoConditionAdapter : public NestedColumnAdapter<Info> class InfoConditionAdapter : public NestedColumnAdapter<Info>
@ -456,24 +456,24 @@ namespace CSMWorld
public: public:
InfoConditionAdapter (); InfoConditionAdapter ();
virtual void addRow(Record<Info>& record, int position) const; void addRow(Record<Info>& record, int position) const override;
virtual void removeRow(Record<Info>& record, int rowToRemove) const; void removeRow(Record<Info>& record, int rowToRemove) const override;
virtual void setTable(Record<Info>& record, void setTable(Record<Info>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<Info>& record) const; NestedTableWrapperBase* table(const Record<Info>& record) const override;
virtual QVariant getData(const Record<Info>& record, QVariant getData(const Record<Info>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<Info>& record, void setData(Record<Info>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<Info>& record) const; int getColumnsCount(const Record<Info>& record) const override;
virtual int getRowsCount(const Record<Info>& record) const; int getRowsCount(const Record<Info>& record) const override;
}; };
class RaceAttributeAdapter : public NestedColumnAdapter<ESM::Race> class RaceAttributeAdapter : public NestedColumnAdapter<ESM::Race>
@ -481,24 +481,24 @@ namespace CSMWorld
public: public:
RaceAttributeAdapter (); RaceAttributeAdapter ();
virtual void addRow(Record<ESM::Race>& record, int position) const; void addRow(Record<ESM::Race>& record, int position) const override;
virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const; void removeRow(Record<ESM::Race>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Race>& record, void setTable(Record<ESM::Race>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const; NestedTableWrapperBase* table(const Record<ESM::Race>& record) const override;
virtual QVariant getData(const Record<ESM::Race>& record, QVariant getData(const Record<ESM::Race>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Race>& record, void setData(Record<ESM::Race>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Race>& record) const; int getColumnsCount(const Record<ESM::Race>& record) const override;
virtual int getRowsCount(const Record<ESM::Race>& record) const; int getRowsCount(const Record<ESM::Race>& record) const override;
}; };
class RaceSkillsBonusAdapter : public NestedColumnAdapter<ESM::Race> class RaceSkillsBonusAdapter : public NestedColumnAdapter<ESM::Race>
@ -506,24 +506,24 @@ namespace CSMWorld
public: public:
RaceSkillsBonusAdapter (); RaceSkillsBonusAdapter ();
virtual void addRow(Record<ESM::Race>& record, int position) const; void addRow(Record<ESM::Race>& record, int position) const override;
virtual void removeRow(Record<ESM::Race>& record, int rowToRemove) const; void removeRow(Record<ESM::Race>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Race>& record, void setTable(Record<ESM::Race>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Race>& record) const; NestedTableWrapperBase* table(const Record<ESM::Race>& record) const override;
virtual QVariant getData(const Record<ESM::Race>& record, QVariant getData(const Record<ESM::Race>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Race>& record, void setData(Record<ESM::Race>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Race>& record) const; int getColumnsCount(const Record<ESM::Race>& record) const override;
virtual int getRowsCount(const Record<ESM::Race>& record) const; int getRowsCount(const Record<ESM::Race>& record) const override;
}; };
class CellListAdapter : public NestedColumnAdapter<CSMWorld::Cell> class CellListAdapter : public NestedColumnAdapter<CSMWorld::Cell>
@ -531,24 +531,24 @@ namespace CSMWorld
public: public:
CellListAdapter (); CellListAdapter ();
virtual void addRow(Record<CSMWorld::Cell>& record, int position) const; void addRow(Record<CSMWorld::Cell>& record, int position) const override;
virtual void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const; void removeRow(Record<CSMWorld::Cell>& record, int rowToRemove) const override;
virtual void setTable(Record<CSMWorld::Cell>& record, void setTable(Record<CSMWorld::Cell>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const; NestedTableWrapperBase* table(const Record<CSMWorld::Cell>& record) const override;
virtual QVariant getData(const Record<CSMWorld::Cell>& record, QVariant getData(const Record<CSMWorld::Cell>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<CSMWorld::Cell>& record, void setData(Record<CSMWorld::Cell>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<CSMWorld::Cell>& record) const; int getColumnsCount(const Record<CSMWorld::Cell>& record) const override;
virtual int getRowsCount(const Record<CSMWorld::Cell>& record) const; int getRowsCount(const Record<CSMWorld::Cell>& record) const override;
}; };
class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region> class RegionWeatherAdapter : public NestedColumnAdapter<ESM::Region>
@ -556,24 +556,24 @@ namespace CSMWorld
public: public:
RegionWeatherAdapter (); RegionWeatherAdapter ();
virtual void addRow(Record<ESM::Region>& record, int position) const; void addRow(Record<ESM::Region>& record, int position) const override;
virtual void removeRow(Record<ESM::Region>& record, int rowToRemove) const; void removeRow(Record<ESM::Region>& record, int rowToRemove) const override;
virtual void setTable(Record<ESM::Region>& record, void setTable(Record<ESM::Region>& record,
const NestedTableWrapperBase& nestedTable) const; const NestedTableWrapperBase& nestedTable) const override;
virtual NestedTableWrapperBase* table(const Record<ESM::Region>& record) const; NestedTableWrapperBase* table(const Record<ESM::Region>& record) const override;
virtual QVariant getData(const Record<ESM::Region>& record, QVariant getData(const Record<ESM::Region>& record,
int subRowIndex, int subColIndex) const; int subRowIndex, int subColIndex) const override;
virtual void setData(Record<ESM::Region>& record, void setData(Record<ESM::Region>& record,
const QVariant& value, int subRowIndex, int subColIndex) const; const QVariant& value, int subRowIndex, int subColIndex) const override;
virtual int getColumnsCount(const Record<ESM::Region>& record) const; int getColumnsCount(const Record<ESM::Region>& record) const override;
virtual int getRowsCount(const Record<ESM::Region>& record) const; int getRowsCount(const Record<ESM::Region>& record) const override;
}; };
} }

18
apps/opencs/model/world/nestedidcollection.hpp
View file

@ -32,24 +32,24 @@ namespace CSMWorld
NestedIdCollection (); NestedIdCollection ();
~NestedIdCollection(); ~NestedIdCollection();
virtual void addNestedRow(int row, int column, int position); void addNestedRow(int row, int column, int position) override;
virtual void removeNestedRows(int row, int column, int subRow); void removeNestedRows(int row, int column, int subRow) override;
virtual QVariant getNestedData(int row, int column, int subRow, int subColumn) const; QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
virtual void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn); void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
virtual NestedTableWrapperBase* nestedTable(int row, int column) const; NestedTableWrapperBase* nestedTable(int row, int column) const override;
virtual void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable); void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
virtual int getNestedRowsCount(int row, int column) const; int getNestedRowsCount(int row, int column) const override;
virtual int getNestedColumnsCount(int row, int column) const; int getNestedColumnsCount(int row, int column) const override;
// this method is inherited from NestedCollection, not from Collection<ESXRecordT> // this method is inherited from NestedCollection, not from Collection<ESXRecordT>
virtual NestableColumn *getNestableColumn(int column); NestableColumn *getNestableColumn(int column) override;
void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<ESXRecordT>* > adapter); void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<ESXRecordT>* > adapter);
}; };

18
apps/opencs/model/world/nestedinfocollection.hpp
View file

@ -24,24 +24,24 @@ namespace CSMWorld
NestedInfoCollection (); NestedInfoCollection ();
~NestedInfoCollection(); ~NestedInfoCollection();
virtual void addNestedRow(int row, int column, int position); void addNestedRow(int row, int column, int position) override;
virtual void removeNestedRows(int row, int column, int subRow); void removeNestedRows(int row, int column, int subRow) override;
virtual QVariant getNestedData(int row, int column, int subRow, int subColumn) const; QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
virtual void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn); void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
virtual NestedTableWrapperBase* nestedTable(int row, int column) const; NestedTableWrapperBase* nestedTable(int row, int column) const override;
virtual void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable); void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
virtual int getNestedRowsCount(int row, int column) const; int getNestedRowsCount(int row, int column) const override;
virtual int getNestedColumnsCount(int row, int column) const; int getNestedColumnsCount(int row, int column) const override;
// this method is inherited from NestedCollection, not from Collection<Info, IdAccessor<Info> > // this method is inherited from NestedCollection, not from Collection<Info, IdAccessor<Info> >
virtual NestableColumn *getNestableColumn(int column); NestableColumn *getNestableColumn(int column) override;
void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<Info>* > adapter); void addAdapter(std::pair<const ColumnBase*, NestedColumnAdapter<Info>* > adapter);
}; };

20
apps/opencs/model/world/nestedtableproxymodel.hpp
View file

@ -39,25 +39,25 @@ namespace CSMWorld
CSMWorld::IdTree* model() const; CSMWorld::IdTree* model() const;
virtual QModelIndex mapFromSource(const QModelIndex& sourceIndex) const; QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
virtual QModelIndex mapToSource(const QModelIndex& proxyIndex) const; QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
virtual int rowCount(const QModelIndex& parent) const; int rowCount(const QModelIndex& parent) const override;
virtual int columnCount(const QModelIndex& parent) const; int columnCount(const QModelIndex& parent) const override;
virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
virtual QModelIndex parent(const QModelIndex& index) const; QModelIndex parent(const QModelIndex& index) const override;
virtual QVariant headerData (int section, Qt::Orientation orientation, int role) const; QVariant headerData (int section, Qt::Orientation orientation, int role) const override;
virtual QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const override;
virtual bool setData (const QModelIndex & index, const QVariant & value, int role = Qt::EditRole); bool setData (const QModelIndex & index, const QVariant & value, int role = Qt::EditRole) override;
virtual Qt::ItemFlags flags(const QModelIndex& index) const; Qt::ItemFlags flags(const QModelIndex& index) const override;
private: private:
void setupHeaderVectors(ColumnBase::Display columnId); void setupHeaderVectors(ColumnBase::Display columnId);

2
apps/opencs/model/world/nestedtablewrapper.hpp
View file

@ -22,7 +22,7 @@ namespace CSMWorld
virtual ~NestedTableWrapper() {} virtual ~NestedTableWrapper() {}
virtual int size() const int size() const override
{ {
return mNestedTable.size(); //i hope that this will be enough return mNestedTable.size(); //i hope that this will be enough
} }

6
apps/opencs/model/world/record.hpp
View file

@ -45,11 +45,11 @@ namespace CSMWorld
Record(State state, Record(State state,
const ESXRecordT *base = 0, const ESXRecordT *modified = 0); const ESXRecordT *base = 0, const ESXRecordT *modified = 0);
virtual RecordBase *clone() const; RecordBase *clone() const override;
virtual RecordBase *modifiedCopy() const; RecordBase *modifiedCopy() const override;
virtual void assign (const RecordBase& record); void assign (const RecordBase& record) override;
const ESXRecordT& get() const; const ESXRecordT& get() const;
///< Throws an exception, if the record is deleted. ///< Throws an exception, if the record is deleted.

589
apps/opencs/model/world/refidadapterimp.hpp
View file

File diff suppressed because it is too large Load diff

62
apps/opencs/model/world/refidcollection.hpp
View file

@ -32,9 +32,9 @@ namespace CSMWorld
int flag = Flag_Table | Flag_Dialogue, bool editable = true, int flag = Flag_Table | Flag_Dialogue, bool editable = true,
bool userEditable = true); bool userEditable = true);
virtual bool isEditable() const; bool isEditable() const override;
virtual bool isUserEditable() const; bool isUserEditable() const override;
}; };
class RefIdCollection : public CollectionBase, public NestedCollection class RefIdCollection : public CollectionBase, public NestedCollection
@ -60,82 +60,82 @@ namespace CSMWorld
virtual ~RefIdCollection(); virtual ~RefIdCollection();
virtual int getSize() const; int getSize() const override;
virtual std::string getId (int index) const; std::string getId (int index) const override;
virtual int getIndex (const std::string& id) const; int getIndex (const std::string& id) const override;
virtual int getColumns() const; int getColumns() const override;
virtual const ColumnBase& getColumn (int column) const; const ColumnBase& getColumn (int column) const override;
virtual QVariant getData (int index, int column) const; QVariant getData (int index, int column) const override;
virtual void setData (int index, int column, const QVariant& data); void setData (int index, int column, const QVariant& data) override;
virtual void removeRows (int index, int count); void removeRows (int index, int count) override;
virtual void cloneRecord(const std::string& origin, void cloneRecord(const std::string& origin,
const std::string& destination, const std::string& destination,
const UniversalId::Type type); const UniversalId::Type type) override;
virtual bool touchRecord(const std::string& id); bool touchRecord(const std::string& id) override;
virtual void appendBlankRecord (const std::string& id, UniversalId::Type type); void appendBlankRecord (const std::string& id, UniversalId::Type type) override;
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual int searchId (const std::string& id) const; int searchId (const std::string& id) const override;
////< Search record with \a id. ////< Search record with \a id.
/// \return index of record (if found) or -1 (not found) /// \return index of record (if found) or -1 (not found)
virtual void replace (int index, const RecordBase& record); void replace (int index, const RecordBase& record) override;
///< If the record type does not match, an exception is thrown. ///< If the record type does not match, an exception is thrown.
/// ///
/// \attention \a record must not change the ID. /// \attention \a record must not change the ID.
virtual void appendRecord (const RecordBase& record, UniversalId::Type type); void appendRecord (const RecordBase& record, UniversalId::Type type) override;
///< If the record type does not match, an exception is thrown. ///< If the record type does not match, an exception is thrown.
/// ///
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual const RecordBase& getRecord (const std::string& id) const; const RecordBase& getRecord (const std::string& id) const override;
virtual const RecordBase& getRecord (int index) const; const RecordBase& getRecord (int index) const override;
void load (ESM::ESMReader& reader, bool base, UniversalId::Type type); void load (ESM::ESMReader& reader, bool base, UniversalId::Type type);
virtual int getAppendIndex (const std::string& id, UniversalId::Type type) const; int getAppendIndex (const std::string& id, UniversalId::Type type) const override;
///< \param type Will be ignored, unless the collection supports multiple record types ///< \param type Will be ignored, unless the collection supports multiple record types
virtual std::vector<std::string> getIds (bool listDeleted) const; std::vector<std::string> getIds (bool listDeleted) const override;
///< Return a sorted collection of all IDs ///< Return a sorted collection of all IDs
/// ///
/// \param listDeleted include deleted record in the list /// \param listDeleted include deleted record in the list
virtual bool reorderRows (int baseIndex, const std::vector<int>& newOrder); bool reorderRows (int baseIndex, const std::vector<int>& newOrder) override;
///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices ///< Reorder the rows [baseIndex, baseIndex+newOrder.size()) according to the indices
/// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex). /// given in \a newOrder (baseIndex+newOrder[0] specifies the new index of row baseIndex).
/// ///
/// \return Success? /// \return Success?
virtual QVariant getNestedData(int row, int column, int subRow, int subColumn) const; QVariant getNestedData(int row, int column, int subRow, int subColumn) const override;
virtual NestedTableWrapperBase* nestedTable(int row, int column) const; NestedTableWrapperBase* nestedTable(int row, int column) const override;
virtual void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable); void setNestedTable(int row, int column, const NestedTableWrapperBase& nestedTable) override;
virtual int getNestedRowsCount(int row, int column) const; int getNestedRowsCount(int row, int column) const override;
virtual int getNestedColumnsCount(int row, int column) const; int getNestedColumnsCount(int row, int column) const override;
NestableColumn *getNestableColumn(int column); NestableColumn *getNestableColumn(int column) override;
virtual void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn); void setNestedData(int row, int column, const QVariant& data, int subRow, int subColumn) override;
virtual void removeNestedRows(int row, int column, int subRow); void removeNestedRows(int row, int column, int subRow) override;
virtual void addNestedRow(int row, int col, int position); void addNestedRow(int row, int col, int position) override;
void save (int index, ESM::ESMWriter& writer) const; void save (int index, ESM::ESMWriter& writer) const;

18
apps/opencs/model/world/refiddata.hpp
View file

@ -66,24 +66,24 @@ namespace CSMWorld
{ {
std::vector<Record<RecordT> > mContainer; std::vector<Record<RecordT> > mContainer;
virtual int getSize() const; int getSize() const override;
virtual const RecordBase& getRecord (int index) const; const RecordBase& getRecord (int index) const override;
virtual RecordBase& getRecord (int index); RecordBase& getRecord (int index) override;
virtual void appendRecord (const std::string& id, bool base); void appendRecord (const std::string& id, bool base) override;
virtual void insertRecord (RecordBase& record); void insertRecord (RecordBase& record) override;
virtual int load (ESM::ESMReader& reader, bool base); int load (ESM::ESMReader& reader, bool base) override;
///< \return index of a loaded record or -1 if no record was loaded ///< \return index of a loaded record or -1 if no record was loaded
virtual void erase (int index, int count); void erase (int index, int count) override;
virtual std::string getId (int index) const; std::string getId (int index) const override;
virtual void save (int index, ESM::ESMWriter& writer) const; void save (int index, ESM::ESMWriter& writer) const override;
}; };
template<typename RecordT> template<typename RecordT>

8
apps/opencs/model/world/regionmap.hpp
View file

@ -91,15 +91,15 @@ namespace CSMWorld
RegionMap (Data& data); RegionMap (Data& data);
virtual int rowCount (const QModelIndex& parent = QModelIndex()) const; int rowCount (const QModelIndex& parent = QModelIndex()) const override;
virtual int columnCount (const QModelIndex& parent = QModelIndex()) const; int columnCount (const QModelIndex& parent = QModelIndex()) const override;
virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const; QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) const override;
///< \note Calling this function with role==Role_CellId may return the ID of a cell ///< \note Calling this function with role==Role_CellId may return the ID of a cell
/// that does not exist. /// that does not exist.
virtual Qt::ItemFlags flags (const QModelIndex& index) const; Qt::ItemFlags flags (const QModelIndex& index) const override;
private slots: private slots:

29
apps/opencs/model/world/resourcetable.hpp
View file

@ -18,41 +18,40 @@ namespace CSMWorld
virtual ~ResourceTable(); virtual ~ResourceTable();
virtual int rowCount (const QModelIndex & parent = QModelIndex()) const; int rowCount (const QModelIndex & parent = QModelIndex()) const override;
virtual int columnCount (const QModelIndex & parent = QModelIndex()) const; int columnCount (const QModelIndex & parent = QModelIndex()) const override;
virtual QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const; QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const override;
virtual QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
virtual bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData ( const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
virtual Qt::ItemFlags flags (const QModelIndex & index) const; Qt::ItemFlags flags (const QModelIndex & index) const override;
virtual QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) QModelIndex index (int row, int column, const QModelIndex& parent = QModelIndex()) const override;
const;
virtual QModelIndex parent (const QModelIndex& index) const; QModelIndex parent (const QModelIndex& index) const override;
virtual QModelIndex getModelIndex (const std::string& id, int column) const; QModelIndex getModelIndex (const std::string& id, int column) const override;
/// Return index of column with the given \a id. If no such column exists, -1 is /// Return index of column with the given \a id. If no such column exists, -1 is
/// returned. /// returned.
virtual int searchColumnIndex (Columns::ColumnId id) const; int searchColumnIndex (Columns::ColumnId id) const override;
/// Return index of column with the given \a id. If no such column exists, an /// Return index of column with the given \a id. If no such column exists, an
/// exception is thrown. /// exception is thrown.
virtual int findColumnIndex (Columns::ColumnId id) const; int findColumnIndex (Columns::ColumnId id) const override;
/// Return the UniversalId and the hint for viewing \a row. If viewing is not /// Return the UniversalId and the hint for viewing \a row. If viewing is not
/// supported by this table, return (UniversalId::Type_None, ""). /// supported by this table, return (UniversalId::Type_None, "").
virtual std::pair<UniversalId, std::string> view (int row) const; std::pair<UniversalId, std::string> view (int row) const override;
/// Is \a id flagged as deleted? /// Is \a id flagged as deleted?
virtual bool isDeleted (const std::string& id) const; bool isDeleted (const std::string& id) const override;
virtual int getColumnId (int column) const; int getColumnId (int column) const override;
/// Signal Qt that the data is about to change. /// Signal Qt that the data is about to change.
void beginReset(); void beginReset();

12
apps/opencs/model/world/scriptcontext.hpp
View file

@ -23,23 +23,23 @@ namespace CSMWorld
ScriptContext (const Data& data); ScriptContext (const Data& data);
virtual bool canDeclareLocals() const; bool canDeclareLocals() const override;
///< Is the compiler allowed to declare local variables? ///< Is the compiler allowed to declare local variables?
virtual char getGlobalType (const std::string& name) const; char getGlobalType (const std::string& name) const override;
///< 'l: long, 's': short, 'f': float, ' ': does not exist. ///< 'l: long, 's': short, 'f': float, ' ': does not exist.
virtual std::pair<char, bool> getMemberType (const std::string& name, std::pair<char, bool> getMemberType (const std::string& name,
const std::string& id) const; const std::string& id) const override;
///< Return type of member variable \a name in script \a id or in script of reference of ///< Return type of member variable \a name in script \a id or in script of reference of
/// \a id /// \a id
/// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist. /// \return first: 'l: long, 's': short, 'f': float, ' ': does not exist.
/// second: true: script of reference /// second: true: script of reference
virtual bool isId (const std::string& name) const; bool isId (const std::string& name) const override;
///< Does \a name match an ID, that can be referenced? ///< Does \a name match an ID, that can be referenced?
virtual bool isJournalId (const std::string& name) const; bool isJournalId (const std::string& name) const override;
///< Does \a name match a journal ID? ///< Does \a name match a journal ID?
void invalidateIds(); void invalidateIds();

2
apps/opencs/model/world/subcellcollection.hpp
View file

@ -20,7 +20,7 @@ namespace CSMWorld
{ {
const IdCollection<Cell>& mCells; const IdCollection<Cell>& mCells;
virtual void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted); void loadRecord (ESXRecordT& record, ESM::ESMReader& reader, bool& isDeleted) override;
public: public:

2
apps/opencs/model/world/tablemimedata.hpp
View file

@ -36,7 +36,7 @@ namespace CSMWorld
~TableMimeData(); ~TableMimeData();
virtual QStringList formats() const; QStringList formats() const override;
std::string getIcon() const; std::string getIcon() const;

2
apps/opencs/view/doc/loader.hpp
View file

@ -38,7 +38,7 @@ namespace CSVDoc
private: private:
void closeEvent (QCloseEvent *event); void closeEvent (QCloseEvent *event) override;
public: public:

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

@ -44,7 +44,7 @@ namespace CSVDoc
void create(); void create();
void reject(); void reject() override;
}; };
} }

2
apps/opencs/view/doc/runlogsubview.hpp
View file

@ -13,7 +13,7 @@ namespace CSVDoc
RunLogSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document); RunLogSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
virtual void setEditLock (bool locked); void setEditLock (bool locked) override;
}; };
} }

2
apps/opencs/view/doc/sizehint.hpp
View file

@ -14,7 +14,7 @@ namespace CSVDoc
SizeHintWidget(QWidget *parent = 0); SizeHintWidget(QWidget *parent = 0);
~SizeHintWidget(); ~SizeHintWidget();
virtual QSize sizeHint() const; QSize sizeHint() const override;
void setSizeHint(const QSize &size); void setSizeHint(const QSize &size);
}; };
} }

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

@ -34,7 +34,7 @@ namespace CSVDoc
void setUniversalId(const CSMWorld::UniversalId& id); void setUniversalId(const CSMWorld::UniversalId& id);
bool event (QEvent *event); bool event (QEvent *event) override;
public: public:
@ -54,7 +54,7 @@ namespace CSVDoc
private: private:
void closeEvent (QCloseEvent *event); void closeEvent (QCloseEvent *event) override;
signals: signals:

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

@ -12,7 +12,7 @@ namespace CSVDoc
{ {
public: public:
virtual CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document); CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
}; };
template<class SubViewT> template<class SubViewT>
@ -32,7 +32,7 @@ namespace CSVDoc
SubViewFactoryWithCreator (bool sorting = true); SubViewFactoryWithCreator (bool sorting = true);
virtual CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document); CSVDoc::SubView *makeSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) override;
}; };
template<class SubViewT, class CreatorFactoryT> template<class SubViewT, class CreatorFactoryT>

2
apps/opencs/view/doc/view.hpp
View file

@ -64,7 +64,7 @@ namespace CSVDoc
private: private:
void closeEvent (QCloseEvent *event); void closeEvent (QCloseEvent *event) override;
QAction* createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName); QAction* createMenuEntry(CSMWorld::UniversalId::Type type, QMenu* menu, const char* shortcutName);
QAction* createMenuEntry(const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName); QAction* createMenuEntry(const std::string& title, const std::string& iconName, QMenu* menu, const char* shortcutName);

6
apps/opencs/view/filter/filterbox.hpp
View file

@ -34,11 +34,11 @@ namespace CSVFilter
private: private:
void dragEnterEvent (QDragEnterEvent* event); void dragEnterEvent (QDragEnterEvent* event) override;
void dropEvent (QDropEvent* event); void dropEvent (QDropEvent* event) override;
void dragMoveEvent(QDragMoveEvent *event); void dragMoveEvent(QDragMoveEvent *event) override;
signals: signals:
void recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter); void recordFilterChanged (std::shared_ptr<CSMFilter::Node> filter);

4
apps/opencs/view/prefs/contextmenulist.hpp
View file

@ -18,9 +18,9 @@ namespace CSVPrefs
protected: protected:
void contextMenuEvent(QContextMenuEvent* e); void contextMenuEvent(QContextMenuEvent* e) override;
void mousePressEvent(QMouseEvent* e); void mousePressEvent(QMouseEvent* e) override;
private slots: private slots:

2
apps/opencs/view/prefs/dialogue.hpp
View file

@ -34,7 +34,7 @@ namespace CSVPrefs
protected: protected:
void closeEvent (QCloseEvent *event); void closeEvent (QCloseEvent *event) override;
public slots: public slots:

2
apps/opencs/view/prefs/pagebase.hpp
View file

@ -26,7 +26,7 @@ namespace CSVPrefs
protected: protected:
void contextMenuEvent(QContextMenuEvent*); void contextMenuEvent(QContextMenuEvent*) override;
private slots: private slots:

12
apps/opencs/view/render/cameracontroller.hpp
View file

@ -96,10 +96,10 @@ namespace CSVRender
void fixUpAxis(const osg::Vec3d& up); void fixUpAxis(const osg::Vec3d& up);
void unfixUpAxis(); void unfixUpAxis();
void handleMouseMoveEvent(int x, int y); void handleMouseMoveEvent(int x, int y) override;
void handleMouseScrollEvent(int x); void handleMouseScrollEvent(int x) override;
void update(double dt); void update(double dt) override;
private: private:
@ -152,10 +152,10 @@ namespace CSVRender
void setOrbitSpeedMultiplier(double value); void setOrbitSpeedMultiplier(double value);
void setPickingMask(unsigned int value); void setPickingMask(unsigned int value);
void handleMouseMoveEvent(int x, int y); void handleMouseMoveEvent(int x, int y) override;
void handleMouseScrollEvent(int x); void handleMouseScrollEvent(int x) override;
void update(double dt); void update(double dt) override;
/// \brief Flag controller to be re-initialized. /// \brief Flag controller to be re-initialized.
void reset(); void reset();

2
apps/opencs/view/render/cell.cpp
View file

@ -45,7 +45,7 @@ namespace CSVRender
{ {
public: public:
virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) void operator()(osg::Node* node, osg::NodeVisitor* nv) override
{ {
traverse(node, nv); traverse(node, nv);
CellNodeContainer* container = static_cast<CellNodeContainer*>(node->getUserData()); CellNodeContainer* container = static_cast<CellNodeContainer*>(node->getUserData());

2
apps/opencs/view/render/cellarrow.hpp
View file

@ -27,7 +27,7 @@ namespace CSVRender
CellArrow *getCellArrow() const; CellArrow *getCellArrow() const;
virtual QString getToolTip (bool hideBasics) const; QString getToolTip (bool hideBasics) const override;
}; };

10
apps/opencs/view/render/editmode.hpp
View file

@ -34,7 +34,7 @@ namespace CSVRender
unsigned int getInteractionMask() const; unsigned int getInteractionMask() const;
virtual void activate (CSVWidget::SceneToolbar *toolbar); void activate (CSVWidget::SceneToolbar *toolbar) override;
/// Default-implementation: Ignored. /// Default-implementation: Ignored.
virtual void setEditLock (bool locked); virtual void setEditLock (bool locked);
@ -90,15 +90,15 @@ namespace CSVRender
virtual void dragWheel (int diff, double speedFactor); virtual void dragWheel (int diff, double speedFactor);
/// Default-implementation: ignored /// Default-implementation: ignored
virtual void dragEnterEvent (QDragEnterEvent *event); void dragEnterEvent (QDragEnterEvent *event) override;
/// Default-implementation: ignored /// Default-implementation: ignored
virtual void dropEvent (QDropEvent *event); void dropEvent (QDropEvent *event) override;
/// Default-implementation: ignored /// Default-implementation: ignored
virtual void dragMoveEvent (QDragMoveEvent *event); void dragMoveEvent (QDragMoveEvent *event) override;
virtual void mouseMoveEvent (QMouseEvent *event); void mouseMoveEvent (QMouseEvent *event) override;
/// Default: return -1 /// Default: return -1
virtual int getSubMode() const; virtual int getSubMode() const;

34
apps/opencs/view/render/instancemode.hpp
View file

@ -64,41 +64,41 @@ namespace CSVRender
InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = 0); InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = 0);
virtual void activate (CSVWidget::SceneToolbar *toolbar); void activate (CSVWidget::SceneToolbar *toolbar) override;
virtual void deactivate (CSVWidget::SceneToolbar *toolbar); void deactivate (CSVWidget::SceneToolbar *toolbar) override;
virtual void setEditLock (bool locked); void setEditLock (bool locked) override;
virtual void primaryOpenPressed (const WorldspaceHitResult& hit); void primaryOpenPressed (const WorldspaceHitResult& hit) override;
virtual void primaryEditPressed (const WorldspaceHitResult& hit); void primaryEditPressed (const WorldspaceHitResult& hit) override;
virtual void secondaryEditPressed (const WorldspaceHitResult& hit); void secondaryEditPressed (const WorldspaceHitResult& hit) override;
virtual void primarySelectPressed (const WorldspaceHitResult& hit); void primarySelectPressed (const WorldspaceHitResult& hit) override;
virtual void secondarySelectPressed (const WorldspaceHitResult& hit); void secondarySelectPressed (const WorldspaceHitResult& hit) override;
virtual bool primaryEditStartDrag (const QPoint& pos); bool primaryEditStartDrag (const QPoint& pos) override;
virtual bool secondaryEditStartDrag (const QPoint& pos); bool secondaryEditStartDrag (const QPoint& pos) override;
virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor); void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
virtual void dragCompleted(const QPoint& pos); void dragCompleted(const QPoint& pos) override;
/// \note dragAborted will not be called, if the drag is aborted via changing /// \note dragAborted will not be called, if the drag is aborted via changing
/// editing mode /// editing mode
virtual void dragAborted(); void dragAborted() override;
virtual void dragWheel (int diff, double speedFactor); void dragWheel (int diff, double speedFactor) override;
virtual void dragEnterEvent (QDragEnterEvent *event); void dragEnterEvent (QDragEnterEvent *event) override;
virtual void dropEvent (QDropEvent *event); void dropEvent (QDropEvent *event) override;
virtual int getSubMode() const; int getSubMode() const override;
signals: signals:

2
apps/opencs/view/render/instanceselectionmode.hpp
View file

@ -21,7 +21,7 @@ namespace CSVRender
/// ///
/// \return Have there been any menu items to be added (if menu is 0 and there /// \return Have there been any menu items to be added (if menu is 0 and there
/// items to be added, the function must return true anyway. /// items to be added, the function must return true anyway.
bool createContextMenu(QMenu* menu); bool createContextMenu(QMenu* menu) override;
private: private:

2
apps/opencs/view/render/lighting.cpp
View file

@ -14,7 +14,7 @@ public:
, mIndex(index) , mIndex(index)
{ } { }
virtual void apply(osg::Switch &switchNode) void apply(osg::Switch &switchNode) override
{ {
if (switchNode.getName() == Constants::NightDayLabel) if (switchNode.getName() == Constants::NightDayLabel)
switchNode.setSingleChildOn(mIndex); switchNode.setSingleChildOn(mIndex);

6
apps/opencs/view/render/lightingbright.hpp
View file

@ -17,11 +17,11 @@ namespace CSVRender
LightingBright(); LightingBright();
virtual void activate (osg::Group* rootNode, bool /*isExterior*/); void activate (osg::Group* rootNode, bool /*isExterior*/) override;
virtual void deactivate(); void deactivate() override;
virtual osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient); osg::Vec4f getAmbientColour(osg::Vec4f* defaultAmbient) override;
}; };
} }

6
apps/opencs/view/render/lightingday.hpp
View file

@ -11,11 +11,11 @@ namespace CSVRender
LightingDay(); LightingDay();
virtual void activate (osg::Group* rootNode, bool /*isExterior*/); void activate (osg::Group* rootNode, bool /*isExterior*/) override;
virtual void deactivate(); void deactivate() override;
virtual osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient); osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient) override;
}; };
} }

6
apps/opencs/view/render/lightingnight.hpp
View file

@ -11,10 +11,10 @@ namespace CSVRender
LightingNight(); LightingNight();
virtual void activate (osg::Group* rootNode, bool isExterior); void activate (osg::Group* rootNode, bool isExterior) override;
virtual void deactivate(); void deactivate() override;
virtual osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient); osg::Vec4f getAmbientColour(osg::Vec4f *defaultAmbient) override;
}; };
} }

2
apps/opencs/view/render/object.hpp
View file

@ -54,7 +54,7 @@ namespace CSVRender
Object* mObject; Object* mObject;
virtual QString getToolTip (bool hideBasics) const; QString getToolTip (bool hideBasics) const override;
}; };
class ObjectMarkerTag : public ObjectTag class ObjectMarkerTag : public ObjectTag

6
apps/opencs/view/render/orbitcameramode.hpp
View file

@ -24,9 +24,9 @@ namespace CSVRender
QWidget* parent = nullptr); QWidget* parent = nullptr);
~OrbitCameraMode(); ~OrbitCameraMode();
virtual void activate(CSVWidget::SceneToolbar* toolbar); void activate(CSVWidget::SceneToolbar* toolbar) override;
virtual void deactivate(CSVWidget::SceneToolbar* toolbar); void deactivate(CSVWidget::SceneToolbar* toolbar) override;
virtual bool createContextMenu(QMenu* menu); bool createContextMenu(QMenu* menu) override;
private: private:

64
apps/opencs/view/render/pagedworldspacewidget.hpp
View file

@ -39,26 +39,26 @@ namespace CSVRender
/// \return Any cells added or removed? /// \return Any cells added or removed?
bool adjustCells(); bool adjustCells();
virtual void referenceableDataChanged (const QModelIndex& topLeft, void referenceableDataChanged (const QModelIndex& topLeft,
const QModelIndex& bottomRight); const QModelIndex& bottomRight) override;
virtual void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end); void referenceableAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
virtual void referenceableAdded (const QModelIndex& index, int start, int end); void referenceableAdded (const QModelIndex& index, int start, int end) override;
virtual void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight); void referenceDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
virtual void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end); void referenceAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
virtual void referenceAdded (const QModelIndex& index, int start, int end); void referenceAdded (const QModelIndex& index, int start, int end) override;
virtual void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight); void pathgridDataChanged (const QModelIndex& topLeft, const QModelIndex& bottomRight) override;
virtual void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end); void pathgridAboutToBeRemoved (const QModelIndex& parent, int start, int end) override;
virtual void pathgridAdded (const QModelIndex& parent, int start, int end); void pathgridAdded (const QModelIndex& parent, int start, int end) override;
virtual std::string getStartupInstruction(); std::string getStartupInstruction() override;
/// \note Does not update the view or any cell marker /// \note Does not update the view or any cell marker
void addCellToScene (const CSMWorld::CellCoordinates& coordinates); void addCellToScene (const CSMWorld::CellCoordinates& coordinates);
@ -86,45 +86,45 @@ namespace CSVRender
virtual ~PagedWorldspaceWidget(); virtual ~PagedWorldspaceWidget();
/// Decodes the the hint string to set of cell that are rendered. /// Decodes the the hint string to set of cell that are rendered.
void useViewHint (const std::string& hint); void useViewHint (const std::string& hint) override;
void setCellSelection(const CSMWorld::CellSelection& selection); void setCellSelection(const CSMWorld::CellSelection& selection);
const CSMWorld::CellSelection& getCellSelection() const; const CSMWorld::CellSelection& getCellSelection() const;
/// \return Drop handled? /// \return Drop handled?
virtual bool handleDrop (const std::vector<CSMWorld::UniversalId>& data, bool handleDrop (const std::vector<CSMWorld::UniversalId>& data,
DropType type); DropType type) override;
virtual dropRequirments getDropRequirements(DropType type) const; dropRequirments getDropRequirements(DropType type) const override;
/// \attention The created tool is not added to the toolbar (via addTool). Doing /// \attention The created tool is not added to the toolbar (via addTool). Doing
/// that is the responsibility of the calling function. /// that is the responsibility of the calling function.
virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector ( virtual CSVWidget::SceneToolToggle2 *makeControlVisibilitySelector (
CSVWidget::SceneToolbar *parent); CSVWidget::SceneToolbar *parent);
virtual unsigned int getVisibilityMask() const; unsigned int getVisibilityMask() const override;
/// \param elementMask Elements to be affected by the clear operation /// \param elementMask Elements to be affected by the clear operation
virtual void clearSelection (int elementMask); void clearSelection (int elementMask) override;
/// \param elementMask Elements to be affected by the select operation /// \param elementMask Elements to be affected by the select operation
virtual void invertSelection (int elementMask); void invertSelection (int elementMask) override;
/// \param elementMask Elements to be affected by the select operation /// \param elementMask Elements to be affected by the select operation
virtual void selectAll (int elementMask); void selectAll (int elementMask) override;
// Select everything that references the same ID as at least one of the elements // Select everything that references the same ID as at least one of the elements
// already selected // already selected
// //
/// \param elementMask Elements to be affected by the select operation /// \param elementMask Elements to be affected by the select operation
virtual void selectAllWithSameParentId (int elementMask); void selectAllWithSameParentId (int elementMask) override;
virtual std::string getCellId (const osg::Vec3f& point) const; std::string getCellId (const osg::Vec3f& point) const override;
virtual Cell* getCell(const osg::Vec3d& point) const; Cell* getCell(const osg::Vec3d& point) const override;
virtual Cell* getCell(const CSMWorld::CellCoordinates& coords) const; Cell* getCell(const CSMWorld::CellCoordinates& coords) const override;
void setCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height); void setCellAlteredHeight(const CSMWorld::CellCoordinates& coords, int inCellX, int inCellY, float height);
@ -132,24 +132,24 @@ namespace CSVRender
void resetAllAlteredHeights(); void resetAllAlteredHeights();
virtual std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask) std::vector<osg::ref_ptr<TagBase> > getSelection (unsigned int elementMask)
const; const override;
virtual std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask) std::vector<osg::ref_ptr<TagBase> > getEdited (unsigned int elementMask)
const; const override;
virtual void setSubMode (int subMode, unsigned int elementMask); void setSubMode (int subMode, unsigned int elementMask) override;
/// Erase all overrides and restore the visual representation to its true state. /// Erase all overrides and restore the visual representation to its true state.
virtual void reset (unsigned int elementMask); void reset (unsigned int elementMask) override;
protected: protected:
virtual void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool); void addVisibilitySelectorButtons (CSVWidget::SceneToolToggle2 *tool) override;
virtual void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool); void addEditModeSelectorButtons (CSVWidget::SceneToolMode *tool) override;
virtual void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type); void handleInteractionPress (const WorldspaceHitResult& hit, InteractionType type) override;
signals: signals:

2
apps/opencs/view/render/pathgrid.cpp
View file

@ -23,7 +23,7 @@ namespace CSVRender
{ {
public: public:
virtual void operator()(osg::Node* node, osg::NodeVisitor* nv) void operator()(osg::Node* node, osg::NodeVisitor* nv) override
{ {
PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData()); PathgridTag* tag = static_cast<PathgridTag*>(node->getUserData());
tag->getPathgrid()->update(); tag->getPathgrid()->update();

2
apps/opencs/view/render/pathgrid.hpp
View file

@ -40,7 +40,7 @@ namespace CSVRender
Pathgrid* getPathgrid () const; Pathgrid* getPathgrid () const;
virtual QString getToolTip (bool hideBasics) const; QString getToolTip (bool hideBasics) const override;
private: private:

24
apps/opencs/view/render/pathgridmode.hpp
View file

@ -17,31 +17,31 @@ namespace CSVRender
PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0); PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
virtual void activate(CSVWidget::SceneToolbar* toolbar); void activate(CSVWidget::SceneToolbar* toolbar) override;
virtual void deactivate(CSVWidget::SceneToolbar* toolbar); void deactivate(CSVWidget::SceneToolbar* toolbar) override;
virtual void primaryOpenPressed(const WorldspaceHitResult& hit); void primaryOpenPressed(const WorldspaceHitResult& hit) override;
virtual void primaryEditPressed(const WorldspaceHitResult& hit); void primaryEditPressed(const WorldspaceHitResult& hit) override;
virtual void secondaryEditPressed(const WorldspaceHitResult& hit); void secondaryEditPressed(const WorldspaceHitResult& hit) override;
virtual void primarySelectPressed(const WorldspaceHitResult& hit); void primarySelectPressed(const WorldspaceHitResult& hit) override;
virtual void secondarySelectPressed(const WorldspaceHitResult& hit); void secondarySelectPressed(const WorldspaceHitResult& hit) override;
virtual bool primaryEditStartDrag (const QPoint& pos); bool primaryEditStartDrag (const QPoint& pos) override;
virtual bool secondaryEditStartDrag (const QPoint& pos); bool secondaryEditStartDrag (const QPoint& pos) override;
virtual void drag (const QPoint& pos, int diffX, int diffY, double speedFactor); void drag (const QPoint& pos, int diffX, int diffY, double speedFactor) override;
virtual void dragCompleted(const QPoint& pos); void dragCompleted(const QPoint& pos) override;
/// \note dragAborted will not be called, if the drag is aborted via changing /// \note dragAborted will not be called, if the drag is aborted via changing
/// editing mode /// editing mode
virtual void dragAborted(); void dragAborted() override;
private: private:

2
apps/opencs/view/render/pathgridselectionmode.hpp
View file

@ -21,7 +21,7 @@ namespace CSVRender
/// ///
/// \return Have there been any menu items to be added (if menu is 0 and there /// \return Have there been any menu items to be added (if menu is 0 and there
/// items to be added, the function must return true anyway. /// items to be added, the function must return true anyway.
bool createContextMenu(QMenu* menu); bool createContextMenu(QMenu* menu) override;
private: private:

4
apps/opencs/view/render/scenewidget.hpp
View file

@ -97,8 +97,8 @@ namespace CSVRender
void setAmbient(const osg::Vec4f& ambient); void setAmbient(const osg::Vec4f& ambient);
virtual void mouseMoveEvent (QMouseEvent *event); void mouseMoveEvent (QMouseEvent *event) override;
virtual void wheelEvent (QWheelEvent *event); void wheelEvent (QWheelEvent *event) override;
std::shared_ptr<Resource::ResourceSystem> mResourceSystem; std::shared_ptr<Resource::ResourceSystem> mResourceSystem;

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