Remove additional unneeded tq method conversions

8 files changed, 32 insertions, 32 deletions

diff --git a/kanagram/data/fruits.kvtml b/kanagram/data/fruits.kvtml
index 22c838a8..60a8881a 100644
--- a/kanagram/data/fruits.kvtml
+++ b/kanagram/data/fruits.kvtml
@@ -93,7 +93,7 @@ Valid xml means:
   <o r="Large yellow citrus fruit with acidic, juicy pulp" >grapefruit</o>
  </e>
  <e>
-  <o r="Fuzzy brown egg-tqshaped fruit with slightly green flesh" >kiwi</o>
+  <o r="Fuzzy brown egg-shaped fruit with slightly green flesh" >kiwi</o>
  </e>
  <e>
   <o r="Yellow oval fruit with juicy acidic flesh" >lemon</o>
@@ -117,7 +117,7 @@ Valid xml means:
   <o r="Juicy fruit with sweet yellowish flesh" >peach</o>
  </e>
  <e>
-  <o r="Small, bell-tqshaped juicy, gritty-textured fruit" >pear</o>
+  <o r="Small, bell-shaped juicy, gritty-textured fruit" >pear</o>
  </e>
  <e>
   <o r="Resembling a pine cone, with a tangy sweet taste" >pineapple</o>
diff --git a/kanagram/data/space.kvtml b/kanagram/data/space.kvtml
index 8c86acf9..97f6b813 100644
--- a/kanagram/data/space.kvtml
+++ b/kanagram/data/space.kvtml
@@ -78,7 +78,7 @@ Valid xml means:
   <o r="Medium-sized icy object orbiting the Sun" >comet</o>
  </e>
  <e>
-  <o r="Grouping of stars which can form a tqshape or pattern" >constellation</o>
+  <o r="Grouping of stars which can form a shape or pattern" >constellation</o>
  </e>
  <e>
   <o r="Person from Russia who travels into space" >cosmonaut</o>
diff --git a/kanagram/data/vegetables.kvtml b/kanagram/data/vegetables.kvtml
index 4c2bdb9f..b3356f3f 100644
--- a/kanagram/data/vegetables.kvtml
+++ b/kanagram/data/vegetables.kvtml
@@ -84,7 +84,7 @@ Valid xml means:
   <o r="Also known as garbanzo beans, with a nut-like flavor" >chickpeas</o>
  </e>
  <e>
-  <o r="Long, green, cylinder-tqshaped vegetable" >cucumber</o>
+  <o r="Long, green, cylinder-shaped vegetable" >cucumber</o>
  </e>
  <e>
   <o r="A bulb made up of sections of cloves" >garlic</o>
diff --git a/kanagram/src/kanagram.cpp b/kanagram/src/kanagram.cpp
index 4a6f8787..bc3c8f21 100644
--- a/kanagram/src/kanagram.cpp
+++ b/kanagram/src/kanagram.cpp
@@ -225,7 +225,7 @@ void Kanagram::paintEvent(TQPaintEvent *)
 	p.setPen(TQPen(black, 3));
 
 	//Draw the border of the input box
-	TQRect borderRect = m_inputBox->tqgeometry();
+	TQRect borderRect = m_inputBox->geometry();
 	borderRect.setLeft(borderRect.left() - 2);
 	borderRect.setTop(borderRect.top() - 2);
 	borderRect.setWidth(borderRect.width() + 2 * 1);
diff --git a/kanagram/src/kanagramgame.cpp b/kanagram/src/kanagramgame.cpp
index 207e607b..67212168 100644
--- a/kanagram/src/kanagramgame.cpp
+++ b/kanagram/src/kanagramgame.cpp
@@ -48,7 +48,7 @@ void KanagramGame::checkFile()
 {
 	if (!TQFile::exists(locate("appdata", m_filename))) {
 	        TQString msg = i18n("File %1 cannot be found.\n Please ensure that Kanagram is properly installed.")
-		  .tqarg(m_filename);
+		  .arg(m_filename);
 		KMessageBox::sorry(m_parent, msg, i18n("Error"));
 		exit(0);
 	}
diff --git a/kanagram/src/keduvocdocument.cpp b/kanagram/src/keduvocdocument.cpp
index 0354b522..6d4eeaea 100644
--- a/kanagram/src/keduvocdocument.cpp
+++ b/kanagram/src/keduvocdocument.cpp
@@ -107,7 +107,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
     TQFile f(tmpfile);
     if (!f.open(IO_ReadOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").tqarg(url.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot open file<br><b>%1</b></qt>").arg(url.path()));
       return false;
     }
 
@@ -163,7 +163,7 @@ bool KEduVocDocument::open(const KURL& url, bool /*append*/)
         // TODO new readers provide an explicite error message
         // the two messages should be merged
         TQString format = i18n("Could not load \"%1\"\nDo you want to try again?");
-        TQString msg = format.tqarg(url.path());
+        TQString msg = format.arg(url.path());
         int result = KMessageBox::warningContinueCancel(0, msg,
                                                         kapp->makeStdCaption(i18n("I/O Failure")),
                                                         i18n("&Retry"));
@@ -211,7 +211,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
 
     if (!f.open(IO_WriteOnly))
     {
-      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").tqarg(tmp.path()));
+      KMessageBox::error(0, i18n("<qt>Cannot write to file<br><b>%1</b></qt>").arg(tmp.path()));
       return false;
     }
 
@@ -253,7 +253,7 @@ bool KEduVocDocument::saveAs(TQObject * /*parent*/, const KURL & url, FileType f
       // TODO new writers provide an explicite error message
       // the two messages should be merged
       TQString format = i18n("Could not save \"%1\"\nDo you want to try again?");
-      TQString msg = format.tqarg(tmp.path());
+      TQString msg = format.arg(tmp.path());
       int result = KMessageBox::warningContinueCancel(0, msg,
                                                       kapp->makeStdCaption(i18n("I/O Failure")),
                                                       i18n("&Retry"));
@@ -989,7 +989,7 @@ KEduVocDocument::FileType KEduVocDocument::detectFT(const TQString &filename)
    line.insert (0, c1);
    f.close();
 
-   bool stat = is.tqdevice()->status();
+   bool stat = is.device()->status();
    if (stat != IO_Ok)
      return kvd_none;
    if (c1 == '<' && c2 == '?' && c3 == 'x' && c4 == 'm' && c5 == 'l')
diff --git a/kanagram/src/keduvockvtmlreader.cpp b/kanagram/src/keduvockvtmlreader.cpp
index 44a4772d..80ee39c6 100644
--- a/kanagram/src/keduvockvtmlreader.cpp
+++ b/kanagram/src/keduvockvtmlreader.cpp
@@ -131,7 +131,7 @@ bool KEduVocKvtmlReader::readArticle(TQDomElement &domElementParent)
   {
     if (domElementEntry.tagName() != KV_ART_ENTRY)
     {
-      domError(i18n("expected tag <%1>").tqarg(KV_ART_ENTRY));
+      domError(i18n("expected tag <%1>").arg(KV_ART_ENTRY));
       return false;
     }
 
@@ -1059,7 +1059,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
   if (domElementExpressionChild.tagName() != KV_ORG)
   {
     // must be preceded by "original"
-    domError(i18n("starting tag <%1> is missing").tqarg(KV_ORG));
+    domError(i18n("starting tag <%1> is missing").arg(KV_ORG));
     return false;
   }
 
@@ -1139,7 +1139,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bConjug)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
         return false;
       }
       bConjug = true;
@@ -1152,7 +1152,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bComparison)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
         return false;
       }
       bComparison = true;
@@ -1165,7 +1165,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     {
       if (bMultipleChoice)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
         return false;
       }
       bMultipleChoice = true;
@@ -1236,7 +1236,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
     if (domElementExpressionChild.tagName() != KV_TRANS)
     {
       // "original" must be followed by "translations"
-      domError(i18n("starting tag <%1> is missing").tqarg(KV_TRANS));
+      domError(i18n("starting tag <%1> is missing").arg(KV_TRANS));
       return false;
     }
 
@@ -1317,7 +1317,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bConjug)
         {
-          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
           return false;
         }
         bConjug = true;
@@ -1330,7 +1330,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bComparison)
         {
-          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
           return false;
         }
         bComparison = true;
@@ -1343,7 +1343,7 @@ bool KEduVocKvtmlReader::readExpression(TQDomElement &domElementParent)
       {
         if (bMultipleChoice)
         {
-          domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementOriginalChild.tagName()));
+          domError(i18n("repeated occurrence of tag <%1>").arg(domElementOriginalChild.tagName()));
           return false;
         }
         bMultipleChoice = true;
@@ -1456,7 +1456,7 @@ if (lines != 0)
     {
       if (lessgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       lessgroup = true;
@@ -1468,7 +1468,7 @@ if (lines != 0)
     {
       if (articlegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       articlegroup = true;
@@ -1480,7 +1480,7 @@ if (lines != 0)
     {
       if (conjuggroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       conjuggroup = true;
@@ -1492,7 +1492,7 @@ if (lines != 0)
     {
       if (optgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       optgroup = true;
@@ -1504,7 +1504,7 @@ if (lines != 0)
     {
       if (attrgroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       attrgroup = true;
@@ -1516,7 +1516,7 @@ if (lines != 0)
     {
       if (tensegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       tensegroup = true;
@@ -1528,7 +1528,7 @@ if (lines != 0)
     {
       if (usagegroup)
       {
-        domError(i18n("repeated occurrence of tag <%1>").tqarg(domElementChild.tagName()));
+        domError(i18n("repeated occurrence of tag <%1>").arg(domElementChild.tagName()));
         return false;
       }
       usagegroup = true;
@@ -1590,7 +1590,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
   if( domElementKvtml.tagName() != KV_DOCTYPE )
   {
     domError(i18n("Tag <%1> was expected "
-            "but tag <%2> was read." ).tqarg(KV_DOCTYPE).tqarg(domElementKvtml.tagName()));
+            "but tag <%2> was read." ).arg(KV_DOCTYPE).arg(domElementKvtml.tagName()));
     return false;
   }
 
@@ -1667,7 +1667,7 @@ bool KEduVocKvtmlReader::readDoc(KEduVocDocument *doc)
 
 void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
 {
-  TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
 
   TQString format = i18n(
       "Your document contains an unknown tag <%1>.  "  // keep trailing space
@@ -1676,7 +1676,7 @@ void KEduVocKvtmlReader::domErrorUnknownElement(const TQString &elem)
       "Loading is aborted because KVocTrain cannot "
       "read documents with unknown elements.\n"
      );
-  TQString msg = format.tqarg(elem);
+  TQString msg = format.arg(elem);
   TQApplication::setOverrideCursor( arrowCursor, true );
   TQString s = kapp->makeStdCaption(i18n("Unknown Element"));
   KMessageBox::sorry(0, ln+msg, s);
@@ -1687,7 +1687,7 @@ void KEduVocKvtmlReader::domError(const TQString &text )
 {
   TQApplication::setOverrideCursor( arrowCursor, true );
   TQString s = kapp->makeStdCaption(i18n("Error"));
-  TQString ln = i18n("File:\t%1\n").tqarg(m_doc->URL().path());
+  TQString ln = i18n("File:\t%1\n").arg(m_doc->URL().path());
   TQString msg = text;
   KMessageBox::error(0, ln+msg, s);
   TQApplication::restoreOverrideCursor();
diff --git a/kanagram/src/leitnersystemview.cpp b/kanagram/src/leitnersystemview.cpp
index 1b8fc961..cbbb0400 100644
--- a/kanagram/src/leitnersystemview.cpp
+++ b/kanagram/src/leitnersystemview.cpp
@@ -116,7 +116,7 @@ void LeitnerSystemView::setSystem(LeitnerSystem* leitnersystem)
 	//calculate the new sizes
 	calculateSize();
 	updateContents();
-	//tqrepaint
+	//repaint
 	//update();
 	//TQPainter* p = new TQPainter(this);
 	//drawContents( p, 0, 0, 0, 0 );