author | andyq <andyq> | 2002-11-21 20:16:40 (UTC) |
---|---|---|
committer | andyq <andyq> | 2002-11-21 20:16:40 (UTC) |
commit | 2185394da06d32a3655e71ec022da202477350e7 (patch) (unidiff) | |
tree | b266ddecaa44a1fef5229bb0525c990d5e7cc51a /noncore/settings/aqpkg | |
parent | 6d302b82aab909da59852d99a31bcc7726ba9f34 (diff) | |
download | opie-2185394da06d32a3655e71ec022da202477350e7.zip opie-2185394da06d32a3655e71ec022da202477350e7.tar.gz opie-2185394da06d32a3655e71ec022da202477350e7.tar.bz2 |
Re-applied patch for gcc3.2
-rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 29 | ||||
-rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/global.h | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/letterpushbutton.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/mainwin.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/aqpkg/networkpkgmgr.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/aqpkg/server.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 23 |
10 files changed, 37 insertions, 41 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index e7fb75a..96c28c0 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp | |||
@@ -39,34 +39,32 @@ DataManager::~DataManager() | |||
39 | { | 39 | { |
40 | } | 40 | } |
41 | 41 | ||
42 | Server *DataManager :: getServer( const char *name ) | 42 | vector<Server>::iterator DataManager :: getServer( const char *name ) |
43 | { | 43 | { |
44 | Server *s = 0; | 44 | vector<Server>::iterator it = serverList.begin(); |
45 | vector<Server>::iterator it = serverList.begin(); | 45 | while ( it != serverList.end() ) |
46 | while ( it != serverList.end() && s == 0 ) | ||
47 | { | 46 | { |
48 | if ( it->getServerName() == name ) | 47 | if ( it->getServerName() == name ) |
49 | s = &(*it); | 48 | return it; |
50 | 49 | ||
51 | ++it; | 50 | ++it; |
52 | } | 51 | } |
53 | 52 | ||
54 | return s; | 53 | return serverList.end(); |
55 | } | 54 | } |
56 | 55 | ||
57 | Destination *DataManager :: getDestination( const char *name ) | 56 | vector<Destination>::iterator DataManager :: getDestination( const char *name ) |
58 | { | 57 | { |
59 | Destination *d = 0; | ||
60 | vector<Destination>::iterator it = destList.begin(); | 58 | vector<Destination>::iterator it = destList.begin(); |
61 | while ( it != destList.end() && d == 0 ) | 59 | while ( it != destList.end() ) |
62 | { | 60 | { |
63 | if ( it->getDestinationName() == name ) | 61 | if ( it->getDestinationName() == name ) |
64 | d = &(*it); | 62 | return it; |
65 | 63 | ||
66 | ++it; | 64 | ++it; |
67 | } | 65 | } |
68 | 66 | ||
69 | return d; | 67 | return destList.end(); |
70 | } | 68 | } |
71 | 69 | ||
72 | void DataManager :: loadServers() | 70 | void DataManager :: loadServers() |
@@ -150,11 +148,6 @@ void DataManager :: loadServers() | |||
150 | } | 148 | } |
151 | fclose( fp ); | 149 | fclose( fp ); |
152 | 150 | ||
153 | cout << "httpProxy = " << httpProxy << endl; | ||
154 | cout << "ftpProxy = " << ftpProxy << endl; | ||
155 | cout << "proxyUsername = " << proxyUsername << endl; | ||
156 | cout << "proxyPassword = " << proxyPassword << endl; | ||
157 | |||
158 | reloadServerData( ); | 151 | reloadServerData( ); |
159 | } | 152 | } |
160 | 153 | ||
@@ -171,9 +164,9 @@ void DataManager :: reloadServerData( ) | |||
171 | if ( it->getServerName() == LOCAL_SERVER ) | 164 | if ( it->getServerName() == LOCAL_SERVER ) |
172 | it->readStatusFile( destList ); | 165 | it->readStatusFile( destList ); |
173 | else if ( it->getServerName() == LOCAL_IPKGS ) | 166 | else if ( it->getServerName() == LOCAL_IPKGS ) |
174 | it->readLocalIpks( getServer( LOCAL_SERVER ) ); | 167 | it->readLocalIpks( &( *getServer( LOCAL_SERVER ) ) ); |
175 | else | 168 | else |
176 | it->readPackageFile( getServer( LOCAL_SERVER ) ); | 169 | it->readPackageFile( &( *getServer( LOCAL_SERVER ) ) ); |
177 | } | 170 | } |
178 | } | 171 | } |
179 | 172 | ||
diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h index 14b0b2f..41833df 100644 --- a/noncore/settings/aqpkg/datamgr.h +++ b/noncore/settings/aqpkg/datamgr.h | |||
@@ -38,17 +38,17 @@ class DataManager | |||
38 | { | 38 | { |
39 | public: | 39 | public: |
40 | DataManager(); | 40 | DataManager(); |
41 | ~DataManager(); | 41 | ~DataManager(); |
42 | 42 | ||
43 | void setActiveServer( const QString &act ) { activeServer = act; } | 43 | void setActiveServer( const QString &act ) { activeServer = act; } |
44 | QString &getActiveServer( ) { return activeServer; } | 44 | QString &getActiveServer( ) { return activeServer; } |
45 | 45 | ||
46 | Server *getLocalServer() { return getServer( LOCAL_SERVER ); } | 46 | Server *getLocalServer() { return &( *getServer( LOCAL_SERVER ) ); } |
47 | vector<Server> &getServerList() { return serverList; } | 47 | vector<Server> &getServerList() { return serverList; } |
48 | Server *getServer( const char *name ); | 48 | vector<Server>::iterator getServer( const char *name ); |
49 | 49 | ||
50 | vector<Destination> &getDestinationList() { return destList; } | 50 | vector<Destination> &getDestinationList() { return destList; } |
51 | Destination *getDestination( const char *name ); | 51 | vector<Destination>::iterator getDestination( const char *name ); |
52 | 52 | ||
53 | void loadServers(); | 53 | void loadServers(); |
54 | void reloadServerData( ); | 54 | void reloadServerData( ); |
diff --git a/noncore/settings/aqpkg/global.h b/noncore/settings/aqpkg/global.h index fcec643..ddfb3ac 100644 --- a/noncore/settings/aqpkg/global.h +++ b/noncore/settings/aqpkg/global.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifndef __GLOBAL_H | 18 | #ifndef __GLOBAL_H |
19 | #define __GLOBAL_H | 19 | #define __GLOBAL_H |
20 | 20 | ||
21 | #define VERSION_TEXT "AQPkg Version 1.3" | 21 | #define VERSION_TEXT "AQPkg Version 1.4" |
22 | 22 | ||
23 | // Uncomment the below line to run on a Linux box rather than a Zaurus | 23 | // Uncomment the below line to run on a Linux box rather than a Zaurus |
24 | // box this allows you to change where root is, and where to load config files from | 24 | // box this allows you to change where root is, and where to load config files from |
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index b297437..db9a259 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -165,7 +165,7 @@ void InstallDlgImpl :: installSelected() | |||
165 | else | 165 | else |
166 | { | 166 | { |
167 | output->setText( "" ); | 167 | output->setText( "" ); |
168 | Destination *d = dataMgr->getDestination( destination->currentText() ); | 168 | vector<Destination>::iterator d = dataMgr->getDestination( destination->currentText() ); |
169 | QString dest = d->getDestinationName(); | 169 | QString dest = d->getDestinationName(); |
170 | QString destDir = d->getDestinationPath(); | 170 | QString destDir = d->getDestinationPath(); |
171 | int instFlags = flags; | 171 | int instFlags = flags; |
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 452eca3..8de3c48 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <fstream> | 18 | #include <fstream> |
19 | #include <iostream> | ||
19 | using namespace std; | 20 | using namespace std; |
20 | 21 | ||
21 | #include <stdio.h> | 22 | #include <stdio.h> |
diff --git a/noncore/settings/aqpkg/letterpushbutton.cpp b/noncore/settings/aqpkg/letterpushbutton.cpp index afe25d8..ca96c6c 100644 --- a/noncore/settings/aqpkg/letterpushbutton.cpp +++ b/noncore/settings/aqpkg/letterpushbutton.cpp | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #include "letterpushbutton.h" | 18 | #include "letterpushbutton.h" |
19 | 19 | ||
20 | LetterPushButton :: LetterPushButton( const QString &text, QWidget *parent, const char *name=0 ) | 20 | LetterPushButton :: LetterPushButton( const QString &text, QWidget *parent, const char *name ) |
21 | : QPushButton( text, parent, name ) | 21 | : QPushButton( text, parent, name ) |
22 | { | 22 | { |
23 | connect( this, SIGNAL(released()), this, SLOT(released_emmitor()) ); | 23 | connect( this, SIGNAL(released()), this, SLOT(released_emmitor()) ); |
diff --git a/noncore/settings/aqpkg/mainwin.cpp b/noncore/settings/aqpkg/mainwin.cpp index 0141359..3ddc582 100644 --- a/noncore/settings/aqpkg/mainwin.cpp +++ b/noncore/settings/aqpkg/mainwin.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <iostream> | 18 | #include <iostream> |
19 | using namespace std; | ||
19 | 20 | ||
20 | #include <qmenubar.h> | 21 | #include <qmenubar.h> |
21 | #include <qpopupmenu.h> | 22 | #include <qpopupmenu.h> |
@@ -51,7 +52,7 @@ MainWindow :: MainWindow( QWidget *p, char *name ) | |||
51 | edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N ); | 52 | edit->insertItem( "Find &Next", this, SLOT(repeatSearchForPackage()), Qt::CTRL+Qt::Key_N ); |
52 | 53 | ||
53 | filter = new QPopupMenu( this ); | 54 | filter = new QPopupMenu( this ); |
54 | mnuShowUninstalledPkgsId = filter->insertItem( "Show &Uninstalled Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U ); | 55 | mnuShowUninstalledPkgsId = filter->insertItem( "Show &Non-Installed Packages", this, SLOT(filterUninstalledPackages()), Qt::CTRL+Qt::Key_U ); |
55 | mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S ); | 56 | mnuShowInstalledPkgsId = filter->insertItem( "Show In&stalled Packages", this, SLOT(filterInstalledPackages()), Qt::CTRL+Qt::Key_S ); |
56 | mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P ); | 57 | mnuShowUpgradedPkgsId = filter->insertItem( "Show U&pdated Packages", this, SLOT(filterUpgradedPackages()), Qt::CTRL+Qt::Key_P ); |
57 | filter->insertSeparator(); | 58 | filter->insertSeparator(); |
@@ -206,4 +207,4 @@ void MainWindow :: filterCategory() | |||
206 | if ( networkPkgWindow->filterByCategory( true ) ) | 207 | if ( networkPkgWindow->filterByCategory( true ) ) |
207 | filter->setItemChecked( mnuFilterByCategory, true ); | 208 | filter->setItemChecked( mnuFilterByCategory, true ); |
208 | } | 209 | } |
209 | } \ No newline at end of file | 210 | } |
diff --git a/noncore/settings/aqpkg/networkpkgmgr.cpp b/noncore/settings/aqpkg/networkpkgmgr.cpp index d9e62b6..79a380e 100644 --- a/noncore/settings/aqpkg/networkpkgmgr.cpp +++ b/noncore/settings/aqpkg/networkpkgmgr.cpp | |||
@@ -217,7 +217,7 @@ void NetworkPackageManager :: serverSelected( int ) | |||
217 | cfg.writeEntry( "selectedServer", currentlySelectedServer ); | 217 | cfg.writeEntry( "selectedServer", currentlySelectedServer ); |
218 | #endif | 218 | #endif |
219 | 219 | ||
220 | Server *s = dataMgr->getServer( serverName ); | 220 | vector<Server>::iterator s = dataMgr->getServer( serverName ); |
221 | 221 | ||
222 | vector<Package> &list = s->getPackageList(); | 222 | vector<Package> &list = s->getPackageList(); |
223 | vector<Package>::iterator it; | 223 | vector<Package>::iterator it; |
@@ -612,7 +612,7 @@ InstallData NetworkPackageManager :: dealWithItem( QCheckListItem *item ) | |||
612 | name.truncate( pos - 1 ); | 612 | name.truncate( pos - 1 ); |
613 | 613 | ||
614 | // Get package | 614 | // Get package |
615 | Server *s = dataMgr->getServer( serversList->currentText() ); | 615 | vector<Server>::iterator s = dataMgr->getServer( serversList->currentText() ); |
616 | Package *p = s->getPackage( name ); | 616 | Package *p = s->getPackage( name ); |
617 | 617 | ||
618 | // If the package has a filename then it is a local file | 618 | // If the package has a filename then it is a local file |
diff --git a/noncore/settings/aqpkg/server.cpp b/noncore/settings/aqpkg/server.cpp index 58407d5..2cb0533 100644 --- a/noncore/settings/aqpkg/server.cpp +++ b/noncore/settings/aqpkg/server.cpp | |||
@@ -80,7 +80,7 @@ void Server :: readStatusFile( vector<Destination> &destList ) | |||
80 | } | 80 | } |
81 | 81 | ||
82 | packageFile = path + "usr/lib/ipkg/status"; | 82 | packageFile = path + "usr/lib/ipkg/status"; |
83 | readPackageFile( 0, false, installingToRoot, dit ); | 83 | readPackageFile( 0, false, installingToRoot, &( *dit ) ); |
84 | } | 84 | } |
85 | 85 | ||
86 | // Ensure that the root status file is read | 86 | // Ensure that the root status file is read |
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index a18a178..9dd2206 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp | |||
@@ -16,6 +16,7 @@ | |||
16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
17 | 17 | ||
18 | #include <fstream> | 18 | #include <fstream> |
19 | #include <algorithm> | ||
19 | using namespace std; | 20 | using namespace std; |
20 | 21 | ||
21 | #include <qlistbox.h> | 22 | #include <qlistbox.h> |
@@ -91,7 +92,7 @@ void SettingsImpl :: setupData() | |||
91 | void SettingsImpl :: editServer( int sel ) | 92 | void SettingsImpl :: editServer( int sel ) |
92 | { | 93 | { |
93 | currentSelectedServer = sel; | 94 | currentSelectedServer = sel; |
94 | Server *s = dataMgr->getServer( servers->currentText() ); | 95 | vector<Server>::iterator s = dataMgr->getServer( servers->currentText() ); |
95 | serverName = s->getServerName(); | 96 | serverName = s->getServerName(); |
96 | servername->setText( s->getServerName() ); | 97 | servername->setText( s->getServerName() ); |
97 | serverurl->setText( s->getServerUrl() ); | 98 | serverurl->setText( s->getServerUrl() ); |
@@ -109,10 +110,10 @@ void SettingsImpl :: newServer() | |||
109 | 110 | ||
110 | void SettingsImpl :: removeServer() | 111 | void SettingsImpl :: removeServer() |
111 | { | 112 | { |
112 | changed = true; | 113 | changed = true; |
113 | Server *s = dataMgr->getServer( servers->currentText() ); | 114 | vector<Server>::iterator s = dataMgr->getServer( servers->currentText() ); |
114 | dataMgr->getServerList().erase( s ); | 115 | dataMgr->getServerList().erase( s ); |
115 | servers->removeItem( currentSelectedServer ); | 116 | servers->removeItem( currentSelectedServer ); |
116 | } | 117 | } |
117 | 118 | ||
118 | void SettingsImpl :: changeServerDetails() | 119 | void SettingsImpl :: changeServerDetails() |
@@ -122,7 +123,7 @@ void SettingsImpl :: changeServerDetails() | |||
122 | QString newName = servername->text(); | 123 | QString newName = servername->text(); |
123 | if ( !newserver ) | 124 | if ( !newserver ) |
124 | { | 125 | { |
125 | Server *s = dataMgr->getServer( serverName ); | 126 | vector<Server>::iterator s = dataMgr->getServer( servers->currentText() ); |
126 | 127 | ||
127 | // Update url | 128 | // Update url |
128 | s->setServerUrl( serverurl->text() ); | 129 | s->setServerUrl( serverurl->text() ); |
@@ -159,7 +160,7 @@ void SettingsImpl :: changeServerDetails() | |||
159 | void SettingsImpl :: editDestination( int sel ) | 160 | void SettingsImpl :: editDestination( int sel ) |
160 | { | 161 | { |
161 | currentSelectedDestination = sel; | 162 | currentSelectedDestination = sel; |
162 | Destination *d = dataMgr->getDestination( destinations->currentText() ); | 163 | vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() ); |
163 | destinationName = d->getDestinationName(); | 164 | destinationName = d->getDestinationName(); |
164 | destinationname->setText( d->getDestinationName() ); | 165 | destinationname->setText( d->getDestinationName() ); |
165 | destinationurl->setText( d->getDestinationPath() ); | 166 | destinationurl->setText( d->getDestinationPath() ); |
@@ -177,9 +178,9 @@ void SettingsImpl :: newDestination() | |||
177 | 178 | ||
178 | void SettingsImpl :: removeDestination() | 179 | void SettingsImpl :: removeDestination() |
179 | { | 180 | { |
180 | changed = true; | 181 | changed = true; |
181 | Destination *d = dataMgr->getDestination( destinations->currentText() ); | 182 | vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() ); |
182 | dataMgr->getDestinationList().erase( d ); | 183 | dataMgr->getDestinationList().erase( d ); |
183 | destinations->removeItem( currentSelectedDestination ); | 184 | destinations->removeItem( currentSelectedDestination ); |
184 | } | 185 | } |
185 | 186 | ||
@@ -195,7 +196,7 @@ void SettingsImpl :: changeDestinationDetails() | |||
195 | QString newName = destinationname->text(); | 196 | QString newName = destinationname->text(); |
196 | if ( !newdestination ) | 197 | if ( !newdestination ) |
197 | { | 198 | { |
198 | Destination *d = dataMgr->getDestination( destinationName ); | 199 | vector<Destination>::iterator d = dataMgr->getDestination( destinations->currentText() ); |
199 | 200 | ||
200 | // Update url | 201 | // Update url |
201 | d->setDestinationPath( destinationurl->text() ); | 202 | d->setDestinationPath( destinationurl->text() ); |