diff options
| -rw-r--r-- | backends/common/virtual-keyboard-parser.cpp (renamed from backends/common/virtualKeyboardParser.cpp) | 2 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard-parser.h (renamed from backends/common/virtualKeyboardParser.h) | 2 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard.cpp (renamed from backends/common/virtualKeyboard.cpp) | 4 | ||||
| -rw-r--r-- | backends/common/virtual-keyboard.h (renamed from backends/common/virtualKeyboard.h) | 2 | ||||
| -rw-r--r-- | backends/events/default/default-events.h | 2 | ||||
| -rw-r--r-- | common/image-map.cpp (renamed from common/imageMap.cpp) | 2 | ||||
| -rw-r--r-- | common/image-map.h (renamed from common/imageMap.h) | 0 | ||||
| -rw-r--r-- | dists/msvc8/scummvm.vcproj | 48 |
8 files changed, 13 insertions, 49 deletions
diff --git a/backends/common/virtualKeyboardParser.cpp b/backends/common/virtual-keyboard-parser.cpp index 8475f3e4f6..6da5f690ba 100644 --- a/backends/common/virtualKeyboardParser.cpp +++ b/backends/common/virtual-keyboard-parser.cpp @@ -23,7 +23,7 @@ * */ -#include "backends/common/virtualKeyboardParser.h" +#include "backends/common/virtual-keyboard-parser.h" #include "common/keyboard.h" #include "graphics/imageman.h" diff --git a/backends/common/virtualKeyboardParser.h b/backends/common/virtual-keyboard-parser.h index 4325d8af31..64651dfa13 100644 --- a/backends/common/virtualKeyboardParser.h +++ b/backends/common/virtual-keyboard-parser.h @@ -27,7 +27,7 @@ #define GUI_VIRTUAL_KEYBOARD_PARSER #include "common/xmlparser.h" -#include "backends/common/virtualKeyboard.h" +#include "backends/common/virtual-keyboard.h" namespace GUI { diff --git a/backends/common/virtualKeyboard.cpp b/backends/common/virtual-keyboard.cpp index 9937127df4..d19471b6bd 100644 --- a/backends/common/virtualKeyboard.cpp +++ b/backends/common/virtual-keyboard.cpp @@ -23,8 +23,8 @@ * */ -#include "backends/common/virtualKeyboard.h" -#include "backends/common/virtualKeyboardParser.h" +#include "backends/common/virtual-keyboard.h" +#include "backends/common/virtual-keyboard-parser.h" #include "common/config-manager.h" #include "common/events.h" #include "graphics/imageman.h" diff --git a/backends/common/virtualKeyboard.h b/backends/common/virtual-keyboard.h index b44d2cd459..b41f346989 100644 --- a/backends/common/virtualKeyboard.h +++ b/backends/common/virtual-keyboard.h @@ -31,7 +31,7 @@ class OSystem; #include "common/events.h" #include "common/hashmap.h" #include "common/hash-str.h" -#include "common/imagemap.h" +#include "common/image-map.h" #include "common/keyboard.h" #include "common/str.h" #include "graphics/surface.h" diff --git a/backends/events/default/default-events.h b/backends/events/default/default-events.h index c52535adfc..c21fb41b16 100644 --- a/backends/events/default/default-events.h +++ b/backends/events/default/default-events.h @@ -28,7 +28,7 @@ #include "common/events.h" #include "common/savefile.h" -#include "backends/common/virtualKeyboard.h" +#include "backends/common/virtual-keyboard.h" /* At some point we will remove pollEvent from OSystem and change diff --git a/common/imageMap.cpp b/common/image-map.cpp index 4646123754..4e8df6cc50 100644 --- a/common/imageMap.cpp +++ b/common/image-map.cpp @@ -23,7 +23,7 @@ * */ -#include "common/imageMap.h" +#include "common/image-map.h" namespace Common { diff --git a/common/imageMap.h b/common/image-map.h index b6a1ad36f4..b6a1ad36f4 100644 --- a/common/imageMap.h +++ b/common/image-map.h diff --git a/dists/msvc8/scummvm.vcproj b/dists/msvc8/scummvm.vcproj index 27a45ccd76..4a6906eda2 100644 --- a/dists/msvc8/scummvm.vcproj +++ b/dists/msvc8/scummvm.vcproj @@ -335,11 +335,11 @@ > </File> <File - RelativePath="..\..\common\imageMap.cpp" + RelativePath="..\..\common\image-map.cpp" > </File> <File - RelativePath="..\..\common\imageMap.h" + RelativePath="..\..\common\image-map.h" > </File> <File @@ -1053,55 +1053,19 @@ Name="common" > <File - RelativePath="..\..\backends\common\virtualKeyboard.cpp" + RelativePath="..\..\backends\common\virtual-keyboard-parser.cpp" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> </File> <File - RelativePath="..\..\backends\common\virtualKeyboard.h" + RelativePath="..\..\backends\common\virtual-keyboard-parser.h" > </File> <File - RelativePath="..\..\backends\common\virtualKeyboardParser.cpp" + RelativePath="..\..\backends\common\virtual-keyboard.cpp" > - <FileConfiguration - Name="Debug|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> - <FileConfiguration - Name="Release|Win32" - > - <Tool - Name="VCCLCompilerTool" - ObjectFile="$(IntDir)\$(InputName)1.obj" - XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" - /> - </FileConfiguration> </File> <File - RelativePath="..\..\backends\common\virtualKeyboardParser.h" + RelativePath="..\..\backends\common\virtual-keyboard.h" > </File> </Filter> |