author | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
commit | ac36bfe2794741188da1d6d4b471f96fd15d47ee (patch) (unidiff) | |
tree | 5c1bc264fd554142993be8963aed159f32877d6a /library/qt_override.cpp | |
parent | a979ea08e8f9dbade70a9bf4fdc93dcbebb5f3fa (diff) | |
download | opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.zip opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.gz opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.bz2 |
-Add a QPEGLOBAL that adds define for 'weak', 'used' and unused symbols
Make use of the newly added qpeglobal.h to kill custom versions of
similiar macros
-rw-r--r-- | library/qt_override.cpp | 16 |
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 | |||
@@ -10,2 +10,3 @@ | |||
10 | 10 | ||
11 | #include <qtopia/qpeglobal.h> | ||
11 | #include "qt_override_p.h" | 12 | #include "qt_override_p.h" |
@@ -87,4 +88,3 @@ extern "C" { | |||
87 | 88 | ||
88 | extern void __gmon_start__ ( ) __attribute__(( weak )); | 89 | extern void __gmon_start__ ( ) QPE_WEAK_SYMBOL; |
89 | |||
90 | extern void __gmon_start__ ( ) | 90 | extern void __gmon_start__ ( ) |
@@ -104,4 +104,2 @@ void QPEApplication::polish ( QWidget *w ) | |||
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++ ) { |
@@ -127,4 +125,2 @@ QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString cons | |||
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 ); |
@@ -146,4 +142,2 @@ void 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 ) |
@@ -156,4 +150,2 @@ void QApplication::setPalette ( const QPalette &pal, bool informWidgets, const c | |||
156 | { | 150 | { |
157 | //qDebug ( "QApplication::setPalette()" ); | ||
158 | |||
159 | if (!( Opie::force_appearance & Opie::Force_Style )) | 151 | if (!( Opie::force_appearance & Opie::Force_Style )) |
@@ -164,4 +156,2 @@ void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *c | |||
164 | { | 156 | { |
165 | //qDebug ( "QApplication::setFont()" ); | ||
166 | |||
167 | if (!( Opie::force_appearance & Opie::Force_Font )) | 157 | if (!( Opie::force_appearance & Opie::Force_Font )) |
@@ -173,4 +163,2 @@ void 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 ) |