@ -1608,7 +1608,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
TQString filename ( TQFile : : decodeName ( cfgDir ) + CONFIG_FILE ) ;
if ( ! TQFile : : exists ( filename ) )
filename = TQFile : : decodeName ( cfgDir ) + " ../ " OLD_CONFIG_FILE ;
filename = TQFile : : decodeName ( cfgDir ) + " ../ " + OLD_CONFIG_FILE ;
return readConfig ( filename , opts , defOpts ) ;
}
}
@ -1631,7 +1631,7 @@ static bool readConfig(const char *file, Options *opts, Options *defOpts)
sprintf ( filename , " %s " CONFIG_FILE , cfgDir ) ;
if ( ! qtcFileExists ( filename ) )
sprintf ( filename , " %s../ " OLD_CONFIG_FILE , cfgDir ) ;
sprintf ( filename , " %s../ " OLD_CONFIG_FILE , cfgDir ) ;
rv = readConfig ( filename , opts , defOpts ) ;
free ( filename ) ;
return rv ;
@ -2300,7 +2300,7 @@ static bool fileExists(const char *path)
static const char * getSystemConfigFile ( )
{
static const char * constFiles [ ] = { /*"/etc/qt4/" OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ " /etc/ " OLD_CONFIG_FILE , NULL } ;
static const char * constFiles [ ] = { /*"/etc/qt4/" OLD_CONFIG_FILE, "/etc/qt3/" OLD_CONFIG_FILE, "/etc/qt/" OLD_CONFIG_FILE,*/ " /etc/ " OLD_CONFIG_FILE , NULL } ;
int i ;