Hmph.. No comment .. Thanks Zecke !

1 files changed, 1 insertions, 1 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index cfe0497..b1c8750 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1253,129 +1253,129 @@ int QPEApplication::defaultRotation()
             deforient = 270;
         }
         else {
             deforient = 0;
         }
     }
     return deforient;
 }
 
 /*!
   \internal
 */
 void QPEApplication::setDefaultRotation( int r )
 {
     if ( qApp->type() == GuiServer ) {
         deforient = r;
         setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
         Config config("qpe");
         config.setGroup( "Rotation" );
         config.writeEntry( "Rot", r );
     }
     else {
 #ifndef QT_NO_COP
         { QCopEnvelope e( "QPE/System", "setDefaultRotation(int)" );
             e << r;
         }
 #endif
 
     }
 }
 
 #include <qgfx_qws.h>
 #include <qwindowsystem_qws.h>
 
 extern void qws_clearLoadedFonts();
 
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
     // Reset the caches
     qws_clearLoadedFonts();
     QPixmapCache::clear();
 
     // Change the screen mode
     qt_screen->setMode(x, y, depth);
 
     if ( qApp->type() == GuiServer ) {
         // Reconfigure the GuiServer
         qwsServer->beginDisplayReconfigure();
         qwsServer->endDisplayReconfigure();
 
         // Get all the running apps to reset
         QCopEnvelope env( "QPE/System", "reset()" );
     }
 }
 
 void QPEApplication::reset() {
     // Reconnect to the screen
     qt_screen->disconnect();
     qt_screen->connect( QString::null );
 
     // Redraw everything
     applyStyle();
 }
 
-#if (QT_VERSION < 238) & Q_OS_MACX
+#if (QT_VERSION < 238) && Q_OS_MACX
 bool qt_left_hand_scrollbars = false;
 #else
 #ifdef Q_OS_MACX
 #define WEAK_SYMBOL __attribute__((weak_import))
 #else
 #define WEAK_SYMBOL __attribute__((weak))
 #endif
 extern bool qt_left_hand_scrollbars WEAK_SYMBOL;
 #endif
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
     Config config( "qpe" );
     config.setGroup( "Appearance" );
 
 #if QT_VERSION > 233
 #if !defined(OPIE_NO_OVERRIDE_QT)
     // don't block ourselves ...
     Opie::force_appearance = 0;
 
     static QString appname = Opie::binaryName ( );
 
     QStringList ex = config. readListEntry ( "NoStyle", ';' );
     int nostyle = 0;
     for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
         if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
             nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
             break;
         }
     }
 #else
         int nostyle = 0;
 #endif
 
     // Widget style
     QString style = config.readEntry( "Style", "FlatStyle" );
 
     // don't set a custom style
     if ( nostyle & Opie::Force_Style )
         style = "FlatStyle";
 
     internalSetStyle ( style );
 
     // Colors - from /etc/colors/Liquid.scheme
     QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
     QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
     QPalette pal( btncolor, bgcolor );
     QString color = config.readEntry( "Highlight", "#73adef" );
     pal.setColor( QColorGroup::Highlight, QColor( color ) );
     color = config.readEntry( "HighlightedText", "#FFFFFF" );
     pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
     color = config.readEntry( "Text", "#000000" );
     pal.setColor( QColorGroup::Text, QColor( color ) );
     color = config.readEntry( "ButtonText", "#000000" );
     pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
     color = config.readEntry( "Base", "#FFFFFF" );
     pal.setColor( QColorGroup::Base, QColor( color ) );
 
     pal.setColor( QPalette::Disabled, QColorGroup::Text,
                   pal.color( QPalette::Active, QColorGroup::Background ).dark() );