From 9a1dcf3d67cefe816ac5c948639ad60269362c59 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Fri, 20 Nov 2009 21:05:35 +0000 Subject: [PATCH] Move the new GUI into the old GUI's directory tree --- CMakeLists.txt | 2 +- include/{gui2 => gui}/Button.hpp | 2 +- include/{gui2 => gui}/ContainerWidget.hpp | 2 +- {src/ft => include/gui}/IFont.hpp | 0 include/{gui2 => gui}/ILayout.hpp | 2 +- include/{gui2 => gui}/Label.hpp | 2 +- include/{gui2 => gui}/RenderBuffer.hpp | 0 include/{gui2 => gui}/RenderContext.hpp | 2 +- include/{gui2 => gui}/Theme.hpp | 2 +- include/{gui2 => gui}/ThrottleMeter.hpp | 2 +- include/{gui2 => gui}/Widget.hpp | 2 +- include/{gui2 => gui}/Window.hpp | 4 ++-- src/Game.cpp | 8 ++++---- src/UIDemo.cpp | 4 ++-- src/{gui2 => gui}/Button.cpp | 2 +- src/{gui2 => gui}/ContainerWidget.cpp | 2 +- src/{ft => gui}/Font.cpp | 2 +- src/{gui2 => gui}/Label.cpp | 2 +- src/{gui2 => gui}/Layout.cpp | 14 +++++++------- src/{gui2 => gui}/RenderContext.cpp | 4 ++-- src/{gui2 => gui}/Theme.cpp | 2 +- src/{gui2 => gui}/ThrottleMeter.cpp | 2 +- src/{gui2 => gui}/Widget.cpp | 2 +- src/{gui2 => gui}/Window.cpp | 2 +- 24 files changed, 34 insertions(+), 34 deletions(-) rename include/{gui2 => gui}/Button.hpp (97%) rename include/{gui2 => gui}/ContainerWidget.hpp (98%) rename {src/ft => include/gui}/IFont.hpp (100%) rename include/{gui2 => gui}/ILayout.hpp (97%) rename include/{gui2 => gui}/Label.hpp (97%) rename include/{gui2 => gui}/RenderBuffer.hpp (100%) rename include/{gui2 => gui}/RenderContext.hpp (98%) rename include/{gui2 => gui}/Theme.hpp (98%) rename include/{gui2 => gui}/ThrottleMeter.hpp (98%) rename include/{gui2 => gui}/Widget.hpp (98%) rename include/{gui2 => gui}/Window.hpp (94%) rename src/{gui2 => gui}/Button.cpp (97%) rename src/{gui2 => gui}/ContainerWidget.cpp (97%) rename src/{ft => gui}/Font.cpp (99%) rename src/{gui2 => gui}/Label.cpp (98%) rename src/{gui2 => gui}/Layout.cpp (95%) rename src/{gui2 => gui}/RenderContext.cpp (97%) rename src/{gui2 => gui}/Theme.cpp (98%) rename src/{gui2 => gui}/ThrottleMeter.cpp (98%) rename src/{gui2 => gui}/Widget.cpp (98%) rename src/{gui2 => gui}/Window.cpp (97%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 709aa9f..ecedd35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ set (CMAKE_BUILD_TYPE RelWithDebInfo) file (GLOB folder_source ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp ${CMAKE_CURRENT_SOURCE_DIR}/src/ft/*.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/src/gui2/*.cpp) + ${CMAKE_CURRENT_SOURCE_DIR}/src/gui/*.cpp) source_group (${PROJECT_NAME} FILES ${folder_source}) find_package (SDL REQUIRED) diff --git a/include/gui2/Button.hpp b/include/gui/Button.hpp similarity index 97% rename from include/gui2/Button.hpp rename to include/gui/Button.hpp index 0d774e7..d14587e 100644 --- a/include/gui2/Button.hpp +++ b/include/gui/Button.hpp @@ -21,7 +21,7 @@ // Internal header: do not include this file directly #include "Platform.hpp" -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include diff --git a/include/gui2/ContainerWidget.hpp b/include/gui/ContainerWidget.hpp similarity index 98% rename from include/gui2/ContainerWidget.hpp rename to include/gui/ContainerWidget.hpp index 9f6696e..7c13cbd 100644 --- a/include/gui2/ContainerWidget.hpp +++ b/include/gui/ContainerWidget.hpp @@ -19,7 +19,7 @@ #define INC_CONTAINER_WIDGET_HPP #include "Platform.hpp" -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include diff --git a/src/ft/IFont.hpp b/include/gui/IFont.hpp similarity index 100% rename from src/ft/IFont.hpp rename to include/gui/IFont.hpp diff --git a/include/gui2/ILayout.hpp b/include/gui/ILayout.hpp similarity index 97% rename from include/gui2/ILayout.hpp rename to include/gui/ILayout.hpp index d6739d0..3309c13 100644 --- a/include/gui2/ILayout.hpp +++ b/include/gui/ILayout.hpp @@ -19,7 +19,7 @@ #define INC_GUI_ILAYOUT_HPP #include "Platform.hpp" -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include diff --git a/include/gui2/Label.hpp b/include/gui/Label.hpp similarity index 97% rename from include/gui2/Label.hpp rename to include/gui/Label.hpp index 837e0d0..59ae4a9 100644 --- a/include/gui2/Label.hpp +++ b/include/gui/Label.hpp @@ -19,7 +19,7 @@ #define INC_GUI_LABEL_HPP #include "Platform.hpp" -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include diff --git a/include/gui2/RenderBuffer.hpp b/include/gui/RenderBuffer.hpp similarity index 100% rename from include/gui2/RenderBuffer.hpp rename to include/gui/RenderBuffer.hpp diff --git a/include/gui2/RenderContext.hpp b/include/gui/RenderContext.hpp similarity index 98% rename from include/gui2/RenderContext.hpp rename to include/gui/RenderContext.hpp index 3319a88..65ca72b 100644 --- a/include/gui2/RenderContext.hpp +++ b/include/gui/RenderContext.hpp @@ -22,7 +22,7 @@ #include "Platform.hpp" #include "Colour.hpp" -#include "gui2/Theme.hpp" +#include "gui/Theme.hpp" #include #include diff --git a/include/gui2/Theme.hpp b/include/gui/Theme.hpp similarity index 98% rename from include/gui2/Theme.hpp rename to include/gui/Theme.hpp index 4b8aca2..10d5855 100644 --- a/include/gui2/Theme.hpp +++ b/include/gui/Theme.hpp @@ -22,7 +22,7 @@ #include "Platform.hpp" #include "Colour.hpp" -#include "ft/IFont.hpp" +#include "IFont.hpp" #include diff --git a/include/gui2/ThrottleMeter.hpp b/include/gui/ThrottleMeter.hpp similarity index 98% rename from include/gui2/ThrottleMeter.hpp rename to include/gui/ThrottleMeter.hpp index f24516a..f110e1f 100644 --- a/include/gui2/ThrottleMeter.hpp +++ b/include/gui/ThrottleMeter.hpp @@ -19,7 +19,7 @@ #define INC_GUI_THROTTLE_METER_HPP #include "Platform.hpp" -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include diff --git a/include/gui2/Widget.hpp b/include/gui/Widget.hpp similarity index 98% rename from include/gui2/Widget.hpp rename to include/gui/Widget.hpp index b47d5ff..0126285 100644 --- a/include/gui2/Widget.hpp +++ b/include/gui/Widget.hpp @@ -21,7 +21,7 @@ // Internal header: do not include this file directly #include "Platform.hpp" -#include "gui2/RenderContext.hpp" +#include "gui/RenderContext.hpp" #include "IXMLParser.hpp" #include diff --git a/include/gui2/Window.hpp b/include/gui/Window.hpp similarity index 94% rename from include/gui2/Window.hpp rename to include/gui/Window.hpp index a9f5d50..7356c6d 100644 --- a/include/gui2/Window.hpp +++ b/include/gui/Window.hpp @@ -21,8 +21,8 @@ // Internal header: do not include this file directly #include "Platform.hpp" -#include "gui2/Widget.hpp" -#include "gui2/ContainerWidget.hpp" +#include "gui/Widget.hpp" +#include "gui/ContainerWidget.hpp" #include diff --git a/src/Game.cpp b/src/Game.cpp index 6c32c0a..a0f9e22 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -27,10 +27,10 @@ #include "IterateTrack.hpp" #include "IConfig.hpp" -#include "gui2/ILayout.hpp" -#include "gui2/Label.hpp" -#include "gui2/ThrottleMeter.hpp" -#include "ft/IFont.hpp" +#include "gui/ILayout.hpp" +#include "gui/Label.hpp" +#include "gui/ThrottleMeter.hpp" +#include "gui/IFont.hpp" #include diff --git a/src/UIDemo.cpp b/src/UIDemo.cpp index 4eead87..19b1bab 100644 --- a/src/UIDemo.cpp +++ b/src/UIDemo.cpp @@ -16,8 +16,8 @@ // #include "IScreen.hpp" -#include "gui2/ILayout.hpp" -#include "gui2/Label.hpp" +#include "gui/ILayout.hpp" +#include "gui/Label.hpp" #include "ILogger.hpp" #include diff --git a/src/gui2/Button.cpp b/src/gui/Button.cpp similarity index 97% rename from src/gui2/Button.cpp rename to src/gui/Button.cpp index 6a3e924..5cc947b 100644 --- a/src/gui2/Button.cpp +++ b/src/gui/Button.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/Button.hpp" +#include "gui/Button.hpp" using namespace gui; diff --git a/src/gui2/ContainerWidget.cpp b/src/gui/ContainerWidget.cpp similarity index 97% rename from src/gui2/ContainerWidget.cpp rename to src/gui/ContainerWidget.cpp index b322dc4..66c90f5 100644 --- a/src/gui2/ContainerWidget.cpp +++ b/src/gui/ContainerWidget.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/ContainerWidget.hpp" +#include "gui/ContainerWidget.hpp" #include "ILogger.hpp" using namespace gui; diff --git a/src/ft/Font.cpp b/src/gui/Font.cpp similarity index 99% rename from src/ft/Font.cpp rename to src/gui/Font.cpp index 4f95301..02ce502 100644 --- a/src/ft/Font.cpp +++ b/src/gui/Font.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "ft/IFont.hpp" +#include "gui/IFont.hpp" #include "ILogger.hpp" #include diff --git a/src/gui2/Label.cpp b/src/gui/Label.cpp similarity index 98% rename from src/gui2/Label.cpp rename to src/gui/Label.cpp index 186db80..e41fd05 100644 --- a/src/gui2/Label.cpp +++ b/src/gui/Label.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/Label.hpp" +#include "gui/Label.hpp" #include "ILogger.hpp" #include diff --git a/src/gui2/Layout.cpp b/src/gui/Layout.cpp similarity index 95% rename from src/gui2/Layout.cpp rename to src/gui/Layout.cpp index baa33e6..37d67c1 100644 --- a/src/gui2/Layout.cpp +++ b/src/gui/Layout.cpp @@ -15,16 +15,16 @@ // along with this program. If not, see . // -#include "gui2/ILayout.hpp" +#include "gui/ILayout.hpp" #include "IXMLParser.hpp" #include "ILogger.hpp" -#include "gui2/Widget.hpp" -#include "gui2/ContainerWidget.hpp" -#include "gui2/Window.hpp" -#include "gui2/Button.hpp" -#include "gui2/Label.hpp" -#include "gui2/ThrottleMeter.hpp" +#include "gui/Widget.hpp" +#include "gui/ContainerWidget.hpp" +#include "gui/Window.hpp" +#include "gui/Button.hpp" +#include "gui/Label.hpp" +#include "gui/ThrottleMeter.hpp" #include #include diff --git a/src/gui2/RenderContext.cpp b/src/gui/RenderContext.cpp similarity index 97% rename from src/gui2/RenderContext.cpp rename to src/gui/RenderContext.cpp index 35f8ce5..4d084a1 100644 --- a/src/gui2/RenderContext.cpp +++ b/src/gui/RenderContext.cpp @@ -15,8 +15,8 @@ // along with this program. If not, see . // -#include "gui2/RenderContext.hpp" -#include "gui2/Widget.hpp" +#include "gui/RenderContext.hpp" +#include "gui/Widget.hpp" #include "ILogger.hpp" #include "IWindow.hpp" #include "OpenGLHelper.hpp" diff --git a/src/gui2/Theme.cpp b/src/gui/Theme.cpp similarity index 98% rename from src/gui2/Theme.cpp rename to src/gui/Theme.cpp index b5eae4e..4ee2aad 100644 --- a/src/gui2/Theme.cpp +++ b/src/gui/Theme.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/Theme.hpp" +#include "gui/Theme.hpp" #include "ILogger.hpp" #include diff --git a/src/gui2/ThrottleMeter.cpp b/src/gui/ThrottleMeter.cpp similarity index 98% rename from src/gui2/ThrottleMeter.cpp rename to src/gui/ThrottleMeter.cpp index ae47a0a..4109b43 100644 --- a/src/gui2/ThrottleMeter.cpp +++ b/src/gui/ThrottleMeter.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/ThrottleMeter.hpp" +#include "gui/ThrottleMeter.hpp" #include #include diff --git a/src/gui2/Widget.cpp b/src/gui/Widget.cpp similarity index 98% rename from src/gui2/Widget.cpp rename to src/gui/Widget.cpp index b68d029..72fb173 100644 --- a/src/gui2/Widget.cpp +++ b/src/gui/Widget.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/Widget.hpp" +#include "gui/Widget.hpp" #include "ILogger.hpp" #include diff --git a/src/gui2/Window.cpp b/src/gui/Window.cpp similarity index 97% rename from src/gui2/Window.cpp rename to src/gui/Window.cpp index da8278f..67e93bf 100644 --- a/src/gui2/Window.cpp +++ b/src/gui/Window.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . // -#include "gui2/Window.hpp" +#include "gui/Window.hpp" #include "ILogger.hpp" using namespace gui; -- 2.39.2