author | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
commit | ac36bfe2794741188da1d6d4b471f96fd15d47ee (patch) (unidiff) | |
tree | 5c1bc264fd554142993be8963aed159f32877d6a /library/qpeapplication.cpp | |
parent | a979ea08e8f9dbade70a9bf4fdc93dcbebb5f3fa (diff) | |
download | opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.zip opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.gz opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.bz2 |
-Add a QPEGLOBAL that adds define for 'weak', 'used' and unused symbols
Make use of the newly added qpeglobal.h to kill custom versions of
similiar macros
-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index df313ce..3efba20 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -79,24 +79,25 @@ | |||
79 | #include "config.h" | 79 | #include "config.h" |
80 | #include "network.h" | 80 | #include "network.h" |
81 | #ifdef QWS | 81 | #ifdef QWS |
82 | #include "fontmanager.h" | 82 | #include "fontmanager.h" |
83 | #include "fontdatabase.h" | 83 | #include "fontdatabase.h" |
84 | #endif | 84 | #endif |
85 | 85 | ||
86 | #include "alarmserver.h" | 86 | #include "alarmserver.h" |
87 | #include "applnk.h" | 87 | #include "applnk.h" |
88 | #include "qpemenubar.h" | 88 | #include "qpemenubar.h" |
89 | #include "textcodecinterface.h" | 89 | #include "textcodecinterface.h" |
90 | #include "imagecodecinterface.h" | 90 | #include "imagecodecinterface.h" |
91 | #include <qtopia/qpeglobal.h> | ||
91 | 92 | ||
92 | #include <unistd.h> | 93 | #include <unistd.h> |
93 | #include <sys/file.h> | 94 | #include <sys/file.h> |
94 | #include <sys/ioctl.h> | 95 | #include <sys/ioctl.h> |
95 | #ifndef QT_NO_SOUND | 96 | #ifndef QT_NO_SOUND |
96 | #include <sys/soundcard.h> | 97 | #include <sys/soundcard.h> |
97 | #endif | 98 | #endif |
98 | #include "qt_override_p.h" | 99 | #include "qt_override_p.h" |
99 | 100 | ||
100 | #include <backend/rohfeedback.h> | 101 | #include <backend/rohfeedback.h> |
101 | 102 | ||
102 | 103 | ||
@@ -1285,30 +1286,25 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) | |||
1285 | void QPEApplication::reset() { | 1286 | void QPEApplication::reset() { |
1286 | // Reconnect to the screen | 1287 | // Reconnect to the screen |
1287 | qt_screen->disconnect(); | 1288 | qt_screen->disconnect(); |
1288 | qt_screen->connect( QString::null ); | 1289 | qt_screen->connect( QString::null ); |
1289 | 1290 | ||
1290 | // Redraw everything | 1291 | // Redraw everything |
1291 | applyStyle(); | 1292 | applyStyle(); |
1292 | } | 1293 | } |
1293 | 1294 | ||
1294 | #if (QT_VERSION < 238) && defined Q_OS_MACX | 1295 | #if (QT_VERSION < 238) && defined Q_OS_MACX |
1295 | bool qt_left_hand_scrollbars = false; | 1296 | bool qt_left_hand_scrollbars = false; |
1296 | #else | 1297 | #else |
1297 | #ifdef Q_OS_MACX | 1298 | extern bool qt_left_hand_scrollbars QPE_WEAK_SYMBOL; |
1298 | #define WEAK_SYMBOL __attribute__((weak_import)) | ||
1299 | #else | ||
1300 | #define WEAK_SYMBOL __attribute__((weak)) | ||
1301 | #endif | ||
1302 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | ||
1303 | #endif | 1299 | #endif |
1304 | 1300 | ||
1305 | /*! | 1301 | /*! |
1306 | \internal | 1302 | \internal |
1307 | */ | 1303 | */ |
1308 | void QPEApplication::applyStyle() | 1304 | void QPEApplication::applyStyle() |
1309 | { | 1305 | { |
1310 | Config config( "qpe" ); | 1306 | Config config( "qpe" ); |
1311 | config.setGroup( "Appearance" ); | 1307 | config.setGroup( "Appearance" ); |
1312 | 1308 | ||
1313 | #if QT_VERSION > 233 | 1309 | #if QT_VERSION > 233 |
1314 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1310 | #if !defined(OPIE_NO_OVERRIDE_QT) |