Add OpenMW commits up to 30 Nov 2020

# Conflicts:
#   CMakeLists.txt
#   apps/openmw/mwphysics/actor.cpp

.gitlab-ci.yml

@@ -37,6 +37,8 @@ Debian_GCC:
     CC: gcc
     CXX: g++
     CCACHE_SIZE: 3G
+  # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
+  timeout: 2h
 
 Debian_GCC_tests:
   extends: .Debian

AUTHORS.md

@@ -96,6 +96,7 @@ Programmers
     Jan Borsodi (am0s)
     Jason Hooks (jhooks)
     jeaye
+    jefetienne
     Jeffrey Haines (Jyby)
     Jengerer
     Jiří Kuneš (kunesj)

CHANGELOG.md

@@ -58,6 +58,7 @@
     Bug #5557: Diagonal movement is noticeably slower with analogue stick
     Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics
     Bug #5603: Setting constant effect cast style doesn't correct effects view
+    Bug #5604: Only one valid NIF root node is loaded from a single file
     Bug #5611: Usable items with "0 Uses" should be used only once
     Bug #5622: Can't properly interact with the console when in pause menu
     Bug #5633: Damage Spells in effect before god mode is enabled continue to hurt the player character and can kill them
@@ -65,6 +66,7 @@
     Bug #5644: Summon effects running on the player during game initialization cause crashes
     Bug #5656: Sneaking characters block hits while standing
     Bug #5661: Region sounds don't play at the right interval
+    Bug #5688: Water shader broken indoors with enable indoor shadows = false
     Feature #390: 3rd person look "over the shoulder"
     Feature #2386: Distant Statics in the form of Object Paging
     Feature #2404: Levelled List can not be placed into a container
@@ -86,6 +88,7 @@
     Feature #5642: Ability to attach arrows to actor skeleton instead of bow mesh
     Feature #5649: Skyrim SE compressed BSA format support
     Feature #5672: Make stretch menu background configuration more accessible
+    Feature #5692: Improve spell/magic item search to factor in magic effect names
     Task #5480: Drop Qt4 support
     Task #5520: Improve cell name autocompleter implementation
 

CI/before_script.msvc.sh

@@ -913,7 +913,7 @@ printf "LZ4 1.9.2... "
 		printf "Exists. "
 	elif [ -z $SKIP_EXTRACT ]; then
 		rm -rf LZ4_1.9.2
-		eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o./LZ4_1.9.2 $STRIP
+		eval 7z x -y lz4_win${BITS}_v1_9_2.7z -o$(real_pwd)/LZ4_1.9.2 $STRIP
 	fi
 	export LZ4DIR="$(real_pwd)/LZ4_1.9.2"
 	add_cmake_opts -DLZ4_INCLUDE_DIR="${LZ4DIR}/include" \

CMakeLists.txt

@@ -267,7 +267,7 @@ if(NOT HAVE_STDINT_H)
 endif()
 
 if(BUILD_OPENMW OR BUILD_OPENCS OR BUILD_OPENMW_MP)
-    find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow)
+    find_package(OpenSceneGraph 3.3.4 REQUIRED osgDB osgViewer osgText osgGA osgParticle osgUtil osgFX osgShadow osgAnimation)
     include_directories(SYSTEM ${OPENSCENEGRAPH_INCLUDE_DIRS})
     find_package(SDL2 2.0.9 REQUIRED)
 endif()

apps/launcher/advancedpage.hpp

@@ -20,7 +20,7 @@ namespace Launcher
 
     public:
         AdvancedPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                     Settings::Manager &engineSettings, QWidget *parent = 0);
+                     Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         bool loadSettings();
         void saveSettings();

apps/launcher/datafilespage.hpp

@@ -32,7 +32,7 @@ namespace Launcher
 
     public:
         explicit DataFilesPage (Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                                Config::LauncherSettings &launcherSettings, QWidget *parent = 0);
+                                Config::LauncherSettings &launcherSettings, QWidget *parent = nullptr);
 
         QAbstractItemModel* profilesModel() const;
 

apps/launcher/graphicspage.hpp

@@ -20,7 +20,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = 0);
+        GraphicsPage(Files::ConfigurationManager &cfg, Settings::Manager &engineSettings, QWidget *parent = nullptr);
 
         void saveSettings();
         bool loadSettings();

apps/launcher/maindialog.hpp

@@ -48,7 +48,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        explicit MainDialog(QWidget *parent = 0);
+        explicit MainDialog(QWidget *parent = nullptr);
         ~MainDialog();
 
         FirstRunDialogResult showFirstRunDialog();

apps/launcher/playpage.hpp

@@ -16,7 +16,7 @@ namespace Launcher
         Q_OBJECT
 
     public:
-        PlayPage(QWidget *parent = 0);
+        PlayPage(QWidget *parent = nullptr);
         void setProfilesModel(QAbstractItemModel *model);
 
     signals:

apps/launcher/settingspage.hpp

@@ -24,7 +24,7 @@ namespace Launcher
 
     public:
         SettingsPage(Files::ConfigurationManager &cfg, Config::GameSettings &gameSettings,
-                      Config::LauncherSettings &launcherSettings, MainDialog *parent = 0);
+                      Config::LauncherSettings &launcherSettings, MainDialog *parent = nullptr);
         ~SettingsPage();
 
         void saveSettings();

apps/launcher/utils/lineedit.hpp

@@ -24,7 +24,7 @@ class LineEdit : public QLineEdit
     QString mPlaceholderText;
 
 public:
-    LineEdit(QWidget *parent = 0);
+    LineEdit(QWidget *parent = nullptr);
 
 protected:
     void resizeEvent(QResizeEvent *) override;

apps/launcher/utils/profilescombobox.cpp

@@ -33,7 +33,7 @@ void ProfilesComboBox::setEditEnabled(bool editable)
     ComboBoxLineEdit *edit = new ComboBoxLineEdit(this);
 
     setLineEdit(edit);
-    setCompleter(0);
+    setCompleter(nullptr);
 
     connect(lineEdit(), SIGNAL(editingFinished()), this,
                 SLOT(slotEditingFinished()));

apps/launcher/utils/profilescombobox.hpp

@@ -16,12 +16,12 @@ public:
     class ComboBoxLineEdit : public LineEdit
     {
     public:
-        explicit ComboBoxLineEdit (QWidget *parent = 0);
+        explicit ComboBoxLineEdit (QWidget *parent = nullptr);
     };
 
 public:
 
-    explicit ProfilesComboBox(QWidget *parent = 0);
+    explicit ProfilesComboBox(QWidget *parent = nullptr);
     void setEditEnabled(bool editable);
     void setCurrentProfile(int index)
     {

apps/launcher/utils/textinputdialog.cpp

@@ -23,7 +23,7 @@ Launcher::TextInputDialog::TextInputDialog(const QString& title, const QString &
     QValidator *validator = new QRegExpValidator(QRegExp("^[a-zA-Z0-9_]*$"), this); // Alpha-numeric + underscore
     mLineEdit = new LineEdit(this);
     mLineEdit->setValidator(validator);
-    mLineEdit->setCompleter(0);
+    mLineEdit->setCompleter(nullptr);
 
     QVBoxLayout *dialogLayout = new QVBoxLayout(this);
     dialogLayout->addWidget(label);

apps/launcher/utils/textinputdialog.hpp

@@ -15,7 +15,7 @@ namespace Launcher
 
     public:
 
-        explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = 0);
+        explicit TextInputDialog(const QString& title, const QString &text, QWidget *parent = nullptr);
         ~TextInputDialog ();
 
         inline LineEdit *lineEdit() { return mLineEdit; }

apps/opencs/model/doc/operationholder.hpp

@@ -25,7 +25,7 @@ namespace CSMDoc
 
         public:
 
-            OperationHolder (Operation *operation = 0);
+            OperationHolder (Operation *operation = nullptr);
 
             void setOperation (Operation *operation);
 

apps/opencs/model/doc/runner.cpp

@@ -8,7 +8,7 @@
 #include "operationholder.hpp"
 
 CSMDoc::Runner::Runner (const boost::filesystem::path& projectPath)
-: mRunning (false), mStartup (0), mProjectPath (projectPath)
+: mRunning (false), mStartup (nullptr), mProjectPath (projectPath)
 {
     connect (&mProcess, SIGNAL (finished (int, QProcess::ExitStatus)),
         this, SLOT (finished (int, QProcess::ExitStatus)));
@@ -25,7 +25,7 @@ CSMDoc::Runner::~Runner()
 {
     if (mRunning)
     {
-        disconnect (&mProcess, 0, this, 0);
+        disconnect (&mProcess, nullptr, this, nullptr);
         mProcess.kill();
         mProcess.waitForFinished();
     }
@@ -36,7 +36,7 @@ void CSMDoc::Runner::start (bool delayed)
     if (mStartup)
     {
         delete mStartup;
-        mStartup = 0;
+        mStartup = nullptr;
     }
 
     if (!delayed)
@@ -102,7 +102,7 @@ void CSMDoc::Runner::start (bool delayed)
 void CSMDoc::Runner::stop()
 {
     delete mStartup;
-    mStartup = 0;
+    mStartup = nullptr;
 
     if (mProcess.state()==QProcess::NotRunning)
     {

apps/opencs/model/prefs/boolsetting.cpp

@@ -11,7 +11,7 @@
 
 CSMPrefs::BoolSetting::BoolSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, bool default_)
-: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label),  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::BoolSetting& CSMPrefs::BoolSetting::setTooltip (const std::string& tooltip)
@@ -33,7 +33,7 @@ std::pair<QWidget *, QWidget *> CSMPrefs::BoolSetting::makeWidgets (QWidget *par
 
     connect (mWidget, SIGNAL (stateChanged (int)), this, SLOT (valueChanged (int)));
 
-    return std::make_pair (static_cast<QWidget *> (0), mWidget);
+    return std::make_pair (static_cast<QWidget *> (nullptr), mWidget);
 }
 
 void CSMPrefs::BoolSetting::updateWidget()

apps/opencs/model/prefs/coloursetting.cpp

@@ -14,7 +14,7 @@
 
 CSMPrefs::ColourSetting::ColourSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, QColor default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::ColourSetting& CSMPrefs::ColourSetting::setTooltip (const std::string& tooltip)

apps/opencs/model/prefs/doublesetting.cpp

@@ -16,7 +16,7 @@ CSMPrefs::DoubleSetting::DoubleSetting (Category *parent, Settings::Manager *val
   QMutex *mutex, const std::string& key, const std::string& label, double default_)
 : Setting (parent, values, mutex, key, label),
   mPrecision(2), mMin (0), mMax (std::numeric_limits<double>::max()),
-  mDefault (default_), mWidget(0)
+  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::DoubleSetting& CSMPrefs::DoubleSetting::setPrecision(int precision)

apps/opencs/model/prefs/enumsetting.cpp

@@ -42,7 +42,7 @@ CSMPrefs::EnumValues& CSMPrefs::EnumValues::add (const std::string& value, const
 
 CSMPrefs::EnumSetting::EnumSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, const EnumValue& default_)
-: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(0)
+: Setting (parent, values, mutex, key, label), mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::EnumSetting& CSMPrefs::EnumSetting::setTooltip (const std::string& tooltip)

apps/opencs/model/prefs/intsetting.cpp

@@ -15,7 +15,7 @@
 CSMPrefs::IntSetting::IntSetting (Category *parent, Settings::Manager *values,
   QMutex *mutex, const std::string& key, const std::string& label, int default_)
 : Setting (parent, values, mutex, key, label), mMin (0), mMax (std::numeric_limits<int>::max()),
-  mDefault (default_), mWidget(0)
+  mDefault (default_), mWidget(nullptr)
 {}
 
 CSMPrefs::IntSetting& CSMPrefs::IntSetting::setRange (int min, int max)

apps/opencs/model/prefs/modifiersetting.cpp

@@ -15,7 +15,7 @@ namespace CSMPrefs
     ModifierSetting::ModifierSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)
-        , mButton(0)
+        , mButton(nullptr)
         , mEditorActive(false)
     {
     }

apps/opencs/model/prefs/shortcut.cpp

@@ -23,7 +23,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -42,7 +42,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -62,7 +62,7 @@ namespace CSMPrefs
         , mLastPos(0)
         , mActivationStatus(AS_Inactive)
         , mModifierStatus(false)
-        , mAction(0)
+        , mAction(nullptr)
     {
         assert (parent);
 
@@ -218,6 +218,6 @@ namespace CSMPrefs
 
     void Shortcut::actionDeleted()
     {
-        mAction = 0;
+        mAction = nullptr;
     }
 }

apps/opencs/model/prefs/shortcutmanager.cpp

@@ -781,7 +781,7 @@ namespace CSMPrefs
         std::make_pair((int)Qt::Key_LastNumberRedial       , "LastNumberRedial"),
         std::make_pair((int)Qt::Key_Camera                 , "Camera"),
         std::make_pair((int)Qt::Key_CameraFocus            , "CameraFocus"),
-        std::make_pair(0                                   , (const char*) 0)
+        std::make_pair(0                                   , (const char*) nullptr)
     };
 
 }

apps/opencs/model/prefs/shortcutsetting.cpp

@@ -18,7 +18,7 @@ namespace CSMPrefs
     ShortcutSetting::ShortcutSetting(Category* parent, Settings::Manager* values, QMutex* mutex, const std::string& key,
         const std::string& label)
         : Setting(parent, values, mutex, key, label)
-        , mButton(0)
+        , mButton(nullptr)
         , mEditorActive(false)
         , mEditorPos(0)
     {

apps/opencs/model/prefs/state.cpp

@@ -12,7 +12,7 @@
 #include "shortcutsetting.hpp"
 #include "modifiersetting.hpp"
 
-CSMPrefs::State *CSMPrefs::State::sThis = 0;
+CSMPrefs::State *CSMPrefs::State::sThis = nullptr;
 
 void CSMPrefs::State::load()
 {
@@ -599,7 +599,7 @@ CSMPrefs::State::State (const Files::ConfigurationManager& configurationManager)
 
 CSMPrefs::State::~State()
 {
-    sThis = 0;
+    sThis = nullptr;
 }
 
 void CSMPrefs::State::save()

apps/opencs/model/tools/mergestages.cpp

@@ -104,7 +104,7 @@ void CSMTools::MergeReferencesStage::perform (int stage, CSMDoc::Messages& messa
         ref.mNew = false;
 
         CSMWorld::Record<CSMWorld::CellRef> newRecord (
-            CSMWorld::RecordBase::State_ModifiedOnly, 0, &ref);
+            CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &ref);
 
         mState.mTarget->getData().getReferences().appendRecord (newRecord);
     }

apps/opencs/model/tools/mergestages.hpp

@@ -82,7 +82,7 @@ namespace CSMTools
         const CSMWorld::Record<RecordType>& record = source.getRecord (stage);
 
         if (!record.isDeleted())
-            target.appendRecord (CSMWorld::Record<RecordType> (CSMWorld::RecordBase::State_ModifiedOnly, 0, &record.get()));
+            target.appendRecord (CSMWorld::Record<RecordType> (CSMWorld::RecordBase::State_ModifiedOnly, nullptr, &record.get()));
     }
 
     class MergeRefIdsStage : public CSMDoc::Stage

apps/opencs/model/tools/scriptcheck.cpp

@@ -50,7 +50,7 @@ void CSMTools::ScriptCheckStage::report (const std::string& message, Type type)
 }
 
 CSMTools::ScriptCheckStage::ScriptCheckStage (const CSMDoc::Document& document)
-: mDocument (document), mContext (document.getData()), mMessages (0), mWarningMode (Mode_Ignore)
+: mDocument (document), mContext (document.getData()), mMessages (nullptr), mWarningMode (Mode_Ignore)
 {
     /// \todo add an option to configure warning mode
     setWarningsMode (0);
@@ -73,7 +73,7 @@ int CSMTools::ScriptCheckStage::setup()
         mWarningMode = Mode_Strict;
 
     mContext.clear();
-    mMessages = 0;
+    mMessages = nullptr;
     mId.clear();
     Compiler::ErrorHandler::reset();
 
@@ -130,5 +130,5 @@ void CSMTools::ScriptCheckStage::perform (int stage, CSMDoc::Messages& messages)
         messages.add (id, stream.str(), "", CSMDoc::Message::Severity_SeriousError);
     }
 
-    mMessages = 0;
+    mMessages = nullptr;
 }

apps/opencs/model/tools/searchstage.cpp

@@ -5,7 +5,7 @@
 #include "searchoperation.hpp"
 
 CSMTools::SearchStage::SearchStage (const CSMWorld::IdTableBase *model)
-: mModel (model), mOperation (0)
+: mModel (model), mOperation (nullptr)
 {}
 
 int CSMTools::SearchStage::setup()

apps/opencs/model/tools/tools.cpp

@@ -43,7 +43,7 @@ CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
         case CSMDoc::State_Merging: return &mMerge;
     }
 
-    return 0;
+    return nullptr;
 }
 
 const CSMDoc::OperationHolder *CSMTools::Tools::get (int type) const
@@ -138,8 +138,8 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
 }
 
 CSMTools::Tools::Tools (CSMDoc::Document& document, ToUTF8::FromType encoding)
-: mDocument (document), mData (document.getData()), mVerifierOperation (0),
+: mDocument (document), mData (document.getData()), mVerifierOperation (nullptr),
-  mSearchOperation (0), mMergeOperation (0), mNextReportNumber (0), mEncoding (encoding)
+  mSearchOperation (nullptr), mMergeOperation (nullptr), mNextReportNumber (0), mEncoding (encoding)
 {
     // index 0: load error log
     mReports.insert (std::make_pair (mNextReportNumber++, new ReportModel));

apps/opencs/model/world/columnimp.hpp

@@ -2254,7 +2254,7 @@ namespace CSMWorld
 
         QVariant get (const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = 0;
+            const std::string *string = nullptr;
 
             switch (this->mColumnId)
             {
@@ -2272,7 +2272,7 @@ namespace CSMWorld
 
         void set (Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = 0;
+            std::string *string = nullptr;
 
             ESXRecordT record2 = record.get();
 
@@ -2312,7 +2312,7 @@ namespace CSMWorld
 
         QVariant get (const Record<ESXRecordT>& record) const override
         {
-            const std::string *string = 0;
+            const std::string *string = nullptr;
 
             switch (this->mColumnId)
             {
@@ -2330,7 +2330,7 @@ namespace CSMWorld
 
         void set (Record<ESXRecordT>& record, const QVariant& data) override
         {
-            std::string *string = 0;
+            std::string *string = nullptr;
 
             ESXRecordT record2 = record.get();
 

apps/opencs/model/world/commanddispatcher.hpp

@@ -34,7 +34,7 @@ namespace CSMWorld
         public:
 
             CommandDispatcher (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                QObject *parent = 0);
+                QObject *parent = nullptr);
             ///< \param id ID of the table the commands should operate on primarily.
 
             void setEditLock (bool locked);

apps/opencs/model/world/commands.cpp

@@ -290,7 +290,7 @@ void CSMWorld::CreateCommand::undo()
 }
 
 CSMWorld::RevertCommand::RevertCommand (IdTable& model, const std::string& id, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (0)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr)
 {
     setText (("Revert record " + id).c_str());
 
@@ -326,7 +326,7 @@ void CSMWorld::RevertCommand::undo()
 
 CSMWorld::DeleteCommand::DeleteCommand (IdTable& model,
         const std::string& id, CSMWorld::UniversalId::Type type, QUndoCommand* parent)
-: QUndoCommand (parent), mModel (model), mId (id), mOld (0), mType(type)
+: QUndoCommand (parent), mModel (model), mId (id), mOld (nullptr), mType(type)
 {
     setText (("Delete record " + id).c_str());
 

apps/opencs/model/world/commands.hpp

@@ -140,7 +140,7 @@ namespace CSMWorld
         public:
 
             ModifyCommand (QAbstractItemModel& model, const QModelIndex& index, const QVariant& new_,
-                QUndoCommand *parent = 0);
+                QUndoCommand *parent = nullptr);
 
             void redo() override;
 
@@ -167,7 +167,7 @@ namespace CSMWorld
 
         public:
 
-            CreateCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            CreateCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             void setType (UniversalId::Type type);
 
@@ -189,7 +189,7 @@ namespace CSMWorld
             CloneCommand (IdTable& model, const std::string& idOrigin,
                           const std::string& IdDestination,
                           const UniversalId::Type type,
-                          QUndoCommand* parent = 0);
+                          QUndoCommand* parent = nullptr);
 
             void redo() override;
 
@@ -208,7 +208,7 @@ namespace CSMWorld
 
         public:
 
-            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            RevertCommand (IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             virtual ~RevertCommand();
 
@@ -231,7 +231,7 @@ namespace CSMWorld
         public:
 
             DeleteCommand (IdTable& model, const std::string& id,
-                    UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = 0);
+                    UniversalId::Type type = UniversalId::Type_None, QUndoCommand *parent = nullptr);
 
             virtual ~DeleteCommand();
 
@@ -259,7 +259,7 @@ namespace CSMWorld
     {
         public:
 
-            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = 0);
+            CreatePathgridCommand(IdTable& model, const std::string& id, QUndoCommand *parent = nullptr);
 
             void redo() override;
     };
@@ -279,7 +279,7 @@ namespace CSMWorld
 
         public:
 
-            UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = 0);
+            UpdateCellCommand (IdTable& model, int row, QUndoCommand *parent = nullptr);
 
             void redo() override;
 
@@ -316,7 +316,7 @@ namespace CSMWorld
 
         public:
 
-            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 = nullptr);
 
             void redo() override;
 
@@ -338,7 +338,7 @@ namespace CSMWorld
 
         public:
 
-            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 = nullptr);
 
             void redo() override;
 

apps/opencs/model/world/data.cpp

@@ -68,7 +68,7 @@ int CSMWorld::Data::count (RecordBase::State state, const CollectionBase& collec
 CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::PathContainer& dataPaths,
     const std::vector<std::string>& archives, const boost::filesystem::path& resDir)
 : mEncoder (encoding), mPathgrids (mCells), mRefs (mCells),
-  mReader (0), mDialogue (0), mReaderIndex(1),
+  mReader (nullptr), mDialogue (nullptr), mReaderIndex(1),
   mFsStrict(fsStrict), mDataPaths(dataPaths), mArchives(archives)
 {
     mVFS.reset(new VFS::Manager(mFsStrict));
@@ -916,7 +916,7 @@ const CSMWorld::MetaData& CSMWorld::Data::getMetaData() const
 
 void CSMWorld::Data::setMetaData (const MetaData& metaData)
 {
-    Record<MetaData> record (RecordBase::State_ModifiedOnly, 0, &metaData);
+    Record<MetaData> record (RecordBase::State_ModifiedOnly, nullptr, &metaData);
     mMetaData.setRecord (0, record);
 }
 
@@ -932,7 +932,7 @@ QAbstractItemModel *CSMWorld::Data::getTableModel (const CSMWorld::UniversalId&
         // construction of the ESX data where no update signals are available.
         if (id.getType()==UniversalId::Type_RegionMap)
         {
-            RegionMap *table = 0;
+            RegionMap *table = nullptr;
             addModel (table = new RegionMap (*this), UniversalId::Type_RegionMap, false);
             return table;
         }
@@ -962,9 +962,9 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
     // Don't delete the Reader yet. Some record types store a reference to the Reader to handle on-demand loading
     std::shared_ptr<ESM::ESMReader> ptr(mReader);
     mReaders.push_back(ptr);
-    mReader = 0;
+    mReader = nullptr;
 
-    mDialogue = 0;
+    mDialogue = nullptr;
 
     mReader = new ESM::ESMReader;
     mReader->setEncoder (&mEncoder);
@@ -982,7 +982,7 @@ int CSMWorld::Data::startLoading (const boost::filesystem::path& path, bool base
         metaData.mId = "sys::meta";
         metaData.load (*mReader);
 
-        mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, 0, &metaData));
+        mMetaData.setRecord (0, Record<MetaData> (RecordBase::State_ModifiedOnly, nullptr, &metaData));
     }
 
     // Fix uninitialized master data index
@@ -1064,9 +1064,9 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
         else
             delete mReader;
 
-        mReader = 0;
+        mReader = nullptr;
 
-        mDialogue = 0;
+        mDialogue = nullptr;
 
         loadFallbackEntries();
 
@@ -1151,7 +1151,7 @@ bool CSMWorld::Data::continueLoading (CSMDoc::Messages& messages)
             if (isDeleted)
             {
                 // record vector can be shuffled around which would make pointer to record invalid
-                mDialogue = 0;
+                mDialogue = nullptr;
 
                 if (mJournals.tryDelete (record.mId))
                 {

apps/opencs/model/world/idtableproxymodel.hpp

@@ -35,7 +35,7 @@ namespace CSMWorld
 
         public:
 
-            IdTableProxyModel (QObject *parent = 0);
+            IdTableProxyModel (QObject *parent = nullptr);
 
             virtual QModelIndex getModelIndex (const std::string& id, int column) const;
 

apps/opencs/model/world/infotableproxymodel.hpp

@@ -28,7 +28,7 @@ namespace CSMWorld
             ///< \a currentRow is a row of the source model.
 
         public:
-            InfoTableProxyModel(UniversalId::Type type, QObject *parent = 0);
+            InfoTableProxyModel(UniversalId::Type type, QObject *parent = nullptr);
 
             void setSourceModel(QAbstractItemModel *sourceModel) override;
 

apps/opencs/model/world/record.hpp

@@ -87,7 +87,7 @@ namespace CSMWorld
     template <typename ESXRecordT>
     RecordBase *Record<ESXRecordT>::modifiedCopy() const
     {
-        return new Record<ESXRecordT> (State_ModifiedOnly, 0, &(this->get()));
+        return new Record<ESXRecordT> (State_ModifiedOnly, nullptr, &(this->get()));
     }
 
     template <typename ESXRecordT>

apps/opencs/model/world/refidcollection.cpp

@@ -350,7 +350,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     };
 
     // for re-use in NPC records
-    const RefIdColumn *essential = 0;
+    const RefIdColumn *essential = nullptr;
 
     for (int i=0; sCreatureFlagTable[i].mName!=-1; ++i)
     {

apps/opencs/model/world/resources.hpp

@@ -25,9 +25,9 @@ namespace CSMWorld
 
             /// \param type Type of resources in this table.
             Resources (const VFS::Manager* vfs, const std::string& baseDirectory, UniversalId::Type type,
-                const char * const *extensions = 0);
+                const char * const *extensions = nullptr);
 
-            void recreate(const VFS::Manager* vfs, const char * const *extensions = 0);
+            void recreate(const VFS::Manager* vfs, const char * const *extensions = nullptr);
 
             int getSize() const;
 

apps/opencs/view/doc/adjusterwidget.hpp

@@ -32,7 +32,7 @@ namespace CSVDoc
 
         public:
 
-            AdjusterWidget (QWidget *parent = 0);
+            AdjusterWidget (QWidget *parent = nullptr);
 
             void setLocalData (const boost::filesystem::path& localData);
             void setAction (ContentAction action);

apps/opencs/view/doc/filedialog.cpp

@@ -18,7 +18,7 @@
 #include "adjusterwidget.hpp"
 
 CSVDoc::FileDialog::FileDialog(QWidget *parent) :
-    QDialog(parent), mSelector (0), mAction(ContentAction_Undefined), mFileWidget (0), mAdjusterWidget (0), mDialogBuilt(false)
+    QDialog(parent), mSelector (nullptr), mAction(ContentAction_Undefined), mFileWidget (nullptr), mAdjusterWidget (nullptr), mDialogBuilt(false)
 {
     ui.setupUi (this);
     resize(400, 400);

apps/opencs/view/doc/filedialog.hpp

@@ -42,7 +42,7 @@ namespace CSVDoc
 
     public:
 
-        explicit FileDialog(QWidget *parent = 0);
+        explicit FileDialog(QWidget *parent = nullptr);
         void showDialog (ContentAction action);
 
         void addFiles (const QString &path);

apps/opencs/view/doc/filewidget.hpp

@@ -23,7 +23,7 @@ namespace CSVDoc
 
         public:
 
-            FileWidget (QWidget *parent = 0);
+            FileWidget (QWidget *parent = nullptr);
 
             void setType (bool addon);
 

apps/opencs/view/doc/globaldebugprofilemenu.cpp

@@ -13,7 +13,7 @@ void CSVDoc::GlobalDebugProfileMenu::rebuild()
     clear();
 
     delete mActions;
-    mActions = 0;
+    mActions = nullptr;
 
     int idColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Id);
     int stateColumn = mDebugProfiles->findColumnIndex (CSMWorld::Columns::ColumnId_Modification);
@@ -48,7 +48,7 @@ void CSVDoc::GlobalDebugProfileMenu::rebuild()
 
 CSVDoc::GlobalDebugProfileMenu::GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles,
     QWidget *parent)
-: QMenu (parent), mDebugProfiles (debugProfiles), mActions (0)
+: QMenu (parent), mDebugProfiles (debugProfiles), mActions (nullptr)
 {
     rebuild();
 

apps/opencs/view/doc/globaldebugprofilemenu.hpp

@@ -26,7 +26,7 @@ namespace CSVDoc
 
         public:
 
-            GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles, QWidget *parent = 0);
+            GlobalDebugProfileMenu (CSMWorld::IdTable *debugProfiles, QWidget *parent = nullptr);
 
             void updateActions (bool running);
 

apps/opencs/view/doc/loader.cpp

@@ -17,7 +17,7 @@ void CSVDoc::LoadingDocument::closeEvent (QCloseEvent *event)
 }
 
 CSVDoc::LoadingDocument::LoadingDocument (CSMDoc::Document *document)
-: mDocument (document), mAborted (false), mMessages (0), mTotalRecords (0)
+: mDocument (document), mAborted (false), mMessages (nullptr), mTotalRecords (0)
 {
     setWindowTitle (QString::fromUtf8((std::string("Opening ") + document->getSavePath().filename().string()).c_str()));
 

apps/opencs/view/doc/sizehint.hpp

@@ -11,7 +11,7 @@ namespace CSVDoc
             QSize mSize;
 
         public:
-            SizeHintWidget(QWidget *parent = 0);
+            SizeHintWidget(QWidget *parent = nullptr);
             ~SizeHintWidget();
 
             QSize sizeHint() const override;

apps/opencs/view/doc/view.cpp

@@ -733,7 +733,7 @@ void CSVDoc::View::infoAbout()
 #endif
 
     // Get current year
-    time_t now = time(NULL);
+    time_t now = time(nullptr);
     struct tm tstruct;
     char copyrightInfo[40];
     tstruct = *localtime(&now);

apps/opencs/view/doc/viewmanager.hpp

@@ -43,7 +43,7 @@ namespace CSVDoc
             ViewManager& operator= (const ViewManager&);
 
             void updateIndices();
-            bool notifySaveOnClose (View *view = 0);
+            bool notifySaveOnClose (View *view = nullptr);
             bool showModifiedDocumentMessageBox (View *view);
             bool showSaveInProgressMessageBox (View *view);
             bool removeDocument(View *view);

apps/opencs/view/filter/editwidget.hpp

@@ -30,7 +30,7 @@ namespace CSVFilter
 
         public:
 
-            EditWidget (CSMWorld::Data& data, QWidget *parent = 0);
+            EditWidget (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void createFilterRequest(std::vector<std::pair<std::string, std::vector<std::string> > >& filterSource,
                                      Qt::DropAction action);

apps/opencs/view/filter/filterbox.hpp

@@ -25,7 +25,7 @@ namespace CSVFilter
             RecordFilterBox *mRecordFilterBox;
 
         public:
-            FilterBox (CSMWorld::Data& data, QWidget *parent = 0);
+            FilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void setRecordFilter (const std::string& filter);
 

apps/opencs/view/filter/recordfilterbox.hpp

@@ -25,7 +25,7 @@ namespace CSVFilter
 
         public:
 
-            RecordFilterBox (CSMWorld::Data& data, QWidget *parent = 0);
+            RecordFilterBox (CSMWorld::Data& data, QWidget *parent = nullptr);
 
             void setFilter (const std::string& filter);
 

apps/opencs/view/prefs/keybindingpage.cpp

@@ -16,9 +16,9 @@ namespace CSVPrefs
 {
     KeyBindingPage::KeyBindingPage(CSMPrefs::Category& category, QWidget* parent)
         : PageBase(category, parent)
-        , mStackedLayout(0)
+        , mStackedLayout(nullptr)
-        , mPageLayout(0)
+        , mPageLayout(nullptr)
-        , mPageSelector(0)
+        , mPageSelector(nullptr)
     {
         // Need one widget for scroll area
         QWidget* topWidget = new QWidget();

apps/opencs/view/render/cell.cpp

@@ -504,12 +504,12 @@ void CSVRender::Cell::setCellArrows (int mask)
 
         bool enable = mask & direction;
 
-        if (enable!=(mCellArrows[i].get()!=0))
+        if (enable!=(mCellArrows[i].get()!=nullptr))
         {
             if (enable)
                 mCellArrows[i].reset (new CellArrow (mCellNode, direction, mCoordinates));
             else
-                mCellArrows[i].reset (0);
+                mCellArrows[i].reset (nullptr);
         }
     }
 }

apps/opencs/view/render/cellwater.cpp

@@ -27,9 +27,9 @@ namespace CSVRender
         : mData(data)
         , mId(id)
         , mParentNode(cellNode)
-        , mWaterTransform(0)
+        , mWaterTransform(nullptr)
-        , mWaterNode(0)
+        , mWaterNode(nullptr)
-        , mWaterGeometry(0)
+        , mWaterGeometry(nullptr)
         , mDeleted(false)
         , mExterior(false)
         , mHasWater(false)
@@ -137,7 +137,7 @@ namespace CSVRender
         if (mWaterGeometry)
         {
             mWaterNode->removeDrawable(mWaterGeometry);
-            mWaterGeometry = 0;
+            mWaterGeometry = nullptr;
         }
 
         if (mDeleted || !mHasWater)

apps/opencs/view/render/editmode.hpp

@@ -30,7 +30,7 @@ namespace CSVRender
         public:
 
             EditMode (WorldspaceWidget *worldspaceWidget, const QIcon& icon, unsigned int mask,
-                const QString& tooltip = "", QWidget *parent = 0);
+                const QString& tooltip = "", QWidget *parent = nullptr);
 
             unsigned int getInteractionMask() const;
 

apps/opencs/view/render/instancemode.cpp

@@ -98,7 +98,7 @@ osg::Vec3f CSVRender::InstanceMode::getScreenCoords(const osg::Vec3f& pos)
 
 CSVRender::InstanceMode::InstanceMode (WorldspaceWidget *worldspaceWidget,  osg::ref_ptr<osg::Group> parentNode,  QWidget *parent)
 : EditMode (worldspaceWidget, QIcon (":scenetoolbar/editing-instance"), Mask_Reference | Mask_Terrain, "Instance editing",
-  parent), mSubMode (0), mSubModeId ("move"), mSelectionMode (0), mDragMode (DragMode_None),
+  parent), mSubMode (nullptr), mSubModeId ("move"), mSelectionMode (nullptr), mDragMode (DragMode_None),
   mDragAxis (-1), mLocked (false), mUnitScaleDist(1), mParentNode (parentNode)
 {
     connect(this, SIGNAL(requestFocus(const std::string&)),
@@ -169,14 +169,14 @@ void CSVRender::InstanceMode::deactivate (CSVWidget::SceneToolbar *toolbar)
     {
         toolbar->removeTool (mSelectionMode);
         delete mSelectionMode;
-        mSelectionMode = 0;
+        mSelectionMode = nullptr;
     }
 
     if (mSubMode)
     {
         toolbar->removeTool (mSubMode);
         delete mSubMode;
-        mSubMode = 0;
+        mSubMode = nullptr;
     }
 
     EditMode::deactivate (toolbar);

apps/opencs/view/render/instancemode.hpp

@@ -62,7 +62,7 @@ namespace CSVRender
 
         public:
 
-            InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = 0);
+            InstanceMode (WorldspaceWidget *worldspaceWidget, osg::ref_ptr<osg::Group> parentNode, QWidget *parent = nullptr);
 
             void activate (CSVWidget::SceneToolbar *toolbar) override;
 

apps/opencs/view/render/instancemovemode.hpp

@@ -11,7 +11,7 @@ namespace CSVRender
 
         public:
 
-            InstanceMoveMode (QWidget *parent = 0);
+            InstanceMoveMode (QWidget *parent = nullptr);
     };
 }
 

apps/opencs/view/render/lighting.hpp

@@ -16,7 +16,7 @@ namespace CSVRender
     {
         public:
 
-            Lighting() : mRootNode(0) {}
+            Lighting() : mRootNode(nullptr) {}
             virtual ~Lighting();
 
             virtual void activate (osg::Group* rootNode, bool isExterior) = 0;

apps/opencs/view/render/object.cpp

@@ -413,7 +413,7 @@ osg::Vec3f CSVRender::Object::getMarkerPosition (float x, float y, float z, int
 
 CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode,
     const std::string& id, bool referenceable, bool forceBaseToZero)
-: mData (data), mBaseNode(0), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
+: mData (data), mBaseNode(nullptr), mSelected(false), mParentNode(parentNode), mResourceSystem(data.getResourceSystem().get()), mForceBaseToZero (forceBaseToZero),
   mScaleOverride (1), mOverrideFlags (0), mSubMode (-1), mMarkerTransparency(0.5f)
 {
     mRootNode = new osg::PositionAttitudeTransform;

apps/opencs/view/render/orbitcameramode.cpp

@@ -13,7 +13,7 @@ namespace CSVRender
         QWidget* parent)
         : ModeButton(icon, tooltip, parent)
         , mWorldspaceWidget(worldspaceWidget)
-        , mCenterOnSelection(0)
+        , mCenterOnSelection(nullptr)
     {
         mCenterShortcut = new CSMPrefs::Shortcut("orbit-center-selection", worldspaceWidget);
         mCenterShortcut->enable(false);
@@ -35,7 +35,7 @@ namespace CSVRender
 
     void OrbitCameraMode::deactivate(CSVWidget::SceneToolbar* toolbar)
     {
-        mCenterShortcut->associateAction(0);
+        mCenterShortcut->associateAction(nullptr);
         mCenterShortcut->enable(false);
     }
 

apps/opencs/view/render/pagedworldspacewidget.cpp

@@ -787,7 +787,7 @@ CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const osg::Vec3d& poi
     if (searchResult != mCells.end())
         return searchResult->second;
     else
-        return 0;
+        return nullptr;
 }
 
 CSVRender::Cell* CSVRender::PagedWorldspaceWidget::getCell(const CSMWorld::CellCoordinates& coords) const

apps/opencs/view/render/pathgrid.cpp

@@ -60,8 +60,8 @@ namespace CSVRender
         , mRemoveGeometry(false)
         , mUseOffset(true)
         , mParent(parent)
-        , mPathgridGeometry(0)
+        , mPathgridGeometry(nullptr)
-        , mDragGeometry(0)
+        , mDragGeometry(nullptr)
         , mTag(new PathgridTag(this))
     {
         const float CoordScalar = ESM::Land::REAL_SIZE;
@@ -219,7 +219,7 @@ namespace CSVRender
         mMoveOffset.set(0, 0, 0);
 
         mPathgridGeode->removeDrawable(mDragGeometry);
-        mDragGeometry = 0;
+        mDragGeometry = nullptr;
     }
 
     void Pathgrid::applyPoint(CSMWorld::CommandMacro& commands, const osg::Vec3d& worldPos)
@@ -557,7 +557,7 @@ namespace CSVRender
         if (mPathgridGeometry)
         {
             mPathgridGeode->removeDrawable(mPathgridGeometry);
-            mPathgridGeometry = 0;
+            mPathgridGeometry = nullptr;
         }
     }
 
@@ -566,7 +566,7 @@ namespace CSVRender
         if (mSelectedGeometry)
         {
             mPathgridGeode->removeDrawable(mSelectedGeometry);
-            mSelectedGeometry = 0;
+            mSelectedGeometry = nullptr;
         }
     }
 
@@ -612,7 +612,7 @@ namespace CSVRender
             return &mPathgridCollection.getRecord(index).get();
         }
 
-        return 0;
+        return nullptr;
     }
 
     int Pathgrid::edgeExists(const CSMWorld::Pathgrid& source, unsigned short node1, unsigned short node2)

apps/opencs/view/render/pathgridmode.cpp

@@ -27,7 +27,7 @@ namespace CSVRender
             getTooltip(), parent)
         , mDragMode(DragMode_None)
         , mFromNode(0)
-        , mSelectionMode(0)
+        , mSelectionMode(nullptr)
     {
     }
 
@@ -59,7 +59,7 @@ namespace CSVRender
         {
             toolbar->removeTool (mSelectionMode);
             delete mSelectionMode;
-            mSelectionMode = 0;
+            mSelectionMode = nullptr;
         }
     }
 
@@ -214,7 +214,7 @@ namespace CSVRender
             Cell* cell = getWorldspaceWidget().getCell(hit.worldPos);
             if (cell && cell->getPathgrid())
             {
-                PathgridTag* tag = 0;
+                PathgridTag* tag = nullptr;
                 if (hit.tag && (tag = dynamic_cast<PathgridTag*>(hit.tag.get())) && tag->getPathgrid()->getId() == mEdgeId)
                 {
                     unsigned short node = SceneUtil::getPathgridNode(static_cast<unsigned short>(hit.index0));

apps/opencs/view/render/pathgridmode.hpp

@@ -15,7 +15,7 @@ namespace CSVRender
 
         public:
 
-            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=0);
+            PathgridMode(WorldspaceWidget* worldspace, QWidget* parent=nullptr);
 
             void activate(CSVWidget::SceneToolbar* toolbar) override;
 

apps/opencs/view/render/previewwidget.hpp

@@ -29,7 +29,7 @@ namespace CSVRender
         public:
 
             PreviewWidget (CSMWorld::Data& data, const std::string& id, bool referenceable,
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
         signals:
 

apps/opencs/view/render/scenewidget.cpp

@@ -36,7 +36,7 @@ namespace CSVRender
 
 RenderWidget::RenderWidget(QWidget *parent, Qt::WindowFlags f)
     : QWidget(parent, f)
-    , mRootNode(0)
+    , mRootNode(nullptr)
 {
 
     osgViewer::CompositeViewer& viewer = CompositeViewer::get();
@@ -257,7 +257,7 @@ void SceneWidget::setLighting(Lighting *lighting)
     mLighting = lighting;
     mLighting->activate (mRootNode, mIsExterior);
 
-    osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : 0);
+    osg::Vec4f ambient = mLighting->getAmbientColour(mHasDefaultAmbient ? &mDefaultAmbient : nullptr);
     setAmbient(ambient);
 
     flagAsModified();

apps/opencs/view/render/terrainshapemode.cpp

@@ -99,7 +99,7 @@ void CSVRender::TerrainShapeMode::primaryOpenPressed (const WorldspaceHitResult&
 
 void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult& hit)
 {
-    if (hit.hit && hit.tag == 0)
+    if (hit.hit && hit.tag == nullptr)
     {
         if (mShapeEditTool == ShapeEditTool_Flatten)
             setFlattenToolTargetHeight(hit);
@@ -124,7 +124,7 @@ void CSVRender::TerrainShapeMode::primaryEditPressed(const WorldspaceHitResult&
 
 void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, false);
     }
@@ -132,7 +132,7 @@ void CSVRender::TerrainShapeMode::primarySelectPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainShapeMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, false);
     }
@@ -144,7 +144,7 @@ bool CSVRender::TerrainShapeMode::primaryEditStartDrag (const QPoint& pos)
 
     mDragMode = InteractionType_PrimaryEdit;
 
-    if (hit.hit && hit.tag == 0)
+    if (hit.hit && hit.tag == nullptr)
     {
         mEditingPos = hit.worldPos;
         mIsEditing = true;
@@ -164,7 +164,7 @@ bool CSVRender::TerrainShapeMode::primarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -177,7 +177,7 @@ bool CSVRender::TerrainShapeMode::secondarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -202,13 +202,13 @@ void CSVRender::TerrainShapeMode::drag (const QPoint& pos, int diffX, int diffY,
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 0, true);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainShapes(CSMWorld::CellCoordinates::toVertexCoords(hit.worldPos), 1, true);
     }
 }
 

apps/opencs/view/render/terraintexturemode.cpp

@@ -119,7 +119,7 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
     int index = landtexturesCollection.searchId(mBrushTexture);
 
-    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
         undoStack.beginMacro ("Edit texture records");
         if(allowLandTextureEditing(mCellId))
@@ -133,7 +133,7 @@ void CSVRender::TerrainTextureMode::primaryEditPressed(const WorldspaceHitResult
 
 void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, false);
     }
@@ -141,7 +141,7 @@ void CSVRender::TerrainTextureMode::primarySelectPressed(const WorldspaceHitResu
 
 void CSVRender::TerrainTextureMode::secondarySelectPressed(const WorldspaceHitResult& hit)
 {
-    if(hit.hit && hit.tag == 0)
+    if(hit.hit && hit.tag == nullptr)
     {
         selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, false);
     }
@@ -166,7 +166,7 @@ bool CSVRender::TerrainTextureMode::primaryEditStartDrag (const QPoint& pos)
     CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
     int index = landtexturesCollection.searchId(mBrushTexture);
 
-    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+    if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
     {
         undoStack.beginMacro ("Edit texture records");
         mIsEditing = true;
@@ -189,7 +189,7 @@ bool CSVRender::TerrainTextureMode::primarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_PrimarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -202,7 +202,7 @@ bool CSVRender::TerrainTextureMode::secondarySelectStartDrag (const QPoint& pos)
 {
     WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
     mDragMode = InteractionType_SecondarySelect;
-    if (!hit.hit || hit.tag != 0)
+    if (!hit.hit || hit.tag != nullptr)
     {
         mDragMode = InteractionType_None;
         return false;
@@ -222,7 +222,7 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
         CSMWorld::IdCollection<CSMWorld::LandTexture>& landtexturesCollection = document.getData().getLandTextures();
         int index = landtexturesCollection.searchId(mBrushTexture);
 
-        if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == 0)
+        if (index != -1 && !landtexturesCollection.getRecord(index).isDeleted() && hit.hit && hit.tag == nullptr)
         {
             editTerrainTextureGrid(hit);
         }
@@ -231,13 +231,13 @@ void CSVRender::TerrainTextureMode::drag (const QPoint& pos, int diffX, int diff
     if (mDragMode == InteractionType_PrimarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 0, true);
     }
 
     if (mDragMode == InteractionType_SecondarySelect)
     {
         WorldspaceHitResult hit = getWorldspaceWidget().mousePick (pos, getWorldspaceWidget().getInteractionMask());
-        if (hit.hit && hit.tag == 0) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
+        if (hit.hit && hit.tag == nullptr) selectTerrainTextures(CSMWorld::CellCoordinates::toTextureCoords(hit.worldPos), 1, true);
     }
 }
 

apps/opencs/view/render/worldspacewidget.cpp

@@ -34,11 +34,11 @@
 
 CSVRender::WorldspaceWidget::WorldspaceWidget (CSMDoc::Document& document, QWidget* parent)
     : SceneWidget (document.getData().getResourceSystem(), parent, Qt::WindowFlags(), false)
-    , mSceneElements(0)
+    , mSceneElements(nullptr)
-    , mRun(0)
+    , mRun(nullptr)
     , mDocument(document)
     , mInteractionMask (0)
-    , mEditMode (0)
+    , mEditMode (nullptr)
     , mLocked (false)
     , mDragMode(InteractionType_None)
     , mDragging (false)
@@ -435,7 +435,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
         }
 
         // Something untagged, probably terrain
-        WorldspaceHitResult hit = { true, 0, 0, 0, 0, intersection.getWorldIntersectPoint() };
+        WorldspaceHitResult hit = { true, nullptr, 0, 0, 0, intersection.getWorldIntersectPoint() };
         if (intersection.indexList.size() >= 3)
         {
             hit.index0 = intersection.indexList[0];
@@ -449,7 +449,7 @@ CSVRender::WorldspaceHitResult CSVRender::WorldspaceWidget::mousePick (const QPo
     direction.normalize();
     direction *= CSMPrefs::get()["3D Scene Editing"]["distance"].toInt();
 
-    WorldspaceHitResult hit = { false, 0, 0, 0, 0, start + direction };
+    WorldspaceHitResult hit = { false, nullptr, 0, 0, 0, start + direction };
     return hit;
 }
 

apps/opencs/view/render/worldspacewidget.hpp

@@ -96,7 +96,7 @@ namespace CSVRender
                 InteractionType_None
             };
 
-            WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = 0);
+            WorldspaceWidget (CSMDoc::Document& document, QWidget *parent = nullptr);
             ~WorldspaceWidget ();
 
             CSVWidget::SceneToolMode *makeNavigationSelector (CSVWidget::SceneToolbar *parent);

apps/opencs/view/tools/merge.cpp

@@ -27,7 +27,7 @@ void CSVTools::Merge::keyPressEvent (QKeyEvent *event)
 }
 
 CSVTools::Merge::Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent)
-: QWidget (parent), mDocument (0), mDocumentManager (documentManager)
+: QWidget (parent), mDocument (nullptr), mDocumentManager (documentManager)
 {
     setWindowTitle ("Merge Content Files into a new Game File");
 
@@ -117,7 +117,7 @@ CSMDoc::Document *CSVTools::Merge::getDocument() const
 
 void CSVTools::Merge::cancel()
 {
-    mDocument = 0;
+    mDocument = nullptr;
     hide();
 }
 

apps/opencs/view/tools/merge.hpp

@@ -39,7 +39,7 @@ namespace CSVTools
 
         public:
 
-            Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent = 0);
+            Merge (CSMDoc::DocumentManager& documentManager, QWidget *parent = nullptr);
 
             /// Configure dialogue for a new merge
             void configure (CSMDoc::Document *document);

apps/opencs/view/tools/reporttable.cpp

@@ -25,7 +25,7 @@ namespace CSVTools
     {
         public:
 
-            RichTextDelegate (QObject *parent = 0);
+            RichTextDelegate (QObject *parent = nullptr);
 
             void paint(QPainter *painter, const QStyleOptionViewItem& option,
                 const QModelIndex& index) const override;
@@ -142,7 +142,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
     const CSMWorld::UniversalId& id, bool richTextDescription, int refreshState,
     QWidget *parent)
 : CSVWorld::DragRecordTable (document, parent), mModel (document.getReport (id)),
-  mRefreshAction (0), mRefreshState (refreshState)
+  mRefreshAction (nullptr), mRefreshState (refreshState)
 {
     horizontalHeader()->setSectionResizeMode (QHeaderView::Interactive);
     horizontalHeader()->setStretchLastSection (true);
@@ -159,7 +159,7 @@ CSVTools::ReportTable::ReportTable (CSMDoc::Document& document,
     setModel (mProxyModel);
     setColumnHidden (2, true);
 
-    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (0,
+    mIdTypeDelegate = CSVWorld::IdTypeDelegateFactory().makeDelegate (nullptr,
         mDocument, this);
 
     setItemDelegateForColumn (0, mIdTypeDelegate);

apps/opencs/view/tools/reporttable.hpp

@@ -62,7 +62,7 @@ namespace CSVTools
             /// 0 no refresh function exists. If the document current has the specified state
             /// the refresh function is disabled.
             ReportTable (CSMDoc::Document& document, const CSMWorld::UniversalId& id,
-                bool richTextDescription, int refreshState = 0, QWidget *parent = 0);
+                bool richTextDescription, int refreshState = 0, QWidget *parent = nullptr);
 
             std::vector<CSMWorld::UniversalId> getDraggedRecords() const override;
 

apps/opencs/view/tools/searchbox.hpp

@@ -41,7 +41,7 @@ namespace CSVTools
             
         public:
 
-            SearchBox (QWidget *parent = 0);
+            SearchBox (QWidget *parent = nullptr);
 
             void setSearchMode (bool enabled);
 

apps/opencs/view/tools/searchsubview.cpp

@@ -30,7 +30,7 @@ void CSVTools::SearchSubView::replace (bool selection)
     bool autoDelete = CSMPrefs::get()["Search & Replace"]["auto-delete"].isTrue();
 
     CSMTools::Search search (mSearch);
-    CSMWorld::IdTableBase *currentTable = 0;
+    CSMWorld::IdTableBase *currentTable = nullptr;
 
     // We are running through the indices in reverse order to avoid messing up multiple results
     // in a single string.

apps/opencs/view/widget/coloreditor.hpp

@@ -22,8 +22,8 @@ namespace CSVWidget
             QPoint calculatePopupPosition();
 
         public:
-            ColorEditor(const QColor &color, QWidget *parent = 0, const bool popupOnStart = false);
+            ColorEditor(const QColor &color, QWidget *parent = nullptr, const bool popupOnStart = false);
-            ColorEditor(const int colorInt, QWidget *parent = 0, const bool popupOnStart = false);
+            ColorEditor(const int colorInt, QWidget *parent = nullptr, const bool popupOnStart = false);
 
             QColor color() const;
 
@@ -41,7 +41,7 @@ namespace CSVWidget
             void showEvent(QShowEvent *event) override;
 
         private:
-            ColorEditor(QWidget *parent = 0, const bool popupOnStart = false);
+            ColorEditor(QWidget *parent = nullptr, const bool popupOnStart = false);
 
         private slots:
             void showPicker();

apps/opencs/view/widget/completerpopup.hpp

@@ -8,7 +8,7 @@ namespace CSVWidget
     class CompleterPopup : public QListView
     {
         public:
-            CompleterPopup(QWidget *parent = 0);
+            CompleterPopup(QWidget *parent = nullptr);
 
             int sizeHintForRow(int row) const override;
     };

apps/opencs/view/widget/droplineedit.hpp

@@ -26,7 +26,7 @@ namespace CSVWidget
             ///< The accepted Display type for this LineEdit.
 
         public:
-            DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent = 0);
+            DropLineEdit(CSMWorld::ColumnBase::Display type, QWidget *parent = nullptr);
 
         protected:
             void dragEnterEvent(QDragEnterEvent *event) override;

apps/opencs/view/widget/modebutton.hpp

@@ -17,7 +17,7 @@ namespace CSVWidget
         public:
 
             ModeButton (const QIcon& icon, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             /// Default-Implementation: do nothing
             virtual void activate (SceneToolbar *toolbar);

apps/opencs/view/widget/pushbutton.hpp

@@ -48,11 +48,11 @@ namespace CSVWidget
 
             /// \param push Do not maintain a toggle state
             PushButton (const QIcon& icon, Type type, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             /// \param push Do not maintain a toggle state
             PushButton (Type type, const QString& tooltip = "",
-                QWidget *parent = 0);
+                QWidget *parent = nullptr);
 
             bool hasKeepOpen() const;
 

apps/opencs/view/widget/scenetoolbar.hpp

@@ -23,11 +23,11 @@ namespace CSVWidget
 
         public:
 
-            SceneToolbar (int buttonSize, QWidget *parent = 0);
+            SceneToolbar (int buttonSize, QWidget *parent = nullptr);
 
             /// If insertPoint==0, insert \a tool at the end of the scrollbar. Otherwise
             /// insert tool after \a insertPoint.
-            void addTool (SceneTool *tool, SceneTool *insertPoint = 0);
+            void addTool (SceneTool *tool, SceneTool *insertPoint = nullptr);
 
             void removeTool (SceneTool *tool);
 

apps/opencs/view/widget/scenetoolmode.cpp

@@ -33,7 +33,7 @@ void CSVWidget::SceneToolMode::adjustToolTip (const ModeButton *activeMode)
 
     toolTip += "<p>(left click to change mode)";
 
-    if (createContextMenu (0))
+    if (createContextMenu (nullptr))
         toolTip += "<br>(right click to access context menu)";
 
     setToolTip (toolTip);
@@ -62,7 +62,7 @@ void CSVWidget::SceneToolMode::setButton (std::map<ModeButton *, std::string>::i
 
 CSVWidget::SceneToolMode::SceneToolMode (SceneToolbar *parent, const QString& toolTip)
 : SceneTool (parent), mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()),
-  mToolTip (toolTip), mFirst (0), mCurrent (0), mToolbar (parent)
+  mToolTip (toolTip), mFirst (nullptr), mCurrent (nullptr), mToolbar (parent)
 {
     mPanel = new QFrame (this, Qt::Popup);
 

apps/opencs/view/widget/scenetoolshapebrush.hpp

@@ -54,7 +54,7 @@ namespace CSVWidget
 
         public:
 
-            ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent = 0);
+            ShapeBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
             void configureButtonInitialSettings(QPushButton *button);
 
             const QString toolTipPoint = "Paint single point";

apps/opencs/view/widget/scenetooltexturebrush.hpp

@@ -57,7 +57,7 @@ namespace CSVWidget
         Q_OBJECT
 
         public:
-            TextureBrushWindow(CSMDoc::Document& document, QWidget *parent = 0);
+            TextureBrushWindow(CSMDoc::Document& document, QWidget *parent = nullptr);
             void configureButtonInitialSettings(QPushButton *button);
 
             const QString toolTipPoint = "Paint single point";

apps/opencs/view/widget/scenetooltoggle.cpp

@@ -115,7 +115,7 @@ QRect CSVWidget::SceneToolToggle::getIconBox (int index) const
 CSVWidget::SceneToolToggle::SceneToolToggle (SceneToolbar *parent, const QString& toolTip,
     const std::string& emptyIcon)
 : SceneTool (parent), mEmptyIcon (emptyIcon), mButtonSize (parent->getButtonSize()),
-  mIconSize (parent->getIconSize()), mToolTip (toolTip), mFirst (0)
+  mIconSize (parent->getIconSize()), mToolTip (toolTip), mFirst (nullptr)
 {
     mPanel = new QFrame (this, Qt::Popup);
 

apps/opencs/view/widget/scenetooltoggle2.cpp

@@ -57,7 +57,7 @@ CSVWidget::SceneToolToggle2::SceneToolToggle2 (SceneToolbar *parent, const QStri
     const std::string& compositeIcon, const std::string& singleIcon)
 : SceneTool (parent), mCompositeIcon (compositeIcon), mSingleIcon (singleIcon),
   mButtonSize (parent->getButtonSize()), mIconSize (parent->getIconSize()), mToolTip (toolTip),
-  mFirst (0)
+  mFirst (nullptr)
 {
     mPanel = new QFrame (this, Qt::Popup);
 

apps/opencs/view/world/creator.cpp

@@ -17,5 +17,5 @@ CSVWorld::CreatorFactoryBase::~CreatorFactoryBase() {}
 CSVWorld::Creator *CSVWorld::NullCreatorFactory::makeCreator (CSMDoc::Document& document, 
                                                               const CSMWorld::UniversalId& id) const
 {
-    return 0;
+    return nullptr;
 }

apps/opencs/view/world/dialoguespinbox.hpp

@@ -12,7 +12,7 @@ namespace CSVWorld
 
         public:
 
-            DialogueSpinBox (QWidget *parent = 0);
+            DialogueSpinBox (QWidget *parent = nullptr);
 
         protected:
 
@@ -27,7 +27,7 @@ namespace CSVWorld
 
         public:
 
-            DialogueDoubleSpinBox (QWidget *parent = 0);
+            DialogueDoubleSpinBox (QWidget *parent = nullptr);
 
         protected:
 

apps/opencs/view/world/dialoguesubview.cpp

@@ -498,7 +498,7 @@ void CSVWorld::EditWidget::remake(int row)
 
     if (mDispatcher)
         delete mDispatcher;
-    mDispatcher = new DialogueDelegateDispatcher(0/*this*/, mTable, mCommandDispatcher, mDocument);
+    mDispatcher = new DialogueDelegateDispatcher(nullptr/*this*/, mTable, mCommandDispatcher, mDocument);
 
     if (mNestedTableDispatcher)
         delete mNestedTableDispatcher;
@@ -648,7 +648,7 @@ void CSVWorld::EditWidget::remake(int row)
                 mNestedTableMapper->setModel(tree);
                 // FIXME: lack MIME support?
                 mNestedTableDispatcher =
-                        new DialogueDelegateDispatcher (0/*this*/, mTable, mCommandDispatcher, mDocument, tree);
+                        new DialogueDelegateDispatcher (nullptr/*this*/, mTable, mCommandDispatcher, mDocument, tree);
                 mNestedTableMapper->setRootIndex (tree->index(row, i));
                 mNestedTableMapper->setItemDelegate(mNestedTableDispatcher);
 
@@ -732,7 +732,7 @@ bool CSVWorld::SimpleDialogueSubView::isLocked() const
 
 CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document) :
     SubView (id),
-    mEditWidget(0),
+    mEditWidget(nullptr),
     mMainLayout(nullptr),
     mTable(dynamic_cast<CSMWorld::IdTable*>(document.getData().getTableModel(id))),
     mLocked(false),
@@ -834,7 +834,7 @@ void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &pa
         if(mEditWidget)
         {
             delete mEditWidget;
-            mEditWidget = 0;
+            mEditWidget = nullptr;
         }
         emit closeRequest(this);
     }
@@ -869,7 +869,7 @@ void CSVWorld::DialogueSubView::addButtonBar()
 
 CSVWorld::DialogueSubView::DialogueSubView (const CSMWorld::UniversalId& id,
     CSMDoc::Document& document, const CreatorFactoryBase& creatorFactory, bool sorting)
-: SimpleDialogueSubView (id, document), mButtons (0)
+: SimpleDialogueSubView (id, document), mButtons (nullptr)
 {
     // bottom box
     mBottom = new TableBottomBox (creatorFactory, document, id, this);
@@ -905,7 +905,7 @@ void CSVWorld::DialogueSubView::settingChanged (const CSMPrefs::Setting *setting
         {
             getMainLayout().removeWidget (mButtons);
             delete mButtons;
-            mButtons = 0;
+            mButtons = nullptr;
         }
     }
 }

apps/opencs/view/world/dialoguesubview.hpp

@@ -50,7 +50,7 @@ namespace CSVWorld
         const CSMWorld::IdTable* mTable;
     public:
         NotEditableSubDelegate(const CSMWorld::IdTable* table,
-                               QObject * parent = 0);
+                               QObject * parent = nullptr);
 
         void setEditorData (QWidget* editor, const QModelIndex& index) const override;
 
@@ -126,7 +126,7 @@ namespace CSVWorld
                                    CSMWorld::IdTable* table,
                                    CSMWorld::CommandDispatcher& commandDispatcher,
                                    CSMDoc::Document& document,
-                                   QAbstractItemModel* model = 0);
+                                   QAbstractItemModel* model = nullptr);
 
         ~DialogueDelegateDispatcher();
 

apps/opencs/view/world/enumdelegate.cpp

@@ -71,7 +71,7 @@ QWidget *CSVWorld::EnumDelegate::createEditor(QWidget *parent, const QStyleOptio
     const QModelIndex& index, CSMWorld::ColumnBase::Display display) const
 {
     if (!index.data(Qt::EditRole).isValid() && !index.data(Qt::DisplayRole).isValid())
-        return 0;
+        return nullptr;
 
     QComboBox *comboBox = new QComboBox (parent);
 

apps/opencs/view/world/extendedcommandconfigurator.hpp

@@ -57,7 +57,7 @@ namespace CSVWorld
         public:
             ExtendedCommandConfigurator(CSMDoc::Document &document,
                                         const CSMWorld::UniversalId &id,
-                                        QWidget *parent = 0);
+                                        QWidget *parent = nullptr);
 
             void configure(Mode mode, const std::vector<std::string> &selectedIds);
             void setEditLock(bool locked);

apps/opencs/view/world/genericcreator.cpp

@@ -148,8 +148,8 @@ void CSVWorld::GenericCreator::addScope (const QString& name, CSMWorld::Scope sc
 CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     const CSMWorld::UniversalId& id, bool relaxedIdRules)
 : mData (data), mUndoStack (undoStack), mListId (id), mLocked (false),
-  mClonedType (CSMWorld::UniversalId::Type_None), mScopes (CSMWorld::Scope_Content), mScope (0),
+  mClonedType (CSMWorld::UniversalId::Type_None), mScopes (CSMWorld::Scope_Content), mScope (nullptr),
-  mScopeLabel (0), mCloneMode (false)
+  mScopeLabel (nullptr), mCloneMode (false)
 {
     // If the collection ID has a parent type, use it instead.
     // It will change IDs with Record/SubRecord class (used for creators in Dialogue subviews)
@@ -322,10 +322,10 @@ void CSVWorld::GenericCreator::setScope (unsigned int scope)
     else
     {
         delete mScope;
-        mScope = 0;
+        mScope = nullptr;
 
         delete mScopeLabel;
-        mScopeLabel = 0;
+        mScopeLabel = nullptr;
     }
 
     updateNamespace();