summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/aqpkg.pro70
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp254
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp6
-rw-r--r--noncore/settings/aqpkg/ipkg.h14
-rw-r--r--noncore/settings/aqpkg/main.cpp2
-rw-r--r--noncore/settings/aqpkg/opie-aqpkg.control2
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp8
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,39 +1,39 @@
-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,5 +1,5 @@
/*
                This file is part of the OPIE Project
-
+
=. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk>
             .=l. Dan Williams <drw@handhelds.org>
@@ -30,6 +30,6 @@
#include <stdio.h>
-#include <opie/ofiledialog.h>
-
+#include <opie2/ofiledialog.h>
+
#ifdef QWS
#include <qpe/config.h>
@@ -59,5 +59,5 @@
enum {
- MAXLINES = 100,
+ MAXLINES = 100,
};
@@ -67,5 +67,5 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
setCaption( title );
init( TRUE );
-
+
pIpkg = 0;
upgradePackages = false;
@@ -82,12 +82,12 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
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 );
@@ -105,42 +105,42 @@ 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() );
}
@@ -163,5 +163,5 @@ InstallDlgImpl::~InstallDlgImpl()
void InstallDlgImpl :: init( bool displayextrainfo )
{
- QGridLayout *layout = new QGridLayout( this );
+ QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 4 );
layout->setMargin( 4 );
@@ -186,5 +186,5 @@ void InstallDlgImpl :: init( bool displayextrainfo )
txtAvailableSpace = 0x0;
}
-
+
QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
GroupBox2->layout()->setSpacing( 0 );
@@ -199,5 +199,5 @@ void InstallDlgImpl :: init( bool displayextrainfo )
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 );
@@ -233,6 +233,6 @@ 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() )
{
@@ -258,5 +258,5 @@ void InstallDlgImpl :: installSelected()
displayText( tr( "**** Process Aborted ****" ) );
}
-
+
btnInstall->setText( tr( "Close" ) );
btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
@@ -268,5 +268,5 @@ void InstallDlgImpl :: installSelected()
return;
}
-
+
// Disable buttons
btnOptions->setEnabled( false );
@@ -292,5 +292,5 @@ void InstallDlgImpl :: installSelected()
if ( d->linkToRoot() )
instFlags |= MAKE_LINKS;
-
+
#ifdef QWS
// Save settings
@@ -304,10 +304,10 @@ void InstallDlgImpl :: installSelected()
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;
@@ -322,5 +322,5 @@ void InstallDlgImpl :: installSelected()
if ( idata->destination->linkToRoot() )
tmpFlags |= MAKE_LINKS;
-
+
pIpkg->setFlags( tmpFlags, infoLevel );
pIpkg->runIpkg();
@@ -401,5 +401,5 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
else
space = tr( "Unknown" );
-
+
if ( txtAvailableSpace )
txtAvailableSpace->setText( space );
@@ -408,69 +408,69 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
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
@@ -28,4 +28,6 @@
*/
+#include <opie2/oprocess.h>
+
#ifdef QWS
#include <qpe/qpeapplication.h>
@@ -37,6 +39,4 @@
#include <qtextstream.h>
-#include <opie/oprocess.h>
-
#include "utils.h"
#include "ipkg.h"
@@ -365,5 +365,5 @@ void Ipkg::processFinished()
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,5 +1,5 @@
/*
                This file is part of the OPIE Project
-
+
=. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk>
             .=l. Dan Williams <drw@handhelds.org>
@@ -56,6 +56,6 @@ public:
Ipkg();
~Ipkg();
- void runIpkg();
- void createSymLinks();
+ void runIpkg();
+ void createSymLinks();
void setOption( const char *opt ) { option = opt; }
@@ -68,5 +68,5 @@ public:
signals:
void outputText( const QString &text );
- void ipkgFinished();
+ void ipkgFinished();
public slots:
@@ -76,5 +76,5 @@ public slots:
void abort();
-
+
private:
bool createLinks;
@@ -92,5 +92,5 @@ private:
QList<QString> *dependantPackages;
-
+
int executeIpkgCommand( QStringList &cmd, const QString option );
void removeStatusEntry();
@@ -99,5 +99,5 @@ private:
void processFileList( const QStringList *fileList, const QString &destDir );
void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
-
+
};
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
@@ -30,5 +30,5 @@
#include "mainwin.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
/* be less intrusive for translation -zecke */
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
@@ -3,5 +3,5 @@ Files: plugins/application/libaqpkg.so* bin/aqpkg pics/aqpkg apps/Settings/aqpkg
Priority: optional
Section: opie/settings
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2, libopieui2
Replaces: aqpkg
Architecture: arm
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,5 +1,5 @@
/*
                This file is part of the OPIE Project
-
+
=. Copyright (c) 2002 Andy Qua <andy.qua@blueyonder.co.uk>
             .=l. Dan Williams <drw@handhelds.org>
@@ -25,5 +25,5 @@
59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
-
+
*/
@@ -32,5 +32,5 @@
/* OPIE */
-#include <opie/otabwidget.h>
+#include <opie2/otabwidget.h>
#ifdef QWS
#include <qpe/config.h>
@@ -64,5 +64,5 @@ 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 );