[dasher] Build fixes and potfile additions.



commit 88cb8e94713475f7ab9372d86ab25d58fd242f42
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Fri Jun 24 12:43:52 2011 +0100

    Build fixes and potfile additions.

 Src/DasherCore/Alphabet/AlphabetMap.cpp |    2 +-
 Src/DasherCore/Makefile.am              |    2 +-
 Src/Win32/Makefile.am                   |    5 -
 Testing/gtest/aclocal.m4                | 9122 -------------
 Testing/gtest/build-aux/config.guess    | 1501 ---
 Testing/gtest/build-aux/config.h        |   63 -
 Testing/gtest/build-aux/config.h.in     |   69 -
 Testing/gtest/build-aux/config.h.in~    |   62 -
 Testing/gtest/build-aux/config.sub      | 1705 ---
 Testing/gtest/build-aux/depcomp         |  630 -
 Testing/gtest/build-aux/install-sh      |  520 -
 Testing/gtest/build-aux/ltmain.sh       | 8406 ------------
 Testing/gtest/build-aux/missing         |  376 -
 Testing/gtest/build-aux/stamp-h1        |    1 -
 Testing/gtest/configure                 |22034 -------------------------------
 po/POTFILES.in                          |    7 +-
 16 files changed, 8 insertions(+), 44497 deletions(-)
---
diff --git a/Src/DasherCore/Alphabet/AlphabetMap.cpp b/Src/DasherCore/Alphabet/AlphabetMap.cpp
index 5245fb6..266131e 100644
--- a/Src/DasherCore/Alphabet/AlphabetMap.cpp
+++ b/Src/DasherCore/Alphabet/AlphabetMap.cpp
@@ -160,7 +160,7 @@ string CAlphabetMap::SymbolStream::peekBack() {
     } else {
       //high bit not set -> single-byte char
       if (bSeenHighBit) return ""; //followed by a "continuation of multibyte char" without a "first byte of multibyte char" before it. (Malformed!)
-      return string(&buf[i],1); 
+      return string(&buf[i],1);
     }
   }
   //fail...relatively gracefully ;-)
diff --git a/Src/DasherCore/Makefile.am b/Src/DasherCore/Makefile.am
index ceb7c84..1be761a 100644
--- a/Src/DasherCore/Makefile.am
+++ b/Src/DasherCore/Makefile.am
@@ -10,7 +10,7 @@ libdasherprefs_a_SOURCES = \
 
 libdashercore_a_SOURCES = \
 		AbstractXMLParser.cpp \
-		AbstracTXMLParser.h \
+		AbstractXMLParser.h \
 		Alphabet/AlphIO.cpp \
 		Alphabet/AlphIO.h \
 		Alphabet/AlphInfo.cpp \
diff --git a/Src/Win32/Makefile.am b/Src/Win32/Makefile.am
index 3067572..e0d4b4c 100644
--- a/Src/Win32/Makefile.am
+++ b/Src/Win32/Makefile.am
@@ -4,7 +4,6 @@ EXTRA_DIST = \
 		Common/StringUtils.h \
 		Common/WinCommon.h \
 		Common/WinHelper.cpp \
-		Common/WinHelper.h \
 		Common/WinLocalisation.cpp \
 		Common/WinLocalisation.h \
 		Common/WinMenus.cpp \
@@ -39,8 +38,6 @@ EXTRA_DIST = \
 		Widgets/Edit.h \
 		Widgets/FilenameGUI.cpp \
 		Widgets/FilenameGUI.h \
-		Widgets/GameGroup.cpp \
-		Widgets/GameGroup.h \
 		Widgets/KeyControl.cpp \
 		Widgets/KeyControl.h \
 		Widgets/LMPage.cpp \
@@ -99,8 +96,6 @@ EXTRA_DIST = \
 		Dasher_vc80.vcproj \
 		EditWrapper.cpp \
 		EditWrapper.h \
-		GameModeHelper.cpp \
-		GameModeHelper.h \
 		KeyboardHelper.cpp \
 		KeyboardHelper.h \
 		ModuleControl.cpp \
diff --git a/Src/Win32/Widgets/KeyControl.cpp b/Src/Win32/Widgets/KeyControl.cpp
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/KeyControl.h b/Src/Win32/Widgets/KeyControl.h
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/Prefs.cpp b/Src/Win32/Widgets/Prefs.cpp
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/Prefs.h b/Src/Win32/Widgets/Prefs.h
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/PrefsPageBase.cpp b/Src/Win32/Widgets/PrefsPageBase.cpp
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/PrefsPageBase.h b/Src/Win32/Widgets/PrefsPageBase.h
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/WindowSelect.cpp b/Src/Win32/Widgets/WindowSelect.cpp
old mode 100755
new mode 100644
diff --git a/Src/Win32/Widgets/WindowSelect.h b/Src/Win32/Widgets/WindowSelect.h
old mode 100755
new mode 100644
diff --git a/Testing/dasher_tests/EventTest.cpp b/Testing/dasher_tests/EventTest.cpp
old mode 100755
new mode 100644
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 84f93d6..385d014 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,16 +11,19 @@ Data/dasher.desktop.in.in
 [type: gettext/glade]Data/GUI/dashermaemo.ui
 [type: gettext/glade]Data/GUI/dashermaemo.preferences.ui
 [type: gettext/glade]Data/GUI/dashermaemofullscreen.ui
+Src/DasherCore/AbstractXMLParser.cpp
+Src/DasherCore/AlphabetManager.cpp
 Src/DasherCore/AlternatingDirectMode.cpp
+Src/DasherCore/AutoSpeedControl.cpp
 Src/DasherCore/ButtonMode.cpp
 Src/DasherCore/ClickFilter.cpp
 Src/DasherCore/ClickFilter.h
 Src/DasherCore/CompassMode.cpp
 Src/DasherCore/DasherButtons.cpp
-Src/DasherCore/DasherGameMode.cpp
 Src/DasherCore/DasherInterfaceBase.cpp
 Src/DasherCore/DefaultFilter.cpp
 Src/DasherCore/DynamicFilter.cpp
+Src/DasherCore/NodeCreationManager.cpp
 Src/DasherCore/OneButtonDynamicFilter.cpp
 Src/DasherCore/OneButtonFilter.cpp
 Src/DasherCore/OneDimensionalFilter.cpp
@@ -28,8 +31,10 @@ Src/DasherCore/OneDimensionalFilter.h
 Src/DasherCore/SettingsStore.cpp
 Src/DasherCore/SocketInput.cpp
 Src/DasherCore/SocketInputBase.cpp
+Src/DasherCore/Trainer.cpp
 Src/DasherCore/TwoButtonDynamicFilter.cpp
 Src/DasherCore/TwoPushDynamicFilter.cpp
+Src/DasherCore/Alphabet/AlphabetMap.cpp
 Src/Gtk2/DasherAppSettings.cpp
 Src/Gtk2/Preferences.cpp
 Src/Gtk2/GnomeSpeech.cpp



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]