1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-26 21:41:36 +00:00

Fixed errors and warnings from Travis CI.

This commit is contained in:
dteviot 2015-01-01 09:40:42 +13:00
parent dfbd470613
commit 93bbd7463a
3 changed files with 3 additions and 3 deletions

View file

@ -6,7 +6,7 @@
#include <QDir> #include <QDir>
#include <QTextCodec> #include <QTextCodec>
#include <QDebug> #include <QDebug>
#include <qbrush> #include <QBrush>
#include "components/esm/esmreader.hpp" #include "components/esm/esmreader.hpp"

View file

@ -5,7 +5,7 @@ QString ContentSelectorModel::LoadOrderError::sErrorToolTips[ErrorCode_LoadOrder
{ {
QString("Unable to find dependant file: %1"), QString("Unable to find dependant file: %1"),
QString("Dependent file needs to be active: %1"), QString("Dependent file needs to be active: %1"),
QString("This file needs to load after %1"), QString("This file needs to load after %1")
}; };
ContentSelectorModel::LoadOrderError ContentSelectorModel::LoadOrderError::sNoError = ContentSelectorModel::LoadOrderError(); ContentSelectorModel::LoadOrderError ContentSelectorModel::LoadOrderError::sNoError = ContentSelectorModel::LoadOrderError();

View file

@ -14,7 +14,7 @@ namespace ContentSelectorModel
ErrorCode_None = 0, ErrorCode_None = 0,
ErrorCode_MissingDependency = 1, ErrorCode_MissingDependency = 1,
ErrorCode_InactiveDependency = 2, ErrorCode_InactiveDependency = 2,
ErrorCode_LoadOrder = 3, ErrorCode_LoadOrder = 3
}; };
inline LoadOrderError() : mErrorCode(ErrorCode_None) {}; inline LoadOrderError() : mErrorCode(ErrorCode_None) {};