summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp
index 67f90a3..93daaba 100644
--- a/noncore/settings/aqpkg/datamgr.cpp
+++ b/noncore/settings/aqpkg/datamgr.cpp
@@ -119,83 +119,83 @@ void DataManager :: loadServers()
119 // Should Handle #src, # src, src, and combinations of 119 // Should Handle #src, # src, src, and combinations of
120 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url ); 120 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
121 Server *s = new Server( alias, url ); 121 Server *s = new Server( alias, url );
122 if ( lineStr.startsWith( "src" ) ) 122 if ( lineStr.startsWith( "src" ) )
123 s->setActive( true ); 123 s->setActive( true );
124 else 124 else
125 s->setActive( false ); 125 s->setActive( false );
126 126
127 serverList.append( s ); 127 serverList.append( s );
128 128
129 } 129 }
130 else if ( lineStr.startsWith( "dest" ) ) 130 else if ( lineStr.startsWith( "dest" ) )
131 { 131 {
132 char alias[20]; 132 char alias[20];
133 char path[50]; 133 char path[50];
134 sscanf( lineStr, "%*[^ ] %s %s", alias, path ); 134 sscanf( lineStr, "%*[^ ] %s %s", alias, path );
135 Destination *d = new Destination( alias, path ); 135 Destination *d = new Destination( alias, path );
136 bool linkToRoot = true; 136 bool linkToRoot = true;
137#ifdef QWS 137#ifdef QWS
138 QString key = alias; 138 QString key = alias;
139 key += "_linkToRoot"; 139 key += "_linkToRoot";
140 linkToRoot = cfg.readBoolEntry( key, true ); 140 linkToRoot = cfg.readBoolEntry( key, true );
141#endif 141#endif
142 d->linkToRoot( linkToRoot ); 142 d->linkToRoot( linkToRoot );
143 143
144 destList.append( d ); 144 destList.append( d );
145 } 145 }
146 else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) ) 146 else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) )
147 { 147 {
148 char type[20]; 148 char type[20];
149 char val[100]; 149 char val[100];
150 sscanf( lineStr, "%*[^ ] %s %s", type, val ); 150 sscanf( lineStr, "%*[^ ] %s %s", type, val );
151 if ( stricmp( type, "http_proxy" ) == 0 ) 151 if ( qstricmp( type, "http_proxy" ) == 0 )
152 { 152 {
153 httpProxy = val; 153 httpProxy = val;
154 if ( lineStr.startsWith( "#" ) ) 154 if ( lineStr.startsWith( "#" ) )
155 httpProxyEnabled = false; 155 httpProxyEnabled = false;
156 else 156 else
157 httpProxyEnabled = true; 157 httpProxyEnabled = true;
158 } 158 }
159 if ( stricmp( type, "ftp_proxy" ) == 0 ) 159 if ( qstricmp( type, "ftp_proxy" ) == 0 )
160 { 160 {
161 ftpProxy = val; 161 ftpProxy = val;
162 if ( lineStr.startsWith( "#" ) ) 162 if ( lineStr.startsWith( "#" ) )
163 ftpProxyEnabled = false; 163 ftpProxyEnabled = false;
164 else 164 else
165 ftpProxyEnabled = true; 165 ftpProxyEnabled = true;
166 } 166 }
167 if ( stricmp( type, "proxy_username" ) == 0 ) 167 if ( qstricmp( type, "proxy_username" ) == 0 )
168 proxyUsername = val; 168 proxyUsername = val;
169 if ( stricmp( type, "proxy_password" ) == 0 ) 169 if ( qstricmp( type, "proxy_password" ) == 0 )
170 proxyPassword = val; 170 proxyPassword = val;
171 } 171 }
172 } 172 }
173 } 173 }
174 fclose( fp ); 174 fclose( fp );
175 175
176 reloadServerData( ); 176 reloadServerData( );
177} 177}
178 178
179void DataManager :: reloadServerData( ) 179void DataManager :: reloadServerData( )
180{ 180{
181 emit progressSetSteps( serverList.count() ); 181 emit progressSetSteps( serverList.count() );
182 emit progressSetMessage( tr( "Reading configuration..." ) ); 182 emit progressSetMessage( tr( "Reading configuration..." ) );
183 183
184 QString serverName; 184 QString serverName;
185 int i = 0; 185 int i = 0;
186 186
187 Server *server; 187 Server *server;
188 QListIterator<Server> it( serverList ); 188 QListIterator<Server> it( serverList );
189 for ( ; it.current(); ++it ) 189 for ( ; it.current(); ++it )
190 { 190 {
191 server = it.current(); 191 server = it.current();
192 serverName = server->getServerName(); 192 serverName = server->getServerName();
193 i++; 193 i++;
194 emit progressUpdate( i ); 194 emit progressUpdate( i );
195 qApp->processEvents(); 195 qApp->processEvents();
196 196
197 // Now we've read the config file in we need to read the servers 197 // Now we've read the config file in we need to read the servers
198 // The local server is a special case. This holds the contents of the 198 // The local server is a special case. This holds the contents of the
199 // status files the number of which depends on how many destinations 199 // status files the number of which depends on how many destinations
200 // we've set up 200 // we've set up
201 // The other servers files hold the contents of the server package list 201 // The other servers files hold the contents of the server package list