thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

protect all vkeybd code with ENABLE_VKEYBD

Browse source 
svn-id: r35956
This commit is contained in:
Andre Heider 2009-01-20 16:00:36 +00:00
parent 60beb35a5a
commit fbfec8e63e
12 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/vkeybd/image-map.cpp
View file

@ -23,10 +23,10 @@
*
*/
#include "backends/vkeybd/image-map.h"
#ifdef ENABLE_VKEYBD
#include "backends/vkeybd/image-map.h"
namespace Common {
ImageMap::~ImageMap() {

3
backends/vkeybd/image-map.h
View file

@ -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"

10
backends/vkeybd/imageman.cpp
View file

@ -22,11 +22,13 @@
* $Id$
*/
#ifdef ENABLE_VKEYBD
#include "backends/vkeybd/imageman.h"
#include "graphics/imagedec.h"
#include "graphics/surface.h"
#include "common/unzip.h"
#include "graphics/imagedec.h"
#include "graphics/surface.h"
DECLARE_SINGLETON(Graphics::ImageManager);
@ -128,4 +130,8 @@ ImageManager::Iterator ImageManager::searchHandle(const Common::String &name) {
}
return pos;
}
} // end of namespace Graphics
#endif // #ifdef ENABLE_VKEYBD

6
backends/vkeybd/imageman.h
View file

@ -25,8 +25,9 @@
#ifndef GRAPHICS_IMAGEMAN_H
#define GRAPHICS_IMAGEMAN_H
#include "common/scummsys.h"
#ifdef ENABLE_VKEYBD
#include "common/scummsys.h"
#include "common/archive.h"
#include "common/singleton.h"
#include "common/str.h"
@ -107,5 +108,6 @@ private:
/** Shortcut for accessing the image manager. */
#define ImageMan (Graphics::ImageManager::instance())
#endif
#endif // #ifdef ENABLE_VKEYBD
#endif

4
backends/vkeybd/polygon.cpp
View file

@ -23,10 +23,10 @@
*
*/
#include "backends/vkeybd/polygon.h"
#ifdef ENABLE_VKEYBD
#include "backends/vkeybd/polygon.h"
namespace Common {
bool Polygon::contains(int16 x, int16 y) const {

3
backends/vkeybd/polygon.h
View file

@ -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"

4
backends/vkeybd/virtual-keyboard-gui.cpp
View file

@ -23,10 +23,10 @@
*
*/
#include "backends/vkeybd/virtual-keyboard-gui.h"
#ifdef ENABLE_VKEYBD
#include "backends/vkeybd/virtual-keyboard-gui.h"
#include "graphics/cursorman.h"
#include "gui/GuiManager.h"

3
backends/vkeybd/virtual-keyboard-gui.h
View file

@ -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"

3
backends/vkeybd/virtual-keyboard-parser.cpp
View file

@ -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"

3
backends/vkeybd/virtual-keyboard-parser.h
View file

@ -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"

4
backends/vkeybd/virtual-keyboard.cpp
View file

@ -23,10 +23,10 @@
*
*/
#include "backends/vkeybd/virtual-keyboard.h"
#ifdef ENABLE_VKEYBD
#include "backends/vkeybd/virtual-keyboard.h"
#include "backends/vkeybd/imageman.h"
#include "backends/vkeybd/virtual-keyboard-gui.h"
#include "backends/vkeybd/virtual-keyboard-parser.h"

3
backends/vkeybd/virtual-keyboard.h
View file

@ -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"