summaryrefslogtreecommitdiff
path: root/noncore/net/opiestumbler/opiestumbler.cpp
Unidiff
Diffstat (limited to 'noncore/net/opiestumbler/opiestumbler.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opiestumbler/opiestumbler.cpp14
1 files changed, 7 insertions, 7 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
@@ -60,21 +60,21 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
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
@@ -124,13 +124,13 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
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{
@@ -231,14 +231,14 @@ void OpieStumbler::slotShowDetails()
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()
@@ -292,13 +292,13 @@ void OpieStumbler::slotJoinNetwork()
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);
@@ -306,13 +306,13 @@ void OpieStumbler::slotJoinNetwork()
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()