first bunch of fixes for Qt 3.x compilation

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 @@
 #include <qdatastream.h>
+#include <qstringlist.h>
 
@@ -40,2 +41,3 @@ class OListViewItem;
 
+
 /*======================================================================================
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
     okButton->show();
-    Layout5_2->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui
+    WellenreiterConfigBaseLayout->addWidget( okButton, 0, 3 ); //FIXME: rename this in configbase.ui
     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 @@
 #include <assert.h>
+#include <qcursor.h>
 #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
 {
+    #ifdef QWS
     if ( action == "TouchSound" )
@@ -491,2 +492,5 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
+    #else
+    #warning Actions do not work with Qt/X11 yet
+    #endif
 }
@@ -495,2 +499,3 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
 {
+    #ifdef QWS
     if ( !iface )
@@ -526,3 +531,5 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
-
+    #else
+    QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );
+    #endif