Remove additional unneeded tq method conversions

11 files changed, 69 insertions, 69 deletions

diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 11d8434a..5775c3b1 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -137,7 +137,7 @@ void ContextView::updateView()
 		temp = "";
 		for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i)
 		{
-		    temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i);
+		    temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i);
 		}
 	    }
             temp = TQStyleSheet::convertFromPlainText(temp);
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 553724bc..62275cdd 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -108,7 +108,7 @@ bool HeaderEditor::isModified()
 
 void HeaderEditor::readHeader(bool readOnly)
 {
-   setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL()));
+   setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL()));
 
    _editor->headerEdit->setReadOnly(readOnly);
    _editor->commentEdit->setReadOnly(readOnly);
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index 3d0b128a..a3dcb3c3 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals )
   MsgMultiLineEdit* pl;
   for(uint i=0 ; i< _numberOfPlurals ; i++)
   {
-     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit());
+     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit());
      _allEdits.append(pl);
-     _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1));
+     _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1));
      if( _eventFilter )
         pl->installEventFilter(_eventFilter);
   }
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index c12a8e41..efdde668 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile)
     
     if ( _project == NULL ) // FIXME should not happen anymore
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
 
     if ( _project == NULL )
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog)
                    "The minimum requirement is to fill out the Identity page.\n"
                    "Also check the encoding on the Save page, which is currently "
                    "set to %1. You may want to change this setting "
-                   "according to the settings of your language team.").tqarg(encodingStr));
+                   "according to the settings of your language team.").arg(encodingStr));
 
       TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
     }
@@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar()
 
     statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY);
 
-    statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1)
+    statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1)
             ,ID_STATUS_CURSOR);
 
     TQHBox* progressBox = new TQHBox(statusBar(),"progressBox");
@@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag)
 
 void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos)
 {
-   statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT);
+   statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT);
   _currentIndex = pos.item;
 }
 
 void KBabelMW::setNumberOfTotal(uint number)
 {
-   statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL);
+   statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL);
 }
 
 void KBabelMW::setNumberOfFuzzies(uint number)
 {
-   statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY);
+   statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY);
 }
 
 void KBabelMW::setNumberOfUntranslated(uint number)
 {
-   statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS);
+   statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS);
 }
 
 void KBabelMW::hasFuzzyAfterwards(bool flag)
@@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp()
     if(!error.isEmpty())
     {
         KMessageBox::sorry(this,i18n("An error occurred while "
-                "trying to open the gettext info page:\n%1").tqarg(error));
+                "trying to open the gettext info page:\n%1").arg(error));
     }
 }
 
@@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus()
 
 void KBabelMW::updateCursorPosition(int line, int col)
 {
-    statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1)
+    statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1)
             ,ID_STATUS_CURSOR);
 }
 
@@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file)
     }
     else 
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
 	m_view->useProject(_project);
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 143aff02..848d506f 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -53,7 +53,7 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set tqgeometry, with support for Xinerama systems
+  // Set geometry, with support for Xinerama systems
   TQRect r;
   r.setSize(sizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index b4bba709..de30b6ce 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -328,7 +328,7 @@ void KBabelView::initDockWidgets()
 "and the behavior of KBabel and to Stephan Kulow, who always\n"
 "lends me a helping hand.\n\n"
 "Many good ideas, especially for the Catalog Manager, are taken\n"
-"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006));
+"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006));
 
     TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
 
@@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project)
    {
     // turn off spellchecker
     msgstrEdit->setSpellChecker(0);
-    // tqinvalidate the current settings, to make sure they are updated when needed
+    // invalidate the current settings, to make sure they are updated when needed
     _spellcheckSettings.valid = false;
    }
 
@@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           {
               KMessageBox::error(this
                  ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(url.prettyURL()));
               break;
           }
           case NO_ENTRY_ERROR:
           {
               KMessageBox::error(this
                   ,i18n("Error while reading the file:\n %1\n"
-                  "No entry found.").tqarg(url.prettyURL()));
+                  "No entry found.").arg(url.prettyURL()));
               break;
           }
           case RECOVERED_PARSE_ERROR:
@@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           case NO_PERMISSIONS:
           {
              KMessageBox::error(this,i18n(
-               "You do not have permissions to read file:\n %1").tqarg(url.prettyURL()));
+               "You do not have permissions to read file:\n %1").arg(url.prettyURL()));
              break;
           }
           case NO_FILE:
           {
              KMessageBox::error(this,i18n(
-                 "You have not specified a valid file:\n %1").tqarg(url.prettyURL()));
+                 "You have not specified a valid file:\n %1").arg(url.prettyURL()));
              break;
           }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
              break;
 	  }
 	  case STOPPED:
@@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           default:
           {
              KMessageBox::error(this,i18n(
-                  "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
+                  "Error while trying to open file:\n %1").arg(url.prettyURL()));
              break;
           }
 
@@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                 KMessageBox::sorry(this,
                     i18n("There was an error while reading the file header of file:\n %1")
-                    .tqarg(openURL.prettyURL()));
+                    .arg(openURL.prettyURL()));
                 break;
            }
            case PARSE_ERROR:
            {
                KMessageBox::error(this
                        ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL()));
+                       "Maybe it is not a valid PO file.").arg(openURL.prettyURL()));
                break;
            }
            case NO_ENTRY_ERROR:
            {
                KMessageBox::error(this
                     ,i18n("Error while reading the file:\n %1\n"
-                       "No entry found.").tqarg(openURL.prettyURL()));
+                       "No entry found.").arg(openURL.prettyURL()));
                break;
            }
            case RECOVERED_PARSE_ERROR:
@@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                KMessageBox::sorry(this,
                    i18n("Minor syntax errors were found while reading file:\n %1")
-                   .tqarg(openURL.prettyURL()));
+                   .arg(openURL.prettyURL()));
                break;
 	  }
 	  case NO_PERMISSIONS:
 	  {
-	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL()));
 	      break;
 	  }
 	  case NO_FILE:
 	  {
-	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL()));
              break;
 	  }
           case STOPPED:
             break;
 	  default:
 	  {
-	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL()));
+	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL()));
 	     break;
 	  }
 
@@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("You do not have permission to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
 	 case NO_PLUGIN:
 	 {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case UNSUPPORTED_TYPE:
 	 {
              KMessageBox::error(this,i18n(
-                 "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
+                 "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case BUSY:
@@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("An error occurred while trying to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
@@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    if (KIO::NetAccess::exists(url, false, this))
    {
-       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
-						       "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
+						       "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
       {
 	 return false;
       }
@@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 	      case NO_PERMISSIONS:
 	      {
 		  message=i18n("You do not have permission to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_FILE:
 	      {
 		 message=i18n("You have specified a folder:\n%1\n"
-			      "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			      "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		 break;
 	      }
 	      case NO_PLUGIN:
 	      {
-	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL());
+	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      case UNSUPPORTED_TYPE:
 	      {
                  message=i18n(
-                    "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL());
+                    "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL());
                  break;
 	      }
 	      default:
 	      {
 		  message=i18n("An error occurred while trying to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
 		  break;
 	      }
 	  }
@@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 		if (KIO::NetAccess::exists(url, false, this))
 		{
 		    if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
-								    "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
+								    "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
 		   {
 		      stat=_catalog->saveFileAs(url);
 		      if(stat!=OK)
@@ -1835,11 +1835,11 @@ void KBabelView::updateEditor(int form, bool delay)
    }
 
    msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
-   msgidLabel->tqrepaint();
+   msgidLabel->repaint();
 
    msgstrEdit->setText(_catalog->msgstr(_currentIndex));
    msgstrEdit->showForm( form );
-   msgstrEdit->tqrepaint();
+   msgstrEdit->repaint();
    m_cataloglistview->setSelectedItem(_currentIndex);
 
    if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
@@ -3599,7 +3599,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 	    }
 
 	    //i18n: translators: Status bar text that automatic checks have found some errors
-	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
+	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg));
 	    emit signalFaultyDisplayed(true);
 
 	    if(KBabelSettings::autoCheckColorError())
@@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *)
 				KMessageBox::sorry(this,
 				            i18n("Error opening the file that contains words "
 				            "to ignore during spell checking:\n"
-							"%1").tqarg(file.name()));
+							"%1").arg(file.name()));
 			}
 		}
 		else
@@ -4012,7 +4012,7 @@ void KBabelView::spellStart(KSpell *)
 			KMessageBox::sorry(this,
 			            i18n("Only local files are allowed for saving "
 			                 "ignored words to during spell checking:\n"
-							 "%1").tqarg(urlString));
+							 "%1").arg(urlString));
 		}
 
 		if(spell.ignoreList.count() > 0)
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index a5ba1df4..34b9dc5b 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf)
     	            KMessageBox::sorry(this
         	        ,i18n("An error occurred while trying to get the list "
                         "of messages for this file from the database:\n"
-                        "%1").tqarg(error));
+                        "%1").arg(error));
 
             	    _diffing=false;
                     _diffEnabled=false;
@@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff)
             {
                 KMessageBox::sorry(this
                     ,i18n("Error while trying to read file:\n %1\n"
-                   "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
+                   "Maybe it is not a valid PO file.").arg(url.prettyURL()));
                 break;
             }
             case NO_PERMISSIONS:
             {
                 KMessageBox::sorry(this,i18n(
                 "You do not have permissions to read file:\n %1")
-                        .tqarg(url.prettyURL()));
+                        .arg(url.prettyURL()));
                 break;
             }
             case NO_FILE:
             {
                  KMessageBox::sorry(this,i18n(
                  "You have not specified a valid file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                 break;
             }
 	    case NO_PLUGIN:
 	    {
 	         KMessageBox::error(this,i18n(
-	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
+	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
 	         break;
 	    }
 	    case UNSUPPORTED_TYPE:
 	    {
 	          KMessageBox::error(this,i18n(
-	               "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
+	               "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
                   break;
 	    }
             default:
             {
                  KMessageBox::sorry(this,i18n(
                   "Error while trying to open file:\n %1")
-                         .tqarg(url.prettyURL()));
+                         .arg(url.prettyURL()));
                  break;
             }
 
@@ -1020,6 +1020,6 @@ void KBabelView::wordCount()
     KMessageBox::information( this
 	, i18n("Total words: %1\n\n"
 "Words in untranslated messages: %2\n\n"
-"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy)
+"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy)
 	, i18n("Word Count") );
 }
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index d9f080cb..488a4281 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b)
 
   // if it's okay then add the bookmark
   _list.append(b);
-  _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()),
+  _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()),
     this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex());
 }
 
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index dd14221c..4bbc3049 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st)
 {
     m_msgid = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 void KBCatalogListViewItem::setMsgStr(const TQString& st)
 {
     m_msgstr = st;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 uint KBCatalogListViewItem::getId()
@@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id)
 {
     m_id = id;
     setup();
-    tqrepaint();
+    repaint();
 }
 
 TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index 7b2155eb..1a6721a6 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -885,7 +885,7 @@ void MsgMultiLineEdit::setFont(const TQFont& font)
    _wsOffsetX = TQMAX(fm.width(' ')/2-2,1);
    _wsOffsetY = TQMAX(fm.height()/2-1,0);
    
-   tqrepaint();
+   repaint();
 }
 
 void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut)
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
             int i = s.find( " " );
             while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
             {
-                TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
+                TQPixmap* pm = ( s.at(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
                 TQRect r = mapToView( curpara, i );
                 r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
                 r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
@@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints()
     }
 }
 
-void MsgMultiLineEdit::tqrepaint()
+void MsgMultiLineEdit::repaint()
 {
     highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::forceUpdate()
@@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate()
     _firstChangedLine=0;
     _lastChangedLine=paragraphs()-1;
     highlighter->highlight();
-    MyMultiLineEdit::tqrepaint();
+    MyMultiLineEdit::repaint();
 }
 
 void MsgMultiLineEdit::ensureCursorVisible()
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index 272878da..ba6a96e6 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -229,7 +229,7 @@ public slots:
    /**
    *  reimplemented to call highlight()
    */
-   void tqrepaint(); 
+   void repaint(); 
    void forceUpdate();
    void emittedTextChanged();