summaryrefslogtreecommitdiff
path: root/noncore
authordrw <drw>2003-02-01 18:39:12 (UTC)
committer drw <drw>2003-02-01 18:39:12 (UTC)
commit3e4dbe1619e26a4ee374e800a19ee5f4c2b6725b (patch) (unidiff)
tree549ff507ac10fa603956c902477f19f1911ff8cc /noncore
parent48c90b56031a372bb3f822ad34b2c6857087aa69 (diff)
downloadopie-3e4dbe1619e26a4ee374e800a19ee5f4c2b6725b.zip
opie-3e4dbe1619e26a4ee374e800a19ee5f4c2b6725b.tar.gz
opie-3e4dbe1619e26a4ee374e800a19ee5f4c2b6725b.tar.bz2
Fix for gcc 3.2...
Diffstat (limited to 'noncore') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index 65aaa32..19fe46a 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -20,49 +20,49 @@
20#ifdef QWS 20#ifdef QWS
21#include <qpe/config.h> 21#include <qpe/config.h>
22#include <qpe/qpeapplication.h> 22#include <qpe/qpeapplication.h>
23#include <qpe/resource.h> 23#include <qpe/resource.h>
24#include <qpe/storage.h> 24#include <qpe/storage.h>
25#endif 25#endif
26 26
27#include <qcheckbox.h> 27#include <qcheckbox.h>
28#include <qcombobox.h> 28#include <qcombobox.h>
29#include <qdialog.h> 29#include <qdialog.h>
30#include <qgroupbox.h> 30#include <qgroupbox.h>
31#include <qmultilineedit.h> 31#include <qmultilineedit.h>
32#include <qlabel.h> 32#include <qlabel.h>
33#include <qlayout.h> 33#include <qlayout.h>
34#include <qpushbutton.h> 34#include <qpushbutton.h>
35 35
36#include "datamgr.h" 36#include "datamgr.h"
37#include "destination.h" 37#include "destination.h"
38#include "instoptionsimpl.h" 38#include "instoptionsimpl.h"
39#include "installdlgimpl.h" 39#include "installdlgimpl.h"
40#include "ipkg.h" 40#include "ipkg.h"
41#include "utils.h" 41#include "utils.h"
42#include "global.h" 42#include "global.h"
43 43
44InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, const char *title = 0 ) 44InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *dataManager, const char *title )
45 : QWidget( 0, 0, 0 ) 45 : QWidget( 0, 0, 0 )
46{ 46{
47 setCaption( title ); 47 setCaption( title );
48 init( TRUE ); 48 init( TRUE );
49 49
50 pIpkg = 0; 50 pIpkg = 0;
51 upgradePackages = false; 51 upgradePackages = false;
52 dataMgr = dataManager; 52 dataMgr = dataManager;
53 vector<Destination>::iterator dit; 53 vector<Destination>::iterator dit;
54 54
55 QString defaultDest = "root"; 55 QString defaultDest = "root";
56#ifdef QWS 56#ifdef QWS
57 Config cfg( "aqpkg" ); 57 Config cfg( "aqpkg" );
58 cfg.setGroup( "settings" ); 58 cfg.setGroup( "settings" );
59 defaultDest = cfg.readEntry( "dest", "root" ); 59 defaultDest = cfg.readEntry( "dest", "root" );
60 60
61 // Grab flags - Turn MAKE_LINKS on by default (if no flags found) 61 // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
62 flags = cfg.readNumEntry( "installFlags", 0 ); 62 flags = cfg.readNumEntry( "installFlags", 0 );
63#else 63#else
64 flags = 0; 64 flags = 0;
65#endif 65#endif
66 66
67 // Output text is read only 67 // Output text is read only
68 output->setReadOnly( true ); 68 output->setReadOnly( true );
@@ -97,49 +97,49 @@ InstallDlgImpl::InstallDlgImpl( vector<InstallData> &packageList, DataManager *d
97 install.append( QString( " %1\n" ).arg( item.packageName ) ); 97 install.append( QString( " %1\n" ).arg( item.packageName ) );
98 } 98 }
99 else if ( item.option == "D" ) 99 else if ( item.option == "D" )
100 { 100 {
101 removeList.push_back( item ); 101 removeList.push_back( item );
102 remove.append( QString( " %1\n" ).arg( item.packageName ) ); 102 remove.append( QString( " %1\n" ).arg( item.packageName ) );
103 } 103 }
104 else if ( item.option == "U" || item.option == "R" ) 104 else if ( item.option == "U" || item.option == "R" )
105 { 105 {
106 updateList.push_back( item ); 106 updateList.push_back( item );
107 QString type; 107 QString type;
108 if ( item.option == "R" ) 108 if ( item.option == "R" )
109 type = tr( "(ReInstall)" ); 109 type = tr( "(ReInstall)" );
110 else 110 else
111 type = tr( "(Upgrade)" ); 111 type = tr( "(Upgrade)" );
112 upgrade.append( QString( " %1 %2\n" ).arg( item.packageName ).arg( type ) ); 112 upgrade.append( QString( " %1 %2\n" ).arg( item.packageName ).arg( type ) );
113 } 113 }
114 } 114 }
115 115
116 output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) ); 116 output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
117 117
118 displayAvailableSpace( destination->currentText() ); 118 displayAvailableSpace( destination->currentText() );
119} 119}
120 120
121InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title = 0 ) 121InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title )
122 : QWidget( 0, 0, 0 ) 122 : QWidget( 0, 0, 0 )
123{ 123{
124 setCaption( title ); 124 setCaption( title );
125 init( FALSE ); 125 init( FALSE );
126 pIpkg = ipkg; 126 pIpkg = ipkg;
127 output->setText( initialText ); 127 output->setText( initialText );
128} 128}
129 129
130 130
131InstallDlgImpl::~InstallDlgImpl() 131InstallDlgImpl::~InstallDlgImpl()
132{ 132{
133 if ( pIpkg ) 133 if ( pIpkg )
134 delete pIpkg; 134 delete pIpkg;
135} 135}
136 136
137void InstallDlgImpl :: init( bool displayextrainfo ) 137void InstallDlgImpl :: init( bool displayextrainfo )
138{ 138{
139 QGridLayout *layout = new QGridLayout( this ); 139 QGridLayout *layout = new QGridLayout( this );
140 layout->setSpacing( 4 ); 140 layout->setSpacing( 4 );
141 layout->setMargin( 4 ); 141 layout->setMargin( 4 );
142 142
143 if ( displayextrainfo ) 143 if ( displayextrainfo )
144 { 144 {
145 QLabel *label = new QLabel( tr( "Destination" ), this ); 145 QLabel *label = new QLabel( tr( "Destination" ), this );