1 files changed, 4 insertions, 0 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 3b6a987..59ca61b 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1095,390 +1095,394 @@ bool QPEApplication::qwsEventFilter( QWSEvent * e )
                     if ( active->inherits( "QDialog" ) ) {
                         HackDialog * d = ( HackDialog * ) active;
                         d->acceptIt();
                         return TRUE;
                     }
                     else if ( ( ( HackWidget * ) active ) ->needsOk() ) {
                         QSignal s;
                         s.connect( active, SLOT( accept() ) );
                         s.activate();
                     }
                     else {
                         // do the same as with the select key: Map to the default action of the widget:
                         mapToDefaultAction( ke, Qt::Key_Return );
                     }
                 }
             }
         }
         else if ( ke->simpleData.keycode == Qt::Key_F30 ) {
             // Use special "select" key to do whatever default action a widget has
             mapToDefaultAction( ke, Qt::Key_Space );
         }
         else if ( ke->simpleData.keycode == Qt::Key_Escape &&
                   ke->simpleData.is_press ) {
             // Escape key closes app if focus on toplevel
             QWidget * active = activeWindow();
             if ( active && active->testWFlags( WType_TopLevel ) &&
                     ( int ) active->winId() == ke->simpleData.window &&
                     !active->testWFlags( WStyle_Dialog | WStyle_Customize | WType_Popup | WType_Desktop ) ) {
                 if ( active->inherits( "QDialog" ) ) {
                     HackDialog * d = ( HackDialog * ) active;
                     d->rejectIt();
                     return TRUE;
                 } else /*if ( strcmp( argv() [ 0 ], "embeddedkonsole" ) != 0 )*/ {
                 active->close();
                 }
             }
 
         }
         else if ( ke->simpleData.keycode >= Qt::Key_F1 && ke->simpleData.keycode <= Qt::Key_F29 ) {
             // this should be if ( ODevice::inst ( )-> buttonForKeycode ( ... ))
             // but we cannot access libopie function within libqpe :(
 
             QWidget * active = activeWindow ( );
             if ( active && ((int) active-> winId ( ) == ke-> simpleData.window )) {
                 if ( d-> kbgrabbed ) { // we grabbed the keyboard
                     QChar ch ( ke-> simpleData.unicode );
                     QKeyEvent qke ( ke-> simpleData. is_press ? QEvent::KeyPress : QEvent::KeyRelease,
                                     ke-> simpleData.keycode,
                                     ch. latin1 ( ),
                                     ke-> simpleData.modifiers,
                                     QString ( ch ),
                                     ke-> simpleData.is_auto_repeat, 1 );
 
                     QObject *which = QWidget::keyboardGrabber ( );
                     if ( !which )
                         which = QApplication::focusWidget ( );
                     if ( !which )
                         which = QApplication::activeWindow ( );
                     if ( !which )
                         which = qApp;
 
                     QApplication::sendEvent ( which, &qke );
                 }
                 else { // we didn't grab the keyboard, so send the event to the launcher
                     QCopEnvelope e ( "QPE/Launcher", "deviceButton(int,int,int)" );
                     e << int( ke-> simpleData.keycode ) << int( ke-> simpleData. is_press ) << int( ke-> simpleData.is_auto_repeat );
                 }
             }
             return true;
         }
     }
     if ( e->type == QWSEvent::Focus ) {
         QWSFocusEvent * fe = ( QWSFocusEvent* ) e;
         if ( !fe->simpleData.get_focus ) {
             QWidget * active = activeWindow();
             while ( active && active->isPopup() ) {
                 active->close();
                 active = activeWindow();
             }
         }
         else {
             // make sure our modal widget is ALWAYS on top
             QWidget *topm = activeModalWidget();
             if ( topm && static_cast<int>( topm->winId() ) != fe->simpleData.window) {
                 topm->raise();
             }
         }
         if ( fe->simpleData.get_focus && inputMethodDict ) {
             InputMethodHint m = inputMethodHint( QWidget::find( e->window() ) );
             if ( m == AlwaysOff )
                 Global::hideInputMethod();
             if ( m == AlwaysOn )
                 Global::showInputMethod();
         }
     }
 
 
     return QApplication::qwsEventFilter( e );
 }
 #endif
 
 /*!
   Destroys the QPEApplication.
 */
 QPEApplication::~QPEApplication()
 {
     ungrabKeyboard();
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     // Need to delete QCopChannels early, since the display will
     // be gone by the time we get to ~QObject().
     delete sysChannel;
     delete pidChannel;
 #endif
 
     delete d;
 }
 
 /*!
   Returns <tt>$OPIEDIR/</tt>.
 */
 QString QPEApplication::qpeDir()
 {
     const char * base = getenv( "OPIEDIR" );
     if ( base )
         return QString( base ) + "/";
 
     return QString( "../" );
 }
 
 /*!
   Returns the user's current Document directory. There is a trailing "/".
   .. well, it does now,, and there's no trailing '/'
 */
 QString QPEApplication::documentDir()
 {
     const char* base = getenv( "HOME");
     if ( base )
         return QString( base ) + "/Documents";
 
     return QString( "../Documents" );
 }
 
 static int deforient = -1;
 
 /*!
   \internal
 */
 int QPEApplication::defaultRotation()
 {
     if ( deforient < 0 ) {
         QString d = getenv( "QWS_DISPLAY" );
         if ( d.contains( "Rot90" ) ) {
             deforient = 90;
         }
         else if ( d.contains( "Rot180" ) ) {
             deforient = 180;
         }
         else if ( d.contains( "Rot270" ) ) {
             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>
 
+#if QT_VERSION > 236
 extern void qws_clearLoadedFonts();
+#endif
 
 void QPEApplication::setCurrentMode( int x, int y, int depth )
 {
     // Reset the caches
+#if QT_VERSION > 236
     qws_clearLoadedFonts();
+#endif
     QPixmapCache::clear();
 
     // Change the screen mode
     qt_screen->setMode(x, y, depth);
 
     if ( qApp->type() == GuiServer ) {
 #if QT_VERSION > 236
         // Reconfigure the GuiServer
         qwsServer->beginDisplayReconfigure();
         qwsServer->endDisplayReconfigure();
 #endif
         // 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) && defined 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() );
 
     setPalette( pal, TRUE );
 
 
         // Set the ScrollBar on the 'right' side but only if the weak symbol is present
         if (&qt_left_hand_scrollbars )
             qt_left_hand_scrollbars = config.readBoolEntry( "LeftHand", false );
 
     // Window Decoration
     QString dec = config.readEntry( "Decoration", "Flat" );
 
     // don't set a custom deco
     if ( nostyle & Opie::Force_Decoration )
         dec = "";
 
 
     if ( dec != d->decorationName ) {
         qwsSetDecoration( new QPEDecoration( dec ) );
         d->decorationName = dec;
     }
 
     // Font
     QString ff = config.readEntry( "FontFamily", font().family() );
     int fs = config.readNumEntry( "FontSize", font().pointSize() );
 
     // don't set a custom font
     if ( nostyle & Opie::Force_Font ) {
         ff = "Vera";
         fs = 10;
     }
 
     setFont ( QFont ( ff, fs ), true );
 
 #if !defined(OPIE_NO_OVERRIDE_QT)
     // revert to global blocking policy ...
     Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
     Opie::force_appearance &= ~nostyle;
 #endif
 #endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "applyStyle()" ) {
         applyStyle();
     }
     else if ( msg == "toggleApplicationMenu()" ) {
         QWidget *active = activeWindow ( );
 
         if ( active ) {
             QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
             bool oldactive = man-> isActive ( );
 
             man-> setActive( !man-> isActive() );
 
             if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
                 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
             }
         }
     }
     else if ( msg == "setDefaultRotation(int)" ) {
         if ( type() == GuiServer ) {
             int r;
             stream >> r;
             setDefaultRotation( r );
         }
     }
     else if ( msg == "setCurrentMode(int,int,int)" ) { // Added: 2003-06-11 by Tim Ansell <mithro@mithis.net>
             if ( type() == GuiServer ) {
         int x, y, depth;
         stream >> x;
         stream >> y;
         stream >> depth;
         setCurrentMode( x, y, depth );
             }
      }
     else if ( msg == "reset()" ) {
             if ( type() != GuiServer )
                 reset();
     }
     else if ( msg == "setCurrentRotation(int)" ) {
         int r;
         stream >> r;
         setCurrentRotation( r );
      }
     else if ( msg == "shutdown()" ) {
         if ( type() == GuiServer )
             shutdown();
     }
     else if ( msg == "quit()" ) {
         if ( type() != GuiServer )
             tryQuit();
     }
     else if ( msg == "forceQuit()" ) {
         if ( type() != GuiServer )
             quit();
     }
     else if ( msg == "restart()" ) {
         if ( type() == GuiServer )
             restart();
     }