1 files changed, 127 insertions, 127 deletions

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,9 +1,9 @@
 /*
                              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
@@ -26,14 +26,14 @@
                              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>
@@ -55,21 +55,21 @@
 #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
@@ -78,20 +78,20 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
     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() );
@@ -101,50 +101,50 @@ InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManag
         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 );
@@ -159,13 +159,13 @@ 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 );
@@ -182,26 +182,26 @@ void InstallDlgImpl :: init( bool displayextrainfo )
     }
     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()
@@ -229,14 +229,14 @@ void InstallDlgImpl :: optionsSelected()
         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 );
@@ -254,23 +254,23 @@ void InstallDlgImpl :: installSelected()
         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" ) );
@@ -288,43 +288,43 @@ void InstallDlgImpl :: installSelected()
         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 );
@@ -397,80 +397,80 @@ void InstallDlgImpl :: displayAvailableSpace( const QString &text )
         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() );
+    }
 }