-rw-r--r-- | noncore/net/opiestumbler/opiestumbler.cpp | 14 | ||||
-rw-r--r-- | noncore/net/opiestumbler/opiestumbler.h | 2 | ||||
-rw-r--r-- | noncore/net/opiestumbler/stationinfo.h | 2 | ||||
-rw-r--r-- | noncore/net/opiestumbler/stumbler.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opiestumbler/stumblersettings.h | 2 |
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 | |||
@@ -54,33 +54,33 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags) | |||
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()) ); |
@@ -118,25 +118,25 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags) | |||
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 | ||
128 | void OpieStumbler::slotConfigure() | 128 | void 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 | ||
135 | void OpieStumbler::loadConfig() | 135 | void 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 | ||
142 | void OpieStumbler::slotStartScanning() | 142 | void OpieStumbler::slotStartScanning() |
@@ -225,26 +225,26 @@ void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, con | |||
225 | } | 225 | } |
226 | } | 226 | } |
227 | 227 | ||
228 | void OpieStumbler::slotShowDetails() | 228 | 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 | ||
244 | void OpieStumbler::slotLoadManufacturers() | 244 | void OpieStumbler::slotLoadManufacturers() |
245 | { | 245 | { |
246 | m_db = Opie::Net::OManufacturerDB::instance(); | 246 | m_db = Opie::Net::OManufacturerDB::instance(); |
247 | } | 247 | } |
248 | 248 | ||
249 | QString OpieStumbler::manufacturer( const QString &mac, bool extended ) | 249 | QString OpieStumbler::manufacturer( const QString &mac, bool extended ) |
250 | { | 250 | { |
@@ -286,39 +286,39 @@ void OpieStumbler::slotJoinNetwork() | |||
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 | ||
318 | void OpieStumbler::slotAssociated() | 318 | void 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; |
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 | |||
@@ -31,25 +31,25 @@ namespace Opie{ | |||
31 | 31 | ||
32 | 32 | ||
33 | class OpieStumbler: public QMainWindow { | 33 | class OpieStumbler: public QMainWindow { |
34 | Q_OBJECT | 34 | Q_OBJECT |
35 | public: | 35 | public: |
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 ); |
44 | protected slots: | 44 | protected 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(); |
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 | |||
@@ -7,25 +7,25 @@ | |||
7 | class QWidget; | 7 | class QWidget; |
8 | class QString; | 8 | class QString; |
9 | class QGroupBox; | 9 | class QGroupBox; |
10 | 10 | ||
11 | class StationInfo: public QDialog | 11 | class StationInfo: public QDialog |
12 | { | 12 | { |
13 | Q_OBJECT | 13 | Q_OBJECT |
14 | 14 | ||
15 | public: | 15 | public: |
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 | ||
21 | protected: | 21 | protected: |
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; |
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 | |||
@@ -26,28 +26,28 @@ void Stumbler::start() | |||
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 | ||
46 | void Stumbler::stop() | 46 | void 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 | ||
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 | ||
6 | class Config; | 6 | class Config; |
7 | class QLineEdit; | 7 | class QLineEdit; |
8 | 8 | ||
9 | class StumblerSettings: public QDialog { | 9 | class StumblerSettings: public QDialog { |
10 | 10 | ||
11 | public: | 11 | public: |
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 | ||
15 | protected slots: | 15 | protected slots: |
16 | void accept(); | 16 | void accept(); |
17 | protected: | 17 | protected: |
18 | Config *m_config; | 18 | Config *m_config; |
19 | QLineEdit *m_interface; | 19 | QLineEdit *m_interface; |
20 | }; | 20 | }; |
21 | 21 | ||
22 | #endif | 22 | #endif |