diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:09:16 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:09:16 -0600 |
commit | bccaa22a757e5e902640613540c32637b66e2575 (patch) | |
tree | f00d2f929aa7bfb41929483cbf8da3f7a7eb9daf /katapult/katapult | |
parent | 769d9f539ffa81925d11cf5480e396d26a43b86d (diff) | |
download | katapult-bccaa22a757e5e902640613540c32637b66e2575.tar.gz katapult-bccaa22a757e5e902640613540c32637b66e2575.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'katapult/katapult')
-rw-r--r-- | katapult/katapult/confdisplay.ui | 2 | ||||
-rw-r--r-- | katapult/katapult/confgeneral.ui | 2 | ||||
-rw-r--r-- | katapult/katapult/katapult.cpp | 24 | ||||
-rw-r--r-- | katapult/katapult/katapult.h | 2 | ||||
-rw-r--r-- | katapult/katapult/settings.cpp | 4 |
5 files changed, 17 insertions, 17 deletions
diff --git a/katapult/katapult/confdisplay.ui b/katapult/katapult/confdisplay.ui index e0e7d53..2dc3a1c 100644 --- a/katapult/katapult/confdisplay.ui +++ b/katapult/katapult/confdisplay.ui @@ -48,7 +48,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> diff --git a/katapult/katapult/confgeneral.ui b/katapult/katapult/confgeneral.ui index cee6595..c3d4788 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.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>62</height> diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp index b94826b..c8d60b2 100644 --- a/katapult/katapult/katapult.cpp +++ b/katapult/katapult/katapult.cpp @@ -164,7 +164,7 @@ void Katapult::clearQuery() void Katapult::setQuery(TQString _query) { - alltqStatus=0; + allStatus=0; bestMatch = Match(); this->_query = _query; @@ -181,12 +181,12 @@ void Katapult::setQuery(TQString _query) } display->setItem(0); display->setAction(0); - display->settqStatus(0); + display->setStatus(0); display->setSelected(0); action = 0; } else if(catalogs.count() == 0) { - alltqStatus = S_Active | S_NoResults; - display->settqStatus(alltqStatus); + allStatus = S_Active | S_NoResults; + display->setStatus(allStatus); } else { TQDictIterator<KatapultCatalog> it(catalogs); KatapultCatalog *catalog; @@ -200,8 +200,8 @@ void Katapult::setQuery(TQString _query) status = catalog->status(); if(status & S_HasResults) { - if(alltqStatus & S_HasResults) - alltqStatus |= S_Multiple; + if(allStatus & S_HasResults) + allStatus |= S_Multiple; Match match = catalog->bestMatch(); if(!match.isNull()) { @@ -209,7 +209,7 @@ void Katapult::setQuery(TQString _query) bestMatch = match; } } - alltqStatus |= status; + allStatus |= 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(!(alltqStatus & S_HasResults) && alltqStatus & S_Active) { + if(!(allStatus & S_HasResults) && allStatus & 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() && alltqStatus & S_HasResults && !(alltqStatus & S_Multiple)) { + if(!executing && settings->isAutoExecute() && allStatus & S_HasResults && !(allStatus & S_Multiple)) { execute(); } @@ -266,7 +266,7 @@ void Katapult::updateDisplay() display->setAction(action); display->setSelected(bestMatch.matched()); } - display->settqStatus(alltqStatus); + display->setStatus(allStatus); display->update(); } } @@ -276,7 +276,7 @@ void Katapult::showLauncher() if(!settings->isConfiguring() && display != 0) { setQuery(""); - display->settqStatus(0); + display->setStatus(0); display->setQuery(""); display->show(); display->update(); @@ -306,7 +306,7 @@ void Katapult::execute() executing = TRUE; if(action == 0) { - display->settqStatus(S_Active | S_NoResults); + display->setStatus(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 b34f34f..2270841 100644 --- a/katapult/katapult/katapult.h +++ b/katapult/katapult/katapult.h @@ -79,7 +79,7 @@ private: void initAccel(TQWidget *); bool executing; - int alltqStatus; + int allStatus; KatapultDisplay *display; KGlobalAccel *globalAccel; KActionCollection *actions; diff --git a/katapult/katapult/settings.cpp b/katapult/katapult/settings.cpp index 9dd8949..8f23bf5 100644 --- a/katapult/katapult/settings.cpp +++ b/katapult/katapult/settings.cpp @@ -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->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, listBox->sizePolicy().hasHeightForWidth() ) ); + listBox->setSizePolicy( 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(tqminimumSizeHint()) ); + resize( TQSize(597, 364).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // signals and slots connections |