author | kergoth <kergoth> | 2003-04-14 23:26:44 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-14 23:26:44 (UTC) |
commit | 9c0ba9922e12081ba87cce6583fe413ab5794cf6 (patch) (unidiff) | |
tree | 274472a08b80971045ad54a49b126f7b19454483 /noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |
parent | 4c0ff8a1bdc4750ee36c713392d0842e9eb9eeb3 (diff) | |
download | opie-9c0ba9922e12081ba87cce6583fe413ab5794cf6.zip opie-9c0ba9922e12081ba87cce6583fe413ab5794cf6.tar.gz opie-9c0ba9922e12081ba87cce6583fe413ab5794cf6.tar.bz2 |
Correct the constructor, and ensure it does not remove all interface options, as that interferes with the new wireless module.
Diffstat (limited to 'noncore/settings/networksettings/interfaces/interfacesetupimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 2a5520d..fc65c5f 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -5,40 +5,38 @@ | |||
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 | #define DNSSCRIPT "changedns" | 12 | #define DNSSCRIPT "changedns" |
13 | 13 | ||
14 | /** | 14 | /** |
15 | * Constuctor. Set up the connection. A profile must be set. | 15 | * Constuctor. Set up the connection. A profile must be set. |
16 | */ | 16 | */ |
17 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interfaces(j), interface(i), delInterfaces(false){ | 17 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ |
18 | } | 18 | if (j == 0) { |
19 | 19 | delInterfaces = true; | |
20 | /** | 20 | interfaces = new Interfaces; |
21 | * Constuctor. Set up the connection. A profile must be set. | 21 | } |
22 | */ | ||
23 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), delInterfaces(true){ | ||
24 | interfaces = new Interfaces; | ||
25 | } | 22 | } |
26 | 23 | ||
27 | /** | 24 | /** |
28 | * Destructor | 25 | * Destructor |
29 | */ | 26 | */ |
30 | InterfaceSetupImp::~InterfaceSetupImp(){ | 27 | InterfaceSetupImp::~InterfaceSetupImp(){ |
31 | if(delInterfaces) | 28 | if(delInterfaces) { |
32 | delete interfaces; | 29 | delete interfaces; |
30 | } | ||
33 | } | 31 | } |
34 | 32 | ||
35 | /** | 33 | /** |
36 | * Save the current settings, then write out the interfaces file and close. | 34 | * Save the current settings, then write out the interfaces file and close. |
37 | */ | 35 | */ |
38 | bool InterfaceSetupImp::saveChanges(){ | 36 | bool InterfaceSetupImp::saveChanges(){ |
39 | if(!saveSettings()) | 37 | if(!saveSettings()) |
40 | return false; | 38 | return false; |
41 | interfaces->write(); | 39 | interfaces->write(); |
42 | return true; | 40 | return true; |
43 | } | 41 | } |
44 | 42 | ||
@@ -53,25 +51,25 @@ bool InterfaceSetupImp::saveSettings(){ | |||
53 | 51 | ||
54 | bool error = false; | 52 | bool error = false; |
55 | // Loopback case | 53 | // Loopback case |
56 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | 54 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ |
57 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 55 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
58 | return true; | 56 | return true; |
59 | } | 57 | } |
60 | 58 | ||
61 | if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ | 59 | if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ |
62 | QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok); | 60 | QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok); |
63 | return false; | 61 | return false; |
64 | } | 62 | } |
65 | interfaces->removeAllInterfaceOptions(); | 63 | //interfaces.removeAllInterfaceOptions(); |
66 | 64 | ||
67 | // DHCP | 65 | // DHCP |
68 | if(dhcpCheckBox->isChecked()) | 66 | if(dhcpCheckBox->isChecked()) |
69 | interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP); | 67 | interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP); |
70 | else{ | 68 | else{ |
71 | interfaces->setInterfaceMethod("static"); | 69 | interfaces->setInterfaceMethod("static"); |
72 | interfaces->setInterfaceOption("address", ipAddressEdit->text()); | 70 | interfaces->setInterfaceOption("address", ipAddressEdit->text()); |
73 | interfaces->setInterfaceOption("netmask", subnetMaskEdit->text()); | 71 | interfaces->setInterfaceOption("netmask", subnetMaskEdit->text()); |
74 | interfaces->setInterfaceOption("gateway", gatewayEdit->text()); | 72 | interfaces->setInterfaceOption("gateway", gatewayEdit->text()); |
75 | if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ | 73 | if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ |
76 | QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); | 74 | QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); |
77 | interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns); | 75 | interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns); |