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
@@ -58,25 +58,25 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
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()) );
@@ -122,17 +122,17 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
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");
@@ -229,18 +229,18 @@ void 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();
@@ -290,31 +290,31 @@ void OpieStumbler::slotJoinNetwork()
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));
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
@@ -35,17 +35,17 @@ class OpieStumbler: public QMainWindow {
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);
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
@@ -11,17 +11,17 @@ class QGroupBox;
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;
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
@@ -30,20 +30,20 @@ void Stumbler::start()
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;
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
@@ -4,17 +4,17 @@
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};