Merged from trunk, from Rev 50841 to HEAD

svn-id: r51495

8 files changed, 9 insertions, 38 deletions

diff --git a/common/hashmap.h b/common/hashmap.h
index db80f632ed..0d4d7663f3 100644
--- a/common/hashmap.h
+++ b/common/hashmap.h
@@ -68,9 +68,6 @@ template<class T> class IteratorImpl;
 template<class Key, class Val, class HashFunc = Hash<Key>, class EqualFunc = EqualTo<Key> >
 class HashMap {
 private:
-#if defined (PALMOS_MODE)
-public:
-#endif
 
 	typedef HashMap<Key, Val, HashFunc, EqualFunc> HM_t;
 
diff --git a/common/ptr.h b/common/ptr.h
index 25ce6dcd64..7307038936 100644
--- a/common/ptr.h
+++ b/common/ptr.h
@@ -242,7 +242,7 @@ public:
 	 */
 	operator bool() const { return _pointer != 0; }
 
-	~ScopedPtr() { 
+	~ScopedPtr() {
 		delete _pointer;
 	}
 
@@ -255,14 +255,14 @@ public:
 	}
 
 	/**
-	 * Returns the plain pointer value. 
+	 * Returns the plain pointer value.
 	 *
 	 * @return the pointer the ScopedPtr manages
 	 */
 	PointerType get() const { return _pointer; }
 
 	/**
-	 * Returns the plain pointer value and releases ScopedPtr. 
+	 * Returns the plain pointer value and releases ScopedPtr.
 	 * After release() call you need to delete object yourself
 	 *
 	 * @return the pointer the ScopedPtr manages
diff --git a/common/scummsys.h b/common/scummsys.h
index 98dd47e171..96639716ea 100644
--- a/common/scummsys.h
+++ b/common/scummsys.h
@@ -243,27 +243,6 @@
 	#define SCUMM_NEED_ALIGNMENT
 	#endif
 
-#elif defined(__PALMOS_TRAPS__)	|| defined (__PALMOS_ARMLET__)
-
-#ifdef __PALMOS_ARMLET__
-	#include <extras_string.h>
-#endif
-	#define SCUMM_LITTLE_ENDIAN
-
-	#define scumm_stricmp stricmp
-	#define scumm_strnicmp strnicmp
-
-	#define SCUMM_NEED_ALIGNMENT
-	#define STRINGBUFLEN 256
-
-	extern const char *SCUMMVM_SAVEPATH;
-
-	#if !defined(COMPILE_ZODIAC) && !defined(COMPILE_OS5)
-	#	define NEWGUI_256
-	#else
-	#	undef UNUSED
-	#endif
-
 #elif defined(__DC__)
 
 	#define scumm_stricmp strcasecmp
diff --git a/common/singleton.h b/common/singleton.h
index d66fb84cc2..2f721a65f7 100644
--- a/common/singleton.h
+++ b/common/singleton.h
@@ -95,7 +95,7 @@ protected:
  * Note that you need to use this macro from the global namespace.
  *
  * This is because C++ requires initial explicit specialization
- * to be placed in the same namespace as the template. 
+ * to be placed in the same namespace as the template.
  * It has to be put in the global namespace to assure the correct
  * namespace Common is referenced.
  */
diff --git a/common/textconsole.cpp b/common/textconsole.cpp
index 2e5a347489..0d0b0aead9 100644
--- a/common/textconsole.cpp
+++ b/common/textconsole.cpp
@@ -155,11 +155,6 @@ void NORETURN_PRE error(const char *s, ...) {
 	__android_log_assert("Fatal error", "ScummVM", "%s", buf_output);
 #endif
 
-#ifdef PALMOS_MODE
-	extern void PalmFatalError(const char *err);
-	PalmFatalError(buf_output);
-#endif
-
 #ifdef __SYMBIAN32__
 	Symbian::FatalError(buf_output);
 #endif
@@ -167,7 +162,7 @@ void NORETURN_PRE error(const char *s, ...) {
 #ifdef __PSP__
 	PspDebugTrace(false, "%s", buf_output);	// write to file
 #endif
-	
+
 	// Finally exit. quit() will terminate the program if g_system is present
 	if (g_system)
 		g_system->quit();
diff --git a/common/translation.cpp b/common/translation.cpp
index 093f26510f..ab6a922c6e 100644
--- a/common/translation.cpp
+++ b/common/translation.cpp
@@ -65,7 +65,7 @@ TranslationManager::TranslationManager() {
 	// http://msdn.microsoft.com/en-us/library/dd318101%28VS.85%29.aspx
 	// On the other hand the locale constants used, seem to exist on Windows 98 too,
 	// check this for that: http://msdn.microsoft.com/en-us/library/dd464799%28v=VS.85%29.aspx
-	// 
+	//
 	// I am not exactly sure what is the truth now, it might be very well that this breaks
 	// support for systems older than Windows 2000....
 	//
diff --git a/common/unarj.cpp b/common/unarj.cpp
index c130533dc1..2b2af3c54f 100644
--- a/common/unarj.cpp
+++ b/common/unarj.cpp
@@ -738,7 +738,7 @@ ArjArchive::ArjArchive(const String &filename) : _arjFilename(filename) {
 		warning("ArjArchive::ArjArchive(): Could not find the archive file");
 		return;
 	}
-	
+
 	int32 firstHeaderOffset = findHeader(arjFile);
 
 	if (firstHeaderOffset < 0) {
@@ -828,7 +828,7 @@ SeekableReadStream *ArjArchive::createReadStreamForMember(const String &name) co
 		delete decoder;
 	}
 
-	return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES);	
+	return new Common::MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES);
 }
 
 Archive *makeArjArchive(const String &name) {
diff --git a/common/util.cpp b/common/util.cpp
index 521a12e4c7..9e36e0f161 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -345,7 +345,7 @@ const String getGameGUIOptionsDescriptionLanguage(Language lang) {
 
 uint32 parseGameGUIOptions(const String &str) {
 	uint32 res = 0;
-	
+
 	for (int i = 0; g_gameOptions[i].desc; i++)
 		if (str.contains(g_gameOptions[i].desc))
 			res |= g_gameOptions[i].option;