From a24f215f09bc7f2f040abd49e3db985be8562f24 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Tue, 30 Apr 2013 09:59:05 -0700 Subject: [PATCH] Moved menu, chat entry field to ui subdirectory. --- interface/src/main.cpp | 9 +++++---- interface/src/{ => ui}/ChatEntry.cpp | 0 interface/src/{ => ui}/ChatEntry.h | 0 interface/src/{ => ui}/Menu.cpp | 0 interface/src/{ => ui}/Menu.h | 0 interface/src/{ => ui}/MenuColumn.cpp | 0 interface/src/{ => ui}/MenuColumn.h | 0 interface/src/{ => ui}/MenuRow.cpp | 0 interface/src/{ => ui}/MenuRow.h | 0 9 files changed, 5 insertions(+), 4 deletions(-) rename interface/src/{ => ui}/ChatEntry.cpp (100%) rename interface/src/{ => ui}/ChatEntry.h (100%) rename interface/src/{ => ui}/Menu.cpp (100%) rename interface/src/{ => ui}/Menu.h (100%) rename interface/src/{ => ui}/MenuColumn.cpp (100%) rename interface/src/{ => ui}/MenuColumn.h (100%) rename interface/src/{ => ui}/MenuRow.cpp (100%) rename interface/src/{ => ui}/MenuRow.h (100%) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index ac186a2f07..1b52194d8d 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -61,11 +61,12 @@ #include "AngleUtil.h" #include "Stars.h" -#include "MenuRow.h" -#include "MenuColumn.h" -#include "Menu.h" +#include "ui/ChatEntry.h" +#include "ui/MenuRow.h" +#include "ui/MenuColumn.h" +#include "ui/Menu.h" + #include "Camera.h" -#include "ChatEntry.h" #include "Avatar.h" #include "Texture.h" #include diff --git a/interface/src/ChatEntry.cpp b/interface/src/ui/ChatEntry.cpp similarity index 100% rename from interface/src/ChatEntry.cpp rename to interface/src/ui/ChatEntry.cpp diff --git a/interface/src/ChatEntry.h b/interface/src/ui/ChatEntry.h similarity index 100% rename from interface/src/ChatEntry.h rename to interface/src/ui/ChatEntry.h diff --git a/interface/src/Menu.cpp b/interface/src/ui/Menu.cpp similarity index 100% rename from interface/src/Menu.cpp rename to interface/src/ui/Menu.cpp diff --git a/interface/src/Menu.h b/interface/src/ui/Menu.h similarity index 100% rename from interface/src/Menu.h rename to interface/src/ui/Menu.h diff --git a/interface/src/MenuColumn.cpp b/interface/src/ui/MenuColumn.cpp similarity index 100% rename from interface/src/MenuColumn.cpp rename to interface/src/ui/MenuColumn.cpp diff --git a/interface/src/MenuColumn.h b/interface/src/ui/MenuColumn.h similarity index 100% rename from interface/src/MenuColumn.h rename to interface/src/ui/MenuColumn.h diff --git a/interface/src/MenuRow.cpp b/interface/src/ui/MenuRow.cpp similarity index 100% rename from interface/src/MenuRow.cpp rename to interface/src/ui/MenuRow.cpp diff --git a/interface/src/MenuRow.h b/interface/src/ui/MenuRow.h similarity index 100% rename from interface/src/MenuRow.h rename to interface/src/ui/MenuRow.h