Diffstat (limited to 'noncore/settings/networksettings/interfaces') (more/less context) (ignore whitespace changes)
5 files changed, 30 insertions, 29 deletions
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp index 4129b3d..7ffa76f 100644 --- a/noncore/settings/networksettings/interfaces/interface.cpp +++ b/noncore/settings/networksettings/interfaces/interface.cpp | |||
@@ -13,3 +13,3 @@ | |||
13 | 13 | ||
14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), status(newSatus), attached(false), hardwareName("Unknown"), moduleOwner(NULL), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"), dhcp(false){ | 14 | Interface::Interface(QObject * parent, const char * name, bool newSatus): QObject(parent, name), hardwareName("Unknown"), moduleOwner(NULL), status(newSatus), attached(false), dhcp(false), macAddress(""), ip("0.0.0.0"), broadcast(""), subnetMask("0.0.0.0"){ |
15 | refresh(); | 15 | refresh(); |
diff --git a/noncore/settings/networksettings/interfaces/interface.h b/noncore/settings/networksettings/interfaces/interface.h index 989d6d8..d37834a 100644 --- a/noncore/settings/networksettings/interfaces/interface.h +++ b/noncore/settings/networksettings/interfaces/interface.h | |||
@@ -18,14 +18,14 @@ public: | |||
18 | 18 | ||
19 | QString getInterfaceName(){ QString n(this->name()); return n; }; | 19 | QString getInterfaceName() const { QString n(this->name()); return n; }; |
20 | 20 | ||
21 | bool getStatus(){ return status; }; | 21 | bool getStatus() const { return status; }; |
22 | void setStatus(bool newStatus); | 22 | void setStatus(bool newStatus); |
23 | 23 | ||
24 | bool isAttached(){ return attached; }; | 24 | bool isAttached() const { return attached; }; |
25 | void setAttached(bool isAttached=false); | 25 | void setAttached(bool isAttached=false); |
26 | 26 | ||
27 | QString getHardwareName(){ return hardwareName; }; | 27 | QString getHardwareName() const { return hardwareName; }; |
28 | void setHardwareName(const QString &name="Unknown"); | 28 | void setHardwareName(const QString &name="Unknown"); |
29 | 29 | ||
30 | Module* getModuleOwner(){ return moduleOwner; }; | 30 | Module* getModuleOwner() const { return moduleOwner; }; |
31 | void setModuleOwner(Module *owner=NULL); | 31 | void setModuleOwner(Module *owner=NULL); |
@@ -33,10 +33,10 @@ public: | |||
33 | // inet information. | 33 | // inet information. |
34 | QString getMacAddress(){ return macAddress; }; | 34 | QString getMacAddress() const { return macAddress; }; |
35 | QString getIp(){ return ip; }; | 35 | QString getIp() const { return ip; }; |
36 | QString getSubnetMask(){ return subnetMask; }; | 36 | QString getSubnetMask() const { return subnetMask; }; |
37 | QString getBroadcast(){ return broadcast; }; | 37 | QString getBroadcast() const { return broadcast; }; |
38 | bool isDhcp(){ return dhcp; }; | 38 | bool isDhcp() const { return dhcp; }; |
39 | QString getDhcpServerIp(){ return dhcpServerIp; }; | 39 | QString getDhcpServerIp() const { return dhcpServerIp; }; |
40 | QString getLeaseObtained(){ return leaseObtained; }; | 40 | QString getLeaseObtained() const { return leaseObtained; }; |
41 | QString getLeaseExpires(){ return leaseExpires; }; | 41 | QString getLeaseExpires() const { return leaseExpires; }; |
42 | 42 | ||
@@ -50,12 +50,8 @@ private: | |||
50 | // Interface information | 50 | // Interface information |
51 | bool status; | ||
52 | bool attached; | ||
53 | QString hardwareName; | 51 | QString hardwareName; |
54 | Module *moduleOwner; | 52 | Module *moduleOwner; |
55 | 53 | bool status; | |
54 | bool attached; | ||
55 | |||
56 | // Network information | 56 | // Network information |
57 | QString macAddress; | ||
58 | QString ip; | ||
59 | QString broadcast; | ||
60 | QString subnetMask; | ||
61 | bool dhcp; | 57 | bool dhcp; |
@@ -65,2 +61,7 @@ private: | |||
65 | 61 | ||
62 | QString macAddress; | ||
63 | QString ip; | ||
64 | QString broadcast; | ||
65 | QString subnetMask; | ||
66 | |||
66 | }; | 67 | }; |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index e49998e..8f685fe 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -73,3 +73,3 @@ QStringList Interfaces::getInterfaceList(){ | |||
73 | */ | 73 | */ |
74 | bool Interfaces::isAuto(const QString &interface){ | 74 | bool Interfaces::isAuto(const QString &interface) const { |
75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); | 75 | QStringList autoLines = interfaces.grep(QRegExp(AUTO)); |
@@ -141,4 +141,4 @@ bool Interfaces::setInterface(QString interface){ | |||
141 | */ | 141 | */ |
142 | bool Interfaces::isInterfaceSet(){ | 142 | bool Interfaces::isInterfaceSet() const { |
143 | return (currentIface != interfaces.end()); | 143 | return (interfaces.end() != currentIface); |
144 | } | 144 | } |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h index d662919..bac2a7e 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.h +++ b/noncore/settings/networksettings/interfaces/interfaces.h | |||
@@ -27,3 +27,3 @@ public: | |||
27 | 27 | ||
28 | bool isAuto(const QString &interface); | 28 | bool isAuto(const QString &interface) const ; |
29 | bool setAuto(const QString &interface, bool setAuto); | 29 | bool setAuto(const QString &interface, bool setAuto); |
@@ -34,3 +34,3 @@ public: | |||
34 | bool setInterface(QString interface); | 34 | bool setInterface(QString interface); |
35 | bool isInterfaceSet(); | 35 | bool isInterfaceSet() const ; |
36 | QString getInterfaceName(bool &error); | 36 | QString getInterfaceName(bool &error); |
@@ -59,7 +59,7 @@ private: | |||
59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); | 59 | bool setStanza(const QString &stanza, const QString &option, QStringList::Iterator &iterator); |
60 | bool removeStanza(QStringList::Iterator &stanza); | ||
60 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 61 | bool setOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | bool removeAllOptions(const QStringList::Iterator &start); | ||
61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 63 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); | 64 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); |
63 | bool removeStanza(QStringList::Iterator &stanza); | ||
64 | bool removeAllOptions(const QStringList::Iterator &start); | ||
65 | 65 | ||
diff --git a/noncore/settings/networksettings/interfaces/interfaces.pro b/noncore/settings/networksettings/interfaces/interfaces.pro index 9a024f6..d6b43fb 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.pro +++ b/noncore/settings/networksettings/interfaces/interfaces.pro | |||
@@ -3,3 +3,3 @@ CONFIG += qt warn_on release | |||
3 | #CONFIG += qt warn_on debug | 3 | #CONFIG += qt warn_on debug |
4 | DESTDIR = $(QTDIR)/lib$(PROJMAK) | 4 | #DESTDIR = $(QTDIR)/lib$(PROJMAK) |
5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h | 5 | HEADERS = interface.h interfaceinformationimp.h interfaces.h interfacesetupimp.h |