Chaninging variables name to follow our policy.

actorid
Marek Kochanowicz 11 years ago
parent aa6d1ff4c3
commit 71d6364754

@ -81,11 +81,11 @@ void CSVWorld::CellCreator::valueChanged (int index)
update(); update();
} }
void CSVWorld::CellCreator::cloneMode(const std::string& originid, void CSVWorld::CellCreator::cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type) const CSMWorld::UniversalId::Type type)
{ {
CSVWorld::GenericCreator::cloneMode(originid, type); CSVWorld::GenericCreator::cloneMode(originId, type);
if (*(originid.begin()) == '#') //if originid points to the exterior cell if (*(originId.begin()) == '#') //if originid points to the exterior cell
{ {
setType(1); //enable x and y controls setType(1); //enable x and y controls
mType->setCurrentIndex(1); mType->setCurrentIndex(1);

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

@ -25,7 +25,7 @@ namespace CSVWorld
virtual void reset() = 0; virtual void reset() = 0;
virtual void cloneMode(const std::string& originid, virtual void cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type) = 0; const CSMWorld::UniversalId::Type type) = 0;
virtual void setEditLock (bool locked) = 0; virtual void setEditLock (bool locked) = 0;

@ -149,11 +149,11 @@ void CSVWorld::GenericCreator::create()
} }
} }
void CSVWorld::GenericCreator::cloneMode(const std::string& originid, void CSVWorld::GenericCreator::cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type) const CSMWorld::UniversalId::Type type)
{ {
mCloneMode = true; mCloneMode = true;
mClonedId = originid; mClonedId = originId;
mClonedType = type; mClonedType = type;
} }

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

@ -85,9 +85,9 @@ void CSVWorld::ReferenceCreator::toggleWidgets(bool active)
mCell->setEnabled(active); mCell->setEnabled(active);
} }
void CSVWorld::ReferenceCreator::cloneMode(const std::string& originid, void CSVWorld::ReferenceCreator::cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type) const CSMWorld::UniversalId::Type type)
{ {
CSVWorld::GenericCreator::cloneMode(originid, type); CSVWorld::GenericCreator::cloneMode(originId, type);
cellChanged(); //otherwise ok button will remain disabled cellChanged(); //otherwise ok button will remain disabled
} }

@ -25,7 +25,7 @@ namespace CSVWorld
ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack, ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
const CSMWorld::UniversalId& id); const CSMWorld::UniversalId& id);
virtual void cloneMode(const std::string& originid, virtual void cloneMode(const std::string& originId,
const CSMWorld::UniversalId::Type type); const CSMWorld::UniversalId::Type type);
virtual void reset(); virtual void reset();

Loading…
Cancel
Save