Diffstat (limited to 'noncore/settings/networksettings/ppp/pppmodule.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/ppp/pppmodule.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp index 7cbccc2..95df068 100644 --- a/noncore/settings/networksettings/ppp/pppmodule.cpp +++ b/noncore/settings/networksettings/ppp/pppmodule.cpp @@ -1,27 +1,28 @@ + #include "pppconfig.h" #include "pppmodule.h" #include "pppdata.h" -#include "kpppwidget.h" -#include "interfaceinformationimp.h" -//#include "devices.h" +#include "interfaceinformationppp.h" +#include "interfaceppp.h" + /** * Constructor, find all of the possible interfaces */ PPPModule::PPPModule() : Module() { - QMap<QString,QString> ifaces = PPPData::data()->getConfiguredInterfaces(); + QMap<QString,QString> ifaces = PPPData::getConfiguredInterfaces(); QMap<QString,QString>::Iterator it; - Interface *iface; + InterfacePPP *iface; qDebug("getting interfaces"); for( it = ifaces.begin(); it != ifaces.end(); ++it ){ qDebug("ifaces %s", it.key().latin1()); - iface = new Interface( 0, it.key() ); + iface = new InterfacePPP( 0, it.key() ); iface->setHardwareName( it.data() ); - list.append( iface ); + list.append( (Interface*)iface ); } } /** * Delete any interfaces that we own. */ @@ -29,14 +30,13 @@ PPPModule::~PPPModule(){ QMap<QString,QString> ifaces; Interface *i; for ( i=list.first(); i != 0; i=list.next() ){ ifaces.insert( i->getInterfaceName(), i->getHardwareName() ); delete i; } - PPPData::data()->setConfiguredInterfaces( ifaces ); - PPPData::data()->save(); + PPPData::setConfiguredInterfaces( ifaces ); } /** * Change the current profile */ void PPPModule::setProfile(const QString &newProfile){ @@ -64,27 +64,28 @@ bool PPPModule::isOwner(Interface *i){ /** * Create, and return the WLANConfigure Module * @return QWidget* pointer to this modules configure. */ QWidget *PPPModule::configure(Interface *i){ qDebug("return ModemWidget"); - PPPConfigWidget *pppconfig = new PPPConfigWidget( i, 0, "PPPConfig", - false, + PPPConfigWidget *pppconfig = new PPPConfigWidget( (InterfacePPP*)i, + 0, "PPPConfig", false, Qt::WDestructiveClose ); return pppconfig; } /** * Create, and return the Information Module * @return QWidget* pointer to this modules info. */ QWidget *PPPModule::information(Interface *i){ // We don't have any advanced pppd information widget yet :-D // TODO ^ qDebug("return PPPModule::information"); - InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); +// InterfaceInformationImp *information = new InterfaceInformationImp( 0, "InterfaceSetupImp", i); + InterfaceInformationPPP *information = new InterfaceInformationPPP( 0, "InterfaceInformationPPP", i ); return information; } /** * Get all active (up or down) interfaces * @return QList<Interface> A list of interfaces that exsist that havn't @@ -103,18 +104,20 @@ QList<Interface> PPPModule::getInterfaces(){ * @return Interface* NULL if it was unable to be created. */ Interface *PPPModule::addNewInterface(const QString &newInterface){ qDebug("try to add iface %s",newInterface.latin1()); + InterfacePPP *ifaceppp; Interface *iface; - iface = new Interface(); - PPPConfigWidget imp(iface, 0, "PPPConfigImp", true); + ifaceppp = new InterfacePPP(); + PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); imp.showMaximized(); if(imp.exec() == QDialog::Accepted ){ iface->setModuleOwner( this ); + iface = ifaceppp; list.append( iface ); return iface; }else { delete iface; iface = NULL; } |