diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-28 22:31:39 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-28 22:31:39 -0600 |
commit | 41bb408dde90e755b07cd2ab8a9bdec7548c84b0 (patch) | |
tree | 6d4d5407c000add30aa78630e009c0e5d633e440 /tools | |
parent | 1740cd279522c060e738bbbffacab83355d2b794 (diff) | |
download | tqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.tar.gz tqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.zip |
Automated conversion from qt3
Diffstat (limited to 'tools')
44 files changed, 198 insertions, 198 deletions
diff --git a/tools/assistant/config.cpp b/tools/assistant/config.cpp index ad7e7edda..4bdc7f38b 100644 --- a/tools/assistant/config.cpp +++ b/tools/assistant/config.cpp @@ -57,7 +57,7 @@ Config::Config() if( !static_configuration ) { static_configuration = this; } else { - qWarning( "Multiple configurations not allowed!" ); + tqWarning( "Multiple configurations not allowed!" ); } } @@ -74,23 +74,23 @@ Config *Config::loadConfig(const TQString &profileFileName) TQFile file(profileFileName); if (!file.exists()) { - qWarning( "File does not exist: " + profileFileName ); + tqWarning( "File does not exist: " + profileFileName ); return 0; } DocuParser *parser = DocuParser::createParser( profileFileName ); if (!parser) { - qWarning( "Failed to create parser for file: " + profileFileName ); + tqWarning( "Failed to create parser for file: " + profileFileName ); return 0; } if (parser->parserVersion() < DocuParser::TQt320) { - qWarning( "File does not contain profile information" ); + tqWarning( "File does not contain profile information" ); return 0; } DocuParser320 *profileParser = static_cast<DocuParser320*>(parser); parser->parse(&file); config->profil = profileParser->profile(); if (!config->profil) { - qWarning( "Config::loadConfig(), no profile in: " + profileFileName ); + tqWarning( "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 TQMap<TQString,TQString> &m, const TQString &header ) { - qDebug( header ); + tqDebug( header ); TQMap<TQString,TQString>::ConstIterator it = m.begin(); while (it != m.end()) { - qDebug( " " + it.key() + ":\t\t" + *it ); + tqDebug( " " + 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" ); - qDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); + tqDebug( "Docfiles: \n " + profil->docs.join( "\n " ) ); #endif } @@ -264,11 +264,11 @@ void Config::saveProfile( Profile *profile ) settings.writeEntry( profKey + "ImageDirs", imgDirs ); #if ASSISTANT_DEBUG - qDebug( "Titles:\n - " + ( (TQStringList*) &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 - " ) ); + tqDebug( "Titles:\n - " + ( (TQStringList*) &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 - " ) ); #endif } @@ -374,6 +374,6 @@ bool Config::sideBarHidden() const TQString Config::assistantDocPath() const { return profil->props["assistantdocs"].isEmpty() - ? TQString( qInstallPathDocs() ) + "/html" + ? TQString( tqInstallPathDocs() ) + "/html" : profil->props["assistantdocs"]; } diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index adf39f2fe..abce3ae84 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -81,7 +81,7 @@ static bool verifyDirectory(const TQString &str) if (!dirInfo.exists()) return TQDir().mkdir(str); if (!dirInfo.isDir()) { - qWarning("'%s' exists but is not a directory", str.latin1()); + tqWarning("'%s' exists but is not a directory", str.latin1()); return FALSE; } return TRUE; @@ -268,7 +268,7 @@ void HelpDialog::removeOldCacheFiles() { TQString dir = cacheFilesPath; // ### remove the last '/' ? if (!verifyDirectory(cacheFilesPath)) { - qWarning( "Failed to created assistant directory" ); + tqWarning( "Failed to created assistant directory" ); return; } TQString pname = "." + Config::configuration()->profileName(); diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp index 24372feed..785f27bc6 100644 --- a/tools/assistant/index.cpp +++ b/tools/assistant/index.cpp @@ -158,7 +158,7 @@ void Index::parseDocument( const TQString &filename, int docNum ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "can not open file " + filename ); + tqWarning( "can not open file " + filename ); return; } @@ -327,7 +327,7 @@ TQString Index::getDocumentTitle( const TQString &fileName ) { TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return fileName; } TQTextStream s( &file ); @@ -450,7 +450,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList & { TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "cannot open file " + fileName ); + tqWarning( "cannot open file " + fileName ); return FALSE; } diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp index 64bb8ee98..8954709cd 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 = qInstallPathTranslations(); + resourceDir = tqInstallPathTranslations(); TQTranslator translator( 0 ); translator.load( TQString("assistant_") + TQTextCodec::locale(), resourceDir ); diff --git a/tools/assistant/mainwindow.ui.h b/tools/assistant/mainwindow.ui.h index d9847b8df..662f890cb 100644 --- a/tools/assistant/mainwindow.ui.h +++ b/tools/assistant/mainwindow.ui.h @@ -412,7 +412,7 @@ void MainWindow::showLinkFromClient( const TQString &link ) void MainWindow::showLink( const TQString &link ) { if( link.isEmpty() ) { - qWarning( "The link is empty!" ); + tqWarning( "The link is empty!" ); } int find = link.find( '#' ); @@ -441,7 +441,7 @@ void MainWindow::showLink( const TQString &link ) void MainWindow::showLinks( const TQStringList &links ) { if ( links.size() == 0 ) { - qWarning( "MainWindow::showLinks() - Empty link" ); + tqWarning( "MainWindow::showLinks() - Empty link" ); return; } @@ -482,7 +482,7 @@ void MainWindow::timerEvent(TQTimerEvent *e) void MainWindow::showTQtHelp() { - showLink( TQString( qInstallPathDocs() ) + "/html/index.html" ); + showLink( TQString( tqInstallPathDocs() ) + "/html/index.html" ); } void MainWindow::showSettingsDialog() diff --git a/tools/assistant/profile.cpp b/tools/assistant/profile.cpp index 231520eef..d7634646e 100644 --- a/tools/assistant/profile.cpp +++ b/tools/assistant/profile.cpp @@ -45,7 +45,7 @@ Profile *Profile::createDefaultProfile( const TQString &docPath ) { - TQString path = qInstallPathDocs(); + TQString path = tqInstallPathDocs(); if ( !docPath.isEmpty() ) path = docPath; path = path + "/html/"; @@ -116,9 +116,9 @@ void Profile::removeDocFileEntry( const TQString &docfile ) } #ifdef ASSISTANT_DEBUG - qDebug( "docs:\n - " + docs.join( "\n - " ) ); - qDebug( "titles:\n - " + titles.join( "\n - " ) ); - qDebug( "keys:\n - " + ( (TQStringList*) &(dcfTitles.keys()) )->join( "\n - " ) ); - qDebug( "values:\n - " + ( (TQStringList*) &(dcfTitles.values()) )->join( "\n - " ) ); + tqDebug( "docs:\n - " + docs.join( "\n - " ) ); + tqDebug( "titles:\n - " + titles.join( "\n - " ) ); + tqDebug( "keys:\n - " + ( (TQStringList*) &(dcfTitles.keys()) )->join( "\n - " ) ); + tqDebug( "values:\n - " + ( (TQStringList*) &(dcfTitles.values()) )->join( "\n - " ) ); #endif } diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp index bb25fa86e..e374a3cc3 100644 --- a/tools/designer/designer/command.cpp +++ b/tools/designer/designer/command.cpp @@ -2220,7 +2220,7 @@ void AddMenuCommand::execute() void AddMenuCommand::unexecute() { if ( !item ) { - qWarning( "The AddMenuCommand was created without a menu item." ); + tqWarning( "The AddMenuCommand was created without a menu item." ); return; } item->menu()->hide(); diff --git a/tools/designer/designer/customwidgeteditorimpl.cpp b/tools/designer/designer/customwidgeteditorimpl.cpp index 515715200..955d0ba17 100644 --- a/tools/designer/designer/customwidgeteditorimpl.cpp +++ b/tools/designer/designer/customwidgeteditorimpl.cpp @@ -764,7 +764,7 @@ void CustomWidgetEditor::loadDescription() TQString errMsg; int errLine; if ( !doc.setContent( &f, &errMsg, &errLine ) ) { - qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); return; } diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp index 25d0f3340..b27ba3301 100644 --- a/tools/designer/designer/hierarchyview.cpp +++ b/tools/designer/designer/hierarchyview.cpp @@ -911,7 +911,7 @@ static HierarchyItem::Type getChildType( int type ) { switch ( (HierarchyItem::Type)type ) { case HierarchyItem::Widget: - qWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" ); + tqWarning( "getChildType: Inserting childs dynamically to Widget or SlotParent is not allowed!" ); break; case HierarchyItem::SlotParent: case HierarchyItem::SlotPublic: diff --git a/tools/designer/designer/layout.cpp b/tools/designer/designer/layout.cpp index 2f0393b1c..5262e49cb 100644 --- a/tools/designer/designer/layout.cpp +++ b/tools/designer/designer/layout.cpp @@ -774,7 +774,7 @@ void GridLayout::doLayout() ( (TQLayoutWidget*)w )->updateSizePolicy(); w->show(); } else { - qWarning("ooops, widget '%s' does not fit in layout", w->name() ); + tqWarning("ooops, widget '%s' does not fit in layout", w->name() ); } } finishLayout( needMove, layout ); diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 1d97ffe44..315cbb631 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -133,7 +133,7 @@ MainWindow *MainWindow::self = 0; TQString assistantPath() { - TQString path = TQDir::cleanDirPath( TQString( qInstallPathBins() ) + + TQString path = TQDir::cleanDirPath( TQString( tqInstallPathBins() ) + TQDir::separator() ); return path; } @@ -2794,7 +2794,7 @@ void MainWindow::setSnapGrid( bool b ) TQString MainWindow::documentationPath() const { - return TQString( qInstallPathDocs() ) + "/html/"; + return TQString( tqInstallPathDocs() ) + "/html/"; } void MainWindow::windowsMenuActivated( int id ) @@ -3421,7 +3421,7 @@ void MainWindow::showSourceLine( TQObject *o, int line, LineMode lm ) fw = ff->formWindow(); if ( !fw && !qwf_forms ) { - qWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" ); + tqWarning( "MainWindow::showSourceLine: qwf_forms is NULL!" ); return; } diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp index dbff60da0..69708a37c 100644 --- a/tools/designer/designer/mainwindowactions.cpp +++ b/tools/designer/designer/mainwindowactions.cpp @@ -1450,7 +1450,7 @@ void MainWindow::createNewTemplate() const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; - templRoots << qInstallPathData(); + templRoots << tqInstallPathData(); if(qtdir) //try the tools/designer directory last! templRoots << (TQString(qtdir) + "/tools/designer"); TQFile f; diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index 302ee5328..e28d77f3e 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -152,7 +152,7 @@ void MetaDataBase::setPropertyChanged( TQObject *o, const TQString &property, bo } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -191,7 +191,7 @@ bool MetaDataBase::isPropertyChanged( TQObject *o, const TQString &property ) return ( (PropertyObject*)o )->mdIsPropertyChanged( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -204,7 +204,7 @@ TQStringList MetaDataBase::changedProperties( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -222,7 +222,7 @@ void MetaDataBase::setPropertyComment( TQObject *o, const TQString &property, co } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -237,7 +237,7 @@ TQString MetaDataBase::propertyComment( TQObject *o, const TQString &property ) return ( (PropertyObject*)o )->mdPropertyComment( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -254,7 +254,7 @@ void MetaDataBase::setFakeProperty( TQObject *o, const TQString &property, const } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -268,7 +268,7 @@ TQVariant MetaDataBase::fakeProperty( TQObject * o, const TQString &property) return ( (PropertyObject*)o )->mdFakeProperty( property ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQVariant(); } @@ -284,7 +284,7 @@ TQMap<TQString,TQVariant>* MetaDataBase::fakeProperties( TQObject* o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return 0; } @@ -298,7 +298,7 @@ void MetaDataBase::setSpacing( TQObject *o, int spacing ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -326,7 +326,7 @@ int MetaDataBase::spacing( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return -1; } @@ -341,7 +341,7 @@ void MetaDataBase::setMargin( TQObject *o, int margin ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -383,7 +383,7 @@ int MetaDataBase::margin( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return -1; } @@ -397,7 +397,7 @@ void MetaDataBase::setResizeMode( TQObject *o, const TQString &mode ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -414,7 +414,7 @@ TQString MetaDataBase::resizeMode( TQObject *o ) o = ( (TQMainWindow*)o )->centralWidget(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r || !o->isWidgetType() ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -427,7 +427,7 @@ void MetaDataBase::addConnection( TQObject *o, TQObject *sender, const TQCString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -461,7 +461,7 @@ void MetaDataBase::removeConnection( TQObject *o, TQObject *sender, const TQCStr setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -490,7 +490,7 @@ void MetaDataBase::setupConnections( TQObject *o, const TQValueList<LanguageInte setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -538,7 +538,7 @@ bool MetaDataBase::hasConnection( TQObject *o, TQObject *sender, const TQCString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -560,7 +560,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -573,7 +573,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -595,7 +595,7 @@ TQValueList<MetaDataBase::Connection> MetaDataBase::connections( TQObject *o, TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Connection>(); } @@ -616,7 +616,7 @@ void MetaDataBase::doConnections( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -670,7 +670,7 @@ bool MetaDataBase::hasSlot( TQObject *o, const TQCString &slot, bool onlyCustom setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -714,7 +714,7 @@ bool MetaDataBase::isSlotUsed( TQObject *o, const TQCString &slot ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -735,7 +735,7 @@ void MetaDataBase::addFunction( TQObject *o, const TQCString &function, const TQ setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -759,7 +759,7 @@ void MetaDataBase::setFunctionList( TQObject *o, const TQValueList<Function> &fu setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -773,7 +773,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQCString &function, const setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -797,7 +797,7 @@ void MetaDataBase::removeFunction( TQObject *o, const TQString &function ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -815,7 +815,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::functionList( TQObject *o, boo setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Function>(); } @@ -834,7 +834,7 @@ TQValueList<MetaDataBase::Function> MetaDataBase::slotList( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Function>(); } @@ -852,7 +852,7 @@ void MetaDataBase::changeFunction( TQObject *o, const TQString &function, const setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -876,7 +876,7 @@ void MetaDataBase::changeFunctionAttributes( TQObject *o, const TQString &oldNam setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -900,7 +900,7 @@ bool MetaDataBase::hasFunction( TQObject *o, const TQCString &function, bool onl setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -944,7 +944,7 @@ TQString MetaDataBase::languageOfFunction( TQObject *o, const TQCString &functio setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1038,7 +1038,7 @@ void MetaDataBase::setTabOrder( TQWidget *w, const TQWidgetList &order ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return; } @@ -1051,7 +1051,7 @@ TQWidgetList MetaDataBase::tabOrder( TQWidget *w ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*) w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return TQWidgetList(); } @@ -1064,7 +1064,7 @@ void MetaDataBase::setIncludes( TQObject *o, const TQValueList<Include> &incs ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1077,7 +1077,7 @@ TQValueList<MetaDataBase::Include> MetaDataBase::includes( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<Include>(); } @@ -1090,7 +1090,7 @@ void MetaDataBase::setForwards( TQObject *o, const TQStringList &fwds ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1103,7 +1103,7 @@ TQStringList MetaDataBase::forwards( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -1116,7 +1116,7 @@ void MetaDataBase::setVariables( TQObject *o, const TQValueList<Variable> &vars setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1129,7 +1129,7 @@ void MetaDataBase::addVariable( TQObject *o, const TQString &name, const TQStrin setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1144,7 +1144,7 @@ void MetaDataBase::removeVariable( TQObject *o, const TQString &name ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1162,7 +1162,7 @@ TQValueList<MetaDataBase::Variable> MetaDataBase::variables( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<MetaDataBase::Variable>(); } @@ -1175,7 +1175,7 @@ bool MetaDataBase::hasVariable( TQObject *o, const TQString &name ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return FALSE; } @@ -1203,7 +1203,7 @@ void MetaDataBase::setSignalList( TQObject *o, const TQStringList &sigs ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1236,7 +1236,7 @@ TQStringList MetaDataBase::signalList( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQStringList(); } @@ -1249,7 +1249,7 @@ void MetaDataBase::setMetaInfo( TQObject *o, MetaInfo mi ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1262,7 +1262,7 @@ MetaDataBase::MetaInfo MetaDataBase::metaInfo( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return MetaInfo(); } @@ -1308,7 +1308,7 @@ void MetaDataBase::setCursor( TQWidget *w, const TQCursor &c ) } MetaDataBaseRecord *r = db->find( (void*)w ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", w, w->name(), w->className() ); return; } @@ -1399,7 +1399,7 @@ void MetaDataBase::setPixmapArgument( TQObject *o, int pixmap, const TQString &a setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1415,7 +1415,7 @@ TQString MetaDataBase::pixmapArgument( TQObject *o, int pixmap ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1430,7 +1430,7 @@ void MetaDataBase::clearPixmapArguments( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1450,7 +1450,7 @@ void MetaDataBase::setPixmapKey( TQObject *o, int pixmap, const TQString &arg ) } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1468,7 +1468,7 @@ TQString MetaDataBase::pixmapKey( TQObject *o, int pixmap ) return ( (PropertyObject*)o )->mdPixmapKey( pixmap ); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1491,7 +1491,7 @@ void MetaDataBase::clearPixmapKeys( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1508,7 +1508,7 @@ void MetaDataBase::setColumnFields( TQObject *o, const TQMap<TQString, TQString> setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1523,7 +1523,7 @@ TQMap<TQString, TQString> MetaDataBase::columnFields( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQMap<TQString, TQString>(); } @@ -1589,7 +1589,7 @@ void MetaDataBase::setBreakPoints( TQObject *o, const TQValueList<uint> &l ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1612,7 +1612,7 @@ TQValueList<uint> MetaDataBase::breakPoints( TQObject *o ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQValueList<uint>(); } @@ -1627,7 +1627,7 @@ void MetaDataBase::setBreakPointCondition( TQObject *o, int line, const TQString setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1641,7 +1641,7 @@ TQString MetaDataBase::breakPointCondition( TQObject *o, int line ) setupDataBase(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return TQString::null; } @@ -1662,7 +1662,7 @@ void MetaDataBase::setExportMacro( TQObject *o, const TQString ¯o ) } MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return; } @@ -1679,7 +1679,7 @@ TQString MetaDataBase::exportMacro( TQObject *o ) return ( (PropertyObject*)o )->mdExportMacro(); MetaDataBaseRecord *r = db->find( (void*)o ); if ( !r ) { - qWarning( "No entry for %p (%s, %s) found in MetaDataBase", + tqWarning( "No entry for %p (%s, %s) found in MetaDataBase", o, o->name(), o->className() ); return ""; } diff --git a/tools/designer/designer/newformimpl.cpp b/tools/designer/designer/newformimpl.cpp index 4636bc9d5..8bbc41f21 100644 --- a/tools/designer/designer/newformimpl.cpp +++ b/tools/designer/designer/newformimpl.cpp @@ -289,7 +289,7 @@ void NewForm::insertTemplates( TQIconView *tView, const char *qtdir = getenv( "QTDIR" ); if(qtdir) templRoots << qtdir; - templRoots << qInstallPathData(); + templRoots << tqInstallPathData(); if(qtdir) //try the tools/designer directory last! templRoots << (TQString(qtdir) + "/tools/designer"); for ( TQStringList::Iterator it = templRoots.begin(); it != templRoots.end(); ++it ) { diff --git a/tools/designer/designer/pixmapchooser.cpp b/tools/designer/designer/pixmapchooser.cpp index de90f369f..fc93bf882 100644 --- a/tools/designer/designer/pixmapchooser.cpp +++ b/tools/designer/designer/pixmapchooser.cpp @@ -83,7 +83,7 @@ void PixmapView::previewUrl( const TQUrl &u ) if ( !pix.isNull() ) setPixmap( pix ); } else { - qWarning( "Previewing remote files not supported." ); + tqWarning( "Previewing remote files not supported." ); } } diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp index 2d5dc2dd2..65ee8bbb4 100644 --- a/tools/designer/designer/project.cpp +++ b/tools/designer/designer/project.cpp @@ -1048,7 +1048,7 @@ void Project::loadConnections() dbConnections.append( conn ); } } else { - qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } f.close(); } @@ -1583,7 +1583,7 @@ TQString Project::locationOfObject( TQObject *o ) extern TQMap<TQWidget*, TQString> *qwf_forms; if ( !qwf_forms ) { - qWarning( "Project::locationOfObject: qwf_forms is NULL!" ); + tqWarning( "Project::locationOfObject: qwf_forms is NULL!" ); return TQString::null; } diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp index af0db8e31..db8b12ac0 100644 --- a/tools/designer/designer/propertyeditor.cpp +++ b/tools/designer/designer/propertyeditor.cpp @@ -118,7 +118,7 @@ static TQStringList getFontList() { if ( !fontDataBase ) { fontDataBase = new TQFontDatabase; - qAddPostRoutine( cleanupFontDatabase ); + tqAddPostRoutine( cleanupFontDatabase ); } return fontDataBase->families(); } @@ -150,7 +150,7 @@ bool PropertyWhatsThis::clicked( const TQString& href ) { if ( !href.isEmpty() ) { TQAssistantClient *ac = MainWindow::self->assistantClient(); - ac->showPage( TQString( qInstallPathDocs() ) + "/html/" + href ); + ac->showPage( TQString( tqInstallPathDocs() ) + "/html/" + href ); } return FALSE; // do not hide window } diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 96720dc4e..36af97757 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -1756,7 +1756,7 @@ void Resource::saveProperty( TQObject *w, const TQString &name, const TQVariant break; } default: - qWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t ); + tqWarning( "saving the property %s of type %d not supported yet", name.latin1(), (int)t ); } } @@ -1803,7 +1803,7 @@ TQObject *Resource::createObject( const TQDomElement &e, TQWidget *parent, TQLay bool isPlugin = WidgetDatabase::isCustomPluginWidget( WidgetDatabase::idFromClassName( parentClassName ) ); if ( isPlugin ) - qWarning( "####### loading custom container widgets without page support not implemented!" ); + tqWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages #endif if ( !className.isNull() ) { @@ -2367,9 +2367,9 @@ void Resource::saveImageData( const TQImage &img, TQTextStream &ts, int indent ) TQByteArray bazip = ba; int i = 0; if (compress) { - bazip = qCompress( ba ); + bazip = tqCompress( ba ); format += ".GZ"; - // The first 4 bytes in qCompress() are the length of the unzipped + // The first 4 bytes in tqCompress() are the length of the unzipped // format. The XPM.GZ format does not use these. i = 4; } diff --git a/tools/designer/designer/wizardeditorimpl.cpp b/tools/designer/designer/wizardeditorimpl.cpp index 99329a25c..47468ceab 100644 --- a/tools/designer/designer/wizardeditorimpl.cpp +++ b/tools/designer/designer/wizardeditorimpl.cpp @@ -252,7 +252,7 @@ void WizardEditor::itemDropped( TQListBoxItem * i ) // Assumes that only one item has been moved. int droppedItem = listBox->index( i ); - //qDebug( "Moving page %d -> %d", draggedItem, droppedItem ); + //tqDebug( "Moving page %d -> %d", draggedItem, droppedItem ); MoveWizardPageCommand *cmd = new MoveWizardPageCommand( tr( "Move page %1 to %2 in %3" ).arg( draggedItem ).arg( droppedItem ).arg( wizard->name() ), formwindow, wizard, draggedItem, droppedItem ); commands.append( cmd ); } diff --git a/tools/designer/editor/yyindent.cpp b/tools/designer/editor/yyindent.cpp index 11adb7f94..d8498dc3a 100644 --- a/tools/designer/editor/yyindent.cpp +++ b/tools/designer/editor/yyindent.cpp @@ -1115,7 +1115,7 @@ static TQString fileContents( const TQString& fileName ) { TQFile f( fileName ); if ( !f.open(IO_ReadOnly) ) { - qWarning( "yyindent error: Cannot open file '%s' for reading: %s", + tqWarning( "yyindent error: Cannot open file '%s' for reading: %s", fileName.latin1(), strerror(errno) ); return TQString::null; } @@ -1124,14 +1124,14 @@ static TQString fileContents( const TQString& fileName ) TQString contents = t.read(); f.close(); if ( contents.isEmpty() ) - qWarning( "yyindent error: File '%s' is empty", fileName.latin1() ); + tqWarning( "yyindent error: File '%s' is empty", fileName.latin1() ); return contents; } int main( int argc, char **argv ) { if ( argc != 2 ) { - qWarning( "usage: yyindent file.cpp" ); + tqWarning( "usage: yyindent file.cpp" ); return 1; } diff --git a/tools/designer/examples/book/connection.cpp b/tools/designer/examples/book/connection.cpp index 3e42fd99e..d9b0df31f 100644 --- a/tools/designer/examples/book/connection.cpp +++ b/tools/designer/examples/book/connection.cpp @@ -18,9 +18,9 @@ bool createConnections() defaultDB->setPassword( DB_BOOKS_PASSWD ); defaultDB->setHostName( DB_BOOKS_HOST ); if ( ! defaultDB->open() ) { - qWarning( "Failed to open books database: " + + tqWarning( "Failed to open books database: " + defaultDB->lastError().driverText() ); - qWarning( defaultDB->lastError().databaseText() ); + tqWarning( defaultDB->lastError().databaseText() ); return FALSE; } diff --git a/tools/designer/plugins/cppeditor/yyreg.cpp b/tools/designer/plugins/cppeditor/yyreg.cpp index 4073752bf..bec1bd9fb 100644 --- a/tools/designer/plugins/cppeditor/yyreg.cpp +++ b/tools/designer/plugins/cppeditor/yyreg.cpp @@ -71,7 +71,7 @@ enum { Tok_Boi, Tok_Ampersand, Tok_Aster, Tok_LeftParen, Tok_RightParen, /* The following variables store the lexical analyzer state. The best way to understand them is to implement a function myGetToken() that calls - getToken(), to add some qDebug() statements in there and then to + getToken(), to add some tqDebug() statements in there and then to #define getToken() myGetToken(). */ static TQString *yyIn; // the input stream @@ -143,7 +143,7 @@ static void stopTokenizer() */ static int getToken() { - // why "+ 2"? try putting some qDebug()'s and see + // why "+ 2"? try putting some tqDebug()'s and see yyPos = yyCurPos + 2; for ( ;; ) { @@ -177,7 +177,7 @@ static int getToken() around with the tokenizer state to effectively ignore the comment. Beware of off-by-one and off-by-two bugs when you modify this code by adding - qDebug()'s here and there. + tqDebug()'s here and there. */ if ( yyCurPos >= 0 ) { int lineStart = yyIn->findRev( TQChar('\n'), yyCurPos ) + 1; diff --git a/tools/designer/plugins/dlg/dlg2ui.cpp b/tools/designer/plugins/dlg/dlg2ui.cpp index da0cd5002..e44c285f2 100644 --- a/tools/designer/plugins/dlg/dlg2ui.cpp +++ b/tools/designer/plugins/dlg/dlg2ui.cpp @@ -1617,7 +1617,7 @@ TQStringList Dlg2Ui::convertTQtArchitectDlgFile( const TQString& fileName ) outf.setName( outFileName ); if ( !outf.open(IO_WriteOnly) ) { - qWarning( "dlg2ui: Could not open output file '%s'", + tqWarning( "dlg2ui: Could not open output file '%s'", outFileName.latin1() ); return TQStringList(); } diff --git a/tools/designer/plugins/glade/glade2ui.cpp b/tools/designer/plugins/glade/glade2ui.cpp index f886a2595..4d4eae25e 100644 --- a/tools/designer/plugins/glade/glade2ui.cpp +++ b/tools/designer/plugins/glade/glade2ui.cpp @@ -2181,7 +2181,7 @@ TQStringList Glade2Ui::convertGladeFile( const TQString& fileName ) outFileName += TQString( ".ui" ); FILE *out = fopen( outFileName.latin1(), "w" ); if ( out == 0 ) { - qWarning( "glade2ui: Could not open file '%s'", + tqWarning( "glade2ui: Could not open file '%s'", outFileName.latin1() ); } else { if ( !yyOut.isEmpty() ) diff --git a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp index a5a46fe79..e92301924 100644 --- a/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp +++ b/tools/designer/plugins/kdevdlg/kdevdlg2ui.cpp @@ -251,7 +251,7 @@ bool KDEVDLG2UI::parse() TQString outputFile = TQString( className ) + ".ui"; fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "kdevdlg2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); targetFiles.append( outputFile ); } else { @@ -515,7 +515,7 @@ bool KDEVDLG2UI::writeDialog( const TQString& name ) writeColor( "paletteBackgroundColor", color ); } //else { //if ( line.length() ) - //qDebug( "IGNORED: %s", line.latin1() ); + //tqDebug( "IGNORED: %s", line.latin1() ); //} } *out << "</UI>" << endl; diff --git a/tools/designer/plugins/kdevdlg/main.cpp b/tools/designer/plugins/kdevdlg/main.cpp index 1e7c34663..e5ccdce29 100644 --- a/tools/designer/plugins/kdevdlg/main.cpp +++ b/tools/designer/plugins/kdevdlg/main.cpp @@ -89,7 +89,7 @@ TQStringList KDevDlgFilter::import( const TQString &, const TQString& filename ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) - qWarning( "uic: Could not open file '%s' ", filename.latin1() ); + tqWarning( "uic: Could not open file '%s' ", filename.latin1() ); TQTextStream in; in.setDevice( &file ); diff --git a/tools/designer/plugins/rc/main.cpp b/tools/designer/plugins/rc/main.cpp index 7d899743e..6ff2fda15 100644 --- a/tools/designer/plugins/rc/main.cpp +++ b/tools/designer/plugins/rc/main.cpp @@ -87,7 +87,7 @@ TQStringList RCFilter::import( const TQString &, const TQString& filename ) { TQFile file( filename ); if ( !file.open( IO_ReadOnly ) ) - qWarning( "uic: Could not open file '%s' ", filename.latin1() ); + tqWarning( "uic: Could not open file '%s' ", filename.latin1() ); TQTextStream in; in.setDevice( &file ); diff --git a/tools/designer/plugins/rc/rc2ui.cpp b/tools/designer/plugins/rc/rc2ui.cpp index f88f9d431..9730b8062 100644 --- a/tools/designer/plugins/rc/rc2ui.cpp +++ b/tools/designer/plugins/rc/rc2ui.cpp @@ -380,7 +380,7 @@ bool RC2UI::makeDialog() TQString outputFile = TQString(className) + ".ui"; fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); targetFiles.append( outputFile ); } else { @@ -838,7 +838,7 @@ bool RC2UI::makeStringTable() if (outputFile ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) - qFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); + tqFatal( "rc2ui: Could not open output file '%s'", outputFile.latin1() ); out = new TQTextStream( &fileOut ); } diff --git a/tools/designer/tools/conv2ui/main.cpp b/tools/designer/tools/conv2ui/main.cpp index 67c584b94..31e561725 100644 --- a/tools/designer/tools/conv2ui/main.cpp +++ b/tools/designer/tools/conv2ui/main.cpp @@ -76,12 +76,12 @@ bool Conv2ui::reinit() bool Conv2ui::convert( const TQString & filename, const TQDir & dest ) { if ( !importFiltersManager ) { - qWarning( "Conv2ui: no TQPluginManager was found" ); + tqWarning( "Conv2ui: no TQPluginManager was found" ); return FALSE; } if ( !TQFile::exists( absName( filename ) ) ) { - qWarning( "Conv2ui: can not find file %s", filename.latin1() ); + tqWarning( "Conv2ui: can not find file %s", filename.latin1() ); return FALSE; } diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp index 63cbd9bc1..bd9088ea9 100644 --- a/tools/designer/uic/embed.cpp +++ b/tools/designer/uic/embed.cpp @@ -78,7 +78,7 @@ static TQString convertToCIdentifier( const char *s ) static ulong embedData( TQTextStream& out, const uchar* input, int nbytes ) { #ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION - TQByteArray bazip( qCompress( input, nbytes ) ); + TQByteArray bazip( tqCompress( input, nbytes ) ); ulong len = bazip.size(); #else ulong len = nbytes; diff --git a/tools/designer/uic/main.cpp b/tools/designer/uic/main.cpp index dbb3962a4..b0048e5bd 100644 --- a/tools/designer/uic/main.cpp +++ b/tools/designer/uic/main.cpp @@ -265,7 +265,7 @@ int main( int argc, char * argv[] ) if ( !outputFile.isEmpty() ) { fileOut.setName( outputFile ); if (!fileOut.open( IO_WriteOnly ) ) { - qWarning( "uic: Could not open output file '%s'", outputFile.data() ); + tqWarning( "uic: Could not open output file '%s'", outputFile.data() ); return 1; } } else { @@ -283,7 +283,7 @@ int main( int argc, char * argv[] ) TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) { - qWarning( "uic: Could not open file '%s'", fileName ); + tqWarning( "uic: Could not open file '%s'", fileName ); return 1; } @@ -291,13 +291,13 @@ int main( int argc, char * argv[] ) TQString errMsg; int errLine; if ( !doc.setContent( &file, &errMsg, &errLine ) ) { - qWarning( TQString("uic: Failed to parse %s: ") + errMsg + TQString (" in line %d"), fileName, errLine ); + tqWarning( TQString("uic: Failed to parse %s: ") + errMsg + TQString (" in line %d"), fileName, errLine ); return 1; } TQDomElement e = doc.firstChild().toElement(); if ( e.hasAttribute("version") && e.attribute("version").toDouble() > 3.3 ) { - qWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"), + tqWarning( TQString("uic: File generated with too recent version of TQt Designer (%s vs. %s)"), e.attribute("version").latin1(), TQT_VERSION_STR ); return 1; } @@ -350,7 +350,7 @@ int main( int argc, char * argv[] ) out << "#endif // " << protector << endl; } if ( fileOut.status() != IO_Ok ) { - qWarning( "uic: Error writing to file" ); + tqWarning( "uic: Error writing to file" ); if ( !outputFile.isEmpty() ) remove( outputFile ); } diff --git a/tools/designer/uic/subclassing.cpp b/tools/designer/uic/subclassing.cpp index 194bb6154..17e651f06 100644 --- a/tools/designer/uic/subclassing.cpp +++ b/tools/designer/uic/subclassing.cpp @@ -345,7 +345,7 @@ void Uic::writeFunctionsSubImpl( const TQStringList &fuLst, const TQStringList & out << " */" << endl; out << type << " " << subClass << "::" << (*it) << endl; out << "{" << endl; - out << " qWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl; + out << " tqWarning( \"" << subClass << "::" << (*it) << " not yet implemented!\" );" << endl; out << "}" << endl << endl; } out << endl; diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index 9cd0ad75d..d1844bb28 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -344,7 +344,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge if ( doc.setContent( dev, &errMsg, &errLine ) ) { w = widgetFactory->createFromUiFile( doc, connector, parent, name ); } else { - // qDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); + // tqDebug( TQString("Parse error: ") + errMsg + TQString(" in line %d"), errLine ); } } if ( !w ) { @@ -701,7 +701,7 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -768,7 +768,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -833,7 +833,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, pixmaps << value.asPixmap(); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -904,7 +904,7 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, popupMenu->insertSeparator(); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; } @@ -1091,7 +1091,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, TQBrush(color, value.asPixmap()) ); break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> paletteTag; } @@ -1156,7 +1156,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, } break; default: - qFatal( "Corrupt" ); + tqFatal( "Corrupt" ); } in >> objectTag; metAttribute--; @@ -1193,14 +1193,14 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, in >> lf; in >> cr; if ( lf != '\n' || cr != '\r' ) { - qWarning( "File corrupted" ); + tqWarning( "File corrupted" ); return 0; } Q_UINT8 qdatastreamVersion; in >> qdatastreamVersion; if ( (int) qdatastreamVersion > in.version() ) { - qWarning( "Incompatible version of TQt" ); + tqWarning( "Incompatible version of TQt" ); return 0; } in.setVersion( qdatastreamVersion ); @@ -1259,7 +1259,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, unpackStringSplit( strings, in, slot ); // ### #if 0 - qWarning( "connect( %p, %s, %p, %s )", objects[senderNo], + tqWarning( "connect( %p, %s, %p, %s )", objects[senderNo], signal.latin1(), objects[receiverNo], slot.latin1() ); #endif @@ -1268,7 +1268,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Functions: // ### - qWarning( "Block_Functions not supported" ); + tqWarning( "Block_Functions not supported" ); in.device()->at( nextBlock ); break; case Block_Images: @@ -1350,7 +1350,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Variables: // ### - qWarning( "Block_Variables not supported" ); + tqWarning( "Block_Variables not supported" ); in.device()->at( nextBlock ); break; case Block_Widget: @@ -1361,7 +1361,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, toplevel->setName( name ); break; default: - qWarning( "Version error" ); + tqWarning( "Version error" ); return 0; } in >> blockType; @@ -1640,7 +1640,7 @@ TQWidget *TQWidgetFactory::createWidgetInternal( const TQDomElement &e, TQWidget TQString parentClassName = parent ? parent->className() : 0; bool isPlugin = parent ? !!d->customWidgets.find( parent->className() ) : FALSE; if ( isPlugin ) - qWarning( "####### loading custom container widgets without page support not implemented!" ); + tqWarning( "####### loading custom container widgets without page support not implemented!" ); // ### TODO loading for custom container widgets without pages #endif diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp index eaa339d6f..79cac514f 100644 --- a/tools/linguist/linguist/trwindow.cpp +++ b/tools/linguist/linguist/trwindow.cpp @@ -769,7 +769,7 @@ void TrWindow::newPhraseBook() void TrWindow::openPhraseBook() { - TQString phrasebooks( qInstallPathData() ); + TQString phrasebooks( tqInstallPathData() ); TQString name = TQFileDialog::getOpenFileName( phrasebooks + "/phrasebooks", tr("TQt phrase books (*.qph)\n" "All files (*)"), @@ -852,8 +852,8 @@ void TrWindow::revertSorting() void TrWindow::manual() { - TQAssistantClient *ac = new TQAssistantClient( qInstallPathBins(), this ); - ac->showPage( TQString( qInstallPathDocs() ) + "/html/linguist-manual.html" ); + TQAssistantClient *ac = new TQAssistantClient( tqInstallPathBins(), this ); + ac->showPage( TQString( tqInstallPathDocs() ) + "/html/linguist-manual.html" ); } void TrWindow::about() diff --git a/tools/linguist/lupdate/fetchtr.cpp b/tools/linguist/lupdate/fetchtr.cpp index 7201f3a0e..7ff6a0387 100644 --- a/tools/linguist/lupdate/fetchtr.cpp +++ b/tools/linguist/lupdate/fetchtr.cpp @@ -176,7 +176,7 @@ static int getToken() break; case 'T': // TR() for when all else fails - if ( qstricmp(yyIdent + 1, "R") == 0 ) + if ( tqstricmp(yyIdent + 1, "R") == 0 ) return Tok_tr; break; case 'c': @@ -350,7 +350,7 @@ static int getToken() yyString[yyStringLen] = '\0'; if ( yyCh != '"' ) - qWarning( "%s:%d: Unterminated C++ string", + tqWarning( "%s:%d: Unterminated C++ string", (const char *) yyFileName, yyLineNo ); if ( yyCh == EOF ) { @@ -551,7 +551,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, TQString::null, utf8) ); if ( lacks_TQ_OBJECT.contains(context) ) { - qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", + tqWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) context ); lacks_TQ_OBJECT.remove( context ); @@ -622,7 +622,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, case Tok_Arrow: yyTok = getToken(); if ( yyTok == Tok_tr || yyTok == Tok_trUtf8 ) - qWarning( "%s:%d: Cannot invoke tr() like this", + tqWarning( "%s:%d: Cannot invoke tr() like this", (const char *) yyFileName, yyLineNo ); break; case Tok_Gulbrandsen: @@ -639,7 +639,7 @@ static void parse( MetaTranslator *tor, const char *initialContext, if ( yyBraceDepth == (int) namespaces.count() ) { if ( missing_TQ_OBJECT ) { if ( needs_TQ_OBJECT.contains(functionContext) ) { - qWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", + tqWarning( "%s:%d: Class '%s' lacks TQ_OBJECT macro", (const char *) yyFileName, yyLineNo, (const char *) functionContext ); } else { diff --git a/tools/makeqpf/main.cpp b/tools/makeqpf/main.cpp index 8abd2162e..cfe9bc9e4 100644 --- a/tools/makeqpf/main.cpp +++ b/tools/makeqpf/main.cpp @@ -242,16 +242,16 @@ private slots: static void usage() { - qWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]"); - qWarning(""); - qWarning(" Saves TQPF font files by rendering and saving fonts."); - qWarning(""); - qWarning(" -A = Render and save all fonts in fontdir"); - qWarning(" -f = File of lines:"); - qWarning(" fontname character-ranges"); - qWarning(" eg."); - qWarning(" smoothtimes 0-ff,20a0-20af"); - qWarning(" font = Font to render and save"); + tqWarning("Usage: makeqpf [-A] [-f spec-file] [font ...]"); + tqWarning(""); + tqWarning(" Saves TQPF font files by rendering and saving fonts."); + tqWarning(""); + tqWarning(" -A = Render and save all fonts in fontdir"); + tqWarning(" -f = File of lines:"); + tqWarning(" fontname character-ranges"); + tqWarning(" eg."); + tqWarning(" smoothtimes 0-ff,20a0-20af"); + tqWarning(" font = Font to render and save"); } int main(int argc, char** argv) @@ -303,7 +303,7 @@ int main(int argc, char** argv) m.save(family); } } else { - qWarning("Cannot open %s",specfile.latin1()); + tqWarning("Cannot open %s",specfile.latin1()); } } else { while (*argv) diff --git a/tools/mergetr/mergetr.cpp b/tools/mergetr/mergetr.cpp index fa9265b46..b87875657 100644 --- a/tools/mergetr/mergetr.cpp +++ b/tools/mergetr/mergetr.cpp @@ -186,7 +186,7 @@ void writecomment( TQTextStream &str, const TQString &s ) while ( idx < len ) { int nl = s.find( '\n', idx ); if ( nl < 0 ) { - qWarning( "writecomment: string lacks newline" ); + tqWarning( "writecomment: string lacks newline" ); str << "# " << s.mid( idx ) << '\n'; return; } diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp index 49d6302d9..2b88dc9c9 100644 --- a/tools/msg2qm/msg2qm.cpp +++ b/tools/msg2qm/msg2qm.cpp @@ -110,7 +110,7 @@ void addTranslation( TQTranslator* translator, const TQString& msgid, const TQSt scope = *defaultScope; if (translator->contains( scope.ascii(), id.ascii() ) ) { - qWarning("Error: \"%s\" already in use", msgid.ascii() ); + tqWarning("Error: \"%s\" already in use", msgid.ascii() ); } else { translator->insert( scope.latin1(), id.latin1(), msgstr ); diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp index dcfcfde63..b891cac0f 100644 --- a/tools/qconfig/main.cpp +++ b/tools/qconfig/main.cpp @@ -422,7 +422,7 @@ void Main::loadFeatures(const TQString& filename) sectioncontents[sec].append(feature); choices.append(feature); } else { - qDebug("Unparsed text"); + tqDebug("Unparsed text"); } feature = lab = sec = TQString::null; @@ -439,7 +439,7 @@ void Main::loadFeatures(const TQString& filename) int colon = line.find(':'); if ( colon < 0 ) { - qDebug("Cannot parse: %s",line.ascii()); + tqDebug("Cannot parse: %s",line.ascii()); } else { TQString tag = line.left(colon); TQString value = line.mid(colon+1).stripWhiteSpace(); @@ -513,7 +513,7 @@ void Main::loadFeatures(const TQString& filename) deps.clear(); } else if ( token[0].isEmpty() ) { } else { - qDebug("Cannot parse: %s",token.join(" ").ascii()); + tqDebug("Cannot parse: %s",token.join(" ").ascii()); } } else if ( token[0] == "#include" ) { on = TRUE; @@ -545,7 +545,7 @@ void Main::createItem(const TQString& ch) for (TQStringList::Iterator dp = deps.begin(); dp != deps.end(); ++dp) { TQString dsec = section[*dp]; if ( dsec.isEmpty() ) - qDebug("No section for %s",(*dp).latin1()); + tqDebug("No section for %s",(*dp).latin1()); if ( !parent && dsec == sec ) { createItem(*dp); parent = item[*dp]; @@ -582,7 +582,7 @@ void Main::loadConfig(const TQString& filename) if ( i ) i->setDefined(TRUE); else - qDebug("The item %s is not used by ntqfeatures.h", token[1].latin1()); + tqDebug("The item %s is not used by ntqfeatures.h", token[1].latin1()); } } while (!s.atEnd()); } @@ -608,14 +608,14 @@ void Main::updateAvailability(TQListViewItem* i) if ( dd->isDefined() || !dd->isAvailable() ) av = FALSE; } else - qDebug("%s ???",(*dit).latin1()); + tqDebug("%s ???",(*dit).latin1()); } if ( d->isAvailable() != av ) { d->setAvailable(av); updateAvailability(d); } } -qDebug("%s: %d",choice->id.latin1(),choice->isAvailable()); +tqDebug("%s: %d",choice->id.latin1(),choice->isAvailable()); } } diff --git a/tools/qembed/qembed.cpp b/tools/qembed/qembed.cpp index 80fe1113c..9a3336e41 100644 --- a/tools/qembed/qembed.cpp +++ b/tools/qembed/qembed.cpp @@ -55,7 +55,7 @@ struct EmbedImage { int main( int argc, char **argv ) { if ( argc < 2 ) { - qWarning( "Usage:\n\t%s [--images] files", argv[0] ); + tqWarning( "Usage:\n\t%s [--images] files", argv[0] ); return 1; } @@ -103,19 +103,19 @@ int main( int argc, char **argv ) } else { TQFile f( *it ); if ( !f.open(IO_ReadOnly) ) { - qWarning( "Cannot open file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot open file %s, ignoring it", (*it).latin1() ); continue; } TQByteArray a( f.size() ); if ( f.size() == 0 || f.readBlock(a.data(), f.size()) != (int)f.size() ) { - qWarning( "Cannot read file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot read file %s, ignoring it", (*it).latin1() ); continue; } if ( images ) { TQImage img; if ( !img.loadFromData(a) ) { - qWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() ); + tqWarning( "Cannot read image from file %s, ignoring it", (*it).latin1() ); continue; } EmbedImage *e = new EmbedImage; diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 0d3cd74db..79506cef2 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -60,7 +60,7 @@ // from qapplication.cpp and qapplication_x11.cpp - These are NOT for // external use ignore them -extern bool Q_EXPORT qt_resolve_symlinks; +extern bool Q_EXPORT tqt_resolve_symlinks; static const char *appearance_text = @@ -290,7 +290,7 @@ MainWindow::MainWindow() dcispin->setValue(TQApplication::doubleClickInterval()); cfispin->setValue(TQApplication::cursorFlashTime()); wslspin->setValue(TQApplication::wheelScrollLines()); - resolvelinks->setChecked(qt_resolve_symlinks); + resolvelinks->setChecked(tqt_resolve_symlinks); effectcheckbox->setChecked(TQApplication::isEffectEnabled(UI_General)); effectbase->setEnabled(effectcheckbox->isChecked()); diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp index aa408fa64..552515840 100644 --- a/tools/qvfb/main.cpp +++ b/tools/qvfb/main.cpp @@ -86,7 +86,7 @@ int main( int argc, char *argv[] ) displayId = displaySpec.mid( m+1, rx.matchedLength()-1 ).toInt(); } - qDebug( "Using display %d", displayId ); + tqDebug( "Using display %d", displayId ); TQVFb mw( displayId, width, height, depth, skin ); app.setMainWidget( &mw ); diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index 8a3c32cca..9ae1e8690 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -251,7 +251,7 @@ public: TQAnimationWriter::TQAnimationWriter( const TQString& filename, const char* format ) { if ( TQCString(format) != "MNG" ) { - qWarning("Format \"%s\" not supported, only MNG", format); + tqWarning("Format \"%s\" not supported, only MNG", format); dev = 0; d = 0; } else { @@ -389,7 +389,7 @@ void TQAnimationWriter::appendFrame(const TQImage& frm, const TQPoint& offset) } } } -qDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); +tqDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); d->composeImage(diff,TQPoint(minx,miny)+offset); } if ( prev.isNull() || prev.size() == frame.size() && offset == TQPoint(0,0) ) { diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 1532fe36c..a23bab69b 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -88,7 +88,7 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, break; default: - qFatal( "Unsupported bit depth %d\n", d ); + tqFatal( "Unsupported bit depth %d\n", d ); } mousePipe = TQString(QT_VFB_MOUSE_PIPE).arg(display_id); @@ -99,14 +99,14 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, mouseFd = open( mousePipe.latin1(), O_RDWR | O_NDELAY ); if ( mouseFd == -1 ) { - qFatal( "Cannot open mouse pipe" ); + tqFatal( "Cannot open mouse pipe" ); } unlink( keyboardPipe ); mkfifo( keyboardPipe, 0666 ); keyboardFd = open( keyboardPipe, O_RDWR | O_NDELAY ); if ( keyboardFd == -1 ) { - qFatal( "Cannot open keyboard pipe" ); + tqFatal( "Cannot open keyboard pipe" ); } key_t key = ftok( mousePipe.latin1(), 'b' ); @@ -129,7 +129,7 @@ TQVFbView::TQVFbView( int display_id, int w, int h, int d, TQWidget *parent, } if ( (long)data == -1 ) - qFatal( "Cannot attach to shared memory" ); + tqFatal( "Cannot attach to shared memory" ); hdr = (TQVFbHeader *)data; hdr->width = w; @@ -215,7 +215,7 @@ void TQVFbView::setGamma(double gr, double gg, double gb) if ( g > 255 ) g = 255; if ( b > 255 ) b = 255; gammatable[i] = tqRgb(r,g,b); -//qDebug("%d: %d,%d,%d",i,r,g,b); +//tqDebug("%d: %d,%d,%d",i,r,g,b); } setDirty(rect()); @@ -282,25 +282,25 @@ static TQString qws_dataDir() TQString dataDir = "/tmp/qtembedded-" + username; if ( mkdir( dataDir.latin1(), 0700 ) ) { if ( errno != EEXIST ) { - qFatal( TQString("Cannot create TQt/Embedded data directory: %1") + tqFatal( TQString("Cannot create TQt/Embedded data directory: %1") .arg( dataDir ) ); } } struct stat buf; if ( lstat( dataDir.latin1(), &buf ) ) - qFatal( TQString( "stat failed for TQt/Embedded data directory: %1" ) + tqFatal( TQString( "stat failed for TQt/Embedded data directory: %1" ) .arg( dataDir ) ); if ( !S_ISDIR( buf.st_mode ) ) - qFatal( TQString( "%1 is not a directory" ).arg( dataDir ) ); + tqFatal( TQString( "%1 is not a directory" ).arg( dataDir ) ); if ( buf.st_uid != getuid() ) - qFatal( TQString( "TQt/Embedded data directory is not owned by user %1" ) + tqFatal( TQString( "TQt/Embedded data directory is not owned by user %1" ) .arg( getuid() ) ); if ( (buf.st_mode & 0677) != 0600 ) - qFatal( TQString( "TQt/Embedded data directory has incorrect permissions: %1" ) + tqFatal( TQString( "TQt/Embedded data directory has incorrect permissions: %1" ) .arg( dataDir ) ); dataDir += "/"; @@ -485,7 +485,7 @@ void TQVFbView::drawScreen() TQRect r( hdr->update ); hdr->dirty = FALSE; hdr->update = TQRect(); - // qDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); + // tqDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); r = r.intersect( TQRect(0, 0, hdr->width, hdr->height ) ); if ( !r.isEmpty() ) { if ( int(zm) != zm ) { |