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,6 +1,6 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
@@ -29,8 +29,8 @@
 
 #include <stdio.h>
 
-#include <opie/ofiledialog.h>
- 
+#include <opie2/ofiledialog.h>
+
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
@@ -58,7 +58,7 @@
 #include "global.h"
 
 enum {
-        MAXLINES = 100,
+    MAXLINES = 100,
 };
 
 InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
@@ -66,7 +66,7 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
 {
     setCaption( title );
     init( TRUE );
-    
+
     pIpkg = 0;
     upgradePackages = false;
     dataMgr = dataManager;
@@ -81,14 +81,14 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
     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
@@ -104,44 +104,44 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
 
     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 )
@@ -162,7 +162,7 @@ InstallDlgImpl::~InstallDlgImpl()
 
 void InstallDlgImpl :: init( bool displayextrainfo )
 {
-    QGridLayout *layout = new QGridLayout( this ); 
+    QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
@@ -185,7 +185,7 @@ void InstallDlgImpl :: init( bool displayextrainfo )
         destination = 0x0;
         txtAvailableSpace = 0x0;
     }
-    
+
     QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
     GroupBox2->layout()->setSpacing( 0 );
     GroupBox2->layout()->setMargin( 4 );
@@ -198,7 +198,7 @@ void InstallDlgImpl :: init( bool displayextrainfo )
     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() ) );
@@ -232,8 +232,8 @@ void InstallDlgImpl :: optionsSelected()
         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();
@@ -257,7 +257,7 @@ void InstallDlgImpl :: installSelected()
             pIpkg->abort();
             displayText( tr( "**** Process Aborted ****" ) );
         }
-        
+
         btnInstall->setText( tr( "Close" ) );
         btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
@@ -267,7 +267,7 @@ void InstallDlgImpl :: installSelected()
         emit reloadData( this );
         return;
     }
-    
+
     // Disable buttons
     btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
@@ -291,7 +291,7 @@ void InstallDlgImpl :: installSelected()
         int instFlags = flags;
         if ( d->linkToRoot() )
             instFlags |= MAKE_LINKS;
-    
+
 #ifdef QWS
         // Save settings
         Config cfg( "aqpkg" );
@@ -303,12 +303,12 @@ void InstallDlgImpl :: installSelected()
         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 )
@@ -321,7 +321,7 @@ void InstallDlgImpl :: installSelected()
             int tmpFlags = flags;
             if ( idata->destination->linkToRoot() )
                 tmpFlags |= MAKE_LINKS;
-            
+
             pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
@@ -400,77 +400,77 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
     }
     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
@@ -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"
@@ -364,7 +364,7 @@ void Ipkg::processFinished()
     proc = 0;
     finished = true;
 
-        emit ipkgFinished();
+    emit ipkgFinished();
 }
 
 
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,6 +1,6 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
@@ -55,8 +55,8 @@ class Ipkg : public QObject
 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; }
@@ -67,7 +67,7 @@ public:
 
 signals:
     void outputText( const QString &text );
-        void ipkgFinished();
+    void ipkgFinished();
 
 public slots:
     void commandStdout(OProcess*, char *buffer, int buflen);
@@ -75,7 +75,7 @@ public slots:
     void processFinished();
     void abort();
 
-    
+
 private:
     bool createLinks;
     bool aborted;
@@ -91,14 +91,14 @@ private:
     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
@@ -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
@@ -1,6 +1,6 @@
 /*
                              This file is part of the OPIE Project
-                             
+
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
@@ -24,14 +24,14 @@
     --        :-=`           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>
@@ -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" ) );