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
@@ -34,7 +34,7 @@ SOURCES		= mainwin.cpp \
         TARGET  = aqpkg
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS        += -lqpe -lopie
+LIBS        += -lqpe -lopiecore2 -lopieui2
 
 include ( $(OPIEDIR)/include.pro )
 
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
@@ -29,7 +29,7 @@
 
 #include <stdio.h>
 
-#include <opie/ofiledialog.h>
+#include <opie2/ofiledialog.h>
  
 #ifdef QWS
 #include <qpe/config.h>
@@ -233,7 +233,7 @@ void InstallDlgImpl :: optionsSelected()
         text << "*";
         map.insert( tr( "All" ), text );
         
-        QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+        QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
         if( !filename.isEmpty() )
         {
             QString currentFileName = QFileInfo( filename ).fileName();
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
@@ -27,6 +27,8 @@
 
 */
 
+#include <opie2/oprocess.h>
+
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #else
@@ -36,8 +38,6 @@
 #include <qfile.h>
 #include <qtextstream.h>
 
-#include <opie/oprocess.h>
-
 #include "utils.h"
 #include "ipkg.h"
 #include "global.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
@@ -29,7 +29,7 @@
 
 #include "mainwin.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 /* be less intrusive for translation -zecke */
 extern QString LOCAL_SERVER;
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
@@ -2,7 +2,7 @@ Package: opie-aqpkg
 Files: plugins/application/libaqpkg.so* bin/aqpkg pics/aqpkg apps/Settings/aqpkg.desktop
 Priority: optional
 Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
 Replaces: aqpkg
 Architecture: arm
 Maintainer: Andy Qua (andy.qua@blueyonder.co.uk)
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
@@ -31,7 +31,7 @@
 #include "global.h"
 
 /* OPIE */
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/resource.h>
@@ -63,7 +63,7 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
     layout->setSpacing( 4 );
 
     // Setup tabs for all info
-    OTabWidget *tabwidget = new OTabWidget( this );
+    Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this );
     layout->addWidget( tabwidget );
 
     tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );