Add the possible defines to the custom- device headers

-storage remove stupid check for custom.h. We gurantee it to be present ( even if it is empty )
-qpeapplication
   -introduce OPIE_NEW_MALLOC This will use malloc and free for new and delete
   -introduce OPIE_HIGH_RES_SMALL_PHY   define this if you've a high resolution but physical smaller display


FIXME:
   some one needs to introduce a C7xx Custom.h or define OPIE_HIGH_RES_SMALL_PHY somewhere in the custom-sharp.h

6 files changed, 19 insertions, 9 deletions

diff --git a/library/custom-ipaq.h b/library/custom-ipaq.h
index a9319fa..8321199 100644
--- a/library/custom-ipaq.h
+++ b/library/custom-ipaq.h
@@ -18,4 +18,7 @@
 **
 **********************************************************************/
 
-#define QPE_NEED_CALIBRATION
\ No newline at end of file
+#define QPE_NEED_CALIBRATION
+#define OPIE_SOUND_FRAGMENT_SHIFT 14
+#define USE_REALTIME_AUDIO_THREAD
+#define OPIE_NEW_MALLOC
diff --git a/library/custom-ramses.h b/library/custom-ramses.h
index 9104931..5a1abe4 100644
--- a/library/custom-ramses.h
+++ b/library/custom-ramses.h
@@ -21,6 +21,9 @@
 #define QPE_NEED_CALIBRATION
 #define QPE_HAVE_TOGGLELIGHT
 #define QPE_STARTMENU
+#define USE_REALTIME_AUDIO_THREAD
+#define OPIE_NEW_MALLOC
+
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/library/custom-sharp.h b/library/custom-sharp.h
index 3936875..b0e67b8 100644
--- a/library/custom-sharp.h
+++ b/library/custom-sharp.h
@@ -23,6 +23,10 @@
 #define QPE_HAVE_TOGGLELIGHT
 #define QPE_NOCIBAUD
 #define QPE_STARTMENU
+#define OPIE_NEW_MALLOC
+#define USE_REALTIME_AUDIO_THREAD
+#define OPIE_NO_SOUND_PCM_READ_BITS
+
 #include <asm/sharp_apm.h>
 #ifndef APM_IOC_BATTERY_BACK_CHK
 #define APM_IOC_BATTERY_BACK_CHK       _IO(APM_IOC_MAGIC, 32)
diff --git a/library/custom-simpad.h b/library/custom-simpad.h
index 3872dfd..c951296 100644
--- a/library/custom-simpad.h
+++ b/library/custom-simpad.h
@@ -4,4 +4,6 @@
  */
 
 
-#define QPE_NEED_CALIBRATION
\ No newline at end of file
+#define QPE_NEED_CALIBRATION
+#define OPIE_NEW_MALLOC
+#define USE_REALTIME_AUDIO_THREAD
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index feba8b6..cd1c62e 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -167,7 +167,7 @@ public:
             // Addendum: Only Sharp currently has models with high resolution but (physically) small displays,
             // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has
             // a (physically) large enough display to use the small icons
-#ifndef QT_QWS_SIMPAD
+#if defined(OPIE_HIGH_RES_SMALL_PHY)
             if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) )  {
                 ( (  QMainWindow* ) mw )->setUsesBigPixmaps( true );
             }
@@ -590,10 +590,10 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
                 AppLnk::setSmallIconSize( 10 );
                 AppLnk::setBigIconSize( 28 );
         }
-#ifndef QT_QWS_SIMPAD
+#ifndef OPIE_HIGH_RES_SMALL_PHY
         else if ( dw > 600 ) {
-                               setFont( QFont( "vera", 16 ) );
-                                AppLnk::setSmallIconSize( 24 );
+                setFont( QFont( "vera", 16 ) );
+                AppLnk::setSmallIconSize( 24 );
                 AppLnk::setBigIconSize( 48 );
         }
 #endif
@@ -2008,7 +2008,7 @@ void __cxa_pure_virtual()
 #endif
 
 
-#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES)
+#if defined(OPIE_NEW_MALLOC)
 
 // The libraries with the skiff package (and possibly others) have
 // completely useless implementations of builtin new and delete that
diff --git a/library/storage.cpp b/library/storage.cpp
index 1ce43bc..dc5cc22 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -21,9 +21,7 @@
 **********************************************************************/
 
 #include <qpe/storage.h>
-#if defined(QT_QWS_SL5XXX)
 #include <qpe/custom.h>
-#endif
 
 #include <qfile.h>
 #include <qtimer.h>