From e7bee19a9f42cffe3a0792348a60e5bee1d3da71 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:58:08 -0600 Subject: Remove additional unneeded tq method conversions (cherry picked from commit 1de96857f5b0ed5d4a36e9486ffc8c7f8c802f98) --- kdict/dict.cpp | 22 +++++++++++----------- kdict/matchview.cpp | 8 ++++---- kdict/matchview.h | 2 +- kdict/options.cpp | 8 ++++---- kdict/options.h | 2 +- kdict/queryview.cpp | 22 +++++++++++----------- kdict/sets.cpp | 8 ++++---- kdict/toplevel.cpp | 20 ++++++++++---------- 8 files changed, 46 insertions(+), 46 deletions(-) (limited to 'kdict') 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("\n

\n"); - resultAppend(i18n("No definitions found for \'%1'.").tqarg(job->query)); + resultAppend(i18n("No definitions found for \'%1'.").arg(job->query)); resultAppend("

\n"); } else { // html header... resultAppend("\n

\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("

\n\n"); TQString lastDb; @@ -591,7 +591,7 @@ void DictAsyncClient::showDbInfo() // html header... resultAppend("\n

\n"); - resultAppend(i18n("Database Information [%1]:").tqarg(job->query)); + resultAppend(i18n("Database Information [%1]:").arg(job->query)); resultAppend("

\n
\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 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("