| -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 @@ -34,11 +34,13 @@ #include <qcolor.h> #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 @@ -80,9 +80,9 @@ 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 WellenreiterConfigWindow::_instance = this; 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 @@ -17,8 +17,9 @@ #include "configwindow.h" #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 @@ -473,8 +473,9 @@ 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" ) ODevice::inst()->alarmSound(); @@ -488,12 +489,16 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); 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." ) ); return; @@ -523,8 +528,10 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch qDebug("msg >%s< channel >%d<", iface->name(),channel); 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 } |