summaryrefslogtreecommitdiff
path: root/library/qt_override.cpp
Unidiff
Diffstat (limited to 'library/qt_override.cpp') (more/less context) (show whitespace changes)
-rw-r--r--library/qt_override.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/library/qt_override.cpp b/library/qt_override.cpp
index 56f82d7..a0d753b 100644
--- a/library/qt_override.cpp
+++ b/library/qt_override.cpp
@@ -8,6 +8,7 @@
8#include <limits.h> 8#include <limits.h>
9#include <sys/param.h> // for toolchains with old libc headers 9#include <sys/param.h> // for toolchains with old libc headers
10 10
11#include <qtopia/qpeglobal.h>
11#include "qt_override_p.h" 12#include "qt_override_p.h"
12 13
13#if QT_VERSION > 233 14#if QT_VERSION > 233
@@ -85,8 +86,7 @@ int Opie::force_appearance = 0;
85 86
86extern "C" { 87extern "C" {
87 88
88extern void __gmon_start__ ( ) __attribute__(( weak )); 89extern void __gmon_start__ ( ) QPE_WEAK_SYMBOL;
89
90extern void __gmon_start__ ( ) 90extern void __gmon_start__ ( )
91{ 91{
92} 92}
@@ -102,8 +102,6 @@ extern void __gmon_start__ ( )
102void QPEApplication::polish ( QWidget *w ) 102void QPEApplication::polish ( QWidget *w )
103{ 103{
104#ifndef OPIE_NO_OVERRIDE_QT 104#ifndef OPIE_NO_OVERRIDE_QT
105 //qDebug ( "QPEApplication::polish()" );
106
107 for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { 105 for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) {
108 if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && 106 if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) &&
109 ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && 107 ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) &&
@@ -125,8 +123,6 @@ void QPEApplication::polish ( QWidget *w )
125 123
126QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) 124QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset )
127{ 125{
128 //qDebug ( "QFontDatabase::pointSizes()" );
129
130 QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); 126 QValueList <int> sl = pointSizes_NonWeak ( family, style, charset );
131 127
132 for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { 128 for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) {
@@ -144,8 +140,6 @@ QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString cons
144 140
145void QApplication::setStyle ( QStyle *style ) 141void QApplication::setStyle ( QStyle *style )
146{ 142{
147 //qDebug ( "QApplication::setStyle()" );
148
149 if ( Opie::force_appearance & Opie::Force_Style ) 143 if ( Opie::force_appearance & Opie::Force_Style )
150 delete style; 144 delete style;
151 else 145 else
@@ -154,16 +148,12 @@ void QApplication::setStyle ( QStyle *style )
154 148
155void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className ) 149void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className )
156{ 150{
157 //qDebug ( "QApplication::setPalette()" );
158
159 if (!( Opie::force_appearance & Opie::Force_Style )) 151 if (!( Opie::force_appearance & Opie::Force_Style ))
160 QApplication::setPalette_NonWeak ( pal, informWidgets, className ); 152 QApplication::setPalette_NonWeak ( pal, informWidgets, className );
161} 153}
162 154
163void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className ) 155void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className )
164{ 156{
165 //qDebug ( "QApplication::setFont()" );
166
167 if (!( Opie::force_appearance & Opie::Force_Font )) 157 if (!( Opie::force_appearance & Opie::Force_Font ))
168 QApplication::setFont_NonWeak ( fnt, informWidgets, className ); 158 QApplication::setFont_NonWeak ( fnt, informWidgets, className );
169} 159}
@@ -171,8 +161,6 @@ void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *c
171 161
172void QApplication::qwsSetDecoration ( QWSDecoration *deco ) 162void QApplication::qwsSetDecoration ( QWSDecoration *deco )
173{ 163{
174 //qDebug ( "QApplication::qwsSetDecoration()" );
175
176 if ( Opie::force_appearance & Opie::Force_Decoration ) 164 if ( Opie::force_appearance & Opie::Force_Decoration )
177 delete deco; 165 delete deco;
178 else 166 else