author | zecke <zecke> | 2003-10-07 13:00:31 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-10-07 13:00:31 (UTC) |
commit | 62d81aa76146401087e3ec9dcebd298a7d030c4a (patch) (unidiff) | |
tree | c84a25f10fef6ca178f66eb1eee92916c6860db9 | |
parent | 6f807f937764d0b80d38cd5e29983ad4ec2ae3c8 (diff) | |
download | opie-62d81aa76146401087e3ec9dcebd298a7d030c4a.zip opie-62d81aa76146401087e3ec9dcebd298a7d030c4a.tar.gz opie-62d81aa76146401087e3ec9dcebd298a7d030c4a.tar.bz2 |
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
-rw-r--r-- | library/custom-ipaq.h | 3 | ||||
-rw-r--r-- | library/custom-ramses.h | 3 | ||||
-rw-r--r-- | library/custom-sharp.h | 4 | ||||
-rw-r--r-- | library/custom-simpad.h | 2 | ||||
-rw-r--r-- | library/qpeapplication.cpp | 6 | ||||
-rw-r--r-- | library/storage.cpp | 2 |
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 | |||
@@ -16,6 +16,9 @@ | |||
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION \ No newline at end of file | 21 | #define QPE_NEED_CALIBRATION \ No newline at end of file |
22 | #define OPIE_SOUND_FRAGMENT_SHIFT 14 | ||
23 | #define USE_REALTIME_AUDIO_THREAD | ||
24 | #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 | |||
@@ -18,12 +18,15 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION | 21 | #define QPE_NEED_CALIBRATION |
22 | #define QPE_HAVE_TOGGLELIGHT | 22 | #define QPE_HAVE_TOGGLELIGHT |
23 | #define QPE_STARTMENU | 23 | #define QPE_STARTMENU |
24 | #define USE_REALTIME_AUDIO_THREAD | ||
25 | #define OPIE_NEW_MALLOC | ||
26 | |||
24 | 27 | ||
25 | #include <unistd.h> | 28 | #include <unistd.h> |
26 | #include <stdio.h> | 29 | #include <stdio.h> |
27 | #include <signal.h> | 30 | #include <signal.h> |
28 | #include <fcntl.h> | 31 | #include <fcntl.h> |
29 | #include <sys/ioctl.h> | 32 | #include <sys/ioctl.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 | |||
@@ -20,12 +20,16 @@ | |||
20 | 20 | ||
21 | #define QPE_NEED_CALIBRATION | 21 | #define QPE_NEED_CALIBRATION |
22 | #define QPE_OWNAPM | 22 | #define QPE_OWNAPM |
23 | #define QPE_HAVE_TOGGLELIGHT | 23 | #define QPE_HAVE_TOGGLELIGHT |
24 | #define QPE_NOCIBAUD | 24 | #define QPE_NOCIBAUD |
25 | #define QPE_STARTMENU | 25 | #define QPE_STARTMENU |
26 | #define OPIE_NEW_MALLOC | ||
27 | #define USE_REALTIME_AUDIO_THREAD | ||
28 | #define OPIE_NO_SOUND_PCM_READ_BITS | ||
29 | |||
26 | #include <asm/sharp_apm.h> | 30 | #include <asm/sharp_apm.h> |
27 | #ifndef APM_IOC_BATTERY_BACK_CHK | 31 | #ifndef APM_IOC_BATTERY_BACK_CHK |
28 | #define APM_IOC_BATTERY_BACK_CHK _IO(APM_IOC_MAGIC, 32) | 32 | #define APM_IOC_BATTERY_BACK_CHK _IO(APM_IOC_MAGIC, 32) |
29 | #endif | 33 | #endif |
30 | #ifndef APM_IOC_BATTERY_MAIN_CHK | 34 | #ifndef APM_IOC_BATTERY_MAIN_CHK |
31 | #define APM_IOC_BATTERY_MAIN_CHK _IO(APM_IOC_MAGIC, 33) | 35 | #define APM_IOC_BATTERY_MAIN_CHK _IO(APM_IOC_MAGIC, 33) |
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 | |||
@@ -2,6 +2,8 @@ | |||
2 | * GPLv2 only zecke@handhelds.org | 2 | * GPLv2 only zecke@handhelds.org |
3 | hOlgAr | 3 | hOlgAr |
4 | */ | 4 | */ |
5 | 5 | ||
6 | 6 | ||
7 | #define QPE_NEED_CALIBRATION \ No newline at end of file | 7 | #define QPE_NEED_CALIBRATION \ No newline at end of file |
8 | #define OPIE_NEW_MALLOC | ||
9 | #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 | |||
@@ -164,13 +164,13 @@ public: | |||
164 | { | 164 | { |
165 | 165 | ||
166 | // ugly hack, remove that later after finding a sane solution | 166 | // ugly hack, remove that later after finding a sane solution |
167 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, | 167 | // Addendum: Only Sharp currently has models with high resolution but (physically) small displays, |
168 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has | 168 | // so this is only useful if QT_QWS_SIMPAD is NOT defined. E.g. SIMpad has 800x600 but has |
169 | // a (physically) large enough display to use the small icons | 169 | // a (physically) large enough display to use the small icons |
170 | #ifndef QT_QWS_SIMPAD | 170 | #if defined(OPIE_HIGH_RES_SMALL_PHY) |
171 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { | 171 | if ( QPEApplication::desktop() ->width() >= 600 && ( mw->inherits("QMainWindow") || mw->isA("QMainWindow") ) ) { |
172 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); | 172 | ( ( QMainWindow* ) mw )->setUsesBigPixmaps( true ); |
173 | } | 173 | } |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | if ( mw->layout() && mw->inherits("QDialog") ) { | 176 | if ( mw->layout() && mw->inherits("QDialog") ) { |
@@ -587,13 +587,13 @@ QPEApplication::QPEApplication( int & argc, char **argv, Type t ) | |||
587 | 587 | ||
588 | if ( dw < 200 ) { | 588 | if ( dw < 200 ) { |
589 | setFont( QFont( "vera", 8 ) ); | 589 | setFont( QFont( "vera", 8 ) ); |
590 | AppLnk::setSmallIconSize( 10 ); | 590 | AppLnk::setSmallIconSize( 10 ); |
591 | AppLnk::setBigIconSize( 28 ); | 591 | AppLnk::setBigIconSize( 28 ); |
592 | } | 592 | } |
593 | #ifndef QT_QWS_SIMPAD | 593 | #ifndef OPIE_HIGH_RES_SMALL_PHY |
594 | else if ( dw > 600 ) { | 594 | else if ( dw > 600 ) { |
595 | setFont( QFont( "vera", 16 ) ); | 595 | setFont( QFont( "vera", 16 ) ); |
596 | AppLnk::setSmallIconSize( 24 ); | 596 | AppLnk::setSmallIconSize( 24 ); |
597 | AppLnk::setBigIconSize( 48 ); | 597 | AppLnk::setBigIconSize( 48 ); |
598 | } | 598 | } |
599 | #endif | 599 | #endif |
@@ -2005,13 +2005,13 @@ void __cxa_pure_virtual() | |||
2005 | 2005 | ||
2006 | } | 2006 | } |
2007 | 2007 | ||
2008 | #endif | 2008 | #endif |
2009 | 2009 | ||
2010 | 2010 | ||
2011 | #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_RAMSES) | 2011 | #if defined(OPIE_NEW_MALLOC) |
2012 | 2012 | ||
2013 | // The libraries with the skiff package (and possibly others) have | 2013 | // The libraries with the skiff package (and possibly others) have |
2014 | // completely useless implementations of builtin new and delete that | 2014 | // completely useless implementations of builtin new and delete that |
2015 | // use about 50% of your CPU. Here we revert to the simple libc | 2015 | // use about 50% of your CPU. Here we revert to the simple libc |
2016 | // functions. | 2016 | // functions. |
2017 | 2017 | ||
diff --git a/library/storage.cpp b/library/storage.cpp index 1ce43bc..dc5cc22 100644 --- a/library/storage.cpp +++ b/library/storage.cpp | |||
@@ -18,15 +18,13 @@ | |||
18 | ** Contact info@trolltech.com if any conditions of this licensing are | 18 | ** Contact info@trolltech.com if any conditions of this licensing are |
19 | ** not clear to you. | 19 | ** not clear to you. |
20 | ** | 20 | ** |
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #include <qpe/storage.h> | 23 | #include <qpe/storage.h> |
24 | #if defined(QT_QWS_SL5XXX) | ||
25 | #include <qpe/custom.h> | 24 | #include <qpe/custom.h> |
26 | #endif | ||
27 | 25 | ||
28 | #include <qfile.h> | 26 | #include <qfile.h> |
29 | #include <qtimer.h> | 27 | #include <qtimer.h> |
30 | #include <qcopchannel_qws.h> | 28 | #include <qcopchannel_qws.h> |
31 | 29 | ||
32 | #include <stdio.h> | 30 | #include <stdio.h> |