[Scummvm-cvs-logs] SF.net SVN: scummvm:[35956] scummvm/trunk/backends/vkeybd

[dhewg at users.sourceforge.net]

Revision: 35956
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35956&view=rev
Author:   dhewg
Date:     2009-01-20 16:00:36 +0000 (Tue, 20 Jan 2009)

Log Message:
-----------
protect all vkeybd code with ENABLE_VKEYBD

Modified Paths:
--------------
    scummvm/trunk/backends/vkeybd/image-map.cpp
    scummvm/trunk/backends/vkeybd/image-map.h
    scummvm/trunk/backends/vkeybd/imageman.cpp
    scummvm/trunk/backends/vkeybd/imageman.h
    scummvm/trunk/backends/vkeybd/polygon.cpp
    scummvm/trunk/backends/vkeybd/polygon.h
    scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
    scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h
    scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
    scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.h
    scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
    scummvm/trunk/backends/vkeybd/virtual-keyboard.h

Modified: scummvm/trunk/backends/vkeybd/image-map.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/image-map.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/image-map.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -23,10 +23,10 @@
  *
  */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/image-map.h"
 
-#ifdef ENABLE_VKEYBD
-
 namespace Common {
 
 ImageMap::~ImageMap() {

Modified: scummvm/trunk/backends/vkeybd/image-map.h
===================================================================
--- scummvm/trunk/backends/vkeybd/image-map.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/image-map.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -26,10 +26,9 @@
 #ifndef COMMON_IMAGEMAP_H
 #define COMMON_IMAGEMAP_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 #include "backends/vkeybd/polygon.h"

Modified: scummvm/trunk/backends/vkeybd/imageman.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/imageman.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/imageman.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -22,12 +22,14 @@
  * $Id$
  */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/imageman.h"
+
+#include "common/unzip.h"
 #include "graphics/imagedec.h"
 #include "graphics/surface.h"
 
-#include "common/unzip.h"
-
 DECLARE_SINGLETON(Graphics::ImageManager);
 
 namespace Graphics {
@@ -128,4 +130,8 @@
 	}
 	return pos;
 }
+
 } // end of namespace Graphics
+
+#endif // #ifdef ENABLE_VKEYBD
+

Modified: scummvm/trunk/backends/vkeybd/imageman.h
===================================================================
--- scummvm/trunk/backends/vkeybd/imageman.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/imageman.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -25,8 +25,9 @@
 #ifndef GRAPHICS_IMAGEMAN_H
 #define GRAPHICS_IMAGEMAN_H
 
+#ifdef ENABLE_VKEYBD
+
 #include "common/scummsys.h"
-
 #include "common/archive.h"
 #include "common/singleton.h"
 #include "common/str.h"
@@ -107,5 +108,6 @@
 /** Shortcut for accessing the image manager. */
 #define ImageMan		(Graphics::ImageManager::instance())
 
+#endif // #ifdef ENABLE_VKEYBD
+
 #endif
-

Modified: scummvm/trunk/backends/vkeybd/polygon.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/polygon.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/polygon.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -23,10 +23,10 @@
  *
  */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/polygon.h"
 
-#ifdef ENABLE_VKEYBD
-
 namespace Common {
 
 bool Polygon::contains(int16 x, int16 y) const {

Modified: scummvm/trunk/backends/vkeybd/polygon.h
===================================================================
--- scummvm/trunk/backends/vkeybd/polygon.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/polygon.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -26,10 +26,9 @@
 #ifndef COMMON_POLYGON_H
 #define COMMON_POLYGON_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/array.h"
 #include "common/rect.h"
 

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -23,10 +23,10 @@
 *
 */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 
-#ifdef ENABLE_VKEYBD
-
 #include "graphics/cursorman.h"
 #include "gui/GuiManager.h"
 

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-gui.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -26,11 +26,10 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_GUI_H
 #define COMMON_VIRTUAL_KEYBOARD_GUI_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
 #include "backends/vkeybd/virtual-keyboard.h"
+#include "common/scummsys.h"
 #include "common/rect.h"
 #include "common/system.h"
 #include "graphics/fontman.h"

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -23,10 +23,11 @@
  *
  */
 
-#include "backends/vkeybd/virtual-keyboard-parser.h"
 
 #ifdef ENABLE_VKEYBD
 
+#include "backends/vkeybd/virtual-keyboard-parser.h"
+
 #include "common/keyboard.h"
 #include "common/util.h"
 #include "common/system.h"

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard-parser.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -26,10 +26,9 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_PARSER_H
 #define COMMON_VIRTUAL_KEYBOARD_PARSER_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
+#include "common/scummsys.h"
 #include "common/xmlparser.h"
 #include "backends/vkeybd/virtual-keyboard.h"
 

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.cpp	2009-01-20 16:00:36 UTC (rev 35956)
@@ -23,10 +23,10 @@
  *
  */
 
+#ifdef ENABLE_VKEYBD
+
 #include "backends/vkeybd/virtual-keyboard.h"
 
-#ifdef ENABLE_VKEYBD
-
 #include "backends/vkeybd/imageman.h"
 #include "backends/vkeybd/virtual-keyboard-gui.h"
 #include "backends/vkeybd/virtual-keyboard-parser.h"

Modified: scummvm/trunk/backends/vkeybd/virtual-keyboard.h
===================================================================
--- scummvm/trunk/backends/vkeybd/virtual-keyboard.h	2009-01-20 15:28:07 UTC (rev 35955)
+++ scummvm/trunk/backends/vkeybd/virtual-keyboard.h	2009-01-20 16:00:36 UTC (rev 35956)
@@ -26,12 +26,11 @@
 #ifndef COMMON_VIRTUAL_KEYBOARD_H
 #define COMMON_VIRTUAL_KEYBOARD_H
 
-#include "common/scummsys.h"
-
 #ifdef ENABLE_VKEYBD
 
 class OSystem;
 
+#include "common/scummsys.h"
 #include "common/events.h"
 #include "common/hashmap.h"
 #include "common/hash-str.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.