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/net | |
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/net/wellenreiter/gui/configwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
@@ -369,21 +369,21 @@ void WellenreiterConfigWindow::load() | |||
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; |
@@ -424,13 +424,13 @@ void WellenreiterConfigWindow::load() | |||
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 ) ); |