1 files changed, 14 insertions, 26 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 7cbda92..4c93111 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -88,2 +88,4 @@
 
+#include "qt_override_p.h"
+
 
@@ -901,4 +903,2 @@ void QPEApplication::setDefaultRotation( int r )
 
-// exported to libpreload.so
-int opie_block_style = 0;
 
@@ -913,21 +913,5 @@ void QPEApplication::applyStyle()
         // don't block ourselves ...
-        opie_block_style = 0;
-        
-        
-        static QString appname;
-        
-        if ( appname. isNull ( )) {
-                char src [32];
-                char dst [PATH_MAX + 1];
-                ::sprintf ( src, "/proc/%d/exe", ::getpid ( ));
-                int l = ::readlink ( src, dst, PATH_MAX );
-                if ( l > 0 ) {
-                        dst [l] = 0;
-                        const char *b = ::strrchr ( dst, '/' );
-                        appname = ( b ? b + 1 : dst );
-                }
-                else
-                        appname = "";
-        }
-        
+        Opie::force_appearance = 0;
+                
+        static QString appname = Opie::binaryName ( );
         
@@ -946,3 +930,3 @@ void QPEApplication::applyStyle()
         // don't set a custom style
-        if ( nostyle & 0x01 )
+        if ( nostyle & Opie::Force_Style )
                 style = "Light";
@@ -975,3 +959,3 @@ void QPEApplication::applyStyle()
         // don't set a custom deco
-        if ( nostyle & 0x04 )
+        if ( nostyle & Opie::Force_Decoration )
                 dec = "";
@@ -990,3 +974,3 @@ void QPEApplication::applyStyle()
                 // don't set a custom font
-        if ( nostyle & 0x02 ) {
+        if ( nostyle & Opie::Force_Font ) {
                 ff = "Helvetica";
@@ -998,4 +982,4 @@ void QPEApplication::applyStyle()
         // revert to global blocking policy ...
-        opie_block_style = config. readBoolEntry ( "ForceStyle", false ) ? 0xff : 0x00;
-        opie_block_style -= nostyle;
+        Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
+        Opie::force_appearance &= ~nostyle;
 }
@@ -1695,2 +1679,6 @@ void QPEApplication::hideOrQuit()
 
+
+// These 6 stubs below need 1.5K in the binary and besides that -
+// we are not using ancient toolchains anymore     - sandman
+
 #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SHARP)