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
@@ -35,9 +35,11 @@
 #include <qlistview.h>
 #include <qpen.h>
 #include <qdatastream.h>
+#include <qstringlist.h>
 
 class OListViewItem;
 
+
 /*======================================================================================
  * OListView
  *======================================================================================*/
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
@@ -81,7 +81,7 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
     #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
     QPushButton* okButton = new QPushButton( "ok", this );
     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() ) );
     #endif
 
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
@@ -18,6 +18,7 @@
 #include "logwindow.h"
 
 #include <assert.h>
+#include <qcursor.h>
 #include <qdatetime.h>
 #include <qtextstream.h>
 #include <qpopupmenu.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
@@ -474,6 +474,7 @@ void Wellenreiter::timerEvent( QTimerEvent* )
 
 void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
 {
+    #ifdef QWS
     if ( action == "TouchSound" )
         ODevice::inst()->touchSound();
     else if ( action == "AlarmSound" )
@@ -489,10 +490,14 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa
     else if ( action == "MessageBox" )
         QMessageBox::information( this, "Notification!",
         QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
+    #else
+    #warning Actions do not work with Qt/X11 yet
+    #endif
 }
 
 void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
 {
+    #ifdef QWS
     if ( !iface )
     {
         QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
@@ -524,7 +529,9 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
     msg << QString(iface->name()) << QString("Channel") << channel;
 //    qDebug("msg >%s< mac >%s<", iface->name(),macaddr);
 //    msg << QString(iface->name()) << QString("MacAddr") << macaddr;
-
+    #else
+    QMessageBox::warning( this, tr( "Can't do that!" ), tr( "Function only available on Embedded build" ) );
+    #endif
 
 }