ich@opiezilla:~/programming/opie/head/opie$ nm lib/libopiecore2.so | grep polish

         U _ZN14QPEApplication6polishEP7QWidget


	 ich@opiezilla:~/programming/opie/head/opie$ nm lib/libopiecore2.so | grep polish
	          U _ZN12QApplication6polishEP7QWidget


        in qt_override we had to overwrite the Palette for some widgets for some styles (setting no
        background liquid and such) we overwrote the polish method.
        As we did not inherit from QPEApplication the 'polish' symbol was only internal to
        libqpe and this way Opie apps worked on Opies and Sharps libqpe, and Sharp apps work
        on our libqpe. Now with libopiecore the compiler tries to include different symbols as shown above.
        So for now we could disable the legacy palette polishing which shouldn't hurt anyway.
        OApplication is the source of all evil, we wouldn't 'pull' in the polish symbol... but having
	a 'shadow' weak symbol as backup isn't good as well.


	Chicken you may enable the option in config.in...

2 files changed, 11 insertions, 2 deletions

diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 8c85ad0..d2782e4 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -1,268 +1,270 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __QPE_APPLICATION_H__
 #define __QPE_APPLICATION_H__
 
 #include <stdlib.h> // for setenv()
 
 #include <qglobal.h>
 #include <qapplication.h>
 #include <qdialog.h>
 #include <qwsdisplay_qws.h>
 #if defined(_WS_QWS_) && !defined(Q_WS_QWS)
 #define Q_WS_QWS
 #endif
 #include "qpedecoration_qws.h"
 #include "timestring.h"
 
 class QCopChannel;
 class QPEApplicationData;
 class QWSEvent;
 class QWSKeyEvent;
 
 /**
   \brief The QPEApplication class implements various system services
     that are available to all Qtopia applications.
 
   Simply by using QPEApplication instead of QApplication, a standard Qt
   application becomes a Qtopia application. It automatically follows
   style changes, quits and raises, and in the
   case of \link docwidget.html document-oriented\endlink applications,
   changes the currently displayed document in response to the environment.
 
   To create a \link docwidget.html document-oriented\endlink
   application use showMainDocumentWidget(); to create a
   non-document-oriented application use showMainWidget(). The
   keepRunning() function indicates whether the application will
   continue running after it's processed the last \link qcop.html
   QCop\endlink message. This can be changed using setKeepRunning().
 
   A variety of signals are emitted when certain events occur, for
   example, timeChanged(), clockChanged(), weekChanged(),
   dateFormatChanged() and volumeChanged(). If the application receives
   a \link qcop.html QCop\endlink message on the application's
   QPE/Application/\e{appname} channel, the appMessage() signal is
   emitted. There are also flush() and reload() signals, which
   are emitted when synching begins and ends respectively - upon these
   signals, the application should save and reload any data
   files that are involved in synching. Most of these signals will initially
   be received and unfiltered through the appMessage() signal.
 
   This class also provides a set of useful static functions. The
   qpeDir() and documentDir() functions return the respective paths.
   The grabKeyboard() and ungrabKeyboard() functions are used to
   control whether the application takes control of the device's
   physical buttons (e.g. application launch keys). The stylus' mode of
   operation is set with setStylusOperation() and retrieved with
   stylusOperation(). There are also setInputMethodHint() and
   inputMethodHint() functions.
 
   \ingroup qtopiaemb
 */
 class QPEApplication : public QApplication
 {
     Q_OBJECT
 public:
     QPEApplication( int& argc, char **argv, Type=GuiClient );
     ~QPEApplication();
 
     static QString qpeDir();
     static QString documentDir();
     void applyStyle();
     void reset();
     static int defaultRotation();
     static void setDefaultRotation(int r);
     static void setCurrentRotation(int r);
     static void setCurrentMode(int x, int y, int depth );
     static void grabKeyboard();
     static void ungrabKeyboard();
 
     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 showWidget( QWidget*, bool nomax=FALSE );
     /* Merge setTempScreenSaverMode */
 #ifdef QTOPIA_INTERNAL_INITAPP
     void initApp( int argv, char **argv );
 #endif
 
     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();
     /* linkChanged signal */
 
 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
+#ifndef OPIE_NO_ERASE_RECT_HACKFIX
+    #if QT_VERSION > 233
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
+    #endif
 #endif
 private:
 #ifndef QT_NO_TRANSLATION
     void installTranslation( const QString& baseName );
 #endif
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
     void processQCopFile();
 
 #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 )
 {
     showWidget( d, nomax );
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog( d, nomax );
     return d->exec();
 }
 
 #ifdef Q_WS_QWS
 extern Q_EXPORT QRect qt_maxWindowRect;
 #endif
 
 inline void QPEApplication::showWidget( QWidget* wg, bool nomax )
 {
     if ( wg->isVisible() )
         wg->show();
     else
     {
         if ( !nomax
                 && ( qApp->desktop()->width() <= 320 ) )
         {
             wg->showMaximized();
         } else {
             #ifdef Q_WS_QWS
                 QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
             #else
                 QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
             #endif
 
             QSize sh = wg->sizeHint();
             int w = QMAX( sh.width(), wg->width() );
             int h = QMAX( sh.height(), wg->height() );
             //              desktop                              widget-frame                      taskbar
             w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
             h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
 
             wg->resize( w, h );
             wg->show();
         }
     }
 }
 
 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 4d1f475..56f82d7 100644
--- a/library/qt_override.cpp
+++ b/library/qt_override.cpp
@@ -1,175 +1,182 @@
 
 #include <qpe/qpeapplication.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
 
+#ifndef OPIE_NO_ERASE_RECT_HACKFIX
 struct color_fix_t {
         char *m_app;
         char *m_class;
         char *m_name;
         QColorGroup::ColorRole m_set;
         QColorGroup::ColorRole m_get;
 };
 
-#ifndef OPIE_NO_OVERRIDE_QT
+
 
 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 }
 };
 
+#endif
+
+#ifndef OPIE_NO_OVERRIDE_QT
+
 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;
 }
 
 #else
 int Opie::force_appearance = 0;
 #endif
 
 // Fix for a toolchain incompatibility (binaries compiled with
 // old tcs using shared libs compiled with newer tcs)
 
 extern "C" {
 
 extern void __gmon_start__ ( ) __attribute__(( weak ));
 
 extern void __gmon_start__ ( )
 {
 }
 
 }
 
 
+#ifndef OPIE_NO_ERASE_RECT_HACKFIX
 // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles
 // that set a background pixmap (it would be easier to fix eraseRect(), but
 // TT made it an inline ...)
 
 void QPEApplication::polish ( QWidget *w )
 {
 #ifndef OPIE_NO_OVERRIDE_QT
         //qDebug ( "QPEApplication::polish()" );
 
         for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) {
                 if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) &&
                     ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) &&
                     ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) {
                         QPalette pal = w-> palette ( );
                         pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get ));
                         w-> setPalette ( pal );
                 }
         }
 #endif
         QApplication::polish ( w );
 }
+#endif
 
 
 #ifndef OPIE_NO_OVERRIDE_QT
 // 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
 #endif