enable opie to compile against a non-patched qt 2.3.2

to prepare the possibility of building an opie 1.0 feed for the sharp rom

4 files changed, 19 insertions, 7 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f4db1ab..19adb00 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -900,200 +900,202 @@ 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
 
         }
 }
 
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
         Config config( "qpe" );
         config.setGroup( "Appearance" );
 
+    #if QT_VERSION > 233
         // 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;
                 }
         }
 
         // Widget style
         QString style = config.readEntry( "Style", "Light" );
 
         // don't set a custom style
         if ( nostyle & Opie::Force_Style )
                 style = "Light";
 
         internalSetStyle ( style );
 
         // Colors
         QColor bgcolor( config.readEntry( "Background", "#E5E1D5" ) );
         QColor btncolor( config.readEntry( "Button", "#D6CDBB" ) );
         QPalette pal( btncolor, bgcolor );
         QString color = config.readEntry( "Highlight", "#800000" );
         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 );
 
         // Window Decoration
         QString dec = config.readEntry( "Decoration", "Qtopia" );
 
         // don't set a custom deco
         if ( nostyle & Opie::Force_Decoration )
                 dec = "";
 
         //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
 
         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 );
 
         // revert to global blocking policy ...
         Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
         Opie::force_appearance &= ~nostyle;
+    #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 == "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();
         }
         else if ( msg == "language(QString)" ) {
                 if ( type() == GuiServer ) {
                         QString l;
                         stream >> l;
                         QString cl = getenv( "LANG" );
                         if ( cl != l ) {
                                 if ( l.isNull() )
                                         unsetenv( "LANG" );
                                 else
                                         setenv( "LANG", l.latin1(), 1 );
                                 restart();
                         }
                 }
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index e35c008..65a6d33 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -57,137 +57,142 @@ public:
     enum StylusMode {
         LeftOnly,
         RightOnHold
         // RightOnHoldLeftDelayed, etc.
     };
     static void setStylusOperation( QWidget*, StylusMode );
     static StylusMode stylusOperation( QWidget* );
 
     enum InputMethodHint {
         Normal,
         AlwaysOff,
         AlwaysOn
     };
 
     enum screenSaverHint {
         Disable = 0,
         DisableLightOff = 1,
         DisableSuspend = 2,
         Enable = 100
     };
 
     static void setInputMethodHint( QWidget *, InputMethodHint );
     static InputMethodHint inputMethodHint( QWidget * );
 
     void showMainWidget( QWidget*, bool nomax=FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
     static void showDialog( QDialog*, bool nomax=FALSE );
     static int execDialog( QDialog*, bool nomax=FALSE );
 
     static void setKeepRunning();
     bool keepRunning() const;
 
     bool keyboardGrabbed() const;
 
     int exec();
 
 signals:
     void clientMoused();
     void timeChanged();
     void clockChanged( bool pm );
     void micChanged( bool muted );
     void volumeChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
     void weekChanged( bool startOnMonday );
     void dateFormatChanged( DateFormat );
     void flush();
     void reload();
 
 private slots:
     void systemMessage( const QCString &msg, const QByteArray &data );
     void pidMessage( const QCString &msg, const QByteArray &data );
     void removeSenderFromStylusDict();
     void hideOrQuit();
 
 protected:
     bool qwsEventFilter( QWSEvent * );
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     bool eventFilter( QObject *, QEvent * );
     void timerEvent( QTimerEvent * );
     bool raiseAppropriateWindow();
     virtual void tryQuit();
-
+#if QT_VERSION > 233
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
-
+#endif
 private:
 #ifndef QT_NO_TRANSLATION
     void installTranslation( const QString& baseName );
 #endif
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *sysChannel;
     QCopChannel *pidChannel;
 #endif
     QPEApplicationData *d;
 
     bool reserved_sh;
 
 
 
 };
 
 inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     QSize sh = d->sizeHint();
     int w = QMAX(sh.width(),d->width());
     int h = QMAX(sh.height(),d->height());
     if ( !nomax
             && ( w > qApp->desktop()->width()*3/4
                  || h > qApp->desktop()->height()*3/4 ) )
     {
         d->showMaximized();
     } else {
         d->resize(w,h);
         d->show();
     }
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog(d,nomax);
     return d->exec();
 }
 
 enum Transformation { Rot0, Rot90, Rot180, Rot270 }; /* from qgfxtransformed_qws.cpp */
 
 inline int TransToDeg ( Transformation t )
 {
         int d = static_cast<int>( t );
         return d * 90;
 }
 
 inline Transformation DegToTrans ( int d )
 {
         Transformation t = static_cast<Transformation>( d / 90 );
         return t;
 }
 
 /*
  * Set current rotation of Opie, and rotation for newly started apps.
  * Differs from setDefaultRotation in that 1) it rotates currently running apps,
  * and 2) does not set deforient or save orientation to qpe.conf.
  */
 
 inline void QPEApplication::setCurrentRotation( int r )
 {
+    // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots
+    // for compatibility with the SharpROM use fallback to setDefaultTransformation()
+    #if QT_VERSION > 233
     Transformation e = DegToTrans( r );
-
     setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 );
     qApp->desktop()->qwsDisplay()->setTransformation( e );
+    #else
+    setDefaultRotation( r );
+    #endif
 }
 
 
 #endif
diff --git a/library/qt_override.cpp b/library/qt_override.cpp
index 02c48a0..edda874 100644
--- a/library/qt_override.cpp
+++ b/library/qt_override.cpp
@@ -1,79 +1,79 @@
 
 #include <qpe/qpeapplication.h>
 #include <qwsdecoration_qws.h>
 #include <qcommonstyle.h>
 #include <qfontdatabase.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <limits.h>
 #include <sys/param.h> // for toolchains with old libc headers
 
 #include "qt_override_p.h"
 
-
+#if QT_VERSION > 233
 
 struct color_fix_t {
         char *m_app;
         char *m_class;
         char *m_name;
         QColorGroup::ColorRole m_set;
         QColorGroup::ColorRole m_get;
 };
 
 
 
 static const color_fix_t apps_that_need_special_colors [] = {
         { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base },
         { "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base },
         
         { 0, 0, 0, QColorGroup::Base, QColorGroup::Base }
 };
 
 static const char * const apps_that_need_pointsizes_times_10 [] = {
         "HancomMobileWord",
         "hancomsheet",
         "HancomPresenterViewer",
         
         0
 };
 
 
 
 
 int Opie::force_appearance = 0;
 
 
 // Return the *real* name of the binary - not just a quick guess
 // by looking at argv [0] (which could be anything)
 
 static void binaryNameFree ( )
 {
         ::free ((void *) Opie::binaryName ( )); // we need to cast away the const here
 }
 
 const char *Opie::binaryName ( )
 {
         static const char *appname = 0;
         
         if ( !appname ) {
                 char dst [PATH_MAX + 1];
                 int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX );
                         
                 if ( l <= 0 ) 
                         l = 0;
                         
                 dst [l] = 0;
                 const char *b = ::strrchr ( dst, '/' );
                 appname = ::strdup ( b ? b + 1 : dst );
                 
                 ::atexit ( binaryNameFree );
                 }
         return appname;
 }
 
 
 // Fix for a toolchain incompatibility (binaries compiled with 
 // old tcs using shared libs compiled with newer tcs)
 
@@ -107,64 +107,65 @@ void QPEApplication::polish ( QWidget *w )
         }
         QApplication::polish ( w );
 }
 
 
 // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes
 // were multiplied by 10 (which was incorrect)
 
 QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset )
 {
         //qDebug ( "QFontDatabase::pointSizes()" );
 
         QValueList <int> sl = pointSizes_NonWeak ( family, style, charset );
 
         for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) {
                 if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) {
                         for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) 
                                         *it *= 10;
                 }
         }
         return sl;
 }
 
 
 // Various style/font/color related overrides for weak symbols in Qt/E,
 // which allows us to force the usage of the global Opie appearance.
 
 void QApplication::setStyle ( QStyle *style )
 {
         //qDebug ( "QApplication::setStyle()" );
 
         if ( Opie::force_appearance & Opie::Force_Style )
                 delete style;
         else
                 QApplication::setStyle_NonWeak ( style );
 }
 
 void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className )
 {
         //qDebug ( "QApplication::setPalette()" );
 
         if (!( Opie::force_appearance & Opie::Force_Style ))
                 QApplication::setPalette_NonWeak ( pal, informWidgets, className );
 }
 
 void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className )
 {
         //qDebug ( "QApplication::setFont()" );
 
         if (!( Opie::force_appearance & Opie::Force_Font ))
                 QApplication::setFont_NonWeak ( fnt, informWidgets, className );
 }
         
 
 void QApplication::qwsSetDecoration ( QWSDecoration *deco )
 {
         //qDebug ( "QApplication::qwsSetDecoration()" );
 
         if ( Opie::force_appearance & Opie::Force_Decoration )
                 delete deco;
         else
                 QApplication::qwsSetDecoration_NonWeak ( deco );
 }
 
+#endif
\ No newline at end of file
diff --git a/library/qt_override_p.h b/library/qt_override_p.h
index d11917c..cb05d15 100644
--- a/library/qt_override_p.h
+++ b/library/qt_override_p.h
@@ -1,21 +1,25 @@
 #ifndef __QT_OVERRIDE_H__
 #define __QT_OVERRIDE_H__
 
+#if QT_VERSION > 233
+
 namespace Opie {
-        
+
 enum ForceAppearance {
         Force_Style      = 0x01,
         Force_Font       = 0x02,
         Force_Decoration = 0x04,
-        
-        Force_All        = 0xff, 
+
+        Force_All        = 0xff,
         Force_None       = 0x00,
 };
 
 extern const char *binaryName ( );
 
 extern int force_appearance;
 
 }
 
+#endif // (QT_VERSION >233)
+
 #endif