author | sandman <sandman> | 2002-12-11 18:38:28 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-12-11 18:38:28 (UTC) |
commit | 073b2388a8c9bd2cc3b4f98025f5fcda424df1c6 (patch) (unidiff) | |
tree | c5ea60c7af591aa2597c27691b4ff2ee61b53b1b | |
parent | 8ca42b97de03ac84da04b9be84f9bbb8eb17b52d (diff) | |
download | opie-073b2388a8c9bd2cc3b4f98025f5fcda424df1c6.zip opie-073b2388a8c9bd2cc3b4f98025f5fcda424df1c6.tar.gz opie-073b2388a8c9bd2cc3b4f98025f5fcda424df1c6.tar.bz2 |
No need for debug output anymore ... it works now
-rw-r--r-- | library/qt_override.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/library/qt_override.cpp b/library/qt_override.cpp index 9c5ba24..02c48a0 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp | |||
@@ -89,17 +89,17 @@ extern void __gmon_start__ ( ) | |||
89 | 89 | ||
90 | 90 | ||
91 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles | 91 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles |
92 | // that set a background pixmap (it would be easier to fix eraseRect(), but | 92 | // that set a background pixmap (it would be easier to fix eraseRect(), but |
93 | // TT made it an inline ...) | 93 | // TT made it an inline ...) |
94 | 94 | ||
95 | void QPEApplication::polish ( QWidget *w ) | 95 | void QPEApplication::polish ( QWidget *w ) |
96 | { | 96 | { |
97 | qDebug ( "QPEApplication::polish()" ); | 97 | //qDebug ( "QPEApplication::polish()" ); |
98 | 98 | ||
99 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { | 99 | for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) { |
100 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && | 100 | if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) && |
101 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && | 101 | ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) && |
102 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { | 102 | ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) { |
103 | QPalette pal = w-> palette ( ); | 103 | QPalette pal = w-> palette ( ); |
104 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); | 104 | pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get )); |
105 | w-> setPalette ( pal ); | 105 | w-> setPalette ( pal ); |
@@ -109,17 +109,17 @@ void QPEApplication::polish ( QWidget *w ) | |||
109 | } | 109 | } |
110 | 110 | ||
111 | 111 | ||
112 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes | 112 | // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes |
113 | // were multiplied by 10 (which was incorrect) | 113 | // were multiplied by 10 (which was incorrect) |
114 | 114 | ||
115 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) | 115 | QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset ) |
116 | { | 116 | { |
117 | qDebug ( "QFontDatabase::pointSizes()" ); | 117 | //qDebug ( "QFontDatabase::pointSizes()" ); |
118 | 118 | ||
119 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); | 119 | QValueList <int> sl = pointSizes_NonWeak ( family, style, charset ); |
120 | 120 | ||
121 | for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { | 121 | for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) { |
122 | if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) { | 122 | if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) { |
123 | for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) | 123 | for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) |
124 | *it *= 10; | 124 | *it *= 10; |
125 | } | 125 | } |
@@ -128,43 +128,43 @@ QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString cons | |||
128 | } | 128 | } |
129 | 129 | ||
130 | 130 | ||
131 | // Various style/font/color related overrides for weak symbols in Qt/E, | 131 | // Various style/font/color related overrides for weak symbols in Qt/E, |
132 | // which allows us to force the usage of the global Opie appearance. | 132 | // which allows us to force the usage of the global Opie appearance. |
133 | 133 | ||
134 | void QApplication::setStyle ( QStyle *style ) | 134 | void QApplication::setStyle ( QStyle *style ) |
135 | { | 135 | { |
136 | qDebug ( "QApplication::setStyle()" ); | 136 | //qDebug ( "QApplication::setStyle()" ); |
137 | 137 | ||
138 | if ( Opie::force_appearance & Opie::Force_Style ) | 138 | if ( Opie::force_appearance & Opie::Force_Style ) |
139 | delete style; | 139 | delete style; |
140 | else | 140 | else |
141 | QApplication::setStyle_NonWeak ( style ); | 141 | QApplication::setStyle_NonWeak ( style ); |
142 | } | 142 | } |
143 | 143 | ||
144 | void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className ) | 144 | void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const char *className ) |
145 | { | 145 | { |
146 | qDebug ( "QApplication::setPalette()" ); | 146 | //qDebug ( "QApplication::setPalette()" ); |
147 | 147 | ||
148 | if (!( Opie::force_appearance & Opie::Force_Style )) | 148 | if (!( Opie::force_appearance & Opie::Force_Style )) |
149 | QApplication::setPalette_NonWeak ( pal, informWidgets, className ); | 149 | QApplication::setPalette_NonWeak ( pal, informWidgets, className ); |
150 | } | 150 | } |
151 | 151 | ||
152 | void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className ) | 152 | void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *className ) |
153 | { | 153 | { |
154 | qDebug ( "QApplication::setFont()" ); | 154 | //qDebug ( "QApplication::setFont()" ); |
155 | 155 | ||
156 | if (!( Opie::force_appearance & Opie::Force_Font )) | 156 | if (!( Opie::force_appearance & Opie::Force_Font )) |
157 | QApplication::setFont_NonWeak ( fnt, informWidgets, className ); | 157 | QApplication::setFont_NonWeak ( fnt, informWidgets, className ); |
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||
161 | void QApplication::qwsSetDecoration ( QWSDecoration *deco ) | 161 | void QApplication::qwsSetDecoration ( QWSDecoration *deco ) |
162 | { | 162 | { |
163 | qDebug ( "QApplication::qwsSetDecoration()" ); | 163 | //qDebug ( "QApplication::qwsSetDecoration()" ); |
164 | 164 | ||
165 | if ( Opie::force_appearance & Opie::Force_Decoration ) | 165 | if ( Opie::force_appearance & Opie::Force_Decoration ) |
166 | delete deco; | 166 | delete deco; |
167 | else | 167 | else |
168 | QApplication::qwsSetDecoration_NonWeak ( deco ); | 168 | QApplication::qwsSetDecoration_NonWeak ( deco ); |
169 | } | 169 | } |
170 | 170 | ||