TDE
/
katapult
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/katapult
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename old tq methods that no longer need a unique name

Browse Source
pull/1/head
Timothy Pearson 13 years ago
parent 769d9f539f
commit bccaa22a75
27 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File

12
katapult/common/cachedcatalog.cpp
Unescape View File

@ -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

2
katapult/common/imagedisplay.cpp
Unescape View File

@ -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);

8
katapult/common/imagedisplaysettings.ui
Unescape View File

@ -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>

2
katapult/common/katapultcatalog.cpp
Unescape View File

@ -50,7 +50,7 @@ void KatapultCatalog::setQuery(TQString _query)
}
}
void KatapultCatalog::settqStatus(int _status)
void KatapultCatalog::setStatus(int _status)
{
this->_status = _status;
}

2
katapult/common/katapultcatalog.h
Unescape View File

@ -53,7 +53,7 @@ public:
protected:
TQString query() const;
void settqStatus(int);
void setStatus(int);
void setBestMatch(Match);
virtual void queryChanged();

2
katapult/common/katapultdisplay.cpp
Unescape View File

@ -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;
}

2
katapult/common/katapultdisplay.h
Unescape View File

@ -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 *);

2
katapult/katapult/confdisplay.ui
Unescape View File

@ -48,7 +48,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>80</height>

2
katapult/katapult/confgeneral.ui
Unescape View File

@ -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>

24
katapult/katapult/katapult.cpp
Unescape View File

@ -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 {

2
katapult/katapult/katapult.h
Unescape View File

@ -79,7 +79,7 @@ private:
void initAccel(TQWidget *);
bool executing;
int alltqStatus;
int allStatus;
KatapultDisplay *display;
KGlobalAccel *globalAccel;
KActionCollection *actions;

4
katapult/katapult/settings.cpp
Unescape View File

@ -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

38
katapult/plugins/catalogs/amarokcatalog/amarokcatalog.cpp
Unescape View File

@ -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;
}
}
}

2
katapult/plugins/catalogs/amarokcatalog/amarokcatalog.h
Unescape View File

@ -56,7 +56,7 @@ protected:
private:
unsigned int _minQueryLen;
bool _dynamicCollection;
bool _gotCollectiontqStatus;
bool _gotCollectionStatus;
Song _result;
};

2
katapult/plugins/catalogs/amarokcatalog/settings.ui
Unescape View File

@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>370</height>

2
katapult/plugins/catalogs/bookmarkcatalog/settings.ui
Unescape View File

@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>100</height>

8
katapult/plugins/catalogs/calculatorcatalog/calculatorcatalog.cpp
Unescape View File

@ -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()

2
katapult/plugins/catalogs/calculatorcatalog/settings.ui
Unescape View File

@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>

12
katapult/plugins/catalogs/documentcatalog/documentcatalog.cpp
Unescape View File

@ -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

2
katapult/plugins/catalogs/documentcatalog/settings.ui
Unescape View File

@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>410</height>

8
katapult/plugins/catalogs/execcatalog/execcatalog.cpp
Unescape View File

@ -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

2
katapult/plugins/catalogs/execcatalog/settings.ui
Unescape View File

@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>150</height>

8
katapult/plugins/catalogs/googlecatalog/googlecatalog.cpp
Unescape View File

@ -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

2
katapult/plugins/catalogs/googlecatalog/settings.ui
Unescape View File

@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>150</height>

2
katapult/plugins/catalogs/programcatalog/settings.ui
Unescape View File

@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>370</height>

2
katapult/plugins/catalogs/spellcatalog/settings.ui
Unescape View File

@ -50,7 +50,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>150</height>

8
katapult/plugins/catalogs/spellcatalog/spellcatalog.cpp
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save