Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (show whitespace changes)
4 files changed, 90 insertions, 93 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaces.cpp b/noncore/settings/networksettings/interfaces/interfaces.cpp index 708f399..e49998e 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces/interfaces.cpp | |||
@@ -5,4 +5,5 @@ | |||
5 | #include <qregexp.h> | 5 | #include <qregexp.h> |
6 | 6 | ||
7 | // The three stanza's | ||
7 | #define AUTO "auto" | 8 | #define AUTO "auto" |
8 | #define IFACE "iface" | 9 | #define IFACE "iface" |
@@ -103,11 +104,10 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){ | |||
103 | break; | 104 | break; |
104 | } | 105 | } |
106 | // else see if we need to remove from this one | ||
105 | else{ | 107 | else{ |
106 | if((*it).contains(interface)){ | 108 | if((*it).contains(interface)){ |
107 | (*it) = (*it).replace(QRegExp(interface), ""); | 109 | (*it) = (*it).replace(QRegExp(interface), ""); |
108 | // clean up | 110 | // if AUTO is the only thing left clear the line |
109 | QString line = (*it).simplifyWhiteSpace(); | 111 | if(((*it).simplifyWhiteSpace()).replace(QRegExp(" "),"") == AUTO) |
110 | line = line.replace(QRegExp(" "),""); | ||
111 | if(line == AUTO) | ||
112 | (*it) = ""; | 112 | (*it) = ""; |
113 | changed = true; | 113 | changed = true; |
@@ -117,11 +117,7 @@ bool Interfaces::setAuto(const QString &interface, bool setAuto){ | |||
117 | } | 117 | } |
118 | } | 118 | } |
119 | if(changed == false){ | 119 | // In the case where there is no AUTO field add one. |
120 | if(setAuto == true) | 120 | if(!changed && setAuto) |
121 | interfaces.append(QString(AUTO" %1").arg(interface)); | 121 | interfaces.append(QString(AUTO" %1").arg(interface)); |
122 | else{ | ||
123 | qDebug(QString("Interfaces: Can't set interface %1 auto to false sense it is already false.").arg(interface).latin1()); | ||
124 | } | ||
125 | } | ||
126 | return true; | 122 | return true; |
127 | } | 123 | } |
@@ -158,5 +154,5 @@ bool Interfaces::isInterfaceSet(){ | |||
158 | */ | 154 | */ |
159 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ | 155 | bool Interfaces::addInterface(const QString &interface, const QString &family, const QString &method){ |
160 | if(acceptedFamily.contains(family)==0) | 156 | if(0 == acceptedFamily.contains(family)) |
161 | return false; | 157 | return false; |
162 | QString newInterface = interface.simplifyWhiteSpace(); | 158 | QString newInterface = interface.simplifyWhiteSpace(); |
@@ -173,15 +169,21 @@ bool Interfaces::addInterface(const QString &interface, const QString &family, c | |||
173 | */ | 169 | */ |
174 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ | 170 | bool Interfaces::copyInterface(const QString &interface, const QString &newInterface){ |
175 | if(!setInterface(interface)) return false; | 171 | if(!setInterface(interface)) |
172 | return false; | ||
176 | 173 | ||
174 | // Store the old interface and bump past the stanza line. | ||
177 | QStringList::Iterator it = currentIface; | 175 | QStringList::Iterator it = currentIface; |
178 | it++; | 176 | it++; |
179 | 177 | ||
178 | // Add the new interface | ||
180 | bool error; | 179 | bool error; |
181 | addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); | 180 | addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); |
182 | if(!setInterface(newInterface)) return false; | 181 | if(!setInterface(newInterface)) |
182 | return false; | ||
183 | |||
183 | QStringList::Iterator newIface = currentIface; | 184 | QStringList::Iterator newIface = currentIface; |
184 | newIface++; | 185 | newIface++; |
185 | 186 | ||
187 | // Copy all of the lines | ||
186 | for ( ; it != interfaces.end(); ++it ){ | 188 | for ( ; it != interfaces.end(); ++it ){ |
187 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) | 189 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) |
@@ -198,8 +200,5 @@ bool Interfaces::copyInterface(const QString &interface, const QString &newInter | |||
198 | */ | 200 | */ |
199 | bool Interfaces::removeInterface(){ | 201 | bool Interfaces::removeInterface(){ |
200 | if(currentIface == interfaces.end()) | 202 | return removeStanza(currentIface); |
201 | return false; | ||
202 | (*currentIface) = ""; | ||
203 | return removeAllInterfaceOptions(); | ||
204 | } | 203 | } |
205 | 204 | ||
@@ -233,8 +232,6 @@ QString Interfaces::getInterfaceName(bool &error){ | |||
233 | QString Interfaces::getInterfaceFamily(bool &error){ | 232 | QString Interfaces::getInterfaceFamily(bool &error){ |
234 | QString name = getInterfaceName(error); | 233 | QString name = getInterfaceName(error); |
235 | if(error){ | 234 | if(error) |
236 | error = true; | ||
237 | return QString(); | 235 | return QString(); |
238 | } | ||
239 | QString line = (*currentIface); | 236 | QString line = (*currentIface); |
240 | line = line.mid(QString(IFACE).length() +1, line.length()); | 237 | line = line.mid(QString(IFACE).length() +1, line.length()); |
@@ -258,13 +255,9 @@ QString Interfaces::getInterfaceFamily(bool &error){ | |||
258 | QString Interfaces::getInterfaceMethod(bool &error){ | 255 | QString Interfaces::getInterfaceMethod(bool &error){ |
259 | QString name = getInterfaceName(error); | 256 | QString name = getInterfaceName(error); |
260 | if(error){ | 257 | if(error) |
261 | error = true; | ||
262 | return QString(); | 258 | return QString(); |
263 | } | ||
264 | QString family = getInterfaceFamily(error); | 259 | QString family = getInterfaceFamily(error); |
265 | if(error){ | 260 | if(error) |
266 | error = true; | ||
267 | return QString(); | 261 | return QString(); |
268 | } | ||
269 | QString line = (*currentIface); | 262 | QString line = (*currentIface); |
270 | line = line.mid(QString(IFACE).length()+1, line.length()); | 263 | line = line.mid(QString(IFACE).length()+1, line.length()); |
@@ -392,8 +385,5 @@ void Interfaces::addMapping(const QString &option){ | |||
392 | */ | 385 | */ |
393 | bool Interfaces::removeMapping(){ | 386 | bool Interfaces::removeMapping(){ |
394 | if(currentMapping == interfaces.end()) | 387 | return removeStanza(currentMapping); |
395 | return false; | ||
396 | (*currentMapping) = ""; | ||
397 | return removeAllOptions(currentMapping); | ||
398 | } | 388 | } |
399 | 389 | ||
@@ -521,4 +511,17 @@ bool Interfaces::setOption(const QStringList::Iterator &start, const QString &op | |||
521 | return found; | 511 | return found; |
522 | } | 512 | } |
513 | |||
514 | /** | ||
515 | * Removes a stanza and all of its options | ||
516 | * @param stanza the stanza to remove | ||
517 | * @return bool true if successfull. | ||
518 | */ | ||
519 | bool Interfaces::removeStanza(QStringList::Iterator &stanza){ | ||
520 | if(stanza == interfaces.end()) | ||
521 | return false; | ||
522 | (*stanza) = ""; | ||
523 | return removeAllOptions(stanza); | ||
524 | } | ||
525 | |||
523 | /** | 526 | /** |
524 | * Removes a option in a stanza | 527 | * Removes a option in a stanza |
@@ -592,12 +595,12 @@ QString Interfaces::getOption(const QStringList::Iterator &start, const QString | |||
592 | if((*it).contains(option) && (*it).at(0) != '#'){ | 595 | if((*it).contains(option) && (*it).at(0) != '#'){ |
593 | if(found) | 596 | if(found) |
594 | qDebug(QString("Interfaces: Get Options found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); | 597 | qDebug(QString("Interfaces: getOption found more then one value: %1 for option: %2 in stanza %3").arg((*it)).arg(option).arg((*start)).latin1()); |
595 | found = true; | 598 | found = true; |
596 | QString line = (*it).simplifyWhiteSpace(); | 599 | QString line = (*it).simplifyWhiteSpace(); |
597 | int space = line.find(" ", option.length()); | 600 | int space = line.find(" ", option.length()); |
598 | if(space != -1) | 601 | if(space != -1){ |
599 | value = line.mid(space+1, line.length()); | 602 | value = line.mid(space+1, line.length()); |
600 | else | 603 | break; |
601 | qDebug(QString("Interfaces: Option %1 with no value").arg(option).latin1()); | 604 | } |
602 | } | 605 | } |
603 | } | 606 | } |
diff --git a/noncore/settings/networksettings/interfaces/interfaces.h b/noncore/settings/networksettings/interfaces/interfaces.h index 26abb73..5a8feb6 100644 --- a/noncore/settings/networksettings/interfaces/interfaces.h +++ b/noncore/settings/networksettings/interfaces/interfaces.h | |||
@@ -29,5 +29,5 @@ public: | |||
29 | bool setAuto(const QString &interface, bool setAuto); | 29 | bool setAuto(const QString &interface, bool setAuto); |
30 | 30 | ||
31 | bool removeInterface(); | 31 | inline bool removeInterface(); |
32 | bool addInterface(const QString &interface, const QString &family, const QString &method); | 32 | bool addInterface(const QString &interface, const QString &family, const QString &method); |
33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); | 33 | bool copyInterface(const QString &oldInterface, const QString &newInterface); |
@@ -46,5 +46,5 @@ public: | |||
46 | 46 | ||
47 | bool setMapping(const QString &interface); | 47 | bool setMapping(const QString &interface); |
48 | bool removeMapping(); | 48 | inline bool removeMapping(); |
49 | inline void addMapping(const QString &options); | 49 | inline void addMapping(const QString &options); |
50 | inline bool setMap(const QString &map, const QString &value); | 50 | inline bool setMap(const QString &map, const QString &value); |
@@ -61,4 +61,5 @@ private: | |||
61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); | 61 | bool removeOption(const QStringList::Iterator &start, const QString &option, const QString &value); |
62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); | 62 | QString getOption(const QStringList::Iterator &start, const QString &option, bool &error); |
63 | bool removeStanza(QStringList::Iterator &stanza); | ||
63 | bool removeAllOptions(const QStringList::Iterator &start); | 64 | bool removeAllOptions(const QStringList::Iterator &start); |
64 | 65 | ||
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 3b1a4de..4818e37 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -1,8 +1,5 @@ | |||
1 | #include "interfacesetupimp.h" | 1 | #include "interfacesetupimp.h" |
2 | #include "interface.h" | 2 | #include "interface.h" |
3 | #include "interfaces.h" | ||
4 | 3 | ||
5 | #include <qdialog.h> | ||
6 | #include <qcombobox.h> | ||
7 | #include <qcheckbox.h> | 4 | #include <qcheckbox.h> |
8 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
@@ -13,23 +10,10 @@ | |||
13 | #include <qmessagebox.h> | 10 | #include <qmessagebox.h> |
14 | 11 | ||
15 | #include <assert.h> | ||
16 | |||
17 | #define DNSSCRIPT "changedns" | 12 | #define DNSSCRIPT "changedns" |
18 | 13 | ||
19 | /** | 14 | /** |
20 | * Constuctor. Set up the connection and load the first profile. | 15 | * Constuctor. Set up the connection. A profile must be set. |
21 | */ | 16 | */ |
22 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl){ | 17 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i){ |
23 | assert(parent); | ||
24 | assert(i); | ||
25 | interface = i; | ||
26 | interfaces = new Interfaces(); | ||
27 | bool error = false; | ||
28 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | ||
29 | staticGroupBox->hide(); | ||
30 | dhcpCheckBox->hide(); | ||
31 | leaseTime->hide(); | ||
32 | leaseHoursLabel->hide(); | ||
33 | } | ||
34 | } | 18 | } |
35 | 19 | ||
@@ -40,5 +24,5 @@ bool InterfaceSetupImp::saveChanges(){ | |||
40 | if(!saveSettings()) | 24 | if(!saveSettings()) |
41 | return false; | 25 | return false; |
42 | interfaces->write(); | 26 | interfaces.write(); |
43 | return true; | 27 | return true; |
44 | } | 28 | } |
@@ -50,11 +34,11 @@ bool InterfaceSetupImp::saveChanges(){ | |||
50 | bool InterfaceSetupImp::saveSettings(){ | 34 | bool InterfaceSetupImp::saveSettings(){ |
51 | // eh can't really do anything about it other then return. :-D | 35 | // eh can't really do anything about it other then return. :-D |
52 | if(!interfaces->isInterfaceSet()) | 36 | if(!interfaces.isInterfaceSet()) |
53 | return true; | 37 | return true; |
54 | 38 | ||
55 | bool error = false; | 39 | bool error = false; |
56 | // Loopback case | 40 | // Loopback case |
57 | if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | 41 | if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){ |
58 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 42 | interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
59 | return true; | 43 | return true; |
60 | } | 44 | } |
@@ -64,26 +48,26 @@ bool InterfaceSetupImp::saveSettings(){ | |||
64 | return false; | 48 | return false; |
65 | } | 49 | } |
66 | interfaces->removeAllInterfaceOptions(); | 50 | interfaces.removeAllInterfaceOptions(); |
67 | 51 | ||
68 | // DHCP | 52 | // DHCP |
69 | if(dhcpCheckBox->isChecked()){ | 53 | if(dhcpCheckBox->isChecked()){ |
70 | interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP); | 54 | interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP); |
71 | interfaces->setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value())); | 55 | interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value())); |
72 | interfaces->setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60)); | 56 | interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60)); |
73 | } | 57 | } |
74 | else{ | 58 | else{ |
75 | interfaces->setInterfaceMethod("static"); | 59 | interfaces.setInterfaceMethod("static"); |
76 | interfaces->setInterfaceOption("address", ipAddressEdit->text()); | 60 | interfaces.setInterfaceOption("address", ipAddressEdit->text()); |
77 | interfaces->setInterfaceOption("netmask", subnetMaskEdit->text()); | 61 | interfaces.setInterfaceOption("netmask", subnetMaskEdit->text()); |
78 | interfaces->setInterfaceOption("gateway", gatewayEdit->text()); | 62 | interfaces.setInterfaceOption("gateway", gatewayEdit->text()); |
79 | if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ | 63 | if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ |
80 | QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); | 64 | QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text(); |
81 | interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns); | 65 | interfaces.setInterfaceOption("up "DNSSCRIPT" -a ", dns); |
82 | interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns); | 66 | interfaces.setInterfaceOption("down "DNSSCRIPT" -r ", dns); |
83 | } | 67 | } |
84 | } | 68 | } |
85 | 69 | ||
86 | // IP Information | 70 | // IP Information |
87 | interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); | 71 | interfaces.setAuto(interface->getInterfaceName(), autoStart->isChecked()); |
88 | return true; | 72 | return true; |
89 | } | 73 | } |
@@ -91,30 +75,39 @@ bool InterfaceSetupImp::saveSettings(){ | |||
91 | /** | 75 | /** |
92 | * The Profile has changed. | 76 | * The Profile has changed. |
93 | * @profile the new profile. | 77 | * @param QString profile the new profile. |
94 | */ | 78 | */ |
95 | void InterfaceSetupImp::setProfile(const QString &profile){ | 79 | void InterfaceSetupImp::setProfile(const QString &profile){ |
80 | /* | ||
81 | bool error = false; | ||
82 | if(interfaces.getInterfaceMethod(error) == INTERFACES_LOOPBACK){ | ||
83 | staticGroupBox->hide(); | ||
84 | dhcpCheckBox->hide(); | ||
85 | leaseTime->hide(); | ||
86 | leaseHoursLabel->hide(); | ||
87 | } | ||
88 | */ | ||
89 | |||
96 | QString newInterfaceName = interface->getInterfaceName(); | 90 | QString newInterfaceName = interface->getInterfaceName(); |
97 | if(profile.length() > 0) | 91 | if(profile.length() > 0) |
98 | newInterfaceName += "_" + profile; | 92 | newInterfaceName += "_" + profile; |
99 | qDebug("InterfaceSetupImp::setProfile"); | ||
100 | // See if we have to make a interface. | 93 | // See if we have to make a interface. |
101 | if(!interfaces->setInterface(newInterfaceName)){ | 94 | if(!interfaces.setInterface(newInterfaceName)){ |
102 | // Add making for this new interface if need too | 95 | // Add making for this new interface if need too |
103 | if(profile != ""){ | 96 | if(profile != ""){ |
104 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 97 | interfaces.copyInterface(interface->getInterfaceName(), newInterfaceName); |
105 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 98 | if(!interfaces.setMapping(interface->getInterfaceName())){ |
106 | interfaces->addMapping(interface->getInterfaceName()); | 99 | interfaces.addMapping(interface->getInterfaceName()); |
107 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 100 | if(!interfaces.setMapping(interface->getInterfaceName())){ |
108 | qDebug("InterfaceSetupImp: Added Mapping, but still can't set."); | 101 | qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface."); |
109 | return; | 102 | return; |
110 | } | 103 | } |
111 | } | 104 | } |
112 | interfaces->setMap("map", newInterfaceName); | 105 | interfaces.setMap("map", newInterfaceName); |
113 | interfaces->setScript("getprofile.sh"); | 106 | interfaces.setScript("getprofile.sh"); |
114 | } | 107 | } |
115 | else{ | 108 | else{ |
116 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | 109 | interfaces.addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); |
117 | if(!interfaces->setInterface(newInterfaceName)){ | 110 | if(!interfaces.setInterface(newInterfaceName)){ |
118 | qDebug("InterfaceSetupImp: Added interface, but still can't set."); | 111 | qDebug("InterfaceSetupImp: Added interface, but still can't setInterface."); |
119 | return; | 112 | return; |
120 | } | 113 | } |
@@ -126,26 +119,26 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
126 | // DHCP | 119 | // DHCP |
127 | bool error = false; | 120 | bool error = false; |
128 | if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP) | 121 | if(interfaces.getInterfaceMethod(error) == INTERFACES_METHOD_DHCP) |
129 | dhcpCheckBox->setChecked(true); | 122 | dhcpCheckBox->setChecked(true); |
130 | else | 123 | else |
131 | dhcpCheckBox->setChecked(false); | 124 | dhcpCheckBox->setChecked(false); |
132 | leaseTime->setValue(interfaces->getInterfaceOption("leasehours", error).toInt()); | 125 | leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt()); |
133 | if(error) | 126 | if(error) |
134 | leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60); | 127 | leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60); |
135 | if(error) | 128 | if(error) |
136 | leaseTime->setValue(24); | 129 | leaseTime->setValue(24); |
137 | 130 | ||
138 | // IP Information | 131 | // IP Information |
139 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); | 132 | autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName())); |
140 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); | 133 | QString dns = interfaces.getInterfaceOption("up "DNSSCRIPT" -a", error); |
141 | if(dns.contains(" ")){ | 134 | if(dns.contains(" ")){ |
142 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); | 135 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); |
143 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); | 136 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); |
144 | } | 137 | } |
145 | ipAddressEdit->setText(interfaces->getInterfaceOption("address", error)); | 138 | ipAddressEdit->setText(interfaces.getInterfaceOption("address", error)); |
146 | subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); | 139 | subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error)); |
147 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); | 140 | gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); |
148 | } | ||
149 | 141 | ||
142 | } | ||
150 | 143 | ||
151 | // interfacesetup.cpp | 144 | // interfacesetup.cpp |
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.h b/noncore/settings/networksettings/interfaces/interfacesetupimp.h index 60933aa..9ec526c 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.h +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.h | |||
@@ -3,8 +3,8 @@ | |||
3 | 3 | ||
4 | #include "interfacesetup.h" | 4 | #include "interfacesetup.h" |
5 | #include "interfaces.h" | ||
5 | #include <qdialog.h> | 6 | #include <qdialog.h> |
6 | 7 | ||
7 | class Interface; | 8 | class Interface; |
8 | class Interfaces; | ||
9 | 9 | ||
10 | class InterfaceSetupImp : public InterfaceSetup { | 10 | class InterfaceSetupImp : public InterfaceSetup { |
@@ -20,5 +20,5 @@ public slots: | |||
20 | 20 | ||
21 | private: | 21 | private: |
22 | Interfaces *interfaces; | 22 | Interfaces interfaces; |
23 | Interface *interface; | 23 | Interface *interface; |
24 | }; | 24 | }; |