Diffstat (limited to 'noncore/net/opiestumbler/opiestumbler.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/net/opiestumbler/opiestumbler.cpp | 14 |
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 @@ -42,57 +42,57 @@ QString OpieStumbler::appCaption() { } OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags) :QMainWindow(parent, name, WStyle_ContextHelp), m_listCurrent(new QListView(this)), m_listHistory(new QListView(this)), m_stationsCurrent(new QList<Opie::Net::OStation>), m_popupCurrent(new QPopupMenu(this)), m_popupHistory(new QPopupMenu(this)), 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); menuBar()->insertItem(tr("Scanning"), scanMenu); QPEApplication::setStylusOperation(m_listCurrent->viewport(), QPEApplication::RightOnHold); QPEApplication::setStylusOperation(m_listHistory->viewport(), QPEApplication::RightOnHold); m_listCurrent->addColumn(tr("SSID")); m_listCurrent->addColumn(tr("Chan")); m_listCurrent->addColumn(tr("Signal")); @@ -106,49 +106,49 @@ OpieStumbler::OpieStumbler(QWidget *parent, const char *name, WFlags) m_listHistory->addColumn(tr("Vendor")); connect(m_listCurrent, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)), this, SLOT(slotCurrentMousePressed (int, QListViewItem*, const QPoint&, int))); connect(m_listHistory, SIGNAL(mouseButtonPressed (int, QListViewItem*, const QPoint&, int)), this, SLOT(slotHistoryMousePressed (int, QListViewItem*, const QPoint&, int))); 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(); } void OpieStumbler::slotStopScanning() { setCaption(appCaption()); m_stumbler->stop(); } void OpieStumbler::slotUpdateStations() @@ -213,50 +213,50 @@ void OpieStumbler::slotCurrentMousePressed(int button, QListViewItem * item, con m_popupCurrent->popup(point); } } void OpieStumbler::slotHistoryMousePressed(int button, QListViewItem * item, const QPoint &point, int c) { Q_UNUSED(c) 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); else retval = m_db->lookup(mac); if ( retval.isEmpty() ) retval = tr("Unknown"); return retval; } @@ -274,63 +274,63 @@ void OpieStumbler::slotJoinNetwork() for(; it.current() && it.current()->st->macAddress.toString() != m_mac; ++it ); if( !it.current() ) return; m_ssid = it.current()->st->ssid.left(it.current()->st->ssid.length()-1); m_splash = new QFrame( this, "splash", false, WStyle_StaysOnTop | WStyle_DialogBorder | WStyle_Customize ); 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")); m_infoLabel->setText(tr("Could not Join")); QTimer::singleShot(5000, this, SLOT(slotCleanSplash())); return; } Global::statusMessage(tr("Joined")); m_pbar->setProgress(2); m_infoLabel->setText(QString("<center><b>%1 %2</b></center>").arg(tr("Joined Network")).arg(m_ssid)); |