summaryrefslogtreecommitdiff
authortille <tille>2003-06-02 15:12:10 (UTC)
committer tille <tille>2003-06-02 15:12:10 (UTC)
commit2d9798f244078089a0305d26509e288bb4a4190e (patch) (unidiff)
treefd1932ca218382dc607ee21dd754693e30ef74e9
parent6f49eaa7cf9589bf1f3f4277dc6dbd4d35cb0462 (diff)
downloadopie-2d9798f244078089a0305d26509e288bb4a4190e.zip
opie-2d9798f244078089a0305d26509e288bb4a4190e.tar.gz
opie-2d9798f244078089a0305d26509e288bb4a4190e.tar.bz2
impl remove item
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/ppp/TODO2
-rw-r--r--noncore/settings/networksettings/ppp/pppdata.cpp5
-rw-r--r--noncore/settings/networksettings/ppp/pppmodule.cpp11
3 files changed, 9 insertions, 9 deletions
diff --git a/noncore/settings/networksettings/ppp/TODO b/noncore/settings/networksettings/ppp/TODO
index 529d236..5635438 100644
--- a/noncore/settings/networksettings/ppp/TODO
+++ b/noncore/settings/networksettings/ppp/TODO
@@ -1,7 +1,7 @@
1- add possibility to input username and password ;) 1- add possibility to input username and password ;)
2- impl. PPPData::copyaccount & PPPData::deleteAccount 2- impl. PPPData::copyaccount & PPPData::deleteAccount
3- update modem attribute inputs when modem has changed 3- update modem attribute inputs when modem has changed
4- fix layout of edit account, i.e. get it shown maximised 4- fix layout of edit account, i.e. get it shown maximised
5- popup configure modem with the correct account prselected 5- popup configure modem with the correct account prselected
6 not quite shure why it does not work... IMHO it should work 6 not quite shure why it does not work... IMHO it should work
7- remove interfaces 7
diff --git a/noncore/settings/networksettings/ppp/pppdata.cpp b/noncore/settings/networksettings/ppp/pppdata.cpp
index 517dd8b..23db409 100644
--- a/noncore/settings/networksettings/ppp/pppdata.cpp
+++ b/noncore/settings/networksettings/ppp/pppdata.cpp
@@ -1236,25 +1236,28 @@ void PPPData::setpppdRunning(bool set) {
1236} 1236}
1237 1237
1238int PPPData::pppdError() const { 1238int PPPData::pppdError() const {
1239 return pppderror; 1239 return pppderror;
1240} 1240}
1241 1241
1242void PPPData::setpppdError(int err) { 1242void PPPData::setpppdError(int err) {
1243 pppderror = err; 1243 pppderror = err;
1244} 1244}
1245 1245
1246QString PPPData::modemGroup() 1246QString PPPData::modemGroup()
1247{ 1247{
1248 if (modemDeviceGroup<0)qFatal("wrong modem %i",modemDeviceGroup); 1248 if (modemDeviceGroup<0){
1249 qDebug("wrong modem %i\n using 0",modemDeviceGroup);
1250 modemDeviceGroup = 0; //FIXME!
1251 }
1249 return QString("%1_%1").arg(MODEM_GRP).arg(modemDeviceGroup); 1252 return QString("%1_%1").arg(MODEM_GRP).arg(modemDeviceGroup);
1250} 1253}
1251 1254
1252 1255
1253QMap<QString,QString> PPPData::getConfiguredInterfaces() 1256QMap<QString,QString> PPPData::getConfiguredInterfaces()
1254{ 1257{
1255 QMap<QString,QString> ifaces; 1258 QMap<QString,QString> ifaces;
1256 Config config = PPPData::config(); 1259 Config config = PPPData::config();
1257 config.setGroup(ACCLIST_GRP); 1260 config.setGroup(ACCLIST_GRP);
1258 int count = config.readNumEntry( ACCOUNTS_COUNT, -1 ); 1261 int count = config.readNumEntry( ACCOUNTS_COUNT, -1 );
1259 QString accGrp, dev, acc; 1262 QString accGrp, dev, acc;
1260 for (int i = 0; i < count; i++){ 1263 for (int i = 0; i < count; i++){
diff --git a/noncore/settings/networksettings/ppp/pppmodule.cpp b/noncore/settings/networksettings/ppp/pppmodule.cpp
index 95df068..8c401a9 100644
--- a/noncore/settings/networksettings/ppp/pppmodule.cpp
+++ b/noncore/settings/networksettings/ppp/pppmodule.cpp
@@ -96,47 +96,44 @@ QList<Interface> PPPModule::getInterfaces(){
96 qDebug("PPPModule::getInterfaces"); 96 qDebug("PPPModule::getInterfaces");
97 return list; 97 return list;
98} 98}
99 99
100/** 100/**
101 * Attempt to add a new interface as defined by name 101 * Attempt to add a new interface as defined by name
102 * @param name the name of the type of interface that should be created given 102 * @param name the name of the type of interface that should be created given
103 * by possibleNewInterfaces(); 103 * by possibleNewInterfaces();
104 * @return Interface* NULL if it was unable to be created. 104 * @return Interface* NULL if it was unable to be created.
105 */ 105 */
106Interface *PPPModule::addNewInterface(const QString &newInterface){ 106Interface *PPPModule::addNewInterface(const QString &newInterface){
107 107
108 qDebug("try to add iface %s",newInterface.latin1());
109
110 InterfacePPP *ifaceppp; 108 InterfacePPP *ifaceppp;
111 Interface *iface; 109 Interface *iface;
112 ifaceppp = new InterfacePPP(); 110 ifaceppp = new InterfacePPP();
113 PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true); 111 PPPConfigWidget imp(ifaceppp, 0, "PPPConfigImp", true);
114 imp.showMaximized(); 112 imp.showMaximized();
115 if(imp.exec() == QDialog::Accepted ){ 113 if(imp.exec() == QDialog::Accepted ){
114 iface = (InterfacePPP*) ifaceppp;
116 iface->setModuleOwner( this ); 115 iface->setModuleOwner( this );
117 iface = ifaceppp;
118 list.append( iface ); 116 list.append( iface );
119 return iface; 117 return iface;
120 }else { 118 }else {
121 delete iface; 119 delete ifaceppp;
122 iface = NULL; 120 iface = NULL;
123 } 121 }
124 return iface; 122 return iface;
125} 123}
126 124
127/** 125/**
128 * Attempts to remove the interface, doesn't delete i 126 * Attempts to remove the interface, doesn't delete i
129 * @return bool true if successfull, false otherwise. 127 * @return bool true if successfull, false otherwise.
130 */ 128 */
131bool PPPModule::remove(Interface*){ 129bool PPPModule::remove(Interface *i){
132 // Can't remove a hardware device, you can stop it though. 130 return list.remove(i);
133 return false;
134} 131}
135 132
136void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces) 133void PPPModule::possibleNewInterfaces(QMap<QString, QString> &newIfaces)
137{ 134{
138 newIfaces.insert(QObject::tr("PPP") , 135 newIfaces.insert(QObject::tr("PPP") ,
139 QObject::tr("generic ppp device")); 136 QObject::tr("generic ppp device"));
140} 137}
141 138
142 139