Rename a number of old tq methods that are no longer tq specific

pull/1/head
Timothy Pearson 13 years ago
parent 1a98207c22
commit a370374512

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

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

@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -90,7 +90,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>91</width>
<height>20</height>
@ -106,7 +106,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout7</cstring>
<cstring>layout7</cstring>
</property>
<hbox>
<property name="name">
@ -130,7 +130,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>181</width>
<height>20</height>
@ -146,7 +146,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -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>

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

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

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

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

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

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

@ -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...")
.tqarg(globalAccel->shortcut("show_katapult").toString());
.arg(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)
{
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 {

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

@ -25,7 +25,7 @@
#include <klocale.h>
#include <tqframe.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqslider.h>
#include <tqcheckbox.h>
#include <tqstringlist.h>
@ -173,7 +173,7 @@ void KatapultConfigDlg::addDisplaySettings()
if(displayConfig != 0)
{
displayConfig->reparent((TQWidget *) display->displaySettings, TQPoint(0, 0));
display->displaySettings->tqlayout()->add(displayConfig);
display->displaySettings->layout()->add(displayConfig);
displayConfig->show();
}
}

@ -109,14 +109,14 @@ void KatapultSettings::writeSettings()
KatapultCatalog *catalog;
while((catalog = it.current()) != 0)
{
KConfigGroup group(config, TQString("Catalogs/%1").tqarg(it.currentKey()));
KConfigGroup group(config, TQString("Catalogs/%1").arg(it.currentKey()));
catalog->writeSettings(&group);
++it;
}
if(_display != 0)
{
KConfigGroup group(config, TQString("Displays/%1").tqarg(_displayName));
KConfigGroup group(config, TQString("Displays/%1").arg(_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").tqarg(id));
KConfigGroup group(kapp->config(), TQString("Catalogs/%1").arg(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").tqarg(_displayName));
KConfigGroup group(kapp->config(), TQString("Displays/%1").arg(_displayName));
_display->readSettings(&group);
}
}

@ -15,7 +15,7 @@
#include <tqtabwidget.h>
#include <tqwidget.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
#include <layout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@ -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

@ -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)
@ -89,8 +89,8 @@ void AmarokCatalog::queryChanged()
queryList = TQStringList::split ( TQString(" "), TQString(queryString).replace(TQChar(':')," ").replace(TQChar('\''), " ").replace(TQChar('\''), "%") );
for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) {
sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").tqarg(*it));
sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it));
sqlQuery.append(TQString(" AND (t.title LIKE '\%%1\%'").arg(*it));
sqlQuery.append(TQString(" OR a.name LIKE '\%%1\%')").arg(*it));
}
sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC");
@ -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;
}
}
@ -163,8 +163,8 @@ void AmarokCatalog::queryChanged()
TQStringList clauses;
for(TQStringList::Iterator it = queryList.begin(); it != queryList.end(); ++it) {
clauses += TQString(" (t.title LIKE '\%%1\%'").tqarg(*it) +
TQString(" OR a.name LIKE '\%%1\%')").tqarg(*it);
clauses += TQString(" (t.title LIKE '\%%1\%'").arg(*it) +
TQString(" OR a.name LIKE '\%%1\%')").arg(*it);
}
sqlQuery.append(clauses.join(TQString(" AND ")));
sqlQuery.append(" ORDER BY a.name, t.title, s.percentage DESC");
@ -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;
}
}
}

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

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -64,7 +64,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>370</height>

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -98,7 +98,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>100</height>

@ -28,7 +28,7 @@
#include <kurl.h>
#include <klocale.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include "calculatorcatalog.h"
#include "expression.h"
@ -150,7 +150,7 @@ void ActionEvaluateExpression::execute(const KatapultItem* item) const
// Copy calculation and result into clipboard (unless there's a parse error).
if (!_expr->parseError()) {
TQClipboard *cb = TQApplication::tqclipboard();
TQClipboard *cb = TQApplication::clipboard();
TQString s = _expr->catalog()->formatString();
s.replace("%1", _expr->text());
s.replace("%2", text());

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

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout13</cstring>
<cstring>layout13</cstring>
</property>
<hbox>
<property name="name">
@ -59,7 +59,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout6</cstring>
<cstring>layout6</cstring>
</property>
<hbox>
<property name="name">
@ -156,7 +156,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout8</cstring>
<cstring>layout8</cstring>
</property>
<hbox>
<property name="name">
@ -200,7 +200,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>40</height>

@ -51,7 +51,7 @@ void ActionOpenDocument::execute(const KatapultItem* item) const
{
if(strcmp(item->className(), "Document") == 0 || strcmp(item->className(), "Directory") == 0) {
const Document *document = (const Document *) item;
qDebug("%s", TQString("Running: %1").tqarg(document->path()).latin1());
qDebug("%s", TQString("Running: %1").arg(document->path()).latin1());
new KRun(document->path());
}
}

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

@ -18,7 +18,7 @@
<vbox>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -66,7 +66,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>410</height>

@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kapplication.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include "execcatalog.h"
#include "command.h"

@ -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
@ -99,7 +99,7 @@ TQWidget * ExecCatalog::configure()
settings->triggerWordLE->setText(_triggerWord);
connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
settings->introLabel->setText(i18n("Use with \"%1 exec query\"").tqarg(_triggerWord));
settings->introLabel->setText(i18n("Use with \"%1 exec query\"").arg(_triggerWord));
return settings;
}

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

@ -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
@ -99,7 +99,7 @@ TQWidget * GoogleCatalog::configure()
settings->triggerWordLE->setText(_triggerWord);
connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
settings->introLabel->setText(i18n("Use with \"%1 search query\"").tqarg(_triggerWord));
settings->introLabel->setText(i18n("Use with \"%1 search query\"").arg(_triggerWord));
return settings;
}

@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <kapplication.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include "googlecatalog.h"
#include "query.h"

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

@ -21,7 +21,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
<cstring>tqlayout1</cstring>
<cstring>layout1</cstring>
</property>
<hbox>
<property name="name">
@ -85,7 +85,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
<property name="tqsizeHint">
<property name="sizeHint">
<size>
<width>20</width>
<height>370</height>

@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <klocale.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include "spellcatalog.h"
#include "spelling.h"

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

@ -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
@ -99,7 +99,7 @@ TQWidget * SpellCatalog::configure()
settings->triggerWordLE->setText(_triggerWord);
connect(settings->triggerWordLE, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(triggerWordChanged(const TQString&)));
settings->introLabel->setText(i18n("Use with \"%1 myword\"").tqarg(_triggerWord));
settings->introLabel->setText(i18n("Use with \"%1 myword\"").arg(_triggerWord));
return settings;
}

@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kapplication.h>
#include <tqclipboard.h>
#include <clipboard.h>
#include "spellcatalog.h"
#include "spelling.h"
@ -125,7 +125,7 @@ void Spelling::evaluate() const
}
void Spelling::copyToClipboard() const {
TQClipboard* clipBoard = TQApplication::tqclipboard();
TQClipboard* clipBoard = TQApplication::clipboard();
clipBoard->setText(suggestedWords, TQClipboard::Clipboard);
clipBoard->setText(suggestedWords, TQClipboard::Selection);
}

Loading…
Cancel
Save