diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6705ad8f..fb1ac83cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,6 +364,8 @@ configure_file(${OpenMW_SOURCE_DIR}/files/gamecontrollerdb.txt
if (NOT WIN32 AND NOT APPLE)
configure_file(${OpenMW_SOURCE_DIR}/files/openmw.desktop
"${OpenMW_BINARY_DIR}/openmw.desktop")
+ configure_file(${OpenMW_SOURCE_DIR}/files/openmw.appdata.xml
+ "${OpenMW_BINARY_DIR}/openmw.appdata.xml")
configure_file(${OpenMW_SOURCE_DIR}/files/openmw-cs.desktop
"${OpenMW_BINARY_DIR}/openmw-cs.desktop")
endif()
@@ -450,6 +452,7 @@ IF(NOT WIN32 AND NOT APPLE)
# Install icon and desktop file
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "openmw")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/launcher/images/openmw.png" DESTINATION "${ICONDIR}" COMPONENT "openmw")
+ INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw.appdata.xml" DESTINATION "${DATAROOTDIR}/appdata" COMPONENT "openmw")
IF(BUILD_OPENCS)
INSTALL(FILES "${OpenMW_BINARY_DIR}/openmw-cs.desktop" DESTINATION "${DATAROOTDIR}/applications" COMPONENT "opencs")
INSTALL(FILES "${OpenMW_SOURCE_DIR}/files/opencs/openmw-cs.png" DESTINATION "${ICONDIR}" COMPONENT "opencs")
diff --git a/apps/niftest/find_bad_nifs.sh b/apps/niftest/find_bad_nifs.sh
deleted file mode 100755
index 4b599f442..000000000
--- a/apps/niftest/find_bad_nifs.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#Script to test all nif files (both loose, and in BSA archives) in data files directory
-
-#The user input as an absolute path
-DATAFILESDIR="`readlink -m "$1"`"
-#Program used to test
-TEST_PROG="`pwd`/niftest"
-
-#Make sure our files don't bother anyone
-NIFTEST_TMP_DIR="/tmp/niftest_$RANDOM/"
-mkdir "$NIFTEST_TMP_DIR"
-cd "$NIFTEST_TMP_DIR"
-
-find "$DATAFILESDIR" -iname *bsa > nifs.txt
-find "$DATAFILESDIR" -iname *nif >> nifs.txt
-
-sed -e 's/.*/\"&\"/' nifs.txt > quoted_nifs.txt
-
-xargs --arg-file=quoted_nifs.txt "$TEST_PROG" 2>&1 | tee nif_out.txt
-# xargs --arg-file=quoted_nifs.txt "$TEST_PROG" 2> nif_out.txt >/dev/null
-
-echo "List of bad NIF Files:"
-cat nif_out.txt|grep File:|cut -d ' ' -f 2-
-
-rm nifs.txt
-rm quoted_nifs.txt
-rm nif_out.txt
-rmdir "$NIFTEST_TMP_DIR"
diff --git a/apps/niftest/niftest.cpp b/apps/niftest/niftest.cpp
index 20c8597f3..72393db40 100644
--- a/apps/niftest/niftest.cpp
+++ b/apps/niftest/niftest.cpp
@@ -2,12 +2,20 @@
#include <iostream>
#include <fstream>
+#include <cstdlib>
#include <components/nif/niffile.hpp>
#include <components/files/constrainedfilestream.hpp>
#include <components/vfs/manager.hpp>
#include <components/vfs/bsaarchive.hpp>
+#include <components/vfs/filesystemarchive.hpp>
+#include <boost/program_options.hpp>
+#include <boost/filesystem.hpp>
+
+// Create local aliases for brevity
+namespace bpo = boost::program_options;
+namespace bfs = boost::filesystem;
///See if the file has the named extension
bool hasExtension(std::string filename, std::string extensionToFind)
@@ -35,32 +43,97 @@ bool isBSA(std::string filename)
return hasExtension(filename,"bsa");
}
-///Check all the nif files in the given BSA archive
-void readBSA(std::string filename)
+/// Check all the nif files in a given VFS::Archive
+/// \note Takes ownership!
+/// \note Can not read a bsa file inside of a bsa file.
+void readVFS(VFS::Archive* anArchive,std::string archivePath = "")
{
- VFS::Manager myManager(false);
- myManager.addArchive(new VFS::BsaArchive(filename));
+ VFS::Manager myManager(true);
+ myManager.addArchive(anArchive);
myManager.buildIndex();
std::map<std::string, VFS::File*> files=myManager.getIndex();
for(std::map<std::string, VFS::File*>::const_iterator it=files.begin(); it!=files.end(); ++it)
{
- std::string name = it->first;
- if(isNIF(name))
- {
-// std::cout << "Decoding: " << name << std::endl;
- Nif::NIFFile temp_nif(myManager.get(name),name);
- }
+ std::string name = it->first;
+
+ try{
+ if(isNIF(name))
+ {
+ // std::cout << "Decoding: " << name << std::endl;
+ Nif::NIFFile temp_nif(myManager.get(name),archivePath+name);
+ }
+ else if(isBSA(name))
+ {
+ if(!archivePath.empty() && !isBSA(archivePath))
+ {
+// std::cout << "Reading BSA File: " << name << std::endl;
+ readVFS(new VFS::BsaArchive(archivePath+name),archivePath+name+"/");
+// std::cout << "Done with BSA File: " << name << std::endl;
+ }
+ }
+ }
+ catch (std::exception& e)
+ {
+ std::cerr << "ERROR, an exception has occurred: " << e.what() << std::endl;
+ }
}
}
+std::vector<std::string> parseOptions (int argc, char** argv)
+{
+ bpo::options_description desc("Ensure that OpenMW can use the provided NIF and BSA files\n\n"
+ "Usages:\n"
+ " niftool <nif files, BSA files, or directories>\n"
+ " Scan the file or directories for nif errors.\n\n"
+ "Allowed options");
+ desc.add_options()
+ ("help,h", "print help message.")
+ ("input-file", bpo::value< std::vector<std::string> >(), "input file")
+ ;
+
+ //Default option if none provided
+ bpo::positional_options_description p;
+ p.add("input-file", -1);
+
+ bpo::variables_map variables;
+ try
+ {
+ bpo::parsed_options valid_opts = bpo::command_line_parser(argc, argv).
+ options(desc).positional(p).run();
+ bpo::store(valid_opts, variables);
+ }
+ catch(std::exception &e)
+ {
+ std::cout << "ERROR parsing arguments: " << e.what() << "\n\n"
+ << desc << std::endl;
+ exit(1);
+ }
+
+ bpo::notify(variables);
+ if (variables.count ("help"))
+ {
+ std::cout << desc << std::endl;
+ exit(1);
+ }
+ if (variables.count("input-file"))
+ {
+ return variables["input-file"].as< std::vector<std::string> >();
+ }
+
+ std::cout << "No input files or directories specified!" << std::endl;
+ std::cout << desc << std::endl;
+ exit(1);
+}
+
int main(int argc, char **argv)
{
+ std::vector<std::string> files = parseOptions (argc, argv);
- std::cout << "Reading Files" << std::endl;
- for(int i = 1; i<argc;i++)
- {
- std::string name = argv[i];
+// std::cout << "Reading Files" << std::endl;
+ for(std::vector<std::string>::const_iterator it=files.begin(); it!=files.end(); ++it)
+ {
+ std::string name = *it;
try{
if(isNIF(name))
@@ -70,12 +143,17 @@ int main(int argc, char **argv)
}
else if(isBSA(name))
{
- std::cout << "Reading BSA File: " << name << std::endl;
- readBSA(name);
+// std::cout << "Reading BSA File: " << name << std::endl;
+ readVFS(new VFS::BsaArchive(name));
+ }
+ else if(bfs::is_directory(bfs::path(name)))
+ {
+// std::cout << "Reading All Files in: " << name << std::endl;
+ readVFS(new VFS::FileSystemArchive(name),name);
}
else
{
- std::cerr << "ERROR: \"" << name << "\" is not a nif or bsa file!" << std::endl;
+ std::cerr << "ERROR: \"" << name << "\" is not a nif file, bsa file, or directory!" << std::endl;
}
}
catch (std::exception& e)
diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt
index 1ae32bcbb..ff6e0506c 100644
--- a/apps/opencs/CMakeLists.txt
+++ b/apps/opencs/CMakeLists.txt
@@ -23,7 +23,7 @@ opencs_units (model/world
opencs_units_noqt (model/world
- universalid record commands columnbase scriptcontext cell refidcollection
+ universalid record commands columnbase columnimp scriptcontext cell refidcollection
refidadapter refiddata refidadapterimp ref collectionbase refcollection columns infocollection tablemimedata cellcoordinates cellselection resources resourcesmanager scope
pathgrid landtexture land nestedtablewrapper nestedcollection nestedcoladapterimp nestedinfocollection
idcompletionmanager npcstats metadata
@@ -41,7 +41,7 @@ opencs_units (model/tools
opencs_units_noqt (model/tools
mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
birthsigncheck spellcheck referencecheck referenceablecheck scriptcheck bodypartcheck
- startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck
+ startscriptcheck search searchoperation searchstage pathgridcheck soundgencheck magiceffectcheck
)
diff --git a/apps/opencs/editor.cpp b/apps/opencs/editor.cpp
index c70b3dd19..bca21ff24 100644
--- a/apps/opencs/editor.cpp
+++ b/apps/opencs/editor.cpp
@@ -1,4 +1,3 @@
-
#include "editor.hpp"
#include <openengine/bullet/BulletShapeLoader.h>
diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp
index ce434fc43..db6531dc6 100644
--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@@ -1,4 +1,3 @@
-
#include "editor.hpp"
#include <exception>
diff --git a/apps/opencs/model/doc/blacklist.cpp b/apps/opencs/model/doc/blacklist.cpp
index 083726412..b1d402c69 100644
--- a/apps/opencs/model/doc/blacklist.cpp
+++ b/apps/opencs/model/doc/blacklist.cpp
@@ -1,4 +1,3 @@
-
#include "blacklist.hpp"
#include <algorithm>
diff --git a/apps/opencs/model/doc/documentmanager.cpp b/apps/opencs/model/doc/documentmanager.cpp
index 29d7a8d3a..070c15f9a 100644
--- a/apps/opencs/model/doc/documentmanager.cpp
+++ b/apps/opencs/model/doc/documentmanager.cpp
@@ -1,4 +1,3 @@
-
#include "documentmanager.hpp"
#include <algorithm>
diff --git a/apps/opencs/model/doc/loader.cpp b/apps/opencs/model/doc/loader.cpp
index 33725a6f9..cb3ff2cd0 100644
--- a/apps/opencs/model/doc/loader.cpp
+++ b/apps/opencs/model/doc/loader.cpp
@@ -1,4 +1,3 @@
-
#include "loader.hpp"
#include <QTimer>
diff --git a/apps/opencs/model/doc/messages.cpp b/apps/opencs/model/doc/messages.cpp
index c8d26d39b..86e96a88d 100644
--- a/apps/opencs/model/doc/messages.cpp
+++ b/apps/opencs/model/doc/messages.cpp
@@ -1,4 +1,3 @@
-
#include "messages.hpp"
CSMDoc::Message::Message() {}
diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp
index 8b2717086..cb9b7ec29 100644
--- a/apps/opencs/model/doc/operation.cpp
+++ b/apps/opencs/model/doc/operation.cpp
@@ -1,4 +1,3 @@
-
#include "operation.hpp"
#include <string>
diff --git a/apps/opencs/model/doc/operationholder.cpp b/apps/opencs/model/doc/operationholder.cpp
index 25fc6fc26..db0d1a9a4 100644
--- a/apps/opencs/model/doc/operationholder.cpp
+++ b/apps/opencs/model/doc/operationholder.cpp
@@ -1,4 +1,3 @@
-
#include "operationholder.hpp"
#include "../settings/usersettings.hpp"
diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp
index 14fe0cda8..5a0bc39be 100644
--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@@ -1,4 +1,3 @@
-
#include "runner.hpp"
#include <QApplication>
diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp
index 9f6e469b8..95a2feaf2 100644
--- a/apps/opencs/model/doc/saving.cpp
+++ b/apps/opencs/model/doc/saving.cpp
@@ -1,4 +1,3 @@
-
#include "saving.hpp"
#include "../world/data.hpp"
@@ -81,22 +80,25 @@ CSMDoc::Saving::Saving (Document& document, const boost::filesystem::path& proje
appendStage (new WriteCollectionStage<CSMWorld::IdCollection<ESM::StartScript> >
(mDocument.getData().getStartScripts(), mState));
- appendStage (new WriteDialogueCollectionStage (mDocument, mState, false));
-
- appendStage (new WriteDialogueCollectionStage (mDocument, mState, true));
-
appendStage (new WriteRefIdCollectionStage (mDocument, mState));
appendStage (new CollectionReferencesStage (mDocument, mState));
appendStage (new WriteCellCollectionStage (mDocument, mState));
+ // Dialogue can reference objects and cells so must be written after these records for vanilla-compatible files
+
+ appendStage (new WriteDialogueCollectionStage (mDocument, mState, false));
+
+ appendStage (new WriteDialogueCollectionStage (mDocument, mState, true));
+
appendStage (new WritePathgridCollectionStage (mDocument, mState));
- appendStage (new WriteLandCollectionStage (mDocument, mState));
-
appendStage (new WriteLandTextureCollectionStage (mDocument, mState));
+ // references Land Textures
+ appendStage (new WriteLandCollectionStage (mDocument, mState));
+
// close file and clean up
appendStage (new CloseSaveStage (mState));
diff --git a/apps/opencs/model/doc/savingstages.cpp b/apps/opencs/model/doc/savingstages.cpp
index f78c57ecd..01d260d68 100644
--- a/apps/opencs/model/doc/savingstages.cpp
+++ b/apps/opencs/model/doc/savingstages.cpp
@@ -1,4 +1,3 @@
-
#include "savingstages.hpp"
#include <fstream>
@@ -455,6 +454,8 @@ void CSMDoc::WriteLandTextureCollectionStage::perform (int stage, Messages& mess
mState.getWriter().startRecord (record.sRecordId);
+ mState.getWriter().writeHNString("NAME", record.mId);
+
record.save (mState.getWriter());
mState.getWriter().endRecord (record.sRecordId);
diff --git a/apps/opencs/model/doc/savingstate.cpp b/apps/opencs/model/doc/savingstate.cpp
index e7ad551b2..10539c1b5 100644
--- a/apps/opencs/model/doc/savingstate.cpp
+++ b/apps/opencs/model/doc/savingstate.cpp
@@ -1,4 +1,3 @@
-
#include "savingstate.hpp"
#include "operation.hpp"
diff --git a/apps/opencs/model/doc/stage.cpp b/apps/opencs/model/doc/stage.cpp
index 78aa14574..c8da86069 100644
--- a/apps/opencs/model/doc/stage.cpp
+++ b/apps/opencs/model/doc/stage.cpp
@@ -1,4 +1,3 @@
-
#include "stage.hpp"
CSMDoc::Stage::~Stage() {}
diff --git a/apps/opencs/model/filter/andnode.cpp b/apps/opencs/model/filter/andnode.cpp
index 4249fc228..908662799 100644
--- a/apps/opencs/model/filter/andnode.cpp
+++ b/apps/opencs/model/filter/andnode.cpp
@@ -1,4 +1,3 @@
-
#include "andnode.hpp"
#include <sstream>
diff --git a/apps/opencs/model/filter/booleannode.cpp b/apps/opencs/model/filter/booleannode.cpp
index 35fc98e08..ee7ddc1c0 100644
--- a/apps/opencs/model/filter/booleannode.cpp
+++ b/apps/opencs/model/filter/booleannode.cpp
@@ -1,4 +1,3 @@
-
#include "booleannode.hpp"
CSMFilter::BooleanNode::BooleanNode (bool true_) : mTrue (true_) {}
diff --git a/apps/opencs/model/filter/leafnode.cpp b/apps/opencs/model/filter/leafnode.cpp
index 055a1747c..6745e165e 100644
--- a/apps/opencs/model/filter/leafnode.cpp
+++ b/apps/opencs/model/filter/leafnode.cpp
@@ -1,4 +1,3 @@
-
#include "leafnode.hpp"
std::vector<int> CSMFilter::LeafNode::getReferencedColumns() const
diff --git a/apps/opencs/model/filter/narynode.cpp b/apps/opencs/model/filter/narynode.cpp
index 98f706c87..f2e0e5cb2 100644
--- a/apps/opencs/model/filter/narynode.cpp
+++ b/apps/opencs/model/filter/narynode.cpp
@@ -1,4 +1,3 @@
-
#include "narynode.hpp"
#include <sstream>
diff --git a/apps/opencs/model/filter/node.cpp b/apps/opencs/model/filter/node.cpp
index 091dc4698..e25610675 100644
--- a/apps/opencs/model/filter/node.cpp
+++ b/apps/opencs/model/filter/node.cpp
@@ -1,4 +1,3 @@
-
#include "node.hpp"
CSMFilter::Node::Node() {}
diff --git a/apps/opencs/model/filter/notnode.cpp b/apps/opencs/model/filter/notnode.cpp
index b5d9da7b7..ba5302bbe 100644
--- a/apps/opencs/model/filter/notnode.cpp
+++ b/apps/opencs/model/filter/notnode.cpp
@@ -1,4 +1,3 @@
-
#include "notnode.hpp"
CSMFilter::NotNode::NotNode (boost::shared_ptr<Node> child) : UnaryNode (child, "not") {}
diff --git a/apps/opencs/model/filter/ornode.cpp b/apps/opencs/model/filter/ornode.cpp
index c5d15a384..41ec7b5cf 100644
--- a/apps/opencs/model/filter/ornode.cpp
+++ b/apps/opencs/model/filter/ornode.cpp
@@ -1,4 +1,3 @@
-
#include "ornode.hpp"
#include <sstream>
diff --git a/apps/opencs/model/filter/parser.cpp b/apps/opencs/model/filter/parser.cpp
index 51338dfc9..7936a1ae2 100644
--- a/apps/opencs/model/filter/parser.cpp
+++ b/apps/opencs/model/filter/parser.cpp
@@ -1,4 +1,3 @@
-
#include "parser.hpp"
#include <cctype>
diff --git a/apps/opencs/model/filter/textnode.cpp b/apps/opencs/model/filter/textnode.cpp
index 73c378f11..246ebae24 100644
--- a/apps/opencs/model/filter/textnode.cpp
+++ b/apps/opencs/model/filter/textnode.cpp
@@ -1,4 +1,3 @@
-
#include "textnode.hpp"
#include <sstream>
diff --git a/apps/opencs/model/filter/unarynode.cpp b/apps/opencs/model/filter/unarynode.cpp
index c40d191b6..cbdadf6fc 100644
--- a/apps/opencs/model/filter/unarynode.cpp
+++ b/apps/opencs/model/filter/unarynode.cpp
@@ -1,4 +1,3 @@
-
#include "unarynode.hpp"
CSMFilter::UnaryNode::UnaryNode (boost::shared_ptr<Node> child, const std::string& name)
diff --git a/apps/opencs/model/filter/valuenode.cpp b/apps/opencs/model/filter/valuenode.cpp
index 6fdb5cb02..85c5a8e27 100644
--- a/apps/opencs/model/filter/valuenode.cpp
+++ b/apps/opencs/model/filter/valuenode.cpp
@@ -1,4 +1,3 @@
-
#include "valuenode.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/birthsigncheck.cpp b/apps/opencs/model/tools/birthsigncheck.cpp
index 4e6da4631..9898352f1 100644
--- a/apps/opencs/model/tools/birthsigncheck.cpp
+++ b/apps/opencs/model/tools/birthsigncheck.cpp
@@ -1,4 +1,3 @@
-
#include "birthsigncheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/classcheck.cpp b/apps/opencs/model/tools/classcheck.cpp
index be57a3729..e4964d4e3 100644
--- a/apps/opencs/model/tools/classcheck.cpp
+++ b/apps/opencs/model/tools/classcheck.cpp
@@ -1,4 +1,3 @@
-
#include "classcheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/factioncheck.cpp b/apps/opencs/model/tools/factioncheck.cpp
index 0dfdee775..621b28070 100644
--- a/apps/opencs/model/tools/factioncheck.cpp
+++ b/apps/opencs/model/tools/factioncheck.cpp
@@ -1,4 +1,3 @@
-
#include "factioncheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/magiceffectcheck.cpp b/apps/opencs/model/tools/magiceffectcheck.cpp
new file mode 100644
index 000000000..5435881b3
--- /dev/null
+++ b/apps/opencs/model/tools/magiceffectcheck.cpp
@@ -0,0 +1,133 @@
+#include "magiceffectcheck.hpp"
+
+#include <components/misc/resourcehelpers.hpp>
+
+#include "../world/resources.hpp"
+#include "../world/data.hpp"
+
+namespace
+{
+ void addMessageIfNotEmpty(CSMDoc::Messages &messages, const CSMWorld::UniversalId &id, const std::string text)
+ {
+ if (!text.empty())
+ {
+ messages.push_back(std::make_pair(id, text));
+ }
+ }
+}
+
+bool CSMTools::MagicEffectCheckStage::isTextureExists(const std::string &texture, bool isIcon) const
+{
+ const CSMWorld::Resources &textures = isIcon ? mIcons : mTextures;
+ bool exists = false;
+
+ if (textures.searchId(texture) != -1)
+ {
+ exists = true;
+ }
+ else
+ {
+ std::string ddsTexture = texture;
+ if (Misc::ResourceHelpers::changeExtensionToDds(ddsTexture) && textures.searchId(ddsTexture) != -1)
+ {
+ exists = true;
+ }
+ }
+
+ return exists;
+}
+
+std::string CSMTools::MagicEffectCheckStage::checkReferenceable(const std::string &id,
+ const CSMWorld::UniversalId &type,
+ const std::string &column) const
+{
+ std::string error;
+ if (!id.empty())
+ {
+ CSMWorld::RefIdData::LocalIndex index = mReferenceables.getDataSet().searchId(id);
+ if (index.first == -1)
+ {
+ error = "No such " + column + " '" + id + "'";
+ }
+ else if (index.second != type.getType())
+ {
+ error = column + " is not of type " + type.getTypeName();
+ }
+ }
+ return error;
+}
+
+std::string CSMTools::MagicEffectCheckStage::checkSound(const std::string &id, const std::string &column) const
+{
+ std::string error;
+ if (!id.empty() && mSounds.searchId(id) == -1)
+ {
+ error = "No such " + column + " '" + id + "'";
+ }
+ return error;
+}
+
+CSMTools::MagicEffectCheckStage::MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect> &effects,
+ const CSMWorld::IdCollection<ESM::Sound> &sounds,
+ const CSMWorld::RefIdCollection &referenceables,
+ const CSMWorld::Resources &icons,
+ const CSMWorld::Resources &textures)
+ : mMagicEffects(effects),
+ mSounds(sounds),
+ mReferenceables(referenceables),
+ mIcons(icons),
+ mTextures(textures)
+{}
+
+int CSMTools::MagicEffectCheckStage::setup()
+{
+ return mMagicEffects.getSize();
+}
+
+void CSMTools::MagicEffectCheckStage::perform(int stage, CSMDoc::Messages &messages)
+{
+ ESM::MagicEffect effect = mMagicEffects.getRecord(stage).get();
+ CSMWorld::UniversalId id(CSMWorld::UniversalId::Type_MagicEffect, effect.mId);
+
+ if (effect.mData.mBaseCost < 0.0f)
+ {
+ messages.push_back(std::make_pair(id, "Base Cost is negative"));
+ }
+
+ if (effect.mIcon.empty())
+ {
+ messages.push_back(std::make_pair(id, "Icon is not specified"));
+ }
+ else if (!isTextureExists(effect.mIcon, true))
+ {
+ messages.push_back(std::make_pair(id, "No such Icon '" + effect.mIcon + "'"));
+ }
+
+ if (!effect.mParticle.empty() && !isTextureExists(effect.mParticle, false))
+ {
+ messages.push_back(std::make_pair(id, "No such Particle '" + effect.mParticle + "'"));
+ }
+
+ addMessageIfNotEmpty(messages,
+ id,
+ checkReferenceable(effect.mCasting, CSMWorld::UniversalId::Type_Static, "Casting Object"));
+ addMessageIfNotEmpty(messages,
+ id,
+ checkReferenceable(effect.mHit, CSMWorld::UniversalId::Type_Static, "Hit Object"));
+ addMessageIfNotEmpty(messages,
+ id,
+ checkReferenceable(effect.mArea, CSMWorld::UniversalId::Type_Static, "Area Object"));
+ addMessageIfNotEmpty(messages,
+ id,
+ checkReferenceable(effect.mBolt, CSMWorld::UniversalId::Type_Weapon, "Bolt Object"));
+
+ addMessageIfNotEmpty(messages, id, checkSound(effect.mCastSound, "Casting Sound"));
+ addMessageIfNotEmpty(messages, id, checkSound(effect.mHitSound, "Hit Sound"));
+ addMessageIfNotEmpty(messages, id, checkSound(effect.mAreaSound, "Area Sound"));
+ addMessageIfNotEmpty(messages, id, checkSound(effect.mBoltSound, "Bolt Sound"));
+
+ if (effect.mDescription.empty())
+ {
+ messages.push_back(std::make_pair(id, "Description is empty"));
+ }
+}
diff --git a/apps/opencs/model/tools/magiceffectcheck.hpp b/apps/opencs/model/tools/magiceffectcheck.hpp
new file mode 100644
index 000000000..0ad6760d3
--- /dev/null
+++ b/apps/opencs/model/tools/magiceffectcheck.hpp
@@ -0,0 +1,50 @@
+#ifndef CSM_TOOLS_MAGICEFFECTCHECK_HPP
+#define CSM_TOOLS_MAGICEFFECTCHECK_HPP
+
+#include <components/esm/loadmgef.hpp>
+#include <components/esm/loadsoun.hpp>
+
+#include "../world/idcollection.hpp"
+#include "../world/refidcollection.hpp"
+
+#include "../doc/stage.hpp"
+
+namespace CSMWorld
+{
+ class Resources;
+}
+
+namespace CSMTools
+{
+ /// \brief VerifyStage: make sure that magic effect records are internally consistent
+ class MagicEffectCheckStage : public CSMDoc::Stage
+ {
+ const CSMWorld::IdCollection<ESM::MagicEffect> &mMagicEffects;
+ const CSMWorld::IdCollection<ESM::Sound> &mSounds;
+ const CSMWorld::RefIdCollection &mReferenceables;
+ const CSMWorld::Resources &mIcons;
+ const CSMWorld::Resources &mTextures;
+
+ private:
+ bool isTextureExists(const std::string &texture, bool isIcon) const;
+
+ std::string checkReferenceable(const std::string &id,
+ const CSMWorld::UniversalId &type,
+ const std::string &column) const;
+ std::string checkSound(const std::string &id, const std::string &column) const;
+
+ public:
+ MagicEffectCheckStage(const CSMWorld::IdCollection<ESM::MagicEffect> &effects,
+ const CSMWorld::IdCollection<ESM::Sound> &sounds,
+ const CSMWorld::RefIdCollection &referenceables,
+ const CSMWorld::Resources &icons,
+ const CSMWorld::Resources &textures);
+
+ virtual int setup();
+ ///< \return number of steps
+ virtual void perform (int stage, CSMDoc::Messages &messages);
+ ///< Messages resulting from this tage will be appended to \a messages.
+ };
+}
+
+#endif
diff --git a/apps/opencs/model/tools/mandatoryid.cpp b/apps/opencs/model/tools/mandatoryid.cpp
index 4c97d2266..23adb9d37 100644
--- a/apps/opencs/model/tools/mandatoryid.cpp
+++ b/apps/opencs/model/tools/mandatoryid.cpp
@@ -1,4 +1,3 @@
-
#include "mandatoryid.hpp"
#include "../world/collectionbase.hpp"
diff --git a/apps/opencs/model/tools/racecheck.cpp b/apps/opencs/model/tools/racecheck.cpp
index 3b2c8d290..b30088620 100644
--- a/apps/opencs/model/tools/racecheck.cpp
+++ b/apps/opencs/model/tools/racecheck.cpp
@@ -1,4 +1,3 @@
-
#include "racecheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/regioncheck.cpp b/apps/opencs/model/tools/regioncheck.cpp
index 42abc35c9..2fdff5f38 100644
--- a/apps/opencs/model/tools/regioncheck.cpp
+++ b/apps/opencs/model/tools/regioncheck.cpp
@@ -1,4 +1,3 @@
-
#include "regioncheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/reportmodel.cpp b/apps/opencs/model/tools/reportmodel.cpp
index 4bf7d1581..77a14de84 100644
--- a/apps/opencs/model/tools/reportmodel.cpp
+++ b/apps/opencs/model/tools/reportmodel.cpp
@@ -1,4 +1,3 @@
-
#include "reportmodel.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/tools/scriptcheck.cpp b/apps/opencs/model/tools/scriptcheck.cpp
index 665edd7a3..d7c41cfcf 100644
--- a/apps/opencs/model/tools/scriptcheck.cpp
+++ b/apps/opencs/model/tools/scriptcheck.cpp
@@ -1,4 +1,3 @@
-
#include "scriptcheck.hpp"
#include <components/compiler/tokenloc.hpp>
diff --git a/apps/opencs/model/tools/search.cpp b/apps/opencs/model/tools/search.cpp
index 449df2c63..0409199af 100644
--- a/apps/opencs/model/tools/search.cpp
+++ b/apps/opencs/model/tools/search.cpp
@@ -1,4 +1,3 @@
-
#include "search.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/tools/searchoperation.cpp b/apps/opencs/model/tools/searchoperation.cpp
index 8cbc5dc8e..8fba1cc1e 100644
--- a/apps/opencs/model/tools/searchoperation.cpp
+++ b/apps/opencs/model/tools/searchoperation.cpp
@@ -1,4 +1,3 @@
-
#include "searchoperation.hpp"
#include "../doc/state.hpp"
diff --git a/apps/opencs/model/tools/searchstage.cpp b/apps/opencs/model/tools/searchstage.cpp
index 17859d930..3db10b0c3 100644
--- a/apps/opencs/model/tools/searchstage.cpp
+++ b/apps/opencs/model/tools/searchstage.cpp
@@ -1,4 +1,3 @@
-
#include "searchstage.hpp"
#include "../world/idtablebase.hpp"
diff --git a/apps/opencs/model/tools/skillcheck.cpp b/apps/opencs/model/tools/skillcheck.cpp
index 2b55526e0..77ba8d4a2 100644
--- a/apps/opencs/model/tools/skillcheck.cpp
+++ b/apps/opencs/model/tools/skillcheck.cpp
@@ -1,4 +1,3 @@
-
#include "skillcheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/soundcheck.cpp b/apps/opencs/model/tools/soundcheck.cpp
index f78932a32..6a059bee2 100644
--- a/apps/opencs/model/tools/soundcheck.cpp
+++ b/apps/opencs/model/tools/soundcheck.cpp
@@ -1,4 +1,3 @@
-
#include "soundcheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/spellcheck.cpp b/apps/opencs/model/tools/spellcheck.cpp
index bd076d2a5..91aed37ed 100644
--- a/apps/opencs/model/tools/spellcheck.cpp
+++ b/apps/opencs/model/tools/spellcheck.cpp
@@ -1,4 +1,3 @@
-
#include "spellcheck.hpp"
#include <sstream>
diff --git a/apps/opencs/model/tools/startscriptcheck.cpp b/apps/opencs/model/tools/startscriptcheck.cpp
index e3c01368b..220751797 100644
--- a/apps/opencs/model/tools/startscriptcheck.cpp
+++ b/apps/opencs/model/tools/startscriptcheck.cpp
@@ -1,4 +1,3 @@
-
#include "startscriptcheck.hpp"
#include <components/misc/stringops.hpp>
diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp
index c9c116091..0c6e36a61 100644
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@@ -1,4 +1,3 @@
-
#include "tools.hpp"
#include <QThreadPool>
@@ -28,6 +27,7 @@
#include "searchoperation.hpp"
#include "pathgridcheck.hpp"
#include "soundgencheck.hpp"
+#include "magiceffectcheck.hpp"
CSMDoc::OperationHolder *CSMTools::Tools::get (int type)
{
@@ -108,6 +108,12 @@ CSMDoc::OperationHolder *CSMTools::Tools::getVerifier()
mData.getSounds(),
mData.getReferenceables()));
+ mVerifierOperation->appendStage (new MagicEffectCheckStage (mData.getMagicEffects(),
+ mData.getSounds(),
+ mData.getReferenceables(),
+ mData.getResources (CSMWorld::UniversalId::Type_Icons),
+ mData.getResources (CSMWorld::UniversalId::Type_Textures)));
+
mVerifier.setOperation (mVerifierOperation);
}
diff --git a/apps/opencs/model/world/cell.cpp b/apps/opencs/model/world/cell.cpp
index 40520a9ba..91becdb74 100644
--- a/apps/opencs/model/world/cell.cpp
+++ b/apps/opencs/model/world/cell.cpp
@@ -1,4 +1,3 @@
-
#include "cell.hpp"
#include <sstream>
diff --git a/apps/opencs/model/world/cellcoordinates.cpp b/apps/opencs/model/world/cellcoordinates.cpp
index b1c8441e6..95e206e2d 100644
--- a/apps/opencs/model/world/cellcoordinates.cpp
+++ b/apps/opencs/model/world/cellcoordinates.cpp
@@ -1,4 +1,3 @@
-
#include "cellcoordinates.hpp"
#include <ostream>
diff --git a/apps/opencs/model/world/cellselection.cpp b/apps/opencs/model/world/cellselection.cpp
index 73b5196f1..c6988e488 100644
--- a/apps/opencs/model/world/cellselection.cpp
+++ b/apps/opencs/model/world/cellselection.cpp
@@ -1,4 +1,3 @@
-
#include "cellselection.hpp"
#include <cmath>
diff --git a/apps/opencs/model/world/collectionbase.cpp b/apps/opencs/model/world/collectionbase.cpp
index b8eed4192..6134dc172 100644
--- a/apps/opencs/model/world/collectionbase.cpp
+++ b/apps/opencs/model/world/collectionbase.cpp
@@ -1,4 +1,3 @@
-
#include "collectionbase.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/world/columnbase.cpp b/apps/opencs/model/world/columnbase.cpp
index f209e48c6..2143ec730 100644
--- a/apps/opencs/model/world/columnbase.cpp
+++ b/apps/opencs/model/world/columnbase.cpp
@@ -82,7 +82,6 @@ bool CSMWorld::ColumnBase::isId (Display display)
Display_EffectId,
Display_PartRefType,
Display_AiPackageType,
- Display_YesNo,
Display_InfoCondFunc,
Display_InfoCondVar,
Display_InfoCondComp,
diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp
index 59f2836c2..400e31333 100644
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@@ -118,7 +118,6 @@ namespace CSMWorld
Display_EffectId,
Display_PartRefType,
Display_AiPackageType,
- Display_YesNo,
Display_InfoCondFunc,
Display_InfoCondVar,
Display_InfoCondComp,
@@ -192,6 +191,12 @@ namespace CSMWorld
ColumnBase::Display_NestedHeader, flags)
{}
+ virtual void set (Record<ESXRecordT>& record, const QVariant& data)
+ {
+ // There is nothing to do here.
+ // This prevents exceptions from parent's implementation
+ }
+
virtual QVariant get (const Record<ESXRecordT>& record) const
{
return true; // required by IdTree::hasChildren()
diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp
new file mode 100644
index 000000000..dc3d39edb
--- /dev/null
+++ b/apps/opencs/model/world/columnimp.cpp
@@ -0,0 +1,28 @@
+#include "columnimp.hpp"
+
+CSMWorld::BodyPartRaceColumn::BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart> *meshType)
+ : mMeshType(meshType)
+{}
+
+QVariant CSMWorld::BodyPartRaceColumn::get(const Record<ESM::BodyPart> &record) const
+{
+ if (mMeshType != NULL && mMeshType->get(record) == ESM::BodyPart::MT_Skin)
+ {
+ return QString::fromUtf8(record.get().mRace.c_str());
+ }
+ return QVariant(QVariant::UserType);
+}
+
+void CSMWorld::BodyPartRaceColumn::set(Record<ESM::BodyPart> &record, const QVariant &data)
+{
+ ESM::BodyPart record2 = record.get();
+
+ record2.mRace = data.toString().toUtf8().constData();
+
+ record.setModified(record2);
+}
+
+bool CSMWorld::BodyPartRaceColumn::isEditable() const
+{
+ return true;
+}
diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp
index 15dd2c15b..4e608dbbd 100644
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@@ -9,6 +9,10 @@
#include <QColor>
+#include <components/esm/loadbody.hpp>
+#include <components/esm/loadskil.hpp>
+#include <components/esm/loadrace.hpp>
+
#include "columnbase.hpp"
#include "columns.hpp"
#include "info.hpp"
@@ -1911,8 +1915,8 @@ namespace CSMWorld
template<typename ESXRecordT>
struct MeshTypeColumn : public Column<ESXRecordT>
{
- MeshTypeColumn()
- : Column<ESXRecordT> (Columns::ColumnId_MeshType, ColumnBase::Display_MeshType)
+ MeshTypeColumn(int flags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue)
+ : Column<ESXRecordT> (Columns::ColumnId_MeshType, ColumnBase::Display_MeshType, flags)
{}
virtual QVariant get (const Record<ESXRecordT>& record) const
@@ -2379,7 +2383,18 @@ namespace CSMWorld
{
return true;
}
- };
+ };
+
+ struct BodyPartRaceColumn : public RaceColumn<ESM::BodyPart>
+ {
+ const MeshTypeColumn<ESM::BodyPart> *mMeshType;
+
+ BodyPartRaceColumn(const MeshTypeColumn<ESM::BodyPart> *meshType);
+
+ virtual QVariant get(const Record<ESM::BodyPart> &record) const;
+ virtual void set(Record<ESM::BodyPart> &record, const QVariant &data);
+ virtual bool isEditable() const;
+ };
}
#endif
diff --git a/apps/opencs/model/world/columns.cpp b/apps/opencs/model/world/columns.cpp
index 329d8a7a5..af26a6901 100644
--- a/apps/opencs/model/world/columns.cpp
+++ b/apps/opencs/model/world/columns.cpp
@@ -1,4 +1,3 @@
-
#include "columns.hpp"
#include <components/misc/stringops.hpp>
@@ -35,6 +34,8 @@ namespace CSMWorld
{ ColumnId_Volume, "Volume" },
{ ColumnId_MinRange, "Min Range" },
{ ColumnId_MaxRange, "Max Range" },
+ { ColumnId_MinMagnitude, "Min Magnitude" },
+ { ColumnId_MaxMagnitude, "Max Magnitude" },
{ ColumnId_SoundFile, "Sound File" },
{ ColumnId_MapColour, "Map Colour" },
{ ColumnId_SleepEncounter, "Sleep Encounter" },
@@ -107,7 +108,6 @@ namespace CSMWorld
{ ColumnId_OriginalCreature, "Original Creature" },
{ ColumnId_Biped, "Biped" },
{ ColumnId_HasWeapon, "Has Weapon" },
- { ColumnId_NoMovement, "No Movement" },
{ ColumnId_Swims, "Swims" },
{ ColumnId_Flies, "Flies" },
{ ColumnId_Walks, "Walks" },
@@ -540,11 +540,6 @@ namespace
"AI Wander", "AI Travel", "AI Follow", "AI Escort", "AI Activate", 0
};
- static const char *sAiWanderRepeat[] =
- {
- "No", "Yes", 0
- };
-
static const char *sInfoCondFunc[] =
{
" ", "Function", "Global", "Local", "Journal",
@@ -584,7 +579,6 @@ namespace
case CSMWorld::Columns::ColumnId_EffectId: return sEffectId;
case CSMWorld::Columns::ColumnId_PartRefType: return sPartRefType;
case CSMWorld::Columns::ColumnId_AiPackageType: return sAiPackageType;
- case CSMWorld::Columns::ColumnId_AiWanderRepeat: return sAiWanderRepeat;
case CSMWorld::Columns::ColumnId_InfoCondFunc: return sInfoCondFunc;
// FIXME: don't have dynamic value enum delegate, use Display_String for now
//case CSMWorld::Columns::ColumnId_InfoCond: return sInfoCond;
diff --git a/apps/opencs/model/world/columns.hpp b/apps/opencs/model/world/columns.hpp
index e2c5712d6..61b796581 100644
--- a/apps/opencs/model/world/columns.hpp
+++ b/apps/opencs/model/world/columns.hpp
@@ -102,7 +102,7 @@ namespace CSMWorld
ColumnId_OriginalCreature = 87,
ColumnId_Biped = 88,
ColumnId_HasWeapon = 89,
- ColumnId_NoMovement = 90,
+ // unused
ColumnId_Swims = 91,
ColumnId_Flies = 92,
ColumnId_Walks = 93,
@@ -306,9 +306,12 @@ namespace CSMWorld
ColumnId_FileDescription = 276,
ColumnId_Author = 277,
- ColumnId_SpellSrc = 278,
- ColumnId_SpellCost = 279,
- ColumnId_SpellChance = 280,
+ ColumnId_MinMagnitude = 278,
+ ColumnId_MaxMagnitude = 279,
+
+ ColumnId_SpellSrc = 280,
+ ColumnId_SpellCost = 281,
+ ColumnId_SpellChance = 282,
// Allocated to a separate value range, so we don't get a collision should we ever need
// to extend the number of use values.
diff --git a/apps/opencs/model/world/commanddispatcher.cpp b/apps/opencs/model/world/commanddispatcher.cpp
index b9d5bd7fe..0b1af0e84 100644
--- a/apps/opencs/model/world/commanddispatcher.cpp
+++ b/apps/opencs/model/world/commanddispatcher.cpp
@@ -1,4 +1,3 @@
-
#include "commanddispatcher.hpp"
#include <algorithm>
diff --git a/apps/opencs/model/world/commands.cpp b/apps/opencs/model/world/commands.cpp
index 5e0cc8f88..d510cd103 100644
--- a/apps/opencs/model/world/commands.cpp
+++ b/apps/opencs/model/world/commands.cpp
@@ -21,19 +21,31 @@ CSMWorld::ModifyCommand::ModifyCommand (QAbstractItemModel& model, const QModelI
// Replace proxy with actual model
mIndex = proxy->mapToSource (index);
mModel = proxy->sourceModel();
+ }
+ if (mIndex.parent().isValid())
+ {
setText ("Modify " + dynamic_cast<CSMWorld::IdTree*>(mModel)->nestedHeaderData (
mIndex.parent().column(), mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
}
else
+ {
setText ("Modify " + mModel->headerData (mIndex.column(), Qt::Horizontal, Qt::DisplayRole).toString());
+ }
// Remember record state before the modification
if (CSMWorld::IdTable *table = dynamic_cast<IdTable *>(mModel))
{
mHasRecordState = true;
int stateColumnIndex = table->findColumnIndex(Columns::ColumnId_Modification);
- mRecordStateIndex = table->index(mIndex.row(), stateColumnIndex);
+
+ int rowIndex = mIndex.row();
+ if (mIndex.parent().isValid())
+ {
+ rowIndex = mIndex.parent().row();
+ }
+
+ mRecordStateIndex = table->index(rowIndex, stateColumnIndex);
mOldRecordState = static_cast<CSMWorld::RecordBase::State>(table->data(mRecordStateIndex).toInt());
}
}
@@ -282,21 +294,24 @@ CSMWorld::DeleteNestedCommand::DeleteNestedCommand (IdTree& model,
std::string title =
model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
setText (("Delete row in " + title + " sub-table of " + mId).c_str());
+
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+ mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
}
void CSMWorld::DeleteNestedCommand::redo()
{
- const QModelIndex& parentIndex = mModel.getModelIndex(mId, mParentColumn);
-
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
mModel.removeRows (mNestedRow, 1, parentIndex);
+ mModifyParentCommand->redo();
}
void CSMWorld::DeleteNestedCommand::undo()
{
- const QModelIndex& parentIndex = mModel.getModelIndex(mId, mParentColumn);
-
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
mModel.setNestedTable(parentIndex, getOld());
+ mModifyParentCommand->undo();
}
CSMWorld::AddNestedCommand::AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent)
@@ -310,20 +325,23 @@ CSMWorld::AddNestedCommand::AddNestedCommand(IdTree& model, const std::string& i
std::string title =
model.headerData(parentColumn, Qt::Horizontal, Qt::DisplayRole).toString().toUtf8().constData();
setText (("Add row in " + title + " sub-table of " + mId).c_str());
+
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
+ mModifyParentCommand = new ModifyCommand(mModel, parentIndex, parentIndex.data(Qt::EditRole), this);
}
void CSMWorld::AddNestedCommand::redo()
{
- const QModelIndex& parentIndex = mModel.getModelIndex(mId, mParentColumn);
-
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
mModel.addNestedRow (parentIndex, mNewRow);
+ mModifyParentCommand->redo();
}
void CSMWorld::AddNestedCommand::undo()
{
- const QModelIndex& parentIndex = mModel.getModelIndex(mId, mParentColumn);
-
+ QModelIndex parentIndex = mModel.getModelIndex(mId, mParentColumn);
mModel.setNestedTable(parentIndex, getOld());
+ mModifyParentCommand->undo();
}
CSMWorld::NestedTableStoring::NestedTableStoring(const IdTree& model, const std::string& id, int parentColumn)
diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp
index 81c40d0ab..23ffccbd7 100644
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@@ -200,6 +200,9 @@ namespace CSMWorld
int mNestedRow;
+ // The command to redo/undo the Modified status of a record
+ ModifyCommand *mModifyParentCommand;
+
public:
DeleteNestedCommand (IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
@@ -219,6 +222,9 @@ namespace CSMWorld
int mParentColumn;
+ // The command to redo/undo the Modified status of a record
+ ModifyCommand *mModifyParentCommand;
+
public:
AddNestedCommand(IdTree& model, const std::string& id, int nestedRow, int parentColumn, QUndoCommand* parent = 0);
diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp
index 7b3e1fe4f..b6b7f689e 100644
--- a/apps/opencs/model/world/data.cpp
+++ b/apps/opencs/model/world/data.cpp
@@ -1,4 +1,3 @@
-
#include "data.hpp"
#include <stdexcept>
@@ -293,9 +292,9 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mSpells.getNestableColumn(index)->addColumn(
new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
mSpells.getNestableColumn(index)->addColumn(
- new NestedChildColumn (Columns::ColumnId_MinRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
mSpells.getNestableColumn(index)->addColumn(
- new NestedChildColumn (Columns::ColumnId_MaxRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
mTopics.addColumn (new StringIdColumn<ESM::Dialogue>);
mTopics.addColumn (new RecordStateColumn<ESM::Dialogue>);
@@ -409,9 +408,9 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mEnchantments.getNestableColumn(index)->addColumn(
new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
mEnchantments.getNestableColumn(index)->addColumn(
- new NestedChildColumn (Columns::ColumnId_MinRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
mEnchantments.getNestableColumn(index)->addColumn(
- new NestedChildColumn (Columns::ColumnId_MaxRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
mBodyParts.addColumn (new StringIdColumn<ESM::BodyPart>);
mBodyParts.addColumn (new RecordStateColumn<ESM::BodyPart>);
@@ -421,9 +420,12 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, const ResourcesManager& resourc
mBodyParts.addColumn (new FlagColumn<ESM::BodyPart> (Columns::ColumnId_Female, ESM::BodyPart::BPF_Female));
mBodyParts.addColumn (new FlagColumn<ESM::BodyPart> (Columns::ColumnId_Playable,
ESM::BodyPart::BPF_NotPlayable, ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue, true));
- mBodyParts.addColumn (new MeshTypeColumn<ESM::BodyPart>);
+
+ int meshTypeFlags = ColumnBase::Flag_Table | ColumnBase::Flag_Dialogue | ColumnBase::Flag_Dialogue_Refresh;
+ MeshTypeColumn<ESM::BodyPart> *meshTypeColumn = new MeshTypeColumn<ESM::BodyPart>(meshTypeFlags);
+ mBodyParts.addColumn (meshTypeColumn);
mBodyParts.addColumn (new ModelColumn<ESM::BodyPart>);
- mBodyParts.addColumn (new RaceColumn<ESM::BodyPart>);
+ mBodyParts.addColumn (new BodyPartRaceColumn(meshTypeColumn));
mSoundGens.addColumn (new StringIdColumn<ESM::SoundGenerator>);
mSoundGens.addColumn (new RecordStateColumn<ESM::SoundGenerator>);
diff --git a/apps/opencs/model/world/idtable.cpp b/apps/opencs/model/world/idtable.cpp
index 8ca19f7e9..bd1179cea 100644
--- a/apps/opencs/model/world/idtable.cpp
+++ b/apps/opencs/model/world/idtable.cpp
@@ -76,8 +76,15 @@ bool CSMWorld::IdTable::setData (const QModelIndex &index, const QVariant &value
if (mIdCollection->getColumn (index.column()).isEditable() && role==Qt::EditRole)
{
mIdCollection->setData (index.row(), index.column(), value);
+ emit dataChanged(index, index);
- emit dataChanged (index, index);
+ // Modifying a value can also change the Modified status of a record.
+ int stateColumn = searchColumnIndex(Columns::ColumnId_Modification);
+ if (stateColumn != -1)
+ {
+ QModelIndex stateIndex = this->index(index.row(), stateColumn);
+ emit dataChanged(stateIndex, stateIndex);
+ }
return true;
}
diff --git a/apps/opencs/model/world/idtablebase.cpp b/apps/opencs/model/world/idtablebase.cpp
index 389f5396e..274446b79 100644
--- a/apps/opencs/model/world/idtablebase.cpp
+++ b/apps/opencs/model/world/idtablebase.cpp
@@ -1,4 +1,3 @@
-
#include "idtablebase.hpp"
CSMWorld::IdTableBase::IdTableBase (unsigned int features) : mFeatures (features) {}
diff --git a/apps/opencs/model/world/idtableproxymodel.cpp b/apps/opencs/model/world/idtableproxymodel.cpp
index 10fd92b46..fbf7b6cf3 100644
--- a/apps/opencs/model/world/idtableproxymodel.cpp
+++ b/apps/opencs/model/world/idtableproxymodel.cpp
@@ -1,10 +1,21 @@
-
#include "idtableproxymodel.hpp"
#include <vector>
#include "idtablebase.hpp"
+namespace
+{
+ std::string getEnumValue(const std::vector<std::string> &values, int index)
+ {
+ if (index < 0 || index >= static_cast<int>(values.size()))
+ {
+ return "";
+ }
+ return values[index];
+ }
+}
+
void CSMWorld::IdTableProxyModel::updateColumnMap()
{
Q_ASSERT(mSourceModel != NULL);
@@ -93,7 +104,9 @@ bool CSMWorld::IdTableProxyModel::lessThan(const QModelIndex &left, const QModel
if (valuesIt != mEnumColumnCache.end())
{
- return valuesIt->second[left.data().toInt()] < valuesIt->second[right.data().toInt()];
+ std::string first = getEnumValue(valuesIt->second, left.data().toInt());
+ std::string second = getEnumValue(valuesIt->second, right.data().toInt());
+ return first < second;
}
return QSortFilterProxyModel::lessThan(left, right);
}
diff --git a/apps/opencs/model/world/idtree.cpp b/apps/opencs/model/world/idtree.cpp
index d8e8c6107..56d83d9ed 100644
--- a/apps/opencs/model/world/idtree.cpp
+++ b/apps/opencs/model/world/idtree.cpp
@@ -95,8 +95,15 @@ bool CSMWorld::IdTree::setData (const QModelIndex &index, const QVariant &value,
const std::pair<int, int>& parentAddress(unfoldIndexAddress(index.internalId()));
mNestedCollection->setNestedData(parentAddress.first, parentAddress.second, value, index.row(), index.column());
+ emit dataChanged(index, index);
- emit dataChanged (index, index);
+ // Modifying a value can also change the Modified status of a record.
+ int stateColumn = searchColumnIndex(Columns::ColumnId_Modification);
+ if (stateColumn != -1)
+ {
+ QModelIndex stateIndex = this->index(index.parent().row(), stateColumn);
+ emit dataChanged(stateIndex, stateIndex);
+ }
return true;
}
diff --git a/apps/opencs/model/world/infocollection.cpp b/apps/opencs/model/world/infocollection.cpp
index 560be8131..60c613041 100644
--- a/apps/opencs/model/world/infocollection.cpp
+++ b/apps/opencs/model/world/infocollection.cpp
@@ -1,4 +1,3 @@
-
#include "infocollection.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/world/landtexture.cpp b/apps/opencs/model/world/landtexture.cpp
index 4725866a5..e7772129c 100644
--- a/apps/opencs/model/world/landtexture.cpp
+++ b/apps/opencs/model/world/landtexture.cpp
@@ -9,13 +9,7 @@ namespace CSMWorld
{
ESM::LandTexture::load(esm);
- int plugin = esm.getIndex();
-
- std::ostringstream stream;
-
- stream << mIndex << "_" << plugin;
-
- mId = stream.str();
+ mPluginIndex = esm.getIndex();
}
}
diff --git a/apps/opencs/model/world/landtexture.hpp b/apps/opencs/model/world/landtexture.hpp
index b13903186..c0b6eeba9 100644
--- a/apps/opencs/model/world/landtexture.hpp
+++ b/apps/opencs/model/world/landtexture.hpp
@@ -7,13 +7,10 @@
namespace CSMWorld
{
- /// \brief Wrapper for LandTexture record. Encodes mIndex and the plugin index (obtained from ESMReader)
- /// in the ID.
- ///
- /// \attention The mId field of the ESM::LandTexture struct is not used.
+ /// \brief Wrapper for LandTexture record, providing info which plugin the LandTexture was loaded from.
struct LandTexture : public ESM::LandTexture
{
- std::string mId;
+ int mPluginIndex;
void load (ESM::ESMReader &esm);
};
diff --git a/apps/opencs/model/world/metadata.cpp b/apps/opencs/model/world/metadata.cpp
index 40b8e9519..960fdc9e4 100644
--- a/apps/opencs/model/world/metadata.cpp
+++ b/apps/opencs/model/world/metadata.cpp
@@ -1,4 +1,3 @@
-
#include "metadata.hpp"
#include <components/esm/loadtes3.hpp>
diff --git a/apps/opencs/model/world/record.cpp b/apps/opencs/model/world/record.cpp
index ef2f4d320..f13a36afc 100644
--- a/apps/opencs/model/world/record.cpp
+++ b/apps/opencs/model/world/record.cpp
@@ -1,4 +1,3 @@
-
#include "record.hpp"
CSMWorld::RecordBase::~RecordBase() {}
diff --git a/apps/opencs/model/world/ref.cpp b/apps/opencs/model/world/ref.cpp
index 13706c950..638f7ec9c 100644
--- a/apps/opencs/model/world/ref.cpp
+++ b/apps/opencs/model/world/ref.cpp
@@ -1,4 +1,3 @@
-
#include "ref.hpp"
#include <cmath>
diff --git a/apps/opencs/model/world/refcollection.cpp b/apps/opencs/model/world/refcollection.cpp
index ff30dafae..f8818807b 100644
--- a/apps/opencs/model/world/refcollection.cpp
+++ b/apps/opencs/model/world/refcollection.cpp
@@ -1,4 +1,3 @@
-
#include "refcollection.hpp"
#include <sstream>
diff --git a/apps/opencs/model/world/refidadapterimp.hpp b/apps/opencs/model/world/refidadapterimp.hpp
index 9fc296231..9d1c1907b 100644
--- a/apps/opencs/model/world/refidadapterimp.hpp
+++ b/apps/opencs/model/world/refidadapterimp.hpp
@@ -1466,7 +1466,7 @@ namespace CSMWorld
return QVariant();
case 5: // wander repeat
if (content.mType == ESM::AI_Wander)
- return content.mWander.mShouldRepeat;
+ return content.mWander.mShouldRepeat != 0;
else
return QVariant();
case 6: // activate name
diff --git a/apps/opencs/model/world/refidcollection.cpp b/apps/opencs/model/world/refidcollection.cpp
index fc52fe388..8ea2bb30a 100644
--- a/apps/opencs/model/world/refidcollection.cpp
+++ b/apps/opencs/model/world/refidcollection.cpp
@@ -94,9 +94,9 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
mColumns.back().addColumn(
new NestedChildColumn (Columns::ColumnId_Duration, ColumnBase::Display_Integer)); // reuse from light
mColumns.back().addColumn(
- new NestedChildColumn (Columns::ColumnId_MinRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MinMagnitude, ColumnBase::Display_Integer));
mColumns.back().addColumn(
- new NestedChildColumn (Columns::ColumnId_MaxRange, ColumnBase::Display_Integer)); // reuse from sound
+ new NestedChildColumn (Columns::ColumnId_MaxMagnitude, ColumnBase::Display_Integer));
EnchantableColumns enchantableColumns (inventoryColumns);
@@ -156,7 +156,7 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
new RefIdColumn (Columns::ColumnId_SpellType, CSMWorld::ColumnBase::Display_SpellType, false/*editable*/, false/*user editable*/));
// creatures do not have below columns
mColumns.back().addColumn(
- new RefIdColumn (Columns::ColumnId_SpellSrc, CSMWorld::ColumnBase::Display_YesNo, false, false)); // from race
+ new RefIdColumn (Columns::ColumnId_SpellSrc, CSMWorld::ColumnBase::Display_Boolean, false, false)); // from race
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_SpellCost, CSMWorld::ColumnBase::Display_Integer, false, false));
mColumns.back().addColumn(
@@ -208,7 +208,7 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiWanderIdle, CSMWorld::ColumnBase::Display_Integer));
mColumns.back().addColumn(
- new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_YesNo));
+ new RefIdColumn (Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
mColumns.back().addColumn(
new RefIdColumn (Columns::ColumnId_AiActivateName, CSMWorld::ColumnBase::Display_String));
mColumns.back().addColumn(
@@ -331,7 +331,6 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
{
{ Columns::ColumnId_Biped, ESM::Creature::Bipedal },
{ Columns::ColumnId_HasWeapon, ESM::Creature::Weapon },
- { Columns::ColumnId_NoMovement, ESM::Creature::None },
{ Columns::ColumnId_Swims, ESM::Creature::Swims },
{ Columns::ColumnId_Flies, ESM::Creature::Flies },
{ Columns::ColumnId_Walks, ESM::Creature::Walks },
@@ -391,7 +390,7 @@ CSMWorld::RefIdCollection::RefIdCollection(const CSMWorld::Data& data)
{ Columns::ColumnId_Portable, ESM::Light::Carry },
{ Columns::ColumnId_NegativeLight, ESM::Light::Negative },
{ Columns::ColumnId_Flickering, ESM::Light::Flicker },
- { Columns::ColumnId_SlowFlickering, ESM::Light::Flicker },
+ { Columns::ColumnId_SlowFlickering, ESM::Light::FlickerSlow },
{ Columns::ColumnId_Pulsing, ESM::Light::Pulse },
{ Columns::ColumnId_SlowPulsing, ESM::Light::PulseSlow },
{ Columns::ColumnId_Fire, ESM::Light::Fire },
diff --git a/apps/opencs/model/world/refiddata.cpp b/apps/opencs/model/world/refiddata.cpp
index 7f5c25f36..c391201e6 100644
--- a/apps/opencs/model/world/refiddata.cpp
+++ b/apps/opencs/model/world/refiddata.cpp
@@ -1,4 +1,3 @@
-
#include "refiddata.hpp"
#include <cassert>
diff --git a/apps/opencs/model/world/regionmap.cpp b/apps/opencs/model/world/regionmap.cpp
index 42bde9c81..10c67c909 100644
--- a/apps/opencs/model/world/regionmap.cpp
+++ b/apps/opencs/model/world/regionmap.cpp
@@ -1,4 +1,3 @@
-
#include "regionmap.hpp"
#include <cmath>
diff --git a/apps/opencs/model/world/resources.cpp b/apps/opencs/model/world/resources.cpp
index 8c9439890..8bfd83248 100644
--- a/apps/opencs/model/world/resources.cpp
+++ b/apps/opencs/model/world/resources.cpp
@@ -1,4 +1,3 @@
-
#include "resources.hpp"
#include <sstream>
diff --git a/apps/opencs/model/world/resourcesmanager.cpp b/apps/opencs/model/world/resourcesmanager.cpp
index deddd83b5..1b4770197 100644
--- a/apps/opencs/model/world/resourcesmanager.cpp
+++ b/apps/opencs/model/world/resourcesmanager.cpp
@@ -1,4 +1,3 @@
-
#include "resourcesmanager.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/world/resourcetable.cpp b/apps/opencs/model/world/resourcetable.cpp
index 2cd44781a..5227ec3e6 100644
--- a/apps/opencs/model/world/resourcetable.cpp
+++ b/apps/opencs/model/world/resourcetable.cpp
@@ -1,4 +1,3 @@
-
#include "resourcetable.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/world/scope.cpp b/apps/opencs/model/world/scope.cpp
index 6e4ce4c02..b026c34c3 100644
--- a/apps/opencs/model/world/scope.cpp
+++ b/apps/opencs/model/world/scope.cpp
@@ -1,4 +1,3 @@
-
#include "scope.hpp"
#include <stdexcept>
diff --git a/apps/opencs/model/world/scriptcontext.cpp b/apps/opencs/model/world/scriptcontext.cpp
index a8c2c9452..bcbca4b28 100644
--- a/apps/opencs/model/world/scriptcontext.cpp
+++ b/apps/opencs/model/world/scriptcontext.cpp
@@ -1,4 +1,3 @@
-
#include "scriptcontext.hpp"
#include <algorithm>
diff --git a/apps/opencs/model/world/tablemimedata.hpp b/apps/opencs/model/world/tablemimedata.hpp
index 06d252435..a42e97561 100644
--- a/apps/opencs/model/world/tablemimedata.hpp
+++ b/apps/opencs/model/world/tablemimedata.hpp
@@ -1,4 +1,3 @@
-
#ifndef TABLEMIMEDATA_H
#define TABLEMIMEDATA_H
diff --git a/apps/opencs/model/world/universalid.cpp b/apps/opencs/model/world/universalid.cpp
index 8ad9873fc..4c6601e52 100644
--- a/apps/opencs/model/world/universalid.cpp
+++ b/apps/opencs/model/world/universalid.cpp
@@ -1,4 +1,3 @@
-
#include "universalid.hpp"
#include <ostream>
diff --git a/apps/opencs/view/doc/adjusterwidget.cpp b/apps/opencs/view/doc/adjusterwidget.cpp
index 6571ad7c8..ba5dd90f8 100644
--- a/apps/opencs/view/doc/adjusterwidget.cpp
+++ b/apps/opencs/view/doc/adjusterwidget.cpp
@@ -1,4 +1,3 @@
-
#include "adjusterwidget.hpp"
#include <stdexcept>
diff --git a/apps/opencs/view/doc/filewidget.cpp b/apps/opencs/view/doc/filewidget.cpp
index f18fe695a..bbb824823 100644
--- a/apps/opencs/view/doc/filewidget.cpp
+++ b/apps/opencs/view/doc/filewidget.cpp
@@ -1,4 +1,3 @@
-
#include "filewidget.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/doc/globaldebugprofilemenu.cpp b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
index b88381385..f0d9655dd 100644
--- a/apps/opencs/view/doc/globaldebugprofilemenu.cpp
+++ b/apps/opencs/view/doc/globaldebugprofilemenu.cpp
@@ -1,4 +1,3 @@
-
#include "globaldebugprofilemenu.hpp"
#include <vector>
diff --git a/apps/opencs/view/doc/loader.cpp b/apps/opencs/view/doc/loader.cpp
index 30235d0f5..713295d70 100644
--- a/apps/opencs/view/doc/loader.cpp
+++ b/apps/opencs/view/doc/loader.cpp
@@ -1,4 +1,3 @@
-
#include "loader.hpp"
#include <QVBoxLayout>
diff --git a/apps/opencs/view/doc/newgame.cpp b/apps/opencs/view/doc/newgame.cpp
index 32b483728..b3e2a4f63 100644
--- a/apps/opencs/view/doc/newgame.cpp
+++ b/apps/opencs/view/doc/newgame.cpp
@@ -1,4 +1,3 @@
-
#include "newgame.hpp"
#include <QApplication>
diff --git a/apps/opencs/view/doc/runlogsubview.cpp b/apps/opencs/view/doc/runlogsubview.cpp
index 129396999..2b7182228 100644
--- a/apps/opencs/view/doc/runlogsubview.cpp
+++ b/apps/opencs/view/doc/runlogsubview.cpp
@@ -1,4 +1,3 @@
-
#include "runlogsubview.hpp"
#include <QTextEdit>
diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp
index 58a46c603..a9d697f1c 100644
--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@@ -1,4 +1,3 @@
-
#include "startup.hpp"
#include <QApplication>
diff --git a/apps/opencs/view/doc/subviewfactory.cpp b/apps/opencs/view/doc/subviewfactory.cpp
index 3137f7e32..82a8aeb05 100644
--- a/apps/opencs/view/doc/subviewfactory.cpp
+++ b/apps/opencs/view/doc/subviewfactory.cpp
@@ -1,4 +1,3 @@
-
#include "subviewfactory.hpp"
#include <cassert>
diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp
index 294efdc1b..8ffd7335d 100644
--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@@ -1,4 +1,3 @@
-
#include "viewmanager.hpp"
#include <vector>
@@ -97,13 +96,12 @@ CSVDoc::ViewManager::ViewManager (CSMDoc::DocumentManager& documentManager)
{ CSMWorld::ColumnBase::Display_MeshType, CSMWorld::Columns::ColumnId_MeshType, false },
{ CSMWorld::ColumnBase::Display_Gender, CSMWorld::Columns::ColumnId_Gender, true },
{ CSMWorld::ColumnBase::Display_SoundGeneratorType, CSMWorld::Columns::ColumnId_SoundGeneratorType, false },
- { CSMWorld::ColumnBase::Display_School, CSMWorld::Columns::ColumnId_School, true },
+ { CSMWorld::ColumnBase::Display_School, CSMWorld::Columns::ColumnId_School, false },
{ CSMWorld::ColumnBase::Display_SkillImpact, CSMWorld::Columns::ColumnId_SkillImpact, true },
{ CSMWorld::ColumnBase::Display_EffectRange, CSMWorld::Columns::ColumnId_EffectRange, false },
{ CSMWorld::ColumnBase::Display_EffectId, CSMWorld::Columns::ColumnId_EffectId, false },
{ CSMWorld::ColumnBase::Display_PartRefType, CSMWorld::Columns::ColumnId_PartRefType, false },
{ CSMWorld::ColumnBase::Display_AiPackageType, CSMWorld::Columns::ColumnId_AiPackageType, false },
- { CSMWorld::ColumnBase::Display_YesNo, CSMWorld::Columns::ColumnId_AiWanderRepeat, false },
{ CSMWorld::ColumnBase::Display_InfoCondFunc, CSMWorld::Columns::ColumnId_InfoCondFunc, false },
{ CSMWorld::ColumnBase::Display_InfoCondComp, CSMWorld::Columns::ColumnId_InfoCondComp, false },
{ CSMWorld::ColumnBase::Display_RaceSkill, CSMWorld::Columns::ColumnId_RaceSkill, true },
diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp
index bc7f9b5a1..657a47750 100644
--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@@ -1,4 +1,3 @@
-
#include "editwidget.hpp"
#include <QAbstractItemModel>
diff --git a/apps/opencs/view/filter/filterbox.cpp b/apps/opencs/view/filter/filterbox.cpp
index 7a42ef0a5..c6c6cc6cc 100644
--- a/apps/opencs/view/filter/filterbox.cpp
+++ b/apps/opencs/view/filter/filterbox.cpp
@@ -1,4 +1,3 @@
-
#include "filterbox.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/filter/recordfilterbox.cpp b/apps/opencs/view/filter/recordfilterbox.cpp
index 97490d508..2bf589215 100644
--- a/apps/opencs/view/filter/recordfilterbox.cpp
+++ b/apps/opencs/view/filter/recordfilterbox.cpp
@@ -1,4 +1,3 @@
-
#include "recordfilterbox.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/render/cell.cpp b/apps/opencs/view/render/cell.cpp
index 99658e1c8..156d9728b 100644
--- a/apps/opencs/view/render/cell.cpp
+++ b/apps/opencs/view/render/cell.cpp
@@ -1,4 +1,3 @@
-
#include "cell.hpp"
#include <OgreSceneManager.h>
diff --git a/apps/opencs/view/render/editmode.cpp b/apps/opencs/view/render/editmode.cpp
index 9361030a3..8a99ba049 100644
--- a/apps/opencs/view/render/editmode.cpp
+++ b/apps/opencs/view/render/editmode.cpp
@@ -1,4 +1,3 @@
-
#include "editmode.hpp"
#include "worldspacewidget.hpp"
diff --git a/apps/opencs/view/render/lightingbright.cpp b/apps/opencs/view/render/lightingbright.cpp
index a342ab093..41d7c5c65 100644
--- a/apps/opencs/view/render/lightingbright.cpp
+++ b/apps/opencs/view/render/lightingbright.cpp
@@ -1,4 +1,3 @@
-
#include "lightingbright.hpp"
#include <OgreSceneManager.h>
diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp
index 21fba4d4e..bcaadbcea 100644
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@@ -1,4 +1,3 @@
-
#include "pagedworldspacewidget.hpp"
#include <sstream>
diff --git a/apps/opencs/view/render/previewwidget.cpp b/apps/opencs/view/render/previewwidget.cpp
index da18e7c89..c00c56ed0 100644
--- a/apps/opencs/view/render/previewwidget.cpp
+++ b/apps/opencs/view/render/previewwidget.cpp
@@ -1,4 +1,3 @@
-
#include "previewwidget.hpp"
#include <OgreSceneManager.h>
diff --git a/apps/opencs/view/render/terrainstorage.cpp b/apps/opencs/view/render/terrainstorage.cpp
index a14eea5dd..9998daeee 100644
--- a/apps/opencs/view/render/terrainstorage.cpp
+++ b/apps/opencs/view/render/terrainstorage.cpp
@@ -28,10 +28,18 @@ namespace CSVRender
const ESM::LandTexture* TerrainStorage::getLandTexture(int index, short plugin)
{
- std::ostringstream stream;
- stream << index << "_" << plugin;
+ int numRecords = mData.getLandTextures().getSize();
- return &mData.getLandTextures().getRecord(stream.str()).get();
+ for (int i=0; i<numRecords; ++i)
+ {
+ const CSMWorld::LandTexture* ltex = &mData.getLandTextures().getRecord(i).get();
+ if (ltex->mIndex == index && ltex->mPluginIndex == plugin)
+ return ltex;
+ }
+
+ std::stringstream error;
+ error << "Can't find LandTexture " << index << " from plugin " << plugin;
+ throw std::runtime_error(error.str());
}
void TerrainStorage::getBounds(float &minX, float &maxX, float &minY, float &maxY)
diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp
index 383382938..4f9dbb96c 100644
--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@@ -1,4 +1,3 @@
-
#include "unpagedworldspacewidget.hpp"
#include <sstream>
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index ba0ec8446..823a38c80 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -1,4 +1,3 @@
-
#include "worldspacewidget.hpp"
#include <algorithm>
diff --git a/apps/opencs/view/tools/reportsubview.cpp b/apps/opencs/view/tools/reportsubview.cpp
index e29447f25..a7316359e 100644
--- a/apps/opencs/view/tools/reportsubview.cpp
+++ b/apps/opencs/view/tools/reportsubview.cpp
@@ -1,4 +1,3 @@
-
#include "reportsubview.hpp"
#include "reporttable.hpp"
diff --git a/apps/opencs/view/tools/reporttable.cpp b/apps/opencs/view/tools/reporttable.cpp
index 550c53969..d4cecc971 100644
--- a/apps/opencs/view/tools/reporttable.cpp
+++ b/apps/opencs/view/tools/reporttable.cpp
@@ -1,4 +1,3 @@
-
#include "reporttable.hpp"
#include <algorithm>
diff --git a/apps/opencs/view/tools/searchbox.cpp b/apps/opencs/view/tools/searchbox.cpp
index 1307c1aab..d98044760 100644
--- a/apps/opencs/view/tools/searchbox.cpp
+++ b/apps/opencs/view/tools/searchbox.cpp
@@ -1,4 +1,3 @@
-
#include "searchbox.hpp"
#include <stdexcept>
diff --git a/apps/opencs/view/tools/searchsubview.cpp b/apps/opencs/view/tools/searchsubview.cpp
index 8b35db6ae..d3fdbbf5d 100644
--- a/apps/opencs/view/tools/searchsubview.cpp
+++ b/apps/opencs/view/tools/searchsubview.cpp
@@ -1,4 +1,3 @@
-
#include "searchsubview.hpp"
#include <QVBoxLayout>
diff --git a/apps/opencs/view/tools/subviews.cpp b/apps/opencs/view/tools/subviews.cpp
index 8a343ebe8..8c3d6d50e 100644
--- a/apps/opencs/view/tools/subviews.cpp
+++ b/apps/opencs/view/tools/subviews.cpp
@@ -1,4 +1,3 @@
-
#include "subviews.hpp"
#include "../doc/subviewfactoryimp.hpp"
diff --git a/apps/opencs/view/widget/modebutton.cpp b/apps/opencs/view/widget/modebutton.cpp
index 56896b422..7c62f6bb1 100644
--- a/apps/opencs/view/widget/modebutton.cpp
+++ b/apps/opencs/view/widget/modebutton.cpp
@@ -1,4 +1,3 @@
-
#include "modebutton.hpp"
CSVWidget::ModeButton::ModeButton (const QIcon& icon, const QString& tooltip, QWidget *parent)
diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index 1baeb7ca2..424aaf68a 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -1,4 +1,3 @@
-
#include "pushbutton.hpp"
#include <QMouseEvent>
diff --git a/apps/opencs/view/widget/scenetool.cpp b/apps/opencs/view/widget/scenetool.cpp
index b8e9f895f..796b98567 100644
--- a/apps/opencs/view/widget/scenetool.cpp
+++ b/apps/opencs/view/widget/scenetool.cpp
@@ -1,4 +1,3 @@
-
#include "scenetool.hpp"
#include <QMouseEvent>
diff --git a/apps/opencs/view/widget/scenetoolbar.cpp b/apps/opencs/view/widget/scenetoolbar.cpp
index f7023b31f..b2e988dc9 100644
--- a/apps/opencs/view/widget/scenetoolbar.cpp
+++ b/apps/opencs/view/widget/scenetoolbar.cpp
@@ -1,4 +1,3 @@
-
#include "scenetoolbar.hpp"
#include <QVBoxLayout>
diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp
index 39e051c48..9f963873c 100644
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@@ -1,4 +1,3 @@
-
#include "scenetoolmode.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/widget/scenetoolrun.cpp b/apps/opencs/view/widget/scenetoolrun.cpp
index 4c9eb676e..1e2d44e7a 100644
--- a/apps/opencs/view/widget/scenetoolrun.cpp
+++ b/apps/opencs/view/widget/scenetoolrun.cpp
@@ -1,4 +1,3 @@
-
#include "scenetoolrun.hpp"
#include <iterator>
diff --git a/apps/opencs/view/widget/scenetooltoggle.cpp b/apps/opencs/view/widget/scenetooltoggle.cpp
index 07c448e45..d7251882a 100644
--- a/apps/opencs/view/widget/scenetooltoggle.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle.cpp
@@ -1,4 +1,3 @@
-
#include "scenetooltoggle.hpp"
#include <stdexcept>
diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp
index 313e519cb..e0431476e 100644
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@@ -1,4 +1,3 @@
-
#include "scenetooltoggle2.hpp"
#include <stdexcept>
diff --git a/apps/opencs/view/world/cellcreator.cpp b/apps/opencs/view/world/cellcreator.cpp
index c7d909f4c..2a710a940 100644
--- a/apps/opencs/view/world/cellcreator.cpp
+++ b/apps/opencs/view/world/cellcreator.cpp
@@ -1,4 +1,3 @@
-
#include "cellcreator.hpp"
#include <limits>
diff --git a/apps/opencs/view/world/creator.cpp b/apps/opencs/view/world/creator.cpp
index 7a8c8d48f..7a93339c5 100644
--- a/apps/opencs/view/world/creator.cpp
+++ b/apps/opencs/view/world/creator.cpp
@@ -1,4 +1,3 @@
-
#include "creator.hpp"
#include <stdexcept>
diff --git a/apps/opencs/view/world/dialoguecreator.cpp b/apps/opencs/view/world/dialoguecreator.cpp
index 3d451ed2d..7c6fb2e81 100644
--- a/apps/opencs/view/world/dialoguecreator.cpp
+++ b/apps/opencs/view/world/dialoguecreator.cpp
@@ -1,4 +1,3 @@
-
#include "dialoguecreator.hpp"
#include <components/esm/loaddial.hpp>
diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp
index 48485c5aa..b8683d2fe 100644
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@@ -104,7 +104,9 @@ QWidget* CSVWorld::NotEditableSubDelegate::createEditor (QWidget *parent,
const QStyleOptionViewItem& option,
const QModelIndex& index) const
{
- return new QLabel(parent);
+ QLabel *label = new QLabel(parent);
+ label->setTextInteractionFlags (Qt::TextSelectableByMouse);
+ return label;
}
/*
@@ -571,8 +573,9 @@ void CSVWorld::EditWidget::remake(int row)
table->setStyleSheet("QTableView { color: gray; }");
table->horizontalHeader()->setStyleSheet("QHeaderView { color: gray; }");
}
- else
- table->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::CurrentChanged);
+ // Uncomment below two lines to activate editing of nested table cells by a single click
+ //else
+ //table->setEditTriggers(QAbstractItemView::SelectedClicked | QAbstractItemView::CurrentChanged);
table->resizeColumnsToContents();
int rows = mTable->rowCount(mTable->index(row, i));
@@ -744,8 +747,10 @@ CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::Universa
mMainLayout = new QVBoxLayout(mainWidget);
setWidget (mainWidget);
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+
mEditWidget = new EditWidget(mainWidget,
- mTable->getModelIndex(getUniversalId().getId(), 0).row(), mTable, mCommandDispatcher, document, false);
+ mTable->getModelIndex(getUniversalId().getId(), idColumn).row(), mTable, mCommandDispatcher, document, false);
if (id.getType() == CSMWorld::UniversalId::Type_Referenceable)
{
@@ -758,7 +763,7 @@ CSVWorld::SimpleDialogueSubView::SimpleDialogueSubView (const CSMWorld::Universa
mMainLayout->addWidget(mEditWidget);
mEditWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
- dataChanged(mTable->getModelIndex (getUniversalId().getId(), 0));
+ dataChanged(mTable->getModelIndex (getUniversalId().getId(), idColumn));
connect(mEditWidget,
SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)),
@@ -771,8 +776,9 @@ void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
if (!mEditWidget) // hack to indicate that getUniversalId().getId() is no longer valid
return;
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
mLocked = locked;
- QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0));
+ QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
if (currentIndex.isValid())
{
@@ -787,7 +793,8 @@ void CSVWorld::SimpleDialogueSubView::setEditLock (bool locked)
void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index)
{
- QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0));
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+ QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
if (currentIndex.isValid() &&
(index.parent().isValid() ? index.parent().row() : index.row()) == currentIndex.row())
@@ -820,9 +827,15 @@ void CSVWorld::SimpleDialogueSubView::dataChanged (const QModelIndex & index)
void CSVWorld::SimpleDialogueSubView::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end)
{
- QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), 0));
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+ QModelIndex currentIndex(mTable->getModelIndex(getUniversalId().getId(), idColumn));
- if (currentIndex.isValid() && currentIndex.row() >= start && currentIndex.row() <= end)
+ if (!currentIndex.isValid())
+ {
+ return;
+ }
+
+ if (currentIndex.parent() == parent && currentIndex.row() >= start && currentIndex.row() <= end)
{
if(mEditWidget)
{
@@ -936,7 +949,8 @@ void CSVWorld::DialogueSubView::updateUserSetting (const QString& name, const QS
void CSVWorld::DialogueSubView::showPreview ()
{
- QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), 0));
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+ QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
if (currentIndex.isValid() &&
getTable().getFeatures() & CSMWorld::IdTable::Feature_Preview &&
@@ -948,7 +962,8 @@ void CSVWorld::DialogueSubView::showPreview ()
void CSVWorld::DialogueSubView::viewRecord ()
{
- QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), 0));
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+ QModelIndex currentIndex (getTable().getModelIndex (getUniversalId().getId(), idColumn));
if (currentIndex.isValid() &&
currentIndex.row() < getTable().rowCount())
@@ -983,7 +998,8 @@ void CSVWorld::DialogueSubView::switchToRow (int row)
void CSVWorld::DialogueSubView::requestFocus (const std::string& id)
{
- QModelIndex index = getTable().getModelIndex (id, 0);
+ int idColumn = getTable().findColumnIndex (CSMWorld::Columns::ColumnId_Id);
+ QModelIndex index = getTable().getModelIndex (id, idColumn);
if (index.isValid())
switchToRow (index.row());
diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp
index 2190a62c6..e582e3356 100644
--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@@ -1,4 +1,3 @@
-
#include "enumdelegate.hpp"
#include <cassert>
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 5f04d9a7a..8ed52bf80 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -1,4 +1,3 @@
-
#include "genericcreator.hpp"
#include <memory>
diff --git a/apps/opencs/view/world/idvalidator.cpp b/apps/opencs/view/world/idvalidator.cpp
index 13b05d2d1..1092d7217 100644
--- a/apps/opencs/view/world/idvalidator.cpp
+++ b/apps/opencs/view/world/idvalidator.cpp
@@ -1,4 +1,3 @@
-
#include "idvalidator.hpp"
#include <components/misc/stringops.hpp>
diff --git a/apps/opencs/view/world/infocreator.cpp b/apps/opencs/view/world/infocreator.cpp
index 268a82a28..1139afd69 100644
--- a/apps/opencs/view/world/infocreator.cpp
+++ b/apps/opencs/view/world/infocreator.cpp
@@ -1,4 +1,3 @@
-
#include "infocreator.hpp"
#include <algorithm>
diff --git a/apps/opencs/view/world/previewsubview.cpp b/apps/opencs/view/world/previewsubview.cpp
index 756e79fe6..f3312bb20 100644
--- a/apps/opencs/view/world/previewsubview.cpp
+++ b/apps/opencs/view/world/previewsubview.cpp
@@ -1,4 +1,3 @@
-
#include "previewsubview.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/world/recordbuttonbar.cpp b/apps/opencs/view/world/recordbuttonbar.cpp
index 9cae0d0c9..1a838a3b3 100644
--- a/apps/opencs/view/world/recordbuttonbar.cpp
+++ b/apps/opencs/view/world/recordbuttonbar.cpp
@@ -1,4 +1,3 @@
-
#include "recordbuttonbar.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/world/referenceablecreator.cpp b/apps/opencs/view/world/referenceablecreator.cpp
index e8055ed31..1357ca46f 100644
--- a/apps/opencs/view/world/referenceablecreator.cpp
+++ b/apps/opencs/view/world/referenceablecreator.cpp
@@ -1,4 +1,3 @@
-
#include "referenceablecreator.hpp"
#include <QComboBox>
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 2b0d44df0..73ca62e02 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -1,4 +1,3 @@
-
#include "referencecreator.hpp"
#include <QLabel>
diff --git a/apps/opencs/view/world/regionmap.cpp b/apps/opencs/view/world/regionmap.cpp
index bc96b0952..49764bd17 100644
--- a/apps/opencs/view/world/regionmap.cpp
+++ b/apps/opencs/view/world/regionmap.cpp
@@ -1,4 +1,3 @@
-
#include "regionmap.hpp"
#include <algorithm>
diff --git a/apps/opencs/view/world/regionmapsubview.cpp b/apps/opencs/view/world/regionmapsubview.cpp
index 411e24e75..996d1dc8b 100644
--- a/apps/opencs/view/world/regionmapsubview.cpp
+++ b/apps/opencs/view/world/regionmapsubview.cpp
@@ -1,4 +1,3 @@
-
#include "regionmapsubview.hpp"
#include "regionmap.hpp"
diff --git a/apps/opencs/view/world/scenesubview.cpp b/apps/opencs/view/world/scenesubview.cpp
index b7a795e23..2ca2548c0 100644
--- a/apps/opencs/view/world/scenesubview.cpp
+++ b/apps/opencs/view/world/scenesubview.cpp
@@ -1,4 +1,3 @@
-
#include "scenesubview.hpp"
#include <sstream>
diff --git a/apps/opencs/view/world/scripterrortable.cpp b/apps/opencs/view/world/scripterrortable.cpp
index 415e6c9dc..b44e1c0bd 100644
--- a/apps/opencs/view/world/scripterrortable.cpp
+++ b/apps/opencs/view/world/scripterrortable.cpp
@@ -1,4 +1,3 @@
-
#include "scripterrortable.hpp"
#include <QHeaderView>
diff --git a/apps/opencs/view/world/scripthighlighter.cpp b/apps/opencs/view/world/scripthighlighter.cpp
index 4923a44d8..487b5b139 100644
--- a/apps/opencs/view/world/scripthighlighter.cpp
+++ b/apps/opencs/view/world/scripthighlighter.cpp
@@ -1,4 +1,3 @@
-
#include "scripthighlighter.hpp"
#include <sstream>
diff --git a/apps/opencs/view/world/subviews.cpp b/apps/opencs/view/world/subviews.cpp
index 73000af13..47a109335 100644
--- a/apps/opencs/view/world/subviews.cpp
+++ b/apps/opencs/view/world/subviews.cpp
@@ -1,4 +1,3 @@
-
#include "subviews.hpp"
#include "../doc/subviewfactoryimp.hpp"
diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp
index b4b8c402a..9975e5355 100644
--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@@ -1,4 +1,3 @@
-
#include "table.hpp"
#include <QHeaderView>
@@ -277,12 +276,16 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id,
horizontalHeader()->setResizeMode (QHeaderView::Interactive);
#endif
verticalHeader()->hide();
- setSortingEnabled (sorting);
setSelectionBehavior (QAbstractItemView::SelectRows);
setSelectionMode (QAbstractItemView::ExtendedSelection);
- int columns = mModel->columnCount();
+ setSortingEnabled (sorting);
+ if (sorting)
+ {
+ sortByColumn (mModel->findColumnIndex(CSMWorld::Columns::ColumnId_Id), Qt::AscendingOrder);
+ }
+ int columns = mModel->columnCount();
for (int i=0; i<columns; ++i)
{
int flags = mModel->headerData (i, Qt::Horizontal, CSMWorld::ColumnBase::Role_Flags).toInt();
diff --git a/apps/opencs/view/world/tablebottombox.cpp b/apps/opencs/view/world/tablebottombox.cpp
index d22bcde4d..00d563607 100644
--- a/apps/opencs/view/world/tablebottombox.cpp
+++ b/apps/opencs/view/world/tablebottombox.cpp
@@ -1,4 +1,3 @@
-
#include "tablebottombox.hpp"
#include <sstream>
diff --git a/apps/opencs/view/world/tablesubview.cpp b/apps/opencs/view/world/tablesubview.cpp
index f20d79036..d00a6f836 100644
--- a/apps/opencs/view/world/tablesubview.cpp
+++ b/apps/opencs/view/world/tablesubview.cpp
@@ -1,4 +1,3 @@
-
#include "tablesubview.hpp"
#include <QHBoxLayout>
diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
index 8d83ab567..1da9878ea 100644
--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@@ -1,4 +1,3 @@
-
#include "util.hpp"
#include <stdexcept>
@@ -13,6 +12,7 @@
#include <QCheckBox>
#include <QPlainTextEdit>
#include <QEvent>
+#include <QItemEditorFactory>
#include "../../model/world/commands.hpp"
#include "../../model/world/tablemimedata.hpp"
@@ -174,7 +174,7 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
// TODO: Find a better solution?
if (display == CSMWorld::ColumnBase::Display_Boolean)
{
- return QStyledItemDelegate::createEditor(parent, option, index);
+ return QItemEditorFactory::defaultFactory()->createEditor(QVariant::Bool, parent);
}
// For tables the pop-up of the color editor should appear immediately after the editor creation
// (the third parameter of ColorEditor's constructor)
diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp
index 90a686a67..a63e6028c 100644
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@@ -1,4 +1,3 @@
-
#include "vartypedelegate.hpp"
#include <QUndoStack>
diff --git a/apps/openmw/android_commandLine.h b/apps/openmw/android_commandLine.h
index 21d1064c6..5ca79c2d0 100644
--- a/apps/openmw/android_commandLine.h
+++ b/apps/openmw/android_commandLine.h
@@ -1,5 +1,4 @@
-
/* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h>
#ifndef _Included_ui_activity_GameActivity_commandLine
diff --git a/apps/openmw/mwbase/environment.cpp b/apps/openmw/mwbase/environment.cpp
index a90eec5bf..4efa7c273 100644
--- a/apps/openmw/mwbase/environment.cpp
+++ b/apps/openmw/mwbase/environment.cpp
@@ -1,4 +1,3 @@
-
#include "environment.hpp"
#include <cassert>
diff --git a/apps/openmw/mwclass/activator.cpp b/apps/openmw/mwclass/activator.cpp
index 457b0cec1..d8a0c8091 100644
--- a/apps/openmw/mwclass/activator.cpp
+++ b/apps/openmw/mwclass/activator.cpp
@@ -1,4 +1,3 @@
-
#include "activator.hpp"
#include <components/esm/loadacti.hpp>
diff --git a/apps/openmw/mwclass/apparatus.cpp b/apps/openmw/mwclass/apparatus.cpp
index 2abd071bd..3add529a9 100644
--- a/apps/openmw/mwclass/apparatus.cpp
+++ b/apps/openmw/mwclass/apparatus.cpp
@@ -1,4 +1,3 @@
-
#include "apparatus.hpp"
#include <components/esm/loadappa.hpp>
diff --git a/apps/openmw/mwclass/armor.cpp b/apps/openmw/mwclass/armor.cpp
index 686f5af61..7a3c395e4 100644
--- a/apps/openmw/mwclass/armor.cpp
+++ b/apps/openmw/mwclass/armor.cpp
@@ -1,4 +1,3 @@
-
#include "armor.hpp"
#include <components/esm/loadarmo.hpp>
diff --git a/apps/openmw/mwclass/classes.cpp b/apps/openmw/mwclass/classes.cpp
index e9538a6cb..c303b23af 100644
--- a/apps/openmw/mwclass/classes.cpp
+++ b/apps/openmw/mwclass/classes.cpp
@@ -1,4 +1,3 @@
-
#include "classes.hpp"
#include "activator.hpp"
diff --git a/apps/openmw/mwclass/clothing.cpp b/apps/openmw/mwclass/clothing.cpp
index b387a3e9f..488142e72 100644
--- a/apps/openmw/mwclass/clothing.cpp
+++ b/apps/openmw/mwclass/clothing.cpp
@@ -1,4 +1,3 @@
-
#include "clothing.hpp"
#include <components/esm/loadclot.hpp>
diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index 5f49a74b6..9d2e34ea3 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -1,4 +1,3 @@
-
#include "container.hpp"
#include <components/esm/loadcont.hpp>
diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 192bdf2ce..49291be2d 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -1,4 +1,3 @@
-
#include "creature.hpp"
#include <openengine/misc/rng.hpp>
diff --git a/apps/openmw/mwclass/creaturelevlist.cpp b/apps/openmw/mwclass/creaturelevlist.cpp
index dbc4b6af7..433e5fcea 100644
--- a/apps/openmw/mwclass/creaturelevlist.cpp
+++ b/apps/openmw/mwclass/creaturelevlist.cpp
@@ -1,4 +1,3 @@
-
#include "creaturelevlist.hpp"
#include <components/esm/loadlevlist.hpp>
diff --git a/apps/openmw/mwclass/door.cpp b/apps/openmw/mwclass/door.cpp
index 48fc3b64c..ab9cfa289 100644
--- a/apps/openmw/mwclass/door.cpp
+++ b/apps/openmw/mwclass/door.cpp
@@ -1,4 +1,3 @@
-
#include "door.hpp"
#include <components/esm/loaddoor.hpp>
diff --git a/apps/openmw/mwclass/ingredient.cpp b/apps/openmw/mwclass/ingredient.cpp
index de43e818e..6388c9f9c 100644
--- a/apps/openmw/mwclass/ingredient.cpp
+++ b/apps/openmw/mwclass/ingredient.cpp
@@ -1,4 +1,3 @@
-
#include "ingredient.hpp"
#include <components/esm/loadingr.hpp>
diff --git a/apps/openmw/mwclass/itemlevlist.cpp b/apps/openmw/mwclass/itemlevlist.cpp
index d31080bb2..a70f31115 100644
--- a/apps/openmw/mwclass/itemlevlist.cpp
+++ b/apps/openmw/mwclass/itemlevlist.cpp
@@ -1,4 +1,3 @@
-
#include "itemlevlist.hpp"
#include <components/esm/loadlevlist.hpp>
diff --git a/apps/openmw/mwclass/light.cpp b/apps/openmw/mwclass/light.cpp
index 90c708f97..9a80c7036 100644
--- a/apps/openmw/mwclass/light.cpp
+++ b/apps/openmw/mwclass/light.cpp
@@ -1,4 +1,3 @@
-
#include "light.hpp"
#include <components/esm/loadligh.hpp>
diff --git a/apps/openmw/mwclass/lockpick.cpp b/apps/openmw/mwclass/lockpick.cpp
index 478c50301..2b6a217e6 100644
--- a/apps/openmw/mwclass/lockpick.cpp
+++ b/apps/openmw/mwclass/lockpick.cpp
@@ -1,4 +1,3 @@
-
#include "lockpick.hpp"
#include <components/esm/loadlock.hpp>
diff --git a/apps/openmw/mwclass/misc.cpp b/apps/openmw/mwclass/misc.cpp
index f5daafeec..7f1f2c5a8 100644
--- a/apps/openmw/mwclass/misc.cpp
+++ b/apps/openmw/mwclass/misc.cpp
@@ -1,4 +1,3 @@
-
#include "misc.hpp"
#include <boost/lexical_cast.hpp>
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 3b0234a25..746099ae5 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1,4 +1,3 @@
-
#include "npc.hpp"
#include <memory>
diff --git a/apps/openmw/mwclass/potion.cpp b/apps/openmw/mwclass/potion.cpp
index ee299ab4f..5e1849a72 100644
--- a/apps/openmw/mwclass/potion.cpp
+++ b/apps/openmw/mwclass/potion.cpp
@@ -1,4 +1,3 @@
-
#include "potion.hpp"
#include <components/esm/loadalch.hpp>
diff --git a/apps/openmw/mwclass/probe.cpp b/apps/openmw/mwclass/probe.cpp
index da22e9be6..00d79653d 100644
--- a/apps/openmw/mwclass/probe.cpp
+++ b/apps/openmw/mwclass/probe.cpp
@@ -1,4 +1,3 @@
-
#include "probe.hpp"
#include <components/esm/loadprob.hpp>
diff --git a/apps/openmw/mwclass/repair.cpp b/apps/openmw/mwclass/repair.cpp
index c02146f12..403eb611b 100644
--- a/apps/openmw/mwclass/repair.cpp
+++ b/apps/openmw/mwclass/repair.cpp
@@ -1,4 +1,3 @@
-
#include "repair.hpp"
#include <components/esm/loadrepa.hpp>
diff --git a/apps/openmw/mwclass/static.cpp b/apps/openmw/mwclass/static.cpp
index dbbe7e43a..7bfd4c76d 100644
--- a/apps/openmw/mwclass/static.cpp
+++ b/apps/openmw/mwclass/static.cpp
@@ -1,4 +1,3 @@
-
#include "static.hpp"
#include <components/esm/loadstat.hpp>
diff --git a/apps/openmw/mwclass/weapon.cpp b/apps/openmw/mwclass/weapon.cpp
index a484ad668..3e39c305a 100644
--- a/apps/openmw/mwclass/weapon.cpp
+++ b/apps/openmw/mwclass/weapon.cpp
@@ -1,4 +1,3 @@
-
#include "weapon.hpp"
#include <components/esm/loadweap.hpp>
diff --git a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
index 1785575fc..982f32956 100644
--- a/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanagerimp.cpp
@@ -1,4 +1,3 @@
-
#include "dialoguemanagerimp.hpp"
#include <cctype>
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index adb7d3892..35ccc287c 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -1,4 +1,3 @@
-
#include "filter.hpp"
#include <components/compiler/locals.hpp>
diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp
index 9f07f7b6f..2f5f02b01 100644
--- a/apps/openmw/mwdialogue/journalentry.cpp
+++ b/apps/openmw/mwdialogue/journalentry.cpp
@@ -1,4 +1,3 @@
-
#include "journalentry.hpp"
#include <stdexcept>
diff --git a/apps/openmw/mwdialogue/journalimp.cpp b/apps/openmw/mwdialogue/journalimp.cpp
index 99dab0cf8..e6ffe22ab 100644
--- a/apps/openmw/mwdialogue/journalimp.cpp
+++ b/apps/openmw/mwdialogue/journalimp.cpp
@@ -1,4 +1,3 @@
-
#include "journalimp.hpp"
#include <iterator>
diff --git a/apps/openmw/mwdialogue/quest.cpp b/apps/openmw/mwdialogue/quest.cpp
index a9e39b379..846597886 100644
--- a/apps/openmw/mwdialogue/quest.cpp
+++ b/apps/openmw/mwdialogue/quest.cpp
@@ -1,4 +1,3 @@
-
#include "quest.hpp"
#include <components/esm/queststate.hpp>
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index fa0fbfe13..a4eba30ae 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -1,4 +1,3 @@
-
#include "selectwrapper.hpp"
#include <cctype>
diff --git a/apps/openmw/mwdialogue/topic.cpp b/apps/openmw/mwdialogue/topic.cpp
index c1a45f841..eb7fbdc1d 100644
--- a/apps/openmw/mwdialogue/topic.cpp
+++ b/apps/openmw/mwdialogue/topic.cpp
@@ -1,4 +1,3 @@
-
#include "topic.hpp"
#include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwgui/tooltips.hpp b/apps/openmw/mwgui/tooltips.hpp
index c50d47ef5..cf5bb14a2 100644
--- a/apps/openmw/mwgui/tooltips.hpp
+++ b/apps/openmw/mwgui/tooltips.hpp
@@ -1,4 +1,3 @@
-
#ifndef MWGUI_TOOLTIPS_H
#define MWGUI_TOOLTIPS_H
diff --git a/apps/openmw/mwmechanics/alchemy.cpp b/apps/openmw/mwmechanics/alchemy.cpp
index 2fc9fe42f..42dd3048f 100644
--- a/apps/openmw/mwmechanics/alchemy.cpp
+++ b/apps/openmw/mwmechanics/alchemy.cpp
@@ -1,4 +1,3 @@
-
#include "alchemy.hpp"
#include <cassert>
diff --git a/apps/openmw/mwmechanics/magiceffects.cpp b/apps/openmw/mwmechanics/magiceffects.cpp
index 0b19df0a8..021691d6a 100644
--- a/apps/openmw/mwmechanics/magiceffects.cpp
+++ b/apps/openmw/mwmechanics/magiceffects.cpp
@@ -1,4 +1,3 @@
-
#include "magiceffects.hpp"
#include <cstdlib>
diff --git a/apps/openmw/mwmechanics/npcstats.cpp b/apps/openmw/mwmechanics/npcstats.cpp
index b9aa8b301..10d603ff1 100644
--- a/apps/openmw/mwmechanics/npcstats.cpp
+++ b/apps/openmw/mwmechanics/npcstats.cpp
@@ -1,4 +1,3 @@
-
#include "npcstats.hpp"
#include <cmath>
diff --git a/apps/openmw/mwmechanics/spells.cpp b/apps/openmw/mwmechanics/spells.cpp
index b1829964b..4636ecfae 100644
--- a/apps/openmw/mwmechanics/spells.cpp
+++ b/apps/openmw/mwmechanics/spells.cpp
@@ -1,4 +1,3 @@
-
#include "spells.hpp"
#include <cstdlib>
diff --git a/apps/openmw/mwscript/aiextensions.cpp b/apps/openmw/mwscript/aiextensions.cpp
index f0cb8a967..c4228884c 100644
--- a/apps/openmw/mwscript/aiextensions.cpp
+++ b/apps/openmw/mwscript/aiextensions.cpp
@@ -1,4 +1,3 @@
-
#include "aiextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index c43cdf565..07a8a300a 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -1,4 +1,3 @@
-
#include "animationextensions.hpp"
#include <stdexcept>
diff --git a/apps/openmw/mwscript/compilercontext.cpp b/apps/openmw/mwscript/compilercontext.cpp
index 3ff75eeae..083f463bc 100644
--- a/apps/openmw/mwscript/compilercontext.cpp
+++ b/apps/openmw/mwscript/compilercontext.cpp
@@ -1,4 +1,3 @@
-
#include "compilercontext.hpp"
#include "../mwworld/esmstore.hpp"
diff --git a/apps/openmw/mwscript/consoleextensions.cpp b/apps/openmw/mwscript/consoleextensions.cpp
index 30956d429..d2e07d3e1 100644
--- a/apps/openmw/mwscript/consoleextensions.cpp
+++ b/apps/openmw/mwscript/consoleextensions.cpp
@@ -1,4 +1,3 @@
-
#include "consoleextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/containerextensions.cpp b/apps/openmw/mwscript/containerextensions.cpp
index 70475d8e2..c456032a4 100644
--- a/apps/openmw/mwscript/containerextensions.cpp
+++ b/apps/openmw/mwscript/containerextensions.cpp
@@ -1,4 +1,3 @@
-
#include "containerextensions.hpp"
#include <stdexcept>
diff --git a/apps/openmw/mwscript/controlextensions.cpp b/apps/openmw/mwscript/controlextensions.cpp
index 904e0ee85..626fafb5a 100644
--- a/apps/openmw/mwscript/controlextensions.cpp
+++ b/apps/openmw/mwscript/controlextensions.cpp
@@ -1,4 +1,3 @@
-
#include "controlextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/dialogueextensions.cpp b/apps/openmw/mwscript/dialogueextensions.cpp
index 8b6805264..c305fb81f 100644
--- a/apps/openmw/mwscript/dialogueextensions.cpp
+++ b/apps/openmw/mwscript/dialogueextensions.cpp
@@ -1,4 +1,3 @@
-
#include "dialogueextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/extensions.cpp b/apps/openmw/mwscript/extensions.cpp
index 2170ba4fb..12bf3413a 100644
--- a/apps/openmw/mwscript/extensions.cpp
+++ b/apps/openmw/mwscript/extensions.cpp
@@ -1,4 +1,3 @@
-
#include "extensions.hpp"
#include <components/interpreter/interpreter.hpp>
diff --git a/apps/openmw/mwscript/globalscripts.cpp b/apps/openmw/mwscript/globalscripts.cpp
index a6ad2cc11..e0c78fc6d 100644
--- a/apps/openmw/mwscript/globalscripts.cpp
+++ b/apps/openmw/mwscript/globalscripts.cpp
@@ -1,4 +1,3 @@
-
#include "globalscripts.hpp"
#include <cassert>
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index 40c555f50..f48360c04 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -1,4 +1,3 @@
-
#include "guiextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp
index df675aebb..b0d4d3f2d 100644
--- a/apps/openmw/mwscript/interpretercontext.cpp
+++ b/apps/openmw/mwscript/interpretercontext.cpp
@@ -1,4 +1,3 @@
-
#include "interpretercontext.hpp"
#include <cmath>
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index 38106340a..5941cba0d 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -1,4 +1,3 @@
-
#include "miscextensions.hpp"
#include <cstdlib>
diff --git a/apps/openmw/mwscript/scriptmanagerimp.cpp b/apps/openmw/mwscript/scriptmanagerimp.cpp
index 5f755e542..084beb812 100644
--- a/apps/openmw/mwscript/scriptmanagerimp.cpp
+++ b/apps/openmw/mwscript/scriptmanagerimp.cpp
@@ -1,4 +1,3 @@
-
#include "scriptmanagerimp.hpp"
#include <cassert>
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index d28d01b63..e0fccd16d 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -1,4 +1,3 @@
-
#include "skyextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/soundextensions.cpp b/apps/openmw/mwscript/soundextensions.cpp
index 606de7aa0..a9896d203 100644
--- a/apps/openmw/mwscript/soundextensions.cpp
+++ b/apps/openmw/mwscript/soundextensions.cpp
@@ -1,4 +1,3 @@
-
#include "extensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwscript/userextensions.cpp b/apps/openmw/mwscript/userextensions.cpp
index 538133c65..165a93062 100644
--- a/apps/openmw/mwscript/userextensions.cpp
+++ b/apps/openmw/mwscript/userextensions.cpp
@@ -1,4 +1,3 @@
-
#include "userextensions.hpp"
#include <components/compiler/extensions.hpp>
diff --git a/apps/openmw/mwstate/character.cpp b/apps/openmw/mwstate/character.cpp
index f190565da..f8eb0410c 100644
--- a/apps/openmw/mwstate/character.cpp
+++ b/apps/openmw/mwstate/character.cpp
@@ -1,4 +1,3 @@
-
#include "character.hpp"
#include <ctime>
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 70e9f0925..22192c355 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -1,4 +1,3 @@
-
#include "charactermanager.hpp"
#include <sstream>
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 0883bc63b..83f1d7406 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -1,4 +1,3 @@
-
#include "statemanagerimp.hpp"
#include <components/esm/esmwriter.hpp>
diff --git a/apps/openmw/mwworld/action.cpp b/apps/openmw/mwworld/action.cpp
index 5e1fb41a6..fb2059de9 100644
--- a/apps/openmw/mwworld/action.cpp
+++ b/apps/openmw/mwworld/action.cpp
@@ -1,4 +1,3 @@
-
#include "action.hpp"
#include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/actionapply.cpp b/apps/openmw/mwworld/actionapply.cpp
index bfd64c85d..00c9628ce 100644
--- a/apps/openmw/mwworld/actionapply.cpp
+++ b/apps/openmw/mwworld/actionapply.cpp
@@ -1,4 +1,3 @@
-
#include "actionapply.hpp"
#include "class.hpp"
diff --git a/apps/openmw/mwworld/actioneat.cpp b/apps/openmw/mwworld/actioneat.cpp
index 660915523..7ca7dcbfd 100644
--- a/apps/openmw/mwworld/actioneat.cpp
+++ b/apps/openmw/mwworld/actioneat.cpp
@@ -1,4 +1,3 @@
-
#include "actioneat.hpp"
#include <cstdlib>
diff --git a/apps/openmw/mwworld/actionopen.hpp b/apps/openmw/mwworld/actionopen.hpp
index 8578995ae..454cc09f1 100644
--- a/apps/openmw/mwworld/actionopen.hpp
+++ b/apps/openmw/mwworld/actionopen.hpp
@@ -1,4 +1,3 @@
-
#ifndef GAME_MWWORLD_ACTIONOPEN_H
#define GAME_MWWORLD_ACTIONOPEN_H
diff --git a/apps/openmw/mwworld/actiontake.cpp b/apps/openmw/mwworld/actiontake.cpp
index 269d941dc..4e6135764 100644
--- a/apps/openmw/mwworld/actiontake.cpp
+++ b/apps/openmw/mwworld/actiontake.cpp
@@ -1,4 +1,3 @@
-
#include "actiontake.hpp"
#include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/actiontalk.cpp b/apps/openmw/mwworld/actiontalk.cpp
index 905497f85..051380ff5 100644
--- a/apps/openmw/mwworld/actiontalk.cpp
+++ b/apps/openmw/mwworld/actiontalk.cpp
@@ -1,4 +1,3 @@
-
#include "actiontalk.hpp"
#include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index 6fa9ba9b6..98d30ad24 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -1,4 +1,3 @@
-
#include "class.hpp"
#include <stdexcept>
diff --git a/apps/openmw/mwworld/containerstore.cpp b/apps/openmw/mwworld/containerstore.cpp
index d4aadc6c7..bf3732a3a 100644
--- a/apps/openmw/mwworld/containerstore.cpp
+++ b/apps/openmw/mwworld/containerstore.cpp
@@ -1,4 +1,3 @@
-
#include "containerstore.hpp"
#include <cassert>
diff --git a/apps/openmw/mwworld/globals.cpp b/apps/openmw/mwworld/globals.cpp
index e7cb04590..dcd7924a2 100644
--- a/apps/openmw/mwworld/globals.cpp
+++ b/apps/openmw/mwworld/globals.cpp
@@ -1,4 +1,3 @@
-
#include "globals.hpp"
#include <stdexcept>
diff --git a/apps/openmw/mwworld/inventorystore.cpp b/apps/openmw/mwworld/inventorystore.cpp
index a2e445d58..5b0c2311a 100644
--- a/apps/openmw/mwworld/inventorystore.cpp
+++ b/apps/openmw/mwworld/inventorystore.cpp
@@ -1,4 +1,3 @@
-
#include "inventorystore.hpp"
#include <iterator>
diff --git a/apps/openmw/mwworld/ptr.cpp b/apps/openmw/mwworld/ptr.cpp
index 1cf22744a..4d74c3c58 100644
--- a/apps/openmw/mwworld/ptr.cpp
+++ b/apps/openmw/mwworld/ptr.cpp
@@ -1,4 +1,3 @@
-
#include "ptr.hpp"
#include <cassert>
diff --git a/apps/openmw/mwworld/refdata.cpp b/apps/openmw/mwworld/refdata.cpp
index ae985f857..15ac52811 100644
--- a/apps/openmw/mwworld/refdata.cpp
+++ b/apps/openmw/mwworld/refdata.cpp
@@ -1,4 +1,3 @@
-
#include "refdata.hpp"
#include <OgreSceneNode.h>
diff --git a/components/compiler/controlparser.cpp b/components/compiler/controlparser.cpp
index aefe6d16d..b202467db 100644
--- a/components/compiler/controlparser.cpp
+++ b/components/compiler/controlparser.cpp
@@ -1,4 +1,3 @@
-
#include "controlparser.hpp"
#include <algorithm>
diff --git a/components/compiler/declarationparser.cpp b/components/compiler/declarationparser.cpp
index 7961b8f41..ffac252d5 100644
--- a/components/compiler/declarationparser.cpp
+++ b/components/compiler/declarationparser.cpp
@@ -1,4 +1,3 @@
-
#include "declarationparser.hpp"
#include <components/misc/stringops.hpp>
diff --git a/components/compiler/discardparser.cpp b/components/compiler/discardparser.cpp
index 6028968bb..da114fb3d 100644
--- a/components/compiler/discardparser.cpp
+++ b/components/compiler/discardparser.cpp
@@ -1,4 +1,3 @@
-
#include "discardparser.hpp"
#include "scanner.hpp"
diff --git a/components/compiler/errorhandler.cpp b/components/compiler/errorhandler.cpp
index bcd30ef2d..a987a86da 100644
--- a/components/compiler/errorhandler.cpp
+++ b/components/compiler/errorhandler.cpp
@@ -1,4 +1,3 @@
-
#include "errorhandler.hpp"
namespace Compiler
diff --git a/components/compiler/errorhandler.hpp b/components/compiler/errorhandler.hpp
index c92e7bb8d..ea904e385 100644
--- a/components/compiler/errorhandler.hpp
+++ b/components/compiler/errorhandler.hpp
@@ -1,4 +1,3 @@
-
#ifndef COMPILER_ERRORHANDLER_H_INCLUDED
#define COMPILER_ERRORHANDLER_H_INCLUDED
diff --git a/components/compiler/exprparser.cpp b/components/compiler/exprparser.cpp
index dc36b58d8..b588b6196 100644
--- a/components/compiler/exprparser.cpp
+++ b/components/compiler/exprparser.cpp
@@ -1,4 +1,3 @@
-
#include "exprparser.hpp"
#include <stdexcept>
@@ -353,7 +352,10 @@ namespace Compiler
if (extensions->isInstruction (keyword, argumentType, hasExplicit))
{
// pretend this is not a keyword
- return parseName (loc.mLiteral, loc, scanner);
+ std::string name = loc.mLiteral;
+ if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+ name = name.substr (1, name.size()-2);
+ return parseName (name, loc, scanner);
}
}
diff --git a/components/compiler/extensions.cpp b/components/compiler/extensions.cpp
index c2b11c615..dbb953e20 100644
--- a/components/compiler/extensions.cpp
+++ b/components/compiler/extensions.cpp
@@ -1,4 +1,3 @@
-
#include "extensions.hpp"
#include <cassert>
diff --git a/components/compiler/generator.cpp b/components/compiler/generator.cpp
index ead0c7290..7e6437e20 100644
--- a/components/compiler/generator.cpp
+++ b/components/compiler/generator.cpp
@@ -1,4 +1,3 @@
-
#include "generator.hpp"
#include <cassert>
diff --git a/components/compiler/junkparser.cpp b/components/compiler/junkparser.cpp
index cfa94044e..7608e9bab 100644
--- a/components/compiler/junkparser.cpp
+++ b/components/compiler/junkparser.cpp
@@ -1,4 +1,3 @@
-
#include "junkparser.hpp"
#include "scanner.hpp"
diff --git a/components/compiler/lineparser.cpp b/components/compiler/lineparser.cpp
index a71672916..032af7d65 100644
--- a/components/compiler/lineparser.cpp
+++ b/components/compiler/lineparser.cpp
@@ -1,4 +1,3 @@
-
#include "lineparser.hpp"
#include <memory>
@@ -222,6 +221,23 @@ namespace Compiler
bool LineParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
{
+ if (mState==MessageState || mState==MessageCommaState)
+ {
+ if (const Extensions *extensions = getContext().getExtensions())
+ {
+ std::string argumentType; // ignored
+ bool hasExplicit = false; // ignored
+ if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+ {
+ // pretend this is not a keyword
+ std::string name = loc.mLiteral;
+ if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+ name = name.substr (1, name.size()-2);
+ return parseName (name, loc, scanner);
+ }
+ }
+ }
+
if (mState==SetMemberVarState)
{
mMemberName = loc.mLiteral;
diff --git a/components/compiler/literals.cpp b/components/compiler/literals.cpp
index 626b03afb..ee2c4d345 100644
--- a/components/compiler/literals.cpp
+++ b/components/compiler/literals.cpp
@@ -1,4 +1,3 @@
-
#include "literals.hpp"
#include <algorithm>
diff --git a/components/compiler/locals.cpp b/components/compiler/locals.cpp
index 60a5704bf..768fc077c 100644
--- a/components/compiler/locals.cpp
+++ b/components/compiler/locals.cpp
@@ -1,4 +1,3 @@
-
#include "locals.hpp"
#include <cassert>
diff --git a/components/compiler/nullerrorhandler.cpp b/components/compiler/nullerrorhandler.cpp
index ee2884705..a0db53a00 100644
--- a/components/compiler/nullerrorhandler.cpp
+++ b/components/compiler/nullerrorhandler.cpp
@@ -1,4 +1,3 @@
-
#include "nullerrorhandler.hpp"
void Compiler::NullErrorHandler::report (const std::string& message, const TokenLoc& loc, Type type) {}
diff --git a/components/compiler/nullerrorhandler.hpp b/components/compiler/nullerrorhandler.hpp
index bb4db99a2..3dcff9250 100644
--- a/components/compiler/nullerrorhandler.hpp
+++ b/components/compiler/nullerrorhandler.hpp
@@ -1,4 +1,3 @@
-
#ifndef COMPILER_NULLERRORHANDLER_H_INCLUDED
#define COMPILER_NULLERRORHANDLER_H_INCLUDED
diff --git a/components/compiler/output.cpp b/components/compiler/output.cpp
index 46e04b8dc..785b2ce84 100644
--- a/components/compiler/output.cpp
+++ b/components/compiler/output.cpp
@@ -1,4 +1,3 @@
-
#include "output.hpp"
#include <cassert>
diff --git a/components/compiler/parser.cpp b/components/compiler/parser.cpp
index 0f442c350..fe019718a 100644
--- a/components/compiler/parser.cpp
+++ b/components/compiler/parser.cpp
@@ -1,4 +1,3 @@
-
#include "parser.hpp"
#include <cctype>
diff --git a/components/compiler/quickfileparser.cpp b/components/compiler/quickfileparser.cpp
index 4e9f76e13..53aaf96e5 100644
--- a/components/compiler/quickfileparser.cpp
+++ b/components/compiler/quickfileparser.cpp
@@ -1,4 +1,3 @@
-
#include "quickfileparser.hpp"
#include "skipparser.hpp"
diff --git a/components/compiler/scanner.cpp b/components/compiler/scanner.cpp
index de7f7e1e1..5af396d27 100644
--- a/components/compiler/scanner.cpp
+++ b/components/compiler/scanner.cpp
@@ -1,4 +1,3 @@
-
#include "scanner.hpp"
#include <cassert>
diff --git a/components/compiler/scriptparser.cpp b/components/compiler/scriptparser.cpp
index ea11be5f0..a3bf23288 100644
--- a/components/compiler/scriptparser.cpp
+++ b/components/compiler/scriptparser.cpp
@@ -1,4 +1,3 @@
-
#include "scriptparser.hpp"
#include "scanner.hpp"
diff --git a/components/compiler/skipparser.cpp b/components/compiler/skipparser.cpp
index c7cb31f58..3e704253d 100644
--- a/components/compiler/skipparser.cpp
+++ b/components/compiler/skipparser.cpp
@@ -1,4 +1,3 @@
-
#include "skipparser.hpp"
#include "scanner.hpp"
diff --git a/components/compiler/streamerrorhandler.cpp b/components/compiler/streamerrorhandler.cpp
index fc1a05943..9ca8aa74b 100644
--- a/components/compiler/streamerrorhandler.cpp
+++ b/components/compiler/streamerrorhandler.cpp
@@ -1,4 +1,3 @@
-
#include "streamerrorhandler.hpp"
#include "tokenloc.hpp"
diff --git a/components/compiler/streamerrorhandler.hpp b/components/compiler/streamerrorhandler.hpp
index 96e02b588..85de1833a 100644
--- a/components/compiler/streamerrorhandler.hpp
+++ b/components/compiler/streamerrorhandler.hpp
@@ -1,4 +1,3 @@
-
#ifndef COMPILER_STREAMERRORHANDLER_H_INCLUDED
#define COMPILER_STREAMERRORHANDLER_H_INCLUDED
diff --git a/components/compiler/stringparser.cpp b/components/compiler/stringparser.cpp
index a86c15794..f8798eccd 100644
--- a/components/compiler/stringparser.cpp
+++ b/components/compiler/stringparser.cpp
@@ -1,12 +1,14 @@
-
#include "stringparser.hpp"
#include <algorithm>
#include <iterator>
+#include <components/misc/stringops.hpp>
+
#include "scanner.hpp"
#include "generator.hpp"
-#include <components/misc/stringops.hpp>
+#include "context.hpp"
+#include "extensions.hpp"
namespace Compiler
{
@@ -33,6 +35,25 @@ namespace Compiler
return Parser::parseName (name, loc, scanner);
}
+ bool StringParser::parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner)
+ {
+ if (const Extensions *extensions = getContext().getExtensions())
+ {
+ std::string argumentType; // ignored
+ bool hasExplicit = false; // ignored
+ if (extensions->isInstruction (keyword, argumentType, hasExplicit))
+ {
+ // pretend this is not a keyword
+ std::string name = loc.mLiteral;
+ if (name.size()>=2 && name[0]=='"' && name[name.size()-1]=='"')
+ name = name.substr (1, name.size()-2);
+ return parseName (name, loc, scanner);
+ }
+ }
+
+ return Parser::parseKeyword (keyword, loc, scanner);
+ }
+
bool StringParser::parseSpecial (int code, const TokenLoc& loc, Scanner& scanner)
{
if (code==Scanner::S_comma && mState==StartState)
diff --git a/components/compiler/stringparser.hpp b/components/compiler/stringparser.hpp
index 3859a2496..52469128f 100644
--- a/components/compiler/stringparser.hpp
+++ b/components/compiler/stringparser.hpp
@@ -32,6 +32,10 @@ namespace Compiler
///< Handle a name token.
/// \return fetch another token?
+ virtual bool parseKeyword (int keyword, const TokenLoc& loc, Scanner& scanner);
+ ///< Handle a keyword token.
+ /// \return fetch another token?
+
virtual bool parseSpecial (int code, const TokenLoc& loc, Scanner& scanner);
///< Handle a special character token.
/// \return fetch another token?
diff --git a/components/esm/cellid.cpp b/components/esm/cellid.cpp
index 3c6e23ffd..5ac8c4cab 100644
--- a/components/esm/cellid.cpp
+++ b/components/esm/cellid.cpp
@@ -1,4 +1,3 @@
-
#include "cellid.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/cellref.cpp b/components/esm/cellref.cpp
index c3b889df5..33ac4a91e 100644
--- a/components/esm/cellref.cpp
+++ b/components/esm/cellref.cpp
@@ -1,4 +1,3 @@
-
#include "cellref.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/cellstate.cpp b/components/esm/cellstate.cpp
index 4df04d0e5..83b130dcd 100644
--- a/components/esm/cellstate.cpp
+++ b/components/esm/cellstate.cpp
@@ -1,4 +1,3 @@
-
#include "cellstate.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/containerstate.cpp b/components/esm/containerstate.cpp
index 80ad5cbdc..301549d59 100644
--- a/components/esm/containerstate.cpp
+++ b/components/esm/containerstate.cpp
@@ -1,4 +1,3 @@
-
#include "containerstate.hpp"
void ESM::ContainerState::load (ESMReader &esm)
diff --git a/components/esm/creaturestate.cpp b/components/esm/creaturestate.cpp
index c15becd98..bffa4e5e4 100644
--- a/components/esm/creaturestate.cpp
+++ b/components/esm/creaturestate.cpp
@@ -1,4 +1,3 @@
-
#include "creaturestate.hpp"
void ESM::CreatureState::load (ESMReader &esm)
diff --git a/components/esm/debugprofile.cpp b/components/esm/debugprofile.cpp
index 6c05fac2a..9d605a6af 100644
--- a/components/esm/debugprofile.cpp
+++ b/components/esm/debugprofile.cpp
@@ -1,4 +1,3 @@
-
#include "debugprofile.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/dialoguestate.cpp b/components/esm/dialoguestate.cpp
index f302e36dc..2b1887e4e 100644
--- a/components/esm/dialoguestate.cpp
+++ b/components/esm/dialoguestate.cpp
@@ -1,4 +1,3 @@
-
#include "dialoguestate.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/filter.cpp b/components/esm/filter.cpp
index a80427bbe..5bc768f72 100644
--- a/components/esm/filter.cpp
+++ b/components/esm/filter.cpp
@@ -1,4 +1,3 @@
-
#include "filter.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/globalscript.cpp b/components/esm/globalscript.cpp
index 0129f8eb7..a42cdc230 100644
--- a/components/esm/globalscript.cpp
+++ b/components/esm/globalscript.cpp
@@ -1,4 +1,3 @@
-
#include "globalscript.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/inventorystate.cpp b/components/esm/inventorystate.cpp
index 4eaaa9f9f..e7257ae53 100644
--- a/components/esm/inventorystate.cpp
+++ b/components/esm/inventorystate.cpp
@@ -1,4 +1,3 @@
-
#include "inventorystate.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/journalentry.cpp b/components/esm/journalentry.cpp
index 445213de4..93011e581 100644
--- a/components/esm/journalentry.cpp
+++ b/components/esm/journalentry.cpp
@@ -1,4 +1,3 @@
-
#include "journalentry.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/loadtes3.cpp b/components/esm/loadtes3.cpp
index 7d749c4d9..df35a2579 100644
--- a/components/esm/loadtes3.cpp
+++ b/components/esm/loadtes3.cpp
@@ -1,4 +1,3 @@
-
#include "loadtes3.hpp"
#include "esmcommon.hpp"
diff --git a/components/esm/locals.cpp b/components/esm/locals.cpp
index f0cfd49f0..bd51be08f 100644
--- a/components/esm/locals.cpp
+++ b/components/esm/locals.cpp
@@ -1,4 +1,3 @@
-
#include "locals.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/npcstate.cpp b/components/esm/npcstate.cpp
index 724d67326..6c9988d50 100644
--- a/components/esm/npcstate.cpp
+++ b/components/esm/npcstate.cpp
@@ -1,4 +1,3 @@
-
#include "npcstate.hpp"
void ESM::NpcState::load (ESMReader &esm)
diff --git a/components/esm/objectstate.cpp b/components/esm/objectstate.cpp
index 9ef1ccf80..3b5288c77 100644
--- a/components/esm/objectstate.cpp
+++ b/components/esm/objectstate.cpp
@@ -1,4 +1,3 @@
-
#include "objectstate.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/player.cpp b/components/esm/player.cpp
index e64cefc30..9ec53240a 100644
--- a/components/esm/player.cpp
+++ b/components/esm/player.cpp
@@ -1,4 +1,3 @@
-
#include "player.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/queststate.cpp b/components/esm/queststate.cpp
index c8cff7adc..5408cd2ff 100644
--- a/components/esm/queststate.cpp
+++ b/components/esm/queststate.cpp
@@ -1,4 +1,3 @@
-
#include "queststate.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/savedgame.cpp b/components/esm/savedgame.cpp
index b5e0810db..4211bb14e 100644
--- a/components/esm/savedgame.cpp
+++ b/components/esm/savedgame.cpp
@@ -1,4 +1,3 @@
-
#include "savedgame.hpp"
#include "esmreader.hpp"
diff --git a/components/esm/variantimp.cpp b/components/esm/variantimp.cpp
index eeb0bf04f..aeea5017e 100644
--- a/components/esm/variantimp.cpp
+++ b/components/esm/variantimp.cpp
@@ -1,4 +1,3 @@
-
#include "variantimp.hpp"
#include <stdexcept>
diff --git a/components/files/multidircollection.cpp b/components/files/multidircollection.cpp
index 1abbae3ae..7b3b0c440 100644
--- a/components/files/multidircollection.cpp
+++ b/components/files/multidircollection.cpp
@@ -1,4 +1,3 @@
-
#include "multidircollection.hpp"
#include <cctype>
diff --git a/components/interpreter/installopcodes.cpp b/components/interpreter/installopcodes.cpp
index d705a109c..31e911f8b 100644
--- a/components/interpreter/installopcodes.cpp
+++ b/components/interpreter/installopcodes.cpp
@@ -1,4 +1,3 @@
-
#include "installopcodes.hpp"
#include <functional>
diff --git a/components/interpreter/interpreter.cpp b/components/interpreter/interpreter.cpp
index ea1e9fc91..4fd3a8d8c 100644
--- a/components/interpreter/interpreter.cpp
+++ b/components/interpreter/interpreter.cpp
@@ -1,4 +1,3 @@
-
#include "interpreter.hpp"
#include <cassert>
diff --git a/components/interpreter/runtime.cpp b/components/interpreter/runtime.cpp
index dc3da07a8..6599882f1 100644
--- a/components/interpreter/runtime.cpp
+++ b/components/interpreter/runtime.cpp
@@ -1,4 +1,3 @@
-
#include "runtime.hpp"
#include <stdexcept>
diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt
index 13d1a9e1a..1833adcee 100644
--- a/files/mygui/CMakeLists.txt
+++ b/files/mygui/CMakeLists.txt
@@ -1,4 +1,3 @@
-
# Copy resource files into the build directory
set(SDIR ${CMAKE_CURRENT_SOURCE_DIR})
set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui)
diff --git a/files/openmw.appdata.xml b/files/openmw.appdata.xml
new file mode 100644
index 000000000..1c16cb9a4
--- /dev/null
+++ b/files/openmw.appdata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2015 Alexandre Moine <nobrakal@gmail.com> -->
+<application>
+ <id type="desktop">openmw.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <project_license> GPL-3.0 and MIT and zlib</project_license>
+ <name>OpenMW</name>
+ <summary>Unofficial open source engine re-implementation of the game Morrowind</summary>
+ <description>
+ <p>
+ OpenMW is a new engine for 2002's Game of the Year, The Elder Scrolls 3: Morrowind.
+ </p>
+ <p>
+ It aims to be a fully playable (and improved!), open source implementation of the game's engine and functionality (including mods).
+ </p>
+ <p>
+ You will still need the original game data to play OpenMW.
+ </p>
+ </description>
+
+ <screenshots>
+ <screenshot type="default">
+ <image>http://wiki.openmw.org/images/b/b2/Openmw_0.11.1_launcher_1.png</image>
+ <caption>The OpenMW launcher</caption>
+ </screenshot>
+ <screenshot>
+ <image>http://wiki.openmw.org/images/f/f1/Screenshot_mournhold_plaza_0.35.png</image>
+ <caption>The Mournhold's plaza on OpenMW</caption>
+ </screenshot>
+ <screenshot>
+ <image>http://wiki.openmw.org/images/5/5b/Screenshot_Vivec_seen_from_Ebonheart_0.35.png</image>
+ <caption>Vivec seen from Ebonheart on OpenMW</caption>
+ </screenshot>
+ </screenshots>
+<updatecontact>nobrakal@gmail.com</updatecontact>
+ <url type="homepage">https://openmw.org</url>
+ <url type="bugtracker">https://bugs.openmw.org/</url>
+ <url type="faq">https://openmw.org/faq/</url>
+</application>