Drop Symbian support

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

11 files changed, 5 insertions, 195 deletions

diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
index 0dadcf19..fea8c8d8 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/dbgtool/hxassert.h
@@ -116,11 +116,6 @@ void HXUnixDebugBreak();
 #include <stdlib.h>
 #endif
 
-#ifdef _SYMBIAN
-# include <unistd.h>
-# define _MAX_PATH MAXPATHLEN
-#endif
-
 #ifdef _OPENWAVE
 #ifndef _MAX_PATH
 #define _MAX_PATH 256
@@ -136,8 +131,6 @@ void HXUnixDebugBreak();
 #  define MAX_TRACE_OUTPUT  255
 # elif _WIN16
 #  define MAX_TRACE_OUTPUT  255
-# elif _SYMBIAN
-#  define MAX_TRACE_OUTPUT  255
 # else
 #  define MAX_TRACE_OUTPUT  (_MAX_PATH*2 + 20)
 # endif
@@ -254,12 +247,6 @@ HXBOOL STDMETHODCALLTYPE HXIsValidString(const char* lpsz, int nLength);
 #else
 void HXDebugBreak();
 #endif
-#elif defined(_SYMBIAN)
-#if defined(__WINS__)
-#define HXDebugBreak() _asm { int 3 }
-#else
-void HXDebugBreak();
-#endif //_SYMBIAN
 #elif  defined(_UNIX)
 void HXDebugBreak();
 #elif defined(_VXWORKS)
@@ -300,8 +287,6 @@ do {						\
 # define HXAbort() 	abort()
 #elif defined(WIN32_PLATFORM_PSPC)
 # define HXAbort()   exit(1)
-#elif defined(_SYMBIAN)
-# define HXAbort() exit(1)
 #elif defined(_OPENWAVE)
 // XXXSAB is this right??
 # define HXAbort() exit(1)
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
index 800f4a21..4f55daa8 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/atomicbase.h
@@ -1225,95 +1225,6 @@ extern HXAtomic g_AtomicOps; //in common/util/atomicops.cpp
 
 
 /***********************************************************************
- * SYMBIAN
- *
- * Implementation Notes:
- *
- * Note: This is an imcompletely-defined platform, be aware that
- * not all standard HXAtomic operators are defined!
- *
- */
-#elif defined(_SYMBIAN)
-
-/* Increment by 1 and return new value */
-inline INT32
-HXAtomicIncRetINT32(INT32* pNum)
-{
-    return User::LockedInc(*((TInt*)pNum)) + 1;
-}
-
-/* Decrement by 1 and return new value */
-inline INT32
-HXAtomicDecRetINT32(INT32* pNum)
-{
-    return User::LockedDec(*((TInt*)pNum)) - 1;
-}
-
-/* Increment by 1 and return new value */
-inline UINT32
-HXAtomicIncRetUINT32(UINT32* pNum)
-{
-    return ((UINT32)User::LockedInc(*((TInt*)pNum))) + 1;
-}
-
-/* Decrement by 1 and return new value */
-inline UINT32
-HXAtomicDecRetUINT32(UINT32* pNum)
-{
-    return ((UINT32)User::LockedDec(*((TInt*)pNum))) - 1;
-}
-
-#define HXAtomicIncINT32(p)    HXAtomicIncRetINT32((p))
-#define HXAtomicDecINT32(p)    HXAtomicDecRetINT32((p))
-#define HXAtomicIncUINT32(p)   HXAtomicIncRetUINT32((p))
-#define HXAtomicDecUINT32(p)   HXAtomicDecRetUINT32((p))
-
-#if 0
-
-/* 
- * Add and subtract operations are not implemented
- * at this time because there isn't an easy way to
- * do it using the facilities provided by Symbian.
- * Assembly will likely be needed.
- */
-
-/* Add n and return new value */
-inline INT32
-HXAtomicAddRetINT32(INT32* pNum, INT32 n)
-{
-
-}
-
-/* Subtract n and return new value */
-inline INT32
-HXAtomicSubRetINT32(INT32* pNum, INT32 n)
-{
-
-}
-
-/* Add n and return new value */
-inline UINT32
-HXAtomicAddRetUINT32(UINT32* pNum, UINT32 n)
-{
-
-}
-
-/* Subtract n and return new value */
-inline UINT32
-HXAtomicSubRetUINT32(UINT32* pNum, UINT32 n)
-{
-
-}
-
-#define HXAtomicAddINT32(p,n)  HXAtomicAddRetINT32((p),(n))
-#define HXAtomicSubINT32(p,n)  HXAtomicSubRetINT32((p),(n))
-
-#define HXAtomicAddUINT32(p,n) HXAtomicAddRetUINT32((p),(n))
-#define HXAtomicSubUINT32(p,n) HXAtomicSubRetUINT32((p),(n))
-
-#endif
-
-/***********************************************************************
  * Linux / ARM (gcc)
  *
  * Implementation Notes:
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
index b3921e04..67d4782a 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxpiids.h
@@ -321,10 +321,6 @@ DEFINE_GUID_ENUM(IID_IHXPreCacheGroupMgr,    0x00000E00, 0xb4c8, 0x11d0, 0x99, 0
 DEFINE_GUID_ENUM(IID_IHXDataFileFactory,        0x00000F00, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
 DEFINE_GUID_ENUM(IID_IHXDataFile,               0x00000F01, 0xb4c8, 0x11d0, 0x99, 0x95, 0x0, 0xa0, 0x24, 0x8d, 0xa5, 0xf0)
 DEFINE_GUID_ENUM(IID_IHXAsyncDataFile,          0x972bacc0, 0xaff, 0x11d7, 0xac, 0x45, 0x0, 0x1, 0x2, 0x51, 0xb3, 0x40)
-#ifdef _SYMBIAN
-DEFINE_GUID_ENUM(IID_IHXSymbFileSessionManager, 0x8a5c6080, 0xb16, 0x11d7, 0xac, 0x45, 0x0, 0x1, 0x2, 0x51, 0xb3, 0x40)
-#endif // _SYMBIAN
-
 /*
  * File:
  *    memfsys.h
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
index 6aa13398..d7446aa1 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxtypes.h
@@ -11,12 +11,6 @@
  *
  */
 
-#if defined(_SYMBIAN)
-# include <e32def.h>
-# include <e32std.h>
-# include <platform/symbian/symbiantypes.h> /* For our TInt64 impl */
-#endif
-
 #ifdef _VXWORKS
 #include "types/vxTypesOld.h"
 #include "vxWorks.h"
@@ -38,7 +32,7 @@
 #define _HXTYPES_H_
 
 // this is essential to make sure that new is not #define'd before the C++ version is included.
-#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_SYMBIAN) && !defined(_OPENWAVE))
+#if (defined(_MSC_VER) && defined(_DEBUG) && defined(__cplusplus) && !defined(WIN32_PLATFORM_PSPC) && !defined(_OPENWAVE))
 #include <memory>
 #endif
 
@@ -51,16 +45,6 @@
 #error For VC++ 6.0 or higher you must include hxtypes.h before other windows header files.
 #endif
 
-#if defined(_SYMBIAN)
-typedef TInt8   INT8;
-typedef TUint8  UINT8;
-typedef TInt16  INT16;
-typedef TUint16 UINT16;
-typedef TInt32  INT32;
-typedef TUint32 UINT32;
-typedef TUint32 UINT; /* Its unclear, but UINT is suppose to be 32 bits. */
-typedef TBool   BOOL;
-#else
 # ifndef _VXWORKS
 
    typedef char                    INT8;   /* signed 8 bit value */
@@ -91,8 +75,6 @@ typedef TBool   BOOL;
 
 #endif /* _VXWORKS */
 
-#endif /* _SYMBIAN */
-
 
 #if defined(HELIX_CONFIG_AVOID_BOOL)
     typedef int HXBOOL;
@@ -125,9 +107,6 @@ typedef unsigned long int       UINT64;
 #elif defined(_WINDOWS) || defined(_OPENWAVE_SIMULATOR)
 typedef __int64			INT64;
 typedef unsigned __int64	UINT64;
-#elif defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
-typedef SymInt64                INT64;
-typedef SymInt64                UINT64;
 #else
 typedef long long		INT64;
 typedef unsigned long long	UINT64;
@@ -146,21 +125,12 @@ typedef ULONG32 HX_MOFTAG;
  * so, we provide these casting macros that have to be used
  * to cast 64-bit ints to smaller datatypes
  */
-#if defined(_SYMBIAN) && !defined (_SYMBIAN_81_)
-#define INT64_TO_ULONG32(a) ((ULONG32)((a).Low()))
-#define INT64_TO_UINT32(a)  ((UINT32)((a).Low()))
-#define INT64_TO_INT32(a)   ((INT32)((a).Low()))
-#define INT64_TO_DOUBLE(a)  ((a).GetTReal())
-#define INT64_TO_FLOAT(a)   ((a).GetTReal())
-#define UINT32_TO_DOUBLE(a) (SymbianUINT32toDouble(a))
-#else
 #define INT64_TO_ULONG32(a) ((ULONG32)(a))
 #define INT64_TO_UINT32(a)  ((UINT32) (a))
 #define INT64_TO_INT32(a)   ((INT32)  (a))
 #define INT64_TO_DOUBLE(a)  ((double) (a))
 #define INT64_TO_FLOAT(a)   ((float) (a))
 #define UINT32_TO_DOUBLE(a) ((double) (a))
-#endif
 
 
 #ifdef _MACINTOSH
@@ -171,10 +141,6 @@ typedef ULONG32 HX_MOFTAG;
     #endif
 #endif
 
-#if defined(_SYMBIAN)
-#define PATH_MAX      KMaxPath
-#endif
-
 #ifdef __cplusplus
 extern "C" {            /* Assume C declarations for C++ */
 #endif  /* __cplusplus */
@@ -650,7 +616,7 @@ typedef ULONG32 HXXIMAGE;
  * in place of the standard header file basetsd.h, since this standard
  * header file conflicts with our definitions.
  */
-#if defined(_MSC_VER) && (_MSC_VER > 1100) && !defined(_SYMBIAN)
+#if defined(_MSC_VER) && (_MSC_VER > 1100)
 #include "hxbastsd.h"
 #ifdef WIN32_PLATFORM_PSPC
 #define _TYPES_H_
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
index 4316cc2f..98334788 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
@@ -20,11 +20,6 @@
 #define BI_BITFIELDS	3L
 #endif
 
-#ifdef _SYMBIAN
-#include <coemain.h>
-#include <w32std.h>
-#endif
-
 /****************************************************************************
  * 
  *  Structure:
@@ -182,9 +177,6 @@ typedef struct HXEXPORT_CLASS _HXxWindow
 #ifdef _UNIX
     void *      display;
 #endif
-#ifdef _SYMBIAN
-    CDirectScreenAccess* iDSA;
-#endif    
 } HXxWindow;
 
 typedef void* HXxWindowID;
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h b/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h
index d9df49cc..aa04dead 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/util/hxstrutl.h
@@ -110,14 +110,6 @@ size_t StrNCSpn(const char *str1, const char *str2, size_t depth1, size_t depth2
 
 char* StrToUpper(char *pString);
 
-#if defined( _SYMBIAN)
-#define NEW_FAST_TEMP_STR(NAME, EstimatedBiggestSize, LenNeeded)	\
-    char*   NAME = new char[(LenNeeded)];		        
-
-#define DELETE_FAST_TEMP_STR(NAME)					\
-    delete[] NAME;							
-
-#else
 /* XXXSMP We can use alloca() on platforms that support it for more speed! */
 #define NEW_FAST_TEMP_STR(NAME, EstimatedBiggestSize, LenNeeded)	\
     char    __##NAME##__StaticVersion[EstimatedBiggestSize];		\
@@ -138,6 +130,5 @@ char* StrToUpper(char *pString);
     { 									\
         delete[] NAME;							\
     }
-#endif /* defined(_SYMBIAN) */
 
 #endif /* _HXSTRUTL_H_ */
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h
index 2cc9d506..03ad99f6 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/memory.h
@@ -14,9 +14,7 @@
 #ifndef HLXSYS_MEMORY_H
 #define HLXSYS_MEMORY_H
 
-#if defined(_SYMBIAN)
-#include <string.h>
-#elif defined(_OPENWAVE)
+#if defined(_OPENWAVE)
 #include "platform/openwave/hx_op_stdc.h"
 #elif !defined(__TCS__) && !defined(_VXWORKS)
 #include <memory.h>
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h
index 117f9ec5..4e8ed044 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdio.h
@@ -105,7 +105,7 @@ int __helix_vfprintf(FILE* f, const char  *format, va_list ap);
 #define snprintf _snprintf
 #define vsnprintf _vsnprintf
 
-#elif defined(_SYMBIAN) || defined(_WINCE) || defined(_IRIX)
+#elif defined(_WINCE) || defined(_IRIX)
 #define snprintf __helix_snprintf
 #define vsnprintf __helix_vsnprintf
 #endif
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h
index b055336e..3ddf3206 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/stdlib.h
@@ -110,15 +110,6 @@ atoi64(const char* str)
 
 #endif /* _UNIX */
 
-#if defined(_SYMBIAN)
-
-#define itoa __helix_itoa
-#define i64toa __helix_i64toa
-#define atoi64 __helix_atoi64
-#define putenv __helix_putenv
-
-#endif
-
 #if defined(_OPENWAVE)
 
 #define itoa(v,s,r) __helix_itoa((v),(s),(r))
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
index f369e2c0..b6091413 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/string.h
@@ -20,11 +20,6 @@
 #include <string.h>
 #endif /* !_OPENWAVE */
 
-#ifdef _SYMBIAN
-//on symbian we have stuff scattered all about.
-# include <stdlib.h>
-# include <ctype.h>
-#endif
 #if !defined(_VXWORKS)
 #ifdef _UNIX
 #include <strings.h>
@@ -88,17 +83,6 @@ strncasecmp(const char* str1, const char* str2, int len)
 #endif /* _WINDOWS */
 
 
-#if defined(_SYMBIAN)
-unsigned long __helix_strtoul(const char*s, char**end, int base);
-#define strtoul __helix_strtoul
-#define strrev __helix_strrev
-#define stricmp strcasecmp
-#define strnicmp strncasecmp
-#define strlwr __helix_strlwr
-#define strupr __helix_strupr
-
-#endif /* _SYMBIAN */
-
 #if defined(_OPENWAVE)
 #define strcmpi stricmp
 #define strrev __helix_strrev
@@ -220,7 +204,7 @@ new_path_string(const char* str)
     {
         if (*psrc == '/' || *psrc == '\\')
         {
-#if defined _WIN32 || defined(_SYMBIAN)
+#if defined _WIN32
             *pdst = '\\';
 #elif defined _UNIX || defined _OPENWAVE
             *pdst = '/';
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h
index f0009d0a..c9db8f46 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/runtime/hlxclib/time.h
@@ -14,10 +14,6 @@
 #ifndef HLXSYS_TIME_H
 #define HLXSYS_TIME_H
 
-#if defined(_SYMBIAN)
-# include <sys/time.h>
-#endif 
-
 #if defined(WIN32_PLATFORM_PSPC)
 # include "hxtypes.h"
 # include "hlxclib/windows.h"