7 files changed, 395 insertions, 225 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp index 37c3a91..698dfd3 100644 --- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp @@ -1,13 +1,18 @@ + #include "interfaceinformationimp.h" #include "interfaceadvanced.h" +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> #include <qpushbutton.h> #include <qlabel.h> #include <qgroupbox.h> #include <qmessagebox.h> -#include <qpe/config.h> #ifdef QWS #else @@ -18,7 +23,8 @@ * Constructor for the InterfaceInformationImp class. This class pretty much * just display's information about the interface that is passed to it. */ -InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i){ +InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *name, Interface *i, WFlags f):InterfaceInformation(parent, name, f), interface(i) +{ connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); connect(i, SIGNAL(updateMessage(const QString &)), this, SLOT(showMessage(const QString &))); updateInterface(interface); @@ -44,13 +50,16 @@ InterfaceInformationImp::~InterfaceInformationImp() * @param Intarface *i the interface to update (should be the one we already * know about). */ -void InterfaceInformationImp::updateInterface(Interface *){ - if(interface->getStatus()){ +void InterfaceInformationImp::updateInterface(Interface *) +{ + if(interface->getStatus()) + { startButton->setEnabled(false); stopButton->setEnabled(true); restartButton->setEnabled(true); } - else{ + else + { startButton->setEnabled(true); stopButton->setEnabled(false); restartButton->setEnabled(false); @@ -65,7 +74,8 @@ void InterfaceInformationImp::updateInterface(Interface *){ * Create the advanced widget. Fill it with the current interface's information. * Display it. */ -void InterfaceInformationImp::advanced(){ +void InterfaceInformationImp::advanced() +{ InterfaceAdvanced *a = new InterfaceAdvanced(this, "InterfaceAdvanced", Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog); a->interfaceName->setText(interface->getInterfaceName()); a->macAddressLabel->setText(interface->getMacAddress()); @@ -76,7 +86,7 @@ void InterfaceInformationImp::advanced(){ a->leaseObtainedLabel->setText(interface->getLeaseObtained()); a->leaseExpiresLabel->setText(interface->getLeaseExpires()); a->dhcpInformation->setEnabled(interface->isDhcp()); - a->showMaximized(); + QPEApplication::showWidget( a ); } /** @@ -84,7 +94,8 @@ void InterfaceInformationImp::advanced(){ * Purly for user feedback. * @param message the message to display. */ -void InterfaceInformationImp::showMessage(const QString &message){ +void InterfaceInformationImp::showMessage(const QString &message) +{ if (CheckBoxSilent->isChecked()) return; QMessageBox::information(this, "Message", message, QMessageBox::Ok); } diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index d9752ce..b0a1dd9 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -1,3 +1,4 @@ + #include "mainwindowimp.h" #include "addconnectionimp.h" #include "interfaceinformationimp.h" @@ -5,33 +6,23 @@ #include "interfaces.h" #include "module.h" +/* OPIE */ +#include <qpe/qcopenvelope_qws.h> +#include <qpe/qpeapplication.h> +#include <qpe/config.h> +#include <qpe/qlibrary.h> +#include <qpe/resource.h> + +/* QT */ #include <qpushbutton.h> #include <qlistbox.h> #include <qlineedit.h> #include <qlistview.h> #include <qheader.h> #include <qlabel.h> -#include <qpe/qcopenvelope_qws.h> #include <qtabwidget.h> // in order to disable the profiles tab -#include <qpe/qpeapplication.h> - #include <qmessagebox.h> -#ifdef QWS - #include <qpe/config.h> - #include <qpe/qlibrary.h> - #include <qpe/resource.h> - #include <qpe/qpeapplication.h> -#else - #include <klibloader.h> - #define QLibrary KLibrary - #include <kconfig.h> - #define Config KConfig - #include <kapplication.h> - #include <kstandarddirs.h> - #include <kiconloader.h> - #define showMaximized show -#endif #if QT_VERSION < 300 #include <qlist.h> @@ -43,6 +34,7 @@ #include <qtextstream.h> #include <qregexp.h> +/* STD */ #include <net/if.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -50,7 +42,8 @@ #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" #define _PROCNETDEV "/proc/net/dev" -MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME){ +MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWindow(parent, name, Qt::WStyle_ContextHelp), advancedUserMode(true), scheme(DEFAULT_SCHEME) +{ connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); @@ -78,22 +71,27 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi Interfaces i; QStringList list = i.getInterfaceList(); QMap<QString, Interface*>::Iterator it; - for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { + for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) + { /* * we skipped it in getAllInterfaces now * we need to ignore it as well */ - if (m_handledIfaces.contains( *ni) ) { + if (m_handledIfaces.contains( *ni) ) + { qDebug("Not up iface handled by module"); continue; } bool found = false; - for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ + for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ) + { if(it.key() == (*ni)) found = true; } - if(!found){ - if(!(*ni).contains("_")){ + if(!found) + { + if(!(*ni).contains("_")) + { Interface *i = new Interface(this, *ni, false); i->setAttached(false); i->setHardwareName(tr("Disconnected")); @@ -117,11 +115,14 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); QFile file(scheme); - if ( file.open(IO_ReadOnly) ) { // file opened successfully + if ( file.open(IO_ReadOnly) ) + { // file opened successfully QTextStream stream( &file ); // use a text stream - while ( !stream.eof() ) { // until end of file... + while ( !stream.eof() ) + { // until end of file... QString line = stream.readLine(); // line of text excluding '\n' - if(line.contains("SCHEME")){ + if(line.contains("SCHEME")) + { line = line.mid(7, line.length()); currentProfileLabel->setText(line); break; @@ -135,7 +136,8 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name, WFlags) : MainWi /** * Deconstructor. Save profiles. Delete loaded libraries. */ -MainWindowImp::~MainWindowImp(){ +MainWindowImp::~MainWindowImp() +{ // Save profiles. Config cfg("NetworkSetup"); cfg.setGroup("General"); @@ -143,7 +145,8 @@ MainWindowImp::~MainWindowImp(){ // Delete all interfaces that don't have owners. QMap<Interface*, QListViewItem*>::Iterator iIt; - for( iIt = items.begin(); iIt != items.end(); ++iIt ){ + for( iIt = items.begin(); iIt != items.end(); ++iIt ) + { if(iIt.key()->getModuleOwner() == NULL) delete iIt.key(); } @@ -151,7 +154,8 @@ MainWindowImp::~MainWindowImp(){ #ifdef QWS // Delete Modules and Libraries QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { delete it.key(); // I wonder why I can't delete the libraries // What fucking shit this is. @@ -165,7 +169,8 @@ MainWindowImp::~MainWindowImp(){ /** * Query the kernel for all of the interfaces. */ -void MainWindowImp::getAllInterfaces(){ +void MainWindowImp::getAllInterfaces() +{ int sockfd = socket(PF_INET, SOCK_DGRAM, 0); if(sockfd == -1) return; @@ -176,19 +181,23 @@ void MainWindowImp::getAllInterfaces(){ int result; Interface *i; - if (! procFile.exists()) { + if (! procFile.exists()) + { struct ifreq ifrs[100]; struct ifconf ifc; ifc.ifc_len = sizeof(ifrs); ifc.ifc_req = ifrs; result = ioctl(sockfd, SIOCGIFCONF, &ifc); - for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) { + for (unsigned int i = 0; i < ifc.ifc_len / sizeof(struct ifreq); i++) + { struct ifreq *pifr = &ifrs[i]; ifaces += pifr->ifr_name; } - } else { + } + else + { procFile.open(IO_ReadOnly); QString line; QTextStream procTs(&procFile); @@ -196,16 +205,20 @@ void MainWindowImp::getAllInterfaces(){ procTs.readLine(); // eat a line procTs.readLine(); // eat a line - while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) { - if((loc = line.find(":")) != -1) { + while((line = procTs.readLine().simplifyWhiteSpace()) != QString::null) + { + if((loc = line.find(":")) != -1) + { ifaces += line.left(loc); } } } - for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) { + for (QStringList::Iterator it = ifaces.begin(); it != ifaces.end(); ++it) + { int flags = 0; - if ( m_handledIfaces.contains( (*it) ) ) { + if ( m_handledIfaces.contains( (*it) ) ) + { qDebug(" %s is handled by a module", (*it).latin1() ); continue; } @@ -245,10 +258,13 @@ void MainWindowImp::getAllInterfaces(){ // now lets ask the plugins too ;) QMap<Module*, QLibrary*>::Iterator it; QList<Interface> ilist; - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { ilist = it.key()->getInterfaces(); - for( i = ilist.first(); i != 0; i = ilist.next() ){ + for( i = ilist.first(); i != 0; i = ilist.next() ) + { qWarning("Adding interface %s to interfaceNames\n", i->getInterfaceName().latin1() ); interfaceNames.insert(i->getInterfaceName(), i); updateInterface(i); @@ -264,7 +280,8 @@ void MainWindowImp::getAllInterfaces(){ * @param path a directory that is scaned for any plugins that can be loaded * and attempts to load them */ -void MainWindowImp::loadModules(const QString &path){ +void MainWindowImp::loadModules(const QString &path) +{ #ifdef DEBUG qDebug("MainWindowImp::loadModules: %s", path.latin1()); #endif @@ -277,11 +294,14 @@ void MainWindowImp::loadModules(const QString &path){ const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *fi; - while ( (fi=it.current()) ) { + while ( (fi=it.current()) ) + { #ifdef QWS - if(fi->fileName().contains(".so")){ + if(fi->fileName().contains(".so")) + { #else - if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")){ + if(fi->fileName().contains(".so") && fi->fileName().contains("networksettings_")) + { #endif loadPlugin(path + "/" + fi->fileName()); qDebug("loaded plugin: >%s< ",QString(path + "/" + fi->fileName()).latin1()); @@ -296,14 +316,16 @@ void MainWindowImp::loadModules(const QString &path){ * @param resolveString - function pointer to resolve * @return pointer to the function with name resolveString or NULL */ -Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){ +Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString) +{ #ifdef DEBUG qDebug("MainWindowImp::loadPlugin: %s: resolving %s", pluginFileName.latin1(), resolveString.latin1()); #endif #ifdef QWS QLibrary *lib = new QLibrary(pluginFileName); void *functionPointer = lib->resolve(resolveString); - if( !functionPointer ){ + if( !functionPointer ) + { #ifdef DEBUG qDebug("MainWindowImp::loadPlugin: Warning: %s is not a plugin", pluginFileName.latin1()); #endif @@ -312,7 +334,8 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & } // Try to get an object. Module *object = ((Module* (*)()) functionPointer)(); - if(object == NULL){ + if(object == NULL) + { #ifdef DEBUG qDebug("MainWindowImp: Couldn't create object, but did load library!"); #endif @@ -327,13 +350,15 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & #else QLibrary *lib = loader->library(pluginFileName); - if( !lib || !lib->hasSymbol(resolveString) ){ + if( !lib || !lib->hasSymbol(resolveString) ) + { qDebug(QString("MainWindowImp::loadPlugin: File: %1 is not a plugin, but though was.").arg(pluginFileName).latin1()); return NULL; } // Try to get an object. Module *object = ((Module* (*)()) lib->symbol(resolveString))(); - if(object == NULL){ + if(object == NULL) + { #ifdef DEBUG qDebug("MainWindowImp: Couldn't create object, but did load library!"); #endif @@ -352,33 +377,40 @@ Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString & * The Add button was clicked. Bring up the add dialog and if OK is hit * load the plugin and append it to the list */ -void MainWindowImp::addClicked(){ +void MainWindowImp::addClicked() +{ QMap<Module*, QLibrary*>::Iterator it; QMap<QString, QString> list; QMap<QString, Module*> newInterfaceOwners; - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { (it.key())->possibleNewInterfaces(list); } } // See if the list has anything that we can add. - if(list.count() == 0){ + if(list.count() == 0) + { QMessageBox::information(this, "Sorry", "Nothing to add.", QMessageBox::Ok); return; } AddConnectionImp addNewConnection(this, "AddConnectionImp", true); addNewConnection.addConnections(list); - addNewConnection.showMaximized(); - if(QDialog::Accepted == addNewConnection.exec()){ + if( QDialog::Accepted == QPEApplication::execDialog( &addNewConnection ) ) + { QListViewItem *item = addNewConnection.registeredServicesList->currentItem(); if(!item) return; - for( it = libraries.begin(); it != libraries.end(); ++it ){ - if(it.key()){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { + if(it.key()) + { Interface *i = (it.key())->addNewInterface(item->text(0)); - if(i){ + if(i) + { qDebug("iface name %s",i->getInterfaceName().latin1()); interfaceNames.insert(i->getInterfaceName(), i); updateInterface(i); @@ -392,21 +424,26 @@ void MainWindowImp::addClicked(){ * Prompt the user to see if they really want to do this. * If they do then remove from the list and unload. */ -void MainWindowImp::removeClicked(){ +void MainWindowImp::removeClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item) { + if(!item) + { QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); return; } Interface *i = interfaceItems[item]; - if(i->getModuleOwner() == NULL){ + if(i->getModuleOwner() == NULL) + { QMessageBox::information(this, "Can't remove interface.", "Interface is built in.", QMessageBox::Ok); } - else{ + else + { if(!i->getModuleOwner()->remove(i)) QMessageBox::information(this, tr("Error"), tr("Unable to remove."), QMessageBox::Ok); - else{ + else + { delete item; // QMessageBox::information(this, "Success", "Interface was removed.", QMessageBox::Ok); } @@ -418,9 +455,11 @@ void MainWindowImp::removeClicked(){ * Report an error if no interface is selected. * If the interface has a module owner then request its configure. */ -void MainWindowImp::configureClicked(){ +void MainWindowImp::configureClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item){ + if(!item) + { QMessageBox::information(this, tr("Sorry"),tr("Please select an interface first."), QMessageBox::Ok); return; } @@ -431,18 +470,20 @@ void MainWindowImp::configureClicked(){ Interface *i = interfaceItems[item]; - if(i->getModuleOwner()){ + if(i->getModuleOwner()) + { QWidget *moduleConfigure = i->getModuleOwner()->configure(i); - if(moduleConfigure != NULL){ + if(moduleConfigure != NULL) + { i->getModuleOwner()->setProfile(currentProfileText); - moduleConfigure->showMaximized(); + QPEApplication::showWidget( moduleConfigure ); return; } } InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(this, "InterfaceSetupImp", i, true, Qt::WDestructiveClose | Qt::WStyle_ContextHelp ); configure->setProfile(currentProfileText); - configure->showMaximized(); + QPEApplication::showDialog( configure ); } /** @@ -450,9 +491,11 @@ void MainWindowImp::configureClicked(){ * Report an error if no interface is selected. * If the interface has a module owner then request its configure. */ -void MainWindowImp::informationClicked(){ +void MainWindowImp::informationClicked() +{ QListViewItem *item = connectionList->currentItem(); - if(!item){ + if(!item) + { QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); return; } @@ -463,10 +506,12 @@ void MainWindowImp::informationClicked(){ // return; // } - if(i->getModuleOwner()){ + if(i->getModuleOwner()) + { QWidget *moduleInformation = i->getModuleOwner()->information(i); - if(moduleInformation != NULL){ - moduleInformation->showMaximized(); + if(moduleInformation != NULL) + { + QPEApplication::showWidget( moduleInformation ); #ifdef DEBUG qDebug("MainWindowImp::informationClicked:: Module owner has created, we showed."); #endif @@ -474,15 +519,17 @@ void MainWindowImp::informationClicked(){ } } InterfaceInformationImp *information = new InterfaceInformationImp(this, "InterfaceSetupImp", i, Qt::WType_Modal | Qt::WDestructiveClose | Qt::WStyle_Dialog | Qt::WStyle_ContextHelp); - information->showMaximized(); + QPEApplication::showWidget( information ); } /** * Update this interface. If no QListViewItem exists create one. * @param Interface* pointer to the interface that needs to be updated. */ -void MainWindowImp::updateInterface(Interface *i){ - if(!advancedUserMode){ +void MainWindowImp::updateInterface(Interface *i) +{ + if(!advancedUserMode) + { if(i->getInterfaceName() == "lo") return; } @@ -490,11 +537,13 @@ void MainWindowImp::updateInterface(Interface *i){ QListViewItem *item = NULL; // Find the interface, making it if needed. - if(items.find(i) == items.end()){ + if(items.find(i) == items.end()) + { item = new QListViewItem(connectionList, "", "", ""); // See if you can't find a module owner for this interface QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { if(it.key()->isOwner(i)) i->setModuleOwner(it.key()); } @@ -537,7 +586,8 @@ void MainWindowImp::updateInterface(Interface *i){ item->setText(4, (i->getStatus()) ? i->getIp() : QString("")); } -void MainWindowImp::newProfileChanged(const QString& newText){ +void MainWindowImp::newProfileChanged(const QString& newText) +{ if(newText.length() > 0) newProfileButton->setEnabled(true); else @@ -549,9 +599,11 @@ void MainWindowImp::newProfileChanged(const QString& newText){ * Don't add profiles that already exists. * Appends to the list and QStringList */ -void MainWindowImp::addProfile(){ +void MainWindowImp::addProfile() +{ QString newProfileName = newProfile->text(); - if(profiles.grep(newProfileName).count() > 0){ + if(profiles.grep(newProfileName).count() > 0) + { QMessageBox::information(this, "Can't Add","Profile already exists.", QMessageBox::Ok); return; } @@ -563,24 +615,29 @@ void MainWindowImp::addProfile(){ * Removes the currently selected profile in the combo. * Doesn't delete if there are less then 2 profiles. */ -void MainWindowImp::removeProfile(){ - if(profilesList->count() <= 1){ +void MainWindowImp::removeProfile() +{ + if(profilesList->count() <= 1) + { QMessageBox::information(this, "Can't remove.","At least one profile\nis needed.", QMessageBox::Ok); return; } QString profileToRemove = profilesList->currentText(); - if(profileToRemove == "All"){ + if(profileToRemove == "All") + { QMessageBox::information(this, "Can't remove.","Can't remove default.", QMessageBox::Ok); return; } // Can't remove the curent profile - if(profileToRemove == currentProfileLabel->text()){ + if(profileToRemove == currentProfileLabel->text()) + { QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), QMessageBox::Ok); return; } - if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ + if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) + { profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); profilesList->clear(); for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) @@ -590,15 +647,19 @@ void MainWindowImp::removeProfile(){ Interfaces interfaces; // Go through them one by one QMap<Interface*, QListViewItem*>::Iterator it; - for( it = items.begin(); it != items.end(); ++it ){ + for( it = items.begin(); it != items.end(); ++it ) + { QString interfaceName = it.key()->getInterfaceName(); qDebug(interfaceName.latin1()); - if(interfaces.setInterface(interfaceName + "_" + profileToRemove)){ + if(interfaces.setInterface(interfaceName + "_" + profileToRemove)) + { interfaces.removeInterface(); - if(interfaces.setMapping(interfaceName)){ + if(interfaces.setMapping(interfaceName)) + { if(profilesList->count() == 1) interfaces.removeMapping(); - else{ + else + { interfaces.removeMap("map", interfaceName + "_" + profileToRemove); } } @@ -613,26 +674,32 @@ void MainWindowImp::removeProfile(){ * A new profile has been selected, change. * @param newProfile the new profile. */ -void MainWindowImp::changeProfile(){ - if(profilesList->currentItem() == -1){ +void MainWindowImp::changeProfile() +{ + if(profilesList->currentItem() == -1) + { QMessageBox::information(this, "Can't Change.","Please select a profile.", QMessageBox::Ok); return; } QString newProfile = profilesList->text(profilesList->currentItem()); - if(newProfile != currentProfileLabel->text()){ + if(newProfile != currentProfileLabel->text()) + { currentProfileLabel->setText(newProfile); QFile::remove(scheme); QFile file(scheme); - if ( file.open(IO_ReadWrite) ) { + if ( file.open(IO_ReadWrite) ) + { QTextStream stream( &file ); stream << QString("SCHEME=%1").arg(newProfile); file.close(); } // restart all up devices? - if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ + if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok) + { // Go through them one by one QMap<Interface*, QListViewItem*>::Iterator it; - for( it = items.begin(); it != items.end(); ++it ){ + for( it = items.begin(); it != items.end(); ++it ) + { if(it.key()->getStatus() == true) it.key()->restart(); } @@ -653,7 +720,8 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) { bool found = false; qDebug("MainWindowImp::receive QCop msg >"+msg+"<"); - if (msg == "raise") { + if (msg == "raise") + { raise(); return; } @@ -664,9 +732,11 @@ void MainWindowImp::receive(const QCString &msg, const QByteArray &arg) qDebug("dest >%s< param >"+param+"<",dest.latin1()); QMap<Module*, QLibrary*>::Iterator it; - for( it = libraries.begin(); it != libraries.end(); ++it ){ + for( it = libraries.begin(); it != libraries.end(); ++it ) + { qDebug("plugin >%s<", it.key()->type().latin1() ); - if(it.key()->type() == dest){ + if(it.key()->type() == dest) + { it.key()->receive( param, arg ); found = true; } diff --git a/noncore/settings/networksettings/ppp/accounts.cpp b/noncore/settings/networksettings/ppp/accounts.cpp index 28d8732..b8a1925a 100644 --- a/noncore/settings/networksettings/ppp/accounts.cpp +++ b/noncore/settings/networksettings/ppp/accounts.cpp @@ -24,23 +24,28 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "accounts.h" +#include "authwidget.h" +#include "pppdata.h" +#include "edit.h" + +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qdir.h> -#include <stdlib.h> #include <qlayout.h> #include <qtabwidget.h> #include <qtabdialog.h> #include <qwhatsthis.h> #include <qmessagebox.h> - #include <qapplication.h> #include <qbuttongroup.h> #include <qmessagebox.h> #include <qvgroupbox.h> -#include "accounts.h" -#include "authwidget.h" -#include "pppdata.h" -#include "edit.h" +/* STD */ +#include <stdlib.h> void parseargs(char* buf, char** args); @@ -68,7 +73,8 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF listListbox->insertStringList(_pppdata->getAccountList()); - for (uint i = 0; i < listListbox->count(); i++){ + for (uint i = 0; i < listListbox->count(); i++) + { if ( listListbox->text(i) == _pppdata->accname() ) listListbox->setCurrentItem( i ); } @@ -76,7 +82,8 @@ AccountWidget::AccountWidget( PPPData *pd, QWidget *parent, const char *name, WF -void AccountWidget::slotListBoxSelect(int idx) { +void AccountWidget::slotListBoxSelect(int idx) +{ bool ok = _pppdata->setAccount( listListbox->text(idx) ); ok = (bool)(idx != -1); delete_b->setEnabled(ok); @@ -84,12 +91,14 @@ void AccountWidget::slotListBoxSelect(int idx) { //FIXME copy_b->setEnabled(ok); } -void AccountWidget::edit() { +void AccountWidget::edit() +{ _pppdata->setAccount(listListbox->text(listListbox->currentItem())); int result = doTab(); - if(result == QDialog::Accepted) { + if(result == QDialog::Accepted) + { listListbox->changeItem(_pppdata->accname(),listListbox->currentItem()); // emit resetaccounts(); _pppdata->save(); @@ -97,7 +106,8 @@ void AccountWidget::edit() { } -void AccountWidget::create() { +void AccountWidget::create() +{ // if(listListbox->count() == MAX_ACCOUNTS) { // QMessageBox::information(this, "sorry", @@ -106,29 +116,34 @@ void AccountWidget::create() { // } int result; - if (_pppdata->newaccount() == -1){ + if (_pppdata->newaccount() == -1) + { qDebug("_pppdata->newaccount() == -1"); return; } result = doTab(); - if(result == QDialog::Accepted) { + if(result == QDialog::Accepted) + { listListbox->insertItem(_pppdata->accname()); listListbox->setSelected(listListbox->findItem(_pppdata->accname()),true); _pppdata->save(); - } else + } + else _pppdata->deleteAccount(); } -void AccountWidget::copy() { +void AccountWidget::copy() +{ // if(listListbox->count() == MAX_ACCOUNTS) { // QMessageBox::information(this, "sorry", tr("Maximum number of accounts reached.")); // return; // } - if(listListbox->currentItem()<0) { + if(listListbox->currentItem()<0) + { QMessageBox::information(this, "sorry", tr("No account selected.")); return; } @@ -141,7 +156,8 @@ void AccountWidget::copy() { } -void AccountWidget::remove() { +void AccountWidget::remove() +{ QString s = tr("Are you sure you want to delete\nthe account \"%1\"?") .arg(listListbox->text(listListbox->currentItem())); @@ -164,7 +180,8 @@ void AccountWidget::remove() { } -int AccountWidget::doTab(){ +int AccountWidget::doTab() +{ QDialog *dlg = new QDialog( 0, "newAccount", true, Qt::WStyle_ContextHelp ); QVBoxLayout *layout = new QVBoxLayout( dlg ); layout->setSpacing( 0 ); @@ -175,10 +192,13 @@ int AccountWidget::doTab(){ bool isnewaccount; - if(_pppdata->accname().isEmpty()) { + if(_pppdata->accname().isEmpty()) + { dlg->setCaption(tr("New Account")); isnewaccount = true; - } else { + } + else + { QString tit = tr("Edit Account: "); tit += _pppdata->accname(); dlg->setCaption(tit); @@ -212,18 +232,24 @@ int AccountWidget::doTab(){ int result = 0; bool ok = false; - while (!ok){ - dlg->showMaximized(); - result = dlg->exec(); + while (!ok) + { + result = QPEApplication::execDialog( dlg ); ok = true; - if(result == QDialog::Accepted) { - if (!auth_w->check()){ + if(result == QDialog::Accepted) + { + if (!auth_w->check()) + { ok = false; - } else if(!dial_w->save()) { + } + else if(!dial_w->save()) + { QMessageBox::critical(this, "error", tr( "You must enter a unique account name")); ok = false; - }else{ + } + else + { ip_w->save(); dns_w->save(); gateway_w->save(); diff --git a/noncore/settings/networksettings/ppp/general.cpp b/noncore/settings/networksettings/ppp/general.cpp index 5540946..ff1b11b 100644 --- a/noncore/settings/networksettings/ppp/general.cpp +++ b/noncore/settings/networksettings/ppp/general.cpp @@ -24,9 +24,17 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <termios.h> -#include <string.h> +#include "general.h" +#include "interfaceppp.h" +#include "modeminfo.h" +#include "modemcmds.h" +#include "pppdata.h" +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> #include <qcombobox.h> #include <qlabel.h> @@ -35,20 +43,10 @@ #include <qslider.h> #include <qspinbox.h> #include <qwhatsthis.h> -#include <qpe/config.h> -// #include <qgroupbox.h> - - -#include "general.h" -#include "interfaceppp.h" -//#include "miniterm.h" -#include "modeminfo.h" -#include "modemcmds.h" -//#include "devices.h" -#include "pppdata.h" -//#include <klocale.h> - +/* STD */ +#include <termios.h> +#include <string.h> ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) @@ -148,7 +146,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) baud_c = new QComboBox(this); baud_label->setBuddy(baud_c); - static const char *baudrates[] = { + static const char *baudrates[] = + { #ifdef B460800 "460800", @@ -170,7 +169,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) "19200", "9600", "2400", - 0}; + 0 + }; for(k = 0; baudrates[k]; k++) baud_c->insertItem(baudrates[k]); @@ -190,7 +190,8 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) QWhatsThis::add(baud_label,tmp); QWhatsThis::add(baud_c,tmp); - for(int i=0; i <= enter->count()-1; i++) { + for(int i=0; i <= enter->count()-1; i++) + { if(_pppdata->enter() == enter->text(i)) enter->setCurrentItem(i); } @@ -237,17 +238,20 @@ ModemWidget::ModemWidget( PPPData *pd, QWidget *parent, const char *name ) "recommended value is 30 seconds.")); //set stuff from gpppdata - for(int i=0; i <= enter->count()-1; i++) { + for(int i=0; i <= enter->count()-1; i++) + { if(_pppdata->enter() == enter->text(i)) enter->setCurrentItem(i); } - for(int i=0; i <= modemdevice->count()-1; i++) { + for(int i=0; i <= modemdevice->count()-1; i++) + { if(_pppdata->modemDevice() == modemdevice->text(i)) modemdevice->setCurrentItem(i); } - for(int i=0; i <= flowcontrol->count()-1; i++) { + for(int i=0; i <= flowcontrol->count()-1; i++) + { if(_pppdata->flowcontrol() == flowcontrol->text(i)) flowcontrol->setCurrentItem(i); } @@ -273,9 +277,11 @@ ModemWidget::~ModemWidget() QString edited = modemdevice->currentText(); - if ( !( edited ).isEmpty() ) { + if ( !( edited ).isEmpty() ) + { edited.simplifyWhiteSpace(); - if ( devs.contains( edited ) == 0 ) { + if ( devs.contains( edited ) == 0 ) + { devs << edited; } _pppdata->setModemDevice( edited ); @@ -470,14 +476,16 @@ ModemWidget2::ModemWidget2( PPPData *pd, InterfacePPP *ip, QWidget *parent, } -void ModemWidget2::modemcmdsbutton() { +void ModemWidget2::modemcmdsbutton() +{ ModemCommands mc(_ifaceppp->data(), this, "commands" , true, Qt::WStyle_ContextHelp); - mc.showMaximized(); - mc.exec(); + + QPEApplication::execDialog( &mc ); } -void ModemWidget2::query_modem() { +void ModemWidget2::query_modem() +{ ModemTransfer mt(_ifaceppp->modem(), this); mt.exec(); } diff --git a/noncore/settings/networksettings/ppp/modeminfo.cpp b/noncore/settings/networksettings/ppp/modeminfo.cpp index dbb26db..df0bf9b 100644 --- a/noncore/settings/networksettings/ppp/modeminfo.cpp +++ b/noncore/settings/networksettings/ppp/modeminfo.cpp @@ -24,16 +24,20 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include <unistd.h> +#include "modeminfo.h" +#include "modem.h" + +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qregexp.h> #include <qlayout.h> -// #include <kwin.h> -// #include <kmessagebox.h> -// #include <kapplication.h> #include <qmessagebox.h> #include <qapplication.h> -#include "modeminfo.h" -#include "modem.h" + +/* STD */ +#include <unistd.h> ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) : QDialog(parent, name,TRUE, WStyle_Customize|WStyle_NormalBorder), @@ -93,7 +97,8 @@ ModemTransfer::ModemTransfer(Modem *mo, QWidget *parent, const char *name) } -void ModemTransfer::ati_done() { +void ModemTransfer::ati_done() +{ scripttimer->stop(); timeout_timer->stop(); _modem->closetty(); @@ -104,15 +109,16 @@ void ModemTransfer::ati_done() { ModemInfo *mi = new ModemInfo(this); for(int i = 0; i < NUM_OF_ATI; i++) mi->setAtiString(i, ati_query_strings[i]); - mi->showMaximized(); - mi->exec(); + + QPEApplication::execDialog( mi ); delete mi; accept(); } -void ModemTransfer::time_out_slot() { +void ModemTransfer::time_out_slot() +{ timeout_timer->stop(); scripttimer->stop(); @@ -121,26 +127,31 @@ void ModemTransfer::time_out_slot() { } -void ModemTransfer::init() { +void ModemTransfer::init() +{ qApp->processEvents(); int lock = _modem->lockdevice(); - if (lock == 1) { + if (lock == 1) + { statusBar->setText(QObject::tr("Modem device is locked.")); return; } - if (lock == -1) { + if (lock == -1) + { statusBar->setText(QObject::tr("Unable to create modem lock file.")); return; } - if(_modem->opentty()) { - if(_modem->hangup()) { + if(_modem->opentty()) + { + if(_modem->hangup()) + { usleep(100000); // wait 0.1 secs _modem->writeLine("ATE0Q1V1"); // E0 don't echo the commands I send ... @@ -165,11 +176,13 @@ void ModemTransfer::init() { } -void ModemTransfer::do_script() { +void ModemTransfer::do_script() +{ QString msg; QString query; - switch(step) { + switch(step) + { case 0: readtty(); statusBar->setText("ATI..."); @@ -199,12 +212,14 @@ void ModemTransfer::do_script() { step++; } -void ModemTransfer::readChar(unsigned char c) { +void ModemTransfer::readChar(unsigned char c) +{ if(readbuffer.length() < 255) readbuffer += c; } -void ModemTransfer::readtty() { +void ModemTransfer::readtty() +{ if (step == 0) return; @@ -220,7 +235,8 @@ void ModemTransfer::readtty() { } -void ModemTransfer::cancelbutton() { +void ModemTransfer::cancelbutton() +{ scripttimer->stop(); _modem->stop(); timeout_timer->stop(); @@ -236,7 +252,8 @@ void ModemTransfer::cancelbutton() { } -void ModemTransfer::closeEvent( QCloseEvent *e ) { +void ModemTransfer::closeEvent( QCloseEvent *e ) +{ cancelbutton(); e->accept(); } @@ -254,7 +271,8 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name) QGridLayout *l1 = new QGridLayout(NUM_OF_ATI, 2, 5); tl->addLayout(l1, 1); - for(int i = 0 ; i < NUM_OF_ATI ; i++) { + for(int i = 0 ; i < NUM_OF_ATI ; i++) + { label_text = ""; if ( i == 0) @@ -286,7 +304,8 @@ ModemInfo::ModemInfo(QWidget *parent, const char* name) } -void ModemInfo::setAtiString(int i, QString s) { +void ModemInfo::setAtiString(int i, QString s) +{ if(i < NUM_OF_ATI) ati_label_result[i]->setText(s); } diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index f7dacf6..a7caffe 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -1,8 +1,3 @@ -#include <errno.h> -#include <signal.h> - - -#include <qpe/config.h> #include "modem.h" #include "pppconfig.h" @@ -11,19 +6,32 @@ #include "interfaceinformationppp.h" #include "interfaceppp.h" +/* OPIE */ +#include <qpe/config.h> +#include <qpe/qpeapplication.h> + +/* QT */ + +/* STD */ +#include <errno.h> +#include <signal.h> + // don't polute global namespace -namespace { +namespace +{ /* * If network settings is qutting and we've ppp * devices open we need to save the pid_t the PPData * and the interface number */ - struct Connection { + struct Connection + { pid_t pid; QString device; QString name; }; - class InterfaceKeeper { + class InterfaceKeeper + { public: InterfaceKeeper(); ~InterfaceKeeper(); @@ -53,14 +61,16 @@ PPPModule::PPPModule() : Module() QMap<QString,QString>::Iterator it; InterfacePPP *iface; qDebug("getting interfaces"); - for( it = ifaces.begin(); it != ifaces.end(); ++it ){ + for( it = ifaces.begin(); it != ifaces.end(); ++it ) + { qDebug("ifaces %s %s", it.key().latin1(), it.data().latin1() ); iface = new InterfacePPP( 0, it.key() ); iface->setHardwareName( it.data() ); list.append( (Interface*)iface ); // check if (*it) is one of the running ifaces - if ( running.contains( it.data() ) ) { + if ( running.contains( it.data() ) ) + { qDebug("iface is running %s", it.key().latin1() ); handledInterfaceNames << running[it.data()].device; iface->setStatus( true ); @@ -76,14 +86,17 @@ PPPModule::PPPModule() : Module() /** * Delete any interfaces that we own. */ -PPPModule::~PPPModule(){ +PPPModule::~PPPModule() +{ qDebug("PPPModule::~PPPModule() " ); QMap<QString,QString> ifaces; InterfaceKeeper keeper; Interface *i; - for ( i=list.first(); i != 0; i=list.next() ){ + for ( i=list.first(); i != 0; i=list.next() ) + { /* if online save the state */ - if ( i->getStatus() ) { + if ( i->getStatus() ) + { qDebug("Iface %s is still up", i->getHardwareName().latin1() ); InterfacePPP* ppp = static_cast<InterfacePPP*>(i); keeper.addInterface( ppp->pppPID(), ppp->pppDev(), ppp->getHardwareName() ); @@ -97,7 +110,8 @@ PPPModule::~PPPModule(){ /** * Change the current profile */ -void PPPModule::setProfile(const QString &newProfile){ +void PPPModule::setProfile(const QString &newProfile) +{ profile = newProfile; } @@ -106,7 +120,8 @@ void PPPModule::setProfile(const QString &newProfile){ * @param Interface* can be used in determining the icon. * @return QString the icon name (minus .png, .gif etc) */ -QString PPPModule::getPixmapName(Interface* ){ +QString PPPModule::getPixmapName(Interface* ) +{ return "ppp"; } @@ -115,7 +130,8 @@ QString PPPModule::getPixmapName(Interface* ){ * @param Interface* interface to check against * @return bool true if i is owned by this module, false otherwise. */ -bool PPPModule::isOwner(Interface *i){ +bool PPPModule::isOwner(Interface *i) +{ return list.find( i ) != -1; } @@ -123,7 +139,8 @@ bool PPPModule::isOwner(Interface *i){ * Create, and return the WLANConfigure Module * @return QWidget* pointer to this modules configure. */ -QWidget *PPPModule::configure(Interface *i){ +QWidget *PPPModule::configure(Interface *i) +{ qDebug("return ModemWidget"); PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, 0, "PPPConfig", false, @@ -135,7 +152,8 @@ QWidget *PPPModule::configure(Interface *i){ * Create, and return the Information Module * @return QWidget* pointer to this modules info. */ -QWidget *PPPModule::information(Interface *i){ +QWidget *PPPModule::information(Interface *i) +{ // We don't have any advanced pppd information widget yet :-D // TODO ^ @@ -147,7 +165,8 @@ QWidget *PPPModule::information(Interface *i){ * @return QList<Interface> A list of interfaces that exsist that havn't * been called by isOwner() */ -QList<Interface> PPPModule::getInterfaces(){ +QList<Interface> PPPModule::getInterfaces() +{ // List all of the files in the peer directory qDebug("PPPModule::getInterfaces"); return list; @@ -159,19 +178,23 @@ QList<Interface> PPPModule::getInterfaces(){ * by possibleNewInterfaces(); * @return Interface* NULL if it was unable to be created. */ -Interface *PPPModule::addNewInterface(const QString &newInterface){ +Interface *PPPModule::addNewInterface(const QString &newInterface) +{ InterfacePPP *ifaceppp; Interface *iface; ifaceppp = new InterfacePPP(); PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); - imp.showMaximized(); - if(imp.exec() == QDialog::Accepted ){ + + if( QPEApplication::execDialog( &imp ) == QDialog::Accepted ) + { iface = (InterfacePPP*) ifaceppp; iface->setModuleOwner( this ); list.append( iface ); return iface; - }else { + } + else + { delete ifaceppp; iface = NULL; } @@ -182,7 +205,8 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ * Attempts to remove the interface, doesn't delete i * @return bool true if successful, false otherwise. */ -bool PPPModule::remove(Interface *i){ +bool PPPModule::remove(Interface *i) +{ return list.remove(i); } @@ -194,37 +218,44 @@ void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) -namespace { - InterfaceKeeper::InterfaceKeeper( ) { - } - InterfaceKeeper::~InterfaceKeeper() { +namespace +{ + InterfaceKeeper::InterfaceKeeper( ) + {} + InterfaceKeeper::~InterfaceKeeper() + { Config cfg("ppp_plugin_keeper"); QStringList lst = cfg.groupList(); - for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + { Connection con; cfg.setGroup( (*it) ); cfg.clearGroup(); } - for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) { + for (QMap<QString, Connection>::Iterator it = m_interfaces.begin(); it != m_interfaces.end(); ++it ) + { Connection con = it.data(); cfg.setGroup( con.name ); cfg.writeEntry( "pid", con.pid ); cfg.writeEntry( "device", con.device ); } } - void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) { + void InterfaceKeeper::addInterface(pid_t pid, const QString& dev, const QString& name ) + { Connection con; con.pid = pid; con.device = dev; con.name = name; m_interfaces.insert( name, con ); } - QMap<QString, Connection> InterfaceKeeper::interfaces()const { + QMap<QString, Connection> InterfaceKeeper::interfaces()const + { Config cfg("ppp_plugin_keeper"); QMap<QString, Connection> ifaces; QStringList lst = cfg.groupList(); - for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) { + for (QStringList::Iterator it = lst.begin(); it != lst.end(); ++it ) + { Connection con; cfg.setGroup( (*it) ); con.name = (*it); @@ -237,8 +268,10 @@ namespace { } return ifaces; } - bool InterfaceKeeper::isAvailable( pid_t p)const { - if (::kill(p, 0 ) == 0 || errno != ESRCH ) { + bool InterfaceKeeper::isAvailable( pid_t p)const + { + if (::kill(p, 0 ) == 0 || errno != ESRCH ) + { qDebug("isAvailable %d", p); return true; } diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 07bf73f..74d7f8e 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -1,9 +1,14 @@ + #include "wlanmodule.h" #include "wlanimp2.h" #include "infoimp.h" #include "wextensions.h" #include "interfaceinformationimp.h" +/* OPIE */ +#include <qpe/qpeapplication.h> + +/* QT */ #include <qcheckbox.h> #include <qcombobox.h> #include <qlabel.h> @@ -13,8 +18,6 @@ #include <qtabwidget.h> - - /** * Constructor, find all of the possible interfaces */ @@ -172,7 +175,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) if (count == 2){ // those should call the interface directly QWidget *info = getInfo( ifa ); - info->showMaximized(); + QPEApplication::showWidget( info ); if ( action.contains("start" ) ){ ifa->start(); @@ -190,7 +193,7 @@ void WLANModule::receive(const QCString ¶m, const QByteArray &arg) wlanconfigWiget = (WLANImp*) configure(ifa); toShow = (QDialog*) wlanconfigWiget; } - wlanconfigWiget->showMaximized(); + QPEApplication::showWidget( wlanconfigWiget ); stream >> value; qDebug("WLANModule (build 4) is setting %s of %s to %s", action.latin1(), interface.latin1(), value.latin1() ); if (value.isEmpty()){ |