Revert automated changes

Sorry guys, they are just not ready for prime time Work will continue as always git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
14 years ago · fd3a982e26
parent 02f67d0e13
commit fd3a982e26
1248 changed files with 8583 additions and 8583 deletions
--- a/applnk/kde-utilities-xutils.directory
+++ b/applnk/kde-utilities-xutils.directory
@ -29,7 +29,7 @@ Name[gl]=Utilidades das X
 Name[he]=כלי X
 Name[hi]=एक्स-यूटिलिटीज़
 Name[hr]=X-alati
-Name[hsb]=Potqmocniki za X
+Name[hsb]=Pomocniki za X
 Name[hu]=X segédprogramok
 Name[is]=X Tól
 Name[it]=Programmi di X
@ -112,7 +112,7 @@ Comment[gl]=Utilidades das X Window
 Comment[he]=כלים של X Window
 Comment[hi]=एक्स विंडो यूटिलिटीज़
 Comment[hr]=Alati X prozora
-Comment[hsb]=Potqmocne programy za X11
+Comment[hsb]=Pomocne programy za X11
 Comment[hu]=X Window segédprogramok
 Comment[is]=X gluggatól
 Comment[it]=Programmi di X Window
--- a/applnk/kde-utilities.directory
+++ b/applnk/kde-utilities.directory
@ -31,7 +31,7 @@ Name[gl]=Utilidades
 Name[he]=כלים
 Name[hi]=यूटिलिटीज़
 Name[hr]=Alati
-Name[hsb]=Potqmocniki
+Name[hsb]=Pomocniki
 Name[hu]=Segédprogramok
 Name[is]=Nytjatól
 Name[it]=Accessori
@ -115,7 +115,7 @@ Comment[gl]=Utilidades
 Comment[he]=כלים
 Comment[hi]=यूटिलिटीज़
 Comment[hr]=Alati
-Comment[hsb]=Potqmocne programy
+Comment[hsb]=Pomocne programy
 Comment[hu]=Segédprogramok
 Comment[is]=Ýmis nytsamleg áhöld
 Comment[it]=Accessori
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@ -137,7 +137,7 @@ bool BackTrace::usefulBacktrace()
 {
  // remove crap
  if( !m_krashconf->removeFromBacktraceRegExp().isEmpty())
-    m_strBt.tqreplace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);
+    m_strBt.replace(TQRegExp( m_krashconf->removeFromBacktraceRegExp()), TQString::null);

  if( m_krashconf->disableChecks())
      return true;
@ -146,13 +146,13 @@ bool BackTrace::usefulBacktrace()
  // how many " ?? " in the bt ?
  int unknown = 0;
  if( !m_krashconf->invalidStackFrameRegExp().isEmpty())
-    unknown = strBt.tqcontains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
+    unknown = strBt.contains( TQRegExp( m_krashconf->invalidStackFrameRegExp()));
  // how many stack frames in the bt ?
  int frames = 0;
  if( !m_krashconf->frameRegExp().isEmpty())
-    frames = strBt.tqcontains( TQRegExp( m_krashconf->frameRegExp()));
+    frames = strBt.contains( TQRegExp( m_krashconf->frameRegExp()));
  else
-    frames = strBt.tqcontains('\n');
+    frames = strBt.contains('\n');
  bool tooShort = false;
  if( !m_krashconf->neededInValidBacktraceRegExp().isEmpty())
    tooShort = ( strBt.find( TQRegExp( m_krashconf->neededInValidBacktraceRegExp())) == -1 );
@ -175,7 +175,7 @@ void BackTrace::processBacktrace()
        --len;
        }
      m_strBt.remove( pos, len );
-      m_strBt.insert( pos, TQString::tqfromLatin1( "[KCrash handler]\n" ));
+      m_strBt.insert( pos, TQString::fromLatin1( "[KCrash handler]\n" ));
      }
    }
 }
--- a/drkonqi/backtrace.h
+++ b/drkonqi/backtrace.h
@ -49,7 +49,7 @@ signals:
  void append(const TQString &str); // Just the new text

  void someError();
-  void done(const TQString &); // tqreplaces whole text
+  void done(const TQString &); // replaces whole text

 protected slots:
  void slotProcessExited(KProcess * proc);
--- a/drkonqi/debugger.cpp
+++ b/drkonqi/debugger.cpp
@ -60,9 +60,9 @@ KrashDebugger :: KrashDebugger (const KrashConfig *krashconf, TQWidget *parent,
  TQWidget *w = new TQWidget( this );
  ( new TQHBoxLayout( w, 0, KDialog::marginHint() ) )->setAutoAdd( true );
  m_status = new TQLabel( w );
-  m_status->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+  m_status->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
  //m_copyButton = new KPushButton( KStdGuiItem::copy(), w );
-  KGuiItem item( i18n( "C&opy" ), TQString::tqfromLatin1( "editcopy" ) );
+  KGuiItem item( i18n( "C&opy" ), TQString::fromLatin1( "editcopy" ) );
  m_copyButton = new KPushButton( item, w );
  connect( m_copyButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) );
  m_copyButton->setEnabled( false );
@ -82,7 +82,7 @@ void KrashDebugger :: slotDone(const TQString& str)
  m_status->setText(i18n("Done."));
  m_copyButton->setEnabled( true );
  m_saveButton->setEnabled( true );
-  m_backtrace->setText( m_prependText + str ); // tqreplace with possibly post-processed backtrace
+  m_backtrace->setText( m_prependText + str ); // replace with possibly post-processed backtrace
 }

 void KrashDebugger :: slotCopy()
@ -109,8 +109,8 @@ void KrashDebugger :: slotSave()
  }
  else
  {
-    TQString defname = m_krashconf->execName() + TQString::tqfromLatin1( ".kcrash" );
-    if( defname.tqcontains( '/' ))
+    TQString defname = m_krashconf->execName() + TQString::fromLatin1( ".kcrash" );
+    if( defname.contains( '/' ))
        defname = defname.mid( defname.findRev( '/' ) + 1 );
    TQString filename = KFileDialog::getSaveFileName(defname, TQString::null, this, i18n("Select Filename"));
    if (!filename.isEmpty())
@ -208,7 +208,7 @@ void KrashDebugger :: startDebugger()
 bool KrashDebugger::performChecks( TQString* msg )
 {
  bool ret = true;
-  KConfig kdedcfg( TQString::tqfromLatin1( "kdedrc" ), true );
+  KConfig kdedcfg( TQString::fromLatin1( "kdedrc" ), true );
  kdedcfg.setGroup( "General" );
  if( kdedcfg.readBoolEntry( "DelayedCheck", false ))
  {
--- a/drkonqi/krashconf.cpp
+++ b/drkonqi/krashconf.cpp
@ -93,12 +93,12 @@ void KrashConfig :: readConfig()

  // maybe we should check if it's relative?
  TQString configname = config->readEntry("ConfigName",
-                                         TQString::tqfromLatin1("enduser"));
+                                         TQString::fromLatin1("enduser"));

  TQString debuggername = config->readEntry("Debugger",
-                                           TQString::tqfromLatin1("gdb"));
+                                           TQString::fromLatin1("gdb"));

-  KConfig debuggers(TQString::tqfromLatin1("debuggers/%1rc").arg(debuggername),
+  KConfig debuggers(TQString::fromLatin1("debuggers/%1rc").arg(debuggername),
                    true, false, "appdata");

  debuggers.setGroup("General");
@ -112,7 +112,7 @@ void KrashConfig :: readConfig()
  m_neededInValidBacktraceRegExp = debuggers.readEntry("NeededInValidBacktraceRegExp");
  m_kcrashRegExp = debuggers.readEntry("KCrashRegExp");

-  KConfig preset(TQString::tqfromLatin1("presets/%1rc").arg(configname),
+  KConfig preset(TQString::fromLatin1("presets/%1rc").arg(configname),
                 true, false, "appdata");

  preset.setGroup("ErrorDescription");
@ -138,24 +138,24 @@ void KrashConfig :: readConfig()
  TQString str = TQString::number(m_signalnum);
  // use group unknown if signal not found
  if (!preset.hasGroup(str))
-    str = TQString::tqfromLatin1("unknown");
+    str = TQString::fromLatin1("unknown");
  preset.setGroup(str);
  m_signalName = preset.readEntry("Name");
  if (b)
    m_signalText = preset.readEntry("Comment");
 }

-// tqreplace some of the strings
+// replace some of the strings
 void KrashConfig :: expandString(TQString &str, bool shell, const TQString &tempFile) const
 {
  TQMap<TQString,TQString> map;
-  map[TQString::tqfromLatin1("appname")] = TQString::tqfromLatin1(appName());
-  map[TQString::tqfromLatin1("execname")] = startedByKdeinit() ? TQString::tqfromLatin1("kdeinit") : m_execname;
-  map[TQString::tqfromLatin1("signum")] = TQString::number(signalNumber());
-  map[TQString::tqfromLatin1("signame")] = signalName();
-  map[TQString::tqfromLatin1("progname")] = programName();
-  map[TQString::tqfromLatin1("pid")] = TQString::number(pid());
-  map[TQString::tqfromLatin1("tempfile")] = tempFile;
+  map[TQString::fromLatin1("appname")] = TQString::fromLatin1(appName());
+  map[TQString::fromLatin1("execname")] = startedByKdeinit() ? TQString::fromLatin1("kdeinit") : m_execname;
+  map[TQString::fromLatin1("signum")] = TQString::number(signalNumber());
+  map[TQString::fromLatin1("signame")] = signalName();
+  map[TQString::fromLatin1("progname")] = programName();
+  map[TQString::fromLatin1("pid")] = TQString::number(pid());
+  map[TQString::fromLatin1("tempfile")] = tempFile;
  if (shell)
    str = KMacroExpander::expandMacrosShellQuote( str, map );
  else
--- a/drkonqi/toplevel.cpp
+++ b/drkonqi/toplevel.cpp
@ -67,12 +67,12 @@ Toplevel :: Toplevel(KrashConfig *krashconf, TQWidget *parent, const char *name)
  // picture of konqi
  TQLabel *lab = new TQLabel(page);
  lab->setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
-  TQPixmap pix(locate("appdata", TQString::tqfromLatin1("pics/konqi.png")));
+  TQPixmap pix(locate("appdata", TQString::fromLatin1("pics/konqi.png")));
  lab->setPixmap(pix);
-  lab->setFixedSize( lab->tqsizeHint() );
+  lab->setFixedSize( lab->sizeHint() );

  TQLabel * info = new TQLabel(generateText(), page);
-  info->setMinimumSize(info->tqsizeHint());
+  info->setMinimumSize(info->sizeHint());

  if (m_krashconf->showBacktrace())
  {
@ -196,7 +196,7 @@ void Toplevel :: slotUser3()
 void Toplevel :: slotBacktraceDone(const TQString &str)
 {
  // Do not translate.. This will be included in the _MAIL_.
-  TQString buf = TQString::tqfromLatin1
+  TQString buf = TQString::fromLatin1
    ("\n\n\nHere is a backtrace generated by DrKonqi:\n") + str;

  m_bugreport->setText(buf);
--- a/kappfinder/README.apps
+++ b/kappfinder/README.apps
@ -1,4 +1,4 @@
-The apps directory tqcontains .desktop files for commonly used non-KDE
+The apps directory contains .desktop files for commonly used non-KDE
 programs which kappfinder installs into the applnk directory of KDE.

 kappfinder used to install .directory files as well because in the past the
--- a/kappfinder/apps/Games/Toys/xpinguin.desktop
+++ b/kappfinder/apps/Games/Toys/xpinguin.desktop
@ -18,26 +18,26 @@ GenericName[az]=Linuks Maskotu
 GenericName[be]=Талісман Linux
 GenericName[bg]=Талисманът на Linux
 GenericName[bn]=লিনাক্স ম্যাস্কট
-GenericName[bs]=Linux tqmaskota
+GenericName[bs]=Linux maskota
 GenericName[ca]=Mascota de Linux
 GenericName[cs]=Maskot Linuxu
 GenericName[csb]=Glingòtka Linuksa
 GenericName[cy]=Masgot Linux 
-GenericName[da]=Linux-tqmaskot
+GenericName[da]=Linux-maskot
 GenericName[de]=Linux-Maskottchen
 GenericName[el]=Η μασκότ του Linux
 GenericName[eo]=La linuksa simbolbesto
 GenericName[es]=Mascota de Linux
-GenericName[et]=Linuxi tqmaskott
-GenericName[eu]=Linuxen tqmaskota
-GenericName[fi]=Linux-tqmaskotti
+GenericName[et]=Linuxi maskott
+GenericName[eu]=Linuxen maskota
+GenericName[fi]=Linux-maskotti
 GenericName[fr]=La mascotte de Linux
-GenericName[fy]=Linux-tqmaskotte
+GenericName[fy]=Linux-maskotte
 GenericName[ga]=Sonóg Linux
 GenericName[gl]=Mascota Linux
 GenericName[he]=הקמע של לינוקס
 GenericName[hi]=लिनक्स शुभंकर
-GenericName[hr]=Linux tqmaskota
+GenericName[hr]=Linux maskota
 GenericName[hu]=Linux-kabalaállatka
 GenericName[is]=Linux lukkudýrið
 GenericName[it]=Mascotte di Linux
@ -51,11 +51,11 @@ GenericName[mk]=Маскотата на Линукс
 GenericName[mn]=Линукс-азын тэнгэр
 GenericName[ms]=Maskot Linux
 GenericName[mt]=Maskott tal-Linux
-GenericName[nb]=Linux-tqmaskot
+GenericName[nb]=Linux-maskot
 GenericName[nds]=Dat Maskottje vun Linux
 GenericName[ne]=लिनक्स मासकोट
 GenericName[nl]=Linux-mascotte
-GenericName[nn]=Linux-tqmaskot
+GenericName[nn]=Linux-maskot
 GenericName[nso]=Mascot wa Linux
 GenericName[pa]=ਲੀਨਕਸ ਮਾਸਕੋਟ
 GenericName[pl]=Maskotka Linuksa
@ -66,8 +66,8 @@ GenericName[ru]=Эмблема Linux
 GenericName[sk]=Maskot Linuxu
 GenericName[sl]=Maskota Linuxa
 GenericName[sr]=Linux-ова маскота
-GenericName[sr@Latn]=Linux-ova tqmaskota
-GenericName[sv]=Linux-tqmaskot
+GenericName[sr@Latn]=Linux-ova maskota
+GenericName[sv]=Linux-maskot
 GenericName[ta]=Linux சின்னம்
 GenericName[te]=లినక్స్ మాస్కాట్
 GenericName[tg]=Таъвизи Linux
--- a/kappfinder/apps/Utilities/Editors/emacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/emacs.desktop
@ -86,7 +86,7 @@ GenericName[xh]=Umhleli Wombhalo
 GenericName[zh_CN]=文本编辑器
 GenericName[zh_TW]=文字編輯器
 GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=emacs %f
 Icon=emacs
 Path=
--- a/kappfinder/apps/Utilities/Editors/gvim.desktop
+++ b/kappfinder/apps/Utilities/Editors/gvim.desktop
@ -115,7 +115,7 @@ GenericName[xh]=Umhleli Wombhalo
 GenericName[zh_CN]=文本编辑器
 GenericName[zh_TW]=文字編輯器
 GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=gvim -f %f
 Icon=gvim
 Type=Application
--- a/kappfinder/apps/Utilities/Editors/lemacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/lemacs.desktop
@ -90,7 +90,7 @@ GenericName[xh]=Umhleli Wombhalo
 GenericName[zh_CN]=文本编辑器
 GenericName[zh_TW]=文字編輯器
 GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=lemacs %f
 Icon=emacs
 Path=
--- a/kappfinder/apps/Utilities/Editors/nedit.desktop
+++ b/kappfinder/apps/Utilities/Editors/nedit.desktop
@ -1,5 +1,5 @@
 [Desktop Entry]
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Name=Nedit
 Name[hi]=नेडिट
 Name[ka]=NEdit
--- a/kappfinder/apps/Utilities/Editors/xemacs.desktop
+++ b/kappfinder/apps/Utilities/Editors/xemacs.desktop
@ -95,7 +95,7 @@ GenericName[xh]=Umhleli Wombhalo
 GenericName[zh_CN]=文本编辑器
 GenericName[zh_TW]=文字編輯器
 GenericName[zu]=Umlungisi wombhalo
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-tqmoc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
 Exec=xemacs %f
 Icon=emacs
 Type=Application
--- a/kappfinder/apps/Utilities/calctool.desktop
+++ b/kappfinder/apps/Utilities/calctool.desktop
@ -37,7 +37,7 @@ GenericName[ca]=Calculadora
 GenericName[cs]=Kalkulátor
 GenericName[csb]=Kalkùlator
 GenericName[cy]=Cyfrifiannell
-GenericName[da]=Regnetqmaskine
+GenericName[da]=Regnemaskine
 GenericName[de]=Rechner
 GenericName[el]=Αριθμομηχανή
 GenericName[eo]=Kalkulilo
@ -46,7 +46,7 @@ GenericName[et]=Kalkulaator
 GenericName[eu]=Kalkulagailua
 GenericName[fa]=ماشین حساب
 GenericName[fi]=Laskin
-GenericName[fo]=Roknitqmaskina
+GenericName[fo]=Roknimaskina
 GenericName[fr]=Calculatrice
 GenericName[fy]=Rekkenmasine
 GenericName[ga]=Áireamhán
--- a/kappfinder/apps/Utilities/xutils/xcalc.desktop
+++ b/kappfinder/apps/Utilities/xutils/xcalc.desktop
@ -50,7 +50,7 @@ GenericName[ca]=Calculadora
 GenericName[cs]=Kalkulátor
 GenericName[csb]=Kalkùlator
 GenericName[cy]=Cyfrifiannell
-GenericName[da]=Regnetqmaskine
+GenericName[da]=Regnemaskine
 GenericName[de]=Rechner
 GenericName[el]=Αριθμομηχανή
 GenericName[eo]=Kalkulilo
@ -59,7 +59,7 @@ GenericName[et]=Kalkulaator
 GenericName[eu]=Kalkulagailua
 GenericName[fa]=ماشین حساب
 GenericName[fi]=Laskin
-GenericName[fo]=Roknitqmaskina
+GenericName[fo]=Roknimaskina
 GenericName[fr]=Calculatrice
 GenericName[fy]=Rekkenmasine
 GenericName[ga]=Áireamhán
--- a/kappfinder/apps/Utilities/xutils/xload.desktop
+++ b/kappfinder/apps/Utilities/xutils/xload.desktop
@ -1,6 +1,6 @@
 [Desktop Entry]
 Exec=xload
-SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -tqgeometry 25x25
+SwallowExec=xload -nolabel -fg green -bg Black -hl red -update 3 -geometry 25x25
 SwallowTitle=xload
 SwallowTitle[no]=xload
 SwallowTitle[es]=xload
--- a/kappfinder/toplevel.cpp
+++ b/kappfinder/toplevel.cpp
@ -48,16 +48,16 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
  : KDialog( parent, name, true )
 {
  setCaption( i18n( "KAppfinder" ) );
-  TQVBoxLayout *tqlayout = new TQVBoxLayout( this, marginHint() );
+  TQVBoxLayout *layout = new TQVBoxLayout( this, marginHint() );

  TQLabel *label = new TQLabel( i18n( "The application finder looks for non-KDE "
                                    "applications on your system and adds "
                                    "them to the KDE menu system. "
                                    "Click 'Scan' to begin, select the desired applications and then click 'Apply'."), this);
-  label->tqsetAlignment( AlignAuto | WordBreak );
-  tqlayout->addWidget( label );
+  label->setAlignment( AlignAuto | WordBreak );
+  layout->addWidget( label );

-  tqlayout->addSpacing( 5 );
+  layout->addSpacing( 5 );

  mListView = new TQListView( this );
  mListView->addColumn( i18n( "Application" ) );
@ -67,14 +67,14 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
  mListView->setRootIsDecorated( true );
  mListView->setAllColumnsShowFocus( true );
  mListView->setSelectionMode(TQListView::NoSelection);
-  tqlayout->addWidget( mListView );
+  layout->addWidget( mListView );

  mProgress = new KProgress( this );
  mProgress->setPercentageVisible( false );
-  tqlayout->addWidget( mProgress );
+  layout->addWidget( mProgress );

  mSummary = new TQLabel( i18n( "Summary:" ), this );
-  tqlayout->addWidget( mSummary );
+  layout->addWidget( mSummary );

  KButtonBox* bbox = new KButtonBox( this );
  mScanButton = bbox->addButton( KGuiItem( i18n( "Scan" ), "find"), this, TQT_SLOT( slotScan() ) );
@ -89,9 +89,9 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
  mApplyButton = bbox->addButton( KStdGuiItem::apply(), this, TQT_SLOT( slotCreate() ) );
  mApplyButton->setEnabled( false );
  bbox->addButton( KStdGuiItem::close(), kapp, TQT_SLOT( quit() ) );
-  bbox->tqlayout();
+  bbox->layout();

-  tqlayout->addWidget( bbox );
+  layout->addWidget( bbox );

 	connect( kapp, TQT_SIGNAL( lastWindowClosed() ), kapp, TQT_SLOT( quit() ) );

@ -100,7 +100,7 @@ TopLevel::TopLevel( const TQString &destDir, TQWidget *parent, const char *name
  adjustSize();

  mDestDir = destDir;
-  mDestDir = mDestDir.tqreplace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
+  mDestDir = mDestDir.replace( TQRegExp( "^~/" ), TQDir::homeDirPath() + "/" );
 	
  KStartupInfo::appStarted();

--- a/kate/COPYING.LIB
+++ b/kate/COPYING.LIB
@ -94,7 +94,7 @@ will lead to faster development of free libraries.
  The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
-former tqcontains code derived from the library, while the latter only
+former contains code derived from the library, while the latter only
 works together with the library.

  Note that it is possible for a library to be covered by the ordinary
@ -104,7 +104,7 @@ General Public License rather than by this special one.
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library which
-tqcontains a notice placed by the copyright holder or other authorized
+contains a notice placed by the copyright holder or other authorized
 party saying it may be distributed under the terms of this Library
 General Public License (also called "this License").  Each licensee is
 addressed as "you".
@ -123,7 +123,7 @@ included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.

@ -225,7 +225,7 @@ source code from the same place satisfies the requirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.

-  5. A program that tqcontains no derivative of any portion of the
+  5. A program that contains no derivative of any portion of the
 Library, but is designed to work with the Library by being compiled or
 linked with it, is called a "work that uses the Library".  Such a
 work, in isolation, is not a derivative work of the Library, and
@ -233,7 +233,7 @@ therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
 creates an executable that is a derivative of the Library (because it
-tqcontains portions of the Library), rather than a "work that uses the
+contains portions of the Library), rather than a "work that uses the
 library".  The executable is therefore covered by this License.
 Section 6 states terms for distribution of such executables.

@ -245,7 +245,7 @@ linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
-structure tqlayouts and accessors, and small macros and small inline
+structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
 work.  (Executables containing this object code plus portions of the
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@ -1,5 +1,5 @@
 2004-04-22 Christoph Cullmann <cullmann@kde.org>
-  * kate switched over to katemdi, even smaller tqreplacement for kmdi2 :)
+  * kate switched over to katemdi, even smaller replacement for kmdi2 :)

 2004-10-06 Christoph Cullmann <cullmann@kde.org>
  * kate switched over to kmdi2, a slim version of old kmdi
@ -133,7 +133,7 @@
  * now the pluginconfig pages work ;)

 2001-04-24 Joseph Wenninger <jowenn@kde.org>
-  *  now <keywords> and <types> is tqreplaced by <list name="XXXX">
+  *  now <keywords> and <types> is replaced by <list name="XXXX">

 2001-04-20 Christoph Cullmann <cullmann@kde.org>
  * new configdialog
@ -268,7 +268,7 @@

  * Filter - select text, hit <Ctrl+Backslash>, and enter an OS command.
    we pipe the selected text thru that command, such as "sort", and then
-    tqreplace the selection with the result. Impress your friends.
+    replace the selection with the result. Impress your friends.

 2001-02-21 Joseph Wenninger <jowenn@kde.org>
  * Makefile.am's     : correction for linking
--- a/kate/README
+++ b/kate/README
@ -2,7 +2,7 @@
 Kate is a fast texteditor for the KDE destop with an Emacs-style document interface.
 I hope it works well and improves workspeed on many little textfiles. ;-)
 Our new buffer managment will allow it to open 50MB files ++ in less than 5 seconds
-(at least on my 400Mhz P2 ;) It is thought as a more powerful tqreplacement for the old
+(at least on my 400Mhz P2 ;) It is thought as a more powerful replacement for the old
 KWrite app, which will still keep alive for the existing userbase and because it is
 just a lot smaller and therefor faster on launch than kate.
 For Kate Plugins, Kate provides the Kate Interfaces, which allow deeper access
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@ -127,7 +127,7 @@ Kate::Application *KateApp::application ()

 /**
 * Has always been the Kate Versioning Scheme:
- * KDE X.Y.Z tqcontains Kate X-1.Y.Z
+ * KDE X.Y.Z contains Kate X-1.Y.Z
 */
 TQString KateApp::kateVersion (bool fullVersion)
 {
@ -396,4 +396,4 @@ KateMainWindow *KateApp::mainWindow (uint n)
  return 0;
 }

-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/kateappIface.cpp
+++ b/kate/app/kateappIface.cpp
@ -101,4 +101,4 @@ const TQString & KateAppDCOPIface::session() const
  return m_app->sessionManager()->activeSession()->sessionName();
 }

-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/kateconfigdialog.cpp
+++ b/kate/app/kateconfigdialog.cpp
@ -334,7 +334,7 @@ void KateConfigDialog::removePluginPage (Kate::Plugin *plugin)
  {
    if  ( pluginPages.at(i)->plugin == plugin )
    {
-      TQWidget *w = pluginPages.at(i)->page->tqparentWidget();
+      TQWidget *w = pluginPages.at(i)->page->parentWidget();
      delete pluginPages.at(i)->page;
      delete w;
      pluginPages.remove(pluginPages.at(i));
--- a/kate/app/kateconsole.cpp
+++ b/kate/app/kateconsole.cpp
@ -57,8 +57,8 @@ void KateConsole::loadConsoleIfNeeded()
 {
  if (m_part) return;

-  if (!tqtopLevelWidget() || !tqparentWidget()) return;
-  if (!tqtopLevelWidget() || !isVisibleTo(tqtopLevelWidget())) return;
+  if (!topLevelWidget() || !parentWidget()) return;
+  if (!topLevelWidget() || !isVisibleTo(topLevelWidget())) return;

  KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart");

@ -86,7 +86,7 @@ void KateConsole::slotDestroyed ()
  m_part = 0;

  // hide the dockwidget
-  if (tqparentWidget())
+  if (parentWidget())
  {
    m_mw->hideToolView (m_toolView);
    m_mw->centralWidget()->setFocus ();
--- a/kate/app/katedocmanager.cpp
+++ b/kate/app/katedocmanager.cpp
@ -86,7 +86,7 @@ KateDocManager::~KateDocManager ()
      {
        m_metaInfos->setGroup(*it);
        TQDateTime last = m_metaInfos->readDateTimeEntry("Time", def);
-        if (last.daysTo(TQDateTime::tqcurrentDateTime()) > m_daysMetaInfos)
+        if (last.daysTo(TQDateTime::currentDateTime()) > m_daysMetaInfos)
          m_metaInfos->deleteGroup(*it);
      }
      delete def;
@ -306,7 +306,7 @@ bool KateDocManager::closeDocument(class Kate::Document *doc,bool closeURL)
    KateApp::self()->mainWindow(i)->viewManager()->closeViews(documentNumber);
  }

-  if ( closeURL && m_tempFiles.tqcontains( documentNumber ) )
+  if ( closeURL && m_tempFiles.contains( documentNumber ) )
  {
    TQFileInfo fi( m_tempFiles[ documentNumber ].first.path() );
    if ( fi.lastModified() <= m_tempFiles[ documentNumber ].second /*||
@ -583,7 +583,7 @@ void KateDocManager::saveMetaInfos(Kate::Document *doc)
    m_metaInfos->setGroup(doc->url().prettyURL());
    doc->writeSessionConfig(m_metaInfos);
    m_metaInfos->writeEntry("MD5", (const char *)md5);
-    m_metaInfos->writeEntry("Time", TQDateTime::tqcurrentDateTime());
+    m_metaInfos->writeEntry("Time", TQDateTime::currentDateTime());
    m_metaInfos->sync();
  }
 }
@ -608,4 +608,4 @@ bool KateDocManager::computeUrlMD5(const KURL &url, TQCString &result)
  return true;
 }

-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/katedocmanager.h
+++ b/kate/app/katedocmanager.h
@ -154,4 +154,4 @@ class KateDocManager : public QObject
 };

 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/kateexternaltools.cpp
+++ b/kate/app/kateexternaltools.cpp
@ -127,7 +127,7 @@ bool KateExternalTool::checkExec()

 bool KateExternalTool::valid( const TQString &mt ) const
 {
-  return mimetypes.isEmpty() || mimetypes.tqcontains( mt );
+  return mimetypes.isEmpty() || mimetypes.contains( mt );
 }
 //END KateExternalTool

@ -191,7 +191,7 @@ bool KateExternalToolsCommand::exec (Kate::View *view, const TQString &cmd, TQSt
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get view widget"<<endl;
 		return false;
 	}
-  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->tqtopLevelWidget());
+  KateMDI::MainWindow *dmw=dynamic_cast<KateMDI::MainWindow*>(wv->topLevelWidget());
 	if (!dmw) {
 // 		kdDebug(13001)<<"KateExternalToolsCommand::exec: Could not get main window"<<endl;
 		return false;
@ -330,8 +330,8 @@ void KateExternalToolsMenuAction::reload()
    bool sepadded = false;
    for (TQStringList::iterator itg = dtools.begin(); itg != dtools.end(); ++itg )
    {
-      if ( ! tools.tqcontains( *itg ) &&
-            ! removed.tqcontains( *itg ) )
+      if ( ! tools.contains( *itg ) &&
+            ! removed.contains( *itg ) )
      {
        if ( ! sepadded )
        {
@ -394,7 +394,7 @@ void KateExternalToolsMenuAction::slotDocumentChanged()
      if ( action )
      {
        l = action->tool->mimetypes;
-        b = ( ! l.count() || l.tqcontains( mt ) );
+        b = ( ! l.count() || l.contains( mt ) );
        action->setEnabled( b );
      }
    }
@ -439,7 +439,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  leName = new TQLineEdit( w );
  lo->addWidget( leName, 1, 2 );
  l = new TQLabel( leName, i18n("&Label:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
  lo->addWidget( l, 1, 1 );
  if ( tool ) leName->setText( tool->name );
  TQWhatsThis::add( leName, i18n(
@ -454,7 +454,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  teCommand = new TQTextEdit( w );
  lo->addMultiCellWidget( teCommand, 2, 2, 2, 3 );
  l = new TQLabel( teCommand, i18n("S&cript:"), w );
-  l->tqsetAlignment( Qt::AlignTop|Qt::AlignRight );
+  l->setAlignment( Qt::AlignTop|Qt::AlignRight );
  lo->addWidget( l, 2, 1 );
  if ( tool ) teCommand->setText( tool->command );
  TQWhatsThis::add( teCommand, i18n(
@ -477,7 +477,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  leExecutable = new TQLineEdit( w );
  lo->addMultiCellWidget( leExecutable, 3, 3, 2, 3 );
  l = new TQLabel( leExecutable, i18n("&Executable:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
  lo->addWidget( l, 3, 1 );
  if ( tool ) leExecutable->setText( tool->tryexec );
  TQWhatsThis::add( leExecutable, i18n(
@ -488,7 +488,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  leMimetypes = new TQLineEdit( w );
  lo->addWidget( leMimetypes, 4, 2 );
  l = new TQLabel( leMimetypes, i18n("&Mime types:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
  lo->addWidget( l, 4, 1 );
  if ( tool ) leMimetypes->setText( tool->mimetypes.join("; ") );
  TQWhatsThis::add( leMimetypes, i18n(
@ -506,7 +506,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  cmbSave = new TQComboBox(w);
  lo->addMultiCellWidget( cmbSave, 5, 5, 2, 3 );
  l = new TQLabel( cmbSave, i18n("&Save:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
  lo->addWidget( l, 5, 1 );
  TQStringList sl;
  sl << i18n("None") << i18n("Current Document") << i18n("All Documents");
@ -521,7 +521,7 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
  leCmdLine = new TQLineEdit( w );
  lo->addMultiCellWidget( leCmdLine, 6, 6, 2, 3 );
  l = new TQLabel( leCmdLine, i18n("&Command line name:"), w );
-  l->tqsetAlignment( l->tqalignment()|Qt::AlignRight );
+  l->setAlignment( l->alignment()|Qt::AlignRight );
  lo->addWidget( l, 6, 1 );
  if ( tool ) leCmdLine->setText( tool->cmdname );
  TQWhatsThis::add( leCmdLine, i18n(
@ -745,7 +745,7 @@ void KateExternalToolsConfigWidget::slotNew()

    // This is sticky, it does not change again, so that shortcuts sticks
    // TODO check for dups
-    t->acname = "externaltool_" + TQString(t->name).tqreplace( TQRegExp("\\W+"), "" );
+    t->acname = "externaltool_" + TQString(t->name).replace( TQRegExp("\\W+"), "" );

    new ToolItem ( lbTools, t->icon.isEmpty() ? blankIcon() : SmallIcon( t->icon ), t );

@ -870,4 +870,4 @@ void KateExternalToolsConfigWidget::slotMoveDown()
  m_changed = true;
 }
 //END KateExternalToolsConfigWidget
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/kateexternaltools.h
+++ b/kate/app/kateexternaltools.h
@ -76,7 +76,7 @@ class KateExternalToolsMenuAction : public KActionMenu
 };

 /**
- * This Action tqcontains a KateExternalTool
+ * This Action contains a KateExternalTool
 */
 class KateExternalToolAction : public KAction, public KWordMacroExpander
 {
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@ -69,7 +69,7 @@ class ToolTip : public QToolTip
      KateFileListItem *item = ((KateFileListItem*)i);
      if ( ! item ) return;

-      tip( m_listView->tqitemRect( i ), m_listView->tooltip( item, 0 ) );
+      tip( m_listView->itemRect( i ), m_listView->tooltip( item, 0 ) );

    }

@ -273,11 +273,11 @@ void KateFileList::slotModChanged (Kate::Document *doc)
    for ( uint i=0; i <  m_editHistory.count(); i++ )
    {
      m_editHistory.at( i )->setEditHistPos( i+1 );
-      tqrepaintItem(  m_editHistory.at( i ) );
+      repaintItem(  m_editHistory.at( i ) );
    }
  }
  else
-    tqrepaintItem( item );
+    repaintItem( item );
 }

 void KateFileList::slotModifiedOnDisc (Kate::Document *doc, bool, unsigned char)
@ -296,7 +296,7 @@ void KateFileList::slotNameChanged (Kate::Document *doc)
    if ( ((KateFileListItem*)item)->document() == doc )
    {
      item->setText( 0, doc->docName() );
-      tqrepaintItem( item );
+      repaintItem( item );
      break;
    }
    item = item->nextSibling();
@ -334,7 +334,7 @@ void KateFileList::slotViewChanged ()
 //   int p = 0;
 //   if (  m_viewHistory.count() )
 //   {
-//     int p =  m_viewHistory.findRef( item ); // only tqrepaint items that needs it
+//     int p =  m_viewHistory.findRef( item ); // only repaint items that needs it
 //   }

  m_viewHistory.removeRef( item );
@ -343,7 +343,7 @@ void KateFileList::slotViewChanged ()
  for ( uint i=0; i <  m_viewHistory.count(); i++ )
  {
    m_viewHistory.at( i )->setViewHistPos( i+1 );
-    tqrepaintItem(  m_viewHistory.at( i ) );
+    repaintItem(  m_viewHistory.at( i ) );
  }

 }
@ -475,7 +475,7 @@ void KateFileListItem::paintCell( TQPainter *painter, const TQColorGroup & cg, i
  {
    TQColorGroup cgNew = cg;

-    // tqreplace the base color with a different shading if necessary...
+    // replace the base color with a different shading if necessary...
    if ( fl->shadingEnabled() && m_viewhistpos > 1 )
    {
      TQColor b( cg.base() );
@ -616,7 +616,7 @@ void KFLConfigPage::apply()
  m_filelist->m_editShade = kcbEditShade->color();
  m_filelist->m_enableBgShading = cbEnableShading->isChecked();
  m_filelist->setSortType( cmbSort->currentItem() );
-  // tqrepaint the affected items
+  // repaint the affected items
  m_filelist->triggerUpdate();
 }

@ -649,4 +649,4 @@ void KFLConfigPage::slotMyChanged()
 //END KFLConfigPage


-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/katefilelist.h
+++ b/kate/app/katefilelist.h
@ -188,4 +188,4 @@ class KFLConfigPage : public Kate::ConfigPage {


 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/katefileselector.cpp
+++ b/kate/app/katefileselector.cpp
@ -96,7 +96,7 @@ void KateFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * )
 {
 	if (m_tb)
 	{
-		setMinimumHeight(m_tb->tqsizeHint().height());
+		setMinimumHeight(m_tb->sizeHint().height());
 		m_tb->resize(width(),height());
 	}
 }
@ -113,17 +113,17 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
 {
  mActionCollection = new KActionCollection( this );

-  QtMsgHandler oldHandler = tqInstallMsgHandler( silenceQToolBar );
+  QtMsgHandler oldHandler = qInstallMsgHandler( silenceQToolBar );

  KateFileSelectorToolBarParent *tbp=new KateFileSelectorToolBarParent(this);
  toolbar = new KateFileSelectorToolBar(tbp);
  tbp->setToolBar(toolbar);
  toolbar->setMovingEnabled(false);
  toolbar->setFlat(true);
-  tqInstallMsgHandler( oldHandler );
+  qInstallMsgHandler( oldHandler );

  cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" );
-  cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
  KURLCompletion* cmpl = new KURLCompletion(KURLCompletion::DirCompletion);
  cmbPath->setCompletionObject( cmpl );
  cmbPath->setAutoDeleteCompletionObject( true );
@ -157,7 +157,7 @@ KateFileSelector::KateFileSelector( KateMainWindow *mainWindow,
  btnFilter->setIconSet( SmallIconSet("filter" ) );
  btnFilter->setToggleButton( true );
  filter = new KHistoryCombo( true, filterBox, "filter");
-  filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
+  filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
  filterBox->setStretchFactor(filter, 2);
  connect( btnFilter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( btnFilterClick() ) );

@ -354,7 +354,7 @@ void KateFileSelector::setDir( KURL u )
  newurl.setPath(pathstr);

  if ( !kateFileSelectorIsReadable ( newurl ) )
-    newurl.cd(TQString::tqfromLatin1(".."));
+    newurl.cd(TQString::fromLatin1(".."));

  if ( !kateFileSelectorIsReadable (newurl) )
     newurl.setPath( TQDir::homeDirPath() );
@ -692,13 +692,13 @@ void KFSConfigPage::init()
  KAction *ac;
  TQListBox *lb;
  for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) {
-    lb = l.tqcontains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
+    lb = l.contains( *it ) ? acSel->selectedListBox() : acSel->availableListBox();
    if ( *it == "bookmarks" || *it == "sync_dir" )
      ac = fileSelector->actionCollection()->action( (*it).latin1() );
    else
      ac = fileSelector->dirOperator()->actionCollection()->action( (*it).latin1() );
    if ( ac )
-      new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().tqreplace( re, "" ), *it );
+      new ActionLBItem( lb, SmallIcon( ac->icon() ), ac->text().replace( re, "" ), *it );
  }

  // sync
@ -719,4 +719,4 @@ void KFSConfigPage::slotMyChanged()
  slotChanged();
 }
 //END KFSConfigPage
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/katefileselector.h
+++ b/kate/app/katefileselector.h
@ -169,4 +169,4 @@ class KFSConfigPage : public Kate::ConfigPage {


 #endif //__KATE_FILESELECTOR_H__
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
--- a/kate/app/kategrepdialog.cpp
+++ b/kate/app/kategrepdialog.cpp
@ -85,22 +85,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
                    << "*";
  }

-  TQGridLayout *tqlayout = new TQGridLayout(this, 6, 3, 4, 4);
-  tqlayout->setColStretch(0, 10);
-  tqlayout->addColSpacing(1, 10);
-  tqlayout->setColStretch(1, 0);
-  tqlayout->setColStretch(2, 1);
-  tqlayout->setRowStretch(1, 0);
-  tqlayout->setRowStretch(2, 10);
-  tqlayout->setRowStretch(4, 0);
+  TQGridLayout *layout = new TQGridLayout(this, 6, 3, 4, 4);
+  layout->setColStretch(0, 10);
+  layout->addColSpacing(1, 10);
+  layout->setColStretch(1, 0);
+  layout->setColStretch(2, 1);
+  layout->setRowStretch(1, 0);
+  layout->setRowStretch(2, 10);
+  layout->setRowStretch(4, 0);

  TQGridLayout *loInput = new TQGridLayout(4, 2, 4);
-  tqlayout->addLayout(loInput, 0, 0);
+  layout->addLayout(loInput, 0, 0);
  loInput->setColStretch(0, 0);
  loInput->setColStretch(1, 20);

  TQLabel *lPattern = new TQLabel(i18n("Pattern:"), this);
-  lPattern->setFixedSize(lPattern->tqsizeHint());
+  lPattern->setFixedSize(lPattern->sizeHint());
  loInput->addWidget(lPattern, 0, 0, AlignRight | AlignVCenter);

  TQBoxLayout *loPattern = new TQHBoxLayout( 4 );
@ -112,22 +112,22 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
  cmbPattern->setInsertionPolicy(TQComboBox::NoInsertion);
  lPattern->setBuddy(cmbPattern);
  cmbPattern->setFocus();
-  cmbPattern->setMinimumSize(cmbPattern->tqsizeHint());
+  cmbPattern->setMinimumSize(cmbPattern->sizeHint());
  loPattern->addWidget( cmbPattern );

  cbCasesensitive = new TQCheckBox(i18n("Case sensitive"), this);
-  cbCasesensitive->setMinimumWidth(cbCasesensitive->tqsizeHint().width());
+  cbCasesensitive->setMinimumWidth(cbCasesensitive->sizeHint().width());
  cbCasesensitive->setChecked(config->readBoolEntry("CaseSensitive", true));
  loPattern->addWidget(cbCasesensitive);

  cbRegex = new TQCheckBox( i18n("Regular expression"), this );
-  cbRegex->setMinimumWidth( cbRegex->tqsizeHint().width() );
+  cbRegex->setMinimumWidth( cbRegex->sizeHint().width() );
  cbRegex->setChecked( config->readBoolEntry( "Regex", true ) );
  loPattern->addWidget( cbRegex );
  loPattern->setStretchFactor( cmbPattern, 100 );

  TQLabel *lTemplate = new TQLabel(i18n("Template:"), this);
-  lTemplate->setFixedSize(lTemplate->tqsizeHint());
+  lTemplate->setFixedSize(lTemplate->sizeHint());
  loInput->addWidget(lTemplate, 1, 0, AlignRight | AlignVCenter);

  TQBoxLayout *loTemplate = new TQHBoxLayout(4);
@ -136,7 +136,7 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
  leTemplate = new KLineEdit(this);
  lTemplate->setBuddy(leTemplate);
  leTemplate->setText(strTemplate[0]);
-  leTemplate->setMinimumSize(leTemplate->tqsizeHint());
+  leTemplate->setMinimumSize(leTemplate->sizeHint());
  loTemplate->addWidget(leTemplate);

  KComboBox *cmbTemplate = new KComboBox(false, this);
@ -146,19 +146,19 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
  loTemplate->addWidget(cmbTemplate);

  TQLabel *lFiles = new TQLabel(i18n("Files:"), this);
-  lFiles->setFixedSize(lFiles->tqsizeHint());
+  lFiles->setFixedSize(lFiles->sizeHint());
  loInput->addWidget(lFiles, 2, 0, AlignRight | AlignVCenter);

  cmbFiles = new KComboBox(true, this);
  lFiles->setBuddy(cmbFiles->focusProxy());
-  cmbFiles->setMinimumSize(cmbFiles->tqsizeHint());
+  cmbFiles->setMinimumSize(cmbFiles->sizeHint());
  cmbFiles->setInsertionPolicy(TQComboBox::NoInsertion);
  cmbFiles->setDuplicatesEnabled(false);
  cmbFiles->insertStringList(lastSearchFiles);
  loInput->addWidget(cmbFiles, 2, 1);

  TQLabel *lDir = new TQLabel(i18n("Folder:"), this);
-  lDir->setFixedSize(lDir->tqsizeHint());
+  lDir->setFixedSize(lDir->sizeHint());
  loInput->addWidget(lDir, 3, 0, AlignRight | AlignVCenter);

  TQBoxLayout *loDir = new TQHBoxLayout(3);
@ -176,24 +176,24 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
  lDir->setBuddy(cmbDir);

  cbRecursive = new TQCheckBox(i18n("Recursive"), this);
-  cbRecursive->setMinimumWidth(cbRecursive->tqsizeHint().width());
+  cbRecursive->setMinimumWidth(cbRecursive->sizeHint().width());
  cbRecursive->setChecked(config->readBoolEntry("Recursive", true));
  loDir->addWidget(cbRecursive);

  KButtonBox *actionbox = new KButtonBox(this, Qt::Vertical);
-  tqlayout->addWidget(actionbox, 0, 2);
+  layout->addWidget(actionbox, 0, 2);
  actionbox->addStretch();
  btnSearch = static_cast<KPushButton*>(actionbox->addButton(KGuiItem(i18n("Find"),"find")));
  btnSearch->setDefault(true);
  btnClear = static_cast<KPushButton*>(actionbox->addButton( KStdGuiItem::clear() ));
  actionbox->addStretch();
-  actionbox->tqlayout();
+  actionbox->layout();

  lbResult = new TQListBox(this);
  TQFontMetrics rb_fm(lbResult->fontMetrics());
-  tqlayout->addMultiCellWidget(lbResult, 2, 2, 0, 2);
+  layout->addMultiCellWidget(lbResult, 2, 2, 0, 2);

-  tqlayout->activate();
+  layout->activate();

  KAcceleratorManager::manage( this );

@ -225,11 +225,11 @@ GrepTool::GrepTool(TQWidget *parent, const char *name)
     "You may give several patterns separated by commas."));
  TQWhatsThis::add(lTemplate,
    i18n("You can choose a template for the pattern from the combo box\n"
-     "and edit it here. The string %s in the template is tqreplaced\n"
+     "and edit it here. The string %s in the template is replaced\n"
     "by the pattern input field, resulting in the regular expression\n"
     "to search for."));
  TQWhatsThis::add(lDir,
-    i18n("Enter the folder which tqcontains the files in which you want to search."));
+    i18n("Enter the folder which contains the files in which you want to search."));
  TQWhatsThis::add(cbRecursive,
    i18n("Check this box to search in all subfolders."));
  TQWhatsThis::add(cbCasesensitive,
@ -329,7 +329,7 @@ void GrepTool::slotSearch()
    return;
  }

-  if ( ! leTemplate