Diffstat (limited to 'noncore/settings/networksettings/interfaces') (more/less context) (show whitespace changes)
6 files changed, 92 insertions, 66 deletions
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 | |||
@@ -44,3 +44,3 @@ void Interface::setAttached(bool isAttached){ | |||
44 | */ | 44 | */ |
45 | void Interface::setHardwareName(QString name){ | 45 | void Interface::setHardwareName(const QString &name){ |
46 | hardwareName = name; | 46 | hardwareName = name; |
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 | |||
@@ -17,17 +17,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 | ||
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 | |||
@@ -72,3 +72,3 @@ QStringList Interfaces::getInterfaceList(){ | |||
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)); |
@@ -88,3 +88,3 @@ bool Interfaces::isAuto(QString interface){ | |||
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. |
@@ -158,9 +158,9 @@ bool Interfaces::isInterfaceSet(){ | |||
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; |
@@ -173,3 +173,3 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) | |||
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; |
@@ -282,9 +282,9 @@ QString Interfaces::getInterfaceMethod(bool &error){ | |||
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; |
@@ -298,3 +298,3 @@ bool Interfaces::setInterfaceName(QString newName){ | |||
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()) |
@@ -313,3 +313,3 @@ bool Interfaces::setInterfaceFamily(QString newName){ | |||
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()) |
@@ -331,3 +331,3 @@ bool Interfaces::setInterfaceMethod(QString newName){ | |||
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); |
@@ -343,3 +343,3 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){ | |||
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); |
@@ -354,3 +354,3 @@ bool Interfaces::setInterfaceOption(QString option, QString value){ | |||
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); |
@@ -373,6 +373,6 @@ bool Interfaces::removeAllInterfaceOptions(){ | |||
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 | } |
@@ -383,3 +383,3 @@ bool Interfaces::setMapping(QString interface){ | |||
383 | */ | 383 | */ |
384 | void Interfaces::addMapping(QString option){ | 384 | void Interfaces::addMapping(const QString &option){ |
385 | interfaces.append(""); | 385 | interfaces.append(""); |
@@ -405,3 +405,3 @@ bool Interfaces::removeMapping(){ | |||
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); |
@@ -415,3 +415,3 @@ bool Interfaces::setMap(QString map, QString value){ | |||
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); |
@@ -425,3 +425,3 @@ bool Interfaces::removeMap(QString map, QString value){ | |||
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); |
@@ -434,3 +434,3 @@ QString Interfaces::getMap(QString map, bool &error){ | |||
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); |
@@ -446,2 +446,4 @@ QString Interfaces::getScript(bool &error){ | |||
446 | 446 | ||
447 | |||
448 | |||
447 | /** | 449 | /** |
@@ -454,3 +456,3 @@ QString Interfaces::getScript(bool &error){ | |||
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; |
@@ -491,3 +493,3 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
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()) |
@@ -526,3 +528,3 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
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()) |
@@ -552,3 +554,3 @@ bool Interfaces::removeOption(QStringList::Iterator start, QString option, QStri | |||
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()) |
@@ -577,3 +579,3 @@ bool Interfaces::removeAllOptions(QStringList::Iterator start){ | |||
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()){ |
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 | |||
@@ -27,29 +27,29 @@ public: | |||
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 | ||
@@ -58,7 +58,7 @@ public: | |||
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 | ||
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 | |||
@@ -101,2 +101,6 @@ | |||
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> |
@@ -253,2 +257,24 @@ | |||
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> |
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 | |||
@@ -23,3 +23,2 @@ private: | |||
23 | Interface *interface; | 23 | Interface *interface; |
24 | |||
25 | }; | 24 | }; |