-rw-r--r-- | noncore/apps/opie-console/TEWidget.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp | 4 | ||||
-rw-r--r-- | noncore/apps/tinykate/libkate/qt3back/qregexp3.h | 4 | ||||
-rw-r--r-- | noncore/apps/zsafe/shadedlistitem.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp index 98c1793..1199e4f 100644 --- a/noncore/apps/opie-console/TEWidget.cpp +++ b/noncore/apps/opie-console/TEWidget.cpp | |||
@@ -261,13 +261,13 @@ void TEWidget::fontChange(const QFont &) | |||
261 | //printf("font_h: %d\n",font_h); | 261 | //printf("font_h: %d\n",font_h); |
262 | //printf("font_w: %d\n",font_w); | 262 | //printf("font_w: %d\n",font_w); |
263 | //printf("font_a: %d\n",font_a); | 263 | //printf("font_a: %d\n",font_a); |
264 | //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); | 264 | //printf("charset: %s\n",QFont::encodingName(font().charSet()).ascii()); |
265 | //printf("rawname: %s\n",font().rawName().ascii()); | 265 | //printf("rawname: %s\n",font().rawName().ascii()); |
266 | fontMap = | 266 | fontMap = |
267 | #if QT_VERSION < 300 | 267 | #if QT_VERSION < 0x030000 |
268 | strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") | 268 | strcmp(QFont::encodingName(font().charSet()).ascii(),"iso10646") |
269 | ? vt100extended | 269 | ? vt100extended |
270 | : | 270 | : |
271 | #endif | 271 | #endif |
272 | identicalMap; | 272 | identicalMap; |
273 | propagateSize(); | 273 | propagateSize(); |
diff --git a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp index 78635b2..7b30b1a 100644 --- a/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp +++ b/noncore/apps/tinykate/libkate/qt3back/qregexp3.cpp | |||
@@ -31,17 +31,17 @@ | |||
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | #if QT_VERSION >=300 | 37 | #if QT_VERSION >= 0x030000 |
38 | #error QRegExp3 is now in QT 3 use QRegExp instead | 38 | #error QRegExp3 is now in QT 3 use QRegExp instead |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #if QT_VERSION < 300 | 41 | #if QT_VERSION < 0x030000 |
42 | #include "./qregexp3.h" | 42 | #include "./qregexp3.h" |
43 | #else | 43 | #else |
44 | #include "qregexp.h" | 44 | #include "qregexp.h" |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | /* OPIE */ | 47 | /* OPIE */ |
diff --git a/noncore/apps/tinykate/libkate/qt3back/qregexp3.h b/noncore/apps/tinykate/libkate/qt3back/qregexp3.h index 5b75131..fd6bc78 100644 --- a/noncore/apps/tinykate/libkate/qt3back/qregexp3.h +++ b/noncore/apps/tinykate/libkate/qt3back/qregexp3.h | |||
@@ -39,13 +39,13 @@ | |||
39 | #define QREGEXP3_H | 39 | #define QREGEXP3_H |
40 | #ifndef QT_H | 40 | #ifndef QT_H |
41 | #include "qstringlist.h" | 41 | #include "qstringlist.h" |
42 | #endif // QT_H | 42 | #endif // QT_H |
43 | 43 | ||
44 | 44 | ||
45 | #if QT_VERSION >=300 | 45 | #if QT_VERSION >= 0x030000 |
46 | #include <qregexp.h> | 46 | #include <qregexp.h> |
47 | #else | 47 | #else |
48 | class QRegExpEngine; | 48 | class QRegExpEngine; |
49 | struct QRegExpPrivate; | 49 | struct QRegExpPrivate; |
50 | 50 | ||
51 | class Q_EXPORT QRegExp3 | 51 | class Q_EXPORT QRegExp3 |
@@ -104,8 +104,8 @@ public: | |||
104 | private: | 104 | private: |
105 | void compile( bool caseSensitive ); | 105 | void compile( bool caseSensitive ); |
106 | 106 | ||
107 | QRegExpEngine *eng; | 107 | QRegExpEngine *eng; |
108 | QRegExpPrivate *priv; | 108 | QRegExpPrivate *priv; |
109 | }; | 109 | }; |
110 | #endif // QT_VERSION >= 300 | 110 | #endif // QT_VERSION >= 0x030000 |
111 | #endif // QREGEXP_H | 111 | #endif // QREGEXP_H |
diff --git a/noncore/apps/zsafe/shadedlistitem.cpp b/noncore/apps/zsafe/shadedlistitem.cpp index 72c6261..7f340f9 100644 --- a/noncore/apps/zsafe/shadedlistitem.cpp +++ b/noncore/apps/zsafe/shadedlistitem.cpp | |||
@@ -49,13 +49,13 @@ ShadedListItem::~ShadedListItem() | |||
49 | } | 49 | } |
50 | 50 | ||
51 | 51 | ||
52 | void ShadedListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) | 52 | void ShadedListItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int alignment) |
53 | { | 53 | { |
54 | QColorGroup colors(cg); | 54 | QColorGroup colors(cg); |
55 | #if QT_VERSION >=300 | 55 | #if QT_VERSION >= 0x030000 |
56 | const QColorGroup::ColorRole crole = QColorGroup::Base; | 56 | const QColorGroup::ColorRole crole = QColorGroup::Base; |
57 | // const QWidget::BackgroundMode bgmode = lv->viewport()->backgroundMode(); | 57 | // const QWidget::BackgroundMode bgmode = lv->viewport()->backgroundMode(); |
58 | // const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(bgmode); | 58 | // const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(bgmode); |
59 | #else | 59 | #else |
60 | const QColorGroup::ColorRole crole = QColorGroup::Base; | 60 | const QColorGroup::ColorRole crole = QColorGroup::Base; |
61 | #endif | 61 | #endif |