author | mickeyl <mickeyl> | 2003-06-26 10:34:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-06-26 10:34:59 (UTC) |
commit | 8168239a5b1ff80abc02f93ed831c088ca5f2f3d (patch) (unidiff) | |
tree | d19069b730eeb82f02754955366569d52d088248 | |
parent | 3c5746daa26d8353fde9ba84c6183517e26a625a (diff) | |
download | opie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.zip opie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.tar.gz opie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.tar.bz2 |
first bunch of fixes for Qt 3.x compilation
-rw-r--r-- | libopie2/opieui/olistview.h | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/configwindow.cpp | 2 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 1 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 9 |
4 files changed, 12 insertions, 2 deletions
diff --git a/libopie2/opieui/olistview.h b/libopie2/opieui/olistview.h index 1bbdd5b..109e309 100644 --- a/libopie2/opieui/olistview.h +++ b/libopie2/opieui/olistview.h | |||
@@ -37,2 +37,3 @@ | |||
37 | #include <qdatastream.h> | 37 | #include <qdatastream.h> |
38 | #include <qstringlist.h> | ||
38 | 39 | ||
@@ -40,2 +41,3 @@ class OListViewItem; | |||
40 | 41 | ||
42 | |||
41 | /*====================================================================================== | 43 | /*====================================================================================== |
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 5bec7ed..11394d7 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -83,3 +83,3 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char | |||
83 | okButton->show(); | 83 | okButton->show(); |
84 | Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui | 84 | WellenreiterConfigBaseLayout->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui |
85 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); | 85 | connect( okButton, SIGNAL( clicked() ), this, SLOT( accept() ) ); |
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 085eec4..f4cfe52 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -20,2 +20,3 @@ | |||
20 | #include <assert.h> | 20 | #include <assert.h> |
21 | #include <qcursor.h> | ||
21 | #include <qdatetime.h> | 22 | #include <qdatetime.h> |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index dcf796f..96733ff 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -476,2 +476,3 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa | |||
476 | { | 476 | { |
477 | #ifdef QWS | ||
477 | if ( action == "TouchSound" ) | 478 | if ( action == "TouchSound" ) |
@@ -491,2 +492,5 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa | |||
491 | QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); | 492 | QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); |
493 | #else | ||
494 | #warning Actions do not work with Qt/X11 yet | ||
495 | #endif | ||
492 | } | 496 | } |
@@ -495,2 +499,3 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
495 | { | 499 | { |
500 | #ifdef QWS | ||
496 | if ( !iface ) | 501 | if ( !iface ) |
@@ -526,3 +531,5 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch | |||
526 | // msg << QString(iface->name()) << QString("MacAddr") << macaddr; | 531 | // msg << QString(iface->name()) << QString("MacAddr") << macaddr; |
527 | 532 | #else | |
533 | QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) ); | ||
534 | #endif | ||
528 | 535 | ||