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, 15 insertions, 5 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
@@ -10,12 +10,15 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QPE_NEED_CALIBRATION
\ No newline at end of file
+#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
@@ -12,24 +12,27 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #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>
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
 #define QPE_HAVE_MEMALERTER
 
 #define QPE_MEMALERTER_IMPL \
 static void sig_handler(int sig) \
 { \
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
@@ -14,24 +14,28 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #define QPE_NEED_CALIBRATION
 #define QPE_OWNAPM
 #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)
 #endif
 #ifndef APM_IOC_BATTERY_MAIN_CHK
 #define APM_IOC_BATTERY_MAIN_CHK       _IO(APM_IOC_MAGIC, 33)
 #endif
 
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
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
@@ -1,7 +1,9 @@
 /*
  * GPLv2 only zecke@handhelds.org
     hOlgAr
  */
 
 
 #define QPE_NEED_CALIBRATION
\ No newline at end of file
+#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
@@ -158,25 +158,25 @@ public:
 #endif
 
 	       delete r;
            }
 	}
 	static void show_mx(QWidget* mw, bool nomaximize,  const QString & = QString::null )
 	{
 
             // ugly hack, remove that later after finding a sane solution
             // 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 );
             }
 #endif
 
 		if ( mw->layout() && mw->inherits("QDialog") ) {
 			QPEApplication::showDialog((QDialog*)mw, nomaximize);
 		}
 		else {
 #ifdef Q_WS_QWS
 			if ( !nomaximize )
 				mw->showMaximized();
@@ -581,25 +581,25 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t )
         QPixmapCache::setCacheLimit(256); // sensible default for smaller devices.
 
 	d = new QPEApplicationData;
 	d->loadTextCodecs();
 	d->loadImageCodecs();
        	int dw = desktop() ->width();
 
 	if ( dw < 200 ) {
 		setFont( QFont( "vera", 8 ) );
 		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 );
 		AppLnk::setBigIconSize( 48 );
 	}
 #endif
 	else if ( dw > 200 ) {
 		setFont( QFont( "vera", 10 ) );
 		AppLnk::setSmallIconSize( 14 );
 		AppLnk::setBigIconSize( 32 );
 	}
 
@@ -1999,25 +1999,25 @@ void QPEApplication::hideOrQuit()
 extern "C" void __cxa_pure_virtual();
 
 void __cxa_pure_virtual()
 {
     fprintf( stderr, "Pure virtual called\n");
     abort();
 
 }
 
 #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
 // use about 50% of your CPU. Here we revert to the simple libc
 // functions.
 
 void* operator new[]( size_t size )
 {
 	return malloc( size );
 }
 
 void* operator new( size_t size )
diff --git a/library/storage.cpp b/library/storage.cpp
index 1ce43bc..dc5cc22 100644
--- a/library/storage.cpp
+++ b/library/storage.cpp
@@ -12,27 +12,25 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include <qpe/storage.h>
-#if defined(QT_QWS_SL5XXX)
 #include <qpe/custom.h>
-#endif
 
 #include <qfile.h>
 #include <qtimer.h>
 #include <qcopchannel_qws.h>
 
 #include <stdio.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif