summaryrefslogtreecommitdiffstats
path: root/kdict
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2011-12-19 11:58:08 -0600
committerTimothy Pearson <[email protected]>2011-12-19 11:58:08 -0600
commit1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98 (patch)
treee24fdc0514249de1233dd5dc07f09d07a35f4269 /kdict
parent089118c18533dfa3e6ce5065dbebdd4db94051f1 (diff)
downloadtdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.tar.gz
tdenetwork-1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kdict')
-rw-r--r--kdict/dict.cpp22
-rw-r--r--kdict/matchview.cpp8
-rw-r--r--kdict/matchview.h2
-rw-r--r--kdict/options.cpp8
-rw-r--r--kdict/options.h2
-rw-r--r--kdict/queryview.cpp22
-rw-r--r--kdict/sets.cpp8
-rw-r--r--kdict/toplevel.cpp20
8 files changed, 46 insertions, 46 deletions
diff --git a/kdict/dict.cpp b/kdict/dict.cpp
index 8e55061c..a58af6f6 100644
--- a/kdict/dict.cpp
+++ b/kdict/dict.cpp
@@ -204,12 +204,12 @@ void DictAsyncClient::define()
job->result = TQString();
if (job->numFetched == 0) {
resultAppend("<body>\n<p class=\"heading\">\n");
- resultAppend(i18n("No definitions found for \'%1'.").tqarg(job->query));
+ resultAppend(i18n("No definitions found for \'%1'.").arg(job->query));
resultAppend("</p>\n</html></body>");
} else {
// html header...
resultAppend("<body>\n<p class=\"heading\">\n");
- resultAppend(i18n("No definitions found for \'%1\'. Perhaps you mean:").tqarg(job->query));
+ resultAppend(i18n("No definitions found for \'%1\'. Perhaps you mean:").arg(job->query));
resultAppend("</p>\n<table width=\"100%\" cols=2>\n");
TQString lastDb;
@@ -591,7 +591,7 @@ void DictAsyncClient::showDbInfo()
// html header...
resultAppend("<body>\n<p class=\"heading\">\n");
- resultAppend(i18n("Database Information [%1]:").tqarg(job->query));
+ resultAppend(i18n("Database Information [%1]:").arg(job->query));
resultAppend("</p>\n<pre><p class=\"definition\">\n");
bool done(false);
@@ -1407,7 +1407,7 @@ void DictInterface::clientDone()
message = i18n("One definition found");
break;
default:
- message = i18n("%1 definitions found").tqarg(job->numFetched);
+ message = i18n("%1 definitions found").arg(job->numFetched);
}
} else {
switch (job->numFetched) {
@@ -1418,7 +1418,7 @@ void DictInterface::clientDone()
message = i18n(" One definition fetched ");
break;
default:
- message = i18n(" %1 definitions fetched ").tqarg(job->numFetched);
+ message = i18n(" %1 definitions fetched ").arg(job->numFetched);
}
}
emit stopped(message);
@@ -1433,7 +1433,7 @@ void DictInterface::clientDone()
message = i18n(" One matching definition found ");
break;
default:
- message = i18n(" %1 matching definitions found ").tqarg(job->numFetched);
+ message = i18n(" %1 matching definitions found ").arg(job->numFetched);
}
emit stopped(message);
emit matchReady(job->matches);
@@ -1451,17 +1451,17 @@ void DictInterface::clientDone()
errMsg += job->result;
break;
case JobData::ErrTimeout:
- errMsg = i18n("A delay occurred which exceeded the\ncurrent timeout limit of %1 seconds.\nYou can modify this limit in the Preferences Dialog.").tqarg(global->timeout);
+ errMsg = i18n("A delay occurred which exceeded the\ncurrent timeout limit of %1 seconds.\nYou can modify this limit in the Preferences Dialog.").arg(global->timeout);
break;
case JobData::ErrBadHost:
- errMsg = i18n("Unable to connect to:\n%1:%2\n\nCannot resolve hostname.").tqarg(job->server).tqarg(job->port);
+ errMsg = i18n("Unable to connect to:\n%1:%2\n\nCannot resolve hostname.").arg(job->server).arg(job->port);
break;
case JobData::ErrConnect:
- errMsg = i18n("Unable to connect to:\n%1:%2\n\n").tqarg(job->server).tqarg(job->port);
+ errMsg = i18n("Unable to connect to:\n%1:%2\n\n").arg(job->server).arg(job->port);
errMsg += job->result;
break;
case JobData::ErrRefused:
- errMsg = i18n("Unable to connect to:\n%1:%2\n\nThe server refused the connection.").tqarg(job->server).tqarg(job->port);
+ errMsg = i18n("Unable to connect to:\n%1:%2\n\nThe server refused the connection.").arg(job->server).arg(job->port);
break;
case JobData::ErrNotAvailable:
errMsg = i18n("The server is temporarily unavailable.");
@@ -1488,7 +1488,7 @@ void DictInterface::clientDone()
errMsg = i18n("No strategies available.");
break;
case JobData::ErrServerError:
- errMsg = i18n("The server sent an unexpected reply:\n\"%1\"\nThis shouldn't happen, please consider\nwriting a bug report").tqarg(job->result);
+ errMsg = i18n("The server sent an unexpected reply:\n\"%1\"\nThis shouldn't happen, please consider\nwriting a bug report").arg(job->result);
break;
case JobData::ErrMsgTooLong:
errMsg = i18n("The server sent a response with a text line\nthat was too long.\n(RFC 2229: max. 1024 characters/6144 octets)");
diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp
index f49a4c7f..7d7ea958 100644
--- a/kdict/matchview.cpp
+++ b/kdict/matchview.cpp
@@ -96,14 +96,14 @@ void MatchViewItem::setOpen(bool o)
}
-void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+void MatchViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
if(command.isEmpty()) {
TQFont font=p->font();
font.setBold(true);
p->setFont(font);
}
- TQListViewItem::paintCell(p,cg,column,width,tqalignment);
+ TQListViewItem::paintCell(p,cg,column,width,alignment);
}
@@ -310,7 +310,7 @@ void MatchView::doGet(TQStringList &defines)
if (defines.count() > 0) {
if (defines.count() > global->maxDefinitions) {
KMessageBox::sorry(global->topLevel,i18n("You have selected %1 definitions,\nbut Kdict will fetch only the first %2 definitions.\nYou can modify this limit in the Preferences Dialog.")
- .tqarg(defines.count()).tqarg(global->maxDefinitions));
+ .arg(defines.count()).arg(global->maxDefinitions));
while (defines.count()>global->maxDefinitions)
defines.pop_back();
}
@@ -368,7 +368,7 @@ void MatchView::newList(const TQStringList &matches)
}
w_list->setUpdatesEnabled(true);
- w_list->tqrepaint();
+ w_list->repaint();
w_list->setFocus();
}
diff --git a/kdict/matchview.h b/kdict/matchview.h
index 5a459e34..3e7e9f7e 100644
--- a/kdict/matchview.h
+++ b/kdict/matchview.h
@@ -35,7 +35,7 @@ public:
~MatchViewItem();
void setOpen(bool o);
- void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
+ void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
TQString command;
TQStringList subEntrys;
diff --git a/kdict/options.cpp b/kdict/options.cpp
index de10606d..efb5f962 100644
--- a/kdict/options.cpp
+++ b/kdict/options.cpp
@@ -104,7 +104,7 @@ void GlobalData::read()
f_onts[Fheadings]=config->readFontEntry("headingsFont",&defFont);
f_ontNames[Fheadings]=i18n("Headings");
- // tqgeometry...
+ // geometry...
config->setGroup("Geometry");
TQSize invalid(-1,-1);
optSize = config->readSizeEntry("Opt_Size",&invalid);
@@ -449,7 +449,7 @@ int OptionsDialog::ColorListItem::width(const TQListBox *lb ) const
OptionsDialog::FontListItem::FontListItem( const TQString &name, const TQFont &font )
: TQListBoxText(name), f_ont(font)
{
- fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize());
+ fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize());
}
@@ -461,7 +461,7 @@ OptionsDialog::FontListItem::~FontListItem()
void OptionsDialog::FontListItem::setFont(const TQFont &font)
{
f_ont = font;
- fontInfo = TQString("[%1 %2]").tqarg(f_ont.family()).tqarg(f_ont.pointSize());
+ fontInfo = TQString("[%1 %2]").arg(f_ont.family()).arg(f_ont.pointSize());
}
@@ -869,7 +869,7 @@ void OptionsDialog::slotColDefaultBtnClicked()
colorItem->setColor(global->defaultColor(i));
}
c_List->triggerUpdate(true);
- c_List->tqrepaint(true);
+ c_List->repaint(true);
}
diff --git a/kdict/options.h b/kdict/options.h
index a1b2745e..1137caf8 100644
--- a/kdict/options.h
+++ b/kdict/options.h
@@ -74,7 +74,7 @@ public:
bool defineClipboard; // define clipboard content on startup?
- TQSize optSize,setsSize,matchSize; // window tqgeometry
+ TQSize optSize,setsSize,matchSize; // window geometry
bool showMatchList;
TQValueList<int> splitterSizes;
diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp
index 3b0cf9e3..81761e2e 100644
--- a/kdict/queryview.cpp
+++ b/kdict/queryview.cpp
@@ -74,7 +74,7 @@ TQFile* SaveHelper::getFile(const TQString &dialogTitle)
if (url.isLocalFile()) {
if (TQFileInfo(url.path()).exists() &&
(KMessageBox::warningContinueCancel(global->topLevel,
- i18n("A file named %1 already exists.\nDo you want to replace it?").tqarg(url.path()),
+ i18n("A file named %1 already exists.\nDo you want to replace it?").arg(url.path()),
dialogTitle, i18n("&Replace")) != KMessageBox::Continue)) {
return 0;
}
@@ -184,11 +184,11 @@ void QueryView::optionsChanged()
saveCurrentResultPos();
currentHTMLHeader = TQString("<html><head><style type=\"text/css\">\n");
- currentHTMLHeader += TQString("body { background-color:%1; color:%2; }\n").tqarg(global->backgroundColor().name()).tqarg(global->textColor().name());
- currentHTMLHeader += TQString("a:link, a:active { color:%1; text-decoration:none; }\n").tqarg(global->linksColor().name());
- currentHTMLHeader += TQString("a:visited { color:%1; text-decoration:none; }\n").tqarg(global->visitedLinksColor().name());
- currentHTMLHeader += TQString("a:hover { color:%1; text-decoration:underline; }\n").tqarg(global->linksColor().name());
- currentHTMLHeader += TQString("p.heading { margin-left:0mm; margin-top:2mm; margin-bottom:2mm; padding:1mm; background-color:%1; color:%2; font-family:%3; font-size:%4pt; ").tqarg(global->headingsBackgroundColor().name()).tqarg(global->headingsTextColor().name()).tqarg(global->headingsFont().family()).tqarg(global->headingsFont().pointSize());
+ currentHTMLHeader += TQString("body { background-color:%1; color:%2; }\n").arg(global->backgroundColor().name()).arg(global->textColor().name());
+ currentHTMLHeader += TQString("a:link, a:active { color:%1; text-decoration:none; }\n").arg(global->linksColor().name());
+ currentHTMLHeader += TQString("a:visited { color:%1; text-decoration:none; }\n").arg(global->visitedLinksColor().name());
+ currentHTMLHeader += TQString("a:hover { color:%1; text-decoration:underline; }\n").arg(global->linksColor().name());
+ currentHTMLHeader += TQString("p.heading { margin-left:0mm; margin-top:2mm; margin-bottom:2mm; padding:1mm; background-color:%1; color:%2; font-family:%3; font-size:%4pt; ").arg(global->headingsBackgroundColor().name()).arg(global->headingsTextColor().name()).arg(global->headingsFont().family()).arg(global->headingsFont().pointSize());
if (global->headingsFont().italic())
currentHTMLHeader += TQString("font-style:italic; ");
if (global->headingsFont().bold())
@@ -196,7 +196,7 @@ void QueryView::optionsChanged()
currentHTMLHeader += TQString("}\n");
currentHTMLHeader += TQString("p.definition { margin-left:1.5mm; margin-top:2mm; margin-bottom:2mm;}\n");
currentHTMLHeader += TQString("table { margin-left:1.5mm; margin-top:2mm; margin-bottom:2mm;}\n");
- currentHTMLHeader += TQString("pre { font-family:%1; font-size:%2pt; ").tqarg(global->textFont().family()).tqarg(global->textFont().pointSize());
+ currentHTMLHeader += TQString("pre { font-family:%1; font-size:%2pt; ").arg(global->textFont().family()).arg(global->textFont().pointSize());
if (global->textFont().italic())
currentHTMLHeader += TQString("font-style:italic; ");
if (global->textFont().bold())
@@ -467,7 +467,7 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
this,TQT_SLOT(browseBack()));
else
rightBtnMenu->insertItem(SmallIcon("back"),
- i18n("&Back: '%1'").tqarg(getShortString(browseList.at(browsePos-1)->queryText,25)),
+ i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25)),
this,TQT_SLOT(browseBack()));
} else {
ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQT_SLOT(browseBack()));
@@ -481,7 +481,7 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point)
this,TQT_SLOT(browseForward()));
else
rightBtnMenu->insertItem(SmallIcon("forward"),
- i18n("&Forward: '%1'").tqarg(getShortString(browseList.at(browsePos+1)->queryText,25)),
+ i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25)),
this,TQT_SLOT(browseForward()));
} else {
ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQT_SLOT(browseForward()));
@@ -569,7 +569,7 @@ void QueryView::updateBrowseActions()
if (browseList.at(browsePos-1)->queryText.isEmpty())
actBack->setText(i18n("&Back: Information"));
else
- actBack->setText(i18n("&Back: '%1'").tqarg(getShortString(browseList.at(browsePos-1)->queryText,25)));
+ actBack->setText(i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25)));
actBack->popupMenu()->clear();
int i = browsePos-1;
@@ -593,7 +593,7 @@ void QueryView::updateBrowseActions()
if (browseList.at(browsePos+1)->queryText.isEmpty())
actForward->setText(i18n("&Forward: Information"));
else
- actForward->setText(i18n("&Forward: '%1'").tqarg(getShortString(browseList.at(browsePos+1)->queryText,25)));
+ actForward->setText(i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25)));
actForward->popupMenu()->clear();
int i = browsePos+1;
diff --git a/kdict/sets.cpp b/kdict/sets.cpp
index 3f043233..51dd7eb6 100644
--- a/kdict/sets.cpp
+++ b/kdict/sets.cpp
@@ -264,8 +264,8 @@ void DbSetsDialog::activateSet(int num)
w_set->clearEdit();
w_delete->setEnabled(false);
w_save->setEnabled(false);
- w_rightBox->tqrepaint(true); // Workaround for tqrepaint-bug
- w_leftBox->tqrepaint(true); // Workaround for tqrepaint-bug
+ w_rightBox->repaint(true); // Workaround for repaint-bug
+ w_leftBox->repaint(true); // Workaround for repaint-bug
} else {
w_set->setCurrentItem(num);
for (unsigned int i=0;i<global->serverDatabases.count();i++)
@@ -278,9 +278,9 @@ void DbSetsDialog::activateSet(int num)
w_delete->setEnabled(true);
w_save->setEnabled(true);
if (w_rightBox->count()==0)
- w_rightBox->tqrepaint(true); // Workaround for tqrepaint-bug
+ w_rightBox->repaint(true); // Workaround for repaint-bug
if (w_leftBox->count()==0)
- w_leftBox->tqrepaint(true); // Workaround for tqrepaint-bug
+ w_leftBox->repaint(true); // Workaround for repaint-bug
w_leftBox->clearSelection();
w_leftBox->centerCurrentItem();
w_rightBox->clearSelection();
diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp
index fb19461f..27211085 100644
--- a/kdict/toplevel.cpp
+++ b/kdict/toplevel.cpp
@@ -394,12 +394,12 @@ void TopLevel::setupStatusBar()
TQString serverInfo;
if (global->authEnabled)
- serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50))
- .tqarg(getShortString(global->server,50))
- .tqarg(global->port);
+ serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50))
+ .arg(getShortString(global->server,50))
+ .arg(global->port);
else
- serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50))
- .tqarg(global->port);
+ serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50))
+ .arg(global->port);
statusBar()->insertItem(serverInfo, 1,3);
statusBar()->setItemAlignment(1,AlignLeft | AlignVCenter);
}
@@ -746,12 +746,12 @@ void TopLevel::optionsChanged()
{
TQString serverInfo;
if (global->authEnabled)
- serverInfo = TQString(" %1@%2:%3 ").tqarg(getShortString(global->user,50))
- .tqarg(getShortString(global->server,50))
- .tqarg(global->port);
+ serverInfo = TQString(" %1@%2:%3 ").arg(getShortString(global->user,50))
+ .arg(getShortString(global->server,50))
+ .arg(global->port);
else
- serverInfo = TQString(" %1:%3 ").tqarg(getShortString(global->server,50))
- .tqarg(global->port);
+ serverInfo = TQString(" %1:%3 ").arg(getShortString(global->server,50))
+ .arg(global->port);
statusBar()->changeItem(serverInfo,1);
interface->serverChanged(); // inform client
queryView->optionsChanged(); // inform html-view
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-03 22:47:15 +0000