summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp18
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.h3
2 files changed, 9 insertions, 12 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
@@ -14,22 +14,20 @@
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 */
17InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interfaces(j), interface(i), delInterfaces(false){ 17InterfaceSetupImp::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 */
23InterfaceSetupImp::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 */
30InterfaceSetupImp::~InterfaceSetupImp(){ 27InterfaceSetupImp::~InterfaceSetupImp(){
31 if(delInterfaces) 28 if(delInterfaces) {
32 delete interfaces; 29 delete interfaces;
30 }
33} 31}
34 32
35/** 33/**
@@ -62,7 +60,7 @@ bool InterfaceSetupImp::saveSettings(){
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())
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
index c4ace77..172da6a 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h
@@ -11,7 +11,6 @@ class InterfaceSetupImp : public InterfaceSetup {
11 Q_OBJECT 11 Q_OBJECT
12 12
13public: 13public:
14 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i = 0, WFlags fl = 0);
15 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i = 0, Interfaces *j = 0, WFlags fl = 0); 14 InterfaceSetupImp( QWidget* parent = 0, const char* name = 0, Interface *i = 0, Interfaces *j = 0, WFlags fl = 0);
16 ~InterfaceSetupImp(); 15 ~InterfaceSetupImp();
17 bool saveChanges(); 16 bool saveChanges();
@@ -37,7 +36,7 @@ public:
37 InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){ 36 InterfaceSetupImpDialog(QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = false, WFlags fl = 0) : QDialog(parent, name, modal, fl){
38 QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this ); 37 QVBoxLayout *InterfaceSetupLayout = new QVBoxLayout( this );
39 setCaption("Interface Setup"); 38 setCaption("Interface Setup");
40 interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i,fl); 39 interfaceSetup = new InterfaceSetupImp(this, "InterfaceSetup",i);
41 InterfaceSetupLayout->addWidget( interfaceSetup ); 40 InterfaceSetupLayout->addWidget( interfaceSetup );
42 }; 41 };
43 void setProfile(QString &profile){ interfaceSetup->setProfile(profile);}; 42 void setProfile(QString &profile){ interfaceSetup->setProfile(profile);};