summaryrefslogtreecommitdiffstats
path: root/katapult/katapult/katapult.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'katapult/katapult/katapult.cpp')
-rw-r--r--katapult/katapult/katapult.cpp24
1 files changed, 12 insertions, 12 deletions
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 {