summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-06-26 10:34:59 (UTC)
committer mickeyl <mickeyl>2003-06-26 10:34:59 (UTC)
commit8168239a5b1ff80abc02f93ed831c088ca5f2f3d (patch) (unidiff)
treed19069b730eeb82f02754955366569d52d088248
parent3c5746daa26d8353fde9ba84c6183517e26a625a (diff)
downloadopie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.zip
opie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.tar.gz
opie-8168239a5b1ff80abc02f93ed831c088ca5f2f3d.tar.bz2
first bunch of fixes for Qt 3.x compilation
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opieui/olistview.h2
-rw-r--r--noncore/net/wellenreiter/gui/configwindow.cpp2
-rw-r--r--noncore/net/wellenreiter/gui/scanlist.cpp1
-rw-r--r--noncore/net/wellenreiter/gui/wellenreiter.cpp9
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
@@ -30,19 +30,21 @@
30 30
31#ifndef OLISTVIEW_H 31#ifndef OLISTVIEW_H
32#define OLISTVIEW_H 32#define OLISTVIEW_H
33 33
34#include <qcolor.h> 34#include <qcolor.h>
35#include <qlistview.h> 35#include <qlistview.h>
36#include <qpen.h> 36#include <qpen.h>
37#include <qdatastream.h> 37#include <qdatastream.h>
38#include <qstringlist.h>
38 39
39class OListViewItem; 40class OListViewItem;
40 41
42
41/*====================================================================================== 43/*======================================================================================
42 * OListView 44 * OListView
43 *======================================================================================*/ 45 *======================================================================================*/
44 46
45/** 47/**
46 * @brief A list/tree widget. 48 * @brief A list/tree widget.
47 * 49 *
48 * A @ref QListView variant featuring visual and functional enhancements 50 * A @ref QListView variant featuring visual and functional enhancements
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
@@ -76,17 +76,17 @@ WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char
76 _guess = devicetype; 76 _guess = devicetype;
77 qDebug( "Wellenreiter: guessed device type to be #%d", devicetype ); 77 qDebug( "Wellenreiter: guessed device type to be #%d", devicetype );
78 } 78 }
79 } 79 }
80 80
81 #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here 81 #ifdef Q_WS_X11 // We're on X11: adding an Ok-Button for the Dialog here
82 QPushButton* okButton = new QPushButton( "ok", this ); 82 QPushButton* okButton = new QPushButton( "ok", this );
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() ) );
86 #endif 86 #endif
87 87
88 WellenreiterConfigWindow::_instance = this; 88 WellenreiterConfigWindow::_instance = this;
89 89
90 connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) ); 90 connect( deviceType, SIGNAL( activated(int) ), this, SLOT( changedDeviceType(int) ) );
91 connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) ); 91 connect( getCaptureFileName, SIGNAL( clicked() ), this, SLOT( getCaptureFileNameClicked() ) );
92 92
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
@@ -13,16 +13,17 @@
13** 13**
14**********************************************************************/ 14**********************************************************************/
15 15
16#include "scanlist.h" 16#include "scanlist.h"
17#include "configwindow.h" 17#include "configwindow.h"
18#include "logwindow.h" 18#include "logwindow.h"
19 19
20#include <assert.h> 20#include <assert.h>
21#include <qcursor.h>
21#include <qdatetime.h> 22#include <qdatetime.h>
22#include <qtextstream.h> 23#include <qtextstream.h>
23#include <qpopupmenu.h> 24#include <qpopupmenu.h>
24 25
25#ifdef QWS 26#ifdef QWS
26#include <qpe/qpeapplication.h> 27#include <qpe/qpeapplication.h>
27#include <opie/odevice.h> 28#include <opie/odevice.h>
28using namespace Opie; 29using namespace Opie;
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
@@ -469,35 +469,40 @@ void Wellenreiter::timerEvent( QTimerEvent* )
469 receivePacket( p ); 469 receivePacket( p );
470 delete p; 470 delete p;
471 } 471 }
472} 472}
473 473
474 474
475void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p ) 475void Wellenreiter::doAction( const QString& action, const QString& protocol, OPacket* p )
476{ 476{
477 #ifdef QWS
477 if ( action == "TouchSound" ) 478 if ( action == "TouchSound" )
478 ODevice::inst()->touchSound(); 479 ODevice::inst()->touchSound();
479 else if ( action == "AlarmSound" ) 480 else if ( action == "AlarmSound" )
480 ODevice::inst()->alarmSound(); 481 ODevice::inst()->alarmSound();
481 else if ( action == "KeySound" ) 482 else if ( action == "KeySound" )
482 ODevice::inst()->keySound(); 483 ODevice::inst()->keySound();
483 else if ( action == "LedOn" ) 484 else if ( action == "LedOn" )
484 ODevice::inst()->setLedState( Led_Mail, Led_On ); 485 ODevice::inst()->setLedState( Led_Mail, Led_On );
485 else if ( action == "LedOff" ) 486 else if ( action == "LedOff" )
486 ODevice::inst()->setLedState( Led_Mail, Led_Off ); 487 ODevice::inst()->setLedState( Led_Mail, Led_Off );
487 else if ( action == "LogMessage" ) 488 else if ( action == "LogMessage" )
488 logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) ); 489 logwindow->log( QString().sprintf( "Got packet with protocol '%s'", (const char*) protocol ) );
489 else if ( action == "MessageBox" ) 490 else if ( action == "MessageBox" )
490 QMessageBox::information( this, "Notification!", 491 QMessageBox::information( this, "Notification!",
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}
493 497
494void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr) 498void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int channel, const QString& macaddr)
495{ 499{
500 #ifdef QWS
496 if ( !iface ) 501 if ( !iface )
497 { 502 {
498 QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) ); 503 QMessageBox::warning( this, tr( "Can't do that!" ), tr( "No wireless\ninterface available." ) );
499 return; 504 return;
500 } 505 }
501 506
502 if ( sniffing ) 507 if ( sniffing )
503 { 508 {
@@ -519,12 +524,14 @@ void Wellenreiter::joinNetwork(const QString& type, const QString& essid, int ch
519 qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() ); 524 qDebug("msg >%s< Mode >%s<", iface->name(),type.latin1() );
520 msg << QString(iface->name()) << QString("Mode") << type; 525 msg << QString(iface->name()) << QString("Mode") << type;
521 qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1()); 526 qDebug("msg >%s< essid >%s<", iface->name(),essid.latin1());
522 msg << QString(iface->name()) << QString("ESSID") << essid; 527 msg << QString(iface->name()) << QString("ESSID") << essid;
523 qDebug("msg >%s< channel >%d<", iface->name(),channel); 528 qDebug("msg >%s< channel >%d<", iface->name(),channel);
524 msg << QString(iface->name()) << QString("Channel") << channel; 529 msg << QString(iface->name()) << QString("Channel") << channel;
525// qDebug("msg >%s< mac >%s<", iface->name(),macaddr); 530// qDebug("msg >%s< mac >%s<", iface->name(),macaddr);
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
529} 536}
530 537