| -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 @@ -32,15 +32,17 @@ #define OLISTVIEW_H #include <qcolor.h> #include <qlistview.h> #include <qpen.h> #include <qdatastream.h> +#include <qstringlist.h> class OListViewItem; + /*====================================================================================== * OListView *======================================================================================*/ /** * @brief A list/tree widget. 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 @@ -78,13 +78,13 @@ 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; connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); 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 @@ -15,12 +15,13 @@ #include "scanlist.h" #include "configwindow.h" #include "logwindow.h" #include <assert.h> +#include <qcursor.h> #include <qdatetime.h> #include <qtextstream.h> #include <qpopupmenu.h> #ifdef QWS #include <qpe/qpeapplication.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 @@ -471,12 +471,13 @@ 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(); else if ( action == "KeySound" ) ODevice::inst()->keySound(); @@ -486,16 +487,20 @@ void Wellenreiter::doAction( const QString& action, const QString& protocol, OPa ODevice::inst()->setLedState( Led_Mail, Led_Off ); else if ( action == "LogMessage" ) 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; } @@ -521,10 +526,12 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1()); msg << QString(iface->name()) << QString("ESSID") << essid; 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 } |