From 769d9f539ffa81925d11cf5480e396d26a43b86d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:55:55 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit a3703745120ffe8f1beadd5fa58f9ab1470bc2f8. --- .../catalogs/amarokcatalog/amarokcatalog.cpp | 46 +++++++++++----------- .../plugins/catalogs/amarokcatalog/amarokcatalog.h | 2 +- .../plugins/catalogs/amarokcatalog/settings.ui | 4 +- .../plugins/catalogs/bookmarkcatalog/settings.ui | 4 +- .../catalogs/calculatorcatalog/actionevalexpr.cpp | 4 +- .../calculatorcatalog/calculatorcatalog.cpp | 8 ++-- .../plugins/catalogs/calculatorcatalog/settings.ui | 8 ++-- .../documentcatalog/actionopendocument.cpp | 2 +- .../catalogs/documentcatalog/documentcatalog.cpp | 12 +++--- .../plugins/catalogs/documentcatalog/settings.ui | 4 +- katapult/plugins/catalogs/execcatalog/command.cpp | 2 +- .../plugins/catalogs/execcatalog/execcatalog.cpp | 10 ++--- katapult/plugins/catalogs/execcatalog/settings.ui | 2 +- .../catalogs/googlecatalog/googlecatalog.cpp | 10 ++--- katapult/plugins/catalogs/googlecatalog/query.cpp | 2 +- .../plugins/catalogs/googlecatalog/settings.ui | 2 +- .../plugins/catalogs/programcatalog/settings.ui | 4 +- .../catalogs/spellcatalog/actioncopyspelling.cpp | 2 +- katapult/plugins/catalogs/spellcatalog/settings.ui | 2 +- .../plugins/catalogs/spellcatalog/spellcatalog.cpp | 10 ++--- .../plugins/catalogs/spellcatalog/spelling.cpp | 4 +- 21 files changed, 72 insertions(+), 72 deletions(-) (limited to 'katapult/plugins') diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp index 6ad0892..7ca1f9b 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp @@ -47,7 +47,7 @@ AmarokCatalog::AmarokCatalog(TQObject*, const char*, const TQStringList&): _resu { _minQueryLen = 3; ActionRegistry::self()->registerAction(new ActionPlaySong()); - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; _dynamicCollection = false; checkCollectionType(); @@ -58,16 +58,16 @@ AmarokCatalog::~AmarokCatalog() void AmarokCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString queryString = query(); if((TQString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) { reset(); setBestMatch(Match()); - setStatus(0); + settqStatus(0); } else { - if ( _gotCollectionStatus) + if ( _gotCollectiontqStatus) { if (!_dynamicCollection) @@ -89,8 +89,8 @@ void AmarokCatalog::queryChanged() queryList = TQStringList::split ( TQString(" "), TQString(queryString).replace(TQChar(':')," ").replace(TQChar('\''), " ").replace(TQChar('\''), "%") ); for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").arg(*it)); - sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").arg(*it)); + sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").tqarg(*it)); + sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it)); } sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); @@ -101,7 +101,7 @@ void AmarokCatalog::queryChanged() arg << sqlQuery; if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - newStatus = 0; + newtqStatus = 0; } else { TQDataStream reply(replyData, IO_ReadOnly); if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { @@ -109,7 +109,7 @@ void AmarokCatalog::queryChanged() reply >> sqlResult; if(sqlResult.isEmpty()) { - newStatus = 0; + newtqStatus = 0; } else { reset(); //Reads information from SQL-Query @@ -141,12 +141,12 @@ void AmarokCatalog::queryChanged() //Checks if there are multiple results if( !sqlResult[5].isEmpty() ) - newStatus = S_HasResults | S_Multiple; + newtqStatus = S_HasResults | S_Multiple; else - newStatus = S_HasResults; + newtqStatus = S_HasResults; } } else { - newStatus = 0; + newtqStatus = 0; } } @@ -163,8 +163,8 @@ void AmarokCatalog::queryChanged() TQStringList clauses; for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) { - clauses += TQString(" (t.title LIKE '\%%1\%'").arg(*it) + - TQString(" OR a.name LIKE '\%%1\%')").arg(*it); + clauses += TQString(" (t.title LIKE '\%%1\%'").tqarg(*it) + + TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it); } sqlQuery.append(clauses.join(TQString(" AND "))); sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC"); @@ -176,7 +176,7 @@ void AmarokCatalog::queryChanged() arg << sqlQuery; if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - newStatus = 0; + newtqStatus = 0; } else { TQDataStream reply(replyData, IO_ReadOnly); if (replyType == TQSTRINGLIST_OBJECT_NAME_STRING) { @@ -184,7 +184,7 @@ void AmarokCatalog::queryChanged() reply >> sqlResult; if(sqlResult.isEmpty()) { - newStatus = 0; + newtqStatus = 0; } else { reset(); //Reads information from SQL-Query @@ -231,25 +231,25 @@ void AmarokCatalog::queryChanged() //Checks if there are multiple results if( !sqlResult[7].isEmpty() ) - newStatus = S_HasResults | S_Multiple; + newtqStatus = S_HasResults | S_Multiple; else - newStatus = S_HasResults; + newtqStatus = S_HasResults; } } else { - newStatus = 0; + newtqStatus = 0; } } } //end of >1.4.2 section - setStatus(newStatus); + settqStatus(newtqStatus); } else { //We haven't got the collection status checkCollectionType(); reset(); setBestMatch(Match()); - setStatus(0); + settqStatus(0); } @@ -275,7 +275,7 @@ void AmarokCatalog::checkCollectionType() arg << sqlQuery; if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData)) { - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; } else @@ -296,11 +296,11 @@ void AmarokCatalog::checkCollectionType() _dynamicCollection = false; } - _gotCollectionStatus = true; + _gotCollectiontqStatus = true; } else { - _gotCollectionStatus = false; + _gotCollectiontqStatus = false; } } } diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h index f103bec..aaff457 100644 --- a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h +++ b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h @@ -56,7 +56,7 @@ protected: private: unsigned int _minQueryLen; bool _dynamicCollection; - bool _gotCollectionStatus; + bool _gotCollectiontqStatus; Song _result; }; diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui index 350a20e..384f4fc 100644 --- a/katapult/plugins/catalogs/amarokcatalog/settings.ui +++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -64,7 +64,7 @@ Expanding - + 20 370 diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui index 24ae2e2..c6f900b 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui +++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -98,7 +98,7 @@ Expanding - + 20 100 diff --git a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp index 038071e..74fce5b 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/actionevalexpr.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include "calculatorcatalog.h" #include "expression.h" @@ -150,7 +150,7 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const // Copy calculation and result into clipboard (unless there's a parse error). if (!_expr->parseError()) { - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); TQString s = _expr->catalog()->formatString(); s.replace("%1", _expr->text()); s.replace("%2", text()); diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp index 724c371..05a6c74 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp +++ b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp @@ -141,7 +141,7 @@ CalculatorCatalog::~CalculatorCatalog() void CalculatorCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString cmd = query(); if (cmd.isEmpty()) { @@ -203,12 +203,12 @@ void CalculatorCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } void CalculatorCatalog::reset() diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui index ca86824..a1a0c18 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui +++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui @@ -21,7 +21,7 @@ - layout13 + tqlayout13 @@ -59,7 +59,7 @@ - layout6 + tqlayout6 @@ -156,7 +156,7 @@ - layout8 + tqlayout8 @@ -200,7 +200,7 @@ Expanding - + 20 40 diff --git a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp index 06c71da..3de6f5a 100644 --- a/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp +++ b/katapult/plugins/catalogs/documentcatalog/actionopendocument.cpp @@ -51,7 +51,7 @@ void ActionOpenDocument::execute(const KatapultItem* item) const { if(strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0) { const Document *document = (const Document *) item; - qDebug("%s", TQString("Running: %1").arg(document->path()).latin1()); + qDebug("%s", TQString("Running: %1").tqarg(document->path()).latin1()); new KRun(document->path()); } } diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp index bdcc1c6..faa129c 100644 --- a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp +++ b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp @@ -98,7 +98,7 @@ void DocumentCatalog::refreshFiles() void DocumentCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; if(query() == "") { // reset query @@ -169,21 +169,21 @@ void DocumentCatalog::queryChanged() if(currentDirDoc != 0 && path.isEmpty()) newBestMatch = Match(currentDirDoc, 100, currentPath.length()); - newStatus |= S_Active; + newtqStatus |= S_Active; if(files.count() > 0) { - newStatus |= S_HasResults; + newtqStatus |= S_HasResults; if(files.count() > 1 || files.at(0)->className() == "Directory") - newStatus |= S_Multiple; + newtqStatus |= S_Multiple; } else - newStatus |= S_NoResults; + newtqStatus |= S_NoResults; setBestMatch(newBestMatch); } else { setBestMatch(Match()); } } - setStatus(newStatus); + settqStatus(newtqStatus); } unsigned int DocumentCatalog::minQueryLen() const diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui index d688553..6f3c990 100644 --- a/katapult/plugins/catalogs/documentcatalog/settings.ui +++ b/katapult/plugins/catalogs/documentcatalog/settings.ui @@ -18,7 +18,7 @@ - layout1 + tqlayout1 @@ -66,7 +66,7 @@ Expanding - + 20 410 diff --git a/katapult/plugins/catalogs/execcatalog/command.cpp b/katapult/plugins/catalogs/execcatalog/command.cpp index 02583d2..5954405 100644 --- a/katapult/plugins/catalogs/execcatalog/command.cpp +++ b/katapult/plugins/catalogs/execcatalog/command.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include "execcatalog.h" #include "command.h" diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp index 7915065..78ef7af 100644 --- a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp +++ b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp @@ -52,7 +52,7 @@ ExecCatalog::~ExecCatalog() void ExecCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString cmd = query(); int origLength = cmd.length(); @@ -67,12 +67,12 @@ void ExecCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } bool ExecCatalog::accepts(const TQString& str) const @@ -99,7 +99,7 @@ TQWidget * ExecCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 exec query\"").tqarg(_triggerWord)); return settings; } diff --git a/katapult/plugins/catalogs/execcatalog/settings.ui b/katapult/plugins/catalogs/execcatalog/settings.ui index 892cfb7..9cfba9a 100644 --- a/katapult/plugins/catalogs/execcatalog/settings.ui +++ b/katapult/plugins/catalogs/execcatalog/settings.ui @@ -50,7 +50,7 @@ Expanding - + 20 150 diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp index a6493e6..050d135 100644 --- a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp +++ b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp @@ -52,7 +52,7 @@ GoogleCatalog::~GoogleCatalog() void GoogleCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString cmd = query(); int origLength = cmd.length(); @@ -67,12 +67,12 @@ void GoogleCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } bool GoogleCatalog::accepts(const TQString& str) const @@ -99,7 +99,7 @@ TQWidget * GoogleCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 search query\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 search query\"").tqarg(_triggerWord)); return settings; } diff --git a/katapult/plugins/catalogs/googlecatalog/query.cpp b/katapult/plugins/catalogs/googlecatalog/query.cpp index d34aed9..96c7aa6 100644 --- a/katapult/plugins/catalogs/googlecatalog/query.cpp +++ b/katapult/plugins/catalogs/googlecatalog/query.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include "googlecatalog.h" #include "query.h" diff --git a/katapult/plugins/catalogs/googlecatalog/settings.ui b/katapult/plugins/catalogs/googlecatalog/settings.ui index fe8ff14..27b2ef4 100644 --- a/katapult/plugins/catalogs/googlecatalog/settings.ui +++ b/katapult/plugins/catalogs/googlecatalog/settings.ui @@ -50,7 +50,7 @@ Expanding - + 20 150 diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui index 16c5e91..d62d902 100644 --- a/katapult/plugins/catalogs/programcatalog/settings.ui +++ b/katapult/plugins/catalogs/programcatalog/settings.ui @@ -21,7 +21,7 @@ - layout1 + tqlayout1 @@ -85,7 +85,7 @@ Expanding - + 20 370 diff --git a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp index 5b19d69..51f2068 100644 --- a/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/actioncopyspelling.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "spellcatalog.h" #include "spelling.h" diff --git a/katapult/plugins/catalogs/spellcatalog/settings.ui b/katapult/plugins/catalogs/spellcatalog/settings.ui index 39a01e8..d1d6fa2 100644 --- a/katapult/plugins/catalogs/spellcatalog/settings.ui +++ b/katapult/plugins/catalogs/spellcatalog/settings.ui @@ -50,7 +50,7 @@ Expanding - + 20 150 diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp index fce2495..cbc3b8b 100644 --- a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp @@ -52,7 +52,7 @@ SpellCatalog::~SpellCatalog() void SpellCatalog::queryChanged() { - int newStatus = 0; + int newtqStatus = 0; TQString cmd = query(); int origLength = cmd.length(); @@ -67,12 +67,12 @@ void SpellCatalog::queryChanged() //set status. //add S_Multiple to make sure katapult doesn't auto-exec and close the window //add S_Active to make sure katapult doesn't start the hideTimer or clearTimer - newStatus = S_HasResults | S_Multiple | S_Active; + newtqStatus = S_HasResults | S_Multiple | S_Active; } else { - newStatus = 0; + newtqStatus = 0; } } - setStatus(newStatus); + settqStatus(newtqStatus); } bool SpellCatalog::accepts(const TQString& str) const @@ -99,7 +99,7 @@ TQWidget * SpellCatalog::configure() settings->triggerWordLE->setText(_triggerWord); connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&))); - settings->introLabel->setText(i18n("Use with \"%1 myword\"").arg(_triggerWord)); + settings->introLabel->setText(i18n("Use with \"%1 myword\"").tqarg(_triggerWord)); return settings; } diff --git a/katapult/plugins/catalogs/spellcatalog/spelling.cpp b/katapult/plugins/catalogs/spellcatalog/spelling.cpp index 706d03e..edadc18 100644 --- a/katapult/plugins/catalogs/spellcatalog/spelling.cpp +++ b/katapult/plugins/catalogs/spellcatalog/spelling.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include "spellcatalog.h" #include "spelling.h" @@ -125,7 +125,7 @@ void Spelling::evaluate() const } void Spelling::copyToClipboard() const { - TQClipboard* clipBoard = TQApplication::clipboard(); + TQClipboard* clipBoard = TQApplication::tqclipboard(); clipBoard->setText(suggestedWords, TQClipboard::Clipboard); clipBoard->setText(suggestedWords, TQClipboard::Selection); } -- cgit v1.2.3