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

Cleared whitespaces.

Browse source
This commit is contained in:
Marek Kochanowicz 2014-01-27 19:40:05 +01:00
parent c82db915f1
commit 62ea0bb066
14 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/opencs/model/world/collection.hpp
View file

@ -50,7 +50,7 @@ namespace CSMWorld
// not implemented
Collection (const Collection&);
Collection& operator= (const Collection&);
protected:
const std::map<std::string, int>& getIdMap() const;
@ -97,11 +97,11 @@ namespace CSMWorld
virtual void appendBlankRecord (const std::string& id,
UniversalId::Type type = UniversalId::Type_None);
///< \param type Will be ignored, unless the collection supports multiple record types
virtual void cloneRecord(const std::string& origin,
const std::string& destination,
const UniversalId::Type type);
virtual int searchId (const std::string& id) const;
////< Search record with \a id.
/// \return index of record (if found) or -1 (not found)
@ -149,7 +149,7 @@ namespace CSMWorld
void setRecord (int index, const Record<ESXRecordT>& record);
///< \attention This function must not change the ID.
};
template<typename ESXRecordT, typename IdAccessorT>
const std::map<std::string, int>& Collection<ESXRecordT, IdAccessorT>::getIdMap() const
{
@ -206,10 +206,10 @@ namespace CSMWorld
copy.mModified = getRecord(origin).get();
copy.mState = RecordBase::State_ModifiedOnly;
copy.get().mId = destination;
insertRecord(copy, getAppendIndex(destination, type));
}
template<typename ESXRecordT, typename IdAccessorT>
Collection<ESXRecordT, IdAccessorT>::Collection()
{}

2
apps/opencs/model/world/collectionbase.hpp
View file

@ -77,7 +77,7 @@ namespace CSMWorld
virtual void cloneRecord(const std::string& origin,
const std::string& destination,
const UniversalId::Type type) = 0;
virtual const RecordBase& getRecord (const std::string& id) const = 0;
virtual const RecordBase& getRecord (int index) const = 0;

4
apps/opencs/model/world/commands.hpp
View file

@ -53,12 +53,12 @@ namespace CSMWorld
const std::string& IdDestination,
const UniversalId::Type type,
QUndoCommand* parent = 0);
virtual void redo();
virtual void undo();
};
class CreateCommand : public QUndoCommand
{
IdTable& mModel;

2
apps/opencs/model/world/idtable.hpp
View file

@ -66,7 +66,7 @@ namespace CSMWorld
void cloneRecord(const std::string& origin,
const std::string& destination,
UniversalId::Type type = UniversalId::Type_None);
QModelIndex getModelIndex (const std::string& id, int column) const;
void setRecord (const std::string& id, const RecordBase& record);

2
apps/opencs/model/world/refidcollection.hpp
View file

@ -72,7 +72,7 @@ namespace CSMWorld
virtual void cloneRecord(const std::string& origin,
const std::string& destination,
const UniversalId::Type type);
virtual void appendBlankRecord (const std::string& id, UniversalId::Type type);
///< \param type Will be ignored, unless the collection supports multiple record types

4
apps/opencs/view/world/cellcreator.hpp
View file

@ -28,9 +28,9 @@ namespace CSVWorld
CellCreator (CSMWorld::Data& data, QUndoStack& undoStack, const CSMWorld::UniversalId& id);
virtual void reset();
virtual void toggleWidgets(bool active = true);
virtual void cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type);

4
apps/opencs/view/world/creator.hpp
View file

@ -24,12 +24,12 @@ namespace CSVWorld
virtual ~Creator();
virtual void reset() = 0;
virtual void cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type) = 0;
virtual void setEditLock (bool locked) = 0;
virtual void toggleWidgets(bool active = true) = 0;
signals:

6
apps/opencs/view/world/genericcreator.cpp
View file

@ -57,15 +57,15 @@ const CSMWorld::UniversalId& CSVWorld::GenericCreator::getCollectionId() const
}
CSVWorld::GenericCreator::GenericCreator (CSMWorld::Data& data, QUndoStack& undoStack,
const CSMWorld::UniversalId& id, bool relaxedIdRules):
const CSMWorld::UniversalId& id, bool relaxedIdRules):
mData (data),
mUndoStack (undoStack),
mListId (id),
mLocked (false),
mCloneMode(false),
mClonedType(CSMWorld::UniversalId::Type_None)
{
mLayout = new QHBoxLayout;
mLayout->setContentsMargins (0, 0, 0, 0);

6
apps/opencs/view/world/genericcreator.hpp
View file

@ -31,10 +31,10 @@ namespace CSVWorld
bool mLocked;
std::string mClonedId;
CSMWorld::UniversalId::Type mClonedType;
protected:
bool mCloneMode;
protected:
void update();
@ -49,7 +49,7 @@ namespace CSVWorld
virtual std::string getId() const;
virtual void configureCreateCommand (CSMWorld::CreateCommand& command) const;
CSMWorld::Data& getData() const;
const CSMWorld::UniversalId& getCollectionId() const;

4
apps/opencs/view/world/referencecreator.cpp
View file

@ -53,9 +53,9 @@ std::string CSVWorld::ReferenceCreator::getErrors() const
{
return errors;
}
std::string cell = mCell->text().toUtf8().constData();
if (cell.empty())
{
if (!errors.empty())

2
apps/opencs/view/world/referencecreator.hpp
View file

@ -27,7 +27,7 @@ namespace CSVWorld
virtual void cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type);
virtual void reset();
virtual void toggleWidgets(bool active = true);

2
apps/opencs/view/world/table.cpp
View file

@ -203,7 +203,7 @@ CSVWorld::Table::Table (const CSMWorld::UniversalId& id, CSMWorld::Data& data, Q
mCreateAction = new QAction (tr ("Add Record"), this);
connect (mCreateAction, SIGNAL (triggered()), this, SIGNAL (createRequest()));
addAction (mCreateAction);
mCloneAction = new QAction (tr ("Clone Record"), this);
connect(mCloneAction, SIGNAL (triggered()), this, SLOT (cloneRecord()));
addAction(mCloneAction);

6
apps/opencs/view/world/tablesubview.cpp
View file

@ -47,11 +47,11 @@ CSVWorld::TableSubView::TableSubView (const CSMWorld::UniversalId& id, CSMDoc::D
if (mBottom->canCreateAndDelete())
{
connect (mTable, SIGNAL (createRequest()), mBottom, SLOT (createRequest()));
connect (mTable, SIGNAL (cloneRequest(const CSMWorld::UniversalId&)), this,
SLOT(cloneRequest(const CSMWorld::UniversalId&)));
connect (this, SIGNAL(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type)),
connect (this, SIGNAL(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type)),
mBottom, SLOT(cloneRequest(const std::string&, const CSMWorld::UniversalId::Type)));
}
connect (mBottom, SIGNAL (requestFocus (const std::string&)),

4
apps/opencs/view/world/tablesubview.hpp
View file

@ -38,9 +38,9 @@ namespace CSVWorld
virtual void updateEditorSetting (const QString& key, const QString& value);
virtual void setStatusBar (bool show);
signals:
void cloneRequest(const std::string&,
void cloneRequest(const std::string&,
const CSMWorld::UniversalId::Type);
private slots: