summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/interfaces
Side-by-side diff
Diffstat (limited to 'noncore/settings/networksettings/interfaces') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/.cvsignore3
-rw-r--r--noncore/settings/networksettings/interfaces/config.in2
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp6
3 files changed, 6 insertions, 5 deletions
diff --git a/noncore/settings/networksettings/interfaces/.cvsignore b/noncore/settings/networksettings/interfaces/.cvsignore
index 1655b12..0b2d203 100644
--- a/noncore/settings/networksettings/interfaces/.cvsignore
+++ b/noncore/settings/networksettings/interfaces/.cvsignore
@@ -1,5 +1,4 @@
-
Makefile
Makefile.in
interfaceadvanced.cpp
interfaceadvanced.h
@@ -8,4 +7,6 @@ interfaceinformation.h
interfacesetup.cpp
interfacesetup.h
lib*.so*
moc*
+.moc
+.obj \ No newline at end of file
diff --git a/noncore/settings/networksettings/interfaces/config.in b/noncore/settings/networksettings/interfaces/config.in
index 6c21aeb..d84cd24 100644
--- a/noncore/settings/networksettings/interfaces/config.in
+++ b/noncore/settings/networksettings/interfaces/config.in
@@ -1,4 +1,4 @@
config INTERFACES
boolean
default "y" if NETWORKSETUP
- depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 78466d0..ab0e4cc 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -11,9 +11,9 @@
#include <opie/oprocess.h>
#ifdef QWS
-#include <opie/owait.h>
+#include <opie2/owait.h>
#include <qpe/global.h>
#include <qapplication.h>
#endif
@@ -154,11 +154,11 @@ void InterfaceSetupImp::setProfile(const QString &profile){
interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
if(!interfaces->setMapping(interface->getInterfaceName())){
interfaces->addMapping(interface->getInterfaceName());
if(!interfaces->setMapping(interface->getInterfaceName())){
- qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
+ qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
return;
- }
+ }
}
interfaces->setMap("map", newInterfaceName);
interfaces->setScript("getprofile.sh");
}