Diffstat (limited to 'noncore/settings/networksettings/interfaces') (more/less context) (show whitespace changes)
3 files changed, 6 insertions, 0 deletions
diff --git a/noncore/settings/networksettings/interfaces/interface.cpp b/noncore/settings/networksettings/interfaces/interface.cpp index d2b106a..46f3e19 100644 --- a/noncore/settings/networksettings/interfaces/interface.cpp +++ b/noncore/settings/networksettings/interfaces/interface.cpp | |||
@@ -1,30 +1,33 @@ | |||
1 | /** | 1 | /** |
2 | * $Author$ | 2 | * $Author$ |
3 | * $Date$ | 3 | * $Date$ |
4 | */ | 4 | */ |
5 | 5 | ||
6 | #include "interface.h" | 6 | #include "interface.h" |
7 | |||
8 | #include <opie2/odebug.h> | ||
9 | |||
7 | #include <qdatetime.h> | 10 | #include <qdatetime.h> |
8 | #include <qfile.h> | 11 | #include <qfile.h> |
9 | #include <qdir.h> | 12 | #include <qdir.h> |
10 | #include <qfileinfo.h> | 13 | #include <qfileinfo.h> |
11 | #include <qtextstream.h> | 14 | #include <qtextstream.h> |
12 | 15 | ||
13 | #define IFCONFIG "/sbin/ifconfig" | 16 | #define IFCONFIG "/sbin/ifconfig" |
14 | #define DHCP_INFO_DIR "/etc/dhcpc" | 17 | #define DHCP_INFO_DIR "/etc/dhcpc" |
15 | 18 | ||
16 | #include <stdio.h> | 19 | #include <stdio.h> |
17 | #include <stdlib.h> | 20 | #include <stdlib.h> |
18 | 21 | ||
19 | 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"){ | 22 | 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"){ |
20 | refresh(); | 23 | refresh(); |
21 | } | 24 | } |
22 | 25 | ||
23 | /** | 26 | /** |
24 | * Set status | 27 | * Set status |
25 | * @param newStatus - the new status | 28 | * @param newStatus - the new status |
26 | * emit updateInterface | 29 | * emit updateInterface |
27 | */ | 30 | */ |
28 | void Interface::setStatus(bool newStatus){ | 31 | void Interface::setStatus(bool newStatus){ |
29 | if(status != newStatus){ | 32 | if(status != newStatus){ |
30 | status = newStatus; | 33 | status = newStatus; |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index e283926..5ce4b58 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -1,26 +1,28 @@ | |||
1 | #include "interfaces.h" | 1 | #include "interfaces.h" |
2 | 2 | ||
3 | #include <opie2/odebug.h> | ||
4 | |||
3 | #include <qcheckbox.h> | 5 | #include <qcheckbox.h> |
4 | #include <qfile.h> | 6 | #include <qfile.h> |
5 | #include <qtextstream.h> | 7 | #include <qtextstream.h> |
6 | #include <qregexp.h> | 8 | #include <qregexp.h> |
7 | 9 | ||
8 | // The three stanza's | 10 | // The three stanza's |
9 | #define AUTO "auto" | 11 | #define AUTO "auto" |
10 | #define IFACE "iface" | 12 | #define IFACE "iface" |
11 | #define MAPPING "mapping" | 13 | #define MAPPING "mapping" |
12 | 14 | ||
13 | /** | 15 | /** |
14 | * Constructor. Reads in the interfaces file and then split the file up by | 16 | * Constructor. Reads in the interfaces file and then split the file up by |
15 | * the \n for interfaces variable. | 17 | * the \n for interfaces variable. |
16 | * @param useInterfacesFile if an interface file other then the default is | 18 | * @param useInterfacesFile if an interface file other then the default is |
17 | * desired to be used it should be passed in. | 19 | * desired to be used it should be passed in. |
18 | */ | 20 | */ |
19 | Interfaces::Interfaces(QString useInterfacesFile){ | 21 | Interfaces::Interfaces(QString useInterfacesFile){ |
20 | acceptedFamily.append(INTERFACES_FAMILY_INET); | 22 | acceptedFamily.append(INTERFACES_FAMILY_INET); |
21 | acceptedFamily.append(INTERFACES_FAMILY_IPX); | 23 | acceptedFamily.append(INTERFACES_FAMILY_IPX); |
22 | acceptedFamily.append(INTERFACES_FAMILY_INET6); | 24 | acceptedFamily.append(INTERFACES_FAMILY_INET6); |
23 | 25 | ||
24 | interfacesFile = useInterfacesFile; | 26 | interfacesFile = useInterfacesFile; |
25 | QFile file(interfacesFile); | 27 | QFile file(interfacesFile); |
26 | if (!file.open(IO_ReadOnly)){ | 28 | if (!file.open(IO_ReadOnly)){ |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index ec3bad3..8498759 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -1,39 +1,40 @@ | |||
1 | #include "interfacesetupimp.h" | 1 | #include "interfacesetupimp.h" |
2 | #include "interface.h" | 2 | #include "interface.h" |
3 | 3 | ||
4 | #include <qcheckbox.h> | 4 | #include <qcheckbox.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qspinbox.h> | 6 | #include <qspinbox.h> |
7 | #include <qgroupbox.h> | 7 | #include <qgroupbox.h> |
8 | #include <qlabel.h> | 8 | #include <qlabel.h> |
9 | 9 | ||
10 | #include <qmessagebox.h> | 10 | #include <qmessagebox.h> |
11 | 11 | ||
12 | #include <opie2/oprocess.h> | 12 | #include <opie2/oprocess.h> |
13 | 13 | ||
14 | #ifdef QWS | 14 | #ifdef QWS |
15 | #include <opie2/owait.h> | 15 | #include <opie2/owait.h> |
16 | #include <opie2/odebug.h> | ||
16 | #include <qpe/global.h> | 17 | #include <qpe/global.h> |
17 | #include <qapplication.h> | 18 | #include <qapplication.h> |
18 | #endif | 19 | #endif |
19 | 20 | ||
20 | #define DNSSCRIPT "changedns" | 21 | #define DNSSCRIPT "changedns" |
21 | 22 | ||
22 | /** | 23 | /** |
23 | * Constuctor. Set up the connection. A profile must be set. | 24 | * Constuctor. Set up the connection. A profile must be set. |
24 | */ | 25 | */ |
25 | using namespace Opie::Ui; | 26 | using namespace Opie::Ui; |
26 | using namespace Opie::Core; | 27 | using namespace Opie::Core; |
27 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ | 28 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ |
28 | if (j == 0) { | 29 | if (j == 0) { |
29 | delInterfaces = true; | 30 | delInterfaces = true; |
30 | interfaces = new Interfaces; | 31 | interfaces = new Interfaces; |
31 | } | 32 | } |
32 | } | 33 | } |
33 | 34 | ||
34 | /** | 35 | /** |
35 | * Destructor | 36 | * Destructor |
36 | */ | 37 | */ |
37 | InterfaceSetupImp::~InterfaceSetupImp(){ | 38 | InterfaceSetupImp::~InterfaceSetupImp(){ |
38 | if(delInterfaces) { | 39 | if(delInterfaces) { |
39 | delete interfaces; | 40 | delete interfaces; |