summaryrefslogtreecommitdiff
authorskyhusker <skyhusker>2005-06-12 14:08:02 (UTC)
committer skyhusker <skyhusker>2005-06-12 14:08:02 (UTC)
commitd6998357a5523188f5273549529193092334303e (patch) (unidiff)
tree82800f1a80db367cdff3c5e9040a1411aafef9d7
parentdc88bc9ebf2514d53eceb17ebcd1c67b89c6da70 (diff)
downloadopie-d6998357a5523188f5273549529193092334303e.zip
opie-d6998357a5523188f5273549529193092334303e.tar.gz
opie-d6998357a5523188f5273549529193092334303e.tar.bz2
TRUE->true, FALSE->false
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opiestumbler/opiestumbler.cpp14
-rw-r--r--noncore/net/opiestumbler/opiestumbler.h2
-rw-r--r--noncore/net/opiestumbler/stationinfo.h2
-rw-r--r--noncore/net/opiestumbler/stumbler.cpp4
-rw-r--r--noncore/net/opiestumbler/stumblersettings.h2
5 files changed, 12 insertions, 12 deletions
diff --git a/noncore/net/opiestumbler/opiestumbler.cpp b/noncore/net/opiestumbler/opiestumbler.cpp
index bc4a7ab..2f4f54b 100644
--- a/noncore/net/opiestumbler/opiestumbler.cpp
+++ b/noncore/net/opiestumbler/opiestumbler.cpp
@@ -42,57 +42,57 @@ QString OpieStumbler::appCaption() {
42} 42}
43 43
44OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags) 44OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
45 :QMainWindow(parent, name, WStyle_ContextHelp), 45 :QMainWindow(parent, name, WStyle_ContextHelp),
46 m_listCurrent(new QListView(this)), m_listHistory(new QListView(this)), 46 m_listCurrent(new QListView(this)), m_listHistory(new QListView(this)),
47 m_stationsCurrent(new QList<Opie::Net::OStation>), 47 m_stationsCurrent(new QList<Opie::Net::OStation>),
48 m_popupCurrent(new QPopupMenu(this)), 48 m_popupCurrent(new QPopupMenu(this)),
49 m_popupHistory(new QPopupMenu(this)), 49 m_popupHistory(new QPopupMenu(this)),
50 m_db(NULL), m_proc(NULL) 50 m_db(NULL), m_proc(NULL)
51{ 51{
52 52
53 if ( QCopChannel::isRegistered("QPE/OpieStumbler") ) { 53 if ( QCopChannel::isRegistered("QPE/OpieStumbler") ) {
54 QCopEnvelope e("QPE/OpieStumbler", "show()"); 54 QCopEnvelope e("QPE/OpieStumbler", "show()");
55 exit(EXIT_SUCCESS); 55 exit(EXIT_SUCCESS);
56 } 56 }
57 57
58 QGridLayout *grid = new QGridLayout( this, 1, 1, 3, 0, "grid"); 58 QGridLayout *grid = new QGridLayout( this, 1, 1, 3, 0, "grid");
59 QVBoxLayout *lay = new QVBoxLayout( NULL, 0, 5, "lay" ); 59 QVBoxLayout *lay = new QVBoxLayout( NULL, 0, 5, "lay" );
60 QSpacerItem *spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed ); 60 QSpacerItem *spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed );
61 lay->addItem(spacer); 61 lay->addItem(spacer);
62 lay->addWidget(m_listCurrent); 62 lay->addWidget(m_listCurrent);
63 lay->addWidget(m_listHistory); 63 lay->addWidget(m_listHistory);
64 grid->addLayout(lay, 0, 0); 64 grid->addLayout(lay, 0, 0);
65 65
66 m_stationsCurrent->setAutoDelete(TRUE); 66 m_stationsCurrent->setAutoDelete(true);
67 67
68 m_channel = new QCopChannel( "QPE/OpieStumbler", this ); 68 m_channel = new QCopChannel( "QPE/OpieStumbler", this );
69 connect(m_channel, SIGNAL(received(const QCString &, const QByteArray &)), 69 connect(m_channel, SIGNAL(received(const QCString &, const QByteArray &)),
70 this, SLOT(slotMessageReceived( const QCString &, const QByteArray &)) ); 70 this, SLOT(slotMessageReceived( const QCString &, const QByteArray &)) );
71 71
72 //setCaption(appCaption()); 72 //setCaption(appCaption());
73 //setCentralWidget(grid); 73 //setCentralWidget(grid);
74 setToolBarsMovable(FALSE); 74 setToolBarsMovable(false);
75 75
76 76
77 QPopupMenu *fileMenu = new QPopupMenu(this); 77 QPopupMenu *fileMenu = new QPopupMenu(this);
78 QPopupMenu *configMenu = new QPopupMenu(this); 78 QPopupMenu *configMenu = new QPopupMenu(this);
79 QPopupMenu *scanMenu = new QPopupMenu(this); 79 QPopupMenu *scanMenu = new QPopupMenu(this);
80 80
81 fileMenu->insertItem( tr("Exit"), this, SLOT(close()) ); 81 fileMenu->insertItem( tr("Exit"), this, SLOT(close()) );
82 configMenu->insertItem( tr("Configure"), this, SLOT(slotConfigure()) ); 82 configMenu->insertItem( tr("Configure"), this, SLOT(slotConfigure()) );
83 scanMenu->insertItem( tr("Start"), this, SLOT(slotStartScanning()) ); 83 scanMenu->insertItem( tr("Start"), this, SLOT(slotStartScanning()) );
84 scanMenu->insertItem( tr("Stop"), this, SLOT(slotStopScanning()) ); 84 scanMenu->insertItem( tr("Stop"), this, SLOT(slotStopScanning()) );
85 85
86 m_popupCurrent->insertItem( tr("Show details"), this, SLOT(slotShowDetails()) ); 86 m_popupCurrent->insertItem( tr("Show details"), this, SLOT(slotShowDetails()) );
87 m_popupCurrent->insertItem( tr("Join Network"), this, SLOT(slotJoinNetwork()) ); 87 m_popupCurrent->insertItem( tr("Join Network"), this, SLOT(slotJoinNetwork()) );
88 88
89 menuBar()->insertItem(tr("File"), fileMenu); 89 menuBar()->insertItem(tr("File"), fileMenu);
90 menuBar()->insertItem(tr("Settings"), configMenu); 90 menuBar()->insertItem(tr("Settings"), configMenu);
91 menuBar()->insertItem(tr("Scanning"), scanMenu); 91 menuBar()->insertItem(tr("Scanning"), scanMenu);
92 92
93 QPEApplication::setStylusOperation(m_listCurrent->viewport(), QPEApplication::RightOnHold); 93 QPEApplication::setStylusOperation(m_listCurrent->viewport(), QPEApplication::RightOnHold);
94 QPEApplication::setStylusOperation(m_listHistory->viewport(), QPEApplication::RightOnHold); 94 QPEApplication::setStylusOperation(m_listHistory->viewport(), QPEApplication::RightOnHold);
95 95
96 m_listCurrent->addColumn(tr("SSID")); 96 m_listCurrent->addColumn(tr("SSID"));
97 m_listCurrent->addColumn(tr("Chan")); 97 m_listCurrent->addColumn(tr("Chan"));
98 m_listCurrent->addColumn(tr("Signal")); 98 m_listCurrent->addColumn(tr("Signal"));
@@ -106,49 +106,49 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
106 m_listHistory->addColumn(tr("Vendor")); 106 m_listHistory->addColumn(tr("Vendor"));
107 107
108 connect(m_listCurrent, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)), 108 connect(m_listCurrent, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)),
109 this, SLOT(slotCurrentMousePressed (int, QListViewItem*, const QPoint&, int))); 109 this, SLOT(slotCurrentMousePressed (int, QListViewItem*, const QPoint&, int)));
110 110
111 connect(m_listHistory, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)), 111 connect(m_listHistory, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)),
112 this, SLOT(slotHistoryMousePressed (int, QListViewItem*, const QPoint&, int))); 112 this, SLOT(slotHistoryMousePressed (int, QListViewItem*, const QPoint&, int)));
113 113
114 for(int i = CURCHAN; i <= CURENC; ++i) { 114 for(int i = CURCHAN; i <= CURENC; ++i) {
115 m_listCurrent->setColumnAlignment( i, Qt::AlignHCenter ); 115 m_listCurrent->setColumnAlignment( i, Qt::AlignHCenter );
116 m_listHistory->setColumnAlignment( i, Qt::AlignHCenter ); 116 m_listHistory->setColumnAlignment( i, Qt::AlignHCenter );
117 } 117 }
118 118
119 loadConfig(); 119 loadConfig();
120 m_stumbler = new Stumbler(m_interface, this); 120 m_stumbler = new Stumbler(m_interface, this);
121 connect(m_stumbler, SIGNAL(newdata()), this, SLOT(slotUpdateStations())); 121 connect(m_stumbler, SIGNAL(newdata()), this, SLOT(slotUpdateStations()));
122 122
123 QTimer::singleShot(1000, this, SLOT(slotLoadManufacturers()) ); 123 QTimer::singleShot(1000, this, SLOT(slotLoadManufacturers()) );
124 124
125 slotStartScanning(); 125 slotStartScanning();
126} 126}
127 127
128void OpieStumbler::slotConfigure() 128void OpieStumbler::slotConfigure()
129{ 129{
130 StumblerSettings settings(this, "Settings", TRUE); 130 StumblerSettings settings(this, "Settings", true);
131 if (settings.exec() == QDialog::Accepted) 131 if (settings.exec() == QDialog::Accepted)
132 loadConfig(); 132 loadConfig();
133} 133}
134 134
135void OpieStumbler::loadConfig() 135void OpieStumbler::loadConfig()
136{ 136{
137 Config cfg("OpieStumbler", Config::User); 137 Config cfg("OpieStumbler", Config::User);
138 cfg.setGroup("General"); 138 cfg.setGroup("General");
139 m_interface = cfg.readEntry("interface", "wlan0"); 139 m_interface = cfg.readEntry("interface", "wlan0");
140} 140}
141 141
142void OpieStumbler::slotStartScanning() 142void OpieStumbler::slotStartScanning()
143{ 143{
144 setCaption(appCaption() + " (" + tr("Scanning") + ")"); 144 setCaption(appCaption() + " (" + tr("Scanning") + ")");
145 m_stumbler->start(); 145 m_stumbler->start();
146} 146}
147 147
148void OpieStumbler::slotStopScanning() 148void OpieStumbler::slotStopScanning()
149{ 149{
150 setCaption(appCaption()); 150 setCaption(appCaption());
151 m_stumbler->stop(); 151 m_stumbler->stop();
152} 152}
153 153
154void OpieStumbler::slotUpdateStations() 154void OpieStumbler::slotUpdateStations()
@@ -213,50 +213,50 @@ void OpieStumbler::slotCurrentMousePressed(int button, QListViewItem * item, con
213 m_popupCurrent->popup(point); 213 m_popupCurrent->popup(point);
214 } 214 }
215} 215}
216 216
217 217
218void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, const QPoint &point, int c) 218void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, const QPoint &point, int c)
219{ 219{
220 Q_UNUSED(c) 220 Q_UNUSED(c)
221 221
222 if ( 2 == button ) { 222 if ( 2 == button ) {
223 m_mac = item->text(HISVENDOR + 1); 223 m_mac = item->text(HISVENDOR + 1);
224 m_popupHistory->popup(point); 224 m_popupHistory->popup(point);
225 } 225 }
226} 226}
227 227
228void OpieStumbler::slotShowDetails() 228void OpieStumbler::slotShowDetails()
229{ 229{
230 QListIterator<StumblerStation> it(m_stationsHistory); 230 QListIterator<StumblerStation> it(m_stationsHistory);
231 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); 231 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
232 232
233 if( it.current() ) { 233 if( it.current() ) {
234 StationInfo info(it.current()->st->ssid, it.current()->st->type, QString::number(it.current()->st->channel), 234 StationInfo info(it.current()->st->ssid, it.current()->st->type, QString::number(it.current()->st->channel),
235 QString::number(it.current()->st->rates.last()/1000000), QString::number(it.current()->st->level), 235 QString::number(it.current()->st->rates.last()/1000000), QString::number(it.current()->st->level),
236 it.current()->st->encrypted ? "WEP": "No", 236 it.current()->st->encrypted ? "WEP": "No",
237 it.current()->st->macAddress.toString(), manufacturer(it.current()->st->macAddress.toString(), TRUE), 237 it.current()->st->macAddress.toString(), manufacturer(it.current()->st->macAddress.toString(), true),
238 it.current()->lastTimeSeen.toString() ,this, "", TRUE); 238 it.current()->lastTimeSeen.toString() ,this, "", true);
239 info.exec(); 239 info.exec();
240 } 240 }
241 241
242} 242}
243 243
244void OpieStumbler::slotLoadManufacturers() 244void OpieStumbler::slotLoadManufacturers()
245{ 245{
246 m_db = Opie::Net::OManufacturerDB::instance(); 246 m_db = Opie::Net::OManufacturerDB::instance();
247} 247}
248 248
249QString OpieStumbler::manufacturer( const QString &mac, bool extended ) 249QString OpieStumbler::manufacturer( const QString &mac, bool extended )
250{ 250{
251 QString retval; 251 QString retval;
252 if ( m_db ) 252 if ( m_db )
253 if ( extended ) 253 if ( extended )
254 retval = m_db->lookupExt(mac); 254 retval = m_db->lookupExt(mac);
255 else 255 else
256 retval = m_db->lookup(mac); 256 retval = m_db->lookup(mac);
257 257
258 if ( retval.isEmpty() ) 258 if ( retval.isEmpty() )
259 retval = tr("Unknown"); 259 retval = tr("Unknown");
260 260
261 return retval; 261 return retval;
262} 262}
@@ -274,63 +274,63 @@ void OpieStumbler::slotJoinNetwork()
274 274
275 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); 275 for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
276 276
277 if( !it.current() ) 277 if( !it.current() )
278 return; 278 return;
279 279
280 m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1); 280 m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1);
281 m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize ); 281 m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize );
282 m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised ); 282 m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised );
283 m_splashBox = new QVBoxLayout( m_splash, 4, 4 ); 283 m_splashBox = new QVBoxLayout( m_splash, 4, 4 );
284 m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash ); 284 m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash );
285 m_pbar = new QProgressBar( 3, m_splash ); 285 m_pbar = new QProgressBar( 3, m_splash );
286 m_pbar->setCenterIndicator(true); 286 m_pbar->setCenterIndicator(true);
287 m_splashBox->addWidget( m_infoLabel ); 287 m_splashBox->addWidget( m_infoLabel );
288 m_splashBox->addWidget( m_pbar ); 288 m_splashBox->addWidget( m_pbar );
289 int sw = m_splashBox->sizeHint().width()*2; 289 int sw = m_splashBox->sizeHint().width()*2;
290 int sh = m_splashBox->sizeHint().height(); 290 int sh = m_splashBox->sizeHint().height();
291 m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh); 291 m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh);
292 m_splash->show(); 292 m_splash->show();
293 m_splash->raise(); 293 m_splash->raise();
294 294
295 Opie::Net::OStation *station = it.current()->st; 295 Opie::Net::OStation *station = it.current()->st;
296 296
297 odebug << "Bringing interface down" << oendl; 297 odebug << "Bringing interface down" << oendl;
298 wiface->setUp(FALSE); 298 wiface->setUp(false);
299 299
300 odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl; 300 odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl;
301 wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" ); 301 wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" );
302 302
303 odebug << "Setting channel to " << station->channel << oendl; 303 odebug << "Setting channel to " << station->channel << oendl;
304 wiface->setChannel(station->channel); 304 wiface->setChannel(station->channel);
305 305
306 odebug << "Setting SSID to " << station->ssid << oendl; 306 odebug << "Setting SSID to " << station->ssid << oendl;
307 wiface->setSSID(station->ssid); 307 wiface->setSSID(station->ssid);
308 308
309 wiface->commit(); 309 wiface->commit();
310 310
311 odebug << "Bringing interface up" << oendl; 311 odebug << "Bringing interface up" << oendl;
312 wiface->setUp(TRUE); 312 wiface->setUp(true);
313 m_pbar->setProgress(1); 313 m_pbar->setProgress(1);
314 //Wait 5 sec for association 314 //Wait 5 sec for association
315 QTimer::singleShot(5000, this, SLOT(slotAssociated())); 315 QTimer::singleShot(5000, this, SLOT(slotAssociated()));
316} 316}
317 317
318void OpieStumbler::slotAssociated() 318void OpieStumbler::slotAssociated()
319{ 319{
320 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface)); 320 OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
321 321
322 if( !wiface ) { 322 if( !wiface ) {
323 slotCleanSplash(); 323 slotCleanSplash();
324 return; 324 return;
325 } 325 }
326 326
327 if (!wiface->isAssociated()) { 327 if (!wiface->isAssociated()) {
328 Global::statusMessage(tr("Could not Join")); 328 Global::statusMessage(tr("Could not Join"));
329 m_infoLabel->setText(tr("Could not Join")); 329 m_infoLabel->setText(tr("Could not Join"));
330 QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); 330 QTimer::singleShot(5000, this, SLOT(slotCleanSplash()));
331 return; 331 return;
332 } 332 }
333 333
334 Global::statusMessage(tr("Joined")); 334 Global::statusMessage(tr("Joined"));
335 m_pbar->setProgress(2); 335 m_pbar->setProgress(2);
336 m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid)); 336 m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid));
diff --git a/noncore/net/opiestumbler/opiestumbler.h b/noncore/net/opiestumbler/opiestumbler.h
index 84a69ba..263af6e 100644
--- a/noncore/net/opiestumbler/opiestumbler.h
+++ b/noncore/net/opiestumbler/opiestumbler.h
@@ -19,49 +19,49 @@ class QVBoxLayout;
19 19
20namespace Opie{ 20namespace Opie{
21 namespace Net { 21 namespace Net {
22 class OMacAddress; 22 class OMacAddress;
23 class OStation; 23 class OStation;
24 class OManufacturerDB; 24 class OManufacturerDB;
25 } 25 }
26 26
27 namespace Core { 27 namespace Core {
28 class OProcess; 28 class OProcess;
29 } 29 }
30} 30}
31 31
32 32
33class OpieStumbler: public QMainWindow { 33class OpieStumbler: public QMainWindow {
34 Q_OBJECT 34 Q_OBJECT
35public: 35public:
36 36
37 enum CurrentColumns { CURSSID, CURCHAN, CURSIGNAL, CURENC }; 37 enum CurrentColumns { CURSSID, CURCHAN, CURSIGNAL, CURENC };
38 enum HistoryColumns { HISSSID, HISCHAN, HISSIGNAL, HISENC, HISVENDOR }; 38 enum HistoryColumns { HISSSID, HISCHAN, HISSIGNAL, HISENC, HISVENDOR };
39 OpieStumbler(QWidget *parent = 0, const char *name = 0, WFlags f = 0); 39 OpieStumbler(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
40 static QString appName() { return QString::fromLatin1("opiestumbler"); } 40 static QString appName() { return QString::fromLatin1("opiestumbler"); }
41 static QString appCaption(); 41 static QString appCaption();
42 void displayStations(); 42 void displayStations();
43 QString manufacturer(const QString &mac, bool extended = FALSE ); 43 QString manufacturer(const QString &mac, bool extended = false );
44protected slots: 44protected slots:
45 void slotConfigure(); 45 void slotConfigure();
46 void slotStartScanning(); 46 void slotStartScanning();
47 void slotStopScanning(); 47 void slotStopScanning();
48 void slotUpdateStations(); 48 void slotUpdateStations();
49 void slotMessageReceived( const QCString &, const QByteArray & ); 49 void slotMessageReceived( const QCString &, const QByteArray & );
50 void slotCurrentMousePressed(int button, QListViewItem *item, const QPoint &point, int c); 50 void slotCurrentMousePressed(int button, QListViewItem *item, const QPoint &point, int c);
51 void slotHistoryMousePressed(int button, QListViewItem *item, const QPoint &point, int c); 51 void slotHistoryMousePressed(int button, QListViewItem *item, const QPoint &point, int c);
52 void slotShowDetails(); 52 void slotShowDetails();
53 void slotLoadManufacturers(); 53 void slotLoadManufacturers();
54 void slotJoinNetwork(); 54 void slotJoinNetwork();
55 void slotAssociated(); 55 void slotAssociated();
56 void slotCheckDHCP(); 56 void slotCheckDHCP();
57 void slotCleanSplash(); 57 void slotCleanSplash();
58protected: 58protected:
59 void loadConfig(); 59 void loadConfig();
60 60
61 QListView *m_listCurrent; 61 QListView *m_listCurrent;
62 QListView *m_listHistory; 62 QListView *m_listHistory;
63 QString m_interface; 63 QString m_interface;
64 Stumbler *m_stumbler; 64 Stumbler *m_stumbler;
65 QCopChannel *m_channel; 65 QCopChannel *m_channel;
66 QList <Opie::Net::OStation> *m_stationsCurrent; 66 QList <Opie::Net::OStation> *m_stationsCurrent;
67 QList <StumblerStation> m_stationsHistory; 67 QList <StumblerStation> m_stationsHistory;
diff --git a/noncore/net/opiestumbler/stationinfo.h b/noncore/net/opiestumbler/stationinfo.h
index f8798a6..aa42932 100644
--- a/noncore/net/opiestumbler/stationinfo.h
+++ b/noncore/net/opiestumbler/stationinfo.h
@@ -1,42 +1,42 @@
1#ifndef STATIONINFO_H 1#ifndef STATIONINFO_H
2#define STATIONINFO_H 2#define STATIONINFO_H
3 3
4#include <qdialog.h> 4#include <qdialog.h>
5#include <qlabel.h> 5#include <qlabel.h>
6 6
7class QWidget; 7class QWidget;
8class QString; 8class QString;
9class QGroupBox; 9class QGroupBox;
10 10
11class StationInfo: public QDialog 11class StationInfo: public QDialog
12{ 12{
13 Q_OBJECT 13 Q_OBJECT
14 14
15public: 15public:
16 StationInfo( const QString &essid, const QString &type, const QString &channel, 16 StationInfo( const QString &essid, const QString &type, const QString &channel,
17 const QString &maxrate, const QString &level, const QString &encryption, const QString &address, 17 const QString &maxrate, const QString &level, const QString &encryption, const QString &address,
18 const QString &vendor, const QString &time, 18 const QString &vendor, const QString &time,
19 QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 19 QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
20 20
21protected: 21protected:
22 QLabel *m_ssidLabel; 22 QLabel *m_ssidLabel;
23 QLabel *m_typeLabel; 23 QLabel *m_typeLabel;
24 QLabel *m_channelLabel; 24 QLabel *m_channelLabel;
25 QLabel *m_maxRateLabel; 25 QLabel *m_maxRateLabel;
26 QLabel *m_levelLabel; 26 QLabel *m_levelLabel;
27 QLabel *m_encLabel; 27 QLabel *m_encLabel;
28 QLabel *m_addrLabel; 28 QLabel *m_addrLabel;
29 QLabel *m_vendorLabel; 29 QLabel *m_vendorLabel;
30 QLabel *m_timeLabel; 30 QLabel *m_timeLabel;
31 QLabel *m_ssid; 31 QLabel *m_ssid;
32 QLabel *m_type; 32 QLabel *m_type;
33 QLabel *m_channel; 33 QLabel *m_channel;
34 QLabel *m_maxRate; 34 QLabel *m_maxRate;
35 QLabel *m_level; 35 QLabel *m_level;
36 QLabel *m_encryption; 36 QLabel *m_encryption;
37 QLabel *m_address; 37 QLabel *m_address;
38 QLabel *m_vendor; 38 QLabel *m_vendor;
39 QLabel *m_lastTime; 39 QLabel *m_lastTime;
40}; 40};
41 41
42#endif 42#endif
diff --git a/noncore/net/opiestumbler/stumbler.cpp b/noncore/net/opiestumbler/stumbler.cpp
index cda6b99..10e89ce 100644
--- a/noncore/net/opiestumbler/stumbler.cpp
+++ b/noncore/net/opiestumbler/stumbler.cpp
@@ -14,52 +14,52 @@ Stumbler::Stumbler(const QString &iface, QObject *parent, const char *name)
14 :QObject(parent, name), m_interval(5000), 14 :QObject(parent, name), m_interval(5000),
15 m_wifaceName(iface), 15 m_wifaceName(iface),
16 m_timer(new QTimer(this)) 16 m_timer(new QTimer(this))
17{ 17{
18 m_wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_wifaceName)); 18 m_wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_wifaceName));
19 connect(m_timer, SIGNAL(timeout()), this, SLOT(slotRefresh())); 19 connect(m_timer, SIGNAL(timeout()), this, SLOT(slotRefresh()));
20} 20}
21 21
22 22
23void Stumbler::start() 23void Stumbler::start()
24{ 24{
25 if (!m_wiface) { 25 if (!m_wiface) {
26 odebug << "Error, interface " << m_wifaceName << " does not exist" << oendl; 26 odebug << "Error, interface " << m_wifaceName << " does not exist" << oendl;
27 return; 27 return;
28 } 28 }
29 29
30 if (!ONetwork::instance()->isWirelessInterface(m_wifaceName.ascii())) { 30 if (!ONetwork::instance()->isWirelessInterface(m_wifaceName.ascii())) {
31 odebug << "Error, " << m_wifaceName << " is not a wireless interface" << oendl; 31 odebug << "Error, " << m_wifaceName << " is not a wireless interface" << oendl;
32 //FIXME: Tell the user about this 32 //FIXME: Tell the user about this
33 return; 33 return;
34 } 34 }
35 35
36 if (!m_timer->isActive()) { 36 if (!m_timer->isActive()) {
37 odebug << "Starting stumbler" << oendl; 37 odebug << "Starting stumbler" << oendl;
38 m_wiface->setUp(FALSE); 38 m_wiface->setUp(false);
39 m_wiface->setSSID("any"); 39 m_wiface->setSSID("any");
40 m_wiface->setAssociatedAP( OMacAddress::broadcast ); 40 m_wiface->setAssociatedAP( OMacAddress::broadcast );
41 m_wiface->setUp(TRUE); 41 m_wiface->setUp(true);
42 m_timer->start(m_interval); 42 m_timer->start(m_interval);
43 } 43 }
44} 44}
45 45
46void Stumbler::stop() 46void Stumbler::stop()
47{ 47{
48 if (m_timer->isActive()) { 48 if (m_timer->isActive()) {
49 odebug << "Stoping stumbler" << oendl; 49 odebug << "Stoping stumbler" << oendl;
50 m_timer->stop(); 50 m_timer->stop();
51 } 51 }
52} 52}
53 53
54void Stumbler::setInterval(int msec) 54void Stumbler::setInterval(int msec)
55{ 55{
56 m_interval = msec; 56 m_interval = msec;
57 if (m_timer->isActive()) { 57 if (m_timer->isActive()) {
58 m_timer->stop(); 58 m_timer->stop();
59 m_timer->start(m_interval); 59 m_timer->start(m_interval);
60 } 60 }
61} 61}
62 62
63void Stumbler::setIface(const QString &iface) 63void Stumbler::setIface(const QString &iface)
64{ 64{
65 m_wifaceName = iface; 65 m_wifaceName = iface;
diff --git a/noncore/net/opiestumbler/stumblersettings.h b/noncore/net/opiestumbler/stumblersettings.h
index 997fc85..f444eba 100644
--- a/noncore/net/opiestumbler/stumblersettings.h
+++ b/noncore/net/opiestumbler/stumblersettings.h
@@ -1,22 +1,22 @@
1#ifndef STUMBLERSETTINGS_H 1#ifndef STUMBLERSETTINGS_H
2#define STUMBLERSETTINGS_H 2#define STUMBLERSETTINGS_H
3 3
4#include <qdialog.h> 4#include <qdialog.h>
5 5
6class Config; 6class Config;
7class QLineEdit; 7class QLineEdit;
8 8
9class StumblerSettings: public QDialog { 9class StumblerSettings: public QDialog {
10 10
11public: 11public:
12 StumblerSettings(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags f = 0); 12 StumblerSettings(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags f = 0);
13 ~StumblerSettings(); 13 ~StumblerSettings();
14 14
15protected slots: 15protected slots:
16 void accept(); 16 void accept();
17protected: 17protected:
18 Config *m_config; 18 Config *m_config;
19 QLineEdit *m_interface; 19 QLineEdit *m_interface;
20}; 20};
21 21
22#endif 22#endif