krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

removed Verifier class (using Operation class without subclassing now)

Browse source
This commit is contained in:
Marc Zinnschlag 2013-09-14 15:16:31 +02:00
parent f4c03c6a29
commit b7bffc8a79
5 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/CMakeLists.txt
View file

@ -37,7 +37,7 @@ opencs_units (model/tools
)
opencs_units_noqt (model/tools
verifier mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
mandatoryid skillcheck classcheck factioncheck racecheck soundcheck regioncheck
birthsigncheck spellcheck
)

7
apps/opencs/model/tools/tools.cpp
View file

@ -3,9 +3,8 @@
#include <QThreadPool>
#include "verifier.hpp"
#include "../doc/state.hpp"
#include "../doc/operation.hpp"
#include "../world/data.hpp"
#include "../world/universalid.hpp"
@ -36,11 +35,11 @@ const CSMDoc::Operation *CSMTools::Tools::get (int type) const
return const_cast<Tools *> (this)->get (type);
}
CSMTools::Verifier *CSMTools::Tools::getVerifier()
CSMDoc::Operation *CSMTools::Tools::getVerifier()
{
if (!mVerifier)
{
mVerifier = new Verifier;
mVerifier = new CSMDoc::Operation (CSMDoc::State_Verifying, false);
connect (mVerifier, SIGNAL (progress (int, int, int)), this, SIGNAL (progress (int, int, int)));
connect (mVerifier, SIGNAL (finished()), this, SLOT (verifierDone()));

5
apps/opencs/model/tools/tools.hpp
View file

@ -18,7 +18,6 @@ namespace CSMDoc
namespace CSMTools
{
class Verifier;
class ReportModel;
class Tools : public QObject
@ -26,7 +25,7 @@ namespace CSMTools
Q_OBJECT
CSMWorld::Data& mData;
Verifier *mVerifier;
CSMDoc::Operation *mVerifier;
std::map<int, ReportModel *> mReports;
int mNextReportNumber;
std::map<int, int> mActiveReports; // type, report number
@ -35,7 +34,7 @@ namespace CSMTools
Tools (const Tools&);
Tools& operator= (const Tools&);
Verifier *getVerifier();
CSMDoc::Operation *getVerifier();
CSMDoc::Operation *get (int type);
///< Returns a 0-pointer, if operation hasn't been used yet.

7
apps/opencs/model/tools/verifier.cpp
View file

@ -1,7 +0,0 @@
#include "verifier.hpp"
#include "../doc/state.hpp"
CSMTools::Verifier::Verifier() : Operation (CSMDoc::State_Verifying, false)
{}

17
apps/opencs/model/tools/verifier.hpp
View file

@ -1,17 +0,0 @@
#ifndef CSM_TOOLS_VERIFIER_H
#define CSM_TOOLS_VERIFIER_H
#include "../doc/operation.hpp"
namespace CSMTools
{
class Verifier : public CSMDoc::Operation
{
public:
Verifier();
};
}
#endif