Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-09 12:07:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 49

Merge branch 'operations' into load

Browse source 
Conflicts:
	apps/opencs/main.cpp
	apps/opencs/model/doc/document.cpp
This commit is contained in:
Marc Zinnschlag 2014-05-08 13:17:24 +02:00
commit 6eff5ecaad
125 changed files with 2013 additions and 2235 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/opencs/model/doc/document.cpp
View file

@ -2247,8 +2247,10 @@ CSMDoc::Document::Document (const Files::ConfigurationManager& configuration,
connect (&mSaving, SIGNAL (progress (int, int, int)), this, SLOT (progress (int, int, int)));
connect (&mSaving, SIGNAL (done (int)), this, SLOT (operationDone (int)));
connect (&mSaving, SIGNAL (reportMessage (const QString&, int)),
this, SLOT (reportMessage (const QString&, int)));
connect (
&mSaving, SIGNAL (reportMessage (const CSMWorld::UniversalId&, const std::string&, int)),
this, SLOT (reportMessage (const CSMWorld::UniversalId&, const std::string&, int)));
}
CSMDoc::Document::~Document()
@ -2327,10 +2329,11 @@ void CSMDoc::Document::modificationStateChanged (bool clean)
emit stateChanged (getState(), this);
}
void CSMDoc::Document::reportMessage (const QString& message, int type)
void CSMDoc::Document::reportMessage (const CSMWorld::UniversalId& id, const std::string& message,
int type)
{
/// \todo find a better way to get these messages to the user.
std::cout << message.toUtf8().constData() << std::endl;
std::cout << message << std::endl;
}
void CSMDoc::Document::operationDone (int type)