From 1023b38fa278cea71fba3d2881e1bfde930cd025 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Fri, 26 Aug 2011 13:41:12 +0300 Subject: [PATCH] Consistently label the graphics part as graphics Fix multiple inclusion guards in the input headers --- Build | 6 +++--- source/{gbase => graphics}/display.cpp | 0 source/{gbase => graphics}/display.h | 4 ++-- source/{gbase => graphics}/display_priv.h | 4 ++-- source/{gbase => graphics}/drawcontext.cpp | 0 source/{gbase => graphics}/drawcontext.h | 4 ++-- source/{gbase => graphics}/eventsource.h | 4 ++-- source/{gbase => graphics}/glcontext.cpp | 0 source/{gbase => graphics}/glcontext.h | 4 ++-- source/{gbase => graphics}/image.cpp | 0 source/{gbase => graphics}/image.h | 4 ++-- source/{gbase => graphics}/pixelformat.h | 4 ++-- source/{gbase => graphics}/simplewindow.cpp | 0 source/{gbase => graphics}/simplewindow.h | 4 ++-- source/{gbase => graphics}/window.cpp | 0 source/{gbase => graphics}/window.h | 4 ++-- source/{gbase => graphics}/window_priv.h | 4 ++-- source/input/binarycontrol.h | 4 ++-- source/input/control.h | 4 ++-- source/input/device.h | 4 ++-- source/input/hub.h | 4 ++-- source/input/keyboard.cpp | 2 +- source/input/keyboard.h | 6 +++--- source/input/mouse.h | 6 +++--- source/input/smoothcontrol.h | 4 ++-- 25 files changed, 40 insertions(+), 40 deletions(-) rename source/{gbase => graphics}/display.cpp (100%) rename source/{gbase => graphics}/display.h (94%) rename source/{gbase => graphics}/display_priv.h (75%) rename source/{gbase => graphics}/drawcontext.cpp (100%) rename source/{gbase => graphics}/drawcontext.h (84%) rename source/{gbase => graphics}/eventsource.h (90%) rename source/{gbase => graphics}/glcontext.cpp (100%) rename source/{gbase => graphics}/glcontext.h (90%) rename source/{gbase => graphics}/image.cpp (100%) rename source/{gbase => graphics}/image.h (93%) rename source/{gbase => graphics}/pixelformat.h (71%) rename source/{gbase => graphics}/simplewindow.cpp (100%) rename source/{gbase => graphics}/simplewindow.h (90%) rename source/{gbase => graphics}/window.cpp (100%) rename source/{gbase => graphics}/window.h (95%) rename source/{gbase => graphics}/window_priv.h (86%) diff --git a/Build b/Build index 79b8cbc..6a78535 100644 --- a/Build +++ b/Build @@ -50,9 +50,9 @@ package "mspgbase" }; }; - headers "msp/gbase" + headers "msp/graphics" { - source "source/gbase"; + source "source/graphics"; install true; }; @@ -64,7 +64,7 @@ package "mspgbase" library "mspgbase" { - source "source/gbase"; + source "source/graphics"; source "source/input"; install true; }; diff --git a/source/gbase/display.cpp b/source/graphics/display.cpp similarity index 100% rename from source/gbase/display.cpp rename to source/graphics/display.cpp diff --git a/source/gbase/display.h b/source/graphics/display.h similarity index 94% rename from source/gbase/display.h rename to source/graphics/display.h index 662e73f..b47a550 100644 --- a/source/gbase/display.h +++ b/source/graphics/display.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_DISPLAY_H_ -#define MSP_GBASE_DISPLAY_H_ +#ifndef MSP_GRAPHICS_DISPLAY_H_ +#define MSP_GRAPHICS_DISPLAY_H_ #include #include diff --git a/source/gbase/display_priv.h b/source/graphics/display_priv.h similarity index 75% rename from source/gbase/display_priv.h rename to source/graphics/display_priv.h index f522812..5e82f9d 100644 --- a/source/gbase/display_priv.h +++ b/source/graphics/display_priv.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_DISPLAY_PRIV_H_ -#define MSP_GBASE_DISPLAY_PRIV_H_ +#ifndef MSP_GRAPHICS_DISPLAY_PRIV_H_ +#define MSP_GRAPHICS_DISPLAY_PRIV_H_ #include "window_priv.h" diff --git a/source/gbase/drawcontext.cpp b/source/graphics/drawcontext.cpp similarity index 100% rename from source/gbase/drawcontext.cpp rename to source/graphics/drawcontext.cpp diff --git a/source/gbase/drawcontext.h b/source/graphics/drawcontext.h similarity index 84% rename from source/gbase/drawcontext.h rename to source/graphics/drawcontext.h index 2717479..957e153 100644 --- a/source/gbase/drawcontext.h +++ b/source/graphics/drawcontext.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_DRAWCONTEXT_H_ -#define MSP_GBASE_DRAWCONTEXT_H_ +#ifndef MSP_GRAPHICS_DRAWCONTEXT_H_ +#define MSP_GRAPHICS_DRAWCONTEXT_H_ namespace Msp { namespace Graphics { diff --git a/source/gbase/eventsource.h b/source/graphics/eventsource.h similarity index 90% rename from source/gbase/eventsource.h rename to source/graphics/eventsource.h index 5f09426..3da2e94 100644 --- a/source/gbase/eventsource.h +++ b/source/graphics/eventsource.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_EVENTSOURCE_H_ -#define MSP_GBASE_EVENTSOURCE_H_ +#ifndef MSP_GRAPHICS_EVENTSOURCE_H_ +#define MSP_GRAPHICS_EVENTSOURCE_H_ namespace Msp { namespace Graphics { diff --git a/source/gbase/glcontext.cpp b/source/graphics/glcontext.cpp similarity index 100% rename from source/gbase/glcontext.cpp rename to source/graphics/glcontext.cpp diff --git a/source/gbase/glcontext.h b/source/graphics/glcontext.h similarity index 90% rename from source/gbase/glcontext.h rename to source/graphics/glcontext.h index dfac328..db9df4e 100644 --- a/source/gbase/glcontext.h +++ b/source/graphics/glcontext.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_GLCONTEXT_H_ -#define MSP_GBASE_GLCONTEXT_H_ +#ifndef MSP_GRAPHICS_GLCONTEXT_H_ +#define MSP_GRAPHICS_GLCONTEXT_H_ #include diff --git a/source/gbase/image.cpp b/source/graphics/image.cpp similarity index 100% rename from source/gbase/image.cpp rename to source/graphics/image.cpp diff --git a/source/gbase/image.h b/source/graphics/image.h similarity index 93% rename from source/gbase/image.h rename to source/graphics/image.h index aec1b0d..db65010 100644 --- a/source/gbase/image.h +++ b/source/graphics/image.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_IMAGE_H_ -#define MSP_GBASE_IMAGE_H_ +#ifndef MSP_GRAPHICS_IMAGE_H_ +#define MSP_GRAPHICS_IMAGE_H_ #include #include "pixelformat.h" diff --git a/source/gbase/pixelformat.h b/source/graphics/pixelformat.h similarity index 71% rename from source/gbase/pixelformat.h rename to source/graphics/pixelformat.h index 64b79ee..891ba7c 100644 --- a/source/gbase/pixelformat.h +++ b/source/graphics/pixelformat.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_PIXELFORMAT_H_ -#define MSP_GBASE_PIXELFORMAT_H_ +#ifndef MSP_GRAPHICS_PIXELFORMAT_H_ +#define MSP_GRAPHICS_PIXELFORMAT_H_ namespace Msp { namespace Graphics { diff --git a/source/gbase/simplewindow.cpp b/source/graphics/simplewindow.cpp similarity index 100% rename from source/gbase/simplewindow.cpp rename to source/graphics/simplewindow.cpp diff --git a/source/gbase/simplewindow.h b/source/graphics/simplewindow.h similarity index 90% rename from source/gbase/simplewindow.h rename to source/graphics/simplewindow.h index 807e69f..f7bb0ce 100644 --- a/source/gbase/simplewindow.h +++ b/source/graphics/simplewindow.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_SIMPLEWINDOW_H_ -#define MSP_GBASE_SIMPLEWINDOW_H_ +#ifndef MSP_GRAPHICS_SIMPLEWINDOW_H_ +#define MSP_GRAPHICS_SIMPLEWINDOW_H_ #include "display.h" #include "glcontext.h" diff --git a/source/gbase/window.cpp b/source/graphics/window.cpp similarity index 100% rename from source/gbase/window.cpp rename to source/graphics/window.cpp diff --git a/source/gbase/window.h b/source/graphics/window.h similarity index 95% rename from source/gbase/window.h rename to source/graphics/window.h index a390b8c..38b9217 100644 --- a/source/gbase/window.h +++ b/source/graphics/window.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_WINDOW_H_ -#define MSP_GBASE_WINDOW_H_ +#ifndef MSP_GRAPHICS_WINDOW_H_ +#define MSP_GRAPHICS_WINDOW_H_ #include #include diff --git a/source/gbase/window_priv.h b/source/graphics/window_priv.h similarity index 86% rename from source/gbase/window_priv.h rename to source/graphics/window_priv.h index 24d71a3..f5e9be8 100644 --- a/source/gbase/window_priv.h +++ b/source/graphics/window_priv.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_WINDOW_PRIV_H_ -#define MSP_GBASE_WINDOW_PRIV_H_ +#ifndef MSP_GRAPHICS_WINDOW_PRIV_H_ +#define MSP_GRAPHICS_WINDOW_PRIV_H_ #ifdef WIN32 #include diff --git a/source/input/binarycontrol.h b/source/input/binarycontrol.h index 851c612..8a156f7 100644 --- a/source/input/binarycontrol.h +++ b/source/input/binarycontrol.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_BINARYCONTROL_H_ -#define MSP_GBASE_BINARYCONTROL_H_ +#ifndef MSP_INPUT_BINARYCONTROL_H_ +#define MSP_INPUT_BINARYCONTROL_H_ #include "control.h" diff --git a/source/input/control.h b/source/input/control.h index a2f002c..924bbec 100644 --- a/source/input/control.h +++ b/source/input/control.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_CONTROL_H_ -#define MSP_GBASE_CONTROL_H_ +#ifndef MSP_INPUT_CONTROL_H_ +#define MSP_INPUT_CONTROL_H_ #include #include diff --git a/source/input/device.h b/source/input/device.h index 43d180d..49d858b 100644 --- a/source/input/device.h +++ b/source/input/device.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_INPUTDEVICE_H_ -#define MSP_GBASE_INPUTDEVICE_H_ +#ifndef MSP_INPUT_INPUTDEVICE_H_ +#define MSP_INPUT_INPUTDEVICE_H_ #include #include diff --git a/source/input/hub.h b/source/input/hub.h index 9fe57dd..8ec2fad 100644 --- a/source/input/hub.h +++ b/source/input/hub.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_INPUTHUB_H_ -#define MSP_GBASE_INPUTHUB_H_ +#ifndef MSP_INPUT_INPUTHUB_H_ +#define MSP_INPUT_INPUTHUB_H_ #include "device.h" diff --git a/source/input/keyboard.cpp b/source/input/keyboard.cpp index 344048e..02ff12e 100644 --- a/source/input/keyboard.cpp +++ b/source/input/keyboard.cpp @@ -3,7 +3,7 @@ #else #include #endif -#include +#include #include #include "keyboard.h" #include "keys.h" diff --git a/source/input/keyboard.h b/source/input/keyboard.h index eaca017..3e5b6b8 100644 --- a/source/input/keyboard.h +++ b/source/input/keyboard.h @@ -1,7 +1,7 @@ -#ifndef MSP_GBASE_KEYBOARD_H_ -#define MSP_GBASE_KEYBOARD_H_ +#ifndef MSP_INPUT_KEYBOARD_H_ +#define MSP_INPUT_KEYBOARD_H_ -#include +#include #include "device.h" namespace Msp { diff --git a/source/input/mouse.h b/source/input/mouse.h index eb5e9d6..5f7e714 100644 --- a/source/input/mouse.h +++ b/source/input/mouse.h @@ -1,7 +1,7 @@ -#ifndef MSP_GBASE_MOUSE_H_ -#define MSP_GBASE_MOUSE_H_ +#ifndef MSP_INPUT_MOUSE_H_ +#define MSP_INPUT_MOUSE_H_ -#include +#include #include "device.h" namespace Msp { diff --git a/source/input/smoothcontrol.h b/source/input/smoothcontrol.h index fb6f84e..78edbb3 100644 --- a/source/input/smoothcontrol.h +++ b/source/input/smoothcontrol.h @@ -1,5 +1,5 @@ -#ifndef MSP_GBASE_SMOOTHCONTROL_H_ -#define MSP_GBASE_SMOOTHCONTROL_H_ +#ifndef MSP_INPUT_SMOOTHCONTROL_H_ +#define MSP_INPUT_SMOOTHCONTROL_H_ #include "control.h" -- 2.43.0