Merge branch 'development' into ModuleMan

Author: Causeless

Source/Activities/ActorEditor.cpp

@@ -19,7 +19,7 @@
 
 #include "ObjectPickerGUI.h"
 
-namespace RTE {
+using namespace RTE;
 
 	ConcreteClassInfo(ActorEditor, EditorActivity, 0);
 
@@ -246,5 +246,3 @@ namespace RTE {
 		}
 		return false;
 	}
-
-} // namespace RTE

Source/Activities/AreaEditor.cpp

@@ -26,7 +26,7 @@
 #include "AreaEditorGUI.h"
 #include "GameActivity.h"
 
-namespace RTE {
+using namespace RTE;
 
 	ConcreteClassInfo(AreaEditor, EditorActivity, 0);
 
@@ -569,5 +569,3 @@ namespace RTE {
 		else
 			m_pOverwriteNameLabel->SetText(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
 	}
-
-} // namespace RTE

Source/Activities/AssemblyEditor.cpp

@@ -26,7 +26,7 @@
 #include "BunkerAssembly.h"
 #include "BunkerAssemblyScheme.h"
 
-namespace RTE {
+using namespace RTE;
 
 	ConcreteClassInfo(AssemblyEditor, EditorActivity, 0);
 
@@ -608,5 +608,3 @@ namespace RTE {
 	void AssemblyEditor::UpdateOverwriteDialog() {
 		m_pOverwriteNameLabel->SetText(m_pEditorGUI->GetCurrentAssemblyName());
 	}
-
-} // namespace RTE

Source/Activities/BaseEditor.cpp

@@ -20,7 +20,7 @@
 
 #include "SceneEditorGUI.h"
 
-namespace RTE {
+using namespace RTE;
 
 	ConcreteClassInfo(BaseEditor, Activity, 0);
 
@@ -281,5 +281,3 @@ namespace RTE {
 		*/
 		return false;
 	}
-
-} // namespace RTE

Source/Activities/EditorActivity.cpp

@@ -19,7 +19,7 @@
 #include "GUIControlManager.h"
 #include "GUICollectionBox.h"
 
-namespace RTE {
+using namespace RTE;
 
 	AbstractClassInfo(EditorActivity, Activity);
 
@@ -504,5 +504,3 @@ namespace RTE {
 
 	void EditorActivity::Draw(BITMAP* pTargetBitmap, const Vector& targetPos) {
 	}
-
-} // namespace RTE

Source/Activities/GAScripted.cpp

@@ -27,7 +27,7 @@
 
 #include "tracy/Tracy.hpp"
 
-namespace RTE {
+using namespace RTE;
 
 	ConcreteClassInfo(GAScripted, GameActivity, 0);
 
@@ -456,5 +456,3 @@ namespace RTE {
 			}
 		}
 	}
-
-} // namespace RTE