Undo prior accidental commit

6 files changed, 28 insertions, 28 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"];
 }
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index 45de1d8..ceee175 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -81,7 +81,7 @@ static bool verifyDirectory(const QString &str)
     if (!dirInfo.exists())
 	return QDir().mkdir(str);
     if (!dirInfo.isDir()) {
-	tqWarning("'%s' exists but is not a directory", str.latin1());
+	qWarning("'%s' exists but is not a directory", str.latin1());
 	return FALSE;
     }
     return TRUE;
@@ -268,7 +268,7 @@ void HelpDialog::removeOldCacheFiles()
 {
     QString dir = cacheFilesPath; // ### remove the last '/' ?
     if (!verifyDirectory(cacheFilesPath)) {
-	tqWarning( "Failed to created assistant directory" );
+	qWarning( "Failed to created assistant directory" );
 	return;
     }
     QString pname = "." + Config::configuration()->profileName();
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index c2190e6..9e73ceb 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -158,7 +158,7 @@ void Index::parseDocument( const QString &filename, int docNum )
 {
     QFile file( filename );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "can not open file " + filename );
+	qWarning( "can not open file " + filename );
 	return;
     }
 
@@ -327,7 +327,7 @@ QString Index::getDocumentTitle( const QString &fileName )
 {
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "cannot open file " + fileName );
+	qWarning( "cannot open file " + fileName );
 	return fileName;
     }
     QTextStream s( &file );
@@ -450,7 +450,7 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 {
     QFile file( fileName );
     if ( !file.open( IO_ReadOnly ) ) {
-	tqWarning( "cannot open file " + fileName );
+	qWarning( "cannot open file " + fileName );
 	return FALSE;
     }
 
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index aa5f3be..0619909 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -286,7 +286,7 @@ int main( int argc, char ** argv )
     }
 
     if( resourceDir.isNull() )
-	resourceDir = tqInstallPathTranslations();
+	resourceDir = qInstallPathTranslations();
 
     QTranslator translator( 0 );
     translator.load( QString("assistant_") + QTextCodec::locale(), resourceDir );
diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h
index e5df018..75acd89 100644
--- a/tools/assistant/mainwindow.ui.h
+++ b/tools/assistant/mainwindow.ui.h
@@ -412,7 +412,7 @@ void MainWindow::showLinkFromClient( const QString &link )
 void MainWindow::showLink( const QString &link )
 {
     if( link.isEmpty() ) {
-	tqWarning( "The link is empty!" );
+	qWarning( "The link is empty!" );
     }
 
     int find = link.find( '#' );
@@ -441,7 +441,7 @@ void MainWindow::showLink( const QString &link )
 void MainWindow::showLinks( const QStringList &links )
 {
     if ( links.size() == 0 ) {
-	tqWarning( "MainWindow::showLinks() - Empty link" );
+	qWarning( "MainWindow::showLinks() - Empty link" );
 	return;
     }
 
@@ -482,7 +482,7 @@ void MainWindow::timerEvent(QTimerEvent *e)
 
 void MainWindow::showQtHelp()
 {
-    showLink( QString( tqInstallPathDocs() ) + "/html/index.html" );
+    showLink( QString( qInstallPathDocs() ) + "/html/index.html" );
 }
 
 void MainWindow::showSettingsDialog()
diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp
index 8d65754..be83f2a 100644
--- a/tools/assistant/profile.cpp
+++ b/tools/assistant/profile.cpp
@@ -45,7 +45,7 @@
 
 Profile *Profile::createDefaultProfile( const QString &docPath )
 {
-    QString path = tqInstallPathDocs();
+    QString path = qInstallPathDocs();
     if ( !docPath.isEmpty() )
         path = docPath;        
     path = path + "/html/";
@@ -116,9 +116,9 @@ void Profile::removeDocFileEntry( const QString &docfile )
     }
 
 #ifdef ASSISTANT_DEBUG   
-    tqDebug( "docs:\n  - " + docs.join( "\n  - " ) );
-    tqDebug( "titles:\n  - " + titles.join( "\n  - " ) );    
-    tqDebug( "keys:\n  - " + ( (QStringList*) &(dcfTitles.keys()) )->join( "\n  - " ) );
-    tqDebug( "values:\n  - " + ( (QStringList*) &(dcfTitles.values()) )->join( "\n  - " ) );
+    qDebug( "docs:\n  - " + docs.join( "\n  - " ) );
+    qDebug( "titles:\n  - " + titles.join( "\n  - " ) );    
+    qDebug( "keys:\n  - " + ( (QStringList*) &(dcfTitles.keys()) )->join( "\n  - " ) );
+    qDebug( "values:\n  - " + ( (QStringList*) &(dcfTitles.values()) )->join( "\n  - " ) );
 #endif
 }