diff options
Diffstat (limited to 'tools/assistant/config.cpp')
-rw-r--r-- | tools/assistant/config.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index dbc823f..83d0bdc 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -57,7 +57,7 @@ Config::Config() if( !static_configuration ) { static_configuration = this; } else { - tqWarning( "Multiple configurations not allowed!" ); + qWarning( "Multiple configurations not allowed!" ); } } @@ -74,23 +74,23 @@ Config *Config::loadConfig(const QString &profileFileName) QFile file(profileFileName); if (!file.exists()) { - tqWarning( "File does not exist: " + profileFileName ); + qWarning( "File does not exist: " + profileFileName ); return 0; } DocuParser *parser = DocuParser::createParser( profileFileName ); if (!parser) { - tqWarning( "Failed to create parser for file: " + profileFileName ); + qWarning( "Failed to create parser for file: " + profileFileName ); return 0; } if (parser->parserVersion() < DocuParser::Qt320) { - tqWarning( "File does not contain profile information" ); + qWarning( "File does not contain profile information" ); return 0; } DocuParser320 *profileParser = static_cast<DocuParser320*>(parser); parser->parse(&file); config->profil = profileParser->profile(); if (!config->profil) { - tqWarning( "Config::loadConfig(), no profile in: " + profileFileName ); + qWarning( "Config::loadConfig(), no profile in: " + profileFileName ); return 0; } config->profil->setProfileType(Profile::UserProfile); @@ -180,10 +180,10 @@ void Config::saveSettings() #ifdef ASSISTANT_DEBUG static void dumpmap( const QMap<QString,QString> &m, const QString &header ) { - tqDebug( header ); + qDebug( header ); QMap<QString,QString>::ConstIterator it = m.begin(); while (it != m.end()) { - tqDebug( " " + it.key() + ":\t\t" + *it ); + qDebug( " " + it.key() + ":\t\t" + *it ); ++it; } } @@ -231,7 +231,7 @@ void Config::loadDefaultProfile() dumpmap( profil->indexPages, "IndexPages" ); dumpmap( profil->imageDirs, "ImageDirs" ); dumpmap( profil->dcfTitles, "dcfTitles" ); - tqDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); + qDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); #endif } @@ -264,11 +264,11 @@ void Config::saveProfile( Profile *profile ) settings.writeEntry( profKey + "ImageDirs", imgDirs ); #if ASSISTANT_DEBUG - tqDebug( "Titles:\n - " + ( (QStringList*) &titles )->join( "\n - " ) ); - tqDebug( "Docfiles:\n - " + dcfs.join( "\n - " ) ); - tqDebug( "IndexPages:\n - " + indexes.join( "\n - " ) ); - tqDebug( "DocIcons:\n - " + icons.join( "\n - " ) ); - tqDebug( "ImageDirs:\n - " + imgDirs.join( "\n - " ) ); + qDebug( "Titles:\n - " + ( (QStringList*) &titles )->join( "\n - " ) ); + qDebug( "Docfiles:\n - " + dcfs.join( "\n - " ) ); + qDebug( "IndexPages:\n - " + indexes.join( "\n - " ) ); + qDebug( "DocIcons:\n - " + icons.join( "\n - " ) ); + qDebug( "ImageDirs:\n - " + imgDirs.join( "\n - " ) ); #endif } @@ -374,6 +374,6 @@ bool Config::sideBarHidden() const QString Config::assistantDocPath() const { return profil->props["assistantdocs"].isEmpty() - ? QString( tqInstallPathDocs() ) + "/html" + ? QString( qInstallPathDocs() ) + "/html" : profil->props["assistantdocs"]; } |