Diffstat (limited to 'noncore/settings/networksettings/ppp/pppmodule.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 147 |
1 files changed, 90 insertions, 57 deletions
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,7 +1,2 @@ -#include <errno.h> -#include <signal.h> - - -#include <qpe/config.h> #include "modem.h" @@ -12,6 +7,17 @@ #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 @@ -19,10 +25,12 @@ namespace { * and the interface number */ - struct Connection { + struct Connection + { pid_t pid; QString device; QString name; }; - class InterfaceKeeper { + class InterfaceKeeper + { public: InterfaceKeeper(); @@ -54,5 +62,6 @@ PPPModule::PPPModule() : Module() 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() ); @@ -61,5 +70,6 @@ PPPModule::PPPModule() : Module() // 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; @@ -77,12 +87,15 @@ 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); @@ -98,6 +111,7 @@ PPPModule::~PPPModule(){ * Change the current profile */ -void PPPModule::setProfile(const QString &newProfile){ - profile = newProfile; +void PPPModule::setProfile(const QString &newProfile) +{ + profile = newProfile; } @@ -107,6 +121,7 @@ void PPPModule::setProfile(const QString &newProfile){ * @return QString the icon name (minus .png, .gif etc) */ -QString PPPModule::getPixmapName(Interface* ){ - return "ppp"; +QString PPPModule::getPixmapName(Interface* ) +{ + return "ppp"; } @@ -116,5 +131,6 @@ QString PPPModule::getPixmapName(Interface* ){ * @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; } @@ -124,9 +140,10 @@ bool PPPModule::isOwner(Interface *i){ * @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, - (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); + 0, "PPPConfig", false, + (Qt::WDestructiveClose | Qt::WStyle_ContextHelp)); return pppconfig; } @@ -136,9 +153,10 @@ QWidget *PPPModule::configure(Interface *i){ * @return QWidget* pointer to this modules info. */ -QWidget *PPPModule::information(Interface *i){ - // We don't have any advanced pppd information widget yet :-D - // TODO ^ +QWidget *PPPModule::information(Interface *i) +{ + // We don't have any advanced pppd information widget yet :-D + // TODO ^ - return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); + return new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); } @@ -148,8 +166,9 @@ QWidget *PPPModule::information(Interface *i){ * been called by isOwner() */ -QList<Interface> PPPModule::getInterfaces(){ - // List all of the files in the peer directory +QList<Interface> PPPModule::getInterfaces() +{ + // List all of the files in the peer directory qDebug("PPPModule::getInterfaces"); - return list; + return list; } @@ -160,21 +179,25 @@ QList<Interface> PPPModule::getInterfaces(){ * @return Interface* NULL if it was unable to be created. */ -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 ){ - iface = (InterfacePPP*) ifaceppp; - iface->setModuleOwner( this ); - list.append( iface ); - return iface; - }else { - delete ifaceppp; - iface = NULL; - } - return iface; +Interface *PPPModule::addNewInterface(const QString &newInterface) +{ + + InterfacePPP *ifaceppp; + Interface *iface; + ifaceppp = new InterfacePPP(); + PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); + + if( QPEApplication::execDialog( &imp ) == QDialog::Accepted ) + { + iface = (InterfacePPP*) ifaceppp; + iface->setModuleOwner( this ); + list.append( iface ); + return iface; + } + else + { + delete ifaceppp; + iface = NULL; + } + return iface; } @@ -183,5 +206,6 @@ Interface *PPPModule::addNewInterface(const QString &newInterface){ * @return bool true if successful, false otherwise. */ -bool PPPModule::remove(Interface *i){ +bool PPPModule::remove(Interface *i) +{ return list.remove(i); } @@ -195,11 +219,14 @@ 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) ); @@ -207,5 +234,6 @@ namespace { } - 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 ); @@ -214,5 +242,6 @@ namespace { } } - 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; @@ -221,9 +250,11 @@ namespace { 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) ); @@ -238,6 +269,8 @@ 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; |