Shuffling files around.

src/xenia/app/emulator_window.cc

@@ -7,7 +7,7 @@
  ******************************************************************************
  */
 
-#include "xenia/emulator_window.h"
+#include "xenia/app/emulator_window.h"
 
 #include "xenia/base/clock.h"
 #include "xenia/base/logging.h"
@@ -18,6 +18,7 @@
 #include "xenia/profiling.h"
 
 namespace xe {
+namespace app {
 
 using xe::ui::KeyEvent;
 using xe::ui::MenuItem;
@@ -222,4 +223,5 @@ void EmulatorWindow::UpdateTitle() {
   window_->set_title(title);
 }
 
+}  // namespace app
 }  // namespace xe

src/xenia/app/emulator_window.h

@@ -7,8 +7,8 @@
  ******************************************************************************
  */
 
-#ifndef XENIA_EMULATOR_WINDOW_H_
+#ifndef XENIA_APP_EMULATOR_WINDOW_H_
-#define XENIA_EMULATOR_WINDOW_H_
+#define XENIA_APP_EMULATOR_WINDOW_H_
 
 #include <memory>
 
@@ -18,8 +18,11 @@
 #include "xenia/xbox.h"
 
 namespace xe {
-
 class Emulator;
+}  // namespace xe
+
+namespace xe {
+namespace app {
 
 class EmulatorWindow {
  public:
@@ -50,6 +53,7 @@ class EmulatorWindow {
   std::unique_ptr<ui::Window> window_;
 };
 
+}  // namespace app
 }  // namespace xe
 
-#endif  // XENIA_EMULATOR_WINDOW_H_
+#endif  // XENIA_APP_EMULATOR_WINDOW_H_

src/xenia/app/xenia_main.cc

@@ -9,10 +9,10 @@
 
 #include <gflags/gflags.h>
 
+#include "xenia/app/emulator_window.h"
 #include "xenia/base/logging.h"
 #include "xenia/base/main.h"
 #include "xenia/emulator.h"
-#include "xenia/emulator_window.h"
 #include "xenia/kernel/kernel.h"
 #include "xenia/profiling.h"
 #include "xenia/ui/file_picker.h"
@@ -20,6 +20,7 @@
 DEFINE_string(target, "", "Specifies the target .xex or .iso to execute.");
 
 namespace xe {
+namespace app {
 
 int xenia_main(std::vector<std::wstring>& args) {
   Profiler::Initialize();
@@ -97,6 +98,7 @@ int xenia_main(std::vector<std::wstring>& args) {
   return 0;
 }
 
+}  // namespace app
 }  // namespace xe
 
-DEFINE_ENTRY_POINT(L"xenia", L"xenia some.xex", xe::xenia_main);
+DEFINE_ENTRY_POINT(L"xenia", L"xenia some.xex", xe::app::xenia_main);

xenia.vcxproj

@@ -105,16 +105,16 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\xenia\app\emulator_window.cc" />
+    <ClCompile Include="src\xenia\app\xenia_main.cc" />
     <ClCompile Include="src\xenia\base\main_win.cc" />
-    <ClCompile Include="src\xenia\emulator_window.cc" />
-    <ClCompile Include="src\xenia\xenia_main.cc" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="src\xenia\app\emulator_window.h" />
     <ClInclude Include="src\xenia\base\main.h" />
-    <ClInclude Include="src\xenia\emulator_window.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\xenia\ui\main_resources.rc">
+    <ResourceCompile Include="src\xenia\app\main_resources.rc">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Checked|x64'">$(SolutionDir)third_party/elemental-forms;$(SolutionDir);.</AdditionalIncludeDirectories>

xenia.vcxproj.filters

@@ -14,32 +14,32 @@
     <Filter Include="src\xenia\base">
       <UniqueIdentifier>{a3d918ab-c42b-469d-9950-ec4656b77b32}</UniqueIdentifier>
     </Filter>
-    <Filter Include="src\xenia\ui">
+    <Filter Include="src\xenia\app">
-      <UniqueIdentifier>{81255c06-3cf7-48ad-900a-f7c614d134ac}</UniqueIdentifier>
+      <UniqueIdentifier>{2d31f471-6ba9-434c-88e6-5a4da1b4d67d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\xenia\base\main_win.cc">
       <Filter>src\xenia\base</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\xenia_main.cc">
+    <ClCompile Include="src\xenia\app\emulator_window.cc">
-      <Filter>src\xenia</Filter>
+      <Filter>src\xenia\app</Filter>
     </ClCompile>
-    <ClCompile Include="src\xenia\emulator_window.cc">
+    <ClCompile Include="src\xenia\app\xenia_main.cc">
-      <Filter>src\xenia</Filter>
+      <Filter>src\xenia\app</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\xenia\base\main.h">
       <Filter>src\xenia\base</Filter>
     </ClInclude>
-    <ClInclude Include="src\xenia\emulator_window.h">
+    <ClInclude Include="src\xenia\app\emulator_window.h">
-      <Filter>src\xenia</Filter>
+      <Filter>src\xenia\app</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="src\xenia\ui\main_resources.rc">
+    <ResourceCompile Include="src\xenia\app\main_resources.rc">
-      <Filter>src\xenia\ui</Filter>
+      <Filter>src\xenia\app</Filter>
     </ResourceCompile>
   </ItemGroup>
 </Project>