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
@@ -50,41 +50,41 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
m_db(NULL), m_proc(NULL)
{
if ( QCopChannel::isRegistered("QPE/OpieStumbler") ) {
QCopEnvelope e("QPE/OpieStumbler", "show()");
exit(EXIT_SUCCESS);
}
QGridLayout *grid = new QGridLayout( this, 1, 1, 3, 0, "grid");
QVBoxLayout *lay = new QVBoxLayout( NULL, 0, 5, "lay" );
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);
fileMenu->insertItem( tr("Exit"), this, SLOT(close()) );
configMenu->insertItem( tr("Configure"), this, SLOT(slotConfigure()) );
scanMenu->insertItem( tr("Start"), this, SLOT(slotStartScanning()) );
scanMenu->insertItem( tr("Stop"), this, SLOT(slotStopScanning()) );
m_popupCurrent->insertItem( tr("Show details"), this, SLOT(slotShowDetails()) );
m_popupCurrent->insertItem( tr("Join Network"), this, SLOT(slotJoinNetwork()) );
menuBar()->insertItem(tr("File"), fileMenu);
menuBar()->insertItem(tr("Settings"), configMenu);
@@ -114,33 +114,33 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags)
for(int i = CURCHAN; i <= CURENC; ++i) {
m_listCurrent->setColumnAlignment( i, Qt::AlignHCenter );
m_listHistory->setColumnAlignment( i, Qt::AlignHCenter );
}
loadConfig();
m_stumbler = new Stumbler(m_interface, this);
connect(m_stumbler, SIGNAL(newdata()), this, SLOT(slotUpdateStations()));
QTimer::singleShot(1000, this, SLOT(slotLoadManufacturers()) );
slotStartScanning();
}
void OpieStumbler::slotConfigure()
{
- StumblerSettings settings(this, "Settings", TRUE);
+ StumblerSettings settings(this, "Settings", true);
if (settings.exec() == QDialog::Accepted)
loadConfig();
}
void OpieStumbler::loadConfig()
{
Config cfg("OpieStumbler", Config::User);
cfg.setGroup("General");
m_interface = cfg.readEntry("interface", "wlan0");
}
void OpieStumbler::slotStartScanning()
{
setCaption(appCaption() + " (" + tr("Scanning") + ")");
m_stumbler->start();
}
@@ -221,34 +221,34 @@ void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, con
if ( 2 == button ) {
m_mac = item->text(HISVENDOR + 1);
m_popupHistory->popup(point);
}
}
void OpieStumbler::slotShowDetails()
{
QListIterator<StumblerStation> it(m_stationsHistory);
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()
{
m_db = Opie::Net::OManufacturerDB::instance();
}
QString OpieStumbler::manufacturer( const QString &mac, bool extended )
{
QString retval;
if ( m_db )
if ( extended )
retval = m_db->lookupExt(mac);
@@ -282,47 +282,47 @@ void OpieStumbler::slotJoinNetwork()
m_splash->setFrameStyle( QFrame::Panel | QFrame::Raised );
m_splashBox = new QVBoxLayout( m_splash, 4, 4 );
m_infoLabel = new QLabel( QString("<center><b>%1 %2</b></center>").arg(tr("Joining Network")).arg(m_ssid), m_splash );
m_pbar = new QProgressBar( 3, m_splash );
m_pbar->setCenterIndicator(true);
m_splashBox->addWidget( m_infoLabel );
m_splashBox->addWidget( m_pbar );
int sw = m_splashBox->sizeHint().width()*2;
int sh = m_splashBox->sizeHint().height();
m_splash->setGeometry((240-(sw))/2, (320-sh)/2, sw, sh);
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);
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()
{
OWirelessNetworkInterface *wiface = static_cast<OWirelessNetworkInterface*>(ONetwork::instance()->interface(m_interface));
if( !wiface ) {
slotCleanSplash();
return;
}
if (!wiface->isAssociated()) {
Global::statusMessage(tr("Could not Join"));
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
@@ -27,33 +27,33 @@ namespace Opie{
namespace Core {
class OProcess;
}
}
class OpieStumbler: public QMainWindow {
Q_OBJECT
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 & );
void slotCurrentMousePressed(int button, QListViewItem *item, const QPoint &point, int c);
void slotHistoryMousePressed(int button, QListViewItem *item, const QPoint &point, int c);
void slotShowDetails();
void slotLoadManufacturers();
void slotJoinNetwork();
void slotAssociated();
void slotCheckDHCP();
void slotCleanSplash();
protected:
void loadConfig();
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
@@ -3,33 +3,33 @@
#include <qdialog.h>
#include <qlabel.h>
class QWidget;
class QString;
class QGroupBox;
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;
QLabel *m_levelLabel;
QLabel *m_encLabel;
QLabel *m_addrLabel;
QLabel *m_vendorLabel;
QLabel *m_timeLabel;
QLabel *m_ssid;
QLabel *m_type;
QLabel *m_channel;
QLabel *m_maxRate;
QLabel *m_level;
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
@@ -22,36 +22,36 @@ Stumbler::Stumbler(const QString &iface, QObject *parent, const char *name)
void Stumbler::start()
{
if (!m_wiface) {
odebug << "Error, interface " << m_wifaceName << " does not exist" << oendl;
return;
}
if (!ONetwork::instance()->isWirelessInterface(m_wifaceName.ascii())) {
odebug << "Error, " << m_wifaceName << " is not a wireless interface" << oendl;
//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()
{
if (m_timer->isActive()) {
odebug << "Stoping stumbler" << oendl;
m_timer->stop();
}
}
void Stumbler::setInterval(int msec)
{
m_interval = msec;
if (m_timer->isActive()) {
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 @@
#ifndef STUMBLERSETTINGS_H
#define STUMBLERSETTINGS_H
#include <qdialog.h>
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;
QLineEdit *m_interface;
};
#endif