author | ar <ar> | 2005-01-21 19:56:15 (UTC) |
---|---|---|
committer | ar <ar> | 2005-01-21 19:56:15 (UTC) |
commit | cd51d382be50bc021739395309e23760f1619759 (patch) (unidiff) | |
tree | e76155f772df7faea5fcf38667c6da8c916208db /noncore | |
parent | fdc37fbd908472e28735a8f0b01e3e66a43535e0 (diff) | |
download | opie-cd51d382be50bc021739395309e23760f1619759.zip opie-cd51d382be50bc021739395309e23760f1619759.tar.gz opie-cd51d382be50bc021739395309e23760f1619759.tar.bz2 |
- make opie compilable against qte 2.3.10 snapshot
check QT_VERSION against 0x030000 instead of 300
-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 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/appearance2/appearance.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/doctab/doctab.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/language/language.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/interfaces/module.h | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindow/addconnectionimp.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/mainwindow/mainwindowimp.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/QOutputDev.cpp | 2 |
12 files changed, 17 insertions, 17 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 | |||
@@ -255,25 +255,25 @@ static QChar identicalMap(QChar c) | |||
255 | void TEWidget::fontChange(const QFont &) | 255 | void TEWidget::fontChange(const QFont &) |
256 | { | 256 | { |
257 | QFontMetrics fm(font()); | 257 | QFontMetrics fm(font()); |
258 | font_h = fm.height(); | 258 | font_h = fm.height(); |
259 | font_w = fm.maxWidth(); | 259 | font_w = fm.maxWidth(); |
260 | font_a = fm.ascent(); | 260 | font_a = fm.ascent(); |
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(); |
274 | update(); | 274 | update(); |
275 | } | 275 | } |
276 | 276 | ||
277 | void TEWidget::setVTFont(const QFont& f) | 277 | void TEWidget::setVTFont(const QFont& f) |
278 | { | 278 | { |
279 | QFrame::setFont(f); | 279 | QFrame::setFont(f); |
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 | |||
@@ -25,29 +25,29 @@ | |||
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
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 */ |
48 | #include <opie2/odebug.h> | 48 | #include <opie2/odebug.h> |
49 | 49 | ||
50 | /* QT */ | 50 | /* QT */ |
51 | #include <qarray.h> | 51 | #include <qarray.h> |
52 | #include <qbitarray.h> | 52 | #include <qbitarray.h> |
53 | #include <qcache.h> | 53 | #include <qcache.h> |
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 | |||
@@ -33,25 +33,25 @@ | |||
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 | 37 | ||
38 | #ifndef QREGEXP3_H | 38 | #ifndef QREGEXP3_H |
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 |
52 | { | 52 | { |
53 | public: | 53 | public: |
54 | QRegExp3(); | 54 | QRegExp3(); |
55 | QRegExp3( const QString& pattern, bool caseSensitive = TRUE, | 55 | QRegExp3( const QString& pattern, bool caseSensitive = TRUE, |
56 | bool wildcard = FALSE ); | 56 | bool wildcard = FALSE ); |
57 | QRegExp3( const QRegExp3& rx ); | 57 | QRegExp3( const QRegExp3& rx ); |
@@ -98,14 +98,14 @@ public: | |||
98 | #ifndef QT_NO_REGEXP_CAPTURE | 98 | #ifndef QT_NO_REGEXP_CAPTURE |
99 | QStringList capturedTexts(); | 99 | QStringList capturedTexts(); |
100 | QString cap( int nth = 0 ); | 100 | QString cap( int nth = 0 ); |
101 | int pos( int nth = 0 ); | 101 | int pos( int nth = 0 ); |
102 | #endif | 102 | #endif |
103 | 103 | ||
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 | |||
@@ -43,25 +43,25 @@ ShadedListItem::ShadedListItem(int index, QListView *parent, QListViewItem *afte | |||
43 | oddRow = (index % 2 != 0); | 43 | oddRow = (index % 2 != 0); |
44 | } | 44 | } |
45 | 45 | ||
46 | ShadedListItem::~ShadedListItem() | 46 | ShadedListItem::~ShadedListItem() |
47 | { | 47 | { |
48 | 48 | ||
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 |
62 | if (oddRow) { | 62 | if (oddRow) { |
63 | colors.setColor(crole, *ZSafe::oddRowColor); | 63 | colors.setColor(crole, *ZSafe::oddRowColor); |
64 | } | 64 | } |
65 | else { | 65 | else { |
66 | colors.setColor(crole, *ZSafe::evenRowColor); | 66 | colors.setColor(crole, *ZSafe::evenRowColor); |
67 | } | 67 | } |
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 1670f93..9ec5af9 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -363,33 +363,33 @@ void WellenreiterConfigWindow::load() | |||
363 | #else | 363 | #else |
364 | odebug << "loading configuration settings..." << oendl; | 364 | odebug << "loading configuration settings..." << oendl; |
365 | 365 | ||
366 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ | 366 | /* This is dumb monkey typing stuff... We _need_ to do this automatically! */ |
367 | 367 | ||
368 | OConfig* c = oApp->config(); | 368 | OConfig* c = oApp->config(); |
369 | 369 | ||
370 | c->setGroup( "Interface" ); | 370 | c->setGroup( "Interface" ); |
371 | 371 | ||
372 | QString interface = c->readEntry( "name", "<none>" ); | 372 | QString interface = c->readEntry( "name", "<none>" ); |
373 | if ( interface != "<none>" ) | 373 | if ( interface != "<none>" ) |
374 | { | 374 | { |
375 | #if QT_VERSION < 300 | 375 | #if QT_VERSION < 0x030000 |
376 | interfaceName->insertItem( interface, 0 ); | 376 | interfaceName->insertItem( interface, 0 ); |
377 | interfaceName->setCurrentItem( 0 ); | 377 | interfaceName->setCurrentItem( 0 ); |
378 | #else | 378 | #else |
379 | interfaceName->setCurrentText( interface ); | 379 | interfaceName->setCurrentText( interface ); |
380 | #endif | 380 | #endif |
381 | 381 | ||
382 | QString device = c->readEntry( "type", "<select>" ); | 382 | QString device = c->readEntry( "type", "<select>" ); |
383 | #if QT_VERSION < 300 | 383 | #if QT_VERSION < 0x030000 |
384 | for ( int i = 0; i < deviceType->count(); ++i ) | 384 | for ( int i = 0; i < deviceType->count(); ++i ) |
385 | { | 385 | { |
386 | if ( deviceType->text( i ) == device ) | 386 | if ( deviceType->text( i ) == device ) |
387 | { | 387 | { |
388 | deviceType->setCurrentItem( i ); | 388 | deviceType->setCurrentItem( i ); |
389 | break; | 389 | break; |
390 | } | 390 | } |
391 | } | 391 | } |
392 | #else | 392 | #else |
393 | deviceType->setCurrentText( device ); | 393 | deviceType->setCurrentText( device ); |
394 | #endif | 394 | #endif |
395 | } | 395 | } |
@@ -418,25 +418,25 @@ void WellenreiterConfigWindow::load() | |||
418 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); | 418 | openTree->setChecked( c->readBoolEntry( "openTree", true ) ); |
419 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); | 419 | disablePM->setChecked( c->readBoolEntry( "disablePM", true ) ); |
420 | newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm | 420 | newNetworkAction->setCurrentItem( c->readNumEntry( "newNetworkAction", 1 ) ); // Default: Play Alarm |
421 | newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); | 421 | newNetworkScript->setText( c->readEntry( "newNetworkScript", "" ) ); |
422 | newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click | 422 | newClientAction->setCurrentItem( c->readNumEntry( "newClientAction", 2 ) ); // Default: Play Click |
423 | newClientScript->setText( c->readEntry( "newClientScript", "" ) ); | 423 | newClientScript->setText( c->readEntry( "newClientScript", "" ) ); |
424 | newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click | 424 | newStationAction->setCurrentItem( c->readNumEntry( "newStationAction", 2 ) ); // Default: Play Click |
425 | newStationScript->setText( c->readEntry( "newStationScript", "" ) ); | 425 | newStationScript->setText( c->readEntry( "newStationScript", "" ) ); |
426 | synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand | 426 | synchronizeActionsAndScripts(); // needed for showing/hiding the script QLineEdit on demand |
427 | 427 | ||
428 | c->setGroup( "GPS" ); | 428 | c->setGroup( "GPS" ); |
429 | enableGPS->setChecked( c->readBoolEntry( "use", false ) ); | 429 | enableGPS->setChecked( c->readBoolEntry( "use", false ) ); |
430 | #if QT_VERSION < 300 | 430 | #if QT_VERSION < 0x030000 |
431 | gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); | 431 | gpsdHost->insertItem( c->readEntry( "host", "localhost" ), 0 ); |
432 | gpsdHost->setCurrentItem( 0 ); | 432 | gpsdHost->setCurrentItem( 0 ); |
433 | #else | 433 | #else |
434 | gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) ); | 434 | gpsdHost->setCurrentText( c->readEntry( "host", "localhost" ) ); |
435 | #endif | 435 | #endif |
436 | gpsdPort->setValue( c->readNumEntry( "port", 2947 ) ); | 436 | gpsdPort->setValue( c->readNumEntry( "port", 2947 ) ); |
437 | startGPS->setChecked( c->readBoolEntry( "start", false ) ); | 437 | startGPS->setChecked( c->readBoolEntry( "start", false ) ); |
438 | commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) ); | 438 | commandGPS->setText( c->readEntry( "command", "gpsd -p /dev/ttyS3 -s 57600" ) ); |
439 | 439 | ||
440 | #endif | 440 | #endif |
441 | } | 441 | } |
442 | 442 | ||
diff --git a/noncore/settings/appearance2/appearance.cpp b/noncore/settings/appearance2/appearance.cpp index 9638686..088171c 100644 --- a/noncore/settings/appearance2/appearance.cpp +++ b/noncore/settings/appearance2/appearance.cpp | |||
@@ -54,25 +54,25 @@ | |||
54 | #include <qbuttongroup.h> | 54 | #include <qbuttongroup.h> |
55 | #include <qcheckbox.h> | 55 | #include <qcheckbox.h> |
56 | #include <qcombobox.h> | 56 | #include <qcombobox.h> |
57 | #include <qdialog.h> | 57 | #include <qdialog.h> |
58 | #include <qdir.h> | 58 | #include <qdir.h> |
59 | #include <qlabel.h> | 59 | #include <qlabel.h> |
60 | #include <qlayout.h> | 60 | #include <qlayout.h> |
61 | #include <qlineedit.h> | 61 | #include <qlineedit.h> |
62 | #include <qlistbox.h> | 62 | #include <qlistbox.h> |
63 | #include <qmessagebox.h> | 63 | #include <qmessagebox.h> |
64 | #include <qpushbutton.h> | 64 | #include <qpushbutton.h> |
65 | #include <qradiobutton.h> | 65 | #include <qradiobutton.h> |
66 | #if QT_VERSION >= 300 | 66 | #if QT_VERSION >= 0x030000 |
67 | #include <qstylefactory.h> | 67 | #include <qstylefactory.h> |
68 | #endif | 68 | #endif |
69 | #include <qtoolbutton.h> | 69 | #include <qtoolbutton.h> |
70 | #include <qwindowsstyle.h> | 70 | #include <qwindowsstyle.h> |
71 | #include <qlistview.h> | 71 | #include <qlistview.h> |
72 | #include <qheader.h> | 72 | #include <qheader.h> |
73 | #include <qvbox.h> | 73 | #include <qvbox.h> |
74 | #include <qwhatsthis.h> | 74 | #include <qwhatsthis.h> |
75 | 75 | ||
76 | using namespace Opie; | 76 | using namespace Opie; |
77 | using namespace Opie::Ui; | 77 | using namespace Opie::Ui; |
78 | using namespace Opie::Core; | 78 | using namespace Opie::Core; |
@@ -121,25 +121,25 @@ QWidget *Appearance::createStyleTab ( QWidget *parent, Config &cfg ) | |||
121 | m_style_list = new QListBox( tab, "m_style_list" ); | 121 | m_style_list = new QListBox( tab, "m_style_list" ); |
122 | vertLayout->addWidget( m_style_list ); | 122 | vertLayout->addWidget( m_style_list ); |
123 | QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) ); | 123 | QWhatsThis::add( m_style_list, tr( "Styles control the way items such as buttons and scroll bars appear in all applications.\n\nClick here to select an available style." ) ); |
124 | 124 | ||
125 | m_style_settings = new QPushButton ( tr( "Settings..." ), tab ); | 125 | m_style_settings = new QPushButton ( tr( "Settings..." ), tab ); |
126 | connect ( m_style_settings, SIGNAL( clicked()), this, SLOT( styleSettingsClicked())); | 126 | connect ( m_style_settings, SIGNAL( clicked()), this, SLOT( styleSettingsClicked())); |
127 | vertLayout-> addWidget ( m_style_settings ); | 127 | vertLayout-> addWidget ( m_style_settings ); |
128 | QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote: This option is not available for all styles." ) ); | 128 | QWhatsThis::add( m_style_settings, tr( "Click here to configure the currently selected style.\n\nNote: This option is not available for all styles." ) ); |
129 | 129 | ||
130 | QString s = cfg. readEntry ( "Style", "Light" ); | 130 | QString s = cfg. readEntry ( "Style", "Light" ); |
131 | 131 | ||
132 | 132 | ||
133 | #if QT_VERSION >= 300 | 133 | #if QT_VERSION >= 0x030000 |
134 | m_style_list->insertStringList(QStyleFactory::styles()); | 134 | m_style_list->insertStringList(QStyleFactory::styles()); |
135 | #else | 135 | #else |
136 | m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( ))); | 136 | m_style_list-> insertItem ( new StyleListItem ( "Windows", new QWindowsStyle ( ))); |
137 | m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( ))); | 137 | m_style_list-> insertItem ( new StyleListItem ( "Light", new LightStyle ( ))); |
138 | m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( ))); | 138 | m_style_list-> insertItem ( new StyleListItem ( "QPE", new QPEStyle ( ))); |
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | { | 141 | { |
142 | QString path = QPEApplication::qpeDir ( ); | 142 | QString path = QPEApplication::qpeDir ( ); |
143 | path.append( "/plugins/styles/" ); | 143 | path.append( "/plugins/styles/" ); |
144 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); | 144 | QStringList sl = QDir ( path, "lib*.so" ). entryList ( ); |
145 | 145 | ||
diff --git a/noncore/settings/doctab/doctab.cpp b/noncore/settings/doctab/doctab.cpp index feaf538..72eda6b 100644 --- a/noncore/settings/doctab/doctab.cpp +++ b/noncore/settings/doctab/doctab.cpp | |||
@@ -34,25 +34,25 @@ | |||
34 | #include <qcheckbox.h> | 34 | #include <qcheckbox.h> |
35 | #include <qradiobutton.h> | 35 | #include <qradiobutton.h> |
36 | #include <qtabwidget.h> | 36 | #include <qtabwidget.h> |
37 | #include <qslider.h> | 37 | #include <qslider.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
40 | #include <qdatastream.h> | 40 | #include <qdatastream.h> |
41 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
42 | #include <qcombobox.h> | 42 | #include <qcombobox.h> |
43 | #include <qspinbox.h> | 43 | #include <qspinbox.h> |
44 | #include <qlistbox.h> | 44 | #include <qlistbox.h> |
45 | #include <qdir.h> | 45 | #include <qdir.h> |
46 | #if QT_VERSION >= 300 | 46 | #if QT_VERSION >= 0x030000 |
47 | #include <qstylefactory.h> | 47 | #include <qstylefactory.h> |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #include <stdlib.h> | 50 | #include <stdlib.h> |
51 | 51 | ||
52 | 52 | ||
53 | DocTabSettings::DocTabSettings( QWidget* parent, const char* name, WFlags fl ) | 53 | DocTabSettings::DocTabSettings( QWidget* parent, const char* name, WFlags fl ) |
54 | : DocTabSettingsBase( parent, name, TRUE, fl ) | 54 | : DocTabSettingsBase( parent, name, TRUE, fl ) |
55 | { | 55 | { |
56 | dl = new QPEDialogListener(this); | 56 | dl = new QPEDialogListener(this); |
57 | reset(); | 57 | reset(); |
58 | } | 58 | } |
diff --git a/noncore/settings/language/language.cpp b/noncore/settings/language/language.cpp index 14750ac..bf90576 100644 --- a/noncore/settings/language/language.cpp +++ b/noncore/settings/language/language.cpp | |||
@@ -34,25 +34,25 @@ | |||
34 | #include <qcheckbox.h> | 34 | #include <qcheckbox.h> |
35 | #include <qradiobutton.h> | 35 | #include <qradiobutton.h> |
36 | #include <qtabwidget.h> | 36 | #include <qtabwidget.h> |
37 | #include <qslider.h> | 37 | #include <qslider.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
40 | #include <qdatastream.h> | 40 | #include <qdatastream.h> |
41 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
42 | #include <qcombobox.h> | 42 | #include <qcombobox.h> |
43 | #include <qspinbox.h> | 43 | #include <qspinbox.h> |
44 | #include <qlistbox.h> | 44 | #include <qlistbox.h> |
45 | #include <qdir.h> | 45 | #include <qdir.h> |
46 | #if QT_VERSION >= 300 | 46 | #if QT_VERSION >= 0x030000 |
47 | #include <qstylefactory.h> | 47 | #include <qstylefactory.h> |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #include <stdlib.h> | 50 | #include <stdlib.h> |
51 | 51 | ||
52 | 52 | ||
53 | LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) | 53 | LanguageSettings::LanguageSettings( QWidget* parent, const char* name, WFlags fl ) |
54 | : LanguageSettingsBase( parent, name, TRUE, fl ) | 54 | : LanguageSettingsBase( parent, name, TRUE, fl ) |
55 | { | 55 | { |
56 | if ( FontManager::hasUnicodeFont() ) | 56 | if ( FontManager::hasUnicodeFont() ) |
57 | languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); | 57 | languages->setFont(FontManager::unicodeFont(FontManager::Proportional)); |
58 | 58 | ||
diff --git a/noncore/settings/networksettings/interfaces/module.h b/noncore/settings/networksettings/interfaces/module.h index 9dc913e..13189c3 100644 --- a/noncore/settings/networksettings/interfaces/module.h +++ b/noncore/settings/networksettings/interfaces/module.h | |||
@@ -1,17 +1,17 @@ | |||
1 | #ifndef NETCONF_MODULE_H | 1 | #ifndef NETCONF_MODULE_H |
2 | #define NETCONF_MODULE_H | 2 | #define NETCONF_MODULE_H |
3 | 3 | ||
4 | #include <qobject.h> | 4 | #include <qobject.h> |
5 | #if QT_VERSION < 300 | 5 | #if QT_VERSION < 0x030000 |
6 | #include <qlist.h> | 6 | #include <qlist.h> |
7 | #else | 7 | #else |
8 | #include <qptrlist.h> | 8 | #include <qptrlist.h> |
9 | #endif | 9 | #endif |
10 | #include <qmap.h> | 10 | #include <qmap.h> |
11 | #include "interface.h" | 11 | #include "interface.h" |
12 | 12 | ||
13 | class QWidget; | 13 | class QWidget; |
14 | class QTabWidget; | 14 | class QTabWidget; |
15 | 15 | ||
16 | 16 | ||
17 | /** | 17 | /** |
diff --git a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp index 84f1cf6..9049af4 100644 --- a/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp +++ b/noncore/settings/networksettings/mainwindow/addconnectionimp.cpp | |||
@@ -1,15 +1,15 @@ | |||
1 | #include "addconnectionimp.h" | 1 | #include "addconnectionimp.h" |
2 | #include <qlistview.h> | 2 | #include <qlistview.h> |
3 | #if QT_VERSION < 300 | 3 | #if QT_VERSION < 0x030000 |
4 | #include <qlist.h> | 4 | #include <qlist.h> |
5 | #else | 5 | #else |
6 | #include <qptrlist.h> | 6 | #include <qptrlist.h> |
7 | #endif | 7 | #endif |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | #include <qheader.h> | 9 | #include <qheader.h> |
10 | 10 | ||
11 | /** | 11 | /** |
12 | * Constructor | 12 | * Constructor |
13 | */ | 13 | */ |
14 | AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f):AddConnection(parent, name, f){ | 14 | AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f):AddConnection(parent, name, f){ |
15 | connect(registeredServicesList, SIGNAL(selectionChanged()), this, SLOT(changed())); | 15 | connect(registeredServicesList, SIGNAL(selectionChanged()), this, SLOT(changed())); |
diff --git a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp index 5f23aea..8feb7a5 100644 --- a/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindow/mainwindowimp.cpp | |||
@@ -16,25 +16,25 @@ | |||
16 | 16 | ||
17 | /* QT */ | 17 | /* QT */ |
18 | #include <qpushbutton.h> | 18 | #include <qpushbutton.h> |
19 | #include <qlistbox.h> | 19 | #include <qlistbox.h> |
20 | #include <qlineedit.h> | 20 | #include <qlineedit.h> |
21 | #include <qlistview.h> | 21 | #include <qlistview.h> |
22 | #include <qheader.h> | 22 | #include <qheader.h> |
23 | #include <qlabel.h> | 23 | #include <qlabel.h> |
24 | #include <qtabwidget.h> // in order to disable the profiles tab | 24 | #include <qtabwidget.h> // in order to disable the profiles tab |
25 | #include <qmessagebox.h> | 25 | #include <qmessagebox.h> |
26 | 26 | ||
27 | 27 | ||
28 | #if QT_VERSION < 300 | 28 | #if QT_VERSION < 0x030000 |
29 | #include <qlist.h> | 29 | #include <qlist.h> |
30 | #else | 30 | #else |
31 | #include <qptrlist.h> | 31 | #include <qptrlist.h> |
32 | #endif | 32 | #endif |
33 | #include <qdir.h> | 33 | #include <qdir.h> |
34 | #include <qfile.h> | 34 | #include <qfile.h> |
35 | #include <qtextstream.h> | 35 | #include <qtextstream.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | 37 | ||
38 | /* STD */ | 38 | /* STD */ |
39 | #include <net/if.h> | 39 | #include <net/if.h> |
40 | #include <sys/ioctl.h> | 40 | #include <sys/ioctl.h> |
diff --git a/noncore/unsupported/qpdf/QOutputDev.cpp b/noncore/unsupported/qpdf/QOutputDev.cpp index 022d938..487177c 100644 --- a/noncore/unsupported/qpdf/QOutputDev.cpp +++ b/noncore/unsupported/qpdf/QOutputDev.cpp | |||
@@ -585,25 +585,25 @@ int QOutputDev::convertSubpath ( GfxState *state, GfxSubpath *subpath, QPointArr | |||
585 | 585 | ||
586 | while ( i < m ) { | 586 | while ( i < m ) { |
587 | if ( i >= 1 && subpath-> getCurve ( i )) { | 587 | if ( i >= 1 && subpath-> getCurve ( i )) { |
588 | state-> transform ( subpath-> getX ( i - 1 ), subpath-> getY ( i - 1 ), &x0, &y0 ); | 588 | state-> transform ( subpath-> getX ( i - 1 ), subpath-> getY ( i - 1 ), &x0, &y0 ); |
589 | state-> transform ( subpath-> getX ( i ), subpath-> getY ( i ), &x1, &y1 ); | 589 | state-> transform ( subpath-> getX ( i ), subpath-> getY ( i ), &x1, &y1 ); |
590 | state-> transform ( subpath-> getX ( i + 1 ), subpath-> getY ( i + 1 ), &x2, &y2 ); | 590 | state-> transform ( subpath-> getX ( i + 1 ), subpath-> getY ( i + 1 ), &x2, &y2 ); |
591 | state-> transform ( subpath-> getX ( i + 2 ), subpath-> getY ( i + 2 ), &x3, &y3 ); | 591 | state-> transform ( subpath-> getX ( i + 2 ), subpath-> getY ( i + 2 ), &x3, &y3 ); |
592 | 592 | ||
593 | QPointArray tmp; | 593 | QPointArray tmp; |
594 | tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ), | 594 | tmp. setPoints ( 4, lrint ( x0 ), lrint ( y0 ), lrint ( x1 ), lrint ( y1 ), |
595 | lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 )); | 595 | lrint ( x2 ), lrint ( y2 ), lrint ( x3 ), lrint ( y3 )); |
596 | 596 | ||
597 | #if QT_VERSION < 300 | 597 | #if QT_VERSION < 0x030000 |
598 | tmp = tmp. quadBezier ( ); | 598 | tmp = tmp. quadBezier ( ); |
599 | 599 | ||
600 | for ( uint loop = 0; loop < tmp. count ( ); loop++ ) { | 600 | for ( uint loop = 0; loop < tmp. count ( ); loop++ ) { |
601 | QPoint p = tmp. point ( loop ); | 601 | QPoint p = tmp. point ( loop ); |
602 | points. putPoints ( points. count ( ), 1, p. x ( ), p. y ( )); | 602 | points. putPoints ( points. count ( ), 1, p. x ( ), p. y ( )); |
603 | } | 603 | } |
604 | #else | 604 | #else |
605 | tmp = tmp. cubicBezier ( ); | 605 | tmp = tmp. cubicBezier ( ); |
606 | points. putPoints ( points. count ( ), tmp. count ( ), tmp ); | 606 | points. putPoints ( points. count ( ), tmp. count ( ), tmp ); |
607 | #endif | 607 | #endif |
608 | 608 | ||
609 | i += 3; | 609 | i += 3; |