Diffstat (limited to 'noncore/settings/networksettings/interfaces/interfacesetupimp.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp index 7c2f85c..ec3bad3 100644 --- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp | |||
@@ -45,9 +45,9 @@ InterfaceSetupImp::~InterfaceSetupImp(){ | |||
45 | */ | 45 | */ |
46 | bool InterfaceSetupImp::saveChanges(){ | 46 | bool InterfaceSetupImp::saveChanges(){ |
47 | bool error; | 47 | bool error; |
48 | QString iface = interfaces->getInterfaceName(error); | 48 | QString iface = interfaces->getInterfaceName(error); |
49 | qDebug("InterfaceSetupImp::saveChanges saves interface %s", iface.latin1() ); | 49 | odebug << "InterfaceSetupImp::saveChanges saves interface " << iface.latin1() << "" << oendl; |
50 | if(!saveSettings()) | 50 | if(!saveSettings()) |
51 | return false; | 51 | return false; |
52 | 52 | ||
53 | interfaces->write(); | 53 | interfaces->write(); |
@@ -71,9 +71,9 @@ bool InterfaceSetupImp::saveChanges(){ | |||
71 | owait->show(); | 71 | owait->show(); |
72 | qApp->processEvents(); | 72 | qApp->processEvents(); |
73 | 73 | ||
74 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { | 74 | if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) { |
75 | qWarning("unstable to spawn ifdown/ifup"); | 75 | owarn << "unstable to spawn ifdown/ifup" << oendl; |
76 | } | 76 | } |
77 | 77 | ||
78 | owait->hide(); | 78 | owait->hide(); |
79 | delete owait; | 79 | delete owait; |
@@ -156,9 +156,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
156 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | 156 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); |
157 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 157 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
158 | interfaces->addMapping(interface->getInterfaceName()); | 158 | interfaces->addMapping(interface->getInterfaceName()); |
159 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 159 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
160 | qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface."); | 160 | odebug << "InterfaceSetupImp: Added Mapping, but still can't setInterface." << oendl; |
161 | return; | 161 | return; |
162 | } | 162 | } |
163 | } | 163 | } |
164 | interfaces->setMap("map", newInterfaceName); | 164 | interfaces->setMap("map", newInterfaceName); |
@@ -166,9 +166,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
166 | } | 166 | } |
167 | else{ | 167 | else{ |
168 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | 168 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); |
169 | if(!interfaces->setInterface(newInterfaceName)){ | 169 | if(!interfaces->setInterface(newInterfaceName)){ |
170 | qDebug("InterfaceSetupImp: Added interface, but still can't setInterface."); | 170 | odebug << "InterfaceSetupImp: Added interface, but still can't setInterface." << oendl; |
171 | return; | 171 | return; |
172 | } | 172 | } |
173 | } | 173 | } |
174 | } | 174 | } |
@@ -184,9 +184,9 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
184 | 184 | ||
185 | // IP Information | 185 | // IP Information |
186 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); | 186 | autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); |
187 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); | 187 | QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error); |
188 | qDebug("dns >%s<",dns.latin1()); | 188 | odebug << "dns >" << dns.latin1() << "<" << oendl; |
189 | if(dns.contains(" ")){ | 189 | if(dns.contains(" ")){ |
190 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); | 190 | firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); |
191 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); | 191 | secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); |
192 | }else firstDNSLineEdit->setText(dns); | 192 | }else firstDNSLineEdit->setText(dns); |
@@ -198,10 +198,10 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
198 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); | 198 | gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error)); |
199 | 199 | ||
200 | 200 | ||
201 | 201 | ||
202 | qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1()); | 202 | owarn << "InterfaceSetupImp::setProfile(" << profile.latin1() << ")\n" << oendl; |
203 | qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1()); | 203 | owarn << "InterfaceSetupImp::setProfile: iface is " << interfaces->getInterfaceName(error).latin1() << "\n" << oendl; |
204 | 204 | ||
205 | } | 205 | } |
206 | 206 | ||
207 | // interfacesetup.cpp | 207 | // interfacesetup.cpp |