summaryrefslogtreecommitdiffstats
path: root/katapult
diff options
context:
space:
mode:
Diffstat (limited to 'katapult')
-rw-r--r--katapult/common/cachedcatalog.cpp12
-rw-r--r--katapult/common/imagedisplay.cpp2
-rw-r--r--katapult/common/imagedisplaysettings.ui8
-rw-r--r--katapult/common/katapultcatalog.cpp2
-rw-r--r--katapult/common/katapultcatalog.h2
-rw-r--r--katapult/common/katapultdisplay.cpp2
-rw-r--r--katapult/common/katapultdisplay.h2
-rw-r--r--katapult/katapult/confdisplay.ui2
-rw-r--r--katapult/katapult/confgeneral.ui2
-rw-r--r--katapult/katapult/katapult.cpp24
-rw-r--r--katapult/katapult/katapult.h2
-rw-r--r--katapult/katapult/settings.cpp4
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp38
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h2
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp12
-rw-r--r--katapult/plugins/catalogs/documentcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/execcatalog/execcatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/execcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp8
-rw-r--r--katapult/plugins/catalogs/googlecatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/programcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/settings.ui2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp8
27 files changed, 82 insertions, 82 deletions
diff --git a/katapult/common/cachedcatalog.cpp b/katapult/common/cachedcatalog.cpp
index 19c15a9..07824a6 100644
--- a/katapult/common/cachedcatalog.cpp
+++ b/katapult/common/cachedcatalog.cpp
@@ -46,7 +46,7 @@ unsigned int CachedCatalog::minQueryLen() const
void CachedCatalog::queryChanged()
{
- int newtqStatus = 0;
+ int newStatus = 0;
if(query() == "")
{
results.clear();
@@ -87,19 +87,19 @@ void CachedCatalog::queryChanged()
}
}
- newtqStatus |= S_Active;
+ newStatus |= S_Active;
if(results.count() > 0)
{
- newtqStatus |= S_HasResults;
+ newStatus |= S_HasResults;
if(results.count() > 1)
- newtqStatus |= S_Multiple;
+ newStatus |= S_Multiple;
} else
- newtqStatus |= S_NoResults;
+ newStatus |= S_NoResults;
setBestMatch(newBestMatch);
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
Match CachedCatalog::queryItem(const KatapultItem *item, TQString query) const
diff --git a/katapult/common/imagedisplay.cpp b/katapult/common/imagedisplay.cpp
index 2204615..eee9de1 100644
--- a/katapult/common/imagedisplay.cpp
+++ b/katapult/common/imagedisplay.cpp
@@ -208,7 +208,7 @@ void ImageDisplay::drawText(TQPixmap & pixmap, int x, int width, TQString text,
TQPainter painter(&pixmap);
painter.setFont(font);
- painter.setPen(tqcolorGroup().color(TQColorGroup::Link));
+ painter.setPen(colorGroup().color(TQColorGroup::Link));
painter.drawText(x, singlesize[1]-offset[3], hilighted);
painter.setPen(TQColor(255, 255, 255));
painter.drawText(x+metrics.width(hilighted), singlesize[1]-offset[3], remaining);
diff --git a/katapult/common/imagedisplaysettings.ui b/katapult/common/imagedisplaysettings.ui
index 84e0bb7..a36eebf 100644
--- a/katapult/common/imagedisplaysettings.ui
+++ b/katapult/common/imagedisplaysettings.ui
@@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@@ -170,7 +170,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>191</width>
<height>20</height>
@@ -196,7 +196,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>160</height>
diff --git a/katapult/common/katapultcatalog.cpp b/katapult/common/katapultcatalog.cpp
index 4fb0eeb..65ff83d 100644
--- a/katapult/common/katapultcatalog.cpp
+++ b/katapult/common/katapultcatalog.cpp
@@ -50,7 +50,7 @@ void KatapultCatalog::setQuery(TQString _query)
}
}
-void KatapultCatalog::settqStatus(int _status)
+void KatapultCatalog::setStatus(int _status)
{
this->_status = _status;
}
diff --git a/katapult/common/katapultcatalog.h b/katapult/common/katapultcatalog.h
index cc861b5..e97569b 100644
--- a/katapult/common/katapultcatalog.h
+++ b/katapult/common/katapultcatalog.h
@@ -53,7 +53,7 @@ public:
protected:
TQString query() const;
- void settqStatus(int);
+ void setStatus(int);
void setBestMatch(Match);
virtual void queryChanged();
diff --git a/katapult/common/katapultdisplay.cpp b/katapult/common/katapultdisplay.cpp
index fdb02a5..b6d3dc6 100644
--- a/katapult/common/katapultdisplay.cpp
+++ b/katapult/common/katapultdisplay.cpp
@@ -76,7 +76,7 @@ void KatapultDisplay::setAction(const KatapultAction *_action)
this->_action = _action;
}
-void KatapultDisplay::settqStatus(int _status)
+void KatapultDisplay::setStatus(int _status)
{
this->_status = _status;
}
diff --git a/katapult/common/katapultdisplay.h b/katapult/common/katapultdisplay.h
index bea1702..414c597 100644
--- a/katapult/common/katapultdisplay.h
+++ b/katapult/common/katapultdisplay.h
@@ -46,7 +46,7 @@ public:
void setSelected(unsigned int);
void setItem(const KatapultItem *);
void setAction(const KatapultAction *);
- void settqStatus(int);
+ void setStatus(int);
virtual void readSettings(KConfigBase *);
virtual void writeSettings(KConfigBase *);
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
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
index 7ca1f9b..2425469 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());
- _gotCollectiontqStatus = false;
+ _gotCollectionStatus = false;
_dynamicCollection = false;
checkCollectionType();
@@ -58,16 +58,16 @@ AmarokCatalog::~AmarokCatalog()
void AmarokCatalog::queryChanged()
{
- int newtqStatus = 0;
+ int newStatus = 0;
TQString queryString = query();
if((TQString(queryString).remove(':').remove('\"').remove(' ').isEmpty()) || (queryString.length() < _minQueryLen)) {
reset();
setBestMatch(Match());
- settqStatus(0);
+ setStatus(0);
} else {
- if ( _gotCollectiontqStatus)
+ if ( _gotCollectionStatus)
{
if (!_dynamicCollection)
@@ -101,7 +101,7 @@ void AmarokCatalog::queryChanged()
arg << sqlQuery;
if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
sqlQueryData, replyType, replyData)) {
- newtqStatus = 0;
+ newStatus = 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()) {
- newtqStatus = 0;
+ newStatus = 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() )
- newtqStatus = S_HasResults | S_Multiple;
+ newStatus = S_HasResults | S_Multiple;
else
- newtqStatus = S_HasResults;
+ newStatus = S_HasResults;
}
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
@@ -176,7 +176,7 @@ void AmarokCatalog::queryChanged()
arg << sqlQuery;
if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)",
sqlQueryData, replyType, replyData)) {
- newtqStatus = 0;
+ newStatus = 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()) {
- newtqStatus = 0;
+ newStatus = 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() )
- newtqStatus = S_HasResults | S_Multiple;
+ newStatus = S_HasResults | S_Multiple;
else
- newtqStatus = S_HasResults;
+ newStatus = S_HasResults;
}
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
} //end of >1.4.2 section
- settqStatus(newtqStatus);
+ setStatus(newStatus);
} else { //We haven't got the collection status
checkCollectionType();
reset();
setBestMatch(Match());
- settqStatus(0);
+ setStatus(0);
}
@@ -275,7 +275,7 @@ void AmarokCatalog::checkCollectionType()
arg << sqlQuery;
if (!kapp->dcopClient()->call("amarok", "collection", "query(TQString)", sqlQueryData, replyType, replyData))
{
- _gotCollectiontqStatus = false;
+ _gotCollectionStatus = false;
}
else
@@ -296,11 +296,11 @@ void AmarokCatalog::checkCollectionType()
_dynamicCollection = false;
}
- _gotCollectiontqStatus = true;
+ _gotCollectionStatus = true;
}
else
{
- _gotCollectiontqStatus = false;
+ _gotCollectionStatus = false;
}
}
}
diff --git a/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h b/katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
index aaff457..f103bec 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 _gotCollectiontqStatus;
+ bool _gotCollectionStatus;
Song _result;
};
diff --git a/katapult/plugins/catalogs/amarokcatalog/settings.ui b/katapult/plugins/catalogs/amarokcatalog/settings.ui
index 384f4fc..1f8dc5f 100644
--- a/katapult/plugins/catalogs/amarokcatalog/settings.ui
+++ b/katapult/plugins/catalogs/amarokcatalog/settings.ui
@@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>370</height>
diff --git a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
index c6f900b..a5b6f38 100644
--- a/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
+++ b/katapult/plugins/catalogs/bookmarkcatalog/settings.ui
@@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>100</height>
diff --git a/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp b/katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
index 05a6c74..724c371 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 newtqStatus = 0;
+ int newStatus = 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
- newtqStatus = S_HasResults | S_Multiple | S_Active;
+ newStatus = S_HasResults | S_Multiple | S_Active;
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
void CalculatorCatalog::reset()
diff --git a/katapult/plugins/catalogs/calculatorcatalog/settings.ui b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
index a1a0c18..50bc410 100644
--- a/katapult/plugins/catalogs/calculatorcatalog/settings.ui
+++ b/katapult/plugins/catalogs/calculatorcatalog/settings.ui
@@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>40</height>
diff --git a/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp b/katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
index faa129c..bdcc1c6 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 newtqStatus = 0;
+ int newStatus = 0;
if(query() == "")
{
// reset query
@@ -169,21 +169,21 @@ void DocumentCatalog::queryChanged()
if(currentDirDoc != 0 && path.isEmpty())
newBestMatch = Match(currentDirDoc, 100, currentPath.length());
- newtqStatus |= S_Active;
+ newStatus |= S_Active;
if(files.count() > 0)
{
- newtqStatus |= S_HasResults;
+ newStatus |= S_HasResults;
if(files.count() > 1 || files.at(0)->className() == "Directory")
- newtqStatus |= S_Multiple;
+ newStatus |= S_Multiple;
} else
- newtqStatus |= S_NoResults;
+ newStatus |= S_NoResults;
setBestMatch(newBestMatch);
} else {
setBestMatch(Match());
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
unsigned int DocumentCatalog::minQueryLen() const
diff --git a/katapult/plugins/catalogs/documentcatalog/settings.ui b/katapult/plugins/catalogs/documentcatalog/settings.ui
index 6f3c990..07353c8 100644
--- a/katapult/plugins/catalogs/documentcatalog/settings.ui
+++ b/katapult/plugins/catalogs/documentcatalog/settings.ui
@@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>410</height>
diff --git a/katapult/plugins/catalogs/execcatalog/execcatalog.cpp b/katapult/plugins/catalogs/execcatalog/execcatalog.cpp
index 78ef7af..75642c8 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 newtqStatus = 0;
+ int newStatus = 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
- newtqStatus = S_HasResults | S_Multiple | S_Active;
+ newStatus = S_HasResults | S_Multiple | S_Active;
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
bool ExecCatalog::accepts(const TQString& str) const
diff --git a/katapult/plugins/catalogs/execcatalog/settings.ui b/katapult/plugins/catalogs/execcatalog/settings.ui
index 9cfba9a..892cfb7 100644
--- a/katapult/plugins/catalogs/execcatalog/settings.ui
+++ b/katapult/plugins/catalogs/execcatalog/settings.ui
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
diff --git a/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp b/katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
index 050d135..0c0b7c2 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 newtqStatus = 0;
+ int newStatus = 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
- newtqStatus = S_HasResults | S_Multiple | S_Active;
+ newStatus = S_HasResults | S_Multiple | S_Active;
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
bool GoogleCatalog::accepts(const TQString& str) const
diff --git a/katapult/plugins/catalogs/googlecatalog/settings.ui b/katapult/plugins/catalogs/googlecatalog/settings.ui
index 27b2ef4..fe8ff14 100644
--- a/katapult/plugins/catalogs/googlecatalog/settings.ui
+++ b/katapult/plugins/catalogs/googlecatalog/settings.ui
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
diff --git a/katapult/plugins/catalogs/programcatalog/settings.ui b/katapult/plugins/catalogs/programcatalog/settings.ui
index d62d902..42a21a8 100644
--- a/katapult/plugins/catalogs/programcatalog/settings.ui
+++ b/katapult/plugins/catalogs/programcatalog/settings.ui
@@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>370</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/settings.ui b/katapult/plugins/catalogs/spellcatalog/settings.ui
index d1d6fa2..39a01e8 100644
--- a/katapult/plugins/catalogs/spellcatalog/settings.ui
+++ b/katapult/plugins/catalogs/spellcatalog/settings.ui
@@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>150</height>
diff --git a/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp b/katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
index cbc3b8b..93e103c 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 newtqStatus = 0;
+ int newStatus = 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
- newtqStatus = S_HasResults | S_Multiple | S_Active;
+ newStatus = S_HasResults | S_Multiple | S_Active;
} else {
- newtqStatus = 0;
+ newStatus = 0;
}
}
- settqStatus(newtqStatus);
+ setStatus(newStatus);
}
bool SpellCatalog::accepts(const TQString& str) const