summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -60,21 +60,21 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
QSpacerItem *spacer = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed );
lay->addItem(spacer);
lay->addWidget(m_listCurrent);
lay->addWidget(m_listHistory);
grid->addLayout(lay, 0, 0);
- m_stationsCurrent->setAutoDelete(TRUE);
+ m_stationsCurrent->setAutoDelete(true);
m_channel = new QCopChannel( "QPE/OpieStumbler", this );
connect(m_channel, SIGNAL(received(const QCString &, const QByteArray &)),
this, SLOT(slotMessageReceived( const QCString &, const QByteArray &)) );
//setCaption(appCaption());
//setCentralWidget(grid);
- setToolBarsMovable(FALSE);
+ setToolBarsMovable(false);
QPopupMenu *fileMenu = new QPopupMenu(this);
QPopupMenu *configMenu = new QPopupMenu(this);
QPopupMenu *scanMenu = new QPopupMenu(this);
@@ -124,13 +124,13 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
slotStartScanning();
}
void OpieStumbler::slotConfigure()
{
- StumblerSettings settings(this, "Settings", TRUE);
+ StumblerSettings settings(this, "Settings", true);
if (settings.exec() == QDialog::Accepted)
loadConfig();
}
void OpieStumbler::loadConfig()
{
@@ -231,14 +231,14 @@ void OpieStumbler::slotShowDetails()
for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it );
if( it.current() ) {
StationInfo info(it.current()->st->ssid, it.current()->st->type, QString::number(it.current()->st->channel),
QString::number(it.current()->st->rates.last()/1000000), QString::number(it.current()->st->level),
it.current()->st->encrypted ? "WEP": "No",
- it.current()->st->macAddress.toString(), manufacturer(it.current()->st->macAddress.toString(), TRUE),
- it.current()->lastTimeSeen.toString() ,this, "", TRUE);
+ it.current()->st->macAddress.toString(), manufacturer(it.current()->st->macAddress.toString(), true),
+ it.current()->lastTimeSeen.toString() ,this, "", true);
info.exec();
}
}
void OpieStumbler::slotLoadManufacturers()
@@ -292,13 +292,13 @@ void OpieStumbler::slotJoinNetwork()
m_splash->show();
m_splash->raise();
Opie::Net::OStation *station = it.current()->st;
odebug << "Bringing interface down" << oendl;
- wiface->setUp(FALSE);
+ wiface->setUp(false);
odebug << "Setting mode to " << (station->type == "adhoc" ? "adhoc" : "managed") << oendl;
wiface->setMode(station->type == "adhoc" ? "adhoc" : "managed" );
odebug << "Setting channel to " << station->channel << oendl;
wiface->setChannel(station->channel);
@@ -306,13 +306,13 @@ void OpieStumbler::slotJoinNetwork()
odebug << "Setting SSID to " << station->ssid << oendl;
wiface->setSSID(station->ssid);
wiface->commit();
odebug << "Bringing interface up" << oendl;
- wiface->setUp(TRUE);
+ wiface->setUp(true);
m_pbar->setProgress(1);
//Wait 5 sec for association
QTimer::singleShot(5000, this, SLOT(slotAssociated()));
}
void OpieStumbler::slotAssociated()
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
@@ -37,13 +37,13 @@ public:
enum CurrentColumns { CURSSID, CURCHAN, CURSIGNAL, CURENC };
enum HistoryColumns { HISSSID, HISCHAN, HISSIGNAL, HISENC, HISVENDOR };
OpieStumbler(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
static QString appName() { return QString::fromLatin1("opiestumbler"); }
static QString appCaption();
void displayStations();
- QString manufacturer(const QString &mac, bool extended = FALSE );
+ QString manufacturer(const QString &mac, bool extended = false );
protected slots:
void slotConfigure();
void slotStartScanning();
void slotStopScanning();
void slotUpdateStations();
void slotMessageReceived( const QCString &, const QByteArray & );
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
@@ -13,13 +13,13 @@ class StationInfo: public QDialog
Q_OBJECT
public:
StationInfo( const QString &essid, const QString &type, const QString &channel,
const QString &maxrate, const QString &level, const QString &encryption, const QString &address,
const QString &vendor, const QString &time,
- QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
+ QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
protected:
QLabel *m_ssidLabel;
QLabel *m_typeLabel;
QLabel *m_channelLabel;
QLabel *m_maxRateLabel;
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
@@ -32,16 +32,16 @@ void Stumbler::start()
//FIXME: Tell the user about this
return;
}
if (!m_timer->isActive()) {
odebug << "Starting stumbler" << oendl;
- m_wiface->setUp(FALSE);
+ m_wiface->setUp(false);
m_wiface->setSSID("any");
m_wiface->setAssociatedAP( OMacAddress::broadcast );
- m_wiface->setUp(TRUE);
+ m_wiface->setUp(true);
m_timer->start(m_interval);
}
}
void Stumbler::stop()
{
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
@@ -6,13 +6,13 @@
class Config;
class QLineEdit;
class StumblerSettings: public QDialog {
public:
- StumblerSettings(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags f = 0);
+ StumblerSettings(QWidget* parent = 0, const char* name = 0, bool modal = false, WFlags f = 0);
~StumblerSettings();
protected slots:
void accept();
protected:
Config *m_config;