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. --- katapult/katapult/confdisplay.ui | 2 +- katapult/katapult/confgeneral.ui | 2 +- katapult/katapult/katapult.cpp | 26 +++++++++++++------------- katapult/katapult/katapult.h | 2 +- katapult/katapult/katapultconfigdlg.cpp | 4 ++-- katapult/katapult/katapultsettings.cpp | 8 ++++---- katapult/katapult/settings.cpp | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'katapult/katapult') diff --git a/katapult/katapult/confdisplay.ui b/katapult/katapult/confdisplay.ui index 2dc3a1c..e0e7d53 100644 --- a/katapult/katapult/confdisplay.ui +++ b/katapult/katapult/confdisplay.ui @@ -48,7 +48,7 @@ Expanding - + 20 80 diff --git a/katapult/katapult/confgeneral.ui b/katapult/katapult/confgeneral.ui index c3d4788..cee6595 100644 --- a/katapult/katapult/confgeneral.ui +++ b/katapult/katapult/confgeneral.ui @@ -237,7 +237,7 @@ This sets how long Katapult will wait before hiding the launcher. Expanding - + 20 62 diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index 7eca292..b94826b 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -81,7 +81,7 @@ Katapult::Katapult() //show popup (unless we're session restored) if (!settings->hideNotification()) { TQString msg = i18n("Application successfully started !\nPress %1 to use it...") - .arg(globalAccel->shortcut("show_katapult").toString()); + .tqarg(globalAccel->shortcut("show_katapult").toString()); KPassivePopup::message(i18n("Katapult Notification"), msg, kapp->miniIcon(), this, 0, settings->notificationTimeout()); } } @@ -164,7 +164,7 @@ void Katapult::clearQuery() void Katapult::setQuery(TQString _query) { - allStatus=0; + alltqStatus=0; bestMatch = Match(); this->_query = _query; @@ -181,12 +181,12 @@ void Katapult::setQuery(TQString _query) } display->setItem(0); display->setAction(0); - display->setStatus(0); + display->settqStatus(0); display->setSelected(0); action = 0; } else if(catalogs.count() == 0) { - allStatus = S_Active | S_NoResults; - display->setStatus(allStatus); + alltqStatus = S_Active | S_NoResults; + display->settqStatus(alltqStatus); } else { TQDictIterator it(catalogs); KatapultCatalog *catalog; @@ -200,8 +200,8 @@ void Katapult::setQuery(TQString _query) status = catalog->status(); if(status & S_HasResults) { - if(allStatus & S_HasResults) - allStatus |= S_Multiple; + if(alltqStatus & S_HasResults) + alltqStatus |= S_Multiple; Match match = catalog->bestMatch(); if(!match.isNull()) { @@ -209,7 +209,7 @@ void Katapult::setQuery(TQString _query) bestMatch = match; } } - allStatus |= status; + alltqStatus |= status; } if(bestMatch.isNull() || bestMatch.rank() == 0) bestMatch = Match(); @@ -219,7 +219,7 @@ void Katapult::setQuery(TQString _query) connect(bestMatch.item(), TQT_SIGNAL(itemChanged()), TQT_TQOBJECT(this), TQT_SLOT(updateDisplay())); } } - if(!(allStatus & S_HasResults) && allStatus & S_Active) { + if(!(alltqStatus & S_HasResults) && alltqStatus & S_Active) { // no results switch(settings->noResultsAction()) { case KatapultSettings::NR_HideDisplay: @@ -240,7 +240,7 @@ void Katapult::setQuery(TQString _query) clearTimer->stop(); } - if(!executing && settings->isAutoExecute() && allStatus & S_HasResults && !(allStatus & S_Multiple)) { + if(!executing && settings->isAutoExecute() && alltqStatus & S_HasResults && !(alltqStatus & S_Multiple)) { execute(); } @@ -266,7 +266,7 @@ void Katapult::updateDisplay() display->setAction(action); display->setSelected(bestMatch.matched()); } - display->setStatus(allStatus); + display->settqStatus(alltqStatus); display->update(); } } @@ -276,7 +276,7 @@ void Katapult::showLauncher() if(!settings->isConfiguring() && display != 0) { setQuery(""); - display->setStatus(0); + display->settqStatus(0); display->setQuery(""); display->show(); display->update(); @@ -306,7 +306,7 @@ void Katapult::execute() executing = TRUE; if(action == 0) { - display->setStatus(S_Active | S_NoResults); + display->settqStatus(S_Active | S_NoResults); display->update(); hideTimer->start(settings->hideDelay(), TRUE); } else { diff --git a/katapult/katapult/katapult.h b/katapult/katapult/katapult.h index 2270841..b34f34f 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -79,7 +79,7 @@ private: void initAccel(TQWidget *); bool executing; - int allStatus; + int alltqStatus; KatapultDisplay *display; KGlobalAccel *globalAccel; KActionCollection *actions; diff --git a/katapult/katapult/katapultconfigdlg.cpp b/katapult/katapult/katapultconfigdlg.cpp index ea6afce..97a7d24 100644 --- a/katapult/katapult/katapultconfigdlg.cpp +++ b/katapult/katapult/katapultconfigdlg.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -173,7 +173,7 @@ void KatapultConfigDlg::addDisplaySettings() if(displayConfig != 0) { displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0)); - display->displaySettings->layout()->add(displayConfig); + display->displaySettings->tqlayout()->add(displayConfig); displayConfig->show(); } } diff --git a/katapult/katapult/katapultsettings.cpp b/katapult/katapult/katapultsettings.cpp index ec20e79..e0a4dc5 100644 --- a/katapult/katapult/katapultsettings.cpp +++ b/katapult/katapult/katapultsettings.cpp @@ -109,14 +109,14 @@ void KatapultSettings::writeSettings() KatapultCatalog *catalog; while((catalog = it.current()) != 0) { - KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey())); + KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey())); catalog->writeSettings(&group); ++it; } if(_display != 0) { - KConfigGroup group(config, TQString("Displays/%1").arg(_displayName)); + KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName)); _display->writeSettings(&group); } @@ -323,7 +323,7 @@ void KatapultSettings::loadCatalogPlugins() (service, 0, 0, TQStringList(), &errCode); if(catalog != 0) { - KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(id)); + KConfigGroup group(kapp->config(), TQString("Catalogs/%1").tqarg(id)); catalog->readSettings(&group); catalog->initialize(); _activeCatalogs.insert(id, catalog); @@ -364,7 +364,7 @@ void KatapultSettings::loadDisplayPlugins() } if(_display != 0) { - KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName)); + KConfigGroup group(kapp->config(), TQString("Displays/%1").tqarg(_displayName)); _display->readSettings(&group); } } diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index 33a3ce1..9dd8949 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include @@ -35,7 +35,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl MyDialog1Layout = new TQGridLayout( this, 1, 1, 11, 6, "MyDialog1Layout"); listBox = new TQListBox( this, "listBox" ); - listBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) ); + listBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) ); MyDialog1Layout->addWidget( listBox, 0, 0 ); @@ -68,7 +68,7 @@ MyDialog1::MyDialog1( TQWidget* parent, const char* name, bool modal, WFlags fl MyDialog1Layout->addMultiCellLayout( Layout1, 1, 1, 0, 1 ); languageChange(); - resize( TQSize(597, 364).expandedTo(minimumSizeHint()) ); + resize( TQSize(597, 364).expandedTo(tqminimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections -- cgit v1.2.3