Changeset 8568 for code/branches/presentation/src/modules/docking/DockingController.h

Timestamp:

May 24, 2011, 10:41:43 PM (14 years ago)

Author:

dafrick

Message:

Renaming member variables to adhere to styleguide, initialize values, always select an item in the DockingDialog.

File:

• code/branches/presentation/src/modules/docking/DockingController.h (modified) (2 diffs)

code/branches/presentation/src/modules/docking/DockingController.h

@@ -49 +49 @@
             void takeControl(bool docking);
 
-            void setDock(Dock* dock) { this->dock = dock; }
-            void setPlayer(PlayerInfo* player) { this->player = player; }
+            void setDock(Dock* dock) { this->dock_ = dock; }
+            void setPlayer(PlayerInfo* player) { this->player_ = player; }
 
         protected:
@@ -56 +56 @@
 
         private:
-            bool docking;
+            bool docking_;
 
-            Dock* dock;
-            PlayerInfo* player;
+            Dock* dock_;
+            PlayerInfo* player_;
 
-            ControllableEntity* entity;
+            ControllableEntity* entity_;
     };
 }