summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-27 19:16:52 (UTC)
committer mickeyl <mickeyl>2004-04-27 19:16:52 (UTC)
commit7e3f65c9733254bf9f67932cc4f3833fba9a4914 (patch) (side-by-side diff)
treec3b609c862afbe8667f448a473a9641c8c0ab298
parentb645511e7fba8e3c27fda69b3939c0e5dbca1609 (diff)
downloadopie-7e3f65c9733254bf9f67932cc4f3833fba9a4914.zip
opie-7e3f65c9733254bf9f67932cc4f3833fba9a4914.tar.gz
opie-7e3f65c9733254bf9f67932cc4f3833fba9a4914.tar.bz2
g++ 3.4 fix in conjunction w/ the qte fix
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
@@ -103,115 +103,115 @@ void DataManager :: loadServers()
{
return;
}
else
{
while ( fgets( line, sizeof line, fp) != NULL )
{
lineStr = line;
if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
{
char alias[20];
char url[100];
// Looks a little wierd but read up to the r of src (throwing it away),
// then read up to the next space and throw that away, the alias
// is next.
// Should Handle #src, # src, src, and combinations of
sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
Server *s = new Server( alias, url );
if ( lineStr.startsWith( "src" ) )
s->setActive( true );
else
s->setActive( false );
serverList.append( s );
}
else if ( lineStr.startsWith( "dest" ) )
{
char alias[20];
char path[50];
sscanf( lineStr, "%*[^ ] %s %s", alias, path );
Destination *d = new Destination( alias, path );
bool linkToRoot = true;
#ifdef QWS
QString key = alias;
key += "_linkToRoot";
linkToRoot = cfg.readBoolEntry( key, true );
#endif
d->linkToRoot( linkToRoot );
destList.append( d );
}
else if ( lineStr.startsWith( "option" ) || lineStr.startsWith( "#option" ) )
{
char type[20];
char val[100];
sscanf( lineStr, "%*[^ ] %s %s", type, val );
- if ( stricmp( type, "http_proxy" ) == 0 )
+ if ( qstricmp( type, "http_proxy" ) == 0 )
{
httpProxy = val;
if ( lineStr.startsWith( "#" ) )
httpProxyEnabled = false;
else
httpProxyEnabled = true;
}
- if ( stricmp( type, "ftp_proxy" ) == 0 )
+ if ( qstricmp( type, "ftp_proxy" ) == 0 )
{
ftpProxy = val;
if ( lineStr.startsWith( "#" ) )
ftpProxyEnabled = false;
else
ftpProxyEnabled = true;
}
- if ( stricmp( type, "proxy_username" ) == 0 )
+ if ( qstricmp( type, "proxy_username" ) == 0 )
proxyUsername = val;
- if ( stricmp( type, "proxy_password" ) == 0 )
+ if ( qstricmp( type, "proxy_password" ) == 0 )
proxyPassword = val;
}
}
}
fclose( fp );
reloadServerData( );
}
void DataManager :: reloadServerData( )
{
emit progressSetSteps( serverList.count() );
emit progressSetMessage( tr( "Reading configuration..." ) );
QString serverName;
int i = 0;
Server *server;
QListIterator<Server> it( serverList );
for ( ; it.current(); ++it )
{
server = it.current();
serverName = server->getServerName();
i++;
emit progressUpdate( i );
qApp->processEvents();
// Now we've read the config file in we need to read the servers
// The local server is a special case. This holds the contents of the
// status files the number of which depends on how many destinations
// we've set up
// The other servers files hold the contents of the server package list
if ( serverName == LOCAL_SERVER )
server->readStatusFile( destList );
else if ( serverName == LOCAL_IPKGS )
server->readLocalIpks( getServer( LOCAL_SERVER ) );
else
server->readPackageFile( getServer( LOCAL_SERVER ) );
}
}
void DataManager :: writeOutIpkgConf()
{
QFile f( IPKG_CONF );
if ( !f.open( IO_WriteOnly ) )
{
return;
}