7 files changed, 9 insertions, 9 deletions

diff --git a/noncore/settings/aqpkg/aqpkg.pro b/noncore/settings/aqpkg/aqpkg.pro
index a24f036..35a7889 100644
--- a/noncore/settings/aqpkg/aqpkg.pro
+++ b/noncore/settings/aqpkg/aqpkg.pro
@@ -36,3 +36,3 @@ INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2 -lopieui2
 
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index ea2c47f..d927a36 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -31,3 +31,3 @@
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
  
@@ -235,3 +235,3 @@ void InstallDlgImpl :: optionsSelected()
         
-        QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+        QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
         if( !filename.isEmpty() )
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 2a9c576..3761b67 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -29,2 +29,4 @@
 
+#include <opie2/oprocess.h>
+
 #ifdef QWS
@@ -38,4 +40,2 @@
 
-#include <opie/oprocess.h>
-
 #include "utils.h"
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index 8f254f9..f892038 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp
index 179f8b7..b391714 100644
--- a/noncore/settings/aqpkg/main.cpp
+++ b/noncore/settings/aqpkg/main.cpp
@@ -31,3 +31,3 @@
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
diff --git a/noncore/settings/aqpkg/opie-aqpkg.control b/noncore/settings/aqpkg/opie-aqpkg.control
index b9e143f..2edb794 100644
--- a/noncore/settings/aqpkg/opie-aqpkg.control
+++ b/noncore/settings/aqpkg/opie-aqpkg.control
@@ -4,3 +4,3 @@ Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Replaces: aqpkg
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9fdf31e..6e9dd99 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -33,3 +33,3 @@
 /* OPIE */
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 #ifdef QWS
@@ -65,3 +65,3 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
     // Setup tabs for all info
-    OTabWidget *tabwidget = new OTabWidget( this );
+    Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this );
     layout->addWidget( tabwidget );