2 files changed, 31 insertions, 1 deletions

diff --git a/noncore/settings/networksettings2/.cvsignore b/noncore/settings/networksettings2/.cvsignore
new file mode 100644
index 0000000..e000724
--- a/dev/null
+++ b/noncore/settings/networksettings2/.cvsignore
@@ -0,0 +1,29 @@
+*.moc
+*.moc.o
+*.o
+.deps
+.libs
+.moc.cpp
+.moc.o
+.o
+Makefile*
+addconnection.cpp
+addconnection.h
+interfaceadvanced.cpp
+interfaceadvanced.h
+interfaceinformation.cpp
+interfaceinformation.h
+interfacesetup.cpp
+interfacesetup.h
+mainwindow.cpp
+mainwindow.h
+moc_*.cpp
+networksetup
+systemadvanced.cpp
+systemadvanced.h
+hosts.h
+hosts.cpp
+vpn.h
+vpn.cpp
+dns.h
+dns.cpp
diff --git a/noncore/settings/networksettings2/main.cpp b/noncore/settings/networksettings2/main.cpp
index e2c00f6..30d1270 100644
--- a/noncore/settings/networksettings2/main.cpp
+++ b/noncore/settings/networksettings2/main.cpp
@@ -1,31 +1,32 @@
 #include "nsdata.h"
 #include "activateprofile.h"
 #include "networksettings.h"
 
 #include <qpe/qpeapplication.h>
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
 
 #ifdef GONE
 
 OPIE_EXPORT_APP( OApplicationFactory<NetworkSettings> )
 
 #else
 
 // just standard GUI
 #define ACT_GUI         0
 // used by interfaces to request for allow of up/down
 #define ACT_REQUEST     1
 // regenerate config files
 #define ACT_REGEN       2
 // used by interfaces to request user prompt 
 #define ACT_PROMPT      3
 
 int main( int argc, char * argv[] ) {
         int rv = 0;
         int Action = ACT_GUI;
         // could be overruled by -qws
         QApplication::Type GuiType = QApplication::GuiClient; 
 
 #ifdef _WS_QWS_
         QPEApplication * TheApp;