author | benmeyer <benmeyer> | 2002-11-08 16:16:11 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-11-08 16:16:11 (UTC) |
commit | e0db2259cc26cab12c6f1131b82dd867c454a3ff (patch) (unidiff) | |
tree | e251396e5e96839aed5bf6a930dff37fefe5acc0 /noncore/settings/networksettings | |
parent | d8ac5b68b504536136347547816992b1cf605cd4 (diff) | |
download | opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.zip opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.tar.gz opie-e0db2259cc26cab12c6f1131b82dd867c454a3ff.tar.bz2 |
Code Optimizations
Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (ignore whitespace changes)
18 files changed, 119 insertions, 96 deletions
diff --git a/noncore/settings/networksettings/TODO b/noncore/settings/networksettings/TODO index 8e57405..7185dbe 100644 --- a/noncore/settings/networksettings/TODO +++ b/noncore/settings/networksettings/TODO | |||
@@ -1,8 +1,6 @@ | |||
1 | CLEAN UP | 1 | CLEAN UP |
2 | 2 | ||
3 | Write a class that parses /proc and not ifconfig | ||
4 | |||
5 | udchcp needs to output the dhcp information so interfaces can read it | 3 | udchcp needs to output the dhcp information so interfaces can read it |
6 | 4 | ||
7 | interfacesetupimp really doesn't need a interface* pointer | 5 | interfacesetupimp really doesn't need a interface* pointer |
8 | 6 | ||
@@ -11,4 +9,5 @@ Possible other modules to write: ppp, ipsec, bluetooth, ipchains | |||
11 | PPP module needs to scan pppd.tdb to see what is currently active | 9 | PPP module needs to scan pppd.tdb to see what is currently active |
12 | 10 | ||
13 | WLAN - add possiblity to input text or hex without knowing "s:" | 11 | WLAN - add possiblity to input text or hex without knowing "s:" |
14 | 12 | ||
13 | Interface setupimp needs to use kernel calls. | ||
diff --git a/noncore/settings/networksettings/addconnectionimp.cpp b/noncore/settings/networksettings/addconnectionimp.cpp index 53db0fc..07545f7 100644 --- a/noncore/settings/networksettings/addconnectionimp.cpp +++ b/noncore/settings/networksettings/addconnectionimp.cpp | |||
@@ -16,18 +16,17 @@ AddConnectionImp::AddConnectionImp(QWidget *parent, const char *name, WFlags f): | |||
16 | * The current item changed, update the discription. | 16 | * The current item changed, update the discription. |
17 | */ | 17 | */ |
18 | void AddConnectionImp::changed(){ | 18 | void AddConnectionImp::changed(){ |
19 | QListViewItem *item = registeredServicesList->currentItem(); | 19 | QListViewItem *item = registeredServicesList->currentItem(); |
20 | if(item){ | 20 | if(item) |
21 | help->setText(list[item->text(0)]); | 21 | help->setText(list[item->text(0)]); |
22 | } | ||
23 | } | 22 | } |
24 | 23 | ||
25 | /** | 24 | /** |
26 | * Save a copy of newList for the discriptions and append them all to the view | 25 | * Save a copy of newList for the discriptions and append them all to the view |
27 | * @param newList the new list of possible interfaces | 26 | * @param newList the new list of possible interfaces |
28 | */ | 27 | */ |
29 | void AddConnectionImp::addConnections(QMap<QString, QString> newList){ | 28 | void AddConnectionImp::addConnections(const QMap<QString, QString> &newList){ |
30 | list = newList; | 29 | list = newList; |
31 | QMap<QString, QString>::Iterator it; | 30 | QMap<QString, QString>::Iterator it; |
32 | for( it = list.begin(); it != list.end(); ++it ) | 31 | for( it = list.begin(); it != list.end(); ++it ) |
33 | QListViewItem *item = new QListViewItem(registeredServicesList, it.key()); | 32 | QListViewItem *item = new QListViewItem(registeredServicesList, it.key()); |
diff --git a/noncore/settings/networksettings/addconnectionimp.h b/noncore/settings/networksettings/addconnectionimp.h index 643cd9a..680a502 100644 --- a/noncore/settings/networksettings/addconnectionimp.h +++ b/noncore/settings/networksettings/addconnectionimp.h | |||
@@ -12,9 +12,9 @@ class AddConnectionImp : public AddConnection { | |||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | AddConnectionImp(QWidget *parent=0, const char *name=0, WFlags f=0); | 15 | AddConnectionImp(QWidget *parent=0, const char *name=0, WFlags f=0); |
16 | void addConnections(QMap<QString, QString> newList); | 16 | void addConnections(const QMap<QString, QString> &newList); |
17 | 17 | ||
18 | private slots: | 18 | private slots: |
19 | void changed(); | 19 | void changed(); |
20 | 20 | ||
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp index e4f405e..4129b3d 100644 --- a/noncore/settings/networksettings/interfaces/interface.cpp +++ b/noncore/settings/networksettings/interfaces/interface.cpp | |||
@@ -41,9 +41,9 @@ void Interface::setAttached(bool isAttached){ | |||
41 | * Set Hardware name | 41 | * Set Hardware name |
42 | * @param name - the new name | 42 | * @param name - the new name |
43 | * emit updateInterface | 43 | * emit updateInterface |
44 | */ | 44 | */ |
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(const QString &name){ |
46 | hardwareName = name; | 46 | hardwareName = name; |
47 | emit(updateInterface(this)); | 47 | emit(updateInterface(this)); |
48 | }; | 48 | }; |
49 | 49 | ||
diff --git a/noncore/settings/networksettings/interfaces/interface.h b/noncore/settings/networksettings/interfaces/interface.h index fc064fe..989d6d8 100644 --- a/noncore/settings/networksettings/interfaces/interface.h +++ b/noncore/settings/networksettings/interfaces/interface.h | |||
@@ -14,23 +14,22 @@ signals: | |||
14 | void updateMessage(const QString &message); | 14 | void updateMessage(const QString &message); |
15 | 15 | ||
16 | public: | 16 | public: |
17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); | 17 | Interface(QObject * parent=0, const char * name= "unknown", bool status = false); |
18 | virtual ~Interface(){}; | ||
19 | 18 | ||
20 | virtual QString getInterfaceName(){ QString n(this->name()); return n; }; | 19 | QString getInterfaceName(){ QString n(this->name()); return n; }; |
21 | 20 | ||
22 | virtual bool getStatus(){ return status; }; | 21 | bool getStatus(){ return status; }; |
23 | virtual void setStatus(bool newStatus); | 22 | void setStatus(bool newStatus); |
24 | 23 | ||
25 | virtual bool isAttached(){ return attached; }; | 24 | bool isAttached(){ return attached; }; |
26 | virtual void setAttached(bool isAttached=false); | 25 | void setAttached(bool isAttached=false); |
27 | 26 | ||
28 | virtual QString getHardwareName(){ return hardwareName; }; | 27 | QString getHardwareName(){ return hardwareName; }; |
29 | virtual void setHardwareName(QString name="Unknown"); | 28 | void setHardwareName(const QString &name="Unknown"); |
30 | 29 | ||
31 | virtual Module* getModuleOwner(){ return moduleOwner; }; | 30 | Module* getModuleOwner(){ return moduleOwner; }; |
32 | virtual void setModuleOwner(Module *owner=NULL); | 31 | void setModuleOwner(Module *owner=NULL); |
33 | 32 | ||
34 | // inet information. | 33 | // inet information. |
35 | QString getMacAddress(){ return macAddress; }; | 34 | QString getMacAddress(){ return macAddress; }; |
36 | QString getIp(){ return ip; }; | 35 | QString getIp(){ return ip; }; |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index f1b8067..708f399 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -69,9 +69,9 @@ QStringList Interfaces::getInterfaceList(){ | |||
69 | * Report any duplicates such as eth0 being in two differnt auto's | 69 | * Report any duplicates such as eth0 being in two differnt auto's |
70 | * @param interface interface to check to see if it is on or not. | 70 | * @param interface interface to check to see if it is on or not. |
71 | * @return true is interface is in auto | 71 | * @return true is interface is in auto |
72 | */ | 72 | */ |
73 | bool Interfaces::isAuto(QString interface){ | 73 | bool Interfaces::isAuto(const QString &interface){ |
74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 74 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
75 | QStringList awi = autoLines.grep(QRegExp(interface)); | 75 | QStringList awi = autoLines.grep(QRegExp(interface)); |
76 | if(awi.count() > 1) | 76 | if(awi.count() > 1) |
77 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); | 77 | qDebug(QString("Interfaces: Found more then auto group with interface: %1.").arg(interface).latin1()); |
@@ -85,9 +85,9 @@ bool Interfaces::isAuto(QString interface){ | |||
85 | * @param interface the interface to set | 85 | * @param interface the interface to set |
86 | * @param setAuto the value to set interface to. | 86 | * @param setAuto the value to set interface to. |
87 | * @return false if already set to setAuto. | 87 | * @return false if already set to setAuto. |
88 | * */ | 88 | * */ |
89 | bool Interfaces::setAuto(QString interface, bool setAuto){ | 89 | bool Interfaces::setAuto(const QString &interface, bool setAuto){ |
90 | // Don't need to set it if it is already set. | 90 | // Don't need to set it if it is already set. |
91 | if(isAuto(interface) == setAuto) | 91 | if(isAuto(interface) == setAuto) |
92 | return false; | 92 | return false; |
93 | 93 | ||
@@ -155,24 +155,24 @@ bool Interfaces::isInterfaceSet(){ | |||
155 | * Must of one of the families defined in interfaces.h | 155 | * Must of one of the families defined in interfaces.h |
156 | * @param method for the family. see interfaces man page for family methods. | 156 | * @param method for the family. see interfaces man page for family methods. |
157 | * @return true if successfull. | 157 | * @return true if successfull. |
158 | */ | 158 | */ |
159 | bool Interfaces::addInterface(QString interface, QString family, QString method){ | 159 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ |
160 | if(acceptedFamily.contains(family)==0) | 160 | if(acceptedFamily.contains(family)==0) |
161 | return false; | 161 | return false; |
162 | interface = interface.simplifyWhiteSpace(); | 162 | QString newInterface = interface.simplifyWhiteSpace(); |
163 | interface = interface.replace(QRegExp(" "), ""); | 163 | newInterface = newInterface.replace(QRegExp(" "), ""); |
164 | interfaces.append(""); | 164 | interfaces.append(""); |
165 | interfaces.append(QString(IFACE " %1 %2 %3").arg(interface).arg(family).arg(method)); | 165 | interfaces.append(QString(IFACE " %1 %2 %3").arg(newInterface).arg(family).arg(method)); |
166 | return true; | 166 | return true; |
167 | } | 167 | } |
168 | 168 | ||
169 | /** | 169 | /** |
170 | * Copies interface with name interface to name newInterface | 170 | * Copies interface with name interface to name newInterface |
171 | * @param newInterface name of the new interface. | 171 | * @param newInterface name of the new interface. |
172 | * @return bool true if successfull | 172 | * @return bool true if successfull |
173 | */ | 173 | */ |
174 | bool Interfaces::copyInterface(QString interface, QString newInterface){ | 174 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ |
175 | if(!setInterface(interface)) return false; | 175 | if(!setInterface(interface)) return false; |
176 | 176 | ||
177 | QStringList::Iterator it = currentIface; | 177 | QStringList::Iterator it = currentIface; |
178 | it++; | 178 | it++; |
@@ -279,15 +279,15 @@ QString Interfaces::getInterfaceMethod(bool &error){ | |||
279 | * Sets the interface name to newName. | 279 | * Sets the interface name to newName. |
280 | * @param newName the new name of the interface. All whitespace is removed. | 280 | * @param newName the new name of the interface. All whitespace is removed. |
281 | * @return bool true if successfull. | 281 | * @return bool true if successfull. |
282 | */ | 282 | */ |
283 | bool Interfaces::setInterfaceName(QString newName){ | 283 | bool Interfaces::setInterfaceName(const QString &newName){ |
284 | if(currentIface == interfaces.end()) | 284 | if(currentIface == interfaces.end()) |
285 | return false; | 285 | return false; |
286 | newName = newName.simplifyWhiteSpace(); | 286 | QString name = newName.simplifyWhiteSpace(); |
287 | newName = newName.replace(QRegExp(" "), ""); | 287 | name = name.replace(QRegExp(" "), ""); |
288 | bool returnValue = false; | 288 | bool returnValue = false; |
289 | (*currentIface) = QString("iface %1 %2 %3").arg(newName).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); | 289 | (*currentIface) = QString("iface %1 %2 %3").arg(name).arg(getInterfaceFamily(returnValue)).arg(getInterfaceMethod(returnValue)); |
290 | return !returnValue; | 290 | return !returnValue; |
291 | } | 291 | } |
292 | 292 | ||
293 | /** | 293 | /** |
@@ -295,9 +295,9 @@ bool Interfaces::setInterfaceName(QString newName){ | |||
295 | * @param newName the new name of the interface. Must be one of the families | 295 | * @param newName the new name of the interface. Must be one of the families |
296 | * defined in the interfaces.h file. | 296 | * defined in the interfaces.h file. |
297 | * @return bool true if successfull. | 297 | * @return bool true if successfull. |
298 | */ | 298 | */ |
299 | bool Interfaces::setInterfaceFamily(QString newName){ | 299 | bool Interfaces::setInterfaceFamily(const QString &newName){ |
300 | if(currentIface == interfaces.end()) | 300 | if(currentIface == interfaces.end()) |
301 | return false; | 301 | return false; |
302 | if(acceptedFamily.contains(newName)==0) | 302 | if(acceptedFamily.contains(newName)==0) |
303 | return false; | 303 | return false; |
@@ -310,9 +310,9 @@ bool Interfaces::setInterfaceFamily(QString newName){ | |||
310 | * Sets the interface method to newName | 310 | * Sets the interface method to newName |
311 | * @param newName the new name of the interface | 311 | * @param newName the new name of the interface |
312 | * @return bool true if successfull. | 312 | * @return bool true if successfull. |
313 | */ | 313 | */ |
314 | bool Interfaces::setInterfaceMethod(QString newName){ | 314 | bool Interfaces::setInterfaceMethod(const QString &newName){ |
315 | if(currentIface == interfaces.end()) | 315 | if(currentIface == interfaces.end()) |
316 | return false; | 316 | return false; |
317 | bool returnValue = false; | 317 | bool returnValue = false; |
318 | (*currentIface) = QString("iface %1 %2 %3").arg(getInterfaceName(returnValue)).arg(getInterfaceFamily(returnValue)).arg(newName); | 318 | (*currentIface) = QString("iface %1 %2 %3").arg(getInterfaceName(returnValue)).arg(getInterfaceFamily(returnValue)).arg(newName); |
@@ -328,9 +328,9 @@ bool Interfaces::setInterfaceMethod(QString newName){ | |||
328 | * @param option the options to get the value. | 328 | * @param option the options to get the value. |
329 | * @param error set to true if any error occurs, false otherwise. | 329 | * @param error set to true if any error occurs, false otherwise. |
330 | * @return QString the options value. QString::null if error == true | 330 | * @return QString the options value. QString::null if error == true |
331 | */ | 331 | */ |
332 | QString Interfaces::getInterfaceOption(QString option, bool &error){ | 332 | QString Interfaces::getInterfaceOption(const QString &option, bool &error){ |
333 | return getOption(currentIface, option, error); | 333 | return getOption(currentIface, option, error); |
334 | } | 334 | } |
335 | 335 | ||
336 | /** | 336 | /** |
@@ -340,9 +340,9 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){ | |||
340 | * @param value the value that option should be set to. | 340 | * @param value the value that option should be set to. |
341 | * @param error set to true if any error occurs, false otherwise. | 341 | * @param error set to true if any error occurs, false otherwise. |
342 | * @return QString the options value. QString::null if error == true | 342 | * @return QString the options value. QString::null if error == true |
343 | */ | 343 | */ |
344 | bool Interfaces::setInterfaceOption(QString option, QString value){ | 344 | bool Interfaces::setInterfaceOption(const QString &option, const QString &value){ |
345 | return setOption(currentIface, option, value); | 345 | return setOption(currentIface, option, value); |
346 | } | 346 | } |
347 | 347 | ||
348 | /** | 348 | /** |
@@ -351,9 +351,9 @@ bool Interfaces::setInterfaceOption(QString option, QString value){ | |||
351 | * @param value the value that option should be set to. | 351 | * @param value the value that option should be set to. |
352 | * @param error set to true if any error occurs, false otherwise. | 352 | * @param error set to true if any error occurs, false otherwise. |
353 | * @return QString the options value. QString::null if error == true | 353 | * @return QString the options value. QString::null if error == true |
354 | */ | 354 | */ |
355 | bool Interfaces::removeInterfaceOption(QString option, QString value){ | 355 | bool Interfaces::removeInterfaceOption(const QString &option, const QString &value){ |
356 | return removeOption(currentIface, option, value); | 356 | return removeOption(currentIface, option, value); |
357 | } | 357 | } |
358 | 358 | ||
359 | /** | 359 | /** |
@@ -370,19 +370,19 @@ bool Interfaces::removeAllInterfaceOptions(){ | |||
370 | * @param interface the name of the interface to set. All whitespace is | 370 | * @param interface the name of the interface to set. All whitespace is |
371 | * removed from the interface name. | 371 | * removed from the interface name. |
372 | * @return bool true if it is successfull. | 372 | * @return bool true if it is successfull. |
373 | */ | 373 | */ |
374 | bool Interfaces::setMapping(QString interface){ | 374 | bool Interfaces::setMapping(const QString &interface){ |
375 | interface = interface.simplifyWhiteSpace(); | 375 | QString interfaceName = interface.simplifyWhiteSpace(); |
376 | interface = interface.replace(QRegExp(" "), ""); | 376 | interfaceName = interfaceName.replace(QRegExp(" "), ""); |
377 | return setStanza(MAPPING, interface, currentMapping); | 377 | return setStanza(MAPPING, interfaceName, currentMapping); |
378 | } | 378 | } |
379 | 379 | ||
380 | /** | 380 | /** |
381 | * Adds a new Mapping to the interfaces file with interfaces. | 381 | * Adds a new Mapping to the interfaces file with interfaces. |
382 | * @param interface the name(s) of the interfaces to set to this mapping | 382 | * @param interface the name(s) of the interfaces to set to this mapping |
383 | */ | 383 | */ |
384 | void Interfaces::addMapping(QString option){ | 384 | void Interfaces::addMapping(const QString &option){ |
385 | interfaces.append(""); | 385 | interfaces.append(""); |
386 | interfaces.append(QString(MAPPING " %1").arg(option)); | 386 | interfaces.append(QString(MAPPING " %1").arg(option)); |
387 | } | 387 | } |
388 | 388 | ||
@@ -402,9 +402,9 @@ bool Interfaces::removeMapping(){ | |||
402 | * @param map map to use | 402 | * @param map map to use |
403 | * @param value value to go with map | 403 | * @param value value to go with map |
404 | * @return bool true if it is successfull. | 404 | * @return bool true if it is successfull. |
405 | */ | 405 | */ |
406 | bool Interfaces::setMap(QString map, QString value){ | 406 | bool Interfaces::setMap(const QString &map, const QString &value){ |
407 | return setOption(currentMapping, map, value); | 407 | return setOption(currentMapping, map, value); |
408 | } | 408 | } |
409 | 409 | ||
410 | /** | 410 | /** |
@@ -412,9 +412,9 @@ bool Interfaces::setMap(QString map, QString value){ | |||
412 | * @param map map to use | 412 | * @param map map to use |
413 | * @param value value to go with map | 413 | * @param value value to go with map |
414 | * @return bool true if it is successfull. | 414 | * @return bool true if it is successfull. |
415 | */ | 415 | */ |
416 | bool Interfaces::removeMap(QString map, QString value){ | 416 | bool Interfaces::removeMap(const QString &map, const QString &value){ |
417 | return removeOption(currentMapping, map, value); | 417 | return removeOption(currentMapping, map, value); |
418 | } | 418 | } |
419 | 419 | ||
420 | /** | 420 | /** |
@@ -422,18 +422,18 @@ bool Interfaces::removeMap(QString map, QString value){ | |||
422 | * @param map map to get value of | 422 | * @param map map to get value of |
423 | * @param bool true if it is successfull. | 423 | * @param bool true if it is successfull. |
424 | * @return value that goes to the map | 424 | * @return value that goes to the map |
425 | */ | 425 | */ |
426 | QString Interfaces::getMap(QString map, bool &error){ | 426 | QString Interfaces::getMap(const QString &map, bool &error){ |
427 | return getOption(currentMapping, map, error); | 427 | return getOption(currentMapping, map, error); |
428 | } | 428 | } |
429 | 429 | ||
430 | /** | 430 | /** |
431 | * Sets a script value of the current mapping to argument. | 431 | * Sets a script value of the current mapping to argument. |
432 | * @param argument the script name. | 432 | * @param argument the script name. |
433 | * @return true if successfull. | 433 | * @return true if successfull. |
434 | */ | 434 | */ |
435 | bool Interfaces::setScript(QString argument){ | 435 | bool Interfaces::setScript(const QString &argument){ |
436 | return setOption(currentMapping, "script", argument); | 436 | return setOption(currentMapping, "script", argument); |
437 | } | 437 | } |
438 | 438 | ||
439 | /** | 439 | /** |
@@ -443,17 +443,19 @@ bool Interfaces::setScript(QString argument){ | |||
443 | QString Interfaces::getScript(bool &error){ | 443 | QString Interfaces::getScript(bool &error){ |
444 | return getOption(currentMapping, "script", error); | 444 | return getOption(currentMapping, "script", error); |
445 | } | 445 | } |
446 | 446 | ||
447 | |||
448 | |||
447 | /** | 449 | /** |
448 | * Helper function used to parse through the QStringList and put pointers in | 450 | * Helper function used to parse through the QStringList and put pointers in |
449 | * the correct place. | 451 | * the correct place. |
450 | * @param stanza The stanza (auto, iface, mapping) to look for. | 452 | * @param stanza The stanza (auto, iface, mapping) to look for. |
451 | * @param option string that must be in the stanza's main line. | 453 | * @param option string that must be in the stanza's main line. |
452 | * @param interator interator to place at location of stanza if successfull. | 454 | * @param interator interator to place at location of stanza if successfull. |
453 | * @return bool true if the stanza is found. | 455 | * @return bool true if the stanza is found. |
454 | */ | 456 | */ |
455 | bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator &iterator){ | 457 | bool Interfaces::setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator){ |
456 | bool found = false; | 458 | bool found = false; |
457 | iterator = interfaces.end(); | 459 | iterator = interfaces.end(); |
458 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { | 460 | for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { |
459 | QString line = (*it).simplifyWhiteSpace(); | 461 | QString line = (*it).simplifyWhiteSpace(); |
@@ -488,9 +490,9 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
488 | * @param start the start of the stanza | 490 | * @param start the start of the stanza |
489 | * @param option the option to use when setting value. | 491 | * @param option the option to use when setting value. |
490 | * @return bool true if successfull, false otherwise. | 492 | * @return bool true if successfull, false otherwise. |
491 | */ | 493 | */ |
492 | bool Interfaces::setOption(QStringList::Iterator start, QString option, QString value){ | 494 | bool Interfaces::setOption(const QStringList::Iterator &start, const QString &option, const QString &value){ |
493 | if(start == interfaces.end()) | 495 | if(start == interfaces.end()) |
494 | return false; | 496 | return false; |
495 | 497 | ||
496 | bool found = false; | 498 | bool found = false; |
@@ -523,9 +525,9 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
523 | * @param start the start of the stanza | 525 | * @param start the start of the stanza |
524 | * @param option the option to use when setting value. | 526 | * @param option the option to use when setting value. |
525 | * @return bool true if successfull, false otherwise. | 527 | * @return bool true if successfull, false otherwise. |
526 | */ | 528 | */ |
527 | bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){ | 529 | bool Interfaces::removeOption(const QStringList::Iterator &start, const QString &option, const QString &value){ |
528 | if(start == interfaces.end()) | 530 | if(start == interfaces.end()) |
529 | return false; | 531 | return false; |
530 | 532 | ||
531 | bool found = false; | 533 | bool found = false; |
@@ -549,9 +551,9 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
549 | * Removes all options in a stanza | 551 | * Removes all options in a stanza |
550 | * @param start the start of the stanza | 552 | * @param start the start of the stanza |
551 | * @return bool true if successfull, false otherwise. | 553 | * @return bool true if successfull, false otherwise. |
552 | */ | 554 | */ |
553 | bool Interfaces::removeAllOptions(QStringList::Iterator start){ | 555 | bool Interfaces::removeAllOptions(const QStringList::Iterator &start){ |
554 | if(start == interfaces.end()) | 556 | if(start == interfaces.end()) |
555 | return false; | 557 | return false; |
556 | 558 | ||
557 | QStringList::Iterator it = start; | 559 | QStringList::Iterator it = start; |
@@ -574,9 +576,9 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){ | |||
574 | * @param option the option to use when getting the value. | 576 | * @param option the option to use when getting the value. |
575 | * @param bool true if errors false otherwise. | 577 | * @param bool true if errors false otherwise. |
576 | * @return QString the value of option QString::null() if error == true. | 578 | * @return QString the value of option QString::null() if error == true. |
577 | */ | 579 | */ |
578 | QString Interfaces::getOption(QStringList::Iterator start, QString option, bool &error){ | 580 | QString Interfaces::getOption(const QStringList::Iterator &start, const QString &option, bool &error){ |
579 | if(start == interfaces.end()){ | 581 | if(start == interfaces.end()){ |
580 | error = false; | 582 | error = false; |
581 | return QString(); | 583 | return QString(); |
582 | } | 584 | } |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h index e09ea71..26abb73 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.h +++ b/noncore/settings/networksettings/interfaces/interfaces.h | |||
@@ -24,44 +24,44 @@ class Interfaces { | |||
24 | public: | 24 | public: |
25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); | 25 | Interfaces(QString useInterfacesFile = "/etc/network/interfaces"); |
26 | QStringList getInterfaceList(); | 26 | QStringList getInterfaceList(); |
27 | 27 | ||
28 | bool isAuto(QString interface); | 28 | bool isAuto(const QString &interface); |
29 | bool setAuto(QString interface, bool setAuto); | 29 | bool setAuto(const QString &interface, bool setAuto); |
30 | 30 | ||
31 | bool removeInterface(); | 31 | bool removeInterface(); |
32 | bool addInterface(QString interface, QString family, QString method); | 32 | bool addInterface(const QString &interface, const QString &family, const QString &method); |
33 | bool copyInterface(QString oldInterface, QString newInterface); | 33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); |
34 | bool setInterface(QString interface); | 34 | bool setInterface(QString interface); |
35 | bool isInterfaceSet(); | 35 | inline bool isInterfaceSet(); |
36 | QString getInterfaceName(bool &error); | 36 | QString getInterfaceName(bool &error); |
37 | bool setInterfaceName(QString newName); | 37 | bool setInterfaceName(const QString &newName); |
38 | QString getInterfaceFamily(bool &error); | 38 | QString getInterfaceFamily(bool &error); |
39 | bool setInterfaceFamily(QString newName); | 39 | bool setInterfaceFamily(const QString &newName); |
40 | QString getInterfaceMethod(bool &error); | 40 | QString getInterfaceMethod(bool &error); |
41 | bool setInterfaceMethod(QString newName); | 41 | bool setInterfaceMethod(const QString &newName); |
42 | QString getInterfaceOption(QString option, bool &error); | 42 | inline QString getInterfaceOption(const QString &option, bool &error); |
43 | bool setInterfaceOption(QString option, QString value); | 43 | inline bool setInterfaceOption(const QString &option, const QString &value); |
44 | bool removeInterfaceOption(QString option, QString value); | 44 | inline bool removeInterfaceOption(const QString &option, const QString &value); |
45 | bool removeAllInterfaceOptions(); | 45 | inline bool removeAllInterfaceOptions(); |
46 | 46 | ||
47 | bool setMapping(QString interface); | 47 | bool setMapping(const QString &interface); |
48 | bool removeMapping(); | 48 | bool removeMapping(); |
49 | void addMapping(QString options); | 49 | inline void addMapping(const QString &options); |
50 | bool setMap(QString map, QString value); | 50 | inline bool setMap(const QString &map, const QString &value); |
51 | bool removeMap(QString map, QString value); | 51 | inline bool removeMap(const QString &map, const QString &value); |
52 | QString getMap(QString map, bool &error); | 52 | inline QString getMap(const QString &map, bool &error); |
53 | bool setScript(QString); | 53 | inline bool setScript(const QString &argument); |
54 | QString getScript(bool &error); | 54 | inline QString getScript(bool &error); |
55 | 55 | ||
56 | bool write(); | 56 | bool write(); |
57 | 57 | ||
58 | private: | 58 | private: |
59 | bool setStanza(QString stanza, QString option,QStringList::Iterator &iterator); | 59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); |
60 | bool setOption(QStringList::Iterator start, QString option, QString value); | 60 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
61 | bool removeOption(QStringList::Iterator start, QString option, QString value); | 61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | QString getOption(QStringList::Iterator start, QString option, bool &error); | 62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); |
63 | bool removeAllOptions(QStringList::Iterator start); | 63 | bool removeAllOptions(const QStringList::Iterator &start); |
64 | 64 | ||
65 | QString interfacesFile; | 65 | QString interfacesFile; |
66 | QStringList interfaces; | 66 | QStringList interfaces; |
67 | QStringList::Iterator currentIface; | 67 | QStringList::Iterator currentIface; |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui index ab8e413..df55d25 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetup.ui +++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui | |||
@@ -98,8 +98,12 @@ | |||
98 | <name>minValue</name> | 98 | <name>minValue</name> |
99 | <number>1</number> | 99 | <number>1</number> |
100 | </property> | 100 | </property> |
101 | <property stdset="1"> | 101 | <property stdset="1"> |
102 | <name>lineStep</name> | ||
103 | <number>24</number> | ||
104 | </property> | ||
105 | <property stdset="1"> | ||
102 | <name>value</name> | 106 | <name>value</name> |
103 | <number>168</number> | 107 | <number>168</number> |
104 | </property> | 108 | </property> |
105 | </widget> | 109 | </widget> |
@@ -250,8 +254,30 @@ | |||
250 | </property> | 254 | </property> |
251 | </spacer> | 255 | </spacer> |
252 | </vbox> | 256 | </vbox> |
253 | </widget> | 257 | </widget> |
258 | <customwidgets> | ||
259 | <customwidget> | ||
260 | <class>QWidget</class> | ||
261 | <header location="local">qwidget.h</header> | ||
262 | <sizehint> | ||
263 | <width>100</width> | ||
264 | <height>100</height> | ||
265 | </sizehint> | ||
266 | <container>0</container> | ||
267 | <sizepolicy> | ||
268 | <hordata>7</hordata> | ||
269 | <verdata>7</verdata> | ||
270 | </sizepolicy> | ||
271 | <pixmap>image0</pixmap> | ||
272 | </customwidget> | ||
273 | </customwidgets> | ||
274 | <images> | ||
275 | <image> | ||
276 | <name>image0</name> | ||
277 | <data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> | ||
278 | </image> | ||
279 | </images> | ||
254 | <connections> | 280 | <connections> |
255 | <connection> | 281 | <connection> |
256 | <sender>dhcpCheckBox</sender> | 282 | <sender>dhcpCheckBox</sender> |
257 | <signal>toggled(bool)</signal> | 283 | <signal>toggled(bool)</signal> |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h index a88e190..60933aa 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h | |||
@@ -20,9 +20,8 @@ public slots: | |||
20 | 20 | ||
21 | private: | 21 | private: |
22 | Interfaces *interfaces; | 22 | Interfaces *interfaces; |
23 | Interface *interface; | 23 | Interface *interface; |
24 | |||
25 | }; | 24 | }; |
26 | 25 | ||
27 | 26 | ||
28 | #include <qlayout.h> | 27 | #include <qlayout.h> |
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 48ef9b3..7b93554 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -29,9 +29,9 @@ | |||
29 | #include <sys/ioctl.h> | 29 | #include <sys/ioctl.h> |
30 | 30 | ||
31 | #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" | 31 | #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" |
32 | 32 | ||
33 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ | 33 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false), scheme(DEFAULT_SCHEME){ |
34 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); | 34 | connect(addConnectionButton, SIGNAL(clicked()), this, SLOT(addClicked())); |
35 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); | 35 | connect(removeConnectionButton, SIGNAL(clicked()), this, SLOT(removeClicked())); |
36 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); | 36 | connect(informationConnectionButton, SIGNAL(clicked()), this, SLOT(informationClicked())); |
37 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); | 37 | connect(configureConnectionButton, SIGNAL(clicked()), this, SLOT(configureClicked())); |
@@ -188,9 +188,9 @@ void MainWindowImp::getAllInterfaces(){ | |||
188 | * Load all modules that are found in the path | 188 | * Load all modules that are found in the path |
189 | * @param path a directory that is scaned for any plugins that can be loaded | 189 | * @param path a directory that is scaned for any plugins that can be loaded |
190 | * and attempts to load them | 190 | * and attempts to load them |
191 | */ | 191 | */ |
192 | void MainWindowImp::loadModules(QString path){ | 192 | void MainWindowImp::loadModules(const QString &path){ |
193 | //qDebug(path.latin1()); | 193 | //qDebug(path.latin1()); |
194 | QDir d(path); | 194 | QDir d(path); |
195 | if(!d.exists()) | 195 | if(!d.exists()) |
196 | return; | 196 | return; |
@@ -213,9 +213,9 @@ void MainWindowImp::loadModules(QString path){ | |||
213 | * @param pluginFileName - the name of the file in which to attempt to load | 213 | * @param pluginFileName - the name of the file in which to attempt to load |
214 | * @param resolveString - function pointer to resolve | 214 | * @param resolveString - function pointer to resolve |
215 | * @return pointer to the function with name resolveString or NULL | 215 | * @return pointer to the function with name resolveString or NULL |
216 | */ | 216 | */ |
217 | Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ | 217 | Module* MainWindowImp::loadPlugin(const QString &pluginFileName, const QString &resolveString){ |
218 | //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); | 218 | //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); |
219 | QLibrary *lib = new QLibrary(pluginFileName); | 219 | QLibrary *lib = new QLibrary(pluginFileName); |
220 | void *functionPointer = lib->resolve(resolveString); | 220 | void *functionPointer = lib->resolve(resolveString); |
221 | if( !functionPointer ){ | 221 | if( !functionPointer ){ |
diff --git a/noncore/settings/networksettings/mainwindowimp.h b/noncore/settings/networksettings/mainwindowimp.h index 382428c..4f09d6c 100644 --- a/noncore/settings/networksettings/mainwindowimp.h +++ b/noncore/settings/networksettings/mainwindowimp.h | |||
@@ -32,12 +32,12 @@ private slots: | |||
32 | void updateInterface(Interface *i); | 32 | void updateInterface(Interface *i); |
33 | void newProfileChanged(const QString& newText); | 33 | void newProfileChanged(const QString& newText); |
34 | 34 | ||
35 | private: | 35 | private: |
36 | void loadModules(QString path); | 36 | void loadModules(const QString &path); |
37 | 37 | ||
38 | Module* loadPlugin(QString pluginFileName, | 38 | Module* loadPlugin(const QString &pluginFileName, |
39 | QString resolveString = "create_plugin"); | 39 | const QString &resolveString = "create_plugin"); |
40 | 40 | ||
41 | // For our local list of names | 41 | // For our local list of names |
42 | QMap<QString, Interface*> interfaceNames; | 42 | QMap<QString, Interface*> interfaceNames; |
43 | 43 | ||
diff --git a/noncore/settings/networksettings/module.h b/noncore/settings/networksettings/module.h index 92b125a..2e6272b 100644 --- a/noncore/settings/networksettings/module.h +++ b/noncore/settings/networksettings/module.h | |||
@@ -21,9 +21,9 @@ public: | |||
21 | * The current profile has been changed and the module should do any | 21 | * The current profile has been changed and the module should do any |
22 | * neccesary changes also. | 22 | * neccesary changes also. |
23 | * @param newProfile what the profile should be changed to. | 23 | * @param newProfile what the profile should be changed to. |
24 | */ | 24 | */ |
25 | virtual void setProfile(QString newProfile) = 0; | 25 | virtual void setProfile(const QString &newProfile) = 0; |
26 | 26 | ||
27 | /** | 27 | /** |
28 | * get the icon name for this device. | 28 | * get the icon name for this device. |
29 | * @param Interface* can be used in determining the icon. | 29 | * @param Interface* can be used in determining the icon. |
@@ -69,9 +69,9 @@ public: | |||
69 | * Attempts to create a new interface from name | 69 | * Attempts to create a new interface from name |
70 | * @return Interface* NULL if it was unable to be created. | 70 | * @return Interface* NULL if it was unable to be created. |
71 | * @param name the type of interface to create | 71 | * @param name the type of interface to create |
72 | */ | 72 | */ |
73 | virtual Interface *addNewInterface(QString name) = 0; | 73 | virtual Interface *addNewInterface(const QString &name) = 0; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * Attempts to remove the interface, doesn't delete i | 76 | * Attempts to remove the interface, doesn't delete i |
77 | * @return bool true if successfull, false otherwise. | 77 | * @return bool true if successfull, false otherwise. |
diff --git a/noncore/settings/networksettings/wlan/infoimp.h b/noncore/settings/networksettings/wlan/infoimp.h index 5311bea..8f7f0d6 100644 --- a/noncore/settings/networksettings/wlan/infoimp.h +++ b/noncore/settings/networksettings/wlan/infoimp.h | |||
@@ -3,9 +3,9 @@ | |||
3 | 3 | ||
4 | #include "info.h" | 4 | #include "info.h" |
5 | 5 | ||
6 | class QTimer; | 6 | class QTimer; |
7 | class WExtensions; | 7 | //class WExtensions; |
8 | 8 | ||
9 | class WlanInfoImp : public WlanInfo { | 9 | class WlanInfoImp : public WlanInfo { |
10 | Q_OBJECT | 10 | Q_OBJECT |
11 | 11 | ||
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp index eb6fc42..6335ebc 100644 --- a/noncore/settings/networksettings/wlan/wextensions.cpp +++ b/noncore/settings/networksettings/wlan/wextensions.cpp | |||
@@ -15,10 +15,9 @@ | |||
15 | 15 | ||
16 | /** | 16 | /** |
17 | * Constructor. Sets hasWirelessExtensions | 17 | * Constructor. Sets hasWirelessExtensions |
18 | */ | 18 | */ |
19 | WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false){ | 19 | WExtensions::WExtensions(QString interfaceName): hasWirelessExtensions(false), interface(interfaceName) { |
20 | interface = interfaceName; | ||
21 | fd = socket( AF_INET, SOCK_DGRAM, 0 ); | 20 | fd = socket( AF_INET, SOCK_DGRAM, 0 ); |
22 | if(fd == -1) | 21 | if(fd == -1) |
23 | return; | 22 | return; |
24 | 23 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 689eae2..d4b4af9 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp | |||
@@ -43,9 +43,9 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Change the profile for both wireless settings and network settings. | 45 | * Change the profile for both wireless settings and network settings. |
46 | */ | 46 | */ |
47 | void WLANImp::setProfile(QString &profile){ | 47 | void WLANImp::setProfile(const QString &profile){ |
48 | interfaceSetup->setProfile(profile); | 48 | interfaceSetup->setProfile(profile); |
49 | parseSettingFile(); | 49 | parseSettingFile(); |
50 | } | 50 | } |
51 | 51 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanimp.h b/noncore/settings/networksettings/wlan/wlanimp.h index f88e550..df599af 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.h +++ b/noncore/settings/networksettings/wlan/wlanimp.h | |||
@@ -12,9 +12,9 @@ class WLANImp : public WLAN { | |||
12 | Q_OBJECT | 12 | Q_OBJECT |
13 | 13 | ||
14 | public: | 14 | public: |
15 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); | 15 | WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 ); |
16 | void setProfile(QString &profile); | 16 | void setProfile(const QString &profile); |
17 | 17 | ||
18 | protected: | 18 | protected: |
19 | void accept(); | 19 | void accept(); |
20 | 20 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index b14fc0a..3979e60 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -25,9 +25,9 @@ WLANModule::~WLANModule(){ | |||
25 | 25 | ||
26 | /** | 26 | /** |
27 | * Change the current profile | 27 | * Change the current profile |
28 | */ | 28 | */ |
29 | void WLANModule::setProfile(QString newProfile){ | 29 | void WLANModule::setProfile(const QString &newProfile){ |
30 | profile = newProfile; | 30 | profile = newProfile; |
31 | } | 31 | } |
32 | 32 | ||
33 | /** | 33 | /** |
@@ -93,9 +93,9 @@ QList<Interface> WLANModule::getInterfaces(){ | |||
93 | * @param name the name of the type of interface that should be created given | 93 | * @param name the name of the type of interface that should be created given |
94 | * by possibleNewInterfaces(); | 94 | * by possibleNewInterfaces(); |
95 | * @return Interface* NULL if it was unable to be created. | 95 | * @return Interface* NULL if it was unable to be created. |
96 | */ | 96 | */ |
97 | Interface *WLANModule::addNewInterface(QString ){ | 97 | Interface *WLANModule::addNewInterface(const QString &){ |
98 | // We can't add a 802.11 interface, either the hardware will be there | 98 | // We can't add a 802.11 interface, either the hardware will be there |
99 | // or it wont. | 99 | // or it wont. |
100 | return NULL; | 100 | return NULL; |
101 | } | 101 | } |
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index a81ccff..3a54de6 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h | |||
@@ -11,17 +11,17 @@ signals: | |||
11 | public: | 11 | public: |
12 | WLANModule(); | 12 | WLANModule(); |
13 | ~WLANModule(); | 13 | ~WLANModule(); |
14 | 14 | ||
15 | virtual void setProfile(QString newProfile); | 15 | void setProfile(const QString &newProfile); |
16 | virtual bool isOwner(Interface *); | 16 | bool isOwner(Interface *); |
17 | virtual QWidget *configure(Interface *i); | 17 | QWidget *configure(Interface *i); |
18 | virtual QWidget *information(Interface *i); | 18 | QWidget *information(Interface *i); |
19 | virtual QList<Interface> getInterfaces(); | 19 | QList<Interface> getInterfaces(); |
20 | virtual void possibleNewInterfaces(QMap<QString, QString> &){}; | 20 | void possibleNewInterfaces(QMap<QString, QString> &){}; |
21 | virtual Interface *addNewInterface(QString name); | 21 | Interface *addNewInterface(const QString &name); |
22 | virtual bool remove(Interface* i); | 22 | bool remove(Interface* i); |
23 | virtual QString getPixmapName(Interface* i); | 23 | QString getPixmapName(Interface* i); |
24 | 24 | ||
25 | private: | 25 | private: |
26 | QList<Interface> list; | 26 | QList<Interface> list; |
27 | QString profile; | 27 | QString profile; |