author | zecke <zecke> | 2004-06-27 19:36:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-06-27 19:36:48 (UTC) |
commit | 78cd13f15c6057e18b6f095841a90bb438dd6fd2 (patch) (unidiff) | |
tree | 08376c584867032bc4fa5725467d46615b02e700 | |
parent | 0ef75ca5409d290df36d1c0bbf0413e37bfd4124 (diff) | |
download | opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.zip opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.tar.gz opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.tar.bz2 |
Safe eilers some time for weak symbols on MacOS X
-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 4bc0c5f..b686e2e 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1292,49 +1292,55 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) | |||
1292 | 1292 | ||
1293 | // Change the screen mode | 1293 | // Change the screen mode |
1294 | qt_screen->setMode(x, y, depth); | 1294 | qt_screen->setMode(x, y, depth); |
1295 | 1295 | ||
1296 | if ( qApp->type() == GuiServer ) { | 1296 | if ( qApp->type() == GuiServer ) { |
1297 | // Reconfigure the GuiServer | 1297 | // Reconfigure the GuiServer |
1298 | qwsServer->beginDisplayReconfigure(); | 1298 | qwsServer->beginDisplayReconfigure(); |
1299 | qwsServer->endDisplayReconfigure(); | 1299 | qwsServer->endDisplayReconfigure(); |
1300 | 1300 | ||
1301 | // Get all the running apps to reset | 1301 | // Get all the running apps to reset |
1302 | QCopEnvelope env( "QPE/System", "reset()" ); | 1302 | QCopEnvelope env( "QPE/System", "reset()" ); |
1303 | } | 1303 | } |
1304 | } | 1304 | } |
1305 | 1305 | ||
1306 | void QPEApplication::reset() { | 1306 | void QPEApplication::reset() { |
1307 | // Reconnect to the screen | 1307 | // Reconnect to the screen |
1308 | qt_screen->disconnect(); | 1308 | qt_screen->disconnect(); |
1309 | qt_screen->connect( QString::null ); | 1309 | qt_screen->connect( QString::null ); |
1310 | 1310 | ||
1311 | // Redraw everything | 1311 | // Redraw everything |
1312 | applyStyle(); | 1312 | applyStyle(); |
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | 1315 | ||
1316 | extern bool qt_left_hand_scrollbars __attribute__(( weak )); | 1316 | #ifdef Q_OS_MACX |
1317 | #define WEAK_SYMBOL __attribute__((weak_import)) | ||
1318 | #else | ||
1319 | #define WEAK_SYMBOL __attribute__((weak)) | ||
1320 | #endif | ||
1321 | |||
1322 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | ||
1317 | /*! | 1323 | /*! |
1318 | \internal | 1324 | \internal |
1319 | */ | 1325 | */ |
1320 | void QPEApplication::applyStyle() | 1326 | void QPEApplication::applyStyle() |
1321 | { | 1327 | { |
1322 | Config config( "qpe" ); | 1328 | Config config( "qpe" ); |
1323 | config.setGroup( "Appearance" ); | 1329 | config.setGroup( "Appearance" ); |
1324 | 1330 | ||
1325 | #if QT_VERSION > 233 | 1331 | #if QT_VERSION > 233 |
1326 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1332 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1327 | // don't block ourselves ... | 1333 | // don't block ourselves ... |
1328 | Opie::force_appearance = 0; | 1334 | Opie::force_appearance = 0; |
1329 | 1335 | ||
1330 | static QString appname = Opie::binaryName ( ); | 1336 | static QString appname = Opie::binaryName ( ); |
1331 | 1337 | ||
1332 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); | 1338 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); |
1333 | int nostyle = 0; | 1339 | int nostyle = 0; |
1334 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { | 1340 | for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) { |
1335 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { | 1341 | if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) { |
1336 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); | 1342 | nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 ); |
1337 | break; | 1343 | break; |
1338 | } | 1344 | } |
1339 | } | 1345 | } |
1340 | #else | 1346 | #else |