AQPkg: libopie->libopie2

7 files changed, 178 insertions, 178 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
@@ -1,40 +1,40 @@
-CONFIG		= qt warn_on release quick-app
-HEADERS		= global.h \
-		  mainwin.h \
-		  datamgr.h \
-		  settingsimpl.h \
-		  ipkg.h \
-		  packagewin.h \
-		  package.h \
-		  installdlgimpl.h \
-		  instoptionsimpl.h \
-		  destination.h \
-		  utils.h \
-		  server.h \
-		  letterpushbutton.h \
-		  inputdlg.h \
-		  categoryfilterimpl.h
-SOURCES		= mainwin.cpp \
-		  datamgr.cpp \
-		  mem.cpp \
-		  settingsimpl.cpp \
-		  ipkg.cpp \
-		  main.cpp \
-		  packagewin.cpp \
-		  package.cpp \
-		  installdlgimpl.cpp \
-		  instoptionsimpl.cpp \
-		  destination.cpp \
-		  utils.cpp \
-		  server.cpp \
-		  letterpushbutton.cpp \
-		  inputdlg.cpp \
-		  version.cpp \
-		  categoryfilterimpl.cpp
-TARGET		= aqpkg
+CONFIG        = qt warn_on release quick-app
+HEADERS        = global.h \
+          mainwin.h \
+          datamgr.h \
+          settingsimpl.h \
+          ipkg.h \
+          packagewin.h \
+          package.h \
+          installdlgimpl.h \
+          instoptionsimpl.h \
+          destination.h \
+          utils.h \
+          server.h \
+          letterpushbutton.h \
+          inputdlg.h \
+          categoryfilterimpl.h
+SOURCES        = mainwin.cpp \
+          datamgr.cpp \
+          mem.cpp \
+          settingsimpl.cpp \
+          ipkg.cpp \
+          main.cpp \
+          packagewin.cpp \
+          package.cpp \
+          installdlgimpl.cpp \
+          instoptionsimpl.cpp \
+          destination.cpp \
+          utils.cpp \
+          server.cpp \
+          letterpushbutton.cpp \
+          inputdlg.cpp \
+          version.cpp \
+          categoryfilterimpl.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
@@ -1,11 +1,11 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
@@ -24,18 +24,18 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdio.h>
 
-#include <opie/ofiledialog.h>
- 
+#include <opie2/ofiledialog.h>
+
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 #endif
 
@@ -53,100 +53,100 @@
 #include "destination.h"
 #include "instoptionsimpl.h"
 #include "installdlgimpl.h"
 #include "ipkg.h"
 #include "utils.h"
 #include "global.h"
 
 enum {
-	MAXLINES = 100,
+    MAXLINES = 100,
 };
 
 InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
     init( TRUE );
-    
+
     pIpkg = 0;
     upgradePackages = false;
     dataMgr = dataManager;
 
     QString defaultDest = "root";
 #ifdef QWS
     Config cfg( "aqpkg" );
     cfg.setGroup( "settings" );
     defaultDest = cfg.readEntry( "dest", "root" );
 
     // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
     flags = cfg.readNumEntry( "installFlags", 0 );
     infoLevel = cfg.readNumEntry( "infoLevel", 1 );
 #else
-	flags = 0;
+    flags = 0;
 #endif
 
     // Output text is read only
     output->setReadOnly( true );
-//	QFont f( "helvetica" );
-//	f.setPointSize( 10 );
-//	output->setFont( f );
+//    QFont f( "helvetica" );
+//    f.setPointSize( 10 );
+//    output->setFont( f );
 
 
     // setup destination data
     int defIndex = 0;
     int i;
     QListIterator<Destination> dit( dataMgr->getDestinationList() );
     for ( i = 0; dit.current(); ++dit, ++i )
     {
         destination->insertItem( dit.current()->getDestinationName() );
         if ( dit.current()->getDestinationName() == defaultDest )
             defIndex = i;
     }
 
     destination->setCurrentItem( defIndex );
 
-	QListIterator<InstallData> it( packageList );
-	// setup package data
-	QString remove = tr( "Remove\n" );
-	QString install = tr( "Install\n" );
-	QString upgrade = tr( "Upgrade\n" );
-	for ( ; it.current(); ++it )
-	{
-		InstallData *item = it.current();
-		InstallData *newitem = new InstallData();
-
-		newitem->option = item->option;
-		newitem->packageName = item->packageName;
-		newitem->destination = item->destination;
-		newitem->recreateLinks = item->recreateLinks;
-		packages.append( newitem );
-
-		if ( item->option == "I" )
-		{
-			install.append( QString( "   %1\n" ).arg( item->packageName ) );
-		}
-		else if ( item->option == "D" )
-		{
-			remove.append( QString( "   %1\n" ).arg( item->packageName ) );
-		}
-		else if ( item->option == "U" || item->option == "R" )
-		{
-			QString type;
-			if ( item->option == "R" )
-				type = tr( "(ReInstall)" );
-			else
-				type = tr( "(Upgrade)" );
-			upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
-		}
-	}
-
-	output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
-
-	displayAvailableSpace( destination->currentText() );
+    QListIterator<InstallData> it( packageList );
+    // setup package data
+    QString remove = tr( "Remove\n" );
+    QString install = tr( "Install\n" );
+    QString upgrade = tr( "Upgrade\n" );
+    for ( ; it.current(); ++it )
+    {
+        InstallData *item = it.current();
+        InstallData *newitem = new InstallData();
+
+        newitem->option = item->option;
+        newitem->packageName = item->packageName;
+        newitem->destination = item->destination;
+        newitem->recreateLinks = item->recreateLinks;
+        packages.append( newitem );
+
+        if ( item->option == "I" )
+        {
+            install.append( QString( "   %1\n" ).arg( item->packageName ) );
+        }
+        else if ( item->option == "D" )
+        {
+            remove.append( QString( "   %1\n" ).arg( item->packageName ) );
+        }
+        else if ( item->option == "U" || item->option == "R" )
+        {
+            QString type;
+            if ( item->option == "R" )
+                type = tr( "(ReInstall)" );
+            else
+                type = tr( "(Upgrade)" );
+            upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
+        }
+    }
+
+    output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
+
+    displayAvailableSpace( destination->currentText() );
 }
 
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
     init( FALSE );
     pIpkg = ipkg;
@@ -157,17 +157,17 @@ InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *tit
 InstallDlgImpl::~InstallDlgImpl()
 {
     if ( pIpkg )
         delete pIpkg;
 }
 
 void InstallDlgImpl :: init( bool displayextrainfo )
 {
-    QGridLayout *layout = new QGridLayout( this ); 
+    QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
     if ( displayextrainfo )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
         layout->addWidget( label, 0, 0 );
         destination = new QComboBox( FALSE, this );
@@ -180,30 +180,30 @@ void InstallDlgImpl :: init( bool displayextrainfo )
         txtAvailableSpace = new QLabel( "", this );
         layout->addWidget( txtAvailableSpace, 1, 1 );
     }
     else
     {
         destination = 0x0;
         txtAvailableSpace = 0x0;
     }
-    
+
     QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
     GroupBox2->layout()->setSpacing( 0 );
     GroupBox2->layout()->setMargin( 4 );
 
     QVBoxLayout *GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() );
     output = new QMultiLineEdit( GroupBox2 );
     GroupBox2Layout->addWidget( output );
     layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
 
     btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
     layout->addWidget( btnInstall, 3, 0 );
     connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
-    
+
     btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( btnOptions, 3, 1 );
     connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
 
 void InstallDlgImpl :: optionsSelected()
 {
     if ( btnOptions->text() == tr( "Options" ) )
@@ -227,18 +227,18 @@ void InstallDlgImpl :: optionsSelected()
     {
         QMap<QString, QStringList> map;
         map.insert( tr( "All" ), QStringList() );
         QStringList text;
         text << "text/*";
         map.insert(tr( "Text" ), text );
         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();
             DocLnk doc;
             doc.setType( "text/plain" );
             doc.setFile( filename );
             doc.setName( currentFileName );
             FileManager fm;
@@ -252,27 +252,27 @@ void InstallDlgImpl :: installSelected()
     if ( btnInstall->text() == tr( "Abort" ) )
     {
         if ( pIpkg )
         {
             displayText( tr( "\n**** User Clicked ABORT ***" ) );
             pIpkg->abort();
             displayText( tr( "**** Process Aborted ****" ) );
         }
-        
+
         btnInstall->setText( tr( "Close" ) );
         btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
     }
     else if ( btnInstall->text() == tr( "Close" ) )
     {
         emit reloadData( this );
         return;
     }
-    
+
     // Disable buttons
     btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
 
     btnInstall->setText( tr( "Abort" ) );
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
 
     if ( pIpkg )
@@ -286,47 +286,47 @@ void InstallDlgImpl :: installSelected()
     {
         output->setText( "" );
         Destination *d = dataMgr->getDestination( destination->currentText() );
         QString dest = d->getDestinationName();
         QString destDir = d->getDestinationPath();
         int instFlags = flags;
         if ( d->linkToRoot() )
             instFlags |= MAKE_LINKS;
-    
+
 #ifdef QWS
         // Save settings
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         cfg.writeEntry( "dest", dest );
 #endif
 
         pIpkg = new Ipkg;
         connect( pIpkg, SIGNAL(outputText(const QString &)), this, SLOT(displayText(const QString &)));
         connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
 
-		firstPackage = TRUE;
-		ipkgFinished();
+        firstPackage = TRUE;
+        ipkgFinished();
 
         // First run through the remove list, then the install list then the upgrade list
-/*        
-		pIpkg->setOption( "remove" );
+/*
+        pIpkg->setOption( "remove" );
         QListIterator<InstallData> it( removeList );
         InstallData *idata;
         for ( ; it.current(); ++it )
         {
             idata = it.current();
             pIpkg->setDestination( idata->destination->getDestinationName() );
             pIpkg->setDestinationDir( idata->destination->getDestinationPath() );
             pIpkg->setPackage( idata->packageName );
 
             int tmpFlags = flags;
             if ( idata->destination->linkToRoot() )
                 tmpFlags |= MAKE_LINKS;
-            
+
             pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
         pIpkg->setOption( "install" );
         pIpkg->setDestination( dest );
         pIpkg->setDestinationDir( destDir );
         pIpkg->setFlags( instFlags, infoLevel );
@@ -395,82 +395,82 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
         if ( !mult ) mult = 1;
         if ( !div ) div = 1;
         long avail = availBlocks * mult / div;
 
         space = tr( "%1 Kb" ).arg( avail );
     }
     else
         space = tr( "Unknown" );
-        
+
     if ( txtAvailableSpace )
         txtAvailableSpace->setText( space );
 }
 
 void InstallDlgImpl :: ipkgFinished()
 {
-	InstallData *item;
-	if ( firstPackage )
-		item = packages.first();
-	else
-	{
-		// Create symlinks if necessary before moving on to next package
-		pIpkg->createSymLinks();
-
-		item = packages.next();
-	}
-
-	firstPackage = FALSE;
-	if ( item )
-	{
-		pIpkg->setPackage( item->packageName );
-		int tmpFlags = flags;
-
-		if ( item->option == "I" )
-		{
-			pIpkg->setOption( "install" );
-			Destination *d = dataMgr->getDestination( destination->currentText() );
-			pIpkg->setDestination( d->getDestinationName() );
-			pIpkg->setDestinationDir( d->getDestinationPath() );
-		
-			if ( d->linkToRoot() )
-				tmpFlags |= MAKE_LINKS;
-		}
-		else if ( item->option == "D" )
-		{
-			pIpkg->setOption( "remove" );
-			pIpkg->setDestination( item->destination->getDestinationName() );
-			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
-
-			if ( item->destination->linkToRoot() )
-				tmpFlags |= MAKE_LINKS;
-		}
-		else
-		{
-			if ( item->option == "R" )
-				pIpkg->setOption( "reinstall" );
-			else
-				pIpkg->setOption( "upgrade" );
-			
-			pIpkg->setDestination( item->destination->getDestinationName() );
-			pIpkg->setDestinationDir( item->destination->getDestinationPath() );
-			pIpkg->setPackage( item->packageName );
-
-			tmpFlags |= FORCE_REINSTALL;
-			if ( item->destination->linkToRoot() && item->recreateLinks )
-				tmpFlags |= MAKE_LINKS;
-		}
-		pIpkg->setFlags( tmpFlags, infoLevel );
-		pIpkg->runIpkg();
-	}
-	else
-	{
-		btnOptions->setEnabled( true );
-		btnInstall->setText( tr( "Close" ) );
-		btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
-
-		btnOptions->setText( tr( "Save output" ) );
-		btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
-
-		if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
-			displayAvailableSpace( destination->currentText() );
-	}
+    InstallData *item;
+    if ( firstPackage )
+        item = packages.first();
+    else
+    {
+        // Create symlinks if necessary before moving on to next package
+        pIpkg->createSymLinks();
+
+        item = packages.next();
+    }
+
+    firstPackage = FALSE;
+    if ( item )
+    {
+        pIpkg->setPackage( item->packageName );
+        int tmpFlags = flags;
+
+        if ( item->option == "I" )
+        {
+            pIpkg->setOption( "install" );
+            Destination *d = dataMgr->getDestination( destination->currentText() );
+            pIpkg->setDestination( d->getDestinationName() );
+            pIpkg->setDestinationDir( d->getDestinationPath() );
+
+            if ( d->linkToRoot() )
+                tmpFlags |= MAKE_LINKS;
+        }
+        else if ( item->option == "D" )
+        {
+            pIpkg->setOption( "remove" );
+            pIpkg->setDestination( item->destination->getDestinationName() );
+            pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+
+            if ( item->destination->linkToRoot() )
+                tmpFlags |= MAKE_LINKS;
+        }
+        else
+        {
+            if ( item->option == "R" )
+                pIpkg->setOption( "reinstall" );
+            else
+                pIpkg->setOption( "upgrade" );
+
+            pIpkg->setDestination( item->destination->getDestinationName() );
+            pIpkg->setDestinationDir( item->destination->getDestinationPath() );
+            pIpkg->setPackage( item->packageName );
+
+            tmpFlags |= FORCE_REINSTALL;
+            if ( item->destination->linkToRoot() && item->recreateLinks )
+                tmpFlags |= MAKE_LINKS;
+        }
+        pIpkg->setFlags( tmpFlags, infoLevel );
+        pIpkg->runIpkg();
+    }
+    else
+    {
+        btnOptions->setEnabled( true );
+        btnInstall->setText( tr( "Close" ) );
+        btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
+
+        btnOptions->setText( tr( "Save output" ) );
+        btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
+
+        if ( destination && destination->currentText() != 0 && destination->currentText() != "" )
+            displayAvailableSpace( destination->currentText() );
+    }
 }
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
@@ -22,27 +22,27 @@
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include <opie2/oprocess.h>
+
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
-#include <opie/oprocess.h>
-
 #include "utils.h"
 #include "ipkg.h"
 #include "global.h"
 
 Ipkg :: Ipkg()
 {
     proc = 0;
 }
@@ -359,17 +359,17 @@ void Ipkg::processFinished()
 
     if ( !error && option == "remove" )
         removeStatusEntry();
 
     delete proc;
     proc = 0;
     finished = true;
 
-	emit ipkgFinished();
+    emit ipkgFinished();
 }
 
 
 void Ipkg :: abort()
 {
     if ( proc )
     {
         proc->kill();
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
@@ -1,11 +1,11 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
@@ -50,55 +50,55 @@
 class OProcess;
 
 class Ipkg : public QObject
 {
     Q_OBJECT
 public:
     Ipkg();
     ~Ipkg();
-	void runIpkg();
-	void createSymLinks();
+    void runIpkg();
+    void createSymLinks();
 
     void setOption( const char *opt )               { option = opt; }
     void setPackage( const char *pkg )              { package = pkg; }
     void setDestination( const char *dest )         { destination = dest; }
     void setDestinationDir( const char *dir )       { destDir = dir; }
     void setFlags( int fl, int il )                 { flags = fl; infoLevel = il; }
     void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 
 signals:
     void outputText( const QString &text );
-	void ipkgFinished();
+    void ipkgFinished();
 
 public slots:
     void commandStdout(OProcess*, char *buffer, int buflen);
     void commandStderr(OProcess*, char *buffer, int buflen);
     void processFinished();
     void abort();
 
-    
+
 private:
     bool createLinks;
     bool aborted;
     bool error;
     QString option;
     QString package;
     QString destination;
     QString destDir;
     QString runtimeDir;
     OProcess *proc;
     int flags;
     int infoLevel;
     bool finished;
 
     QList<QString> *dependantPackages;
-    
+
     int executeIpkgCommand( QStringList &cmd, const QString option );
     void removeStatusEntry();
     void linkPackage( const QString &packFileName, const QString &dest, const QString &destDir );
     QStringList* getList( const QString &packageFilename, const QString &destDir );
     void processFileList( const QStringList *fileList, const QString &destDir );
     void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
-    
+
 };
 
 #endif
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
@@ -24,15 +24,15 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwin.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 /* be less intrusive for translation -zecke */
 extern QString LOCAL_SERVER;
 extern QString LOCAL_IPKGS;
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
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
@@ -1,10 +1,10 @@
 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)
 Description: A Package Manager
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -1,11 +1,11 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
@@ -19,24 +19,24 @@
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
- 
+
 */
 
 #include "settingsimpl.h"
 #include "global.h"
 
 /* OPIE */
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #endif
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
@@ -58,17 +58,17 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
     setCaption( tr( "Configuration" ) );
 
     // Setup layout to make everything pretty
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     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" ) );
     tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
     tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
     tabwidget->setCurrentTab( tr( "Servers" ) );
 
     dataMgr = dataManager;