From 71d63647546db1bf0e2b8adb189cbacb1f6ba1d7 Mon Sep 17 00:00:00 2001
From: Marek Kochanowicz <sirherrbatka@gmail.com>
Date: Mon, 27 Jan 2014 13:13:39 +0100
Subject: [PATCH] Chaninging variables name to follow our policy.

---
 apps/opencs/view/world/cellcreator.cpp      | 6 +++---
 apps/opencs/view/world/cellcreator.hpp      | 2 +-
 apps/opencs/view/world/creator.hpp          | 2 +-
 apps/opencs/view/world/genericcreator.cpp   | 4 ++--
 apps/opencs/view/world/genericcreator.hpp   | 2 +-
 apps/opencs/view/world/referencecreator.cpp | 4 ++--
 apps/opencs/view/world/referencecreator.hpp | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/opencs/view/world/cellcreator.cpp b/apps/opencs/view/world/cellcreator.cpp
index e65501e5f6..cdeee56559 100644
--- a/apps/opencs/view/world/cellcreator.cpp
+++ b/apps/opencs/view/world/cellcreator.cpp
@@ -81,11 +81,11 @@ void CSVWorld::CellCreator::valueChanged (int index)
     update();
 }
 
-void CSVWorld::CellCreator::cloneMode(const std::string& originid, 
+void CSVWorld::CellCreator::cloneMode(const std::string& originId, 
                                       const CSMWorld::UniversalId::Type type)
 {
-    CSVWorld::GenericCreator::cloneMode(originid, type);
-    if (*(originid.begin()) == '#') //if originid points to the exterior cell
+    CSVWorld::GenericCreator::cloneMode(originId, type);
+    if (*(originId.begin()) == '#') //if originid points to the exterior cell
     {
         setType(1); //enable x and y controls
         mType->setCurrentIndex(1);
diff --git a/apps/opencs/view/world/cellcreator.hpp b/apps/opencs/view/world/cellcreator.hpp
index 472be43b94..74bf5f76bf 100644
--- a/apps/opencs/view/world/cellcreator.hpp
+++ b/apps/opencs/view/world/cellcreator.hpp
@@ -31,7 +31,7 @@ namespace CSVWorld
             
             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);
 
         private slots:
diff --git a/apps/opencs/view/world/creator.hpp b/apps/opencs/view/world/creator.hpp
index 9be619915d..2d5e014e2d 100644
--- a/apps/opencs/view/world/creator.hpp
+++ b/apps/opencs/view/world/creator.hpp
@@ -25,7 +25,7 @@ namespace CSVWorld
 
             virtual void reset() = 0;
             
-            virtual void cloneMode(const std::string& originid,
+            virtual void cloneMode(const std::string& originId,
                                    const CSMWorld::UniversalId::Type type) = 0;
 
             virtual void setEditLock (bool locked) = 0;
diff --git a/apps/opencs/view/world/genericcreator.cpp b/apps/opencs/view/world/genericcreator.cpp
index 1f74b99540..9fb0b4b21f 100644
--- a/apps/opencs/view/world/genericcreator.cpp
+++ b/apps/opencs/view/world/genericcreator.cpp
@@ -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)
 {
     mCloneMode = true;
-    mClonedId = originid;
+    mClonedId = originId;
     mClonedType = type;
 }
 
diff --git a/apps/opencs/view/world/genericcreator.hpp b/apps/opencs/view/world/genericcreator.hpp
index 06b110b11c..98dd12ac27 100644
--- a/apps/opencs/view/world/genericcreator.hpp
+++ b/apps/opencs/view/world/genericcreator.hpp
@@ -66,7 +66,7 @@ namespace CSVWorld
             
             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);
             
             virtual std::string getErrors() const;
diff --git a/apps/opencs/view/world/referencecreator.cpp b/apps/opencs/view/world/referencecreator.cpp
index 069300f423..384b59fc4c 100644
--- a/apps/opencs/view/world/referencecreator.cpp
+++ b/apps/opencs/view/world/referencecreator.cpp
@@ -85,9 +85,9 @@ void CSVWorld::ReferenceCreator::toggleWidgets(bool 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)
 {
-    CSVWorld::GenericCreator::cloneMode(originid, type);
+    CSVWorld::GenericCreator::cloneMode(originId, type);
     cellChanged(); //otherwise ok button will remain disabled
 }
diff --git a/apps/opencs/view/world/referencecreator.hpp b/apps/opencs/view/world/referencecreator.hpp
index 96c1bec27e..73b0899e54 100644
--- a/apps/opencs/view/world/referencecreator.hpp
+++ b/apps/opencs/view/world/referencecreator.hpp
@@ -25,7 +25,7 @@ namespace CSVWorld
             ReferenceCreator (CSMWorld::Data& data, QUndoStack& undoStack,
                 const CSMWorld::UniversalId& id);
 
-            virtual void cloneMode(const std::string& originid, 
+            virtual void cloneMode(const std::string& originId, 
                                    const CSMWorld::UniversalId::Type type);
             
             virtual void reset();