diff --git a/applnk/kde-utilities-xutils.directory b/applnk/kde-utilities-xutils.directory
index 807cbafa9..ca0e44eef 100644
--- 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
diff --git a/applnk/kde-utilities.directory b/applnk/kde-utilities.directory
index ce2821ec8..edb9d8757 100644
--- 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
diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index f2f4688fa..c60d6a41c 100644
--- 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" ));
       }
     }
 }
diff --git a/drkonqi/backtrace.h b/drkonqi/backtrace.h
index 70c3a0994..b6779f3eb 100644
--- 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);
diff --git a/drkonqi/debugger.cpp b/drkonqi/debugger.cpp
index b54a0f9ba..c6b073e4f 100644
--- 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 ))
   {
diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp
index ae22606f4..4faccc956 100644
--- 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
diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp
index ff18d2488..488edaebd 100644
--- 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);
diff --git a/kappfinder/README.apps b/kappfinder/README.apps
index f293582ce..b0010b473 100644
--- 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
diff --git a/kappfinder/apps/Games/Toys/xpinguin.desktop b/kappfinder/apps/Games/Toys/xpinguin.desktop
index 175a47331..057b3a37d 100644
--- 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
diff --git a/kappfinder/apps/Utilities/Editors/emacs.desktop b/kappfinder/apps/Utilities/Editors/emacs.desktop
index b84918ae9..6b8d315ff 100644
--- 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=
diff --git a/kappfinder/apps/Utilities/Editors/gvim.desktop b/kappfinder/apps/Utilities/Editors/gvim.desktop
index d23f40538..f2b694347 100644
--- 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
diff --git a/kappfinder/apps/Utilities/Editors/lemacs.desktop b/kappfinder/apps/Utilities/Editors/lemacs.desktop
index 203c056a8..fb8f0b620 100644
--- 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=
diff --git a/kappfinder/apps/Utilities/Editors/nedit.desktop b/kappfinder/apps/Utilities/Editors/nedit.desktop
index 99364eb58..998d3d117 100644
--- 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
diff --git a/kappfinder/apps/Utilities/Editors/xemacs.desktop b/kappfinder/apps/Utilities/Editors/xemacs.desktop
index 7c1b57723..46b773bd9 100644
--- 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
diff --git a/kappfinder/apps/Utilities/calctool.desktop b/kappfinder/apps/Utilities/calctool.desktop
index 2a03a0869..af82e0e2e 100644
--- 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
diff --git a/kappfinder/apps/Utilities/xutils/xcalc.desktop b/kappfinder/apps/Utilities/xutils/xcalc.desktop
index fddb8f86f..6dc3c4953 100644
--- 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
diff --git a/kappfinder/apps/Utilities/xutils/xload.desktop b/kappfinder/apps/Utilities/xutils/xload.desktop
index be21fdcce..a6dd72a0a 100644
--- 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
diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp
index 121b05c4a..660c5b498 100644
--- 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();
 
diff --git a/kate/COPYING.LIB b/kate/COPYING.LIB
index 61359d115..789c31eee 100644
--- 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
diff --git a/kate/ChangeLog b/kate/ChangeLog
index d3ca5da32..68dc0da01 100644
--- 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
diff --git a/kate/README b/kate/README
index f1a42b24b..67eb04be6 100644
--- 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
diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 084b6f313..70c81d465 100644
--- 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;
diff --git a/kate/app/kateappIface.cpp b/kate/app/kateappIface.cpp
index eb8b58a4f..259e48b89 100644
--- 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;
diff --git a/kate/app/kateconfigdialog.cpp b/kate/app/kateconfigdialog.cpp
index 370abe97e..47a7de19c 100644
--- 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));
diff --git a/kate/app/kateconsole.cpp b/kate/app/kateconsole.cpp
index b599ab202..a160162db 100644
--- 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 ();
diff --git a/kate/app/katedocmanager.cpp b/kate/app/katedocmanager.cpp
index a8a13ab98..f60c09783 100644
--- 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;
diff --git a/kate/app/katedocmanager.h b/kate/app/katedocmanager.h
index 56f006ea8..b35d0a65f 100644
--- 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;
diff --git a/kate/app/kateexternaltools.cpp b/kate/app/kateexternaltools.cpp
index a3482f2b5..6680e26a4 100644
--- 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;
diff --git a/kate/app/kateexternaltools.h b/kate/app/kateexternaltools.h
index 71cc5eaf0..507e1cfca 100644
--- 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
 {
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index 343f66a9a..47c8aa75b 100644
--- 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;
diff --git a/kate/app/katefilelist.h b/kate/app/katefilelist.h
index 837761780..e90281558 100644
--- 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;
diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp
index 789b6f735..5ab42a289 100644
--- 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;
diff --git a/kate/app/katefileselector.h b/kate/app/katefileselector.h
index 4a52a6ea1..442d3101e 100644
--- 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;
diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp
index 99d0b7501..409bfd0a1 100644
--- 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->text().tqcontains("%s") )
+  if ( ! leTemplate->text().contains("%s") )
   {
     leTemplate->setFocus();
     return;
@@ -347,9 +347,9 @@ void GrepTool::slotSearch()
 
   TQString s = cmbPattern->currentText();
   if ( ! cbRegex->isChecked() )
-    s.tqreplace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
+    s.replace( TQRegExp( "([^\\w'()<>])" ), "\\\\1" );
   TQString pattern = leTemplate->text();
-  pattern.tqreplace( "%s", s );
+  pattern.replace( "%s", s );
 
   childproc = new KProcess();
   childproc->setWorkingDirectory( m_workingDir );
@@ -476,7 +476,7 @@ void GrepTool::childExited()
 
   if ( ! errbuf.isEmpty() )
   {
-    KMessageBox::information( tqparentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
+    KMessageBox::information( parentWidget(), i18n("<strong>Error:</strong><p>") + errbuf, i18n("Grep Tool Error") );
     errbuf.truncate(0);
   }
   else
diff --git a/kate/app/katemailfilesdialog.cpp b/kate/app/katemailfilesdialog.cpp
index 52bf1f243..79a1e19c6 100644
--- a/kate/app/katemailfilesdialog.cpp
+++ b/kate/app/katemailfilesdialog.cpp
@@ -78,7 +78,7 @@ KateMailDialog::KateMailDialog( TQWidget *parent, KateMainWindow  *mainwin )
   }
   list->hide();
   connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotShowButton()) );
-  mw->setMinimumSize( lInfo->tqsizeHint() );
+  mw->setMinimumSize( lInfo->sizeHint() );
 }
 
 TQPtrList<Kate::Document> KateMailDialog::selectedDocs()
@@ -105,8 +105,8 @@ void KateMailDialog::slotShowButton()
     lInfo->setText( i18n("Press <strong>Mail...</strong> to send selected documents") );
 
   }
-  mw->setMinimumSize( TQSize( lInfo->tqsizeHint().width(), mw->tqsizeHint().height()) );
-  setMinimumSize( calculateSize( mw->tqminimumSize().width(), mw->tqsizeHint().height() ) );
+  mw->setMinimumSize( TQSize( lInfo->sizeHint().width(), mw->sizeHint().height()) );
+  setMinimumSize( calculateSize( mw->minimumSize().width(), mw->sizeHint().height() ) );
   resize( width(), minimumHeight() );
 }
 #include "katemailfilesdialog.moc"
diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp
index 9ba62782a..371161de0 100644
--- a/kate/app/katemain.cpp
+++ b/kate/app/katemain.cpp
@@ -253,4 +253,4 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
   return app.exec();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index 331194159..dea2b0fae 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -101,7 +101,7 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
   // here we go, set some usable default sizes
   if (!initialGeometrySet())
   {
-    int scnum = TQApplication::desktop()->screenNumber(tqparentWidget());
+    int scnum = TQApplication::desktop()->screenNumber(parentWidget());
     TQRect desk = TQApplication::desktop()->screenGeometry(scnum);
 
     TQSize size;
@@ -110,8 +110,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
     if (sconfig)
     {
       sconfig->setGroup (sgroup);
-      size.setWidth (sconfig->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-      size.setHeight (sconfig->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+      size.setWidth (sconfig->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+      size.setHeight (sconfig->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
     }
 
     // if thats fails, try to reuse size
@@ -131,8 +131,8 @@ KateMainWindow::KateMainWindow (KConfig *sconfig, const TQString &sgroup)
       {
         // first try global app config
         KateApp::self()->config()->setGroup ("MainWindow");
-        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Width %1").arg(desk.width()), 0 ));
-        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::tqfromLatin1("Height %1").arg(desk.height()), 0 ));
+        size.setWidth (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Width %1").arg(desk.width()), 0 ));
+        size.setHeight (KateApp::self()->config()->readNumEntry( TQString::fromLatin1("Height %1").arg(desk.height()), 0 ));
 
         if (size.isEmpty())
           size = TQSize (kMin (700, desk.width()), kMin(480, desk.height()));
@@ -851,4 +851,4 @@ void KateMainWindow::saveGlobalProperties( KConfig* sessionConfig )
   sessionConfig->writeEntry ("Last Session", KateApp::self()->sessionManager()->activeSession()->sessionFileRelative());
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemainwindow.h b/kate/app/katemainwindow.h
index e0859bcbd..77db9999c 100644
--- a/kate/app/katemainwindow.h
+++ b/kate/app/katemainwindow.h
@@ -213,4 +213,4 @@ class KateMainWindow : public KateMDI::MainWindow, virtual public KParts::PartBa
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp
index 64aef77bc..9d73e762c 100644
--- a/kate/app/katemdi.cpp
+++ b/kate/app/katemdi.cpp
@@ -128,7 +128,7 @@ GUIClient::GUIClient ( MainWindow *mw )
 
   if ( domDocument().documentElement().isNull() )
   {
-    TQString completeDescription = TQString::tqfromLatin1( guiDescription )
+    TQString completeDescription = TQString::fromLatin1( guiDescription )
           .arg( actionListName );
 
     setXML( completeDescription, false /*merge*/ );
@@ -339,7 +339,7 @@ ToolView *Sidebar::addWidget (const TQPixmap &icon, const TQString &text, ToolVi
 
 bool Sidebar::removeWidget (ToolView *widget)
 {
-  if (!m_widgetToId.tqcontains(widget))
+  if (!m_widgetToId.contains(widget))
     return false;
 
   removeTab(m_widgetToId[widget]);
@@ -369,7 +369,7 @@ bool Sidebar::removeWidget (ToolView *widget)
 
 bool Sidebar::showWidget (ToolView *widget)
 {
-  if (!m_widgetToId.tqcontains(widget))
+  if (!m_widgetToId.contains(widget))
     return false;
 
   // hide other non-persistent views
@@ -394,7 +394,7 @@ bool Sidebar::showWidget (ToolView *widget)
 
 bool Sidebar::hideWidget (ToolView *widget)
 {
-  if (!m_widgetToId.tqcontains(widget))
+  if (!m_widgetToId.contains(widget))
     return false;
 
   bool anyVis = false;
@@ -579,7 +579,7 @@ void Sidebar::restoreSession (KConfig *config)
         }
 
     // then: remove this items from the button bar
-    // do this backwards, to minimize the retqlayout efforts
+    // do this backwards, to minimize the relayout efforts
     for (int i=m_toolviews.size()-1; i >= (int)firstWrong; --i)
     {
       removeTab (m_widgetToId[m_toolviews[i]]);
@@ -659,8 +659,8 @@ void Sidebar::saveSession (KConfig *config)
 
 //BEGIN MAIN WINDOW
 
-MainWindow::MainWindow (TQWidget* tqparentWidget, const char* name)
- : KParts::MainWindow( tqparentWidget, name)
+MainWindow::MainWindow (TQWidget* parentWidget, const char* name)
+ : KParts::MainWindow( parentWidget, name)
  , m_sidebarsVisible(true)
  , m_restoreConfig (0)
  , m_guiClient (new GUIClient (this))
diff --git a/kate/app/katemdi.h b/kate/app/katemdi.h
index 915589d77..1b13c30a8 100644
--- a/kate/app/katemdi.h
+++ b/kate/app/katemdi.h
@@ -258,7 +258,7 @@ class MainWindow : public KParts::MainWindow
     /**
      * Constructor
      */
-    MainWindow (TQWidget* tqparentWidget = 0, const char* name = 0);
+    MainWindow (TQWidget* parentWidget = 0, const char* name = 0);
 
     /**
      * Destructor
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 263d06c7e..5199a6925 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -91,7 +91,7 @@ KateMwModOnHdDialog::KateMwModOnHdDialog( DocVector docs, TQWidget *parent, cons
   // document list
   lvDocuments = new KListView( w );
   lvDocuments->addColumn( i18n("Filename") );
-  lvDocuments->addColumn( i18n("tqStatus on Disk") );
+  lvDocuments->addColumn( i18n("Status on Disk") );
   lvDocuments->setSelectionMode( TQListView::Single );
 
   TQStringList l;
@@ -278,4 +278,4 @@ void KateMwModOnHdDialog::slotPDone( KProcess *p )
   m_tmpfile = 0;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katemwmodonhddialog.h b/kate/app/katemwmodonhddialog.h
index 121761f38..7a5d8f7ca 100644
--- a/kate/app/katemwmodonhddialog.h
+++ b/kate/app/katemwmodonhddialog.h
@@ -58,4 +58,4 @@ class KateMwModOnHdDialog : public KDialogBase
 };
 
 #endif // _KATE_MW_MODONHD_DIALOG_H_
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/katesession.cpp b/kate/app/katesession.cpp
index 70c844804..fd0e059f9 100644
--- a/kate/app/katesession.cpp
+++ b/kate/app/katesession.cpp
@@ -917,4 +917,4 @@ void KateSessionsAction::openSession (int i)
 
   KateSessionManager::self()->activateSession(slist[(uint)i]);
 }
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/katetabwidget.cpp b/kate/app/katetabwidget.cpp
index cd9df55d1..4b278e327 100644
--- a/kate/app/katetabwidget.cpp
+++ b/kate/app/katetabwidget.cpp
@@ -70,7 +70,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQString & label, int in
   KTabWidget::insertTab(child,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label, int index )
@@ -78,7 +78,7 @@ void KateTabWidget::insertTab ( TQWidget * child, const TQIconSet & iconset, con
   KTabWidget::insertTab(child,iconset,label,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
@@ -86,7 +86,7 @@ void KateTabWidget::insertTab ( TQWidget * child, TQTab * tab, int index)
   KTabWidget::insertTab(child,tab,index);
   showPage(child);
   maybeShow();
-  tabBar()->tqrepaint();
+  tabBar()->repaint();
 }
 
 void KateTabWidget::removePage ( TQWidget * w )
diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp
index 08f080fec..c62e6e082 100644
--- a/kate/app/kateviewmanager.cpp
+++ b/kate/app/kateviewmanager.cpp
@@ -511,4 +511,4 @@ KateMainWindow *KateViewManager::mainWindow() {
         return m_mainWindow;
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.cpp b/kate/app/kateviewspace.cpp
index de7090215..43a73a2b6 100644
--- a/kate/app/kateviewspace.cpp
+++ b/kate/app/kateviewspace.cpp
@@ -67,9 +67,9 @@ protected:
   void paintEvent( TQPaintEvent *e )
   {
     TQPainter p( this );
-    p.setPen( tqcolorGroup().shadow() );
+    p.setPen( colorGroup().shadow() );
     p.drawLine( e->rect().left(), 0, e->rect().right(), 0 );
-    p.setPen( ((KateViewSpace*)tqparentWidget())->isActiveSpace() ? tqcolorGroup().light() : tqcolorGroup().midlight() );
+    p.setPen( ((KateViewSpace*)parentWidget())->isActiveSpace() ? colorGroup().light() : colorGroup().midlight() );
     p.drawLine( e->rect().left(), 1, e->rect().right(), 1 );
   }
 };
@@ -226,9 +226,9 @@ bool KateViewSpace::event( TQEvent *e )
   return TQVBox::event( e );
 }
 
-void KateViewSpace::slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
+void KateViewSpace::slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg)
 {
-  if ((TQWidgetStack *)view->tqparentWidget() != stack)
+  if ((TQWidgetStack *)view->parentWidget() != stack)
     return;
   mStatusBar->setStatus( r, c, ovr, block, mod, msg );
 }
@@ -309,29 +309,29 @@ KateVSStatusBar::KateVSStatusBar ( KateViewSpace *parent, const char *name )
 {
   m_lineColLabel = new TQLabel( this );
   addWidget( m_lineColLabel, 0, false );
-  m_lineColLabel->tqsetAlignment( Qt::AlignCenter );
+  m_lineColLabel->setAlignment( Qt::AlignCenter );
   m_lineColLabel->installEventFilter( this );
 
   m_modifiedLabel = new TQLabel( TQString("   "), this );
   addWidget( m_modifiedLabel, 0, false );
-  m_modifiedLabel->tqsetAlignment( Qt::AlignCenter );
+  m_modifiedLabel->setAlignment( Qt::AlignCenter );
   m_modifiedLabel->installEventFilter( this );
 
   m_insertModeLabel = new TQLabel( i18n(" INS "), this );
   addWidget( m_insertModeLabel, 0, false );
-  m_insertModeLabel->tqsetAlignment( Qt::AlignCenter );
+  m_insertModeLabel->setAlignment( Qt::AlignCenter );
   m_insertModeLabel->installEventFilter( this );
 
   m_selectModeLabel = new TQLabel( i18n(" NORM "), this );
   addWidget( m_selectModeLabel, 0, false );
-  m_selectModeLabel->tqsetAlignment( Qt::AlignCenter );
+  m_selectModeLabel->setAlignment( Qt::AlignCenter );
   m_selectModeLabel->installEventFilter( this );
 
   m_fileNameLabel=new KSqueezedTextLabel( this );
   addWidget( m_fileNameLabel, 1, true );
   m_fileNameLabel->setMinimumSize( 0, 0 );
-  m_fileNameLabel->tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
-  m_fileNameLabel->tqsetAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
+  m_fileNameLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Fixed ));
+  m_fileNameLabel->setAlignment( /*Qt::AlignRight*/Qt::AlignLeft );
   m_fileNameLabel->installEventFilter( this );
 
   installEventFilter( this );
@@ -396,7 +396,7 @@ void KateVSStatusBar::modifiedChanged()
 
 void KateVSStatusBar::showMenu()
 {
-   KMainWindow* mainWindow = static_cast<KMainWindow*>( tqtopLevelWidget() );
+   KMainWindow* mainWindow = static_cast<KMainWindow*>( topLevelWidget() );
    TQPopupMenu* menu = static_cast<TQPopupMenu*>( mainWindow->factory()->container("viewspace_popup", mainWindow ) );
 
    if (menu)
@@ -419,4 +419,4 @@ bool KateVSStatusBar::eventFilter(TQObject*,TQEvent *e)
   return false;
 }
 //END KateVSStatusBar
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspace.h b/kate/app/kateviewspace.h
index 9f1106aab..b6a5a185e 100644
--- a/kate/app/kateviewspace.h
+++ b/kate/app/kateviewspace.h
@@ -110,7 +110,7 @@ class KateViewSpace : public QVBox
     TQString m_group;
 
   private slots:
-    void slottqStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
+    void slotStatusChanged (Kate::View *view, int r, int c, int ovr, bool block, int mod, const TQString &msg);
 
   public slots:
     void polish();
@@ -118,4 +118,4 @@ class KateViewSpace : public QVBox
 };
 
 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index a441e3adb..1e05e8b5a 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -69,7 +69,7 @@ KateViewSpaceContainer::KateViewSpaceContainer (TQWidget *parent, KateViewManage
   m_viewSpaceList.setAutoDelete(true);
 
   KateViewSpace* vs = new KateViewSpace( this, this );
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
+  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString&)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString&)));
   vs->setActive( true );
   m_viewSpaceList.append(vs);
   connect( this, TQT_SIGNAL(viewChanged()), this, TQT_SLOT(slotViewChanged()) );
@@ -124,7 +124,7 @@ bool KateViewSpaceContainer::createView ( Kate::Document *doc )
 
   connect(view->getDoc(),TQT_SIGNAL(nameChanged(Kate::Document *)),this,TQT_SLOT(statusMsg()));
   connect(view,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(statusMsg()));
-  connect(view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(statusMsg()));
+  connect(view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(statusMsg()));
   connect(view->getDoc(), TQT_SIGNAL(undoChanged()), this, TQT_SLOT(statusMsg()));
   connect(view,TQT_SIGNAL(dropEventPass(TQDropEvent *)), mainWindow(),TQT_SLOT(slotDropEvent(TQDropEvent *)));
   connect(view,TQT_SIGNAL(gotFocus(Kate::View *)),this,TQT_SLOT(activateSpace(Kate::View *)));
@@ -141,7 +141,7 @@ bool KateViewSpaceContainer::deleteView (Kate::View *view, bool delViewSpace)
 {
   if (!view) return true;
 
-  KateViewSpace *viewspace = (KateViewSpace *)view->tqparentWidget()->tqparentWidget();
+  KateViewSpace *viewspace = (KateViewSpace *)view->parentWidget()->parentWidget();
 
   viewspace->removeView (view);
 
@@ -241,7 +241,7 @@ void KateViewSpaceContainer::activateSpace (Kate::View* v)
 {
   if (!v) return;
 
-  KateViewSpace* vs = (KateViewSpace*)v->tqparentWidget()->tqparentWidget();
+  KateViewSpace* vs = (KateViewSpace*)v->parentWidget()->parentWidget();
 
   if (!vs->isActiveSpace()) {
     setActiveSpace (vs);
@@ -446,23 +446,23 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
   if (!activeView()) return;
   if (!vs) vs = activeViewSpace();
 
-  bool isFirstTime = vs->tqparentWidget() == this;
+  bool isFirstTime = vs->parentWidget() == this;
 
   TQValueList<int> psizes;
   if ( ! isFirstTime )
-    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->tqparentWidget()->qt_cast("TQSplitter")) )
+    if ( TQSplitter *ps = static_cast<TQSplitter*>(vs->parentWidget()->qt_cast("TQSplitter")) )
       psizes = ps->sizes();
 
   Qt::Orientation o = isHoriz ? Qt::Vertical : Qt::Horizontal;
-  KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->tqparentWidget());
+  KateMDI::Splitter* s = new KateMDI::Splitter(o, vs->parentWidget());
   s->setOpaqueResize( KGlobalSettings::opaqueResize() );
 
   if (! isFirstTime) {
     // anders: make sure the split' viewspace is always
     // correctly positioned.
     // If viewSpace is the first child, the new splitter must be moveToFirst'd
-    if ( !((KateMDI::Splitter*)vs->tqparentWidget())->isLastChild( vs ) )
-       ((KateMDI::Splitter*)s->tqparentWidget())->moveToFirst( s );
+    if ( !((KateMDI::Splitter*)vs->parentWidget())->isLastChild( vs ) )
+       ((KateMDI::Splitter*)s->parentWidget())->moveToFirst( s );
   }
   vs->reparent( s, 0, TQPoint(), true );
   KateViewSpace* vsNew = new KateViewSpace( this, s );
@@ -471,17 +471,17 @@ void KateViewSpaceContainer::splitViewSpace( KateViewSpace* vs,
     s->moveToFirst( vsNew );
 
   if (!isFirstTime)
-    if (TQSplitter *ps = static_cast<TQSplitter*>(s->tqparentWidget()->qt_cast("TQSplitter")) )
+    if (TQSplitter *ps = static_cast<TQSplitter*>(s->parentWidget()->qt_cast("TQSplitter")) )
       ps->setSizes( psizes );
 
   s->show();
 
   TQValueList<int> sizes;
-  int space = 50;//isHoriz ? s->tqparentWidget()->height()/2 : s->tqparentWidget()->width()/2;
+  int space = 50;//isHoriz ? s->parentWidget()->height()/2 : s->parentWidget()->width()/2;
   sizes << space << space;
   s->setSizes( sizes );
 
-  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
+  connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vsNew, TQT_SLOT(slotStatusChanged(Kate::View *, int, int,int, bool, int, const TQString &)));
   m_viewSpaceList.append( vsNew );
   activeViewSpace()->setActive( false );
   vsNew->setActive( true, true );
@@ -503,7 +503,7 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
   // abort if this is the last viewspace
   if (m_viewSpaceList.count() < 2) return;
 
-  KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->tqparentWidget();
+  KateMDI::Splitter* p = (KateMDI::Splitter*)viewspace->parentWidget();
 
   // find out if it is the first child for repositioning
   // see below
@@ -512,9 +512,9 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
   // save some size information
   KateMDI::Splitter* pp=0L;
   TQValueList<int> ppsizes;
-  if (m_viewSpaceList.count() > 2 && p->tqparentWidget() != this)
+  if (m_viewSpaceList.count() > 2 && p->parentWidget() != this)
   {
-    pp = (KateMDI::Splitter*)p->tqparentWidget();
+    pp = (KateMDI::Splitter*)p->parentWidget();
     ppsizes = pp->sizes();
     pIsFirst = !pp->isLastChild( p ); // simple logic, right-
   }
@@ -554,10 +554,10 @@ void KateViewSpaceContainer::removeViewSpace (KateViewSpace *viewspace)
   {
     TQWidget* other = ((TQWidget *)(( TQPtrList<TQObject>*)p->children())->first());
 
-    other->reparent( p->tqparentWidget(), 0, TQPoint(), true );
+    other->reparent( p->parentWidget(), 0, TQPoint(), true );
     // We also need to find the right viewspace to become active
     if (pIsFirst)
-       ((KateMDI::Splitter*)p->tqparentWidget())->moveToFirst( other );
+       ((KateMDI::Splitter*)p->parentWidget())->moveToFirst( other );
     if ( other->isA("KateViewSpace") ) {
       setActiveSpace( (KateViewSpace*)other );
     }
@@ -726,7 +726,7 @@ void KateViewSpaceContainer::restoreSplitter( KConfig* config, const TQString &g
     {
      KateViewSpace* vs = new KateViewSpace( this, s );
 
-     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slottqStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
+     connect(this, TQT_SIGNAL(statusChanged(Kate::View *, int, int, int, bool, int, const TQString &)), vs, TQT_SLOT(slotStatusChanged(Kate::View *, int, int, int, bool, int, const TQString &)));
 
      if (m_viewSpaceList.isEmpty())
        vs->setActive (true);
@@ -755,4 +755,4 @@ KateMainWindow *KateViewSpaceContainer::mainWindow() {
   return m_viewManager->mainWindow();
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp
index 2ac1e5d9e..efb71b767 100644
--- a/kate/app/kwritemain.cpp
+++ b/kate/app/kwritemain.cpp
@@ -96,8 +96,8 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   setAcceptDrops(true);
 
-  connect(m_view,TQT_SIGNAL(newtqStatus()),this,TQT_SLOT(newCaption()));
-  connect(m_view,TQT_SIGNAL(viewtqStatusMsg(const TQString &)),this,TQT_SLOT(newtqStatus(const TQString &)));
+  connect(m_view,TQT_SIGNAL(newStatus()),this,TQT_SLOT(newCaption()));
+  connect(m_view,TQT_SIGNAL(viewStatusMsg(const TQString &)),this,TQT_SLOT(newStatus(const TQString &)));
   connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(newCaption()));
   connect(m_view->document(),TQT_SIGNAL(fileNameChanged()),this,TQT_SLOT(slotFileNameChanged()));
   connect(m_view,TQT_SIGNAL(dropEventPass(TQDropEvent *)),this,TQT_SLOT(slotDropEvent(TQDropEvent *)));
@@ -112,7 +112,7 @@ KWrite::KWrite (KTextEditor::Document *doc)
 
   // init with more usefull size, stolen from konq :)
   if (!initialGeometrySet())
-    resize( TQSize(700, 480).expandedTo(tqminimumSizeHint()));
+    resize( TQSize(700, 480).expandedTo(minimumSizeHint()));
 
   // call it as last thing, must be sure everything is already set up ;)
   setAutoSaveSettings ();
@@ -163,7 +163,7 @@ void KWrite::setupActions()
   // setup Settings menu
   setStandardToolBarMenuEnabled(true);
 
-  m_paShowStatusBar = KStdAction::showtqStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
+  m_paShowStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(toggleStatusBar()), actionCollection(), "settings_show_statusbar");
   m_paShowStatusBar->setWhatsThis(i18n("Use this command to show or hide the view's statusbar"));
 
   m_paShowPath = new KToggleAction(i18n("Sho&w Path"), 0, this, TQT_SLOT(newCaption()),
@@ -320,7 +320,7 @@ void KWrite::printDlg()
   KTextEditor::printInterface(m_view->document())->printDialog ();
 }
 
-void KWrite::newtqStatus(const TQString &msg)
+void KWrite::newStatus(const TQString &msg)
 {
   newCaption();
 
@@ -709,4 +709,4 @@ void KWriteEditorChooser::slotOk() {
 	m_chooser->writeAppSetting();
 	KDialogBase::slotOk();
 }
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/app/kwritemain.h b/kate/app/kwritemain.h
index 91c4240ff..6a3565a6c 100644
--- a/kate/app/kwritemain.h
+++ b/kate/app/kwritemain.h
@@ -76,7 +76,7 @@ class KWrite : public KParts::MainWindow
     void printNow();
     void printDlg();
 
-    void newtqStatus(const TQString &msg);
+    void newStatus(const TQString &msg);
     void newCaption();
 
     void slotDropEvent(TQDropEvent *);
@@ -135,4 +135,4 @@ class KWriteEditorChooser: public KDialogBase
 };
 
 #endif
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/data/tips b/kate/data/tips
index 5d74a1202..aaee34424 100644
--- a/kate/data/tips
+++ b/kate/data/tips
@@ -83,9 +83,9 @@ in the active frame.</p>
 </tip>
 <tip category="Kate|part">
 <html>
-<p>You can do cool sed-like regular expression tqreplacements using <em>Command Line</em>.</p>
+<p>You can do cool sed-like regular expression replacements using <em>Command Line</em>.</p>
 <p>For example, press <strong>F7</strong> and enter <code>s /oldtext/newtext/g</code>
-to tqreplace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
+to replace &quot;oldtext&quot; with &quot;newtext&quot; throughout the current
 line.</p>
 </html>
 </tip>
diff --git a/kate/interfaces/mainwindow.cpp b/kate/interfaces/mainwindow.cpp
index 26dbe913d..4596cacb5 100644
--- a/kate/interfaces/mainwindow.cpp
+++ b/kate/interfaces/mainwindow.cpp
@@ -79,4 +79,4 @@ ToolViewManager *MainWindow::toolViewManager () const
 
 }
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/interfaces/mainwindow.h b/kate/interfaces/mainwindow.h
index b0874458a..5c8449b62 100644
--- a/kate/interfaces/mainwindow.h
+++ b/kate/interfaces/mainwindow.h
@@ -62,4 +62,4 @@ class KDE_EXPORT MainWindow : public QObject
 
 #endif
 
-// kate: space-indent on; indent-width 2; tqreplace-tabs on;
+// kate: space-indent on; indent-width 2; replace-tabs on;
diff --git a/kate/utils/dockviewbase.cpp b/kate/utils/dockviewbase.cpp
index 6048f9b70..76e5844ed 100644
--- a/kate/utils/dockviewbase.cpp
+++ b/kate/utils/dockviewbase.cpp
@@ -87,7 +87,7 @@ void Kate::DockViewBase::init( const TQString &prefix, const TQString &title )
 {
   setSpacing( 4 );
   d->header = new TQWidget( this );
-  d->header->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
+  d->header->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed, true ) );
   TQHBoxLayout *lo = new TQHBoxLayout( d->header );
   lo->setSpacing( 6 );
   lo->insertSpacing( 0, 6 ); 
diff --git a/kcminit/main.cpp b/kcminit/main.cpp
index 757c751de..507d648c9 100644
--- a/kcminit/main.cpp
+++ b/kcminit/main.cpp
@@ -113,10 +113,10 @@ void KCMInit::runModules( int phase )
       TQString libName = TQString("kcm_%1").arg(library);
 
       // try to load the library
-      if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+      if (! alreadyInitialized.contains( libName.ascii() )) {
 	  if (!runModule(libName, service)) {
 	      libName = TQString("libkcm_%1").arg(library);
-	      if (! alreadyInitialized.tqcontains( libName.ascii() )) {
+	      if (! alreadyInitialized.contains( libName.ascii() )) {
 		  runModule(libName, service);
 		  alreadyInitialized.append( libName.ascii() );
 	      }
@@ -193,8 +193,8 @@ KCMInit::KCMInit( KCmdLineArgs* args )
      runModules( 0 );
      kapp->dcopClient()->send( "ksplash", "", "upAndRunning(TQString)",  TQString("kcminit"));
      sendReady();
-     TQTimer::singleShot( 300 * 1000, tqApp, TQT_SLOT( quit())); // just in case
-     tqApp->exec(); // wait for runPhase1() and runPhase2()
+     TQTimer::singleShot( 300 * 1000, qApp, TQT_SLOT( quit())); // just in case
+     qApp->exec(); // wait for runPhase1() and runPhase2()
   }
   else
      runModules( -1 ); // all phases
@@ -215,7 +215,7 @@ void KCMInit::runPhase2()
 {
   runModules( 2 );
   emitDCOPSignal( "phase2Done()", TQByteArray());
-  tqApp->exit( 0 );
+  qApp->exit( 0 );
 }
 
 extern "C" KDE_EXPORT int kdemain(int argc, char *argv[])
diff --git a/kcontrol/TODO b/kcontrol/TODO
index 48d8587b4..b3b8d2971 100644
--- a/kcontrol/TODO
+++ b/kcontrol/TODO
@@ -88,11 +88,11 @@ The desktop file is called "kcm_fonts" with "Name=Fonts" and "Categories=X-KDE-s
 
 // Not sure where these next three are is this OLD and from KDE2 and has already been done?
 
-* Remove "Internet & Network/Email". It is tqreplaced by the new kcm_useraccount
+* Remove "Internet & Network/Email". It is replaced by the new kcm_useraccount
 
-* Remove "System Administration/User Info". It is tqreplaced by the new kcm_useraccount
+* Remove "System Administration/User Info". It is replaced by the new kcm_useraccount
 
-* Remove "Privacy & Crypto/Passwords". It is tqreplaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
+* Remove "Privacy & Crypto/Passwords". It is replaced by the new kcm_useraccount. Probably. (awaiting comment from Aaron)
 
 * Tell Konqi to go burn the 11 tabs of keyboard options(5 KCMs). Because it is.. bizarre. Two KCMs with two tabs each is absolute maximum. One KCM with three tabs is quite ok too.
 
@@ -151,9 +151,9 @@ The current dialog should appear as an advanced tab behind the "Theme"-tab.
 Network -> Talk Configuration
 -----------------------------
 Answering Machine: A groupbox around "Address:, Subject:, First Line:" would be nice. That way one wouldn't need to mention "Mail" each time. The Groupbox could be named something like "Anwering Mail".
-That way one would have a much cleaner tqlayout and it would be much easier to see at once what the dialog is about.
+That way one would have a much cleaner layout and it would be much easier to see at once what the dialog is about.
 Forward: Way too much text here. I see the point of having a direct explanation in the dialog. But this could look much friendlier using the following solution:
-There should be a Textbox below the "Forward method"-Combobox. This Textbox only tqcontains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
+There should be a Textbox below the "Forward method"-Combobox. This Textbox only contains the information for the Forward-method which is currently selected (So the text changes each time a different Forward-method is selected).
 
 Sound -> Sound Server
 ---------------------
@@ -164,5 +164,5 @@ Web Browsing -> User Agent
 The Dialog suffers from the cockpit-dilemma.
 All the new "Add"-checkboxes are only there for finetuning. Most of the time the useragent-strings should work
 w/o the need to tune them this way. Better Solution: Remove the Customize-Group-box and simply add a Button "Customize ..." below the Text: "Current User Agent String: Mozilla/5.0 (comp.; Konq.orwhateveritis)".
-After pressing the "Customize"-Button a dialog should pop up which tqcontains all the nice
+After pressing the "Customize"-Button a dialog should pop up which contains all the nice
 "Add"-checkboxes which have been added recently.
diff --git a/kcontrol/access/eventsrc b/kcontrol/access/eventsrc
index f8ac0d207..185460ec4 100644
--- a/kcontrol/access/eventsrc
+++ b/kcontrol/access/eventsrc
@@ -130,7 +130,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
 Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní aktivní.
 Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
 Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu aktiv
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt aktiv
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt aktiv
 Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ενεργό
 Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas aktiva
 Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y está activa ahora
@@ -242,7 +242,7 @@ Comment[ca]=Una tecla modificadora (p.ex. Majús o Ctrl) ha canviat d'estat i ar
 Comment[cs]=Modifikační kláves (např. Shift nebo Control) změnila svůj stav a je nyní neaktivní.
 Comment[csb]=Klawisza zjinaczi (n.p. Shift czë Control) zmieniła stón ë je terô aktiwnô
 Comment[da]=En ændringstast (f.eks., Shift eller Ctrl) har ændret sin tilstand og er nu inaktiv
-Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren tqStatus geändert und ist jetzt inaktiv
+Comment[de]=Eine Sondertaste (z. B. Umschalt oder Strg) hat ihren Status geändert und ist jetzt inaktiv
 Comment[el]=Άλλαξε η κατάσταση ενός πλήκτρου τροποποιητή (π.χ. Shift ή Control) και τώρα είναι ανενεργό
 Comment[eo]=Modifa klavo (ekz. majuskliga klavo aŭ stirklavo) ŝanĝis sian staton kaj nun estas malaktiva
 Comment[es]=Una tecla modificadora (p.ej. Mayúsculas o Control) ha cambiado su estado y ahora está inactiva
@@ -466,7 +466,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
 Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
 Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniłą stón ë nie je terô aktiwnô
 Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu aktiv
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun aktiv
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun aktiv
 Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
 Comment[eo]=Ŝlosa klavo (ekz. majuskla baskulo aŭ Cifera baskulo) ŝanĝis sian staton kaj nun estas aktiva
 Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
@@ -579,7 +579,7 @@ Comment[ca]=Una tecla de bloqueig (p.ex. BloqMajús o BloqNum) ha canviat d'esta
 Comment[cs]=Klávesa zámku (např. Caps Lock nebo Num Lock) změnila svůj stav a je nyní aktivní
 Comment[csb]=Klawisza blokadë (np. Caps Lock czë Num Lock) zmieniła stón ë nie je terô aktiwnô
 Comment[da]=En låsetast (f.eks., Caps Lock eller Num Lock) har ændret sin tilstand og er nu inaktiv
-Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren tqStatus geändert und ist nun inaktiv
+Comment[de]=Eine Feststelltaste (z. B. die Hochstelltaste oder Num-Lock) hat ihren Status geändert und ist nun inaktiv
 Comment[el]=Ένα πλήκτρο κλειδώματος (π.χ. Caps Lock ή Num Lock) άλλαξε κατάσταση και είναι τώρα ανενεργό
 Comment[eo]=baskula klavo (ekz. majuskla baskulo aŭ nombra baskulo) ŝanĝis staton, kaj jam ne estas aktiva
 Comment[es]=Una tecla de bloqueo (p. ej., Bloq Mayús o Bloq Num) ha cambiado su estado y ahora está inactiva
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 5dca89695..10c593ed7 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -31,7 +31,7 @@
 #include "kaccess.moc"
 
 struct ModifierKey {
-   const unsigned int tqmask;
+   const unsigned int mask;
    const KeySym keysym;
    const char *name;
    const char *lockedText;
@@ -303,9 +303,9 @@ void KAccessApp::readSettings()
   overlay = 0;
 }
 
-static int tqmaskToBit (int tqmask) {
+static int maskToBit (int mask) {
    for (int i = 0; i < 8; i++)
-      if (tqmask & (1 << i))
+      if (mask & (1 << i))
          return i;
    return -1;
 }
@@ -316,19 +316,19 @@ void KAccessApp::initMasks() {
    state = 0;
 
    for (int i = 0; strcmp (modifierKeys[i].name, "") != 0; i++) {
-      int tqmask = modifierKeys[i].tqmask;
-      if (tqmask == 0)
+      int mask = modifierKeys[i].mask;
+      if (mask == 0)
          if (modifierKeys[i].keysym != 0)
-            tqmask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
+            mask = XkbKeysymToModifiers (qt_xdisplay(), modifierKeys[i].keysym);
          else if (!strcmp(modifierKeys[i].name, "Win"))
-            tqmask = KKeyNative::modX(KKey::WIN);
+            mask = KKeyNative::modX(KKey::WIN);
          else
-            tqmask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
+            mask = XkbKeysymToModifiers (qt_xdisplay(), XK_Mode_switch)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Shift)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Latch)
                  | XkbKeysymToModifiers (qt_xdisplay(), XK_ISO_Level3_Lock);
 
-      int bit = tqmaskToBit (tqmask);
+      int bit = maskToBit (mask);
       if (bit != -1 && keys[bit] == -1)
          keys[bit] = i;
    }
@@ -496,7 +496,7 @@ TQString mouseKeysShortcut (Display *display) {
            {
               if (type->map[i].active && (type->map[i].level == level))
               {
-                 modifiers = type->map[i].mods.tqmask;
+                 modifiers = type->map[i].mods.mask;
                  found = true;
               }
            }
@@ -585,7 +585,7 @@ void KAccessApp::createDialogContents() {
       TQVBoxLayout * vlay = new TQVBoxLayout(lay);
 
       featuresLabel = new TQLabel( "", contents );
-      featuresLabel->tqsetAlignment( WordBreak|AlignVCenter );
+      featuresLabel->setAlignment( WordBreak|AlignVCenter );
       vlay->addWidget( featuresLabel );
       vlay->addStretch();
 
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index ecd55e02b..d7e114c55 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -142,7 +142,7 @@ TQString mouseKeysShortcut (Display *display) {
            {
               if (type->map[i].active && (type->map[i].level == level))
               {
-                 modifiers = type->map[i].mods.tqmask;
+                 modifiers = type->map[i].mods.mask;
                  found = true;
               }
            }
@@ -248,7 +248,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->tqlayout(),
+  TQVBoxLayout *vvbox = new TQVBoxLayout(grp->layout(),
       KDialogBase::spacingHint());
 
   systemBell = new TQCheckBox(i18n("Use &system bell"), grp);
@@ -291,7 +291,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   visibleBell = new TQCheckBox(i18n("&Use visible bell"), grp);
   vvbox->addWidget(visibleBell);
@@ -311,7 +311,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   TQWhatsThis::add( flashScreen, i18n("The screen will turn to a custom color for the amount of time specified below.") );
   hbox->addSpacing(12);
   colorButton = new KColorButton(grp);
-  colorButton->setFixedWidth(colorButton->tqsizeHint().height()*2);
+  colorButton->setFixedWidth(colorButton->sizeHint().height()*2);
   hbox->addWidget(colorButton);
   hbox->addStretch();
   TQWhatsThis::add( colorButton, i18n("Click here to choose the color used for the \"flash screen\" visible bell.") );
@@ -353,7 +353,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   stickyKeys = new TQCheckBox(i18n("Use &sticky keys"), grp);
   vvbox->addWidget(stickyKeys);
@@ -377,7 +377,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   toggleKeysBeep = new TQCheckBox(i18n("Use system bell whenever a locking key gets activated or deactivated"), grp);
   vvbox->addWidget(toggleKeysBeep);
@@ -388,7 +388,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
   hbox->addStretch(1);
   kNotifyModifiersButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-  kNotifyModifiersButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+  kNotifyModifiersButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyModifiersButton);
 
   connect(stickyKeys, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
@@ -415,7 +415,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   slowKeys = new TQCheckBox(i18n("&Use slow keys"), grp);
   vvbox->addWidget(slowKeys);
@@ -447,7 +447,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   bounceKeys = new TQCheckBox(i18n("Use bou&nce keys"), grp);
   vvbox->addWidget(bounceKeys);
@@ -491,7 +491,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   gestures = new TQCheckBox(i18n("Use gestures for activating sticky keys and slow keys"), grp);
   vvbox->addWidget(gestures);
@@ -521,7 +521,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   grp->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(grp);
 
-  vvbox = new TQVBoxLayout(grp->tqlayout(), KDialog::spacingHint());
+  vvbox = new TQVBoxLayout(grp->layout(), KDialog::spacingHint());
 
   accessxBeep = new TQCheckBox(i18n("Use the system bell whenever a gesture is used to turn an accessibility feature on or off"), grp);
   vvbox->addWidget(accessxBeep);
@@ -536,7 +536,7 @@ KAccessConfig::KAccessConfig(TQWidget *parent, const char *)
   hbox = new TQHBoxLayout(vvbox, KDialog::spacingHint());
   hbox->addStretch(1);
   kNotifyAccessXButton = new TQPushButton(i18n("Configure System Notification..."), grp);
-  kNotifyAccessXButton->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+  kNotifyAccessXButton->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
   hbox->addWidget(kNotifyAccessXButton);
 
   connect(gestures, TQT_SIGNAL(clicked()), this, TQT_SLOT(configChanged()));
diff --git a/kcontrol/accessibility/accessibilityconfigwidget.ui b/kcontrol/accessibility/accessibilityconfigwidget.ui
index f18758eac..5d0069a09 100644
--- a/kcontrol/accessibility/accessibilityconfigwidget.ui
+++ b/kcontrol/accessibility/accessibilityconfigwidget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>AccessibilityConfigWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -95,7 +95,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -152,7 +152,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                             </widget>
                             <widget class="QLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout9</cstring>
+                                    <cstring>layout9</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -244,7 +244,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -338,7 +338,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                                         <property name="sizeType">
                                                             <enum>Expanding</enum>
                                                         </property>
-                                                        <property name="tqsizeHint">
+                                                        <property name="sizeHint">
                                                             <size>
                                                                 <width>0</width>
                                                                 <height>15</height>
@@ -363,7 +363,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>0</height>
@@ -420,7 +420,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -534,7 +534,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -625,7 +625,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -683,7 +683,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>21</width>
                                 <height>61</height>
@@ -789,7 +789,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="text">
                                             <string>Ma&amp;ximum speed:</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -806,7 +806,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="text">
                                             <string>Acceleration &amp;time:</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -895,7 +895,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -944,7 +944,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="text">
                                             <string>&amp;Repeat interval:</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -992,7 +992,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="text">
                                             <string>Acceleration &amp;profile:</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -1087,7 +1087,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                                         <property name="text">
                                             <string>&amp;Acceleration delay:</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -1108,7 +1108,7 @@ Please note that on slow machines this may cause a "lag" between the event causi
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>1</height>
@@ -1610,8 +1610,8 @@ Please note that on slow machines this may cause a "lag" between the event causi
 <slots>
     <slot access="private" specifier="non virtual">updateFlashScreenColor()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcmodule.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp
index 68ca85932..792951aec 100644
--- a/kcontrol/arts/arts.cpp
+++ b/kcontrol/arts/arts.cpp
@@ -116,7 +116,7 @@ void KArtsModule::initAudioIOList()
 
 void KArtsModule::slotArtsdExited(KProcess* proc)
 {
-	latestProcesstqStatus = proc->exitStatus();
+	latestProcessStatus = proc->exitStatus();
 	delete proc;
 }
 
@@ -151,17 +151,17 @@ KArtsModule::KArtsModule(TQWidget *parent, const char *name)
 
 	initAudioIOList();
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQTabWidget *tab = new TQTabWidget(this);
-	tqlayout->addWidget(tab);
+	layout->addWidget(tab);
 
 	general = new generalTab(tab);
 	hardware = new hardwareTab(tab);
 	//mixer = KCModuleLoader::loadModule("kmixcfg", tab);
 	//midi = new KMidConfig(tab, "kmidconfig");
 
-	general->tqlayout()->setMargin( KDialog::marginHint() );
-	hardware->tqlayout()->setMargin( KDialog::marginHint() );
+	general->layout()->setMargin( KDialog::marginHint() );
+	hardware->layout()->setMargin( KDialog::marginHint() );
 	general->latencyLabel->setFixedHeight(general->latencyLabel->fontMetrics().lineSpacing());
 
 	tab->addTab(general, i18n("&General"));
@@ -499,7 +499,7 @@ void KArtsModule::updateWidgets()
 	if (item >= 0)
 	{
 		audioIO = audioIOList.at(item)->name;
-		bool jack = (audioIO == TQString::tqfromLatin1("jack"));
+		bool jack = (audioIO == TQString::fromLatin1("jack"));
 		if(jack)
 		{
 			customRate->setChecked(false);
@@ -549,7 +549,7 @@ bool KArtsModule::realtimeIsPossible()
 		delete checkProcess;
 		realtimePossible =  false;
 	}
-	else if (latestProcesstqStatus == 0)
+	else if (latestProcessStatus == 0)
 	{
 		realtimePossible =  true;
 	}
@@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans,
 	TQString args;
 
 	if(fragmentCount)
-		args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount);
+		args += TQString::fromLatin1(" -F %1").arg(fragmentCount);
 
 	if(fragmentSize)
-		args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize);
+		args += TQString::fromLatin1(" -S %1").arg(fragmentSize);
 
 	if (!audioIO.isEmpty())
-		args += TQString::tqfromLatin1(" -a %1").arg(audioIO);
+		args += TQString::fromLatin1(" -a %1").arg(audioIO);
 
 	if (duplex)
-		args += TQString::tqfromLatin1(" -d");
+		args += TQString::fromLatin1(" -d");
 
 	if (netTrans)
-		args += TQString::tqfromLatin1(" -n");
+		args += TQString::fromLatin1(" -n");
 
 	if (!deviceName.isEmpty())
-		args += TQString::tqfromLatin1(" -D ") + deviceName;
+		args += TQString::fromLatin1(" -D ") + deviceName;
 
 	if (rate)
-		args += TQString::tqfromLatin1(" -r %1").arg(rate);
+		args += TQString::fromLatin1(" -r %1").arg(rate);
 
 	if (bits)
-		args += TQString::tqfromLatin1(" -b %1").arg(bits);
+		args += TQString::fromLatin1(" -b %1").arg(bits);
 
 	if (autoSuspend && suspendTime)
-		args += TQString::tqfromLatin1(" -s %1").arg(suspendTime);
+		args += TQString::fromLatin1(" -s %1").arg(suspendTime);
 
 	if (!addOptions.isEmpty())
 		args += TQChar(' ') + addOptions;
 
-	args += TQString::tqfromLatin1(" -m artsmessage");
-	args += TQString::tqfromLatin1(" -c drkonqi");
-	args += TQString::tqfromLatin1(" -l 3");
-	args += TQString::tqfromLatin1(" -f");
+	args += TQString::fromLatin1(" -m artsmessage");
+	args += TQString::fromLatin1(" -c drkonqi");
+	args += TQString::fromLatin1(" -l 3");
+	args += TQString::fromLatin1(" -f");
 
 	return args;
 }
diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h
index 2e033286d..80df5bd8e 100644
--- a/kcontrol/arts/arts.h
+++ b/kcontrol/arts/arts.h
@@ -92,7 +92,7 @@ private:
   hardwareTab *hardware;
   KConfig *config;
   DeviceManager *deviceManager;
-  int latestProcesstqStatus;
+  int latestProcessStatus;
   int fragmentCount;
   int fragmentSize;
   bool configChanged;
diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui
index 19aa6444a..5b7ba7f79 100644
--- a/kcontrol/arts/generaltab.ui
+++ b/kcontrol/arts/generaltab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>generalTab</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,7 +12,7 @@
             <height>613</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>450</height>
@@ -186,7 +186,7 @@ Recommended if you want sound.</string>
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -227,7 +227,7 @@ Recommended if you want sound.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>173</width>
                                     <height>20</height>
@@ -240,7 +240,7 @@ Recommended if you want sound.</string>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -256,7 +256,7 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -289,7 +289,7 @@ Recommended if you want sound.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -308,7 +308,7 @@ Recommended if you want sound.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -322,7 +322,7 @@ Recommended if you want sound.</string>
 <includes>
     <include location="local" impldecl="in implementation">krichtextlabel.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui
index 977cb6440..c11f19962 100644
--- a/kcontrol/arts/hardwaretab.ui
+++ b/kcontrol/arts/hardwaretab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>hardwareTab</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout57</cstring>
+                        <cstring>layout57</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -117,7 +117,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -133,7 +133,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -189,7 +189,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -208,7 +208,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -252,7 +252,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -345,7 +345,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>
@@ -354,5 +354,5 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp
index 0d20965c7..5c7618a1b 100644
--- a/kcontrol/arts/krichtextlabel.cpp
+++ b/kcontrol/arts/krichtextlabel.cpp
@@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text )
 KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( Qt::WordBreak );
+  setAlignment( Qt::WordBreak );
   setText(text);
 }
 
 KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name )
  : TQLabel ( parent, name ) {
   m_defaultWidth = QMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5);
-  tqsetAlignment( Qt::WordBreak );
+  setAlignment( Qt::WordBreak );
 }
 
 void KRichTextLabel::setDefaultWidth(int defaultWidth)
@@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const
   return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false);
 }
 
-TQSize KRichTextLabel::tqminimumSizeHint() const
+TQSize KRichTextLabel::minimumSizeHint() const
 {
   TQString qt_text = qrichtextify( text() );
   int pref_width = 0;
@@ -97,9 +97,9 @@ TQSize KRichTextLabel::tqminimumSizeHint() const
   return TQSize(pref_width, rt.height());
 }
 
-TQSize KRichTextLabel::tqsizeHint() const
+TQSize KRichTextLabel::sizeHint() const
 {
-  return tqminimumSizeHint();
+  return minimumSizeHint();
 }
 
 void KRichTextLabel::setText( const TQString &text ) {
diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h
index 178630bc2..40ead0375 100644
--- a/kcontrol/arts/krichtextlabel.h
+++ b/kcontrol/arts/krichtextlabel.h
@@ -24,7 +24,7 @@
 #include <kdelibs_export.h>
 
 /**
- * @short A tqreplacement for TQLabel that supports richtext and proper tqlayout management
+ * @short A replacement for TQLabel that supports richtext and proper layout management
  *
  * @author Waldo Bastian <bastian@kde.org>
  */
@@ -45,8 +45,8 @@ public:
   int defaultWidth() const { return m_defaultWidth; }
   void setDefaultWidth(int defaultWidth);
 
-  virtual TQSize tqminimumSizeHint() const;
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize minimumSizeHint() const;
+  virtual TQSize sizeHint() const;
   TQSizePolicy sizePolicy() const;
 
 public slots:
diff --git a/kcontrol/background/bgadvanced.cpp b/kcontrol/background/bgadvanced.cpp
index c6b21c38a..e1f9ece96 100644
--- a/kcontrol/background/bgadvanced.cpp
+++ b/kcontrol/background/bgadvanced.cpp
@@ -432,7 +432,7 @@ KProgramEditDialog::KProgramEditDialog(const TQString &program, TQWidget *parent
     m_RefreshEdit->setRange(5, 60);
     m_RefreshEdit->setSteps(5, 10);
     m_RefreshEdit->setSuffix(i18n(" min"));
-    m_RefreshEdit->setFixedSize(m_RefreshEdit->tqsizeHint());
+    m_RefreshEdit->setFixedSize(m_RefreshEdit->sizeHint());
     lbl->setBuddy(m_RefreshEdit);
     grid->addWidget(m_RefreshEdit, 5, 1, AlignLeft);
 
diff --git a/kcontrol/background/bgadvanced_ui.ui b/kcontrol/background/bgadvanced_ui.ui
index 4048c820f..6aa3d436a 100644
--- a/kcontrol/background/bgadvanced_ui.ui
+++ b/kcontrol/background/bgadvanced_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGAdvancedBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -91,7 +91,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                     <property name="enabled">
                         <bool>false</bool>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>400</width>
                             <height>0</height>
@@ -223,7 +223,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>220</width>
                             <height>20</height>
@@ -376,7 +376,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -395,7 +395,7 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -453,8 +453,8 @@ You can also remove programs from this list clicking on the &lt;b&gt;Remove&lt;/
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index 309d19d08..8294f53a3 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -142,7 +142,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    }
 
    // background image settings
-   TQIconSet iconSet = SmallIconSet(TQString::tqfromLatin1("fileopen"));
+   TQIconSet iconSet = SmallIconSet(TQString::fromLatin1("fileopen"));
    TQPixmap pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal );
    m_urlWallpaperButton->setIconSet( iconSet );
    m_urlWallpaperButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 );
@@ -257,7 +257,7 @@ BGDialog::BGDialog(TQWidget* parent, KConfig* _config, bool _multidesktop)
    updateUI();
 
 #if (QT_VERSION-0 >= 0x030200)
-   connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
+   connect( qApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( desktopResized())); // RANDR support
 #endif
 }
 
@@ -395,7 +395,7 @@ TQString BGDialog::quickHelp() const
       " wallpaper can be overlaid opaquely, or blended in different ways with"
       " the background colors and patterns.<p>"
       " KDE allows you to have the wallpaper change automatically at specified"
-      " intervals of time. You can also tqreplace the background with a program"
+      " intervals of time. You can also replace the background with a program"
       " that updates the desktop dynamically. For example, the \"kdeworld\""
       " program shows a day/night map of the world which is updated periodically.");
 }
@@ -414,14 +414,14 @@ void BGDialog::slotIdentifyScreens()
       screenLabel->setFrameStyle(TQFrame::Panel);
       screenLabel->setFrameShadow(TQFrame::Plain);
 
-      screenLabel->tqsetAlignment(Qt::AlignCenter);
+      screenLabel->setAlignment(Qt::AlignCenter);
       screenLabel->setNum(int(s + 1));
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
       TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
 
       TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
-      TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
+      TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
       targetGeometry.moveCenter(screenCenter);
 
       screenLabel->setGeometry(targetGeometry);
@@ -524,7 +524,7 @@ void BGDialog::loadWallpaperFilesList() {
       if (imageCaption.isEmpty())
       {
          imageCaption = fileName;
-         imageCaption.tqreplace('_', ' ');
+         imageCaption.replace('_', ' ');
          imageCaption = KStringHandler::capwords(imageCaption);
       }
 
@@ -571,7 +571,7 @@ void BGDialog::loadWallpaperFilesList() {
             else
                imageCaption = (*it).mid(slash);
 
-            imageCaption.tqreplace('_', ' ');
+            imageCaption.replace('_', ' ');
             imageCaption = KStringHandler::capwords(imageCaption);
          }
 
@@ -943,7 +943,7 @@ void BGDialog::slotWallpaperTypeChanged(int i)
          else
             m_wallpaperPos = KBackgroundSettings::Tiled;
       }
-      else if (KMimeType::tqfindByPath(path)->is("image/svg+xml"))
+      else if (KMimeType::findByPath(path)->is("image/svg+xml"))
       {
          m_wallpaperPos = KBackgroundSettings::Scaled;         
       }
@@ -1004,7 +1004,7 @@ void BGDialog::slotSetupMulti()
 {
     KBackgroundRenderer *r = eRenderer();
 
-    BGMultiWallpaperDialog dlg(r, tqtopLevelWidget());
+    BGMultiWallpaperDialog dlg(r, topLevelWidget());
     if (dlg.exec() == TQDialog::Accepted) {
         r->stop();
         m_slideShowRandom = r->multiWallpaperMode();
@@ -1182,7 +1182,7 @@ void BGDialog::slotAdvanced()
     KBackgroundRenderer *r = eRenderer();
 
     m_previewUpdates = false;
-    BGAdvancedDialog dlg(r, tqtopLevelWidget(), m_multidesktop);
+    BGAdvancedDialog dlg(r, topLevelWidget(), m_multidesktop);
 
     if (!m_pMonitorArrangement->isEnabled()) {
        dlg.makeReadOnly();
diff --git a/kcontrol/background/bgdialog_ui.ui b/kcontrol/background/bgdialog_ui.ui
index 93df51428..7cc6571d5 100644
--- a/kcontrol/background/bgdialog_ui.ui
+++ b/kcontrol/background/bgdialog_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGDialog_UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>0</height>
@@ -114,7 +114,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="1" column="4" rowspan="2" colspan="1">
             <property name="name">
-                <cstring>tqlayout36</cstring>
+                <cstring>layout36</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -132,7 +132,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>0</height>
@@ -141,7 +141,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout35</cstring>
+                        <cstring>layout35</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -161,7 +161,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -197,7 +197,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -219,7 +219,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -255,7 +255,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -277,7 +277,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -313,7 +313,7 @@
                             <property name="sizeType">
                                 <enum>Minimum</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>4</width>
                                     <height>20</height>
@@ -333,7 +333,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -386,7 +386,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="3" column="1">
                     <property name="name">
-                        <cstring>tqlayout31</cstring>
+                        <cstring>layout31</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -440,7 +440,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="6" column="1">
                     <property name="name">
-                        <cstring>tqlayout23</cstring>
+                        <cstring>layout23</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -522,7 +522,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>120</width>
                             <height>10</height>
@@ -539,7 +539,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>130</width>
                             <height>10</height>
@@ -613,7 +613,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>260</width>
                             <height>20</height>
@@ -641,7 +641,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>110</width>
                             <height>16</height>
@@ -711,8 +711,8 @@
     <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/background/bghash.h b/kcontrol/background/bghash.h
index b59a46f96..ab13daf90 100644
--- a/kcontrol/background/bghash.h
+++ b/kcontrol/background/bghash.h
@@ -8,7 +8,7 @@
 static int QHash(TQString key)
 {
     int g, h = 0;
-    const TQChar *p = key.tqunicode();
+    const TQChar *p = key.unicode();
     for (unsigned i=0; i < key.length(); i++) {
         h = (h << 4) + p[i].cell();
         if ((g = (h & 0xf0000000)))
diff --git a/kcontrol/background/bgmonitor.cpp b/kcontrol/background/bgmonitor.cpp
index 3c2278722..f78a7b616 100644
--- a/kcontrol/background/bgmonitor.cpp
+++ b/kcontrol/background/bgmonitor.cpp
@@ -91,7 +91,7 @@ void BGMonitorArrangement::updateArrangement()
 {
     // In this function, sizes, etc have a normal value, and their "expanded"
     // value. The expanded value is used for setting the size of the monitor
-    // image that tqcontains the preview of the background. The monitor image
+    // image that contains the preview of the background. The monitor image
     // will set the background preview back to the normal value.
     
     TQRect overallGeometry;
@@ -157,21 +157,21 @@ void BGMonitorArrangement::setPixmap( const KPixmap & pm )
 BGMonitorLabel::BGMonitorLabel(TQWidget *parent, const char *name)
     : TQLabel(parent, name)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
     setScaledContents(true);
     setPixmap( TQPixmap( locate("data",  "kcontrol/pics/monitor.png") ) );
     m_pBGMonitor = new BGMonitor(this);
     
-    TQWhatsThis::add( this, i18n("This picture of a monitor tqcontains a preview of what the current settings will look like on your desktop.") );
+    TQWhatsThis::add( this, i18n("This picture of a monitor contains a preview of what the current settings will look like on your desktop.") );
 }
 
 
 void BGMonitorLabel::updateMonitorGeometry()
 {
-    double scaleX = double(width()) / double(tqsizeHint().width());
-    double scaleY = double(height()) / double(tqsizeHint().height());
+    double scaleX = double(width()) / double(sizeHint().width());
+    double scaleY = double(height()) / double(sizeHint().height());
     
-    kdDebug() << k_funcinfo << " Setting tqgeometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
+    kdDebug() << k_funcinfo << " Setting geometry to " << TQRect( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) ) << endl;
     m_pBGMonitor->setGeometry( int(23*scaleX), int(14*scaleY), int(151*scaleX), int(115*scaleY) );
 }
 
@@ -189,7 +189,7 @@ void BGMonitorLabel::resizeEvent( TQResizeEvent * e )
 BGMonitor::BGMonitor(TQWidget *parent, const char *name)
     : TQLabel(parent, name)
 {
-    tqsetAlignment(AlignCenter);
+    setAlignment(AlignCenter);
     setScaledContents(true);
     setAcceptDrops(true);
 }
diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp
index 288a06aa3..f11363982 100644
--- a/kcontrol/background/bgrender.cpp
+++ b/kcontrol/background/bgrender.cpp
@@ -54,7 +54,7 @@ KBackgroundRenderer::KBackgroundRenderer(int desk, int screen, bool drawBackgrou
     m_isBusyCursor = false;
     m_enableBusyCursor = false;
     m_pDirs = KGlobal::dirs();
-    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+    m_rSize = m_Size = drawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
     m_pProc = 0L;
     m_Tempfile = 0L;
     m_bPreview = false;
@@ -85,7 +85,7 @@ void KBackgroundRenderer::setSize(const TQSize &size)
 void KBackgroundRenderer::desktopResized()
 {
     m_State = 0;
-    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->tqgeometry().size();
+    m_rSize = drawBackgroundPerScreen() ? KApplication::desktop()->screenGeometry(screen()).size() : KApplication::desktop()->geometry().size();
     if( !m_bPreview )
         m_Size = m_rSize;
 }
@@ -132,24 +132,24 @@ TQString KBackgroundRenderer::buildCommand()
         switch (cmd.at(pos+1).latin1()) {
         case 'f':
             createTempFile();
-            cmd.tqreplace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
+            cmd.replace(pos, 2, KShellProcess::quote(m_Tempfile->name()));
             pos += m_Tempfile->name().length() - 2;
             break;
 
         case 'x':
             num.setNum(m_Size.width());
-            cmd.tqreplace(pos, 2, num);
+            cmd.replace(pos, 2, num);
             pos += num.length() - 2;
             break;
 
         case 'y':
             num.setNum(m_Size.height());
-            cmd.tqreplace(pos, 2, num);
+            cmd.replace(pos, 2, num);
             pos += num.length() - 2;
             break;
 
         case '%':
-            cmd.tqreplace(pos, 2, "%");
+            cmd.replace(pos, 2, "%");
             pos--;
             break;
         default:
@@ -191,7 +191,7 @@ int KBackgroundRenderer::doBackground(bool quit)
         int tile_val = TQPixmap::defaultDepth() >= 24 ? 1 : 2;
     // some dithering may be needed even with bpb==15/16, so don't use tileWidth==1
     // for them
-    // with tileWidth>2, tqrepainting the desktop causes nasty effect (XFree86 4.1.0 )
+    // with tileWidth>2, repainting the desktop causes nasty effect (XFree86 4.1.0 )
         if( XQueryBestTile( qt_xdisplay(), qt_xrootwin(), tile_val, tile_val,
             &tileWidth, &tileHeight ) != Success )
             tileWidth = tileHeight = tile_val; // some defaults
@@ -584,7 +584,7 @@ void KBackgroundRenderer::fastWallpaperBlend()
             m_Pixmap.convertFromImage( m_Wallpaper );
         return;
     }
-    else if( m_WallpaperRect.tqcontains( TQRect( TQPoint( 0, 0 ), m_Size ))
+    else if( m_WallpaperRect.contains( TQRect( TQPoint( 0, 0 ), m_Size ))
         && !m_Wallpaper.hasAlphaBuffer()) // wallpaper covers all and no blending
         m_Pixmap = TQPixmap( m_Size );
     else if (m_Background.size() == m_Size)
@@ -730,10 +730,10 @@ void KBackgroundRenderer::blend(TQImage& dst, TQRect dr, const TQImage& src, TQP
 			+ (dr.x() + x) * sizeof(QRgb));
                 d = reinterpret_cast<QRgb*>(src.scanLine(soffs.y() + y)
 			+ (soffs.x() + x) * sizeof(QRgb));
-                a = (tqAlpha(*d) * blendFactor) / 100;
-                *b = tqRgb(tqRed(*b) - (((tqRed(*b) - tqRed(*d)) * a) >> 8),
-                          tqGreen(*b) - (((tqGreen(*b) - tqGreen(*d)) * a) >> 8),
-                          tqBlue(*b) - (((tqBlue(*b) - tqBlue(*d)) * a) >> 8));
+                a = (qAlpha(*d) * blendFactor) / 100;
+                *b = qRgb(qRed(*b) - (((qRed(*b) - qRed(*d)) * a) >> 8),
+                          qGreen(*b) - (((qGreen(*b) - qGreen(*d)) * a) >> 8),
+                          qBlue(*b) - (((qBlue(*b) - qBlue(*d)) * a) >> 8));
             }
         }
     }
@@ -946,8 +946,8 @@ void KBackgroundRenderer::createTempFile()
 TQString KBackgroundRenderer::cacheFileName()
 {
     TQString f = fingerprint();
-    f.tqreplace ( ':', '_' ); // avoid characters that shouldn't be in filenames
-    f.tqreplace ( '/', '#' );
+    f.replace ( ':', '_' ); // avoid characters that shouldn't be in filenames
+    f.replace ( '/', '#' );
     f = locateLocal( "cache", TQString( "background/%1x%2_%3.png" )
         .arg( m_Size.width()).arg( m_Size.height()).arg( f ));
     return f;
@@ -1046,7 +1046,7 @@ KVirtualBGRenderer::KVirtualBGRenderer( int desk, KConfig *config )
     }
 
     initRenderers();
-    m_size = KApplication::desktop()->tqgeometry().size();
+    m_size = KApplication::desktop()->geometry().size();
 }
 
 KVirtualBGRenderer::~KVirtualBGRenderer()
@@ -1153,7 +1153,7 @@ void KVirtualBGRenderer::setEnabled(bool enable)
 
 void KVirtualBGRenderer::desktopResized()
 {
-    m_size = KApplication::desktop()->tqgeometry().size();
+    m_size = KApplication::desktop()->geometry().size();
 
     if (m_pPixmap)
     {
@@ -1194,7 +1194,7 @@ void KVirtualBGRenderer::setPreview(const TQSize & size)
 
 TQSize KVirtualBGRenderer::renderSize(int screen)
 {
-    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->tqgeometry().size();
+    return m_bDrawBackgroundPerScreen ? KApplication::desktop()->screenGeometry(screen).size() : KApplication::desktop()->geometry().size();
 }
 
 
diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp
index 90d028e22..8d3bdac0f 100644
--- a/kcontrol/background/bgsettings.cpp
+++ b/kcontrol/background/bgsettings.cpp
@@ -751,7 +751,7 @@ void KBackgroundSettings::readSettings(bool reparse)
     m_BackgroundMode = defBackgroundMode;
     s = m_pConfig->readEntry("BackgroundMode", "invalid");
 
-    if (m_BMMap.tqcontains(s)) {
+    if (m_BMMap.contains(s)) {
         int mode = m_BMMap[s];
         // consistency check
         if  ( ((mode != Pattern) && (mode != Program)) ||
@@ -763,7 +763,7 @@ void KBackgroundSettings::readSettings(bool reparse)
 
     m_BlendMode = defBlendMode;
     s = m_pConfig->readEntry("BlendMode", "invalid");
-    if (m_BlMMap.tqcontains(s)) {
+    if (m_BlMMap.contains(s)) {
       m_BlendMode = m_BlMMap[s];
     }
 
@@ -784,7 +784,7 @@ void KBackgroundSettings::readSettings(bool reparse)
 
     m_MultiMode = defMultiMode;
     s = m_pConfig->readEntry("MultiWallpaperMode");
-    if (m_MMMap.tqcontains(s)) {
+    if (m_MMMap.contains(s)) {
 	int mode = m_MMMap[s];
 	m_MultiMode = mode;
     }
@@ -799,7 +799,7 @@ void KBackgroundSettings::readSettings(bool reparse)
     m_WallpaperMode = defWallpaperMode;
     m_Wallpaper = m_pConfig->readPathEntry("Wallpaper");
     s = m_pConfig->readEntry("WallpaperMode", "invalid");
-    if (m_WMMap.tqcontains(s)) {
+    if (m_WMMap.contains(s)) {
         int mode = m_WMMap[s];
         // consistency check.
         if ((mode == NoWallpaper) || !m_Wallpaper.isEmpty() || (m_MultiMode == InOrder || m_MultiMode == Random))
@@ -1029,7 +1029,7 @@ TQString KBackgroundSettings::fingerprint()
     s += TQString("wm:%1;").arg(m_WallpaperMode);
     if (m_WallpaperMode != NoWallpaper)
     {
-        TQ_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
+        Q_UINT32 rh = KGlobal::dirs()->calcResourceHash("wallpaper", currentWallpaper(), false);
         s += TQString("wp:%2:%1;").arg(rh).arg(currentWallpaper());
         
     }
diff --git a/kcontrol/background/bgwallpaper_ui.ui b/kcontrol/background/bgwallpaper_ui.ui
index a0a4a2a96..c3d9a9a40 100644
--- a/kcontrol/background/bgwallpaper_ui.ui
+++ b/kcontrol/background/bgwallpaper_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BGMultiWallPaperBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
         </widget>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -69,7 +69,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -80,7 +80,7 @@
         </widget>
         <widget class="QLayoutWidget" row="3" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -98,7 +98,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>300</width>
                             <height>100</height>
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -162,6 +162,6 @@
     <include location="local" impldecl="in declaration">bgwallpaper.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp
index e6e7bce35..da77d7cda 100644
--- a/kcontrol/background/main.cpp
+++ b/kcontrol/background/main.cpp
@@ -54,11 +54,11 @@ KBackground::KBackground(TQWidget *parent, const char *name, const TQStringList
 	configname.sprintf("kdesktop-screen-%drc", screen_number);
     m_pConfig = new KConfig(configname, false, false);
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_base = new BGDialog(this, m_pConfig);
     setQuickHelp( m_base->quickHelp());
-    tqlayout->add(m_base);
-    tqlayout->addStretch();
+    layout->add(m_base);
+    layout->addStretch();
 
     KImageIO::registerFormats();
 
diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp
index c0b9c20fc..10d774da7 100644
--- a/kcontrol/bell/bell.cpp
+++ b/kcontrol/bell/bell.cpp
@@ -67,14 +67,14 @@ extern "C"
 KBellConfig::KBellConfig(TQWidget *parent, const char *name):
     KCModule(parent, name)
 {
-  TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   int row = 0;
   TQGroupBox *box = new TQGroupBox( i18n("Bell Settings"), this );
   box->setColumnLayout( 0, Qt::Horizontal );
-  tqlayout->addWidget(box);
-  tqlayout->addStretch();
-  TQGridLayout *grid = new TQGridLayout(box->tqlayout(), KDialog::spacingHint());
+  layout->addWidget(box);
+  layout->addStretch();
+  TQGridLayout *grid = new TQGridLayout(box->layout(), KDialog::spacingHint());
   grid->setColStretch(0, 0);
   grid->setColStretch(1, 1);
   grid->addColSpacing(0, 30);
diff --git a/kcontrol/clock/dtime.cpp b/kcontrol/clock/dtime.cpp
index cc83f6306..109e436c4 100644
--- a/kcontrol/clock/dtime.cpp
+++ b/kcontrol/clock/dtime.cpp
@@ -65,14 +65,14 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   // Time Server
 
-  privateLayoutWidget = new TQWidget( this, "tqlayout1" );
-  TQHBoxLayout *tqlayout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntptqlayout");
+  privateLayoutWidget = new TQWidget( this, "layout1" );
+  TQHBoxLayout *layout1 = new TQHBoxLayout( privateLayoutWidget, 0, 0, "ntplayout");
 
   setDateTimeAuto = new TQCheckBox( privateLayoutWidget, "setDateTimeAuto" );
   setDateTimeAuto->setText(i18n("Set date and time &automatically:"));
   connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(serverTimeCheck()));
   connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), TQT_SLOT(configChanged()));
-  tqlayout1->addWidget( setDateTimeAuto );
+  layout1->addWidget( setDateTimeAuto );
 
   timeServerList = new TQComboBox( false, privateLayoutWidget, "timeServerList" );
   connect(timeServerList, TQT_SIGNAL(activated(int)), TQT_SLOT(configChanged()));
@@ -80,7 +80,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
   connect(setDateTimeAuto, TQT_SIGNAL(toggled(bool)), timeServerList, TQT_SLOT(setEnabled(bool)));
   timeServerList->setEnabled(false);
   timeServerList->setEditable(true);
-  tqlayout1->addWidget( timeServerList );
+  layout1->addWidget( timeServerList );
   findNTPutility();
 
   // Date box
@@ -89,7 +89,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
   TQVBoxLayout *l1 = new TQVBoxLayout( dateBox, KDialog::spacingHint() );
 
   cal = new KDatePicker( dateBox );
-  cal->setMinimumSize(cal->tqsizeHint());
+  cal->setMinimumSize(cal->sizeHint());
   l1->addWidget( cal );
   TQWhatsThis::add( cal, i18n("Here you can change the system date's day of the month, month and year.") );
 
@@ -120,7 +120,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   TQLabel *dots1 = new TQLabel(":", timeBox);
   dots1->setMinimumWidth( 7 );
-  dots1->tqsetAlignment( TQLabel::AlignCenter );
+  dots1->setAlignment( TQLabel::AlignCenter );
   v3->addMultiCellWidget(dots1, 0, 1, 3, 3 );
 
   minute = new HMSTimeWidget( timeBox );
@@ -132,7 +132,7 @@ Dtime::Dtime(TQWidget * parent, const char *name)
 
   TQLabel *dots2 = new TQLabel(":", timeBox);
   dots2->setMinimumWidth( 7 );
-  dots2->tqsetAlignment( TQLabel::AlignCenter );
+  dots2->setAlignment( TQLabel::AlignCenter );
   v3->addMultiCellWidget(dots2, 0, 1, 5, 5 );
 
   second = new HMSTimeWidget( timeBox );
@@ -252,7 +252,7 @@ oceania.pool.ntp.org"))));
 
   // Reset to the current date and time
   time = TQTime::currentTime();
-  date = TQDate::tqcurrentDate();
+  date = TQDate::currentDate();
   cal->setDate(date);
 
   // start internal timer
@@ -285,8 +285,8 @@ void Dtime::save()
     // NTP Time setting
     TQString timeServer = timeServerList->currentText();
     if( timeServer.find( TQRegExp(".*\\(.*\\)$") ) != -1 ) {
-      timeServer.tqreplace( TQRegExp(".*\\("), "" );
-      timeServer.tqreplace( TQRegExp("\\).*"), "" );
+      timeServer.replace( TQRegExp(".*\\("), "" );
+      timeServer.replace( TQRegExp("\\).*"), "" );
       // Would this be better?: s/^.*\(([^)]*)\).*$/\1/
     }
     KProcess proc;
@@ -368,7 +368,7 @@ TQString Dtime::quickHelp() const
 void Kclock::setTime(const TQTime &time)
 {
   this->time = time;
-  tqrepaint();
+  repaint();
 }
 
 void Kclock::paintEvent( TQPaintEvent * )
@@ -382,8 +382,8 @@ void Kclock::paintEvent( TQPaintEvent * )
   TQPointArray pts;
   TQPoint cp = rect().center();
   int d = QMIN(width(),height());
-  TQColor hands =  tqcolorGroup().dark();
-  TQColor shadow =  tqcolorGroup().text();
+  TQColor hands =  colorGroup().dark();
+  TQColor shadow =  colorGroup().text();
   paint.setPen( shadow );
   paint.setBrush( shadow );
   paint.setViewport(4,4,width(),height());
diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp
index d6a52456c..86e47e7ad 100644
--- a/kcontrol/clock/main.cpp
+++ b/kcontrol/clock/main.cpp
@@ -59,17 +59,17 @@ KclockModule::KclockModule(TQWidget *parent, const char *name, const TQStringLis
 
   KGlobal::locale()->insertCatalogue("timezones"); // For time zone translations
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   dtime = new Dtime(this);
-  tqlayout->addWidget(dtime);
+  layout->addWidget(dtime);
   connect(dtime, TQT_SIGNAL(timeChanged(bool)), this, TQT_SIGNAL(changed(bool)));
 
   tzone = new Tzone(this);
-  tqlayout->addWidget(tzone);
+  layout->addWidget(tzone);
   connect(tzone, TQT_SIGNAL(zoneChanged(bool)), this, TQT_SIGNAL(changed(bool)));
 
-  tqlayout->addStretch();
+  layout->addStretch();
 
   if(getuid() == 0)
     setButtons(Help|Apply);
diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp
index bfb32c557..6161198c0 100644
--- a/kcontrol/colors/colorscm.cpp
+++ b/kcontrol/colors/colorscm.cpp
@@ -154,7 +154,7 @@ KColorScheme::KColorScheme(TQWidget *parent, const char *name, const TQStringLis
     TQWhatsThis::add( sList, i18n("This is a list of predefined color schemes,"
        " including any that you may have created. You can preview an existing"
        " color scheme by selecting it from the list. The current scheme will"
-       " be tqreplaced by the selected color scheme.<p>"
+       " be replaced by the selected color scheme.<p>"
        " Warning: if you have not yet applied any changes you may have made"
        " to the current scheme, those changes will be lost if you select"
        " another color scheme.") );
diff --git a/kcontrol/colors/stdclient_bitmaps.h b/kcontrol/colors/stdclient_bitmaps.h
index 6b93e8481..912040fe2 100644
--- a/kcontrol/colors/stdclient_bitmaps.h
+++ b/kcontrol/colors/stdclient_bitmaps.h
@@ -18,7 +18,7 @@ static unsigned char close_dgray_bits[] = {
   0xc0, 0x06, 0x80, 0x03, 0x80, 0x03, 0xc0, 0x06, 0x60, 0x0c, 0x30, 0x18,
   0x18, 0x30, 0x08, 0x20, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char close_tqmask_bits[] = {
+static unsigned char close_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x0c, 0x30, 0x1c, 0x38, 0x38, 0x1c, 0x70, 0x0e,
   0xe0, 0x07, 0xc0, 0x03, 0xc0, 0x03, 0xe0, 0x07, 0x70, 0x0e, 0x38, 0x1c,
   0x1c, 0x38, 0x0c, 0x30, 0x00, 0x00, 0x00, 0x00};
@@ -34,7 +34,7 @@ static unsigned char iconify_dgray_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 
-static unsigned char iconify_tqmask_bits[] = {
+static unsigned char iconify_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x80, 0x03, 0x80, 0x02, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -49,7 +49,7 @@ static unsigned char maximize_dgray_bits[] = {
   0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0x10,
   0xf8, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char maximize_tqmask_bits[] = {
+static unsigned char maximize_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18, 0x0c, 0x18,
   0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0xfc, 0x1f,
   0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -64,7 +64,7 @@ static unsigned char maximizedown_dgray_bits[] = {
   0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08, 0x04, 0x08,
   0xf4, 0x0f, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char maximizedown_tqmask_bits[] = {
+static unsigned char maximizedown_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x1f, 0xfc, 0x1f, 0x0c, 0x18,
   0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18, 0x0c, 0x18,
   0xfc, 0x1f, 0xfc, 0x1f, 0x00, 0x00, 0x00, 0x00};
@@ -79,7 +79,7 @@ static unsigned char menu_dgray_bits[] = {
   0x00, 0x00, 0x00, 0x20, 0xf8, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char menu_tqmask_bits[] = {
+static unsigned char menu_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0xfc, 0x3f, 0x04, 0x20, 0xfc, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -99,7 +99,7 @@ static unsigned char pindown_dgray_bits[] = {
   0x48, 0x30, 0xc8, 0x38, 0x08, 0x1f, 0x08, 0x18, 0x10, 0x1c, 0x10, 0x0e,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char pindown_tqmask_bits[] = {
+static unsigned char pindown_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xc0, 0x1f, 0xf0, 0x3f, 0xf0, 0x3f,
   0xf8, 0x3f, 0xf8, 0x3f, 0xf8, 0x1f, 0xf8, 0x1f, 0xf0, 0x1f, 0xf0, 0x0f,
   0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -119,7 +119,7 @@ static unsigned char pinup_dgray_bits[] = {
   0x40, 0x20, 0x40, 0x20, 0x7f, 0x2a, 0x40, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
-static unsigned char pinup_tqmask_bits[] = {
+static unsigned char pinup_mask_bits[] = {
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x20, 0xc0, 0x31, 0xc0, 0x3f,
   0xff, 0x3f, 0xff, 0x3f, 0xff, 0x3f, 0xc0, 0x3f, 0xc0, 0x31, 0xc0, 0x20,
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
diff --git a/kcontrol/colors/widgetcanvas.cpp b/kcontrol/colors/widgetcanvas.cpp
index 3013321b8..67e68b3a3 100644
--- a/kcontrol/colors/widgetcanvas.cpp
+++ b/kcontrol/colors/widgetcanvas.cpp
@@ -64,7 +64,7 @@ void WidgetCanvas::paintEvent(TQPaintEvent *)
 void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
 {
     for ( int i = 0; i < MAX_HOTSPOTS; i++ )
-	if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
+	if ( hotspots[i].rect.contains( me->pos() ) ) {
 	    emit widgetSelected( hotspots[i].number );
 	    return;
 	}
@@ -73,7 +73,7 @@ void WidgetCanvas::mousePressEvent( TQMouseEvent *me )
 void WidgetCanvas::mouseMoveEvent( TQMouseEvent *me )
 {
     for ( int i = 0; i < MAX_HOTSPOTS; i++ )
-	if ( hotspots[i].rect.tqcontains( me->pos() ) ) {
+	if ( hotspots[i].rect.contains( me->pos() ) ) {
 	    if ( i != currentHotspot ) {
 		TQString tip = tips[hotspots[i].number];
 		TQToolTip::remove( this );
@@ -91,7 +91,7 @@ void WidgetCanvas::dropEvent( TQDropEvent *e)
     TQColor c;
     if (KColorDrag::decode( e, c)) {
 	for ( int i = 0; i < MAX_HOTSPOTS; i++ )
-	    if ( hotspots[i].rect.tqcontains( e->pos() ) ) {
+	    if ( hotspots[i].rect.contains( e->pos() ) ) {
 		emit colorDropped( hotspots[i].number, c);
 		return;
 	    }
@@ -162,7 +162,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, close_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, close_mask_bits, true);
     close_pix->setMask(bitmap); dis_close_pix->setMask(bitmap);
 
     minimize_pix = new TQPixmap(16, 16);
@@ -178,7 +178,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, iconify_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, iconify_mask_bits, true);
     minimize_pix->setMask(bitmap); dis_minimize_pix->setMask(bitmap);
     
     maximize_pix = new TQPixmap(16, 16);
@@ -194,7 +194,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, maximize_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, maximize_mask_bits, true);
     maximize_pix->setMask(bitmap); dis_maximize_pix->setMask(bitmap);
 
     normalize_pix = new TQPixmap(16, 16);
@@ -210,7 +210,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, maximizedown_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, maximizedown_mask_bits, true);
     normalize_pix->setMask(bitmap); dis_normalize_pix->setMask(bitmap);
 
     menu_pix = new TQPixmap(16, 16);
@@ -226,7 +226,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, menu_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, menu_mask_bits, true);
     menu_pix->setMask(bitmap); dis_menu_pix->setMask(bitmap);
 
     pinup_pix = new TQPixmap(16, 16);
@@ -247,7 +247,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, pinup_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, pinup_mask_bits, true);
     pinup_pix->setMask(bitmap); dis_pinup_pix->setMask(bitmap);
     
     pindown_pix = new TQPixmap(16, 16);
@@ -268,7 +268,7 @@ void WidgetCanvas::resetTitlebarPixmaps(const TQColor &actMed,
     pact.drawPixmap(0, 0, bitmap);
     pdis.drawPixmap(0, 0, bitmap);
     pact.end(); pdis.end();
-    bitmap = TQBitmap(16, 16, pindown_tqmask_bits, true);
+    bitmap = TQBitmap(16, 16, pindown_mask_bits, true);
     pindown_pix->setMask(bitmap); dis_pindown_pix->setMask(bitmap);
     
 }
@@ -327,7 +327,7 @@ void WidgetCanvas::drawSampleWidgets()
 #ifndef __osf__
     TQPainter::redirect( vertScrollBar, &pm );
 #endif
-    vertScrollBar->tqrepaint();
+    vertScrollBar->repaint();
     TQPainter::redirect( vertScrollBar, 0 );
     vertScrollBar->hide();
 
@@ -337,8 +337,8 @@ void WidgetCanvas::drawSampleWidgets()
     // Initialize the pixmap which we draw sample widgets into.
 
     smplw.resize(width(), height());
-    //smplw.fill( tqparentWidget()->back() );
-    smplw.fill( tqparentWidget()->tqcolorGroup().mid() );
+    //smplw.fill( parentWidget()->back() );
+    smplw.fill( parentWidget()->colorGroup().mid() );
 
     // Actually start painting in
 
@@ -567,9 +567,9 @@ void WidgetCanvas::drawSampleWidgets()
 	popup->setItemEnabled( id, false );
 
 	// HACK: Force Layouting
-	//Sad Eagle: tqsizeHint() forces tqlayouting too, and it's a lot less visible
-	//popup->tqsizeHint(); // Breaks with Qt 3.3
-	popup->resize(popup->tqsizeHint());
+	//Sad Eagle: sizeHint() forces layouting too, and it's a lot less visible
+	//popup->sizeHint(); // Breaks with Qt 3.3
+	popup->resize(popup->sizeHint());
 
 	pm = TQPixmap::grabWidget( popup );
 	delete popup;
@@ -585,12 +585,12 @@ void WidgetCanvas::drawSampleWidgets()
     // Valance
 
     qDrawWinPanel ( &paint, 0, 0, width(), height(),
-                    tqparentWidget()->tqcolorGroup(), TRUE, 0);
+                    parentWidget()->colorGroup(), TRUE, 0);
 
     // Stop the painting
 
     hotspots[ spot++ ] =
         HotSpot( TQRect( 0, 0, width(), height() ), CSM_Background ); // ?
 
-    tqrepaint( FALSE );
+    repaint( FALSE );
 }
diff --git a/kcontrol/componentchooser/EXAMPLE.desktop b/kcontrol/componentchooser/EXAMPLE.desktop
index 699601588..f5501162b 100644
--- a/kcontrol/componentchooser/EXAMPLE.desktop
+++ b/kcontrol/componentchooser/EXAMPLE.desktop
@@ -123,14 +123,14 @@ Comment[nl]=Een behulpzame omschrijving van de interface, bedoelt voor het infor
 Comment[nn]=Ei hjelpsam skildring av grensesnittet for infoboksen oppe til høgre
 Comment[nso]=Thlaloso yeo e tletsego thuso ya interface ya lepokisi la tshedimoso la godimo kago lagoja
 Comment[pa]=ਸੱਜੇ ਜਾਣਕਾਰੀ ਬਕਸੇ ਲਈ ਇੰਟਰਫੇਸ ਲ਼ਈ ਸਹਾਇਤਾ ਵੇਰਵਾ
-Comment[pl]=Potqmocny opis programu (dla informacji w okienku w prawym, górnym rogu)
+Comment[pl]=Pomocny opis programu (dla informacji w okienku w prawym, górnym rogu)
 Comment[pt]=Uma descrição útil da interface para a zona de informação do canto superior direito
 Comment[pt_BR]=Uma descrição útil da interface para a caixa de informação superior direita
 Comment[ro]=Aici trebuie să fie descrierea interfeței pentru căsuța din dreapta-sus
 Comment[ru]=Полезное описание интерфейса в верхнем правом информационном окне
 Comment[rw]=Umwirondoro ngirakamaro w'imigaragarire ujyanye n'agasanduku k'ibisobanuro hejuru iburyo
 Comment[se]=Laktaválddahus maid infoboksa badjin olgešbealde geavaha.
-Comment[sk]=Potqmocný popis rozhrania pre informačný box v pravom hornom rohu
+Comment[sk]=Pomocný popis rozhrania pre informačný box v pravom hornom rohu
 Comment[sl]=Primeren opis vmesnika za gornjo desno okno z informacijami
 Comment[sr]=Опис интерфејса који сте изабрали за горњу десну инфо коцкицу
 Comment[sr@Latn]=Opis interfejsa koji ste izabrali za gornju desnu info kockicu
diff --git a/kcontrol/componentchooser/browserconfig_ui.ui b/kcontrol/componentchooser/browserconfig_ui.ui
index 6dd93e404..886724970 100644
--- a/kcontrol/componentchooser/browserconfig_ui.ui
+++ b/kcontrol/componentchooser/browserconfig_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>BrowserConfig_UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -70,7 +70,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -86,7 +86,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -134,7 +134,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -169,6 +169,6 @@
 <slots>
     <slot access="protected">selectBrowser()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp
index 2da13b52a..88fdeb165 100644
--- a/kcontrol/componentchooser/componentchooser.cpp
+++ b/kcontrol/componentchooser/componentchooser.cpp
@@ -147,7 +147,7 @@ void CfgEmailClient::load(KConfig *)
 	kmailCB->setChecked(useKMail);
 	otherCB->setChecked(!useKMail);
 	txtEMailClient->setText(emailClient);
-	txtEMailClient->setFixedHeight(txtEMailClient->tqsizeHint().height());
+	txtEMailClient->setFixedHeight(txtEMailClient->sizeHint().height());
 	chkRunTerminal->setChecked((pSettings->getSetting(KEMailSettings::ClientTerminal) == "true"));
 
 	emit changed(false);
@@ -169,9 +169,9 @@ void CfgEmailClient::selectEmailClient()
 	TQString client = dlg.text();
 
 	// get the preferred Terminal Application 
-	KConfigGroup confGroup( KGlobal::config(), TQString::tqfromLatin1("General") );
-	TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::tqfromLatin1("konsole"));
-	preferredTerminal += TQString::tqfromLatin1(" -e ");
+	KConfigGroup confGroup( KGlobal::config(), TQString::fromLatin1("General") );
+	TQString preferredTerminal = confGroup.readPathEntry("TerminalApplication", TQString::fromLatin1("konsole"));
+	preferredTerminal += TQString::fromLatin1(" -e ");
 	
 	int len = preferredTerminal.length();
 	bool b = client.left(len) == preferredTerminal;
@@ -197,7 +197,7 @@ void CfgEmailClient::save(KConfig *)
 		pSettings->setSetting(KEMailSettings::ClientTerminal, (chkRunTerminal->isChecked()) ? "true" : "false");
 	}
 
-	// insure proper permissions -- tqcontains sensitive data
+	// insure proper permissions -- contains sensitive data
 	TQString cfgName(KGlobal::dirs()->findResource("config", "emails"));
 	if (!cfgName.isEmpty())
 		::chmod(TQFile::encodeName(cfgName), 0600);
@@ -393,7 +393,7 @@ ComponentChooser::ComponentChooser(TQWidget *parent, const char *name):
 		ServiceChooser->insertItem(new MyListBoxItem(cfg.readEntry("Name",i18n("Unknown")),(*it)));
 
 	}
-	ServiceChooser->setFixedWidth(ServiceChooser->tqsizeHint().width());
+	ServiceChooser->setFixedWidth(ServiceChooser->sizeHint().width());
 	ServiceChooser->sort();
 	connect(ServiceChooser,TQT_SIGNAL(highlighted(TQListBoxItem*)),this,TQT_SLOT(slotServiceSelected(TQListBoxItem*)));
 	ServiceChooser->setSelected(0,true);
@@ -410,7 +410,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 	KSimpleConfig cfg(static_cast<MyListBoxItem*>(it)->File);
 
 	ComponentDescription->setText(cfg.readEntry("Comment",i18n("No description available")));
-	ComponentDescription->setMinimumSize(ComponentDescription->tqsizeHint());
+	ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
 
 
 	TQString cfgType=cfg.readEntry("configurationType");
@@ -461,7 +461,7 @@ void ComponentChooser::slotServiceSelected(TQListBoxItem* it) {
 		delete configWidget;
 		configWidget=newConfigWidget;
 		connect(configWidget,TQT_SIGNAL(changed(bool)),this,TQT_SLOT(emitChanged(bool)));
-	        configContainer->setMinimumSize(configWidget->tqsizeHint());
+	        configContainer->setMinimumSize(configWidget->sizeHint());
 	}
 	
 	if (configWidget)
diff --git a/kcontrol/componentchooser/componentchooser_ui.ui b/kcontrol/componentchooser/componentchooser_ui.ui
index d872d774a..ed1ed7f7b 100644
--- a/kcontrol/componentchooser/componentchooser_ui.ui
+++ b/kcontrol/componentchooser/componentchooser_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ComponentChooser_UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -91,7 +91,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
@@ -125,8 +125,8 @@
     <include location="global" impldecl="in declaration">klistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>
diff --git a/kcontrol/componentchooser/componentconfig_ui.ui b/kcontrol/componentchooser/componentconfig_ui.ui
index fd5160ba4..d6a7bba87 100644
--- a/kcontrol/componentchooser/componentconfig_ui.ui
+++ b/kcontrol/componentchooser/componentconfig_ui.ui
@@ -26,7 +26,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>91</height>
@@ -58,6 +58,6 @@
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/emailclientconfig_ui.ui b/kcontrol/componentchooser/emailclientconfig_ui.ui
index 79b204781..d4cb44085 100644
--- a/kcontrol/componentchooser/emailclientconfig_ui.ui
+++ b/kcontrol/componentchooser/emailclientconfig_ui.ui
@@ -7,7 +7,7 @@
     <property name="enabled">
         <bool>true</bool>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -73,7 +73,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -83,7 +83,7 @@
                                 <string>&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
                             </property>
                             <property name="whatsThis" stdset="0">
-                                <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be tqreplaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
+                                <string>Press this button to select your favorite email client. Please note that the file you select has to have the executable attribute set in order to be accepted.&lt;br&gt; You can also use several placeholders which will be replaced with the actual values when the email client is called:&lt;ul&gt; &lt;li&gt;%t: Recipient's address&lt;/li&gt; &lt;li&gt;%s: Subject&lt;/li&gt; &lt;li&gt;%c: Carbon Copy (CC)&lt;/li&gt; &lt;li&gt;%b: Blind Carbon Copy (BCC)&lt;/li&gt; &lt;li&gt;%B: Template body text&lt;/li&gt; &lt;li&gt;%A: Attachment &lt;/li&gt; &lt;/ul&gt;</string>
                             </property>
                         </widget>
                         <widget class="QToolButton">
@@ -126,7 +126,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>16</height>
@@ -165,7 +165,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>16</height>
@@ -182,7 +182,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>16</height>
@@ -231,6 +231,6 @@
 <slots>
     <slot access="protected">selectEmailClient()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
index abebae591..7d355fdd8 100644
--- a/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
+++ b/kcontrol/componentchooser/terminalemulatorconfig_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>TerminalEmulatorConfig_UI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>87</height>
@@ -82,7 +82,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -120,7 +120,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>0</height>
@@ -189,6 +189,6 @@
 <slots>
     <slot access="protected">selectTerminalApp()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/crypto/certgen.ui b/kcontrol/crypto/certgen.ui
index cbffdf872..19ee05535 100644
--- a/kcontrol/crypto/certgen.ui
+++ b/kcontrol/crypto/certgen.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>D_GenCert</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>TextLabel2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>40</y>
@@ -41,7 +41,7 @@
         <property name="name">
             <cstring>TextLabel3</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>100</y>
@@ -57,7 +57,7 @@
         <property name="name">
             <cstring>TextLabel4</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>130</y>
@@ -73,7 +73,7 @@
         <property name="name">
             <cstring>T_CertType</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>10</y>
@@ -89,7 +89,7 @@
         <property name="name">
             <cstring>TextLabel2_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>70</y>
@@ -105,7 +105,7 @@
         <property name="name">
             <cstring>TextLabel5</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>160</y>
@@ -121,7 +121,7 @@
         <property name="name">
             <cstring>TextLabel6</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>190</y>
@@ -137,7 +137,7 @@
         <property name="name">
             <cstring>TextLabel7</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>220</y>
@@ -153,7 +153,7 @@
         <property name="name">
             <cstring>TextLabel8</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>250</y>
@@ -169,7 +169,7 @@
         <property name="name">
             <cstring>L_CertType</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>10</y>
@@ -182,7 +182,7 @@
         <property name="name">
             <cstring>LineEdit3</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>100</y>
@@ -198,7 +198,7 @@
         <property name="name">
             <cstring>TextLabel9</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>280</y>
@@ -214,7 +214,7 @@
         <property name="name">
             <cstring>LineEdit4_2_2_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>220</y>
@@ -230,7 +230,7 @@
         <property name="name">
             <cstring>LineEdit4_2_2_2_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>250</y>
@@ -246,7 +246,7 @@
         <property name="name">
             <cstring>LineEdit4_2_2_2_3</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>280</y>
@@ -262,7 +262,7 @@
         <property name="name">
             <cstring>E_Passphrase</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>40</y>
@@ -281,7 +281,7 @@
         <property name="name">
             <cstring>E_Passphrase_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>70</y>
@@ -300,7 +300,7 @@
         <property name="name">
             <cstring>TextLabel10</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>10</x>
                 <y>310</y>
@@ -316,7 +316,7 @@
         <property name="name">
             <cstring>SpinBox1</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>310</y>
@@ -338,7 +338,7 @@
         <property name="name">
             <cstring>TextLabel11</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>320</x>
                 <y>40</y>
@@ -354,7 +354,7 @@
         <property name="name">
             <cstring>CheckBox1</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>320</x>
                 <y>10</y>
@@ -373,7 +373,7 @@
         <property name="name">
             <cstring>TextLabel12</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>320</x>
                 <y>70</y>
@@ -389,7 +389,7 @@
         <property name="name">
             <cstring>LineEdit19</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>380</x>
                 <y>70</y>
@@ -402,7 +402,7 @@
         <property name="name">
             <cstring>LineEdit4_2_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>190</y>
@@ -418,7 +418,7 @@
         <property name="name">
             <cstring>LineEdit4_2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>160</y>
@@ -434,7 +434,7 @@
         <property name="name">
             <cstring>ComboBox2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>380</x>
                 <y>40</y>
@@ -447,7 +447,7 @@
         <property name="name">
             <cstring>CheckBox2</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>320</x>
                 <y>100</y>
@@ -463,7 +463,7 @@
         <property name="name">
             <cstring>TextLabel13</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>320</x>
                 <y>130</y>
@@ -479,7 +479,7 @@
         <property name="name">
             <cstring>ComboBox5</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>400</x>
                 <y>130</y>
@@ -492,7 +492,7 @@
         <property name="name">
             <cstring>LineEdit4</cstring>
         </property>
-        <property name="tqgeometry">
+        <property name="geometry">
             <rect>
                 <x>180</x>
                 <y>130</y>
@@ -508,6 +508,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index 4194fdaec..d39c09752 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -128,7 +128,7 @@ OtherCertItem::OtherCertItem( TQListView *view, const TQString& sub, const TQStr
     m_module = module;
 KSSLX509Map cert(sub);
     setText(0, cert.getValue("O"));
-    setText(1, cert.getValue("CN").tqreplace("\n", ", "));
+    setText(1, cert.getValue("CN").replace("\n", ", "));
 
     if (_exp.date().year() > 3000 || _exp.date().year() < 1900)
        _exp.setDate(TQDate(3000,1,1));
@@ -151,7 +151,7 @@ YourCertItem::YourCertItem( TQListView *view, TQString pkcs, TQString pass, TQSt
 {
     m_module = module;
 KSSLX509Map cert(name);
-    TQString tmp = cert.getValue("CN").tqreplace("\n", ", ");
+    TQString tmp = cert.getValue("CN").replace("\n", ", ");
     setText(0, tmp);
     setText(1, cert.getValue("Email"));
     _pkcs = pkcs;
@@ -180,10 +180,10 @@ KSSLX509Map mcert(name);
 TQString tmp;
     setText(0, mcert.getValue("O"));
     tmp = mcert.getValue("OU");
-    tmp.tqreplace("\n", ", ");
+    tmp.replace("\n", ", ");
     setText(1, tmp);
     tmp = mcert.getValue("CN");
-    tmp.tqreplace("\n", ", ");
+    tmp.replace("\n", ", ");
     setText(2, tmp);
     _name = name;
     _cert = cert;
@@ -269,7 +269,7 @@ TQString whatstr;
   grid->addWidget(mUseTLS, 0, 0);
   whatstr = i18n("TLS is the newest revision of the SSL protocol."
                  " It integrates better with other protocols and has"
-                 " tqreplaced SSL in protocols such as POP3 and SMTP.");
+                 " replaced SSL in protocols such as POP3 and SMTP.");
   TQWhatsThis::add(mUseTLS, whatstr);
 
   mUseSSLv2 = new TQCheckBox(i18n("Enable SSLv&2"), tabSSL);
@@ -842,7 +842,7 @@ TQString whatstr;
   tabs->addTab(tabSSLCOpts, i18n("Validation Options"));
 #endif
 
-  tabs->resize(tabs->tqsizeHint());
+  tabs->resize(tabs->sizeHint());
   load();
 }
 
@@ -1214,7 +1214,7 @@ void KCryptoConfig::save()
   pcerts->sync();
   authcfg->sync();
 
-  // insure proper permissions -- tqcontains sensitive data
+  // insure proper permissions -- contains sensitive data
   TQString cfgName(KGlobal::dirs()->findResource("config", "cryptodefaults"));
   if (!cfgName.isEmpty())
     ::chmod(TQFile::encodeName(cfgName), 0600);
@@ -1480,7 +1480,7 @@ TQString iss = TQString::null;
          TQPalette cspl;
          iss = cert->getIssuer();
          cspl = validFrom->palette();
-         if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1488,7 +1488,7 @@ TQString iss = TQString::null;
          validFrom->setPalette(cspl);
 
          cspl = validUntil->palette();
-         if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1498,7 +1498,7 @@ TQString iss = TQString::null;
          validFrom->setText(cert->getNotBefore());
          validUntil->setText(cert->getNotAfter());
          untilDate->setText(x ? KGlobal::locale()->formatDateTime(x->getExpires())
-                              : KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime(Qt::UTC)));
+                              : KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(Qt::UTC)));
          untilDate->setEnabled(x && !x->isPermanent());
          pHash->setText(cert->getMD5DigestText());
          delete cert;
@@ -1587,7 +1587,7 @@ TryImportPassAgain:
                                                             i;
              i = static_cast<YourCertItem *>(i->nextSibling())) {
       if (i->configName() == name) {
-         rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to tqreplace it?"), i18n("SSL"), i18n("Replace"));
+         rc = KMessageBox::warningContinueCancel(this, i18n("A certificate with that name already exists. Are you sure that you wish to replace it?"), i18n("SSL"), i18n("Replace"));
          if (rc == KMessageBox::Cancel) {
             delete cert;
             return;
@@ -1718,7 +1718,7 @@ TQString iss;
    TQPalette cspl;
    KSSLCertificate *cert = pkcs->getCertificate();
    cspl = yValidFrom->palette();
-   if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+   if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1726,7 +1726,7 @@ TQString iss;
    yValidFrom->setPalette(cspl);
 
    cspl = yValidUntil->palette();
-   if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+   if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
    } else {
 	   cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1758,7 +1758,7 @@ TQString iss;
          KSSLCertificate *cert = pkcs->getCertificate();
          iss = cert->getIssuer();
          cspl = yValidFrom->palette();
-         if (TQDateTime::tqcurrentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
+         if (TQDateTime::currentDateTime(Qt::UTC) < cert->getQDTNotBefore()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1766,7 +1766,7 @@ TQString iss;
          yValidFrom->setPalette(cspl);
 
          cspl = yValidUntil->palette();
-         if (TQDateTime::tqcurrentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
+         if (TQDateTime::currentDateTime(Qt::UTC) > cert->getQDTNotAfter()) {
             cspl.setColor(TQColorGroup::Foreground, TQColor(196,33,21));
          } else {
             cspl.setColor(TQColorGroup::Foreground, TQColor(42,153,59));
@@ -1921,7 +1921,7 @@ void KCryptoConfig::slotCAImport() {
 		if (certStore) { KOSSL::self()->X509_STORE_free(certStore);
 				certStore = NULL; }
 
-		if (certtext.tqcontains("-----BEGIN CERTIFICATE-----")) {
+		if (certtext.contains("-----BEGIN CERTIFICATE-----")) {
 			qf.reset();
 			certtext = TQString::null;
 			while (!qf.atEnd()) {
@@ -1929,10 +1929,10 @@ void KCryptoConfig::slotCAImport() {
 				qf.readLine(xx, qf.size());
 				certtext += xx;
 			}
-			certtext = certtext.tqreplace("-----BEGIN CERTIFICATE-----", TQString::null);
-			certtext = certtext.tqreplace("-----END CERTIFICATE-----", TQString::null);
+			certtext = certtext.replace("-----BEGIN CERTIFICATE-----", TQString::null);
+			certtext = certtext.replace("-----END CERTIFICATE-----", TQString::null);
 			certtext = certtext.stripWhiteSpace();
-			certtext = certtext.tqreplace("\n", TQString::null);
+			certtext = certtext.replace("\n", TQString::null);
 		} else {
 			// Must [could?] be DER
 			qf.close();
@@ -2350,7 +2350,7 @@ SSL_CONST SSL_METHOD *meth;
       break;
     // Leak of sc*?
     TQString scn(sc->name);
-    if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
+    if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
       continue;
     }
     k = SSL_CIPHER_get_bits(sc, &j);
@@ -2378,7 +2378,7 @@ SSL_CONST SSL_METHOD *meth;
       break;
     // Leak of sc*?
     TQString scn(sc->name);
-    if (scn.tqcontains("ADH-") || scn.tqcontains("NULL-") || scn.tqcontains("DES-CBC3-SHA") || scn.tqcontains("FZA-")) {
+    if (scn.contains("ADH-") || scn.contains("NULL-") || scn.contains("DES-CBC3-SHA") || scn.contains("FZA-")) {
       continue;
     }
     k = SSL_CIPHER_get_bits(sc, &j);
diff --git a/kcontrol/css/cssconfig.ui b/kcontrol/css/cssconfig.ui
index dfcf7768e..c3d064b48 100644
--- a/kcontrol/css/cssconfig.ui
+++ b/kcontrol/css/cssconfig.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CSSConfigDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,9 +12,9 @@
             <height>195</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <property name="whatsThis" stdset="0">
         <string>&lt;b&gt;Stylesheets&lt;/b&gt;&lt;p&gt;See http://www.w3.org/Style/CSS for further information on cascading style sheets.&lt;/p&gt;</string>
@@ -87,7 +87,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -103,7 +103,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -141,7 +141,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -157,7 +157,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -185,7 +185,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>451</width>
                                     <height>20</height>
@@ -206,7 +206,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -232,8 +232,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kcontrol/css/csscustom.ui b/kcontrol/css/csscustom.ui
index da47ec849..b19e08baf 100644
--- a/kcontrol/css/csscustom.ui
+++ b/kcontrol/css/csscustom.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CSSCustomDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -243,7 +243,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>20</height>
@@ -273,7 +273,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -315,7 +315,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>20</height>
@@ -412,7 +412,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -429,7 +429,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -446,7 +446,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -463,7 +463,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -545,8 +545,8 @@
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/css/preview.ui b/kcontrol/css/preview.ui
index bf1b95fd1..438d40d37 100644
--- a/kcontrol/css/preview.ui
+++ b/kcontrol/css/preview.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PreviewDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -87,8 +87,8 @@ people.&lt;/p&gt;
     <include location="global" impldecl="in declaration">kseparator.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kseparator.h</includehint>
 </includehints>
diff --git a/kcontrol/css/template.cpp b/kcontrol/css/template.cpp
index 02bcf69ed..e237ed796 100644
--- a/kcontrol/css/template.cpp
+++ b/kcontrol/css/template.cpp
@@ -32,7 +32,7 @@ bool CSSTemplate::expand(TQString destname, const TQMap<TQString,TQString> &dict
 	      TQString expr = line.mid(start+1, end-start-1);
 	      TQString res = dict[expr];
 
-	      line.tqreplace(start, end-start+1, res);
+	      line.replace(start, end-start+1, res);
 	    }
 	}
       os << line << endl;
diff --git a/kcontrol/dnssd/configdialog.ui b/kcontrol/dnssd/configdialog.ui
index 611629fad..848457a44 100644
--- a/kcontrol/dnssd/configdialog.ui
+++ b/kcontrol/dnssd/configdialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>0</width>
             <height>0</height>
@@ -73,7 +73,7 @@
                             <property name="enabled">
                                 <bool>true</bool>
                             </property>
-                            <property name="tqgeometry">
+                            <property name="geometry">
                                 <rect>
                                     <x>11</x>
                                     <y>51</y>
@@ -95,7 +95,7 @@
                             <property name="name">
                                 <cstring>LANButtor</cstring>
                             </property>
-                            <property name="tqgeometry">
+                            <property name="geometry">
                                 <rect>
                                     <x>11</x>
                                     <y>23</y>
@@ -180,7 +180,7 @@ is configured with 'Browse local network' option above.</string>
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout7</cstring>
+                            <cstring>layout7</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -204,7 +204,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>130</width>
                                         <height>21</height>
@@ -264,7 +264,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>90</width>
                                         <height>20</height>
@@ -281,7 +281,7 @@ is configured with 'Browse local network' option above.</string>
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>90</width>
                                         <height>21</height>
@@ -300,7 +300,7 @@ is configured with 'Browse local network' option above.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>50</width>
                                 <height>110</height>
@@ -318,7 +318,7 @@ is configured with 'Browse local network' option above.</string>
 <includes>
     <include location="global" impldecl="in declaration">kcmodule.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcmodule.h</includehint>
     <includehint>keditlistbox.h</includehint>
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index f2d9907dc..97b532b54 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("KDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
 	domain->setGroup("publishing");
 	load();
 	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));
@@ -119,12 +119,12 @@ void KCMDnssd::load()
 {
 	if (geteuid()==0) loadMdnsd();
 	enableZeroconf->setChecked(false);
-	TQProcess avahitqStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahitqStatus");
-	avahitqStatus.start();
-	while (avahitqStatus.isRunning()) {
+	TQProcess avahiStatus(TQString("/usr/share/avahi/avahi_status"), this, "avahiStatus");
+	avahiStatus.start();
+	while (avahiStatus.isRunning()) {
 	  kapp->processEvents();
 	}
-	int exitStatus = avahitqStatus.exitStatus();
+	int exitStatus = avahiStatus.exitStatus();
 	if (exitStatus == 0) { // disabled
 	  enableZeroconf->setChecked(false);
 	} else if (exitStatus == 1) { // enabled 
diff --git a/kcontrol/ebrowsing/ebrowsing.desktop b/kcontrol/ebrowsing/ebrowsing.desktop
index 52ebe69b1..a0bf4593b 100644
--- a/kcontrol/ebrowsing/ebrowsing.desktop
+++ b/kcontrol/ebrowsing/ebrowsing.desktop
@@ -177,7 +177,7 @@ Keywords[ca]=Navegació millorada,Navegació,WWW,Internet,Paraules clau d'Intern
 Keywords[cs]=Rozšířené procházení,Procházení,WWW,Internet,Klíčová slova internetu,Internetové filtry,Síť,Zkratky,Vyhledávací stroje
 Keywords[csb]=Rozszérzoné przezéranié,przezéranié,WWW,Internet,kluczowé słowa w Internece,filtrë w Internece,séc,szëkôrze,skrodzënë
 Keywords[cy]=Pori Uchel,Pori,WWW,Rhyngrwyd,Allweddair Rhyngrwyd,Hidl Rhyngrwyd,Rhwydwaith,Peiriannau Chwilio,Llwybrau Byr
-Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgetqmaskiner,Genveje
+Keywords[da]=Udvidet netsøgning,Netsøgning,www,Internet,Internet-nøgleord,Internet-filtre,Søgemaskiner,Genveje
 Keywords[de]=Browsen,Erweitertes Browsen,WWW,Internet,Stichwörter,Filter,Netz,Internetfilter,Suchmaschinen,Kurzbefehle,Netzwerk
 Keywords[el]=Εμπλουτισμένη περιήγηση,Περιήγηση,WWW,Διαδίκτυο,Λέξεις κλειδιά διαδικτύου,Φίλτρα διαδικτύου,Δίκτυο,Μηχανές αναζήτησης,Συντομεύσεις
 Keywords[eo]=progresintoj,TTT,krozado,WWW,Interreto,filtrilo,reto,serĉiloj,mallongigoj
diff --git a/kcontrol/ebrowsing/main.cpp b/kcontrol/ebrowsing/main.cpp
index f6e5efc49..a41ab92e3 100644
--- a/kcontrol/ebrowsing/main.cpp
+++ b/kcontrol/ebrowsing/main.cpp
@@ -56,7 +56,7 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
       " Even easier: just press Alt+F2 (if you have not"
       " changed this shortcut) and enter the shortcut in the KDE Run Command dialog."));
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
 
 #if 0
     opts = new FilterOptions(this);
@@ -95,10 +95,10 @@ KURIFilterModule::KURIFilterModule(TQWidget *parent, const char *name, const TQS
     else if (modules.count() == 1)
     {
         widget = modules.first();
-        tqlayout->setMargin(-KDialog::marginHint());
+        layout->setMargin(-KDialog::marginHint());
     }
 
-    tqlayout->addWidget(widget);
+    layout->addWidget(widget);
 }
 
 void KURIFilterModule::load()
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
index 302bdf21b..fdeeb27ca 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FilterOptionsUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -34,7 +34,7 @@ Enable shortcuts that allow you to quickly search for information on the web. Fo
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout10</cstring>
+                <cstring>layout10</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -161,7 +161,7 @@ Select the search engine to use for input boxes that provide automatic lookup se
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>170</height>
@@ -254,5 +254,5 @@ Select the search engine to use for input boxes that provide automatic lookup se
     <tabstop>cmbDefaultEngine</tabstop>
     <tabstop>cmbDelimiter</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
index 3f96f90e2..9f3a245fc 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp
@@ -149,11 +149,11 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
       TQString s = userquery.mid (pos, qsexpr.matchedLength());
       while ((i = s.find(" ")) != -1)
       {
-        s = s.tqreplace (i, 1, "%20");
+        s = s.replace (i, 1, "%20");
         n++;
       }
       start = pos + qsexpr.matchedLength() + 2*n; // Move after last quote
-      userquery = userquery.tqreplace (pos, qsexpr.matchedLength(), s);
+      userquery = userquery.replace (pos, qsexpr.matchedLength(), s);
     }
   }
 
@@ -164,10 +164,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
   {
     int i = 0;
     while ((i = userquery.find("%20")) != -1)
-      userquery = userquery.tqreplace(i, 3, " ");
+      userquery = userquery.replace(i, 3, " ");
 
     for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it )
-      *it = (*it).tqreplace("%20", " ");
+      *it = (*it).replace("%20", " ");
   }
 
   PIDDBG << "Generating substitution map:\n";
@@ -188,10 +188,10 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
 
     // Back-substitute quoted strings (%20 -> " "):
     while ((j = v.find("%20")) != -1)
-      v = v.tqreplace(j, 3, " ");
+      v = v.replace(j, 3, " ");
 
     // Insert partial queries (referenced by \1 ... \n) to map:
-    map.tqreplace(TQString::number(i), v);
+    map.replace(TQString::number(i), v);
     PDVAR ("  map['" + nr + "']", map[nr]);
 
     // Insert named references (referenced by \name) to map:
@@ -202,8 +202,8 @@ TQStringList KURISearchFilterEngine::modifySubstitutionMap(SubstMap& map,
       TQString k = v.left(pos);
 
       // Back-substitute references contained in references (e.g. '\refname' substitutes to 'thisquery=\0')
-      while ((j = s.find("%5C")) != -1) s = s.tqreplace(j, 3, "\\");
-      map.tqreplace(k, s);
+      while ((j = s.find("%5C")) != -1) s = s.replace(j, 3, "\\");
+      map.replace(k, s);
       PDVAR ("  map['" + k + "']", map[k]);
     }
   }
@@ -228,15 +228,15 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
   TQStringList ql = modifySubstitutionMap (map, userquery);
   int count = ql.count();
 
-  // Check, if old style '\1' is found and tqreplace it with \{@} (compatibility mode):
+  // Check, if old style '\1' is found and replace it with \{@} (compatibility mode):
   {
     int pos = -1;
     if ((pos = newurl.find("\\1")) >= 0)
     {
       PIDDBG << "WARNING: Using compatibility mode for newurl='" << newurl
-             << "'. Please tqreplace old style '\\1' with new style '\\{0}' "
+             << "'. Please replace old style '\\1' with new style '\\{0}' "
                 "in the query definition.\n";
-      newurl = newurl.tqreplace(pos, 2, "\\{@}");
+      newurl = newurl.replace(pos, 2, "\\{@}");
     }
   }
 
@@ -307,7 +307,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
           v = encodeString(s, encodingMib);
           PDVAR ("    default", s);
         }
-        else if (map.tqcontains(rlitem))
+        else if (map.contains(rlitem))
         {
           // Use value from substitution map:
           found = true;
@@ -341,7 +341,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
           // Encode '+', otherwise it would be interpreted as space in the resulting url:
           int vpos = 0;
           while ((vpos = v.find('+')) != -1)
-            v = v.tqreplace (vpos, 1, "%2B");
+            v = v.replace (vpos, 1, "%2B");
 
         }
         else if (rlitem == "@")
@@ -353,7 +353,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
         i++;
       }
 
-      newurl = newurl.tqreplace(pos, reflist.matchedLength(), v);
+      newurl = newurl.replace(pos, reflist.matchedLength(), v);
     }
 
     // Special handling for \{@};
@@ -371,7 +371,7 @@ TQString KURISearchFilterEngine::substituteQuery(const TQString& url, SubstMap &
       // Substitute \{@} with list of unmatched query strings
       int vpos = 0;
       while ((vpos = newurl.find("\\@")) != -1)
-        newurl = newurl.tqreplace (vpos, 2, v);
+        newurl = newurl.replace (vpos, 2, v);
     }
   }
 
@@ -395,7 +395,7 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
                                               bool /* isMalformed */,
                                               SubstMap& map ) const
 {
-  // Return nothing if userquery is empty and it tqcontains
+  // Return nothing if userquery is empty and it contains
   // substitution strings...
   if (query.isEmpty() && url.find(TQRegExp(TQRegExp::escape("\\{"))) > 0)
     return TQString::null;
@@ -427,13 +427,13 @@ TQString KURISearchFilterEngine::formatResult( const TQString& url,
   PDVAR ("query definition", url);
 
   // Add charset indicator for the query to substitution map:
-  map.tqreplace("ikw_charset", cseta);
+  map.replace("ikw_charset", cseta);
 
   // Add charset indicator for the fallback query to substitution map:
   TQString csetb = cset2;
   if (csetb.isEmpty())
     csetb = "iso-8859-1";
-  map.tqreplace("wsc_charset", csetb);
+  map.replace("wsc_charset", csetb);
 
   TQString newurl = substituteQuery (url, map, userquery, csetacodec->mibEnum());
 
@@ -446,7 +446,7 @@ void KURISearchFilterEngine::loadConfig()
 {
   // Migrate from the old format, this block should remain until
   // we can assume "every" user has upgraded to a KDE version that
-  // tqcontains the sycoca based search provider configuration (malte).
+  // contains the sycoca based search provider configuration (malte).
   // TODO: Remove in KDE 4 !!! This has been here a sufficient amount of time...
   {
     KSimpleConfig oldConfig(kapp->dirs()->saveLocation("config") + TQString(name()) + "rc");
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
index b9c60f2aa..35bb3242a 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchprovider.desktop
@@ -13,7 +13,7 @@ Comment[ca]=Motor de recerca
 Comment[cs]=Vyhledávací stroj
 Comment[csb]=Szëkôrz
 Comment[cy]=Peiriant Chwilio
-Comment[da]=Søgetqmaskine
+Comment[da]=Søgemaskine
 Comment[de]=Suchmaschine
 Comment[el]=Μηχανή αναζήτησης
 Comment[eo]=Serĉilo
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
index ab28f7e30..1a507c0ff 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SearchProviderDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -127,7 +127,7 @@ Recommended is \{@}, since it removes all query variables (name=value) from the
     <tabstop>leShortcut</tabstop>
     <tabstop>cbCharset</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
index cdc3590f1..2e104f15b 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/mamma.desktop
@@ -11,7 +11,7 @@ Name[ca]=Mamma - La mare de tots els motors de recerca
 Name[cs]=Mamma
 Name[csb]=Mamma - mëmka wszëstczich szëkôrzów
 Name[cy]=Mamma - Mam holl Beiriannau Chwilio
-Name[da]=Mamma - moderen til alle søgetqmaskiner
+Name[da]=Mamma - moderen til alle søgemaskiner
 Name[de]=Mamma - Die Mutter aller Suchmaschinen
 Name[el]=Mamma - Η μητέρα όλων των μηχανών αναζήτησης
 Name[eo]=Mamma - Patrino de ĉiuj retserĉiloj
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
index 761a20954..7abbad0e1 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviders/nl-telephone.desktop
@@ -26,7 +26,7 @@ Name[he]=חיפוש ספר של ספר טלפונים
 Name[hi]=टेलिफोनबुक खोज प्रदायक
 Name[hr]=Davatelj usluge pretraživanja imenika
 Name[hu]=Telefonkönyv (NL)
-Name[is]=Leitarvél fyrir sítqmaskrár
+Name[is]=Leitarvél fyrir símaskrár
 Name[it]=Motore di ricerca Elencotelefonico
 Name[ja]=Telephonebook 検索プロバイダ
 Name[km]=អ្នក​ផ្ដល់​សេវា​ស្វែងរក​សៀវភៅ​លេខ​ទូរស័ព្ទ
diff --git a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
index 94565719c..f0986c188 100644
--- a/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/localdomain/localdomainurifilter.cpp
@@ -41,7 +41,7 @@ LocalDomainURIFilter::LocalDomainURIFilter( TQObject *parent, const char *name,
     : KURIFilterPlugin( parent, name ? name : "localdomainurifilter", 1.0 ),
       DCOPObject( "LocalDomainURIFilterIface" ),
       last_time( 0 ),
-      m_hostPortPattern( TQString::tqfromLatin1(HOSTPORT_PATTERN) )
+      m_hostPortPattern( TQString::fromLatin1(HOSTPORT_PATTERN) )
 {
     configure();
 }
@@ -56,7 +56,7 @@ bool LocalDomainURIFilter::filterURI( KURIFilterData& data ) const
     if( m_hostPortPattern.exactMatch( cmd ) && 
         isLocalDomainHost( cmd ) )
     {
-        cmd.prepend( TQString::tqfromLatin1("http://") );
+        cmd.prepend( TQString::fromLatin1("http://") );
         setFilteredURI( data, KURL( cmd ) );
         setURIType( data, KURIFilterData::NET_PROTOCOL );
         
@@ -76,7 +76,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
 
     if( !(host == last_host && last_time > time( NULL ) - 5 ) ) {
 
-        TQString helper = KStandardDirs::findExe(TQString::tqfromLatin1( "klocaldomainurifilterhelper" ));
+        TQString helper = KStandardDirs::findExe(TQString::fromLatin1( "klocaldomainurifilterhelper" ));
         if( helper.isEmpty())
             return last_result = false;
 
@@ -95,7 +95,7 @@ bool LocalDomainURIFilter::isLocalDomainHost( TQString& cmd ) const
         last_result = proc.wait( 1 ) && proc.normalExit() && !proc.exitStatus();
 
         if( !m_fullname.isEmpty() )
-            cmd.tqreplace( 0, host.length(), m_fullname );
+            cmd.replace( 0, host.length(), m_fullname );
     }
 
     return last_result;
diff --git a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
index 4f6464097..9d15802f1 100644
--- a/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
+++ b/kcontrol/ebrowsing/plugins/shorturi/kshorturifilter.cpp
@@ -43,7 +43,7 @@
 #define IPv6_PATTERN    "^\\[.*\\]"
 #define ENV_VAR_PATTERN "\\$[a-zA-Z_][a-zA-Z0-9_]*"
 
-#define QFL1(x) TQString::tqfromLatin1(x)
+#define QFL1(x) TQString::fromLatin1(x)
 
  /**
   * IMPORTANT:
@@ -66,7 +66,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match FQDN_PATTERN
   exp.setPattern( QFL1(FQDN_PATTERN) );
-  if ( cmd.tqcontains( exp ) )
+  if ( cmd.contains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -85,7 +85,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match IPv4 addresses
   exp.setPattern( QFL1(IPv4_PATTERN) );
-  if ( cmd.tqcontains( exp ) )
+  if ( cmd.contains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -95,7 +95,7 @@ static bool isValidShortURL( const TQString& cmd, bool verbose = false )
 
   // Match IPv6 addresses
   exp.setPattern( QFL1(IPv6_PATTERN) );
-  if ( cmd.tqcontains( exp ) )
+  if ( cmd.contains( exp ) )
   {
     if (verbose)
       kdDebug() << "KShortURIFilter::isValidShortURL: " << cmd
@@ -164,13 +164,13 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
 
   if (!isMalformed &&
       (url.protocol().length() == 4) &&
-      (url.protocol() != TQString::tqfromLatin1("http")) &&
+      (url.protocol() != TQString::fromLatin1("http")) &&
       (url.protocol()[0]=='h') &&
       (url.protocol()[1]==url.protocol()[2]) &&
       (url.protocol()[3]=='p'))
   {
      // Handle "encrypted" URLs like: h++p://www.kde.org
-     url.setProtocol( TQString::tqfromLatin1("http"));
+     url.setProtocol( TQString::fromLatin1("http"));
      setFilteredURI( data, url);
      setURIType( data, KURIFilterData::NET_PROTOCOL );
      return true;
@@ -210,11 +210,11 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   }
 
   // Detect UNC style (aka windows SMB) URLs
-  if ( cmd.startsWith( TQString::tqfromLatin1( "\\\\") ) )
+  if ( cmd.startsWith( TQString::fromLatin1( "\\\\") ) )
   {
     // make sure path is unix style
-    cmd.tqreplace('\\', '/');
-    cmd.prepend( TQString::tqfromLatin1( "smb:" ) );
+    cmd.replace('\\', '/');
+    cmd.prepend( TQString::fromLatin1( "smb:" ) );
     setFilteredURI( data, KURL( cmd ));
     setURIType( data, KURIFilterData::NET_PROTOCOL );
     return true;
@@ -262,7 +262,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
       slashPos = path.length();
     if( slashPos == 1 )   // ~/
     {
-      path.tqreplace ( 0, 1, TQDir::homeDirPath() );
+      path.replace ( 0, 1, TQDir::homeDirPath() );
     }
     else // ~username/
     {
@@ -270,7 +270,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
       struct passwd *dir = getpwnam(user.local8Bit().data());
       if( dir && strlen(dir->pw_dir) )
       {
-        path.tqreplace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir));
+        path.replace (0, slashPos, TQString::fromLocal8Bit(dir->pw_dir));
       }
       else
       {
@@ -293,7 +293,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
       const char* exp = getenv( path.mid( 1, r.matchedLength() - 1 ).local8Bit().data() );
       if(exp)
       {
-        path.tqreplace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
+        path.replace( 0, r.matchedLength(), TQString::fromLocal8Bit(exp) );
         expanded = true;
       }
     }
@@ -379,7 +379,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setRef(ref);
     u.setQuery(query);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
+    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it's a file will get
       // an access denied error later on.
@@ -453,7 +453,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
   // Okay this is the code that allows users to supply custom matches for
   // specific URLs using Qt's regexp class. This is hard-coded for now.
   // TODO: Make configurable at some point...
-  if ( !cmd.tqcontains( ' ' ) )
+  if ( !cmd.contains( ' ' ) )
   {
     TQValueList<URLHint>::ConstIterator it;
     for( it = m_urlHints.begin(); it != m_urlHints.end(); ++it )
@@ -492,7 +492,7 @@ bool KShortURIFilter::filterURI( KURIFilterData& data ) const
     u.setPath(path);
     u.setRef(ref);
 
-    if (kapp && !kapp->authorizeURLAction( TQString::tqfromLatin1("open"), KURL(), u))
+    if (kapp && !kapp->authorizeURLAction( TQString::fromLatin1("open"), KURL(), u))
     {
       // No authorisation, we pretend it exists and will get
       // an access denied error later on.
diff --git a/kcontrol/energy/energy.cpp b/kcontrol/energy/energy.cpp
index 1ca4b48ae..1d0241914 100644
--- a/kcontrol/energy/energy.cpp
+++ b/kcontrol/energy/energy.cpp
@@ -50,7 +50,7 @@
 #include <X11/Xmd.h>
 extern "C" {
 #include <X11/extensions/dpms.h>
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 Bool DPMSCapable( Display * );
 int __kde_do_not_unload = 1;
 
@@ -59,7 +59,7 @@ Bool DPMSCapable ( Display * );
 #endif
 
 #ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 #endif
 }
 
@@ -67,8 +67,8 @@ tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
 extern "C" {
 #endif
     Bool DPMSQueryExtension(Display *, int *, int *);
-    tqStatus DPMSEnable(Display *);
-    tqStatus DPMSDisable(Display *);
+    Status DPMSEnable(Display *);
+    Status DPMSDisable(Display *);
     Bool DPMSGetTimeouts(Display *, CARD16 *, CARD16 *, CARD16 *);
     Bool DPMSSetTimeouts(Display *, CARD16, CARD16, CARD16);
 #if defined(XIMStringConversionRetrival) || defined (__sun) || defined(__hpux)
diff --git a/kcontrol/energy/energy.desktop b/kcontrol/energy/energy.desktop
index 2293bf6c8..bf856866a 100644
--- a/kcontrol/energy/energy.desktop
+++ b/kcontrol/energy/energy.desktop
@@ -143,7 +143,7 @@ Comment[nl]=Instellingen voor energiebesparing voor monitors/displays
 Comment[nn]=Innstillingar for straumkontroll av skjerm
 Comment[nso]=Dipeakanyo tsa taolo ya matla a pontsho
 Comment[pa]=ਊਰਜਾ ਪਰਬੰਧਨ ਝਲਕ ਲਈ ਸੈਟਿੰਗ
-Comment[pl]=Ustawienia zarządzania tqmocą
+Comment[pl]=Ustawienia zarządzania mocą
 Comment[pt]=Configurações para a gestão de energia do ecrã
 Comment[pt_BR]= Configurações para o gerenciamento de energia do monitor
 Comment[ro]=Setări pentru controlul energiei consumate de monitor
diff --git a/kcontrol/filetypes/filegroupdetails.cpp b/kcontrol/filetypes/filegroupdetails.cpp
index 1c5127fca..eb57f50ac 100644
--- a/kcontrol/filetypes/filegroupdetails.cpp
+++ b/kcontrol/filetypes/filegroupdetails.cpp
@@ -27,12 +27,12 @@
 FileGroupDetails::FileGroupDetails(TQWidget *parent, const char *name )
     : TQWidget( parent, name )
 {
-  TQWidget * tqparentWidget = this;
-  TQVBoxLayout *secondLayout = new TQVBoxLayout(tqparentWidget,
+  TQWidget * parentWidget = this;
+  TQVBoxLayout *secondLayout = new TQVBoxLayout(parentWidget,
       0, KDialog::spacingHint());
 
-  m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), tqparentWidget );
-  m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), parentWidget );
+  m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
   secondLayout->addWidget( m_autoEmbed );
   // The order of those two items is very important. If you change it, fix typeslistitem.cpp !
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
diff --git a/kcontrol/filetypes/filegroupdetails.h b/kcontrol/filetypes/filegroupdetails.h
index c5724186e..bb4d15bd7 100644
--- a/kcontrol/filetypes/filegroupdetails.h
+++ b/kcontrol/filetypes/filegroupdetails.h
@@ -23,7 +23,7 @@ class TypesListItem;
 class TQButtonGroup;
 
 /**
- * This widget tqcontains the details for a filetype group.
+ * This widget contains the details for a filetype group.
  * Currently this only involves the embedding configuration.
  */
 class FileGroupDetails : public QWidget
diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp
index ffa6ff010..a678e0eb2 100644
--- a/kcontrol/filetypes/filetypedetails.cpp
+++ b/kcontrol/filetypes/filetypedetails.cpp
@@ -52,7 +52,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   grid->setRowStretch(1, 1);
   grid->setRowStretch(2, 0);
 
-  TQWhatsThis::add( extensionLB, i18n("This box tqcontains a list of patterns that can be"
+  TQWhatsThis::add( extensionLB, i18n("This box contains a list of patterns that can be"
     " used to identify files of the selected type. For example, the pattern *.txt is"
     " associated with the file type 'text/plain'; all files ending in '.txt' are recognized"
     " as plain text files.") );
@@ -97,10 +97,10 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
                                        KDialog::spacingHint());
 
   m_autoEmbed = new TQVButtonGroup( i18n("Left Click Action"), secondWidget );
-  m_autoEmbed->tqlayout()->setSpacing( KDialog::spacingHint() );
+  m_autoEmbed->layout()->setSpacing( KDialog::spacingHint() );
   secondLayout->addWidget( m_autoEmbed, 1 );
 
-  m_autoEmbed->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
+  m_autoEmbed->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)0, m_autoEmbed->sizePolicy().hasHeightForWidth() ) );
 
   // The order of those three items is very important. If you change it, fix typeslistitem.cpp !
   new TQRadioButton( i18n("Show file in embedded viewer"), m_autoEmbed );
@@ -120,7 +120,7 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
   secondLayout->addSpacing(10);
 
   embedServiceListWidget = new KServiceListWidget( KServiceListWidget::SERVICELIST_SERVICES, secondWidget );
-  embedServiceListWidget->setMinimumHeight( serviceListWidget->tqsizeHint().height() );
+  embedServiceListWidget->setMinimumHeight( serviceListWidget->sizeHint().height() );
   connect( embedServiceListWidget, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool)));
   secondLayout->addWidget(embedServiceListWidget, 3);
 
@@ -241,8 +241,8 @@ void FileTypeDetails::updateAskSave()
          mime->is( "text/xml" ) ||
          mime->is( "inode/directory" ) ||
          mimeType.startsWith( "image" ) ||
-         mime->is( "multipart/x-mixed-tqreplace" ) ||
-         mime->is( "multipart/tqreplace" ) ||
+         mime->is( "multipart/x-mixed-replace" ) ||
+         mime->is( "multipart/replace" ) ||
          mimeType.startsWith( "print" ) )
     {
         neverAsk = true;
diff --git a/kcontrol/filetypes/filetypedetails.h b/kcontrol/filetypes/filetypedetails.h
index c774d677f..b364d919d 100644
--- a/kcontrol/filetypes/filetypedetails.h
+++ b/kcontrol/filetypes/filetypedetails.h
@@ -13,7 +13,7 @@ class TQPushButton;
 class KServiceListWidget;
 
 /**
- * This widget tqcontains the right part of the file type configuration
+ * This widget contains the right part of the file type configuration
  * dialog, that shows the details for a file type.
  * It is implemented as a separate class so that it can be used by
  * the keditfiletype program to show the details of a single mimetype.
diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp
index d9d1f8138..ad60fc3de 100644
--- a/kcontrol/filetypes/filetypesview.cpp
+++ b/kcontrol/filetypes/filetypesview.cpp
@@ -126,7 +126,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name)
 
   // Widget shown on startup
   m_emptyWidget = new TQLabel( i18n("Select a file type by name or by extension"), m_widgetStack);
-  m_emptyWidget->tqsetAlignment(AlignCenter);
+  m_emptyWidget->setAlignment(AlignCenter);
 
   m_widgetStack->addWidget( m_emptyWidget, 3 /*id*/ );
 
diff --git a/kcontrol/filetypes/typeslistitem.cpp b/kcontrol/filetypes/typeslistitem.cpp
index e2429e661..8ff08d157 100644
--- a/kcontrol/filetypes/typeslistitem.cpp
+++ b/kcontrol/filetypes/typeslistitem.cpp
@@ -69,7 +69,7 @@ void TypesListItem::initMeta( const TQString & major )
   KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
   config->setGroup("EmbedSettings");
   bool defaultValue = defaultEmbeddingSetting( major );
-  m_autoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+  m_autoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
 }
 
 bool TypesListItem::defaultEmbeddingSetting( const TQString& major )
@@ -230,7 +230,7 @@ bool TypesListItem::isDirty() const
     KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
     config->setGroup("EmbedSettings");
     bool defaultValue = defaultEmbeddingSetting(m_major);
-    unsigned int oldAutoEmbed = config->readBoolEntry( TQString::tqfromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
+    unsigned int oldAutoEmbed = config->readBoolEntry( TQString::fromLatin1("embed-")+m_major, defaultValue ) ? 0 : 1;
     if ( m_autoEmbed != oldAutoEmbed )
       return true;
   }
@@ -249,7 +249,7 @@ void TypesListItem::sync()
   {
     KSharedConfig::Ptr config = KSharedConfig::openConfig("konquerorrc", false, false);
     config->setGroup("EmbedSettings");
-    config->writeEntry( TQString::tqfromLatin1("embed-")+m_major, m_autoEmbed == 0 );
+    config->writeEntry( TQString::fromLatin1("embed-")+m_major, m_autoEmbed == 0 );
     return;
   }
 
@@ -286,9 +286,9 @@ void TypesListItem::sync()
     config.writeEntry("Hidden", false);
 
     if ( m_autoEmbed == 2 )
-      config.deleteEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), false );
+      config.deleteEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), false );
     else
-      config.writeEntry( TQString::tqfromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
+      config.writeEntry( TQString::fromLatin1("X-KDE-AutoEmbed"), m_autoEmbed == 0 );
 
     m_bNewItem = false;
   }
@@ -343,18 +343,18 @@ void TypesListItem::sync()
           continue; // Only those which were added in init()
 
       // Look in the correct list...
-      if ( (isApplication && ! m_appServices.tqcontains( pService->desktopEntryPath() ))
-           || (!isApplication && !m_embedServices.tqcontains( pService->desktopEntryPath() ))
+      if ( (isApplication && ! m_appServices.contains( pService->desktopEntryPath() ))
+           || (!isApplication && !m_embedServices.contains( pService->desktopEntryPath() ))
           ) {
         // The service was in m_appServices but has been removed
         // create a new .desktop file without this mimetype
 
         if( s_changedServices == NULL )
             deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
-        TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+        TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
             ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
 
-        if ( mimeTypeList.tqcontains( name() ) ) {
+        if ( mimeTypeList.contains( name() ) ) {
           // The mimetype is listed explicitly in the .desktop files, so
           // just remove it and we're done
           KConfig *desktop;
@@ -370,7 +370,7 @@ void TypesListItem::sync()
           }
           desktop->setDesktopGroup();
 
-          mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+          mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
             ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
 
           // Remove entry and the number that might follow.
@@ -438,7 +438,7 @@ KMimeType::Ptr TypesListItem::findImplicitAssociation(const TQString &desktop)
 
     if( s_changedServices == NULL )
        deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
-    TQStringList mimeTypeList = s_changedServices->tqcontains( s->desktopEntryPath())
+    TQStringList mimeTypeList = s_changedServices->contains( s->desktopEntryPath())
        ? (*s_changedServices)[ s->desktopEntryPath() ] : s->serviceTypes();
 
     for(TQStringList::ConstIterator it = mimeTypeList.begin();
@@ -477,10 +477,10 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
     // merge new mimetype
     if( s_changedServices == NULL )
        deleter.setObject( s_changedServices, new TQMap< TQString, TQStringList > );
-    TQStringList mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+    TQStringList mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
        ? (*s_changedServices)[ pService->desktopEntryPath() ] : pService->serviceTypes();
 
-    if (!mimeTypeList.tqcontains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
+    if (!mimeTypeList.contains(name()) && !inheritsMimetype(m_mimetype, mimeTypeList))
     {
       KConfig *desktop;
       if ( pService->type() == TQString("Service") )
@@ -495,7 +495,7 @@ void TypesListItem::saveServices( KConfig & profile, TQStringList services, cons
       }
 
       desktop->setDesktopGroup();
-      mimeTypeList = s_changedServices->tqcontains( pService->desktopEntryPath())
+      mimeTypeList = s_changedServices->contains( pService->desktopEntryPath())
             ? (*s_changedServices)[ pService->desktopEntryPath() ] : desktop->readListEntry("MimeType", ';');
       mimeTypeList.append(name());
 
diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp
index ab70526a3..b082cf1fa 100644
--- a/kcontrol/fonts/fonts.cpp
+++ b/kcontrol/fonts/fonts.cpp
@@ -220,21 +220,21 @@ FontAASettings::FontAASettings(TQWidget *parent)
                 changesMade(false)
 {
   TQWidget     *mw=new TQWidget(this);
-  TQGridLayout *tqlayout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
+  TQGridLayout *layout=new TQGridLayout(mw, 1, 1, 0, KDialog::spacingHint());
 
   excludeRange=new TQCheckBox(i18n("E&xclude range:"), mw),
-  tqlayout->addWidget(excludeRange, 0, 0);
+  layout->addWidget(excludeRange, 0, 0);
   excludeFrom=new KDoubleNumInput(0, 72, 8.0, 1, 1, mw),
   excludeFrom->setSuffix(i18n(" pt"));
-  tqlayout->addWidget(excludeFrom, 0, 1);
+  layout->addWidget(excludeFrom, 0, 1);
   excludeToLabel=new TQLabel(i18n(" to "), mw);
-  tqlayout->addWidget(excludeToLabel, 0, 2);
+  layout->addWidget(excludeToLabel, 0, 2);
   excludeTo=new KDoubleNumInput(0, 72, 15.0, 1, 1, mw);
   excludeTo->setSuffix(i18n(" pt"));
-  tqlayout->addWidget(excludeTo, 0, 3);
+  layout->addWidget(excludeTo, 0, 3);
 
   useSubPixel=new TQCheckBox(i18n("&Use sub-pixel hinting:"), mw);
-  tqlayout->addWidget(useSubPixel, 1, 0);
+  layout->addWidget(useSubPixel, 1, 0);
 
   TQWhatsThis::add(useSubPixel, i18n("If you have a TFT or LCD screen you"
        " can further improve the quality of displayed fonts by selecting"
@@ -242,7 +242,7 @@ FontAASettings::FontAASettings(TQWidget *parent)
        "<br><b>This will not work with CRT monitors.</b>"));
 
   subPixelType=new TQComboBox(false, mw);
-  tqlayout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
+  layout->addMultiCellWidget(subPixelType, 1, 1, 1, 3);
 
   TQWhatsThis::add(subPixelType, i18n("In order for sub-pixel hinting to"
        " work correctly you need to know how the sub-pixels of your display"
@@ -256,9 +256,9 @@ FontAASettings::FontAASettings(TQWidget *parent)
 
 #ifdef HAVE_FONTCONFIG
   TQLabel *hintingLabel=new TQLabel(i18n("Hinting style: "), mw);
-  tqlayout->addWidget(hintingLabel, 2, 0);
+  layout->addWidget(hintingLabel, 2, 0);
   hintingStyle=new TQComboBox(false, mw);
-  tqlayout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
+  layout->addMultiCellWidget(hintingStyle, 2, 2, 1, 3);
   for(int s=KXftConfig::Hint::NotSet+1; s<=KXftConfig::Hint::Full; ++s)
     hintingStyle->insertItem(KXftConfig::description((KXftConfig::Hint::Style)s));
 
@@ -560,11 +560,11 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
     << i18n("Used by the taskbar.")
     << i18n("Used for desktop icons.");
 
-  TQVBoxLayout * tqlayout =
+  TQVBoxLayout * layout =
     new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   TQGridLayout * fontUseLayout =
-    new TQGridLayout(tqlayout, nameGroupKeyRc.count() / 4, 3);
+    new TQGridLayout(layout, nameGroupKeyRc.count() / 4, 3);
 
   fontUseLayout->setColStretch(0, 0);
   fontUseLayout->setColStretch(1, 1);
@@ -607,16 +607,16 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
     ++count;
   }
 
-   TQHBoxLayout *hblay = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+   TQHBoxLayout *hblay = new TQHBoxLayout(layout, KDialog::spacingHint());
    hblay->addStretch();
    TQPushButton * fontAdjustButton = new TQPushButton(i18n("Ad&just All Fonts..."), this);
    TQWhatsThis::add(fontAdjustButton, i18n("Click to change all fonts"));
    hblay->addWidget( fontAdjustButton );
    connect(fontAdjustButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyFontDiff()));
 
-   tqlayout->addSpacing(KDialog::spacingHint());
+   layout->addSpacing(KDialog::spacingHint());
 
-   TQGridLayout* lay = new TQGridLayout(tqlayout, 2, 4, KDialog::spacingHint());
+   TQGridLayout* lay = new TQGridLayout(layout, 2, 4, KDialog::spacingHint());
    lay->setColStretch( 3, 10 );
    TQLabel* label = new TQLabel( i18n( "Use a&nti-aliasing:" ), this );
    lay->addWidget( label, 0, 0 );
@@ -655,7 +655,7 @@ KFonts::KFonts(TQWidget *parent, const char *name, const TQStringList &)
    connect( comboForceDpi, TQT_SIGNAL( activated( int )), TQT_SLOT( changed()));
    lay->addWidget( comboForceDpi, 1, 1 );
 
-   tqlayout->addStretch(1);
+   layout->addStretch(1);
 
    aaSettings=new FontAASettings(this);
 
diff --git a/kcontrol/fonts/kxftconfig.cpp b/kcontrol/fonts/kxftconfig.cpp
index 4718e8fd7..682672a7a 100644
--- a/kcontrol/fonts/kxftconfig.cpp
+++ b/kcontrol/fonts/kxftconfig.cpp
@@ -52,7 +52,7 @@ TQString KXftConfig::contractHome(TQString path)
             unsigned int len = home.length();
 
             if(path.length() == len || path[len] == '/')
-                return path.tqreplace(0, len, TQString::tqfromLatin1("~"));
+                return path.replace(0, len, TQString::fromLatin1("~"));
         }
     }
 
@@ -62,7 +62,7 @@ TQString KXftConfig::contractHome(TQString path)
 TQString KXftConfig::expandHome(TQString path)
 {
     if(!path.isEmpty() && '~'==path[0])
-        return 1==path.length() ? TQDir::homeDirPath() : path.tqreplace(0, 1, TQDir::homeDirPath());
+        return 1==path.length() ? TQDir::homeDirPath() : path.replace(0, 1, TQDir::homeDirPath());
 
     return path;
 }
@@ -88,7 +88,7 @@ static TQString dirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.tqreplace("//", "/");
+        ds.replace("//", "/");
 
         int slashPos=ds.findRev('/');
 
@@ -648,10 +648,10 @@ bool KXftConfig::apply()
                         if(0!=str.find("<?xml"))
                             str.insert(0, xmlHeader);
                         else if(0==str.find(qtXmlHeader))
-                            str.tqreplace(0, strlen(qtXmlHeader), xmlHeader);
+                            str.replace(0, strlen(qtXmlHeader), xmlHeader);
     
                         if(-1!=(idx=str.find(qtDocTypeLine)))
-                            str.tqreplace(idx, strlen(qtDocTypeLine), docTypeLine);
+                            str.replace(idx, strlen(qtDocTypeLine), docTypeLine);
     
                         //
                         // Write to file...
@@ -1291,7 +1291,7 @@ void KXftConfig::applySubPixelType()
     if(m_subPixel.node.isNull())
         m_doc.documentElement().appendChild(matchNode);
     else
-        m_doc.documentElement().tqreplaceChild(matchNode, m_subPixel.node);
+        m_doc.documentElement().replaceChild(matchNode, m_subPixel.node);
     m_subPixel.node=matchNode;
 }
 
@@ -1323,7 +1323,7 @@ void KXftConfig::applyHintStyle()
         if(m_hint.node.isNull())
             m_doc.documentElement().appendChild(matchNode);
         else
-            m_doc.documentElement().tqreplaceChild(matchNode, m_hint.node);
+            m_doc.documentElement().replaceChild(matchNode, m_hint.node);
         m_hint.node=matchNode;
     }
 }
@@ -1344,7 +1344,7 @@ void KXftConfig::applyHinting()
     if(m_hinting.node.isNull())
         m_doc.documentElement().appendChild(matchNode);
     else
-        m_doc.documentElement().tqreplaceChild(matchNode, m_hinting.node);
+        m_doc.documentElement().replaceChild(matchNode, m_hinting.node);
     m_hinting.node=matchNode;
 }
 
diff --git a/kcontrol/fonts/kxftconfig.h b/kcontrol/fonts/kxftconfig.h
index e78358eba..cb5cd71f5 100644
--- a/kcontrol/fonts/kxftconfig.h
+++ b/kcontrol/fonts/kxftconfig.h
@@ -175,7 +175,7 @@ class KXftConfig
 
     //
     // Constructor
-    //    required - This should be a bittqmask of 'RequiredData', and indicates the data to be
+    //    required - This should be a bitmask of 'RequiredData', and indicates the data to be
     //               read/written to the config file. It is intended that the 'fonts' KControl
     //               module will use KXftConfig::SubPixelType|KXftConfig::ExcludeRange, and the
     //               font installer will use KXftConfig::Dirs|KXftConfig::SymbolFamilies.
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index 30445b0d9..41ddfe8e3 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -64,9 +64,9 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   : KCModule(KICCCFactory::instance(), parent, name)
 {
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  config = new KSimpleConfig( TQString::tqfromLatin1( "kiccconfigrc" ));
-  systemconfig = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
+  TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  config = new KSimpleConfig( TQString::fromLatin1( "kiccconfigrc" ));
+  systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kicc/kiccconfigrc" ));
 
   KAboutData *about =
   new KAboutData(I18N_NOOP("kcmiccconfig"), I18N_NOOP("KDE ICC Profile Control Module"),
@@ -77,7 +77,7 @@ KICCConfig::KICCConfig(TQWidget *parent, const char *name, const TQStringList &)
   setAboutData( about );
 
   base = new ICCConfigBase(this);
-  tqlayout->add(base);
+  layout->add(base);
 
   setRootOnlyMsg(i18n("<b>The global ICC color profile is a system wide setting, and requires administrator access</b><br>To alter the system's global ICC profile, click on the \"Administrator Mode\" button below."));
   setUseRootOnlyMsg(true);
diff --git a/kcontrol/iccconfig/iccconfigbase.ui b/kcontrol/iccconfig/iccconfigbase.ui
index 4823fab37..c9be0818f 100644
--- a/kcontrol/iccconfig/iccconfigbase.ui
+++ b/kcontrol/iccconfig/iccconfigbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
 	    <cstring>ICCConfigBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -168,7 +168,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -197,6 +197,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index a12bbed36..d1454171e 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -80,7 +80,7 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
 
     // Size
     TQLabel *lbl = new TQLabel(i18n("Size:"), m_pTab1);
-    lbl->setFixedSize(lbl->tqsizeHint());
+    lbl->setFixedSize(lbl->sizeHint());
     grid->addWidget(lbl, 0, 0, Qt::AlignLeft);
     mpSizeBox = new TQComboBox(m_pTab1);
     connect(mpSizeBox, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSize(int)));
@@ -105,8 +105,8 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
 
     top->activate();
 
-    mpSystrayConfig = new KSimpleConfig( TQString::tqfromLatin1( "systemtray_panelappletrc" ));
-    mpKickerConfig = new KSimpleConfig( TQString::tqfromLatin1( "kickerrc" ));
+    mpSystrayConfig = new KSimpleConfig( TQString::fromLatin1( "systemtray_panelappletrc" ));
+    mpKickerConfig = new KSimpleConfig( TQString::fromLatin1( "kickerrc" ));
 
     init();
     read();
@@ -125,7 +125,7 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
     TQLabel *lab = new TQLabel(str, parent);
     lay->addWidget(lab, 1, i, AlignCenter);
     mpPreview[i] = new TQLabel(parent);
-    mpPreview[i]->tqsetAlignment(AlignCenter);
+    mpPreview[i]->setAlignment(AlignCenter);
     mpPreview[i]->setMinimumSize(105, 105);
     lay->addWidget(mpPreview[i], 2, i);
     TQPushButton *push = new TQPushButton(i18n("Set Effect..."), parent);
@@ -688,7 +688,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
     top->setRowStretch(1,1);
 
     lbl = new TQLabel(i18n("&Effect:"), page);
-    lbl->setFixedSize(lbl->tqsizeHint());
+    lbl->setFixedSize(lbl->sizeHint());
     top->addWidget(lbl, 0, 0, Qt::AlignLeft);
     mpEffectBox = new TQListBox(page);
     mpEffectBox->insertItem(i18n("No Effect"));
@@ -713,7 +713,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
     grid->setRowStretch(1, 1);
 
     mpPreview = new TQLabel(frame);
-    mpPreview->tqsetAlignment(AlignCenter);
+    mpPreview->setAlignment(AlignCenter);
     mpPreview->setMinimumSize(105, 105);
     grid->addWidget(mpPreview, 1, 0);
 
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index ad84e9e10..5d7f924a9 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -158,7 +158,7 @@ void IconThemesConfig::installNewTheme()
   if (themeURL.url().isEmpty()) return;
 
   TQString themeTmpFile;
-  // themeTmpFile tqcontains the name of the downloaded file
+  // themeTmpFile contains the name of the downloaded file
 
   if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
     TQString sorryText;
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index c16a8db0b..396a6ee4f 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -39,9 +39,9 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
 IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
   : KCModule(IconsFactory::instance(), parent, name)
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   tab1 = new IconThemesConfig(this, "themes");
   tab->addTab(tab1, i18n("&Theme"));
diff --git a/kcontrol/info/info.cpp b/kcontrol/info/info.cpp
index d5cc677d3..770b2cdf3 100644
--- a/kcontrol/info/info.cpp
+++ b/kcontrol/info/info.cpp
@@ -80,7 +80,7 @@ static const TQString HexStr(unsigned long val, int digits )
 {
     TQString hexstr;
     int i;
-    hexstr = TQString::tqfromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
+    hexstr = TQString::fromLatin1("0x%1").arg(val, digits, 16/*=HEX*/);
     for (i=hexstr.length()-1; i>0; --i)
      if (hexstr[i]==' ')
          hexstr[i] = '0';
@@ -167,7 +167,7 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
         for (i = 0; i < ndepths; i++) {
             txt = txt + Value(depths[i]);
             if (i < ndepths - 1)
-                txt = txt + TQString::tqfromLatin1(", ");
+                txt = txt + TQString::fromLatin1(", ");
         }
 
         last = new TQListViewItem(item, last, i18n("Depths (%1)").arg(ndepths,-1), txt);
@@ -200,11 +200,11 @@ static TQListViewItem* XServer_fill_screen_info( TQListViewItem *lBox, TQListVie
 		      ((DoesBackingStore(s) == Always) ? YES : i18n("When mapped")) )
 		.arg(  DoesSaveUnders(s) ? YES : NO ));
 
-    XQueryBestSize (dpy, tqCursorShape, RootWindow(dpy,scr), 65535, 65535,
+    XQueryBestSize (dpy, CursorShape, RootWindow(dpy,scr), 65535, 65535,
 		    &width, &height);
     last = new TQListViewItem(item, last, i18n("Largest Cursor"),
 		(width == 65535 && height == 65535)
-		? i18n("unlimited") : TQString::tqfromLatin1("%1 x %2").arg(width).arg(height));
+		? i18n("unlimited") : TQString::fromLatin1("%1 x %2").arg(width).arg(height));
 
     last = new TQListViewItem(item, last, i18n("Current Input Event Mask"),
 		HexStr((unsigned long)EventMaskOfScreen(s),HEXDIGITS));
@@ -272,12 +272,12 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
     last = new TQListViewItem(next, i18n("Name of the Display"),
 		DisplayString(dpy));
 
-    last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::tqfromLatin1(ServerVendor(dpy)));
+    last = new TQListViewItem(next, last, i18n("Vendor String"), TQString::fromLatin1(ServerVendor(dpy)));
     last = new TQListViewItem(next, last, i18n("Vendor Release Number"),
 		Value((int)VendorRelease(dpy)));
 
     last = new TQListViewItem(next, last, i18n("Version Number"),
-		TQString::tqfromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
+		TQString::fromLatin1("%1.%2").arg((int)ProtocolVersion(dpy))
     		                  .arg((int)ProtocolRevision(dpy)));
 
     last = item = new TQListViewItem(next, last, i18n("Available Screens"));
@@ -294,7 +294,7 @@ static bool GetInfo_XServer_Generic( TQListView *lBox )
     int extCount;
     char **extensions = XListExtensions( dpy, &extCount );
     for ( i = 0; i < extCount; i++ ) {
-       item = new TQListViewItem( last, item, TQString::tqfromLatin1( extensions[i] ) );
+       item = new TQListViewItem( last, item, TQString::fromLatin1( extensions[i] ) );
     }
     XFreeExtensionList( extensions );
 
@@ -356,7 +356,7 @@ void KInfoListWidget::load()
         retrieve-function. If the function wants the widget to show
         another string, then it change *GetInfo_ErrorString ! */
     ErrorString = i18n("No information available about %1.").arg(title)
-		    + TQString::tqfromLatin1("\n\n") + DEFAULT_ERRORSTRING;
+		    + TQString::fromLatin1("\n\n") + DEFAULT_ERRORSTRING;
     GetInfo_ErrorString = &ErrorString;  /* save the address of ErrorString */
 
     sorting_allowed = true; 	/* the functions may set that */
@@ -414,9 +414,9 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     setButtons(KCModule::Help);
     getlistbox 	= _getlistbox;
     GetInfo_ErrorString = 0;
-    TQHBoxLayout *tqlayout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
+    TQHBoxLayout *layout = new TQHBoxLayout(this, 0, KDialog::spacingHint());
     widgetStack = new TQWidgetStack(this);
-    tqlayout->addWidget(widgetStack);
+    layout->addWidget(widgetStack);
     lBox 	= new TQListView(widgetStack);
     widgetStack->addWidget(lBox, 0);
     lBox->setMinimumSize(200,120);
@@ -425,7 +425,7 @@ KInfoListWidget::KInfoListWidget(const TQString &_title, TQWidget *parent, const
     TQWhatsThis::add( lBox, i18n( "This list displays system information on the selected category." ) );
     NoInfoText  = new TQLabel(widgetStack);
     widgetStack->addWidget(NoInfoText, 1);
-    NoInfoText->tqsetAlignment(AlignCenter | WordBreak);
+    NoInfoText->setAlignment(AlignCenter | WordBreak);
     widgetStack->raiseWidget(NoInfoText);
     load();
 }
diff --git a/kcontrol/info/info_aix.cpp b/kcontrol/info/info_aix.cpp
index de7c3a095..9aa0d3767 100644
--- a/kcontrol/info/info_aix.cpp
+++ b/kcontrol/info/info_aix.cpp
@@ -70,7 +70,7 @@ list_devices(TQListView *lBox, char *criteria)
   TQListViewItem *lastitem = NULL;
 
   lBox->addColumn(i18n("Name"));
-  lBox->addColumn(i18n("tqStatus"));
+  lBox->addColumn(i18n("Status"));
   lBox->addColumn(i18n("Location"));
   lBox->addColumn(i18n("Description"));
 
diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp
index 74bb08258..18287c45f 100644
--- a/kcontrol/info/info_linux.cpp
+++ b/kcontrol/info/info_linux.cpp
@@ -503,7 +503,7 @@ bool GetInfo_Partitions(TQListView * lbox)
 #endif
     {
 	total = avail = 0;	/* initialize size.. */
-	found_in_List = (Mounted_Partitions.tqcontains(FS_NAME) > 0);
+	found_in_List = (Mounted_Partitions.contains(FS_NAME) > 0);
 	if (found_in_List && statfs(FS_FILE, &sfs) == 0) {
 	    total = ((LONG_TYPE) sfs.f_blocks) * sfs.f_bsize;
 	    avail = (getuid()? sfs.f_bavail : sfs.f_bfree)
@@ -573,7 +573,7 @@ bool GetInfo_CD_ROM(TQListView * lBox)
 				if (-1 != rx.search(line)) {
 					TQString text = rx.cap(1);
 					TQString value = rx.cap(2);
-					if (!text.tqcontains('#')) {
+					if (!text.contains('#')) {
 						if (value == "0")
 							value = KStdGuiItem::no().plainText();
 						if (value == "1")
diff --git a/kcontrol/info/info_netbsd.cpp b/kcontrol/info/info_netbsd.cpp
index d9857af28..02fd98b1d 100644
--- a/kcontrol/info/info_netbsd.cpp
+++ b/kcontrol/info/info_netbsd.cpp
@@ -125,18 +125,18 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter,
 	TQListViewItem *olditem = NULL;
 	while(!(s = t->readLine().local8Bit()).isEmpty()) {
 		if (!seencpu) {
-			if (s.tqcontains("cpu"))
+			if (s.contains("cpu"))
 				seencpu = true;
 			else
 				continue;
 		}
-		if (s.tqcontains("boot device") ||
-			s.tqcontains("WARNING: old BSD partition ID!"))
+		if (s.contains("boot device") ||
+			s.contains("WARNING: old BSD partition ID!"))
 			break;
 
 		if (!filter
 		    || (filter[0] == '^' && s.find(&filter[1]) == 0)
-		    || (filter[0] != '^' && s.tqcontains(filter))) {
+		    || (filter[0] != '^' && s.contains(filter))) {
 			if (func)
 				func(lBox, s);
 			else
@@ -253,7 +253,7 @@ bool GetInfo_SCSI (TQListView *lbox)
 	for(; lvitem; lvitem = lvitem->nextSibling()) {
 		TQString s = lvitem->text(0);
 
-		if (s.tqcontains("seconds for devices to settle")) {
+		if (s.contains("seconds for devices to settle")) {
 			lbox->removeItem(lvitem);
 			break;
 		}
@@ -296,18 +296,18 @@ bool GetInfo_Partitions (TQListView *lbox)
 
 		// convert to strings
 		vv[0] = KIO::convertSize(big[0]);
-		vv[1] = TQString::tqfromLatin1("%1 (%2%%)")
+		vv[1] = TQString::fromLatin1("%1 (%2%%)")
 				.arg(KIO::convertSize(big[1]))
 				.arg(mnt->f_blocks ? mnt->f_bavail*100/mnt->f_blocks : 0);
 
 		// FIXME: these two are large enough to punctuate
 		vv[2] = TQString::number(mnt->f_files);
-		vv[3] = TQString::tqfromLatin1("%1 (%2%%) ")
+		vv[3] = TQString::fromLatin1("%1 (%2%%) ")
 				.arg(mnt->f_ffree)
 				.arg(mnt->f_files ? mnt->f_ffree*100/mnt->f_files : 0);
 
 		vv[4] = TQString::null;
-#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::tqfromLatin1(#x " ");
+#define MNTF(x) if (mnt->f_flags & MNT_##x) vv[4] += TQString::fromLatin1(#x " ");
 		MNTF(ASYNC)
 		MNTF(DEFEXPORTED)
 		MNTF(EXKERB)
diff --git a/kcontrol/info/info_openbsd.cpp b/kcontrol/info/info_openbsd.cpp
index 22b6c8426..12ec8ee2d 100644
--- a/kcontrol/info/info_openbsd.cpp
+++ b/kcontrol/info/info_openbsd.cpp
@@ -122,16 +122,16 @@ static bool GetDmesgInfo(TQListView *lBox, const char *filter,
 	TQListViewItem *olditem = NULL;
 	while(!(s = t->readLine()).isNull()) {
 		if (!seencpu) {
-			if (s.tqcontains("cpu"))
+			if (s.contains("cpu"))
 				seencpu = true;
 			else
 				continue;
 		}
-		if (s.tqcontains("boot device") ||
-			s.tqcontains("WARNING: old BSD partition ID!"))
+		if (s.contains("boot device") ||
+			s.contains("WARNING: old BSD partition ID!"))
 			break;
 
-		if (!filter || s.tqcontains(filter)) {
+		if (!filter || s.contains(filter)) {
 			if (func) {
 				func(lBox, s, &opaque, false);
 			}
diff --git a/kcontrol/info/info_osx.cpp b/kcontrol/info/info_osx.cpp
index 1b457f18a..5f18aebea 100644
--- a/kcontrol/info/info_osx.cpp
+++ b/kcontrol/info/info_osx.cpp
@@ -115,7 +115,7 @@ bool GetInfo_Sound (TQListView *lBox)
 {
 #ifdef HAVE_COREAUDIO
 #define kMaxStringSize 1024
-	OStqStatus status;
+	OSStatus status;
 	AudioDeviceID gOutputDeviceID;
 	unsigned long propertySize;
 	char deviceName[kMaxStringSize];
diff --git a/kcontrol/info/info_solaris.cpp b/kcontrol/info/info_solaris.cpp
index 6dd215f55..9f2b17e1b 100644
--- a/kcontrol/info/info_solaris.cpp
+++ b/kcontrol/info/info_solaris.cpp
@@ -184,10 +184,10 @@ bool GetInfo_Partitions( TQListView *lBox ) {
 	lBox->addColumn( i18n( "Mount Point" ));
 	lBox->addColumn( i18n( "FS Type" ));
 	lBox->addColumn( i18n( "Total Size" ));
-	// XXX: FIXME: how do I set column tqalignment correctly?
+	// XXX: FIXME: how do I set column alignment correctly?
 	lBox->setColumnAlignment( 3, 2 );
 	lBox->addColumn( i18n( "Free Size" ));
-	// XXX: FIXME: how do I set column tqalignment correctly?
+	// XXX: FIXME: how do I set column alignment correctly?
 	lBox->setColumnAlignment( 4, 2 );
 	lBox->addColumn( i18n( "Mount Time" ));
 	lBox->addColumn( i18n( "Mount Options" ));
diff --git a/kcontrol/info/memory.cpp b/kcontrol/info/memory.cpp
index 0720f32a6..7bfe52948 100644
--- a/kcontrol/info/memory.cpp
+++ b/kcontrol/info/memory.cpp
@@ -163,7 +163,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	    break;
 	};
 	Widget = new TQLabel(title, this);
-	Widget->tqsetAlignment(AlignLeft);
+	Widget->setAlignment(AlignLeft);
 	vbox->addWidget(Widget, 1);
     }
 
@@ -174,7 +174,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	    if (i == SWAP_MEM)
 		vbox->addSpacing(SPACING);
 	    Widget = new TQLabel(this);
-	    Widget->tqsetAlignment(AlignRight);
+	    Widget->setAlignment(AlignRight);
 	    MemSizeLabel[i][j] = Widget;
 	    vbox->addWidget(Widget, 1);
 	}
@@ -228,7 +228,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	  hint = "<qt>" + hint + "</qt>";
 
 	Widget = new TQLabel("<b>" + title + "</b>", this);
-	Widget->tqsetAlignment(AlignCenter);
+	Widget->setAlignment(AlignCenter);
 	TQToolTip::add(Widget, hint);
 	vbox->addWidget(Widget);
 	vbox->addSpacing(SPACING / 2);
@@ -243,7 +243,7 @@ KMemoryWidget::KMemoryWidget(TQWidget * parent, const char *name)
 	vbox->addSpacing(SPACING / 2);
 
 	Widget = new TQLabel(this);	/* xx MB used. */
-	Widget->tqsetAlignment(AlignCenter);
+	Widget->setAlignment(AlignCenter);
 	TQToolTip::add(Widget, hint);
 	GraphLabel[i] = Widget;
 	vbox->addWidget(Widget);
@@ -424,7 +424,7 @@ void KMemoryWidget::update_Values()
 		      used, swap_colors, swap_text);
     
     /* RAM + SWAP usage: */
-    /* used[0] already tqcontains the amount of used swap */
+    /* used[0] already contains the amount of used swap */
     used[2] = Memory_Info[FREE_MEM] + ZERO_IF_NO_INFO(Memory_Info[FREESWAP_MEM]);
     used[1] = Memory_Info[TOTAL_MEM] - Memory_Info[FREE_MEM];
     if (!all_colors_initialized) {
diff --git a/kcontrol/info/opengl.cpp b/kcontrol/info/opengl.cpp
index 49b29f953..061e368e6 100644
--- a/kcontrol/info/opengl.cpp
+++ b/kcontrol/info/opengl.cpp
@@ -194,7 +194,7 @@ print_extension_list(const char *ext, TQListViewItem *l1)
 
    if (!ext || !ext[0])
       return;
-   TQString qext = TQString::tqfromLatin1(ext);
+   TQString qext = TQString::fromLatin1(ext);
    TQListViewItem *l2 = NULL;
 
    i = j = 0;
@@ -551,7 +551,7 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ
       None };
 
    XSetWindowAttributes attr;
-   unsigned long tqmask;
+   unsigned long mask;
    Window root;
    GLXContext ctx;
    XVisualInfo *visinfo;
@@ -573,10 +573,10 @@ static TQListViewItem *get_gl_info(Display *dpy, int scrnum, Bool allowDirect,TQ
    attr.border_pixel = 0;
    attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone);
    attr.event_mask = StructureNotifyMask | ExposureMask;
-   tqmask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
+   mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask;
    win = XCreateWindow(dpy, root, 0, 0, width, height,
    			0, visinfo->depth, InputOutput,
-		       visinfo->visual, tqmask, &attr);
+		       visinfo->visual, mask, &attr);
 
    ctx = glXCreateContext( dpy, visinfo, NULL, allowDirect );
    if (!ctx) {
diff --git a/kcontrol/info/opengl.desktop b/kcontrol/info/opengl.desktop
index fa38a0db3..4451c5167 100644
--- a/kcontrol/info/opengl.desktop
+++ b/kcontrol/info/opengl.desktop
@@ -121,11 +121,11 @@ Keywords[km]=OpenGL,DRI,GLX,3D,ប័ណ្ណ​វីដេអូ,បន្ទ
 Keywords[lt]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Video plokštė,aparatūros greitinimas,grafika
 Keywords[lv]=OpenGL,DRI,GLX,3D,VideoKarte,Dzelžu paātrināšana,Grafika,X,X11,Xserveris,X-Serveris,XFree86,Ekrāns
 Keywords[mk]=OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,Видео-картичка,Хардверско забрзување,Графика,екран,приказ
-Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm
+Keywords[nb]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,bilde,X,X11,X-tenar,XFree86,skjerm
 Keywords[nds]=OpenGL,DRI,GLX,3D,Videokort,Hardware Acceleration,Grafik,X,X11,Xserver,X-Server,XFree86,Display,Dorstellen,Beslünigen
 Keywords[ne]=खुला GL, DRI, GLX, 3D,भिडियो कार्ड, हार्डवेयर गतिवर्धन, ग्राफिक्स, X, X11, Xसर्भर, X-सर्भर, X स्वतन्त्र 86, प्रदर्शन गर्नुहोस्
 Keywords[nl]=OpenGL,DRI,GLX,3D,videokaart,hardware-acceleratie,grafisch,graphics,X,X11,Xserver,X-Server,XFree86,display,beeldscherm
-Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,tqmaskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm
+Keywords[nn]=OpenGL,DRI,GLX,3D,skjermkort,maskinvareakselerasjon,grafikk,X,X11,X-tenar,XFree86,skjerm
 Keywords[pa]=OpenGL,DRI,GLX,3D,ਵੀਡਿਓਕਾਰਡ, ਹਾਰਡਵੇਅਰ ਪਰਵੇਸ਼ਕ,ਗਰਾਫਿਕਸ,X,X11,Xserver,X-Server,XFree86,ਦਰਿਸ਼
 Keywords[pl]=OpenGL,DRI,GLX,3D,karta graficzna,grafika,X,X11,Xserver,X-Server,XFree86,ekran
 Keywords[pt]=OpenGL,DRI,GLX,3D,Placa Vídeo,Aceleração por Hardware,Gráficos,X,X11,Servidor X,XFree86,Ecrã
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index 90afbbdfd..a2b5f1b86 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -52,10 +52,10 @@ namespace {
 ThemePage::ThemePage( TQWidget* parent, const char* name )
 	: TQWidget( parent, name )
 {
-	TQBoxLayout *tqlayout = new TQVBoxLayout( this );
-	tqlayout->setAutoAdd( true );
-	tqlayout->setMargin( KDialog::marginHint() );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	TQBoxLayout *layout = new TQVBoxLayout( this );
+	layout->setAutoAdd( true );
+	layout->setMargin( KDialog::marginHint() );
+	layout->setSpacing( KDialog::spacingHint() );
 
 	new TQLabel( i18n("Select the cursor theme you want to use:"), this );
 
diff --git a/kcontrol/input/kmousedlg.ui b/kcontrol/input/kmousedlg.ui
index 53353c3f6..01ba9966f 100644
--- a/kcontrol/input/kmousedlg.ui
+++ b/kcontrol/input/kmousedlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KMouseDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -57,7 +57,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -74,7 +74,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -112,7 +112,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>150</width>
                             <height>115</height>
@@ -181,10 +181,10 @@
                 </widget>
                 <widget class="QCheckBox" row="2" column="1" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>cb_pointertqshape</cstring>
+                        <cstring>cb_pointershape</cstring>
                     </property>
                     <property name="text">
-                        <string>Cha&amp;nge pointer tqshape over icons</string>
+                        <string>Cha&amp;nge pointer shape over icons</string>
                     </property>
                     <property name="checked">
                         <bool>true</bool>
@@ -208,7 +208,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
@@ -217,7 +217,7 @@
                 </spacer>
                 <widget class="QLayoutWidget" row="4" column="2">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -235,7 +235,7 @@
                             <property name="name">
                                 <cstring>slAutoSelect</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>250</width>
                                     <height>0</height>
@@ -258,7 +258,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>230</width>
                                     <height>20</height>
@@ -283,7 +283,7 @@
                             <property name="text">
                                 <string>Long</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -301,7 +301,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -331,7 +331,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -344,7 +344,7 @@
     <connection>
         <sender>singleClick</sender>
         <signal>toggled(bool)</signal>
-        <receiver>cb_pointertqshape</receiver>
+        <receiver>cb_pointershape</receiver>
         <slot>setEnabled(bool)</slot>
     </connection>
     <connection>
@@ -364,7 +364,7 @@
     <tabstop>rightHanded</tabstop>
     <tabstop>leftHanded</tabstop>
     <tabstop>singleClick</tabstop>
-    <tabstop>cb_pointertqshape</tabstop>
+    <tabstop>cb_pointershape</tabstop>
     <tabstop>cbAutoSelect</tabstop>
     <tabstop>slAutoSelect</tabstop>
     <tabstop>doubleClick</tabstop>
@@ -373,6 +373,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp
index ee0c31b06..9fc8daf32 100644
--- a/kcontrol/input/logitechmouse.cpp
+++ b/kcontrol/input/logitechmouse.cpp
@@ -86,7 +86,7 @@ LogitechMouse::LogitechMouse( struct usb_device *usbDev, int mouseCapabilityFlag
 
     if ( mouseCapabilityFlags & HAS_CSR ) {
 
-        initCordlesstqStatusReporting();
+        initCordlessStatusReporting();
 
         // Do a name
         cordlessNameLabel->setText( i18n("Mouse type: %1").arg( cordlessName() ) );
@@ -118,15 +118,15 @@ LogitechMouse::~LogitechMouse()
     usb_close( m_usbDeviceHandle );
 }
 
-void LogitechMouse::initCordlesstqStatusReporting()
+void LogitechMouse::initCordlessStatusReporting()
 {
-    updateCordlesstqStatus();
+    updateCordlessStatus();
     doUpdate = new TQTimer( this ); // will be automatically deleted
     connect( doUpdate, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateGUI() ) );
     doUpdate->start( 20000 );
 }
 
-void LogitechMouse::updateCordlesstqStatus()
+void LogitechMouse::updateCordlessStatus()
 {
     TQByteArray status(8);
 
@@ -147,7 +147,7 @@ void LogitechMouse::updateCordlesstqStatus()
     } else {
         // kdDebug() << "P6 (connect status): " << (status[0] & 0xFF) << endl;
         if ( status[0] & 0x20 ) { // mouse is talking
-            m_connecttqStatus = ( status[0] & 0x80 );
+            m_connectStatus = ( status[0] & 0x80 );
             m_mousePowerup = ( status[0] & 0x40 );
             m_receiverUnlock = ( status[0] & 0x10 );
             m_waitLock = ( status[0] & 0x08 );
@@ -188,7 +188,7 @@ void LogitechMouse::updateCordlesstqStatus()
 
 void LogitechMouse::updateGUI()
 {
-    updateCordlesstqStatus();
+    updateCordlessStatus();
 
     batteryBar->setProgress( batteryLevel() );
 
@@ -229,7 +229,7 @@ void LogitechMouse::applyChanges()
             KMessageBox::information(this, i18n("RF channel 2 has been set. Please press Connect button on mouse to re-establish link"), i18n("Press Connect Button") );
         }
 
-        initCordlesstqStatusReporting();
+        initCordlessStatusReporting();
     }
 }
 
@@ -238,7 +238,7 @@ void LogitechMouse::save(KConfig * /*config*/)
     kdDebug() << "Logitech mouse settings not saved - not implemented yet" << endl;
 }
 
-TQ_UINT8 LogitechMouse::resolution()
+Q_UINT8 LogitechMouse::resolution()
 {
     // kdDebug() << "resolution: " << m_resolution << endl;
     if ( 0 == m_resolution ) {
@@ -299,13 +299,13 @@ void LogitechMouse::setLogitechTo400()
     }
 }
 
-TQ_UINT8 LogitechMouse::batteryLevel()
+Q_UINT8 LogitechMouse::batteryLevel()
 {
     return m_batteryLevel;
 }
 
 
-TQ_UINT8 LogitechMouse::channel()
+Q_UINT8 LogitechMouse::channel()
 {
     return m_channel;
 }
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 20e7400c2..4ea296725 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -61,36 +61,36 @@ protected slots:
     void stopTimerForNow();
 
 private:
-    void initCordlesstqStatusReporting();
-    void updateCordlesstqStatus();
+    void initCordlessStatusReporting();
+    void updateCordlessStatus();
 
     void setLogitechTo400();
     void setLogitechTo800();
 
     TQString cordlessName();
-    TQ_UINT8 resolution();
+    Q_UINT8 resolution();
     void updateResolution();
-    TQ_UINT8 batteryLevel();
-    TQ_UINT8 channel();
+    Q_UINT8 batteryLevel();
+    Q_UINT8 channel();
     bool isDualChannelCapable();
 
     TQTimer *doUpdate;
 
     struct usb_dev_handle *m_usbDeviceHandle;
-    bool m_connecttqStatus; // true if the CONNECT button on the mouse is pressed
+    bool m_connectStatus; // true if the CONNECT button on the mouse is pressed
     bool m_mousePowerup; // true if we are doing "just out of the box" auto-locking
     bool m_receiverUnlock; // true if mouse has been disconnected by a long press
                            // of the receiver's CONNECT button
     bool m_waitLock; // true if receiver searching for new mouse because the
                      // CONNECT button on the receiver was pressed
-    TQ_UINT8 m_batteryLevel;
-    TQ_UINT8 m_channel;
-    TQ_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName()
-    TQ_UINT16 m_cordlessSecurity;
-    TQ_UINT16 m_useSecondChannel;
-    TQ_UINT8 m_caseShape;
-    TQ_UINT8 m_numberOfButtons;
-    TQ_UINT8 m_resolution;
+    Q_UINT8 m_batteryLevel;
+    Q_UINT8 m_channel;
+    Q_UINT8 m_cordlessNameIndex; // this gets convered into a TQString in cordlessName()
+    Q_UINT16 m_cordlessSecurity;
+    Q_UINT16 m_useSecondChannel;
+    Q_UINT8 m_caseShape;
+    Q_UINT8 m_numberOfButtons;
+    Q_UINT8 m_resolution;
     bool m_twoChannelCapable; // true if the mouse supports dual channels
     bool m_verticalRoller; // true if the mouse has a vertical roller (wheel)
     bool m_horizontalRoller; // true if the mouse has a horizontal roller (wheel)
diff --git a/kcontrol/input/logitechmouse_base.ui b/kcontrol/input/logitechmouse_base.ui
index 3b12782dc..5c9c1cd9a 100644
--- a/kcontrol/input/logitechmouse_base.ui
+++ b/kcontrol/input/logitechmouse_base.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>LogitechMouseBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -31,7 +31,7 @@
             <property name="text">
                 <string>You have a Logitech Mouse connected, and libusb was found at compile time, but it was not possible to access this mouse. This is probably caused by a permissions problem - you should consult the manual on how to fix this.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -149,5 +149,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 1b64dbb9c..68f376474 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -150,7 +150,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
     connect(tab1->slAutoSelect, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changed()));
     connect(tab1->cbVisualActivate, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
 
-    connect(tab1->cb_pointertqshape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
+    connect(tab1->cb_pointershape, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
 
     connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
     connect(tab1->singleClick, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClick()));
@@ -291,7 +291,7 @@ MouseConfig::MouseConfig (TQWidget * parent, const char *name)
   TQBoxLayout *vbox = new TQVBoxLayout(mouse, KDialog::marginHint(),
     KDialog::spacingHint());
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->tqlayout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(mouse->layout(), KDialog::spacingHint());
 
   mouseKeys = new TQCheckBox(i18n("&Move pointer with keyboard (using the num pad)"), mouse);
   vvbox->addWidget(mouseKeys);
@@ -506,7 +506,7 @@ void MouseConfig::load( bool useDefaults )
 
   tab1->singleClick->setChecked( settings->singleClick );
   tab1->doubleClick->setChecked(!settings->singleClick);
-  tab1->cb_pointertqshape->setChecked(settings->changeCursor);
+  tab1->cb_pointershape->setChecked(settings->changeCursor);
   tab1->cbAutoSelect->setChecked( settings->autoSelectDelay >= 0 );
   if ( settings->autoSelectDelay < 0 )
      tab1->slAutoSelect->setValue( 0 );
@@ -564,7 +564,7 @@ void MouseConfig::save()
   settings->autoSelectDelay = tab1->cbAutoSelect->isChecked()? tab1->slAutoSelect->value():-1;
   settings->visualActivate = tab1->cbVisualActivate->isChecked();
 //  settings->changeCursor = tab1->singleClick->isChecked();
-  settings->changeCursor = tab1->cb_pointertqshape->isChecked();
+  settings->changeCursor = tab1->cb_pointershape->isChecked();
   settings->reverseScrollPolarity = tab1->cbScrollPolarity->isChecked();
 
   settings->apply();
@@ -723,7 +723,7 @@ void MouseConfig::slotWheelScrollLinesChanged(int value)
 void MouseSettings::apply(bool force)
 {
   XChangePointerControl( kapp->getDisplay(),
-                         true, true, int(tqRound(accelRate*10)), 10, thresholdMove);
+                         true, true, int(qRound(accelRate*10)), 10, thresholdMove);
 
   // 256 might seems extreme, but X has already been known to return 32, 
   // and we don't want to truncate things. Xlib limits the table to 256 bytes,
diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop
index 8560e6453..fe0f30281 100644
--- a/kcontrol/input/mouse.desktop
+++ b/kcontrol/input/mouse.desktop
@@ -214,7 +214,7 @@ Keywords[ne]=माउस, माउस गतिवर्धन, माउस 
 Keywords[nl]=muis,muissnelheid,muisknoppen,selectie,cursor-uiterlijk,input devices,invoerapparaten,knopindeling,klikken,iconen,pictogrammen,icons,aanwijzers,pointers,drag,verslepen,dubbelklikken,linkshandig,rechtshandig.randapparaten
 Keywords[nn]=mus,musakselerasjon,musterskel,musknappar,val,peikar,peikarform,inneiningar,knappar,klikk,ikon,tilbakemelding,dra,dobbeltklikk,høgrehendt,venstrehendt
 Keywords[nso]=Legotlo,Koketso ya legotlo,Threshold ya legotlo,Ditobetswa tsa legotlo, Kgetho,Sebopego sa Cursor,Maano a Tsenyo,Mapping Setobetswa,Tobetsa, diemedi,phetolo,Disupi,Topa,Tobetsopedi,mapping,swerwe ka lagoja,swerwe ka lanngele
-Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,tqCursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ
+Keywords[pa]=ਮਾਊਸ,ਮਾਊਸ ਪ੍ਰਵੇਸ਼,ਮਾਊਸ threshold,ਮਾਊਸ buttons,Selection,CursorShape,Input ਜੰਤਰ,Button Mapping,Click,icons,feedback,Pointers,Drag,DoubleClick,mapping,righthanded,left handed,ਕਲਿੱਕ,ਆਈਕਾਨ
 Keywords[pl]=Mysz,Akceleracja myszy,Próg myszy,Przyciski myszy,Zaznaczenie,Kształt kursora,Urządzenia wejściowe,mapowanie przycisków,kliknięcie,ikony,widoczne efekty,wskaźniki,przeciąganie,podwójne kliknięcie,mapowanie,praworęczny,leworęczny
 Keywords[pt]=rato,aceleração do rato,limite do rato,botões do rato,selecção,forma do cursor,dispositivos de entrada,atribuição de botões,click,ícones,feedback,cursores,arrastar,duplo 'click',atribuição,destro,esquerdino
 Keywords[pt_BR]=Mouse,aceleração do mouse,limiar do mouse, botões do mouse,Seleção,Formato do Cursor,Dispositivos de entrada,mapeamento de botões,clique,ícones,retorno,ponteiros,arrastar,clique duplo,mapeamento,destro,canhoto
diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h
index 8d6bba1df..bee04d5ea 100644
--- a/kcontrol/input/mouse.h
+++ b/kcontrol/input/mouse.h
@@ -84,7 +84,7 @@ public:
  bool reverseScrollPolarity;
 
  #ifdef HAVE_LIBUSB
- // TODO: In Qt4, tqreplace with a better container.
+ // TODO: In Qt4, replace with a better container.
  TQPtrList <LogitechMouse> logitechMouseList;
  #endif
 };
diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp
index a7a35687c..ceb399648 100644
--- a/kcontrol/input/xcursor/previewwidget.cpp
+++ b/kcontrol/input/xcursor/previewwidget.cpp
@@ -68,8 +68,8 @@ namespace {
 		"center_ptr",
 		"circle",
 		"dot",
-		"dot_box_tqmask",
-		"dot_box_tqmask",
+		"dot_box_mask",
+		"dot_box_mask",
 		"double_arrow",
 		"draped_box",
 		"left_side",
@@ -303,7 +303,7 @@ void PreviewWidget::setTheme( const TQString &theme )
 	current = -1;
 	setFixedSize( ( maxWidth + cursorSpacing ) * numCursors, kMax( maxHeight, minHeight ) );
 	setUpdatesEnabled( true );
-	tqrepaint( false );
+	repaint( false );
 }
 
 
@@ -311,7 +311,7 @@ void PreviewWidget::paintEvent( TQPaintEvent * )
 {
 	TQPixmap buffer( size() );
 	TQPainter p( &buffer );
-	p.fillRect( rect(), tqcolorGroup().brush( TQColorGroup::Background ) );
+	p.fillRect( rect(), colorGroup().brush( TQColorGroup::Background ) );
 	Picture dest;
 
 	if ( !qt_has_xft || !qt_use_xrender ) {
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index 38d41fff1..7caf18c3f 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -83,10 +83,10 @@ static TQString defaultThemeDescription( const TQString& theme )
 ThemePage::ThemePage( TQWidget* parent, const char* name )
 	: TQWidget( parent, name ), selectedTheme( NULL ), currentTheme( NULL )
 {
-	TQBoxLayout *tqlayout = new TQVBoxLayout( this );
-	tqlayout->setAutoAdd( true );
-	tqlayout->setMargin( KDialog::marginHint() );
-	tqlayout->setSpacing( KDialog::spacingHint() );
+	TQBoxLayout *layout = new TQVBoxLayout( this );
+	layout->setAutoAdd( true );
+	layout->setMargin( KDialog::marginHint() );
+	layout->setSpacing( KDialog::spacingHint() );
 
 	new TQLabel( i18n("Select the cursor theme you want to use (hover preview to test cursor):"), this );
 
@@ -122,7 +122,7 @@ ThemePage::ThemePage( TQWidget* parent, const char* name )
 		( !icons.exists() && !TQFileInfo( TQDir::homeDirPath() ).isWritable() ) )
 		installButton->setEnabled( false );
 
-	if ( !themeDirs.tqcontains( path ) )
+	if ( !themeDirs.contains( path ) )
 		installButton->setEnabled( false );
 
 	selectionChanged( listview->currentItem() );
@@ -305,17 +305,17 @@ bool ThemePage::installThemes( const TQString &file )
 		// Check if a theme with that name already exists
 		if ( TQDir( destDir ).exists( *it ) ) {
 			const TQString question = i18n( "A theme named %1 already exists in your icon "
-					"theme folder. Do you want tqreplace it with this one?" ).arg( *it );
+					"theme folder. Do you want replace it with this one?" ).arg( *it );
 			int answer = KMessageBox::warningContinueCancel( this, question, i18n( "Overwrite Theme?"), i18n("Replace") );
 			if ( answer != KMessageBox::Continue )
 				continue;
 
-			// ### If the theme that's being tqreplaced is the current theme, it
+			// ### If the theme that's being replaced is the current theme, it
 			//     will cause cursor inconsistencies in newly started apps.
 		}
 
 		// ### Should we check if a theme with the same name exists in a global theme dir?
-		//     If that's the case it will effectively tqreplace it, even though the global theme
+		//     If that's the case it will effectively replace it, even though the global theme
 		//     won't be deleted. Checking for this situation is easy, since the global theme
 		//     will be in the listview. Maybe this should never be allowed since it might
 		//     result in strange side effects (from the average users point of view). OTOH
@@ -395,7 +395,7 @@ const TQStringList ThemePage::getThemeBaseDirs() const
 	TQString path = XcursorLibraryPath();
 #endif
 	// Expand all occurences of ~ to the home dir
-	path.tqreplace( "~/", TQDir::homeDirPath() + '/' );
+	path.replace( "~/", TQDir::homeDirPath() + '/' );
 	return TQStringList::split( ':', path );
 }
 
@@ -414,7 +414,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 			continue;
 
 		const TQStringList subdirs( dir.entryList( TQDir::Dirs ) );
-		if ( subdirs.tqcontains( theme ) )
+		if ( subdirs.contains( theme ) )
 		{
 			const TQString path       = *it + '/' + theme;
 			const TQString indexfile  = path + "/index.theme";
@@ -453,7 +453,7 @@ bool ThemePage::isCursorTheme( const TQString &theme, const int depth ) const
 void ThemePage::insertThemes()
 {
 	// Scan each base dir for cursor themes and add them to the listview.
-	// An icon theme is considered to be a cursor theme if it tqcontains
+	// An icon theme is considered to be a cursor theme if it contains
 	// a cursors subdirectory or if it inherits a cursor theme.
 	for ( TQStringList::ConstIterator it = themeDirs.begin(); it != themeDirs.end(); ++it )
 	{
@@ -585,7 +585,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		image.setAlphaBuffer( true );
 
 		// Clear the image
-		TQ_UINT32 *dst = reinterpret_cast<TQ_UINT32*>( image.bits() );
+		Q_UINT32 *dst = reinterpret_cast<Q_UINT32*>( image.bits() );
 		for ( int i = 0; i < image.width() * image.height(); i++ )
 			dst[i] = 0;
 
@@ -593,26 +593,26 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		TQPoint dstOffset( (image.width() - r.width()) / 2, (image.height() - r.height()) / 2 );
 		TQPoint srcOffset( r.topLeft() );
 
-		dst = reinterpret_cast<TQ_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
-		src = reinterpret_cast<TQ_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
+		dst = reinterpret_cast<Q_UINT32*>( image.scanLine(dstOffset.y()) ) + dstOffset.x();
+		src = reinterpret_cast<Q_UINT32*>( xcur->pixels ) + srcOffset.y() * xcur->width + srcOffset.x();
 
 		// Copy the XcursorImage into the TQImage, converting it from premultiplied
 		// to non-premultiplied alpha and cropping it if needed.
 		for ( int y = 0; y < r.height(); y++ )
 		{
 			for ( int x = 0; x < r.width(); x++, dst++, src++ ) {
-				const TQ_UINT32 pixel = *src;
+				const Q_UINT32 pixel = *src;
 
-				const TQ_UINT8 a = tqAlpha( pixel );
-				const TQ_UINT8 r = tqRed( pixel );
-				const TQ_UINT8 g = tqGreen( pixel );
-				const TQ_UINT8 b = tqBlue( pixel );
+				const Q_UINT8 a = qAlpha( pixel );
+				const Q_UINT8 r = qRed( pixel );
+				const Q_UINT8 g = qGreen( pixel );
+				const Q_UINT8 b = qBlue( pixel );
 
 				if ( !a || a == 255 ) {
 					*dst = pixel;
 				} else {
 					float alpha = a / 255.0;
-					*dst = tqRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
+					*dst = qRgba( int(r / alpha), int(g / alpha), int(b / alpha), a );
 				}
 			}
 			dst += ( image.width() - r.width() );
@@ -630,7 +630,7 @@ TQPixmap ThemePage::createIcon( const TQString &theme, const TQString &sample )
 		TQImage image( iconSize, iconSize, 32 );
 		image.setAlphaBuffer( true );
 
-		TQ_UINT32 *data = reinterpret_cast< TQ_UINT32* >( image.bits() );
+		Q_UINT32 *data = reinterpret_cast< Q_UINT32* >( image.bits() );
 		for ( int i = 0; i < image.width() * image.height(); i++ )
 			data[ i ] = 0;
 
diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
index 647b67621..e2014a1ca 100644
--- a/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
+++ b/kcontrol/ioslaveinfo/kcmioslaveinfo.cpp
@@ -51,7 +51,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_ioslaveinfo, SlaveFactory("kcmioslaveinfo") )
 KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStringList &)
                :KCModule(SlaveFactory::instance(), parent,name),m_ioslavesLb(0),m_tfj(0)
 {
-   TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+   TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
    setQuickHelp( i18n("<h1>IO slaves</h1> Gives you an overview of the installed ioslaves."));
    setButtons( KCModule::Help );
@@ -65,8 +65,8 @@ KCMIOSlaveInfo::KCMIOSlaveInfo(TQWidget *parent, const char *name, const TQStrin
    m_info=new KTextBrowser(hbox);
    hbox->setSpacing(KDialog::spacingHint());
 
-   tqlayout->addWidget(label);
-   tqlayout->addWidget(hbox);
+   layout->addWidget(label);
+   layout->addWidget(hbox);
    hbox->setStretchFactor(m_ioslavesLb,1);
    hbox->setStretchFactor(m_info,5);
 
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp
index 84135bb66..095f18f41 100644
--- a/kcontrol/joystick/caldialog.cpp
+++ b/kcontrol/joystick/caldialog.cpp
@@ -65,7 +65,7 @@ void CalDialog::calibrate()
 
   do
   {
-    tqApp->processEvents(2000);
+    qApp->processEvents(2000);
   }
   while ( ti.isActive() && (result() != TQDialog::Rejected) );
 
@@ -165,7 +165,7 @@ void CalDialog::waitButton(int axis, bool press, int &lastVal)
   // loop until the user presses a button on the device or on the dialog
   do
   {
-    tqApp->processEvents(100);
+    qApp->processEvents(100);
 
     if ( joydev->getEvent(type, number, value) )
     {
diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp
index 87b6f4e05..3ffc0e1d7 100644
--- a/kcontrol/joystick/joystick.cpp
+++ b/kcontrol/joystick/joystick.cpp
@@ -95,7 +95,7 @@ joystick::joystick(TQWidget *parent, const char *name, const TQStringList &)
 
   joyWidget = new JoyWidget(this);
 
-  setMinimumSize(joyWidget->tqminimumSize());
+  setMinimumSize(joyWidget->minimumSize());
 
   setButtons(KCModule::Default);
 }
diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp
index d460eaf3c..cfc293b89 100644
--- a/kcontrol/joystick/joywidget.cpp
+++ b/kcontrol/joystick/joywidget.cpp
@@ -56,7 +56,7 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
     TQLabel *icon = new TQLabel(messageBox);
     icon->setPixmap(KGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
                                                     KIcon::SizeMedium, KIcon::DefaultState, 0, true));
-    icon->setFixedSize(icon->tqsizeHint());
+    icon->setFixedSize(icon->sizeHint());
     message = new TQLabel(messageBox);
     messageBox->hide();
   }
diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp
index 9c7d25898..f25eae002 100644
--- a/kcontrol/kcontrol/aboutwidget.cpp
+++ b/kcontrol/kcontrol/aboutwidget.cpp
@@ -82,7 +82,7 @@ AboutWidget::AboutWidget(TQWidget *parent , const char *name, TQListViewItem* ca
     // set qwhatsthis help
     TQWhatsThis::add(this, i18n(intro_text));
     _viewer = new KHTMLPart( this, "_viewer" );
-    _viewer->widget()->tqsetSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
+    _viewer->widget()->setSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Ignored );
     connect( _viewer->browserExtension(),
              TQT_SIGNAL(openURLRequest(const KURL&, const KParts::URLArgs&)),
              this, TQT_SLOT(slotModuleLinkClicked(const KURL&)) );
diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp
index 4f0b14f4d..598807a2d 100644
--- a/kcontrol/kcontrol/dockcontainer.cpp
+++ b/kcontrol/kcontrol/dockcontainer.cpp
@@ -131,7 +131,7 @@ DockContainer::DockContainer(TQWidget *parent)
   , _module(0L)
 {
   _busyw = new TQLabel(i18n("<big><b>Loading...</b></big>"), this);
-  _busyw->tqsetAlignment(AlignCenter);
+  _busyw->setAlignment(AlignCenter);
   _busyw->setTextFormat(RichText);
   _busyw->setGeometry(0,0, width(), height());
   addWidget( _busyw );
@@ -221,7 +221,7 @@ i18n("There are unsaved changes in the active module.\n"
 
   ProxyWidget *widget = loadModule( module );
 
-  KCGlobal::repairAccels( tqtopLevelWidget() );
+  KCGlobal::repairAccels( topLevelWidget() );
   return ( widget!=0 );
 }
 
diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ed892ac70..0a409b7e0 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -91,12 +91,12 @@ TQString KCGlobal::baseGroup()
       if (_infocenter)
       {
         kdWarning() << "No K menu group with X-KDE-BaseGroup=info found ! Defaulting to Settings/Information/" << endl;
-        _baseGroup = TQString::tqfromLatin1("Settings/Information/");
+        _baseGroup = TQString::fromLatin1("Settings/Information/");
       }
       else
       {
         kdWarning() << "No K menu group with X-KDE-BaseGroup=settings found ! Defaulting to Settings/" << endl;
-        _baseGroup = TQString::tqfromLatin1("Settings/");
+        _baseGroup = TQString::fromLatin1("Settings/");
       }
     }
   }
diff --git a/kcontrol/kcontrol/kcrootonly.cpp b/kcontrol/kcontrol/kcrootonly.cpp
index 237cbdfe9..723895de3 100644
--- a/kcontrol/kcontrol/kcrootonly.cpp
+++ b/kcontrol/kcontrol/kcrootonly.cpp
@@ -26,13 +26,13 @@
 KCRootOnly::KCRootOnly(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-   TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+   TQVBoxLayout *layout=new TQVBoxLayout(this);
    TQLabel *label = new TQLabel(i18n("<big>You need super user privileges to run this control module.</big><br>"
                                     "Click on the \"Administrator Mode\" button below."), this);
-   tqlayout->addWidget(label);
-   label->tqsetAlignment(AlignCenter);
+   layout->addWidget(label);
+   label->setAlignment(AlignCenter);
    label->setTextFormat(RichText);
-   label->setMinimumSize(label->tqsizeHint());
+   label->setMinimumSize(label->sizeHint());
 }
 
 
diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp
index 67ffdaa46..758b742fd 100644
--- a/kcontrol/kcontrol/main.cpp
+++ b/kcontrol/kcontrol/main.cpp
@@ -77,9 +77,9 @@ KControlApp::KControlApp()
   int fontSize = toplevel->fontInfo().pointSize();
   if (fontSize == 0)
     fontSize = (toplevel->fontInfo().pixelSize() * 72) / pdm.logicalDpiX();
-  int x = config->readNumEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk.width()), 
+  int x = config->readNumEntry(TQString::fromLatin1("InitialWidth %1").arg(desk.width()), 
 			       QMIN( desk.width(), 368 + (6*pdm.logicalDpiX()*fontSize)/12 ) );
-  int y = config->readNumEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk.height()), 
+  int y = config->readNumEntry(TQString::fromLatin1("InitialHeight %1").arg(desk.height()), 
 			       QMIN( desk.height(), 312 + (4*pdm.logicalDpiX()*fontSize)/12 ) );
   toplevel->resize(x,y);
 }
@@ -91,8 +91,8 @@ KControlApp::~KControlApp()
       KConfig *config = KGlobal::config();
       config->setGroup("General");
       TQWidget *desk = TQApplication::desktop();
-      config->writeEntry(TQString::tqfromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
-      config->writeEntry(TQString::tqfromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
+      config->writeEntry(TQString::fromLatin1("InitialWidth %1").arg(desk->width()), toplevel->width());
+      config->writeEntry(TQString::fromLatin1("InitialHeight %1").arg(desk->height()), toplevel->height());
       config->sync();
     }
   delete toplevel;
diff --git a/kcontrol/kcontrol/modulemenu.cpp b/kcontrol/kcontrol/modulemenu.cpp
index 6ab262508..ad60eda5a 100644
--- a/kcontrol/kcontrol/modulemenu.cpp
+++ b/kcontrol/kcontrol/modulemenu.cpp
@@ -68,9 +68,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
      connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(moduleSelected(int)));
 
      // Item names may contain ampersands. To avoid them being converted to 
-     // accelators, tqreplace them with two ampersands.
+     // accelators, replace them with two ampersands.
      TQString name = group->caption();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
   
      parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
                         , name, menu);
@@ -83,9 +83,9 @@ void ModuleMenu::fill(KPopupMenu *parentMenu, const TQString &parentPath)
   for (module=moduleList.first(); module != 0; module=moduleList.next())
   {
      // Item names may contain ampersands. To avoid them being converted to 
-     // accelators, tqreplace them with two ampersands.
+     // accelators, replace them with two ampersands.
      TQString name = module->moduleName();
-     name.tqreplace("&", "&&");
+     name.replace("&", "&&");
 
      int realid = parentMenu->insertItem(KGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
                                      , name, id);
diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp
index 14b75c780..cc8c63af4 100644
--- a/kcontrol/kcontrol/modules.cpp
+++ b/kcontrol/kcontrol/modules.cpp
@@ -142,12 +142,12 @@ void ConfigModule::runAsRoot()
 
   // create an embed widget that will embed the
   // kcmshell running as root
-  _embedLayout = new TQVBoxLayout(_module->tqparentWidget());
-  _embedFrame = new TQVBox( _module->tqparentWidget() );
+  _embedLayout = new TQVBoxLayout(_module->parentWidget());
+  _embedFrame = new TQVBox( _module->parentWidget() );
   _embedFrame->setFrameStyle( TQFrame::Box | TQFrame::Raised );
   TQPalette pal( red );
   pal.setColor( TQColorGroup::Background,
-		_module->tqparentWidget()->tqcolorGroup().background() );
+		_module->parentWidget()->colorGroup().background() );
   _embedFrame->setPalette( pal );
   _embedFrame->setLineWidth( 2 );
   _embedFrame->setMidLineWidth( 2 );
@@ -158,7 +158,7 @@ void ConfigModule::runAsRoot()
   _module->hide();
   _embedFrame->show();
   TQLabel *_busy = new TQLabel(i18n("<big>Loading...</big>"), _embedStack);
-  _busy->tqsetAlignment(AlignCenter);
+  _busy->setAlignment(AlignCenter);
   _busy->setTextFormat(RichText);
   _busy->setGeometry(0,0, _module->width(), _module->height());
   _busy->show();
@@ -338,7 +338,7 @@ TQString ConfigModuleList::findModule(ConfigModule *module)
   Menu *menu;
   for(;(menu = it.current());++it)
   {
-     if (menu->modules.tqcontainsRef(module))
+     if (menu->modules.containsRef(module))
         return it.currentKey();
   }
   return TQString::null;
diff --git a/kcontrol/kcontrol/moduletreeview.cpp b/kcontrol/kcontrol/moduletreeview.cpp
index b15f0ccd6..6f767ab20 100644
--- a/kcontrol/kcontrol/moduletreeview.cpp
+++ b/kcontrol/kcontrol/moduletreeview.cpp
@@ -133,9 +133,9 @@ void ModuleTreeView::fill(ModuleTreeItem *parent, const TQString &parentPath)
 
 
 
-TQSize ModuleTreeView::tqsizeHint() const
+TQSize ModuleTreeView::sizeHint() const
 {
-    return TQListView::tqsizeHint().boundedTo( 
+    return TQListView::sizeHint().boundedTo( 
 	TQSize( fontMetrics().maxWidth()*35, QWIDGETSIZE_MAX) );
 }
 
@@ -166,7 +166,7 @@ void ModuleTreeView::expandItem(TQListViewItem *item, TQPtrList<TQListViewItem>
 {
   while (item)
     {
-      setOpen(item, parentList->tqcontains(item));
+      setOpen(item, parentList->contains(item));
 
           if (item->childCount() != 0)
                 expandItem(item->firstChild(), parentList);
@@ -342,8 +342,8 @@ void ModuleTreeItem::paintCell( TQPainter * p, const TQColorGroup & cg, int colu
       TQPixmap pixmap(offset, offset);
       pixmap.fill(Qt::color0);
       pixmap.setMask(pixmap.createHeuristicMask());
-      TQBitmap tqmask( pixmap.size(), true );
-      pixmap.setMask( tqmask );
+      TQBitmap mask( pixmap.size(), true );
+      pixmap.setMask( mask );
       TQListViewItem::setPixmap(0, pixmap);
     }
   }
diff --git a/kcontrol/kcontrol/moduletreeview.h b/kcontrol/kcontrol/moduletreeview.h
index 448251a6f..ede3c8a52 100644
--- a/kcontrol/kcontrol/moduletreeview.h
+++ b/kcontrol/kcontrol/moduletreeview.h
@@ -74,7 +74,7 @@ public:
   void makeSelected(ConfigModule* module);
   void makeVisible(ConfigModule *module);
   void fill();
-  TQSize tqsizeHint() const;
+  TQSize sizeHint() const;
 
 signals:
   void moduleSelected(ConfigModule*);
diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp
index e50b67fa5..b8f83c5fc 100644
--- a/kcontrol/kcontrol/proxywidget.cpp
+++ b/kcontrol/kcontrol/proxywidget.cpp
@@ -120,7 +120,7 @@ public:
     ~ProxyContentWidget(){}
 
     // this should be really done by qscrollview in AutoOneFit mode!
-    TQSize tqsizeHint() const { return tqminimumSizeHint(); }
+    TQSize sizeHint() const { return minimumSizeHint(); }
 };
 
 
@@ -144,7 +144,7 @@ ProxyView::ProxyView(KCModule *_client, const TQString&, TQWidget *parent, bool
   }
   client->reparent(contentWidget,0,TQPoint(0,0),true);
   vbox->addWidget( client );
-  vbox->activate(); // make sure we have a proper tqminimumSizeHint
+  vbox->activate(); // make sure we have a proper minimumSizeHint
   addChild(contentWidget);
 }
 
diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp
index e4fa10d5b..aac3427ff 100644
--- a/kcontrol/kcontrol/toplevel.cpp
+++ b/kcontrol/kcontrol/toplevel.cpp
@@ -85,7 +85,7 @@ TopLevel::TopLevel(const char* name)
       connect( m, TQT_SIGNAL( helpRequest() ), this, TQT_SLOT( slotHelpRequest() ) );
   }
 
-  // create the tqlayout box
+  // create the layout box
   _splitter = new TQSplitter( TQSplitter::Horizontal, this );
 
   TQFrame* leftFrame = new TQFrame ( _splitter );
@@ -142,7 +142,7 @@ TopLevel::TopLevel(const char* name)
   // help widget
   _help = new HelpWidget(_dock);
 
-  _stack->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+  _stack->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
  // Restore sizes
   config->setGroup("General");
@@ -514,7 +514,7 @@ void TopLevel::aboutModule()
 
 TQString TopLevel::handleAmpersand( TQString modulename ) const
 {
-   if( modulename.tqcontains( '&' )) // double it
+   if( modulename.contains( '&' )) // double it
    {
       for( int i = modulename.length();
            i >= 0;
diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp
index 461aeab22..f24af2c1e 100644
--- a/kcontrol/kded/kcmkded.cpp
+++ b/kcontrol/kded/kcmkded.cpp
@@ -78,7 +78,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_lvLoD = new KListView( gb );
 	_lvLoD->addColumn(i18n("Service"));
 	_lvLoD->addColumn(i18n("Description"));
-	_lvLoD->addColumn(i18n("tqStatus"));
+	_lvLoD->addColumn(i18n("Status"));
 	_lvLoD->setAllColumnsShowFocus(true);
 	_lvLoD->header()->setStretchEnabled(true, 1);
 
@@ -92,7 +92,7 @@ KDEDConfig::KDEDConfig(TQWidget* parent, const char* name, const TQStringList &)
 	_lvStartup->addColumn(i18n("Use"));
 	_lvStartup->addColumn(i18n("Service"));
 	_lvStartup->addColumn(i18n("Description"));
-	_lvStartup->addColumn(i18n("tqStatus"));
+	_lvStartup->addColumn(i18n("Status"));
 	_lvStartup->setAllColumnsShowFocus(true);
 	_lvStartup->header()->setStretchEnabled(true, 2);
 
@@ -149,7 +149,7 @@ void KDEDConfig::load( bool useDefaults ) {
 
 	TQStringList files;
 	KGlobal::dirs()->findAllResources( "services",
-			TQString::tqfromLatin1( "kded/*.desktop" ),
+			TQString::fromLatin1( "kded/*.desktop" ),
 			true, true, files );
 
 	TQListViewItem* item = 0L;
@@ -178,7 +178,7 @@ void KDEDConfig::load( bool useDefaults ) {
 		}
 	}
 
-	getServicetqStatus();
+	getServiceStatus();
    emit changed( useDefaults );
 }
 
@@ -187,7 +187,7 @@ void KDEDConfig::save() {
 
 	TQStringList files;
 	KGlobal::dirs()->findAllResources( "services",
-			TQString::tqfromLatin1( "kded/*.desktop" ),
+			TQString::fromLatin1( "kded/*.desktop" ),
 			true, true, files );
 
 	KConfig kdedrc("kdedrc", false, false);
@@ -222,7 +222,7 @@ void KDEDConfig::defaults()
 }
 
 
-void KDEDConfig::getServicetqStatus()
+void KDEDConfig::getServiceStatus()
 {
 	QCStringList modules;
 	TQCString replyType;
@@ -293,12 +293,12 @@ void KDEDConfig::slotEvalItem(TQListViewItem * item)
 		_pbStop->setEnabled( false );
 	}
 
-	getServicetqStatus();
+	getServiceStatus();
 }
 
 void KDEDConfig::slotServiceRunningToggled()
 {
-	getServicetqStatus();
+	getServiceStatus();
 	slotEvalItem(_lvStartup->currentItem());
 }
 
diff --git a/kcontrol/kded/kcmkded.h b/kcontrol/kded/kcmkded.h
index 1548f2b47..8e6ff8d9a 100644
--- a/kcontrol/kded/kcmkded.h
+++ b/kcontrol/kded/kcmkded.h
@@ -47,7 +47,7 @@ protected slots:
 	void slotServiceRunningToggled();
 	void slotEvalItem(TQListViewItem *item);
 	void slotItemChecked(TQCheckListItem *item);
-	void getServicetqStatus();
+	void getServiceStatus();
 
         bool autoloadEnabled(KConfig *config, const TQString &filename);
         void setAutoloadEnabled(KConfig *config, const TQString &filename, bool b);
diff --git a/kcontrol/kdm/ChangeLog b/kcontrol/kdm/ChangeLog
index 167e413a6..d49bb2548 100644
--- a/kcontrol/kdm/ChangeLog
+++ b/kcontrol/kdm/ChangeLog
@@ -10,7 +10,7 @@
 	* Few bug fixes
 
 1998-04-28 Thomas Tanghus <tanghus@earthling.net>
-	* Improved tqgeometry management.
+	* Improved geometry management.
 
 1998-05-14 Thomas Tanghus <tanghus@earthling.net>
 	* Fixed bug with "ShutDownButton=...".
diff --git a/kcontrol/kdm/background.cpp b/kcontrol/kdm/background.cpp
index 80879fe8c..b5ce18ff5 100644
--- a/kcontrol/kdm/background.cpp
+++ b/kcontrol/kdm/background.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 1999 Geert Jansen <g.t.jansen@stud.tue.nl>
  *
  * Modified 2000.07.14 by Brad Hughes <bhughes@trolltech.com>
- * Improve tqlayout and consistency with KDesktop's background selection
+ * Improve layout and consistency with KDesktop's background selection
  *
  * Based on old backgnd.cpp:
  *
@@ -56,7 +56,7 @@ KBackground::KBackground(TQWidget *parent, const char *name)
 
     connect(m_background, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)));
 
-    // Top tqlayout
+    // Top layout
     TQVBoxLayout *top = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint() );
     top->addWidget(m_pCBEnable);
     top->addWidget(m_background);
diff --git a/kcontrol/kdm/kbackedcombobox.cpp b/kcontrol/kdm/kbackedcombobox.cpp
index 9f651b433..1ba598e49 100644
--- a/kcontrol/kdm/kbackedcombobox.cpp
+++ b/kcontrol/kdm/kbackedcombobox.cpp
@@ -28,7 +28,7 @@ void KBackedComboBox::insertItem( const TQString &id, const TQString &name )
 
 void KBackedComboBox::setCurrentId( const TQString &id )
 {
-    if (id2name.tqcontains( id ))
+    if (id2name.contains( id ))
 	setCurrentItem( id2name[id] );
     else
 	setCurrentItem( 0 );
diff --git a/kcontrol/kdm/kdm-appear.cpp b/kcontrol/kdm/kdm-appear.cpp
index 7f68deb3b..58696902b 100644
--- a/kcontrol/kdm/kdm-appear.cpp
+++ b/kcontrol/kdm/kdm-appear.cpp
@@ -216,7 +216,7 @@ KDMAppearanceWidget::KDMAppearanceWidget(TQWidget *parent, const char *name)
   loadLanguageList(langcombo);
   connect(langcombo, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(changed()));
   label = new TQLabel(langcombo, i18n("Languag&e:"), group);
-  TQGridLayout *hbox = new TQGridLayout( group->tqlayout(), 2, 2, KDialog::spacingHint() );
+  TQGridLayout *hbox = new TQGridLayout( group->layout(), 2, 2, KDialog::spacingHint() );
   hbox->setColStretch(1, 1);
   hbox->addWidget(label, 1, 0);
   hbox->addWidget(langcombo, 1, 1);
@@ -250,7 +250,7 @@ void KDMAppearanceWidget::makeReadOnly()
 void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
 {
   TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
-			TQString::tqfromLatin1("*/entry.desktop"));
+			TQString::fromLatin1("*/entry.desktop"));
   langlist.sort();
   for ( TQStringList::ConstIterator it = langlist.begin();
 	it != langlist.end(); ++it )
@@ -260,9 +260,9 @@ void KDMAppearanceWidget::loadLanguageList(KLanguageButton *combo)
     TQString nid = fpath.mid(index + 1);
 
     KSimpleConfig entry(*it);
-    entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-    TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
-    combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString::null);
+    entry.setGroup(TQString::fromLatin1("KCM Locale"));
+    TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+    combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null);
   }
 }
 
@@ -316,7 +316,7 @@ void KDMAppearanceWidget::loadGuiStyles(KBackedComboBox *combo)
 bool KDMAppearanceWidget::setLogo(TQString logo)
 {
     TQString flogo = logo.isEmpty() ?
-                    locate("data", TQString::tqfromLatin1("kdm/pics/kdelogo.png") ) :
+                    locate("data", TQString::fromLatin1("kdm/pics/kdelogo.png") ) :
                     logo;
     TQImage p(flogo);
     if (p.isNull())
@@ -324,7 +324,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
     if (p.width() > 100 || p.height() > 100)
         p = p.smoothScale(100, 100, TQImage::ScaleMin);
     logobutton->setPixmap(p);
-    uint bd = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+    uint bd = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     logobutton->setFixedSize(p.width() + bd, p.height() + bd);
     logopath = logo;
     return true;
@@ -334,7 +334,7 @@ bool KDMAppearanceWidget::setLogo(TQString logo)
 void KDMAppearanceWidget::slotLogoButtonClicked()
 {
     KImageIO::registerFormats();
-    KFileDialog dialogue(locate("data", TQString::tqfromLatin1("kdm/pics/")),
+    KFileDialog dialogue(locate("data", TQString::fromLatin1("kdm/pics/")),
 			 KImageIO::pattern( KImageIO::Reading ),
 			 this, 0, true);
     dialogue.setOperationMode( KFileDialog::Opening );
@@ -392,7 +392,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
 	if(!url->isLocalFile()) {
 	    pixurl.setPath(KGlobal::dirs()->resourceDirs("data").last() +
 		     "kdm/pics/" + url->fileName());
-	    KIO::NetAccess::copy(*url, pixurl, tqparentWidget());
+	    KIO::NetAccess::copy(*url, pixurl, parentWidget());
 	    istmp = true;
 	} else {
 	    pixurl = *url;
@@ -401,7 +401,7 @@ void KDMAppearanceWidget::iconLoaderDropEvent(TQDropEvent *e)
 
 	// By now url should be "file:/..."
 	if (!setLogo(pixurl.path())) {
-	    KIO::NetAccess::del(pixurl, tqparentWidget());
+	    KIO::NetAccess::del(pixurl, parentWidget());
 	    TQString msg = i18n("There was an error loading the image:\n"
 			       "%1\n"
 			       "It will not be saved.")
diff --git a/kcontrol/kdm/kdm-conv.cpp b/kcontrol/kdm/kdm-conv.cpp
index e7f267ce3..155d5b380 100644
--- a/kcontrol/kdm/kdm-conv.cpp
+++ b/kcontrol/kdm/kdm-conv.cpp
@@ -50,7 +50,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
 
     alGroup = new TQVGroupBox( i18n("Enable Au&to-Login"), this );
     alGroup->setCheckable( true );
-    alGroup->tqsetSizePolicy( vpref );
+    alGroup->setSizePolicy( vpref );
 
     TQWhatsThis::add( alGroup, i18n("Turn on the auto-login feature."
 	" This applies only to KDM's graphical login."
@@ -92,7 +92,7 @@ KDMConvenienceWidget::KDMConvenienceWidget(TQWidget *parent, const char *name)
 
 
     puGroup = new TQVButtonGroup(i18n("Preselect User"), this );
-    puGroup->tqsetSizePolicy( vpref );
+    puGroup->setSizePolicy( vpref );
 
     connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPresChanged()));
     connect(puGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotChanged()));
diff --git a/kcontrol/kdm/kdm-users.cpp b/kcontrol/kdm/kdm-users.cpp
index d6c1eaf7d..ce27f6498 100644
--- a/kcontrol/kdm/kdm-users.cpp
+++ b/kcontrol/kdm/kdm-users.cpp
@@ -94,14 +94,14 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
     TQLabel *minlab = new TQLabel( i18n("Below:"), minGroup );
     leminuid = new KLineEdit( minGroup );
     minlab->setBuddy( leminuid );
-    leminuid->tqsetSizePolicy( sp_ign_fix );
+    leminuid->setSizePolicy( sp_ign_fix );
     leminuid->setValidator( valid );
     connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
     connect( leminuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
     TQLabel *maxlab = new TQLabel( i18n("Above:"), minGroup );
     lemaxuid = new KLineEdit( minGroup );
     maxlab->setBuddy( lemaxuid );
-    lemaxuid->tqsetSizePolicy( sp_ign_fix );
+    lemaxuid->setSizePolicy( sp_ign_fix );
     lemaxuid->setValidator( valid );
     connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotChanged()) );
     connect(lemaxuid, TQT_SIGNAL(textChanged( const TQString & )), TQT_SLOT(slotMinMaxChanged()) );
@@ -168,7 +168,7 @@ KDMUsersWidget::KDMUsersWidget(TQWidget *parent, const char *name)
     userbutton = new TQPushButton( hlpw );
     userbutton->setAcceptDrops( true );
     userbutton->installEventFilter( this ); // for drag and drop
-    uint sz = style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
+    uint sz = style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2 + 48;
     userbutton->setFixedSize( sz, sz );
     connect( userbutton, TQT_SIGNAL(clicked()),
 	     TQT_SLOT(slotUserButtonClicked()) );
@@ -346,7 +346,7 @@ void KDMUsersWidget::userButtonDropEvent(TQDropEvent *e)
     KURL *url = decodeImgDrop(e, this);
     if (url) {
 	TQString pixpath;
-	KIO::NetAccess::download(*url, pixpath, tqparentWidget());
+	KIO::NetAccess::download(*url, pixpath, parentWidget());
 	changeUserPix( pixpath );
 	KIO::NetAccess::removeTempFile(pixpath);
 	delete url;
@@ -457,11 +457,11 @@ void KDMUsersWidget::load()
     cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
 
     TQString ps = config->readEntry( "FaceSource" );
-    if (ps == TQString::tqfromLatin1("UserOnly"))
+    if (ps == TQString::fromLatin1("UserOnly"))
 	rbusronly->setChecked(true);
-    else if (ps == TQString::tqfromLatin1("PreferUser"))
+    else if (ps == TQString::fromLatin1("PreferUser"))
 	rbprefusr->setChecked(true);
-    else if (ps == TQString::tqfromLatin1("PreferAdmin"))
+    else if (ps == TQString::fromLatin1("PreferAdmin"))
 	rbprefadm->setChecked(true);
     else
 	rbadmonly->setChecked(true);
diff --git a/kcontrol/kdm/main.cpp b/kcontrol/kdm/main.cpp
index f342985aa..ae99b51f5 100644
--- a/kcontrol/kdm/main.cpp
+++ b/kcontrol/kdm/main.cpp
@@ -164,7 +164,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
         if ((*umapi).second.find( gn ) == (*umapi).second.end())
 	  (*umapi).second.append( gn );
       } else
-        kdWarning() << "group '" << gn << "' tqcontains unknown user '" << un << "'" << endl;
+        kdWarning() << "group '" << gn << "' contains unknown user '" << un << "'" << endl;
     } while (*++grp->gr_mem);
   }
   endgrent();
@@ -173,7 +173,7 @@ KDModule::KDModule(TQWidget *parent, const char *name, const TQStringList &)
     kdWarning() << "user(s) '" << tgmapci.data().join(",")
 	<< "' have unknown GID " << tgmapci.key() << endl;
 
-  config = new KSimpleConfig( TQString::tqfromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
+  config = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdm/kdmrc" ));
 
   TQVBoxLayout *top = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp
index edf285a5b..a38f46f29 100644
--- a/kcontrol/keys/commandShortcuts.cpp
+++ b/kcontrol/keys/commandShortcuts.cpp
@@ -83,13 +83,13 @@ void CommandShortcutsModule::initGUI()
     label->setText(i18n("<qt>Below is a list of known commands which you may assign keyboard shortcuts to. "
                         "To edit, add or remove entries from this list use the "
                         "<a href=\"launchMenuEditor\">KDE menu editor</a>.</qt>"));
-    label->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
+    label->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum);
     disconnect(label, TQT_SIGNAL(linkClicked(const TQString &)), label, TQT_SLOT(openLink(const TQString &)));
     connect(label, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(launchMenuEditor()));
     mainLayout->addWidget(label);
 
     m_tree = new AppTreeView(this, "appTreeView");
-    m_tree->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    m_tree->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
     mainLayout->setStretchFactor(m_tree, 10);
     mainLayout->addWidget(m_tree);
     TQWhatsThis::add(m_tree,
diff --git a/kcontrol/keys/convertShortcuts.pl b/kcontrol/keys/convertShortcuts.pl
index fa189c810..9dc216ac6 100755
--- a/kcontrol/keys/convertShortcuts.pl
+++ b/kcontrol/keys/convertShortcuts.pl
@@ -9,7 +9,7 @@ foreach (<>) {
         s/^Lock screen/Lock Session/;
         s/^Lock Screen/Lock Session/;
         s/^Mouse emulation/Mouse Emulation/;
-        s/^Next keyboard tqlayout/Switch to Next Keyboard Layout/;
+        s/^Next keyboard layout/Switch to Next Keyboard Layout/;
         s/Switch To Next Keyboard Layout/Switch to Next Keyboard Layout/;
         s/^Screenshot of desktop/Desktop Screenshot/;
         s/^Pop-up window operations menu/Window Operations Menu/;
diff --git a/kcontrol/keys/kaccelaction.h b/kcontrol/keys/kaccelaction.h
index faf6b6bd3..144427d9c 100644
--- a/kcontrol/keys/kaccelaction.h
+++ b/kcontrol/keys/kaccelaction.h
@@ -58,7 +58,7 @@ class KConfigBase;
 				1) KKey = "Meta+X"
 					1) Meta+X
 				2) KKey = "Asterisk"
-					1) Shift+8 (English tqlayout)
+					1) Shift+8 (English layout)
 					2) Keypad_Asterisk
 */
 
@@ -111,7 +111,7 @@ class KAccelAction
 
 	bool setKeySequence( uint i, const KKeySequence& );
 	void clearShortcut();
-	bool tqcontains( const KKeySequence& );
+	bool contains( const KKeySequence& );
 
 	TQString toString() const;
 	TQString toStringInternal() const;
diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp
index a49eea231..09726de63 100644
--- a/kcontrol/keys/keyconfig.cpp
+++ b/kcontrol/keys/keyconfig.cpp
@@ -83,7 +83,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
 		kdDebug(125) << "sConfigKey: " << sConfigKey
 			<< " bIsNum: " << bIsNum
 			<< " bSeriesOnly: " << bSeriesOnly << endl;
-		if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.tqcontains( ':' ) ) {
+		if( ((bSeriesOnly && !bIsNum) || (bSeriesNone && bIsNum)) && !sConfigKey.contains( ':' ) ) {
 			actions.removeAction( sConfigKey );
 			i--;
 		}
@@ -170,7 +170,7 @@ void KKeyModule::init( bool isGlobal, bool _bSeriesOnly, bool bSeriesNone )
   topLayout->addRowSpacing(3, 15);
   topLayout->addMultiCellWidget(kc, 5, 5, 0, 1);
 
-  setMinimumSize(topLayout->tqsizeHint());
+  setMinimumSize(topLayout->sizeHint());
 }
 
 KKeyModule::~KKeyModule (){
@@ -332,7 +332,7 @@ void KKeyModule::readScheme( int index )
 
         TQString s = sFile.mid( ind, 1 );
         s = s.upper();
-        sFile.tqreplace( ind, 1, s );
+        sFile.replace( ind, 1, s );
 
       }
 
@@ -416,8 +416,8 @@ void KKeyModule::readScheme( int index )
   // Set various appropriate for the scheme
 
   if ( indx < nSysSchemes ||
-       (*sFileList->at(indx)).tqcontains( "/global-" ) ||
-       (*sFileList->at(indx)).tqcontains( "/app-" ) ) {
+       (*sFileList->at(indx)).contains( "/global-" ) ||
+       (*sFileList->at(indx)).contains( "/app-" ) ) {
     removeBt->setEnabled( FALSE );
   } else {
     removeBt->setEnabled( TRUE );
diff --git a/kcontrol/keys/keys.desktop b/kcontrol/keys/keys.desktop
index 9594b832a..b39bab385 100644
--- a/kcontrol/keys/keys.desktop
+++ b/kcontrol/keys/keys.desktop
@@ -179,7 +179,7 @@ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové
 Keywords[csb]=Klawisze,globalné klawiszowé skrodzënë,schematë skrodzënów,sparłączenia klawiszów,skrodzënë dlô programów
 Keywords[cy]=Bysell,Rhwymiadau bysell eang,Cynllun bysell,Llwybrau byr,Llwybrau byr y rhaglen
 Keywords[da]=Taster,Globale tastebindinger,Tastesystem,Tastebindinger,genveje,programgenveje
-Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout
+Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout
 Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Θέμα πλήκτρων,Συνδυασμοί πλήκτρων,συντομεύσεις,συντομεύσεις εφαρμογών
 Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj
 Keywords[es]=Teclas,Asociaciones de teclas globales,Esquema de teclas,Asociaciones de teclas,accesos directos,accesos directos de aplicaciones
diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp
index 41e792d6f..d17e1619e 100644
--- a/kcontrol/keys/modifiers.cpp
+++ b/kcontrol/keys/modifiers.cpp
@@ -341,7 +341,7 @@ void ModifiersModule::slotMacSwapClicked()
 	if( m_pchkMacKeyboard->isChecked() && !KKeyNative::keyboardHasWinKey() ) {
 		KMessageBox::sorry( this,
 			i18n("You can only activate this option if your "
-			"X keyboard tqlayout has the 'Super' or 'Meta' keys "
+			"X keyboard layout has the 'Super' or 'Meta' keys "
 			"properly configured as modifier keys."),
 			"Incompatibility" );
 		m_pchkMacSwap->setChecked( false );
diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp
index 5db554ca6..9f997b7e5 100644
--- a/kcontrol/keys/shortcuts.cpp
+++ b/kcontrol/keys/shortcuts.cpp
@@ -145,7 +145,7 @@ void ShortcutsModule::initGUI()
 
 	m_pcbSchemes = new KComboBox( this );
 	m_pcbSchemes->setMinimumWidth( 100 );
-	m_pcbSchemes->tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
+	m_pcbSchemes->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
 	connect( m_pcbSchemes, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSelectScheme(int)) );
 	pHLayout->addWidget( m_pcbSchemes );
 
@@ -190,10 +190,10 @@ void ShortcutsModule::initGUI()
 	m_pListGeneral = new KAccelShortcutList( m_actionsGeneral, true );
 
 	m_pkcGeneral = new KKeyChooser( m_pListGeneral, this, KKeyChooser::Global, false );
-	m_pkcGeneral->resize (m_pkcGeneral->tqsizeHint() );
+	m_pkcGeneral->resize (m_pkcGeneral->sizeHint() );
 	if (system("xmodmap 1> /dev/null 2> /dev/null") == 0) {
 		m_useRmWinKeys = new TQCheckBox( i18n("Use Win key as modifier (uncheck to bind Win key to Menu)"), this );
-		m_useRmWinKeys->resize( m_useRmWinKeys->tqsizeHint() );
+		m_useRmWinKeys->resize( m_useRmWinKeys->sizeHint() );
 		m_useRmWinKeys->setChecked( m_bUseRmWinKeys );
 		pVLayout->addWidget( m_useRmWinKeys, 1, 0 );
 		connect( m_useRmWinKeys, TQT_SIGNAL(clicked()), TQT_SLOT(slotUseRmWinKeysClicked()) );
@@ -234,7 +234,7 @@ void ShortcutsModule::createActionsGeneral()
 
 		//kdDebug(125) << "sConfigKey: " << sConfigKey
 		//	<< " bIsNum: " << bIsNum << endl;
-		if( bIsNum && !sConfigKey.tqcontains( ':' ) ) {
+		if( bIsNum && !sConfigKey.contains( ':' ) ) {
 			actions[i].setConfigurable( false );
 			actions[i].setName( TQString::null );
 		}
@@ -255,7 +255,7 @@ void ShortcutsModule::createActionsSequence()
 
 		//kdDebug(125) << "sConfigKey: " << sConfigKey
 		//	<< " bIsNum: " << bIsNum << endl;
-		if( !bIsNum && !sConfigKey.tqcontains( ':' ) ) {
+		if( !bIsNum && !sConfigKey.contains( ':' ) ) {
 			actions[i].setConfigurable( false );
 			actions[i].setName( TQString::null );
 		}
@@ -327,14 +327,14 @@ void ShortcutsModule::slotSelectScheme( int )
 		config.setGroup( "Settings" );
 		//m_sBaseSchemeFile = config.readEntry( "Name" );
 
-		// If the user's keyboard tqlayout doesn't support the Win key,
-		//  but this tqlayout scheme requires it,
+		// If the user's keyboard layout doesn't support the Win key,
+		//  but this layout scheme requires it,
 		if( !KKeyNative::keyboardHasWinKey()
 		    && config.readBoolEntry( "Uses Win Modifier", false ) ) {
 			// TODO: change "Win" to Win's label.
 			int ret = KMessageBox::warningContinueCancel( this,
 				i18n("This scheme requires the \"%1\" modifier key, which is not "
-				"available on your keyboard tqlayout. Do you wish to view it anyway?" )
+				"available on your keyboard layout. Do you wish to view it anyway?" )
 				.arg(i18n("Win")) );
 			if( ret == KMessageBox::Cancel )
 				return;
@@ -384,7 +384,7 @@ void ShortcutsModule::slotSaveSchemeAs()
 				// Make the next letter upper case
 				TQString s = sFile.mid( ind, 1 );
 				s = s.upper();
-				sFile.tqreplace( ind, 1, s );
+				sFile.replace( ind, 1, s );
 			}
 
 			iScheme = -1;
diff --git a/kcontrol/keys/treeview.cpp b/kcontrol/keys/treeview.cpp
index 0d1ddc3cc..58de8a1f5 100644
--- a/kcontrol/keys/treeview.cpp
+++ b/kcontrol/keys/treeview.cpp
@@ -156,8 +156,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent)
             TQString groupCaption = g->caption();
 
             // Item names may contain ampersands. To avoid them being converted
-            // to accelerators, tqreplace them with two ampersands.
-            groupCaption.tqreplace("&", "&&");
+            // to accelerators, replace them with two ampersands.
+            groupCaption.replace("&", "&&");
 
             AppTreeItem *item;
             if (parent == 0)
@@ -177,8 +177,8 @@ void AppTreeView::fillBranch(const TQString& rPath, AppTreeItem *parent)
             TQString serviceCaption = s->name();
 
             // Item names may contain ampersands. To avoid them being converted
-            // to accelerators, tqreplace them with two ampersands.
-            serviceCaption.tqreplace("&", "&&");
+            // to accelerators, replace them with two ampersands.
+            serviceCaption.replace("&", "&&");
 
             AppTreeItem* item;
             if (parent == 0)
@@ -228,7 +228,7 @@ TQStringList AppTreeView::fileList(const TQString& rPath)
         TQStringList files = dir.entryList();
         for (TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) {
             // does not work?!
-            //if (filelist.tqcontains(*it)) continue;
+            //if (filelist.contains(*it)) continue;
 
             if (relativePath.isEmpty()) {
                 filelist.remove(*it); // hack
@@ -266,7 +266,7 @@ TQStringList AppTreeView::dirList(const TQString& rPath)
         for (TQStringList::ConstIterator it = subdirs.begin(); it != subdirs.end(); ++it) {
             if ((*it) == "." || (*it) == "..") continue;
             // does not work?!
-            // if (dirlist.tqcontains(*it)) continue;
+            // if (dirlist.contains(*it)) continue;
 
             if (relativePath.isEmpty()) {
                 dirlist.remove(*it); //hack
diff --git a/kcontrol/kfontinst/ChangeLog b/kcontrol/kfontinst/ChangeLog
index fd6995a9c..b00a53f1e 100644
--- a/kcontrol/kfontinst/ChangeLog
+++ b/kcontrol/kfontinst/ChangeLog
@@ -5,7 +5,7 @@ KDE3.4 -> KDE3.5
 
     e.g. Times New Roman -> times.ttf
          Helvetica, Bold Oblique-> Hevetica, Bold Oblique.fonts.tar.gz
-                  Which tqcontains:
+                  Which contains:
                            75dpi_helvBO10.pcf.gz
                            75dpi_helvBO12.pcf.gz
                            100dpi_helvBO10.pcf.gz
@@ -336,9 +336,9 @@ KDE3.1 -> KDE3.2
 2. Rearranged this file!
 3. Removed command line interface - KDE2's command line stuff is way different!
 4. Re-created dialogs with Qt designer.
-5. Removed ProgressDialog, and tqreplaced with a progress bar on a new statusbar.
+5. Removed ProgressDialog, and replaced with a progress bar on a new statusbar.
 6. Modified configure script to check for FreeType & t1lib.
-7. If an encoding (not tqunicode) is selected, then the .enc file is copied to the X11 fonts directory.
+7. If an encoding (not unicode) is selected, then the .enc file is copied to the X11 fonts directory.
 8. As with the .enc files, the StarOffice .xpp files are also copied, and no longer just sym linked.
 9. Removed enabling/disabing of Configure System button.
 10. Fontmap.X11 is no longer created, instead the real Fontmap file itself is modified.
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
index 3e7c699e2..c525cd337 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp
@@ -97,10 +97,10 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     itsEmbeddedAdmin=Misc::root() && (NULL==appName || strcmp("kcontrol", appName) &&
                      KCmdLineArgs::parsedArgs()->isSet("embed"));
 
-    itstqStatusLabel = new TQLabel(this);
-    itstqStatusLabel->setFrameShape(TQFrame::Panel);
-    itstqStatusLabel->setFrameShadow(TQFrame::Sunken);
-    itstqStatusLabel->setLineWidth(1);
+    itsStatusLabel = new TQLabel(this);
+    itsStatusLabel->setFrameShape(TQFrame::Panel);
+    itsStatusLabel->setFrameShadow(TQFrame::Sunken);
+    itsStatusLabel->setLineWidth(1);
 
     itsConfig.setGroup(CFG_GROUP);
 
@@ -113,7 +113,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
         itsSplitter=new TQSplitter(this);
         fontsFrame=new TQFrame(itsSplitter),
         itsPreview=(KParts::ReadOnlyPart *)factory->create(itsSplitter, "kcmfontinst", "KParts::ReadOnlyPart");
-        itsSplitter->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        itsSplitter->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 
         TQValueList<int> sizes(itsConfig.readIntListEntry(CFG_SPLITTER_SIZES));
 
@@ -129,18 +129,18 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     {
 #endif
         fontsFrame=new TQFrame(this);
-        fontsFrame->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+        fontsFrame->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 #ifdef HAVE_XFT
     }
 #endif
 
     TQGridLayout *fontsLayout=new TQGridLayout(fontsFrame, 1, 1, 0, 1);
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *layout=new TQVBoxLayout(this, 0, KDialog::spacingHint());
     KToolBar    *toolbar=new KToolBar(this);
     bool        showBitmap(itsConfig.readBoolEntry(CFG_SHOW_BITMAP, false));
 
     fontsFrame->setLineWidth(0);
-    toolbar->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
+    toolbar->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum);
     toolbar->setMovingEnabled(false);
 
     TQString previousPath=itsConfig.readEntry(CFG_PATH);
@@ -151,22 +151,22 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&)
     itsDirOp->setMinimumSize(TQSize(96, 64));
     setMimeTypes(showBitmap);
     itsDirOp->dirLister()->setMainWindow(this);
-    itsDirOp->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsDirOp->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     fontsLayout->addMultiCellWidget(itsDirOp, 0, 0, 0, 1);
 
     KPushButton *button=new KPushButton(KGuiItem(i18n("Add Fonts..."), "newfont"), fontsFrame);
     connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts()));
-    button->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
+    button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum);
     fontsLayout->addWidget(button, 1, 0);
     fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
 
-    tqlayout->addWidget(toolbar);
+    layout->addWidget(toolbar);
 #ifdef HAVE_XFT
-    tqlayout->addWidget(itsPreview ? itsSplitter : fontsFrame);
+    layout->addWidget(itsPreview ? itsSplitter : fontsFrame);
 #else
-    tqlayout->addWidget(fontsFrame);
+    layout->addWidget(fontsFrame);
 #endif
-    tqlayout->addWidget(itstqStatusLabel);
+    layout->addWidget(itsStatusLabel);
 
     setButtons(0);
     setRootOnlyMsg(i18n("<b>The fonts shown are your personal fonts.</b><br>To see (and install) "
@@ -390,7 +390,7 @@ void CKCmFontInst::fileHighlighted(const KFileItem *item)
                                              ? list->getFirst()
                                              : NULL;
 
-        if(previewItem && list && list->tqcontains(previewItem))  // OK, check its been selected - not deselected!!!
+        if(previewItem && list && list->contains(previewItem))  // OK, check its been selected - not deselected!!!
             itsPreview->openURL(previewItem->url());
     }
 #endif
@@ -545,7 +545,7 @@ void CKCmFontInst::dropped(const KFileItem *i, TQDropEvent *, const KURL::List &
 
 void CKCmFontInst::infoMessage(const TQString &msg)
 {
-    itstqStatusLabel->setText(msg);
+    itsStatusLabel->setText(msg);
 }
 
 static TQString family(const TQString &name)
@@ -582,7 +582,7 @@ void CKCmFontInst::updateInformation(int, int fonts)
     }
     text+=" - ";
     text+=i18n("One Family", "%n Families", families.count());
-    itstqStatusLabel->setText(text);
+    itsStatusLabel->setText(text);
 }
 
 void CKCmFontInst::delResult(KIO::Job *job)
diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
index 8f655f2a4..b304e0a1a 100644
--- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
+++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.h
@@ -108,7 +108,7 @@ class CKCmFontInst : public KCModule
     TQSplitter            *itsSplitter;
     KConfig              itsConfig;
     bool                 itsEmbeddedAdmin;
-    TQLabel               *itstqStatusLabel;
+    TQLabel               *itsStatusLabel;
 };
 
 }
diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
index b1bb35e88..b4766c5c4 100644
--- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
+++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.h
@@ -88,7 +88,7 @@ class CFontListViewItem : public KListViewItem
 
     TQRect rect() const
     {
-        TQRect r = listView()->tqitemRect(this);
+        TQRect r = listView()->itemRect(this);
 
         return TQRect(listView()->viewportToContents(r.topLeft()), TQSize(r.width(), r.height()));
     }
diff --git a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
index 11f1cdebe..afd9fa204 100644
--- a/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
+++ b/kcontrol/kfontinst/kcmfontinst/PrintDialog.cpp
@@ -39,14 +39,14 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
             : KDialogBase(Plain, i18n("Print Font Samples"), Ok|Cancel, Ok, parent, NULL, true, false)
 {
     TQFrame      *page=plainPage();
-    TQGridLayout *tqlayout=new TQGridLayout(page, 1, 1, 0, spacingHint());
+    TQGridLayout *layout=new TQGridLayout(page, 1, 1, 0, spacingHint());
 
-    tqlayout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
+    layout->addWidget(new TQLabel(i18n("Output:"), page), 0, 0);
     itsOutput=new TQComboBox(page);
     itsOutput->insertItem(i18n("All Fonts"), 0);
     itsOutput->insertItem(i18n("Selected Fonts"), 1);
-    tqlayout->addWidget(itsOutput, 0, 1);
-    tqlayout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
+    layout->addWidget(itsOutput, 0, 1);
+    layout->addWidget(new TQLabel(i18n("Font size:"), page), 1, 0);
     itsSize=new TQComboBox(page);
     itsSize->insertItem(i18n("Waterfall"), 0);
     itsSize->insertItem(i18n("12pt"), 1);
@@ -54,8 +54,8 @@ CPrintDialog::CPrintDialog(TQWidget *parent)
     itsSize->insertItem(i18n("24pt"), 3);
     itsSize->insertItem(i18n("36pt"), 4);
     itsSize->insertItem(i18n("48pt"), 5);
-    tqlayout->addWidget(itsSize, 1, 1);
-    tqlayout->addItem(new TQSpacerItem(2, 2), 2, 1);
+    layout->addWidget(itsSize, 1, 1);
+    layout->addItem(new TQSpacerItem(2, 2), 2, 1);
 }
 
 bool CPrintDialog::exec(bool select, int size)
diff --git a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
index 55ab5773a..112e3562b 100644
--- a/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
+++ b/kcontrol/kfontinst/kfile-plugin/KFileFont.cpp
@@ -44,35 +44,35 @@ static int strToWeight(const TQString &str)
 {
     if(NULL==str)
         return FC_WEIGHT_MEDIUM;
-    else if(str.tqcontains("Bold", false))
+    else if(str.contains("Bold", false))
         return FC_WEIGHT_BOLD;
-    else if(str.tqcontains("Heavy", false)) 
+    else if(str.contains("Heavy", false)) 
         return FC_WEIGHT_HEAVY;
-    else if(str.tqcontains("Black", false))
+    else if(str.contains("Black", false))
         return FC_WEIGHT_BLACK;
-    else if(str.tqcontains("ExtraBold", false))
+    else if(str.contains("ExtraBold", false))
         return FC_WEIGHT_EXTRABOLD;
-    else if(str.tqcontains("UltraBold", false))
+    else if(str.contains("UltraBold", false))
         return FC_WEIGHT_ULTRABOLD;
-    else if(str.tqcontains("ExtraLight", false))
+    else if(str.contains("ExtraLight", false))
         return FC_WEIGHT_EXTRALIGHT;
-    else if(str.tqcontains("UltraLight", false))
+    else if(str.contains("UltraLight", false))
         return FC_WEIGHT_ULTRALIGHT;
-    else if(str.tqcontains("Light", false))
+    else if(str.contains("Light", false))
         return FC_WEIGHT_LIGHT;
-    else if(str.tqcontains("Medium", false) || str.tqcontains("Normal", false) || str.tqcontains("Roman", false))
+    else if(str.contains("Medium", false) || str.contains("Normal", false) || str.contains("Roman", false))
         return FC_WEIGHT_MEDIUM;
-    else if(str.tqcontains("Regular", false))
+    else if(str.contains("Regular", false))
         return FC_WEIGHT_REGULAR;
-    else if(str.tqcontains("SemiBold", false))
+    else if(str.contains("SemiBold", false))
         return FC_WEIGHT_SEMIBOLD;
-    else if(str.tqcontains("DemiBold", false))
+    else if(str.contains("DemiBold", false))
         return FC_WEIGHT_DEMIBOLD;
-    else if(str.tqcontains("Thin", false))
+    else if(str.contains("Thin", false))
         return FC_WEIGHT_THIN;
-    else if(str.tqcontains("Book", false))
+    else if(str.contains("Book", false))
         return FC_WEIGHT_NORMAL;
-    else if(str.tqcontains("Demi", false)) 
+    else if(str.contains("Demi", false)) 
         return FC_WEIGHT_NORMAL;
     else
         return FC_WEIGHT_MEDIUM;
@@ -83,21 +83,21 @@ static int strToWidth(const TQString &str)
 {   
     if(str.isEmpty())
         return FC_WIDTH_NORMAL;
-    else if(str.tqcontains("UltraCondensed", false))
+    else if(str.contains("UltraCondensed", false))
         return FC_WIDTH_ULTRACONDENSED;
-    else if(str.tqcontains("ExtraCondensed", false))
+    else if(str.contains("ExtraCondensed", false))
         return FC_WIDTH_EXTRACONDENSED;
-    else if(str.tqcontains("SemiCondensed", false))
+    else if(str.contains("SemiCondensed", false))
         return FC_WIDTH_SEMICONDENSED;
-    else if(str.tqcontains("Condensed", false))
+    else if(str.contains("Condensed", false))
         return FC_WIDTH_CONDENSED;
-    else if(str.tqcontains("SemiExpanded", false))
+    else if(str.contains("SemiExpanded", false))
         return FC_WIDTH_SEMIEXPANDED;
-    else if(str.tqcontains("UltraExpanded", false))
+    else if(str.contains("UltraExpanded", false))
         return FC_WIDTH_ULTRAEXPANDED;
-    else if(str.tqcontains("ExtraExpanded", false))
+    else if(str.contains("ExtraExpanded", false))
         return FC_WIDTH_EXTRAEXPANDED;
-    else if(str.tqcontains("Expanded", false))
+    else if(str.contains("Expanded", false))
         return FC_WIDTH_EXPANDED;
     else
         return FC_WIDTH_NORMAL;
@@ -372,7 +372,7 @@ bool KFileFontPlugin::readInfo(KFileMetaInfo& info, uint what)
                                 const FoundryMap *entry;
 
                                 for(entry=map; NULL!=entry->foundry; entry++)
-                                    if(foundryAll.length()==entry->len && foundryAll.tqcontains(entry->foundry, false))
+                                    if(foundryAll.length()==entry->len && foundryAll.contains(entry->foundry, false))
                                     {
                                         foundryAll=entry->foundry;
                                         break;
diff --git a/kcontrol/kfontinst/kfontinst/FontEngine.cpp b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
index 7f14d556f..4fe823c23 100644
--- a/kcontrol/kfontinst/kfontinst/FontEngine.cpp
+++ b/kcontrol/kfontinst/kfontinst/FontEngine.cpp
@@ -157,13 +157,13 @@ CFontEngine::EWeight CFontEngine::strToWeight(const char *str)
 
 static void removeSymbols(TQString &str)
 {
-    str.tqreplace(TQRegExp("[\\-\\[\\]()]"), " ");
+    str.replace(TQRegExp("[\\-\\[\\]()]"), " ");
 
     int   len=str.length();
     TQChar space(' ');
 
     for(int c=0; c<len; ++c)
-        if(str[c].tqunicode()<0x20 || str[c].tqunicode()>0x7E)
+        if(str[c].unicode()<0x20 || str[c].unicode()>0x7E)
             str[c]=space;
 
     str=str.simplifyWhiteSpace();
diff --git a/kcontrol/kfontinst/kfontinst/Fontmap.cpp b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
index a63efeb5d..476b422bd 100644
--- a/kcontrol/kfontinst/kfontinst/Fontmap.cpp
+++ b/kcontrol/kfontinst/kfontinst/Fontmap.cpp
@@ -113,7 +113,7 @@ static TQString createX11PsName(const TQString &font)
     unsigned int  ch;
     bool          newWord=true;
 
-    newName.tqreplace(TQRegExp("\\-"), "_");
+    newName.replace(TQRegExp("\\-"), "_");
 
     for(ch=0; ch<newName.length(); ++ch)
     {
@@ -136,7 +136,7 @@ static TQString createX11PsName(const TQString &font)
         }
     }
 
-    newName.tqreplace(" ", TQString::null);
+    newName.replace(" ", TQString::null);
     return newName;
 }
 
diff --git a/kcontrol/kfontinst/kfontinst/GetPid.c b/kcontrol/kfontinst/kfontinst/GetPid.c
index 1251c030c..015ea7ce9 100644
--- a/kcontrol/kfontinst/kfontinst/GetPid.c
+++ b/kcontrol/kfontinst/kfontinst/GetPid.c
@@ -71,7 +71,7 @@
 
            gcc GetPid.c -DTEST_GETPID -DOS_Linux -o tst
 
-       ...tqreplace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris,
+       ...replace OS_Linux with your particular OS type: OS_FreeBSD, OS_NetBSD, OS_Irix, OS_Solaris,
        OS_HPUX, or OS_AIX
 
     2. Start a program - such as "vi"
diff --git a/kcontrol/kfontinst/kfontinst/XConfig.cpp b/kcontrol/kfontinst/kfontinst/XConfig.cpp
index 6b0b54340..112ab3d3c 100644
--- a/kcontrol/kfontinst/kfontinst/XConfig.cpp
+++ b/kcontrol/kfontinst/kfontinst/XConfig.cpp
@@ -748,7 +748,7 @@ CXConfig::TPath::EType CXConfig::TPath::getType(const TQString &d)
 {
     TQString str(d);
 
-    str.tqreplace(TQRegExp("\\s*"), "");
+    str.replace(TQRegExp("\\s*"), "");
 
     return 0==str.find("unix/:")
                ? FONT_SERVER
diff --git a/kcontrol/kfontinst/kio/KioFonts.cpp b/kcontrol/kfontinst/kio/KioFonts.cpp
index 4246afa66..ee1d2dc3c 100644
--- a/kcontrol/kfontinst/kio/KioFonts.cpp
+++ b/kcontrol/kfontinst/kio/KioFonts.cpp
@@ -136,7 +136,7 @@ static TQString removeMultipleExtension(const KURL &url)
     TQString fname(url.fileName());
     int     pos;
 
-    if(-1!=(pos=fname.findRev(TQString::tqfromLatin1(constMultipleExtension))))
+    if(-1!=(pos=fname.findRev(TQString::fromLatin1(constMultipleExtension))))
         fname=fname.left(pos);
 
     return fname;
@@ -158,7 +158,7 @@ static TQString modifyName(const TQString &fname)
     }
 
     for(int s=0; constSymbols[s]; ++s)
-        rv=rv.tqreplace(constSymbols[s], '_');
+        rv=rv.replace(constSymbols[s], '_');
 
     return rv;
 }
@@ -292,7 +292,7 @@ static bool createFolderUDSEntry(KIO::UDSEntry &entry, const TQString &name, con
                                                 ? KFI_KIO_FONTS_PROTOCOL"/system-folder" 
                                                 : KFI_KIO_FONTS_PROTOCOL"/folder");
         addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
-        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
+        TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
         return true;
     }
     else if (sys && !Misc::root())   // Default system fonts folder does not actually exist yet!
@@ -390,18 +390,18 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
             addAtom(entry, KIO::UDS_GROUP, 0, grp ? grp->gr_name : TQString::number(buff.st_gid).latin1());
 
             addAtom(entry, KIO::UDS_ACCESS_TIME, buff.st_atime);
-            addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::tqfindByPath(path, 0, true)->name());
+            addAtom(entry, KIO::UDS_MIME_TYPE, 0, KMimeType::findByPath(path, 0, true)->name());
             addAtom(entry, KIO::UDS_GUESSED_MIME_TYPE, 0, "application/octet-stream");
 
-            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::tqfromLatin1(":/"));
+            TQString url(KFI_KIO_FONTS_PROTOCOL+TQString::fromLatin1(":/"));
 
             if(!Misc::root())
             {
                 url+=sys ? i18n(KFI_KIO_FONTS_SYS) : i18n(KFI_KIO_FONTS_USER);
-                url+=TQString::tqfromLatin1("/");
+                url+=TQString::fromLatin1("/");
             }
             if(multiple)
-                url+=name+TQString::tqfromLatin1(constMultipleExtension);
+                url+=name+TQString::fromLatin1(constMultipleExtension);
             else
                 url+=Misc::getFile(path);
             addAtom(entry, KIO::UDS_URL, 0, url);
@@ -411,7 +411,7 @@ static bool createFontUDSEntry(KIO::UDSEntry &entry, const TQString &name, TQVal
     return false;
 }
 
-enum EUrltqStatus
+enum EUrlStatus
 {
     BAD_URL,
     URL_OK,
@@ -427,7 +427,7 @@ static KURL getRedirect(const KURL &u)
             sect(CKioFonts::getSect(path));
 
     path.remove(sect);
-    path.tqreplace("//", "/");
+    path.replace("//", "/");
     redirect.setPath(path);
 
     KFI_DBUG << "Redirect from " << u.path() << " to " << redirect.path() << endl;
@@ -441,7 +441,7 @@ static bool nonRootSys(const KURL &u)
 
 static TQString getFontFolder(const TQString &defaultDir, const TQString &root, TQStringList &dirs)
 {
-    if(dirs.tqcontains(defaultDir))
+    if(dirs.contains(defaultDir))
         return defaultDir;
     else
     {
@@ -494,7 +494,7 @@ static bool isAAfm(const TQString &fname)
             {
                 line=stream.readLine();
 
-                if(line.tqcontains("StartFontMetrics"))
+                if(line.contains("StartFontMetrics"))
                 {
                     file.close();
                     return true;
@@ -650,7 +650,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
 
         if(entry!=list.end())
         {
-            if(!(*entry).paths.tqcontains(path))
+            if(!(*entry).paths.contains(path))
                 (*entry).paths.append(path);
         }
         else
@@ -670,7 +670,7 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
         if((*fIt).paths.count()>1)
         {
             // There's more than 1 file with the same name, but in a different locations
-            // therefore, take the unique part of the path, and tqreplace / with _
+            // therefore, take the unique part of the path, and replace / with _
             // e.g.
             //     /usr/X11R6/lib/X11/fonts/75dpi/times.pcf.gz
             //     /usr/X11R6/lib/X11/fonts/100dpi/times.pcf.gz
@@ -688,11 +688,11 @@ static bool getFontList(const TQStringList &files, TQMap<TQString, TQString> &ma
                     if((*pIt).orig[i]!=(*pBegin).orig[i])
                     {
                         (*pIt).modified=(*pIt).orig.mid(i);
-                        (*pIt).modified=(*pIt).modified.tqreplace('/', '_');
+                        (*pIt).modified=(*pIt).modified.replace('/', '_');
                         if((*pBegin).modified.isEmpty())
                         {
                             (*pBegin).modified=(*pBegin).orig.mid(i);
-                            (*pBegin).modified=(*pBegin).modified.tqreplace('/', '_');
+                            (*pBegin).modified=(*pBegin).modified.replace('/', '_');
                         }
                         break;
                     }
@@ -806,7 +806,7 @@ CKioFonts::CKioFonts(const TQCString &pool, const TQCString &app)
                 {
                     TQString str(paths[path]);
 
-                    str.tqreplace(TQRegExp("\\s*"), "");
+                    str.replace(TQRegExp("\\s*"), "");
 
                     if(0==str.find("unix/:"))
                         itsUsingXfsFpe=true;
@@ -1018,7 +1018,7 @@ void CKioFonts::get(const KURL &url)
             {
                 // Determine the mimetype of the file to be retrieved, and emit it.
                 // This is mandatory in all slaves (for KRun/BrowserRun to work).
-                emit mimeType(useMime.isEmpty() ? KMimeType::tqfindByPath(realPathC, buff.st_mode, true)->name() : useMime);
+                emit mimeType(useMime.isEmpty() ? KMimeType::findByPath(realPathC, buff.st_mode, true)->name() : useMime);
     
                 totalSize(buff.st_size);
     
@@ -1185,7 +1185,7 @@ bool CKioFonts::putReal(const TQString &destOrig, const TQCString &destOrigC, bo
 
     if (markPartial)
     {
-        TQString  destPart(destOrig+TQString::tqfromLatin1(".part"));
+        TQString  destPart(destOrig+TQString::fromLatin1(".part"));
         TQCString destPartC(TQFile::encodeName(destPart));
 
         dest = destPart;
@@ -1751,9 +1751,9 @@ void CKioFonts::special(const TQByteArray &a)
                 finished();
                 break;
             case SPECIAL_RECONFIG:  // Only itended to be called from kcmfontinst - when a user has re-enabled doX or doGs
-                if(itsRoot && !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+                if(itsRoot && !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
                     itsFolders[FOLDER_SYS].modified.add(itsFolders[FOLDER_SYS].location);
-                else if(!itsRoot && !itsFolders[FOLDER_USER].modified.tqcontains(itsFolders[FOLDER_USER].location))
+                else if(!itsRoot && !itsFolders[FOLDER_USER].modified.contains(itsFolders[FOLDER_USER].location))
                     itsFolders[FOLDER_USER].modified.add(itsFolders[FOLDER_USER].location);
 
                 doModified();
@@ -1831,7 +1831,7 @@ void CKioFonts::doModified()
             //
             // If a non-default folder has been modified, always configure X
             if(NULL==strchr(itsKfiParams, 'x') && 
-               (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location)))
+               (itsFolders[FOLDER_SYS].modified.count()>1 || !itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location)))
             {
                 if(0==itsKfiParams[0])
                     strcpy(itsKfiParams, "-x");
@@ -1850,7 +1850,7 @@ void CKioFonts::doModified()
                     KFI_DBUG << "RUN(root): kfontinst " << itsKfiParams << ' ' << *it << endl;
                 }
 
-                if(itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+                if(itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
                 {
                     itsHasSys=true;
                     itsAddToSysFc=false;
@@ -1862,7 +1862,7 @@ void CKioFonts::doModified()
             TQCString cmd;
 
             createRootRefreshCmd(cmd, itsFolders[FOLDER_SYS].modified, false);
-            if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.tqcontains(itsFolders[FOLDER_SYS].location))
+            if(doRootCmd(cmd, false) && itsFolders[FOLDER_SYS].modified.contains(itsFolders[FOLDER_SYS].location))
             {
                 itsHasSys=true;
                 itsAddToSysFc=false;
@@ -2385,8 +2385,8 @@ bool CKioFonts::checkAllowed(const KURL &u)
 
         if(ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_USER)+TQChar('/')) ||
            ds==TQString(TQChar('/')+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')) ||
-           ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
-           ds==TQString(TQChar('/')+TQString::tqfromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_USER)+TQChar('/')) ||
+           ds==TQString(TQChar('/')+TQString::fromLatin1(KFI_KIO_FONTS_SYS)+TQChar('/')))
         {
             error(KIO::ERR_SLAVE_DEFINED, i18n("Sorry, you cannot rename, move, copy, or delete either \"%1\" or \"%2\".")
                   .arg(i18n(KFI_KIO_FONTS_USER)).arg(i18n(KFI_KIO_FONTS_SYS))); \
diff --git a/kcontrol/kfontinst/kio/KioFonts.h b/kcontrol/kfontinst/kio/KioFonts.h
index 802d16eaf..57dc8516a 100644
--- a/kcontrol/kfontinst/kio/KioFonts.h
+++ b/kcontrol/kfontinst/kio/KioFonts.h
@@ -82,7 +82,7 @@ class CKioFonts : public KIO::SlaveBase
         CDirList()                                      { }
         CDirList(const TQString &str) : TQStringList(str) { }
 
-        void add(const TQString &d)                      { if (!tqcontains(d)) append(d); }
+        void add(const TQString &d)                      { if (!contains(d)) append(d); }
     };
 
     struct TFolder
diff --git a/kcontrol/kfontinst/lib/FcEngine.cpp b/kcontrol/kfontinst/lib/FcEngine.cpp
index 2b3d40737..44d180fd2 100644
--- a/kcontrol/kfontinst/lib/FcEngine.cpp
+++ b/kcontrol/kfontinst/lib/FcEngine.cpp
@@ -439,7 +439,7 @@ static bool hasStr(XftFont *font, TQString &str)
                  ch;
 
     for(ch=0; ch<slen; ++ch)
-        if(!FcCharSetHasChar(font->charset, str[ch].tqunicode()))
+        if(!FcCharSetHasChar(font->charset, str[ch].unicode()))
             return false;
     return true;
 }
diff --git a/kcontrol/kfontinst/lib/Misc.cpp b/kcontrol/kfontinst/lib/Misc.cpp
index a3c77526a..1e779b514 100644
--- a/kcontrol/kfontinst/lib/Misc.cpp
+++ b/kcontrol/kfontinst/lib/Misc.cpp
@@ -65,7 +65,7 @@ TQString dirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.tqreplace("//", "/");
+        ds.replace("//", "/");
 
         int slashPos=ds.findRev('/');
 
@@ -84,7 +84,7 @@ TQString xDirSyntax(const TQString &d)
     {
         TQString ds(d);
 
-        ds.tqreplace("//", "/");
+        ds.replace("//", "/");
 
         int slashPos=ds.findRev('/');
  
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.cpp b/kcontrol/kfontinst/viewpart/FontPreview.cpp
index bded4fad4..3679be252 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.cpp
+++ b/kcontrol/kfontinst/viewpart/FontPreview.cpp
@@ -103,12 +103,12 @@ void CFontPreview::paintEvent(TQPaintEvent *)
     }
 }
 
-TQSize CFontPreview::tqsizeHint() const
+TQSize CFontPreview::sizeHint() const
 {
     return TQSize(132, 132);
 }
 
-TQSize CFontPreview::tqminimumSizeHint() const
+TQSize CFontPreview::minimumSizeHint() const
 {
     return TQSize(32, 32);
 }
diff --git a/kcontrol/kfontinst/viewpart/FontPreview.h b/kcontrol/kfontinst/viewpart/FontPreview.h
index 6ef34f5bc..a57e9b9c9 100644
--- a/kcontrol/kfontinst/viewpart/FontPreview.h
+++ b/kcontrol/kfontinst/viewpart/FontPreview.h
@@ -50,8 +50,8 @@ class CFontPreview : public QWidget
     virtual ~CFontPreview() {}
 
     void        paintEvent(TQPaintEvent *);
-    TQSize       tqsizeHint() const;
-    TQSize       tqminimumSizeHint() const;
+    TQSize       sizeHint() const;
+    TQSize       minimumSizeHint() const;
 
     void        showFont(const KURL &url);
     void        showFont();
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.cpp b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
index a560d2968..14bda4024 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.cpp
@@ -76,7 +76,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
 
     itsToolsFrame=new TQFrame(itsFrame);
 
-    TQVBoxLayout *tqlayout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
+    TQVBoxLayout *layout=new TQVBoxLayout(itsFrame, kcm ? 0 : KDialog::marginHint(), kcm ? 0 : KDialog::spacingHint());
     TQGridLayout *previewLayout=new TQGridLayout(previewFrame, 1, 1, 1, 1);
     TQHBoxLayout *toolsLayout=new TQHBoxLayout(itsToolsFrame, 0, KDialog::spacingHint());
 
@@ -88,14 +88,14 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     setInstance(new KInstance("kfontview"));
 
     itsPreview=new CFontPreview(previewFrame, "FontViewPart::Preview");
-    itsPreview->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    itsPreview->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     itsFaceLabel=new TQLabel(i18n("Face:"), itsToolsFrame);
     itsFaceSelector=new KIntNumInput(1, itsToolsFrame);
     itsInstallButton=new TQPushButton(i18n("Install..."), itsToolsFrame, "button");
     itsInstallButton->hide();
     previewLayout->addWidget(itsPreview, 0, 0);
-    tqlayout->addWidget(previewFrame);
-    tqlayout->addWidget(itsToolsFrame);
+    layout->addWidget(previewFrame);
+    layout->addWidget(itsToolsFrame);
     toolsLayout->addWidget(itsFaceLabel);
     toolsLayout->addWidget(itsFaceSelector);
     itsFaceLabel->hide();
@@ -103,7 +103,7 @@ CFontViewPart::CFontViewPart(TQWidget *parent, const char *name)
     toolsLayout->addItem(new TQSpacerItem(5, 5, TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum));
     toolsLayout->addWidget(itsInstallButton);
     itsToolsFrame->hide();
-    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewtqStatus(bool)));
+    connect(itsPreview, TQT_SIGNAL(status(bool)), TQT_SLOT(previewStatus(bool)));
     connect(itsInstallButton, TQT_SIGNAL(clicked()), TQT_SLOT(install()));
     connect(itsFaceSelector, TQT_SIGNAL(valueChanged(int)), itsPreview, TQT_SLOT(showFace(int)));
 
@@ -165,17 +165,17 @@ void CFontViewPart::timeout()
         if(Misc::root())
         {
             destUrl=TQString("fonts:/")+itsPreview->engine().getName(m_url);
-            itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+            itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
         }
         else
         {
             destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_SYS)+TQChar('/')+itsPreview->engine().getName(m_url);
-            if(KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget()))
+            if(KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget()))
                 itsShowInstallButton=false;
             else
             {
                 destUrl=TQString("fonts:/")+i18n(KFI_KIO_FONTS_USER)+TQChar('/')+itsPreview->engine().getName(m_url);
-                itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->tqparentWidget());
+                itsShowInstallButton=!KIO::NetAccess::exists(destUrl, true, itsFrame->parentWidget());
             }
         }
     }
@@ -193,7 +193,7 @@ void CFontViewPart::timeout()
     itsToolsFrame->hide();
 }
 
-void CFontViewPart::previewtqStatus(bool st)
+void CFontViewPart::previewStatus(bool st)
 {
     itsInstallButton->setShown(st && itsShowInstallButton);
     itsToolsFrame->setShown(itsInstallButton->isShown()||itsFaceSelector->isShown());
@@ -220,7 +220,7 @@ void CFontViewPart::install()
     {
         KURL destUrl(getDest(m_url, KMessageBox::No==resp));
 
-        if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->tqparentWidget()))
+        if(KIO::NetAccess::copy(m_url, destUrl, itsFrame->parentWidget()))
         {
             //
             // OK file copied, now look for any AFM or PFM file...
@@ -236,7 +236,7 @@ void CFontViewPart::install()
                 for(it=urls.begin(); it!=end; ++it)
                 {
                     destUrl=getDest(*it, KMessageBox::No==resp);
-                    KIO::NetAccess::copy(*it, destUrl, itsFrame->tqparentWidget());
+                    KIO::NetAccess::copy(*it, destUrl, itsFrame->parentWidget());
                 }
             }
 
@@ -274,7 +274,7 @@ void CFontViewPart::print()
 
     items.append(itsPreview->engine().getName(m_url));
 
-    Print::printItems(items, 0, itsFrame->tqparentWidget(), itsPreview->engine());
+    Print::printItems(items, 0, itsFrame->parentWidget(), itsPreview->engine());
 }
 
 }
diff --git a/kcontrol/kfontinst/viewpart/FontViewPart.h b/kcontrol/kfontinst/viewpart/FontViewPart.h
index 79d5c4743..21de2e074 100644
--- a/kcontrol/kfontinst/viewpart/FontViewPart.h
+++ b/kcontrol/kfontinst/viewpart/FontViewPart.h
@@ -60,7 +60,7 @@ class CFontViewPart : public KParts::ReadOnlyPart
 
     private slots:
 
-    void previewtqStatus(bool st);
+    void previewStatus(bool st);
     void timeout();
     void install();
     void changeText();
diff --git a/kcontrol/kicker/advancedDialog.cpp b/kcontrol/kicker/advancedDialog.cpp
index 2d1f392cf..372104c4a 100644
--- a/kcontrol/kicker/advancedDialog.cpp
+++ b/kcontrol/kicker/advancedDialog.cpp
@@ -46,12 +46,12 @@ advancedDialog::advancedDialog(TQWidget* parent, const char* name)
             this, TQT_SLOT(save()));
 
     TQFrame* page = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
+    TQVBoxLayout* layout = new TQVBoxLayout(page);
     m_advancedWidget = new advancedKickerOptions(page);
-    tqlayout->addWidget(m_advancedWidget);
-    tqlayout->addStretch();
+    layout->addWidget(m_advancedWidget);
+    layout->addStretch();
 
-    setMinimumSize( tqsizeHint() );
+    setMinimumSize( sizeHint() );
 
     connect(m_advancedWidget->handles, TQT_SIGNAL(clicked(int)),
             this, TQT_SLOT(changed()));
@@ -86,7 +86,7 @@ void advancedDialog::load()
 
     int defaultHideButtonSize = c.readNumEntry("HideButtonSize", 14);
     m_advancedWidget->hideButtonSize->setValue(defaultHideButtonSize);
-    TQColor color = c.readColorEntry( "TintColor", &tqcolorGroup().mid() );
+    TQColor color = c.readColorEntry( "TintColor", &colorGroup().mid() );
     m_advancedWidget->tintColorB->setColor( color );
     int tintValue = c.readNumEntry( "TintValue", 33 );
     m_advancedWidget->tintSlider->setValue( tintValue );
@@ -123,7 +123,7 @@ void advancedDialog::save()
 
         // is there a config group for this extension?
         if(!c.hasGroup(group) ||
-           group.tqcontains("Extension") < 1)
+           group.contains("Extension") < 1)
         {
             continue;
         }
diff --git a/kcontrol/kicker/advancedOptions.ui b/kcontrol/kicker/advancedOptions.ui
index f88303414..215ef7e8b 100644
--- a/kcontrol/kicker/advancedOptions.ui
+++ b/kcontrol/kicker/advancedOptions.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>advancedKickerOptions</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -71,7 +71,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>101</width>
                             <height>20</height>
@@ -145,7 +145,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -194,7 +194,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -208,7 +208,7 @@
                     <property name="text">
                         <string>Min</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignLeft</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -225,7 +225,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>81</width>
                             <height>20</height>
@@ -250,7 +250,7 @@
                     <property name="text">
                         <string>Max</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                     <property name="whatsThis" stdset="0">
@@ -312,8 +312,8 @@
     <include location="global" impldecl="in declaration">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/kicker/applettab.ui b/kcontrol/kicker/applettab.ui
index e5120f9a6..6ebfa2c88 100644
--- a/kcontrol/kicker/applettab.ui
+++ b/kcontrol/kicker/applettab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AppletTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -112,7 +112,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -123,7 +123,7 @@
                                     <property name="name">
                                         <cstring>pb_add</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>0</height>
@@ -143,7 +143,7 @@
                                     <property name="sizeType">
                                         <enum>Minimum</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -162,7 +162,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>0</width>
                                             <height>0</height>
@@ -182,7 +182,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -219,8 +219,8 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>qwidget.h</includehint>
 </includehints>
diff --git a/kcontrol/kicker/applettab_impl.cpp b/kcontrol/kicker/applettab_impl.cpp
index 534f2cbdb..a8b7cdb20 100644
--- a/kcontrol/kicker/applettab_impl.cpp
+++ b/kcontrol/kicker/applettab_impl.cpp
@@ -132,7 +132,7 @@ void AppletTab::load( bool useDefaults )
       TQStringList list = c.readListEntry("TrustedApplets");
       for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
         {
-          if(available.tqcontains(*it))
+          if(available.contains(*it))
             l_trusted << (*it);
         }
     }
@@ -142,7 +142,7 @@ void AppletTab::load( bool useDefaults )
 
   for ( TQStringList::Iterator it = available.begin(); it != available.end(); ++it )
     {
-      if(!l_trusted.tqcontains(*it))
+      if(!l_trusted.contains(*it))
         l_available << (*it);
     }
 
diff --git a/kcontrol/kicker/extensionInfo.cpp b/kcontrol/kicker/extensionInfo.cpp
index 89f000410..d1a0b2766 100644
--- a/kcontrol/kicker/extensionInfo.cpp
+++ b/kcontrol/kicker/extensionInfo.cpp
@@ -125,7 +125,7 @@ void ExtensionInfo::load()
     c.setGroup("General");
 
     _position       = c.readNumEntry ("Position",            _position);
-    _tqalignment      = c.readNumEntry ("Alignment",           _tqalignment);
+    _alignment      = c.readNumEntry ("Alignment",           _alignment);
     _xineramaScreen = c.readNumEntry ("XineramaScreen",      _xineramaScreen);
     _showLeftHB     = c.readBoolEntry("ShowLeftHideButton",  _showLeftHB);
     _showRightHB    = c.readBoolEntry("ShowRightHideButton", _showRightHB);
@@ -147,7 +147,7 @@ void ExtensionInfo::load()
     }
 
     _orig_position = _position;
-    _orig_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
@@ -170,10 +170,10 @@ void ExtensionInfo::configChanged()
         _orig_position = _position = position;
     }
 
-    int tqalignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
-    if (tqalignment != _tqalignment && tqalignment != _orig_tqalignment)
+    int alignment = c.readNumEntry ("Alignment", TQApplication::reverseLayout() ? 2 : 0);
+    if (alignment != _alignment && alignment != _orig_alignment)
     {
-        _orig_tqalignment = _tqalignment = tqalignment;
+        _orig_alignment = _alignment = alignment;
     }
 
     if (_resizeable)
@@ -197,7 +197,7 @@ void ExtensionInfo::setDefaults()
 {
     // defaults
     _position       = 3;
-    _tqalignment      = TQApplication::reverseLayout() ? 2 : 0;
+    _alignment      = TQApplication::reverseLayout() ? 2 : 0;
     _xineramaScreen = TQApplication::desktop()->primaryScreen();
     _size           = 2;
     _showLeftHB     = false;
@@ -225,7 +225,7 @@ void ExtensionInfo::save()
     c.setGroup("General");
 
     c.writeEntry("Position",            _position);
-    c.writeEntry("Alignment",           _tqalignment);
+    c.writeEntry("Alignment",           _alignment);
     c.writeEntry("XineramaScreen",      _xineramaScreen);
     c.writeEntry("ShowLeftHideButton",  _showLeftHB);
     c.writeEntry("ShowRightHideButton", _showRightHB);
@@ -251,7 +251,7 @@ void ExtensionInfo::save()
     }
 
     _orig_position = _position;
-    _orig_tqalignment = _tqalignment;
+    _orig_alignment = _alignment;
     _orig_size = _size;
     _orig_customSize = _customSize;
 
diff --git a/kcontrol/kicker/extensionInfo.h b/kcontrol/kicker/extensionInfo.h
index 5b890d324..169322aa4 100644
--- a/kcontrol/kicker/extensionInfo.h
+++ b/kcontrol/kicker/extensionInfo.h
@@ -47,7 +47,7 @@ class ExtensionInfo
         // Configuration settings
         TQString  _name;
         int      _position;
-        int      _tqalignment;
+        int      _alignment;
         int      _xineramaScreen;
         int      _size;
         int      _customSize;
@@ -67,7 +67,7 @@ class ExtensionInfo
         // Original settings to ensure that we can figure out
         // what has changed externally to the panel vs within the panel
         int      _orig_position;
-        int      _orig_tqalignment;
+        int      _orig_alignment;
         int      _orig_size;
         int      _orig_customSize;
 
diff --git a/kcontrol/kicker/hidingconfig.cpp b/kcontrol/kicker/hidingconfig.cpp
index 27e40a5fc..935fa5902 100644
--- a/kcontrol/kicker/hidingconfig.cpp
+++ b/kcontrol/kicker/hidingconfig.cpp
@@ -31,10 +31,10 @@
 HidingConfig::HidingConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new HidingTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/hidingtab.ui b/kcontrol/kicker/hidingtab.ui
index 6bc618591..8d7b0b254 100644
--- a/kcontrol/kicker/hidingtab.ui
+++ b/kcontrol/kicker/hidingtab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>HidingTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -62,7 +62,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>342</width>
                             <height>20</height>
@@ -92,7 +92,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -115,7 +115,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="2" column="1">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -179,7 +179,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -218,7 +218,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="6" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -299,7 +299,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -332,7 +332,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>10</height>
@@ -401,7 +401,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -439,7 +439,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -467,7 +467,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>20</height>
@@ -532,7 +532,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -557,7 +557,7 @@
                             <property name="text">
                                 <string>Fast</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -573,7 +573,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -598,7 +598,7 @@
                             <property name="text">
                                 <string>Medium</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="hAlign" stdset="0">
@@ -637,7 +637,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -753,8 +753,8 @@
 <slots>
     <slot specifier="pure virtual">switchPanel(int)</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/kcontrol/kicker/lookandfeelconfig.cpp b/kcontrol/kicker/lookandfeelconfig.cpp
index 2c490f6dc..7475ad7b0 100644
--- a/kcontrol/kicker/lookandfeelconfig.cpp
+++ b/kcontrol/kicker/lookandfeelconfig.cpp
@@ -31,10 +31,10 @@
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new LookAndFeelTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/lookandfeeltab.ui b/kcontrol/kicker/lookandfeeltab.ui
index 8a802a369..87f87cfc7 100644
--- a/kcontrol/kicker/lookandfeeltab.ui
+++ b/kcontrol/kicker/lookandfeeltab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>LookAndFeelTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -359,7 +359,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>66</width>
                             <height>130</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -428,13 +428,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>50</width>
                             <height>50</height>
@@ -449,7 +449,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                     <property name="hAlign" stdset="0">
@@ -500,7 +500,7 @@ This option is only active if 'Enable background image' is selected.</string>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -527,7 +527,7 @@ This option is only active if 'Enable background image' is selected.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>289</width>
                             <height>20</height>
@@ -546,7 +546,7 @@ This option is only active if 'Enable background image' is selected.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -626,8 +626,8 @@ This option is only active if 'Enable background image' is selected.</string>
     <slot access="protected" specifier="pure virtual">browseTheme(const QString&amp;)</slot>
     <slot access="protected" specifier="pure virtual">enableTransparency(bool)</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp
index ac977b676..bfdb3a491 100644
--- a/kcontrol/kicker/lookandfeeltab_kcm.cpp
+++ b/kcontrol/kicker/lookandfeeltab_kcm.cpp
@@ -42,11 +42,11 @@ LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)
     setAboutData( about );
 
     KickerConfig::initScreenNumber();
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
     lookandfeeltab = new LookAndFeelTab(this);
-    tqlayout->addWidget(lookandfeeltab);
-    tqlayout->addStretch();
+    layout->addWidget(lookandfeeltab);
+    layout->addStretch();
 
     connect(lookandfeeltab, TQT_SIGNAL(changed()), TQT_SLOT(configChanged()));
 
diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp
index 10fc45699..e60746db8 100644
--- a/kcontrol/kicker/main.cpp
+++ b/kcontrol/kicker/main.cpp
@@ -187,7 +187,7 @@ void KickerConfig::setupExtensionInfo(KConfig& config, bool checkExists, bool re
         TQString group(*it);
 
         // is there a config group for this extension?
-        if (!config.hasGroup(group) || group.tqcontains("Extension") < 1)
+        if (!config.hasGroup(group) || group.contains("Extension") < 1)
         {
             continue;
         }
diff --git a/kcontrol/kicker/menuconfig.cpp b/kcontrol/kicker/menuconfig.cpp
index 4b6c6c6ff..03ca57582 100644
--- a/kcontrol/kicker/menuconfig.cpp
+++ b/kcontrol/kicker/menuconfig.cpp
@@ -31,10 +31,10 @@
 MenuConfig::MenuConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new MenuTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/menutab.ui b/kcontrol/kicker/menutab.ui
index ac2b8fe0f..7d3a3d460 100644
--- a/kcontrol/kicker/menutab.ui
+++ b/kcontrol/kicker/menutab.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MenuTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -63,7 +63,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -85,7 +85,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -197,7 +197,7 @@
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -261,13 +261,13 @@
 							<verstretch>0</verstretch>
 						</sizepolicy>
 					</property>
-					<property name="tqminimumSize">
+					<property name="minimumSize">
 						<size>
 							<width>26</width>
 							<height>26</height>
 						</size>
 					</property>
-					<property name="tqmaximumSize">
+					<property name="maximumSize">
 						<size>
 							<width>26</width>
 							<height>26</height>
@@ -327,7 +327,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>20</height>
@@ -345,7 +345,7 @@
 				<property name="sizeType">
 					<enum>MinimumExpanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 						<width>20</width>
 						<height>0</height>
@@ -389,7 +389,7 @@
                             <verstretch>1</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -487,7 +487,7 @@
 				<property name="sizeType">
 					<enum>Expanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 					<width>20</width>
 					<height>0</height>
@@ -558,7 +558,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>0</height>
@@ -654,7 +654,7 @@
 				<property name="sizeType">
 					<enum>Expanding</enum>
 				</property>
-				<property name="tqsizeHint">
+				<property name="sizeHint">
 					<size>
 					<width>20</width>
 					<height>0</height>
@@ -698,7 +698,7 @@
 					<property name="sizeType">
 						<enum>Expanding</enum>
 					</property>
-					<property name="tqsizeHint">
+					<property name="sizeHint">
 						<size>
 							<width>20</width>
 							<height>0</height>
@@ -730,8 +730,8 @@
     <include location="global" impldecl="in implementation">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp
index cd1d27fa9..970aa10a1 100644
--- a/kcontrol/kicker/menutab_impl.cpp
+++ b/kcontrol/kicker/menutab_impl.cpp
@@ -93,9 +93,9 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
     btnCustomKMenuIcon->setPixmap(kmenu_icon);
 
     KConfig *config;
-    config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
-    maxrecentdocs->setValue(config->readNumEntry(TQString::tqfromLatin1("MaxEntries"), 10));
+    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    config->setGroup(TQString::fromLatin1("RecentDocuments"));
+    maxrecentdocs->setValue(config->readNumEntry(TQString::fromLatin1("MaxEntries"), 10));
 
     m_browserGroupLayout->setColStretch( 1, 1 );
     m_pRecentOrderGroupLayout->setColStretch( 1, 1 );
@@ -148,7 +148,7 @@ void MenuTab::load( bool useDefaults )
                                         df.readName(),
                                         *it,
                                         SmallIcon(df.readIcon()),
-                                        tqFind(ext.begin(), ext.end(), *it) != ext.end());
+                                        qFind(ext.begin(), ext.end(), *it) != ext.end());
             connect(menuItem, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()));
         }
     }
@@ -247,8 +247,8 @@ void MenuTab::save()
 
     // Save recent documents
     KConfig *config;
-    config = new KConfig(TQString::tqfromLatin1("kdeglobals"), false, false);
-    config->setGroup(TQString::tqfromLatin1("RecentDocuments"));
+    config = new KConfig(TQString::fromLatin1("kdeglobals"), false, false);
+    config->setGroup(TQString::fromLatin1("RecentDocuments"));
     config->writeEntry("MaxEntries", maxrecentdocs->value());
     config->sync();
 
diff --git a/kcontrol/kicker/positionconfig.cpp b/kcontrol/kicker/positionconfig.cpp
index 2367f2317..6e5dcdeb2 100644
--- a/kcontrol/kicker/positionconfig.cpp
+++ b/kcontrol/kicker/positionconfig.cpp
@@ -31,10 +31,10 @@
 PositionConfig::PositionConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     m_widget = new PositionTab(this);
-    tqlayout->addWidget(m_widget);
-    tqlayout->addStretch();
+    layout->addWidget(m_widget);
+    layout->addStretch();
 
     setQuickHelp(KickerConfig::the()->quickHelp());
     setAboutData(KickerConfig::the()->aboutData());
diff --git a/kcontrol/kicker/positiontab.ui b/kcontrol/kicker/positiontab.ui
index 90217d5e4..b0566f5dc 100644
--- a/kcontrol/kicker/positiontab.ui
+++ b/kcontrol/kicker/positiontab.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>PositionTabBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -66,7 +66,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>342</width>
                             <height>20</height>
@@ -104,7 +104,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -123,7 +123,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>151</width>
                                     <height>115</height>
@@ -132,7 +132,7 @@
                             <property name="scaledContents">
                                 <bool>true</bool>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                             <property name="whatsThis" stdset="0">
@@ -149,7 +149,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -235,7 +235,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>0</width>
                             <height>101</height>
@@ -357,7 +357,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -426,7 +426,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>40</height>
@@ -538,7 +538,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -555,7 +555,7 @@ how it is positioned on the screen and how much of the screen it should use.</st
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>0</height>
@@ -590,13 +590,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -624,13 +624,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -658,13 +658,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -702,13 +702,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -736,13 +736,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -770,13 +770,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -814,13 +814,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -848,13 +848,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -882,13 +882,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>32</width>
                                             <height>16</height>
@@ -926,13 +926,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -960,13 +960,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -994,13 +994,13 @@ how it is positioned on the screen and how much of the screen it should use.</st
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
                                         </size>
                                     </property>
-                                    <property name="tqmaximumSize">
+                                    <property name="maximumSize">
                                         <size>
                                             <width>16</width>
                                             <height>24</height>
@@ -1118,8 +1118,8 @@ how it is positioned on the screen and how much of the screen it should use.</st
     <slot access="protected" specifier="pure virtual">panelDimensionsChanged()</slot>
     <slot specifier="pure virtual">switchPanel( int )</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp
index b5c4c0ac7..d65498430 100644
--- a/kcontrol/kicker/positiontab_impl.cpp
+++ b/kcontrol/kicker/positiontab_impl.cpp
@@ -43,7 +43,7 @@
 #include "positiontab_impl.moc"
 
 
-// magic numbers for the preview widget tqlayout
+// magic numbers for the preview widget layout
 extern const int offsetX = 23;
 extern const int offsetY = 14;
 extern const int maxX = 150;
@@ -60,7 +60,7 @@ PositionTab::PositionTab(TQWidget *parent, const char* name)
 {
     TQPixmap monitor(locate("data", "kcontrol/pics/monitor.png"));
     m_monitorImage->setPixmap(monitor);
-    m_monitorImage->setFixedSize(m_monitorImage->tqsizeHint());
+    m_monitorImage->setFixedSize(m_monitorImage->sizeHint());
 
     m_pretendDesktop = new TQWidget(m_monitorImage, "pretendBG");
     m_pretendDesktop->setGeometry(offsetX, offsetY, maxX, maxY);
@@ -558,7 +558,7 @@ void PositionTab::switchPanel(int panelItem)
     m_customSpinbox->setValue(m_panelInfo->_customSize);
     m_sizeGroup->setEnabled(m_panelInfo->_resizeable);
     m_panelPos = m_panelInfo->_position;
-    m_panelAlign = m_panelInfo->_tqalignment;
+    m_panelAlign = m_panelInfo->_alignment;
     if(m_panelInfo->_xineramaScreen >= 0 && m_panelInfo->_xineramaScreen < TQApplication::desktop()->numScreens())
         m_xineramaScreenComboBox->setCurrentItem(m_panelInfo->_xineramaScreen);
     else if(m_panelInfo->_xineramaScreen == -2) /* the All Screens option: qt uses -1 for default, so -2 for all */
@@ -672,7 +672,7 @@ void PositionTab::storeInfo()
     }
 
     m_panelInfo->_position = m_panelPos;
-    m_panelInfo->_tqalignment = m_panelAlign;
+    m_panelInfo->_alignment = m_panelAlign;
     if(m_xineramaScreenComboBox->currentItem() == m_xineramaScreenComboBox->count()-1)
         m_panelInfo->_xineramaScreen = -2; /* all screens */
     else
@@ -696,14 +696,14 @@ void PositionTab::showIdentify()
         screenLabel->setFrameStyle(TQFrame::Panel);
         screenLabel->setFrameShadow(TQFrame::Plain);
 
-        screenLabel->tqsetAlignment(Qt::AlignCenter);
+        screenLabel->setAlignment(Qt::AlignCenter);
         screenLabel->setNum(s + 1);
         // BUGLET: we should not allow the identification to be entered again
         //         until the timer fires.
         TQTimer::singleShot(1500, screenLabel, TQT_SLOT(close()));
 
         TQPoint screenCenter(TQApplication::desktop()->screenGeometry(s).center());
-        TQRect targetGeometry(TQPoint(0,0),screenLabel->tqsizeHint());
+        TQRect targetGeometry(TQPoint(0,0),screenLabel->sizeHint());
         targetGeometry.moveCenter(screenCenter);
 
         screenLabel->setGeometry(targetGeometry);
diff --git a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
index b0b32404e..8d67d9a37 100644
--- a/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
+++ b/kcontrol/kio/UA-DESKTOP-FILE-HOWTO
@@ -37,7 +37,7 @@ to group the entries whenever necessary. Currently there are 5
 approximations: IE, NN, MOZ, OP, MISC. These represent Internet
 Explorer, Netscape Navigator, Mozilla, Opera and Miscellaneous
 respectively. NOTE: you can enter any value here as it is just
-a place holder that would be automatically tqreplaced with the
+a place holder that would be automatically replaced with the
 actual user-agent name (X-KDE-UA-NAME).
 
 X-KDE-UA-FULL
@@ -46,7 +46,7 @@ TYPE:         QString
 TRANSLATE:    NO
 DESCRIPTION:
 The full user-agent description that will be sent to the remote
-site. It can contain the following keywords that would be tqreplaced
+site. It can contain the following keywords that would be replaced
 with the appropriate value as defined by "uname":
 
 appSysName          the name of the operating system (ex: Linux).
@@ -56,7 +56,7 @@ appSysRelease       the version of the operating system (ex: 2.2.18).
 appKDERelease       the current release number as set by KDE (ex: 2.1.9 >=20010310).
 appMachineType      the processor or machine type (ex: i686).
 
-NOTE: if you use any of these values and want them to be tqreplaced
+NOTE: if you use any of these values and want them to be replaced
 automatically, make sure you include the X-KDE-UA-DYNAMIC-ENTRY field
 and set its value to 1 (for true).
 
@@ -98,7 +98,7 @@ DESCRIPTION:
 A boolean that indicates whether the keywords described under
 X-KDE-UA-FULL should be translated.  Make sure this field is
 there with its value set to "1" if you want the keywords to
-be tqreplaced appropriately.
+be replaced appropriately.
 
 
 EXAMPLES:
@@ -127,7 +127,7 @@ X-KDE-UA-DYNAMIC-ENTRY=1
 The first entry is a description file for Internet Explorer running on
 a Windows 98 machine while the second one is an example of a description
 file for Netscape browser using the "keyword" based approach to describe 
-the fields that should be tqreplaced dynamically based on the current system 
+the fields that should be replaced dynamically based on the current system 
 settings. Note that all "keyword" based desktop files should always set
 X-KDE-UA-DYNAMIC-ENTRY to 1.
 
diff --git a/kcontrol/kio/cache_ui.ui b/kcontrol/kio/cache_ui.ui
index 20368e748..c0e504057 100644
--- a/kcontrol/kio/cache_ui.ui
+++ b/kcontrol/kio/cache_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>CacheDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>16</width>
                     <height>21</height>
@@ -88,7 +88,7 @@
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>21</height>
@@ -183,5 +183,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kio/envvarproxy_ui.ui b/kcontrol/kio/envvarproxy_ui.ui
index 4a0130f46..471b9f868 100644
--- a/kcontrol/kio/envvarproxy_ui.ui
+++ b/kcontrol/kio/envvarproxy_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>EnvVarProxyDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -171,5 +171,5 @@ Alternatively, you can click on the &lt;b&gt;"Auto Detect"&lt;/b&gt; button to a
     <tabstop>pbVerify</tabstop>
     <tabstop>pbDetect</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kio/fakeuaprovider.cpp b/kcontrol/kio/fakeuaprovider.cpp
index 1920ddad9..00a87567e 100644
--- a/kcontrol/kio/fakeuaprovider.cpp
+++ b/kcontrol/kio/fakeuaprovider.cpp
@@ -27,14 +27,14 @@
 #include "fakeuaprovider.h"
 
 #define UA_PTOS(x) (*it)->property(x).toString()
-#define QFL(x) TQString::tqfromLatin1(x)
+#define QFL(x) TQString::fromLatin1(x)
 
 FakeUASProvider::FakeUASProvider()
 {
    m_bIsDirty = true;
 }
 
-FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
+FakeUASProvider::StatusCode FakeUASProvider::createNewUAProvider( const TQString& uaStr )
 {
   TQStringList split;
   int pos = (uaStr).find("::");
@@ -53,7 +53,7 @@ FakeUASProvider::tqStatusCode FakeUASProvider::createNewUAProvider( const TQStri
     split = TQStringList::split("::", uaStr);
   }
 
-  if ( m_lstIdentity.tqcontains(split[1]) )
+  if ( m_lstIdentity.contains(split[1]) )
     return DUPLICATE_ENTRY;
   else
   {
@@ -90,29 +90,29 @@ void FakeUASProvider::parseDescription()
       struct utsname utsn;
       uname( &utsn );
 
-      tmp.tqreplace( QFL("appSysName"), TQString(utsn.sysname) );
-      tmp.tqreplace( QFL("appSysRelease"), TQString(utsn.release) );
-      tmp.tqreplace( QFL("appMachineType"), TQString(utsn.machine) );
+      tmp.replace( QFL("appSysName"), TQString(utsn.sysname) );
+      tmp.replace( QFL("appSysRelease"), TQString(utsn.release) );
+      tmp.replace( QFL("appMachineType"), TQString(utsn.machine) );
 
       TQStringList languageList = KGlobal::locale()->languageList();
       if ( languageList.count() )
       {
-        TQStringList::Iterator it = languageList.find( TQString::tqfromLatin1("C") );
+        TQStringList::Iterator it = languageList.find( TQString::fromLatin1("C") );
         if( it != languageList.end() )
         {
-          if( languageList.tqcontains( TQString::tqfromLatin1("en") ) > 0 )
+          if( languageList.contains( TQString::fromLatin1("en") ) > 0 )
             languageList.remove( it );
           else
-            (*it) = TQString::tqfromLatin1("en");
+            (*it) = TQString::fromLatin1("en");
         }
       }
 
-      tmp.tqreplace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
-      tmp.tqreplace( QFL("appPlatform"), QFL("X11") );
+      tmp.replace( QFL("appLanguage"), TQString("%1").arg(languageList.join(", ")) );
+      tmp.replace( QFL("appPlatform"), QFL("X11") );
     }
 
     // Ignore dups...
-    if ( m_lstIdentity.tqcontains(tmp) )
+    if ( m_lstIdentity.contains(tmp) )
       continue;
 
     m_lstIdentity << tmp;
diff --git a/kcontrol/kio/fakeuaprovider.h b/kcontrol/kio/fakeuaprovider.h
index 01a6aeae5..8aedb639d 100644
--- a/kcontrol/kio/fakeuaprovider.h
+++ b/kcontrol/kio/fakeuaprovider.h
@@ -27,7 +27,7 @@ class TQStringList;
 class FakeUASProvider
 {
 public:
-  enum tqStatusCode {
+  enum StatusCode {
     SUCCEEDED=0,
     ALREADY_EXISTS,
     DUPLICATE_ENTRY
@@ -36,7 +36,7 @@ public:
   FakeUASProvider();
   ~FakeUASProvider(){};
 
-  tqStatusCode createNewUAProvider( const TQString& );
+  StatusCode createNewUAProvider( const TQString& );
   TQString aliasStr( const TQString& );
   TQString agentStr( const TQString& );
   TQStringList userAgentStringList();
diff --git a/kcontrol/kio/kcookiesmain.cpp b/kcontrol/kio/kcookiesmain.cpp
index d8639d1be..8233f0d20 100644
--- a/kcontrol/kio/kcookiesmain.cpp
+++ b/kcontrol/kio/kcookiesmain.cpp
@@ -34,9 +34,9 @@ KCookiesMain::KCookiesMain(TQWidget *parent)
                              "are stored on your computer."));
     }
     
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout *layout = new TQVBoxLayout(this);
     tab = new TQTabWidget(this);
-    tqlayout->addWidget(tab);
+    layout->addWidget(tab);
 
     policies = new KCookiesPolicies(this);
     tab->addTab(policies, i18n("&Policy"));
diff --git a/kcontrol/kio/kcookiesmanagement.cpp b/kcontrol/kio/kcookiesmanagement.cpp
index 85a16edd5..f2cd45c42 100644
--- a/kcontrol/kio/kcookiesmanagement.cpp
+++ b/kcontrol/kio/kcookiesmanagement.cpp
@@ -102,7 +102,7 @@ TQString CookieListViewItem::text(int f) const
 KCookiesManagement::KCookiesManagement(TQWidget *parent)
                    : KCModule(parent, "kcmkio")
 {
-  // Toplevel tqlayout
+  // Toplevel layout
   TQVBoxLayout* mainLayout = new TQVBoxLayout(this, KDialog::marginHint(),
                                             KDialog::spacingHint());
 
diff --git a/kcontrol/kio/kcookiesmanagementdlg_ui.ui b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
index 63f9a2008..f36c0a707 100644
--- a/kcontrol/kio/kcookiesmanagementdlg_ui.ui
+++ b/kcontrol/kio/kcookiesmanagementdlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KCookiesManagementDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -21,7 +21,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -71,7 +71,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -119,7 +119,7 @@
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>62</height>
@@ -130,7 +130,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -315,8 +315,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistviewsearchline.h</includehint>
 </includehints>
diff --git a/kcontrol/kio/kcookiespolicies.cpp b/kcontrol/kio/kcookiespolicies.cpp
index 00d2b9860..63f4dd21a 100644
--- a/kcontrol/kio/kcookiespolicies.cpp
+++ b/kcontrol/kio/kcookiespolicies.cpp
@@ -175,7 +175,7 @@ bool KCookiesPolicies::handleDuplicate( const TQString& domain, int advice )
     {
       TQString msg = i18n("<qt>A policy already exists for"
                          "<center><b>%1</b></center>"
-                         "Do you want to tqreplace it?</qt>").arg(domain);
+                         "Do you want to replace it?</qt>").arg(domain);
       int res = KMessageBox::warningContinueCancel(this, msg,
                                           i18n("Duplicate Policy"),
                                           i18n("Replace"));
@@ -392,7 +392,7 @@ void KCookiesPolicies::save()
 
   while( at )
   {
-    domainConfig.append(TQString::tqfromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
+    domainConfig.append(TQString::fromLatin1("%1:%2").arg(KIDNA::toAscii(at->text(0))).arg(m_pDomainPolicy[at]));
     at = at->nextSibling();
   }
 
diff --git a/kcontrol/kio/kcookiespoliciesdlg_ui.ui b/kcontrol/kio/kcookiespoliciesdlg_ui.ui
index 50b6805b4..435ca8640 100644
--- a/kcontrol/kio/kcookiespoliciesdlg_ui.ui
+++ b/kcontrol/kio/kcookiespoliciesdlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KCookiesPolicyDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -161,7 +161,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -170,7 +170,7 @@ To add a new policy, simply click on the &lt;b&gt;Add...&lt;/b&gt; button and su
                 </spacer>
                 <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -256,7 +256,7 @@ List of sites for which you have set a specific cookie policy. Specific policies
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="0">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -314,8 +314,8 @@ List of sites for which you have set a specific cookie policy. Specific policies
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistviewsearchline.h</includehint>
diff --git a/kcontrol/kio/kenvvarproxydlg.cpp b/kcontrol/kio/kenvvarproxydlg.cpp
index 8d21c7a5b..22accb4e9 100644
--- a/kcontrol/kio/kenvvarproxydlg.cpp
+++ b/kcontrol/kio/kenvvarproxydlg.cpp
@@ -163,16 +163,16 @@ void KEnvVarProxyDlg::autoDetectPressed()
   setHighLight (mDlg->lbNoProxy, false);
 
   // Detect HTTP proxy settings...
-  found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
+  found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTP_PROXY), mEnvVarsMap["http"]);
 
   // Detect HTTPS proxy settings...
-  found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
+  found |= autoDetectProxySetting (TQString::fromLatin1(ENV_HTTPS_PROXY), mEnvVarsMap["https"]);
 
   // Detect FTP proxy settings...
-  found |= autoDetectProxySetting (TQString::tqfromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
+  found |= autoDetectProxySetting (TQString::fromLatin1(ENV_FTP_PROXY), mEnvVarsMap["ftp"]);
 
   // Detect the NO_PROXY settings...
-  found |= autoDetectProxySetting (TQString::tqfromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
+  found |= autoDetectProxySetting (TQString::fromLatin1(NO_PROXY), mEnvVarsMap["noProxy"]);
 
   if ( !found )
   {
diff --git a/kcontrol/kio/kmanualproxydlg.cpp b/kcontrol/kio/kmanualproxydlg.cpp
index 3b0745961..92e8a98e6 100644
--- a/kcontrol/kio/kmanualproxydlg.cpp
+++ b/kcontrol/kio/kmanualproxydlg.cpp
@@ -52,7 +52,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
     mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
     TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
                             mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
-    mDlg->pbCopyDown->tqsetSizePolicy( sizePolicy );
+    mDlg->pbCopyDown->setSizePolicy( sizePolicy );
 
     init();
 }
@@ -423,7 +423,7 @@ bool KManualProxyDlg::isValidURL( const TQString& _url, KURL* result ) const
     
     // We only check for a relevant subset of characters that are 
     // not allowed in <authority> component of a URL.
-    if ( host.tqcontains ('*') || host.tqcontains (' ') || host.tqcontains ('?') )
+    if ( host.contains ('*') || host.contains (' ') || host.contains ('?') )
       return false;
       
     if ( result )
diff --git a/kcontrol/kio/kproxydlg.cpp b/kcontrol/kio/kproxydlg.cpp
index 5f43afce2..bbe7a76bd 100644
--- a/kcontrol/kio/kproxydlg.cpp
+++ b/kcontrol/kio/kproxydlg.cpp
@@ -43,10 +43,10 @@
 KProxyOptions::KProxyOptions (TQWidget* parent )
               :KCModule (parent, "kcmkio")
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   
   mTab = new TQTabWidget(this);
-  tqlayout->addWidget(mTab);
+  layout->addWidget(mTab);
 
   mProxy  = new KProxyDialog(mTab);
   mSocks = new KSocksConfig(mTab);
diff --git a/kcontrol/kio/kproxydlg_ui.ui b/kcontrol/kio/kproxydlg_ui.ui
index c2f654358..1a6b5d6e2 100644
--- a/kcontrol/kio/kproxydlg_ui.ui
+++ b/kcontrol/kio/kproxydlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ProxyDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -99,7 +99,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -115,7 +115,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -145,7 +145,7 @@ Automatic detection is performed using the &lt;b&gt;Web Proxy Auto-Discovery Pro
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -194,7 +194,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -284,7 +284,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -300,7 +300,7 @@ Environment variables such as &lt;b&gt;HTTP_PROXY&lt;/b&gt; and &lt;b&gt;NO_PROX
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -433,8 +433,8 @@ Although a persistent proxy connection is faster, note that it only works correc
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kcontrol/kio/lanbrowser.desktop b/kcontrol/kio/lanbrowser.desktop
index 6959cba35..5d3965667 100644
--- a/kcontrol/kio/lanbrowser.desktop
+++ b/kcontrol/kio/lanbrowser.desktop
@@ -96,7 +96,7 @@ Comment[bn]=lisa, reslisa এবং ioslaves সেট-আপ
 Comment[br]=Kefluniadur lisa, reslisa and skalvoù IO
 Comment[bs]=Podesite lisa, reslisa i ioslaves
 Comment[ca]=Arranja lisa, reslisa i els ioslaves
-Comment[cs]=Nastavení Lisa, ResLisa a potqmocných zařízení
+Comment[cs]=Nastavení Lisa, ResLisa a pomocných zařízení
 Comment[csb]=Ùstôw lisa, reslisa ë procedurów wé/wi
 Comment[cy]=Gosodiad lisa,reslisa a'r gweision-io
 Comment[da]=Opsætning af lisa, reslisa og ioslaverne
diff --git a/kcontrol/kio/main.cpp b/kcontrol/kio/main.cpp
index fb2c0edfd..96821defa 100644
--- a/kcontrol/kio/main.cpp
+++ b/kcontrol/kio/main.cpp
@@ -79,7 +79,7 @@ extern "C"
 
 LanBrowser::LanBrowser(TQWidget *parent)
 :KCModule(parent,"kcmkio")
-,tqlayout(this)
+,layout(this)
 ,tabs(this)
 {
    setQuickHelp( i18n("<h1>Local Network Browsing</h1>Here you setup your "
@@ -99,7 +99,7 @@ LanBrowser::LanBrowser(TQWidget *parent)
 		"the LISa Homepage</a> or contact Alexander Neundorf "
 		"&lt;<a href=\"mailto:neundorf@kde.org\">neundorf@kde.org</a>&gt;."));
 
-   tqlayout.addWidget(&tabs);
+   layout.addWidget(&tabs);
 
    smbPage = create_smb(&tabs, 0);
    tabs.addTab(smbPage, i18n("&Windows Shares"));
diff --git a/kcontrol/kio/main.h b/kcontrol/kio/main.h
index 9d3609924..5c6d35ef9 100644
--- a/kcontrol/kio/main.h
+++ b/kcontrol/kio/main.h
@@ -35,7 +35,7 @@ class LanBrowser:public KCModule
       virtual void save();
 
    private:
-      TQVBoxLayout tqlayout;
+      TQVBoxLayout layout;
       TQTabWidget tabs;
       KCModule *smbPage;
       KCModule *lisaPage;
diff --git a/kcontrol/kio/manualproxy_ui.ui b/kcontrol/kio/manualproxy_ui.ui
index 6202a78ab..1c8ef8634 100644
--- a/kcontrol/kio/manualproxy_ui.ui
+++ b/kcontrol/kio/manualproxy_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ManualProxyDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -137,7 +137,7 @@
                     <property name="name">
                         <cstring>sbHttp</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Minimum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>
@@ -211,7 +211,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -280,7 +280,7 @@ Reverse the use of the exception list. Checking this box will result in the prox
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>114</height>
@@ -313,5 +313,5 @@ Reverse the use of the exception list. Checking this box will result in the prox
     <tabstop>pbDelete</tabstop>
     <tabstop>pbDeleteAll</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/kio/policydlg.cpp b/kcontrol/kio/policydlg.cpp
index 19cccaf22..463806266 100644
--- a/kcontrol/kio/policydlg.cpp
+++ b/kcontrol/kio/policydlg.cpp
@@ -70,7 +70,7 @@ PolicyDlg::PolicyDlg (const TQString& caption, TQWidget *parent,
   connect(m_dlgUI->leDomain, TQT_SIGNAL(textChanged(const TQString&)),
     TQT_SLOT(slotTextChanged(const TQString&)));
 
-  setFixedSize (tqsizeHint());
+  setFixedSize (sizeHint());
   m_dlgUI->leDomain->setFocus ();
 }
 
diff --git a/kcontrol/kio/policydlg.h b/kcontrol/kio/policydlg.h
index a67bfccaa..2bf7a4c99 100644
--- a/kcontrol/kio/policydlg.h
+++ b/kcontrol/kio/policydlg.h
@@ -52,11 +52,11 @@ public:
     if (advice.isEmpty())
       return KCookieAdvice::Dunno;
 
-    if (advice.find (TQString::tqfromLatin1("accept"), 0, false) == 0)
+    if (advice.find (TQString::fromLatin1("accept"), 0, false) == 0)
       return KCookieAdvice::Accept;
-    else if (advice.find (TQString::tqfromLatin1("reject"), 0, false) == 0)
+    else if (advice.find (TQString::fromLatin1("reject"), 0, false) == 0)
       return KCookieAdvice::Reject;
-    else if (advice.find (TQString::tqfromLatin1("ask"), 0, false) == 0)
+    else if (advice.find (TQString::fromLatin1("ask"), 0, false) == 0)
       return KCookieAdvice::Ask;
 
     return KCookieAdvice::Dunno;
diff --git a/kcontrol/kio/policydlg_ui.ui b/kcontrol/kio/policydlg_ui.ui
index 627a985cf..1bae63208 100644
--- a/kcontrol/kio/policydlg_ui.ui
+++ b/kcontrol/kio/policydlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PolicyDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -101,6 +101,6 @@ Select the desired policy:
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kio/smbrodlg.cpp b/kcontrol/kio/smbrodlg.cpp
index 93267c0e2..90dfd9170 100644
--- a/kcontrol/kio/smbrodlg.cpp
+++ b/kcontrol/kio/smbrodlg.cpp
@@ -38,40 +38,40 @@
 SMBRoOptions::SMBRoOptions(TQWidget *parent)
   : KCModule(parent, "kcmkio")
 {
-   TQGridLayout *tqlayout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
+   TQGridLayout *layout = new TQGridLayout(this,2,-1,KDialog::marginHint(),
          KDialog::spacingHint());
    TQLabel *label=new TQLabel(i18n("This is the configuration for the samba client only, not the server."),this);
-   tqlayout->addMultiCellWidget(label,0,0,0,1);
+   layout->addMultiCellWidget(label,0,0,0,1);
 
    m_userLe=new TQLineEdit(this);
    label=new TQLabel(m_userLe,i18n("Default user name:"),this);
-   tqlayout->addWidget(label,1,0);
-   tqlayout->addWidget(m_userLe,1,1);
+   layout->addWidget(label,1,0);
+   layout->addWidget(m_userLe,1,1);
 
    m_passwordLe=new TQLineEdit(this);
    m_passwordLe->setEchoMode(TQLineEdit::Password);
    label=new TQLabel(m_passwordLe,i18n("Default password:"),this);
-   tqlayout->addWidget(label,2,0);
-   tqlayout->addWidget(m_passwordLe,2,1);
+   layout->addWidget(label,2,0);
+   layout->addWidget(m_passwordLe,2,1);
 
 /*   m_workgroupLe=new TQLineEdit(this);
    label=new TQLabel(m_workgroupLe,i18n("Workgroup:"),this);
-   tqlayout->addWidget(label,3,0);
-   tqlayout->addWidget(m_workgroupLe,3,1);
+   layout->addWidget(label,3,0);
+   layout->addWidget(m_workgroupLe,3,1);
 
    m_showHiddenShares=new TQCheckBox(i18n("Show hidden shares"),this);
-   tqlayout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
+   layout->addMultiCellWidget(m_showHiddenShares,4,4,0,1);
 
    m_encodingList = new KComboBox( false, this );
    TQStringList _strList = KGlobal::charsets()->availableEncodingNames();
    m_encodingList->insertStringList( _strList );
 
    label = new TQLabel( m_encodingList, i18n( "MS Windows encoding:" ), this );
-   tqlayout->addWidget( label, 3, 0 );
-   tqlayout->addWidget( m_encodingList, 3, 1 );
+   layout->addWidget( label, 3, 0 );
+   layout->addWidget( m_encodingList, 3, 1 );
    */
 
-   tqlayout->addWidget(new TQWidget(this),4,0);
+   layout->addWidget(new TQWidget(this),4,0);
 
 //   connect(m_showHiddenShares, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(changed()));
    connect(m_userLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
@@ -79,7 +79,7 @@ SMBRoOptions::SMBRoOptions(TQWidget *parent)
 //   connect(m_workgroupLe, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(changed()));
 //   connect( m_encodingList, TQT_SIGNAL( activated( const TQString & ) ), this , TQT_SLOT( changed() ) );
 
-   tqlayout->setRowStretch(4, 1);
+   layout->setRowStretch(4, 1);
 
    // finaly read the options
    load();
@@ -140,7 +140,7 @@ void SMBRoOptions::save()
    for (uint i=0; i<password.length(); i++)
    {
       TQChar c = password[i];
-      unsigned int num = (c.tqunicode() ^ 173) + 17;
+      unsigned int num = (c.unicode() ^ 173) + 17;
       unsigned int a1 = (num & 0xFC00) >> 10;
       unsigned int a2 = (num & 0x3E0) >> 5;
       unsigned int a3 = (num & 0x1F);
diff --git a/kcontrol/kio/socks.cpp b/kcontrol/kio/socks.cpp
index 3a322ab29..fd1ce7d8e 100644
--- a/kcontrol/kio/socks.cpp
+++ b/kcontrol/kio/socks.cpp
@@ -48,9 +48,9 @@ KSocksConfig::KSocksConfig(TQWidget *parent)
   setAboutData( about );
 
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   base = new SocksBase(this);
-  tqlayout->add(base);
+  layout->add(base);
 
   connect(base->_c_enableSocks, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
   connect(base->bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(methodChanged(int)));
diff --git a/kcontrol/kio/socksbase.ui b/kcontrol/kio/socksbase.ui
index 03adb5202..5def84076 100644
--- a/kcontrol/kio/socksbase.ui
+++ b/kcontrol/kio/socksbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SocksBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,9 +15,9 @@
     <property name="caption">
         <string>SOCKS</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -127,7 +127,7 @@
                             <property name="name">
                                 <cstring>_c_customPath</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>0</width>
                                     <height>20</height>
@@ -211,7 +211,7 @@
                     <property name="name">
                         <cstring>_c_newPath</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>25</height>
@@ -236,7 +236,7 @@
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -281,7 +281,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -330,6 +330,6 @@
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/kio/uagentproviderdlg.cpp b/kcontrol/kio/uagentproviderdlg.cpp
index 5bf92cdb7..9e945948d 100644
--- a/kcontrol/kio/uagentproviderdlg.cpp
+++ b/kcontrol/kio/uagentproviderdlg.cpp
@@ -47,7 +47,7 @@ void UALineEdit::keyPressEvent( TQKeyEvent* e )
   TQString keycode = e->text();
   if ( (key >= Qt::Key_Escape && key <= Qt::Key_Help) || key == Qt::Key_Period ||
        (cursorPosition() > 0 && key == Qt::Key_Minus) ||
-       (!keycode.isEmpty() && keycode.tqunicode()->isLetterOrNumber()) )
+       (!keycode.isEmpty() && keycode.unicode()->isLetterOrNumber()) )
   {
     KLineEdit::keyPressEvent(e);
     return;
diff --git a/kcontrol/kio/uagentproviderdlg_ui.ui b/kcontrol/kio/uagentproviderdlg_ui.ui
index add8356d7..6f2a006ec 100644
--- a/kcontrol/kio/uagentproviderdlg_ui.ui
+++ b/kcontrol/kio/uagentproviderdlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>UAProviderDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -117,7 +117,7 @@ The actual browser identification text that will be sent to the remote machine.
             <property name="sizeType">
                 <enum>MinimumExpanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>16</height>
@@ -126,7 +126,7 @@ The actual browser identification text that will be sent to the remote machine.
         </spacer>
         <widget class="QLayoutWidget" row="8" column="0">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -142,7 +142,7 @@ The actual browser identification text that will be sent to the remote machine.
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>29</width>
                             <height>20</height>
@@ -197,8 +197,8 @@ The actual browser identification text that will be sent to the remote machine.
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/kcontrol/kio/useragentdlg.cpp b/kcontrol/kio/useragentdlg.cpp
index 09ebe351f..c34d5cadc 100644
--- a/kcontrol/kio/useragentdlg.cpp
+++ b/kcontrol/kio/useragentdlg.cpp
@@ -111,12 +111,12 @@ void UserAgentDlg::load()
   dlg->cbSendUAString->setChecked( b );
   m_ua_keys = m_config->readEntry("UserAgentKeys", DEFAULT_USER_AGENT_KEYS).lower();
   dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent( m_ua_keys ) );
-  dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') );
-  dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') );
-  dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') );
-  dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') );
-  dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') );
-  dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') );
+  dlg->cbOS->setChecked( m_ua_keys.contains('o') );
+  dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') );
+  dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') );
+  dlg->cbPlatform->setChecked( m_ua_keys.contains('p') );
+  dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') );
+  dlg->cbLanguage->setChecked( m_ua_keys.contains('l') );
   updateButtons();
   emit changed( false );
 }
@@ -135,12 +135,12 @@ void UserAgentDlg::defaults()
   dlg->lvDomainPolicyList->clear();
   m_ua_keys = DEFAULT_USER_AGENT_KEYS;
   dlg->leDefaultId->setSqueezedText( KProtocolManager::defaultUserAgent(m_ua_keys) );
-  dlg->cbOS->setChecked( m_ua_keys.tqcontains('o') );
-  dlg->cbOSVersion->setChecked( m_ua_keys.tqcontains('v') );
-  dlg->cbOSVersion->setEnabled( m_ua_keys.tqcontains('o') );
-  dlg->cbPlatform->setChecked( m_ua_keys.tqcontains('p') );
-  dlg->cbProcessorType->setChecked( m_ua_keys.tqcontains('m') );
-  dlg->cbLanguage->setChecked( m_ua_keys.tqcontains('l') );
+  dlg->cbOS->setChecked( m_ua_keys.contains('o') );
+  dlg->cbOSVersion->setChecked( m_ua_keys.contains('v') );
+  dlg->cbOSVersion->setEnabled( m_ua_keys.contains('o') );
+  dlg->cbPlatform->setChecked( m_ua_keys.contains('p') );
+  dlg->cbProcessorType->setChecked( m_ua_keys.contains('m') );
+  dlg->cbLanguage->setChecked( m_ua_keys.contains('l') );
   dlg->cbSendUAString->setChecked( true );
   updateButtons();
   configChanged();
@@ -224,7 +224,7 @@ bool UserAgentDlg::handleDuplicate( const TQString& site,
     {
       TQString msg = i18n("<qt><center>Found an existing identification for"
                          "<br/><b>%1</b><br/>"
-                         "Do you want to tqreplace it?</center>"
+                         "Do you want to replace it?</center>"
                          "</qt>").arg(site);
       int res = KMessageBox::warningContinueCancel(this, msg,
                                           i18n("Duplicate Identification"),
@@ -351,7 +351,7 @@ void UserAgentDlg::changeDefaultUAModifiers( int )
   if ( dlg->cbLanguage->isChecked() )
      m_ua_keys += 'l';
 
-  dlg->cbOSVersion->setEnabled(m_ua_keys.tqcontains('o'));
+  dlg->cbOSVersion->setEnabled(m_ua_keys.contains('o'));
 
   TQString modVal = KProtocolManager::defaultUserAgent( m_ua_keys );
   if ( dlg->leDefaultId->text() != modVal )
diff --git a/kcontrol/kio/useragentdlg_ui.ui b/kcontrol/kio/useragentdlg_ui.ui
index 2beb0beb1..0db2a2440 100644
--- a/kcontrol/kio/useragentdlg_ui.ui
+++ b/kcontrol/kio/useragentdlg_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>UserAgentDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -101,7 +101,7 @@ By default, only minimal identification information is sent to remote sites. The
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -117,7 +117,7 @@ By default, only minimal identification information is sent to remote sites. The
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -250,7 +250,7 @@ By default, only minimal identification information is sent to remote sites. The
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -310,7 +310,7 @@ By default, only minimal identification information is sent to remote sites. The
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>16</height>
@@ -346,8 +346,8 @@ By default, only minimal identification information is sent to remote sites. The
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp
index 9baa6fdba..edfa28e48 100644
--- a/kcontrol/knotify/knotify.cpp
+++ b/kcontrol/knotify/knotify.cpp
@@ -64,19 +64,19 @@ KCMKNotify::KCMKNotify(TQWidget *parent, const char *name, const TQStringList &
                 "any additional visual or audible alert."
                 "</ul>"));
 
-    TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+    TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
 
     TQLabel *label = new TQLabel( i18n( "Event source:" ), this );
     m_appCombo = new KComboBox( false, this, "app combo" );
 
-    TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout );
+    TQHBoxLayout *hbox = new TQHBoxLayout( layout );
     hbox->addWidget( label );
     hbox->addWidget( m_appCombo, 10 );
 
     m_notifyWidget = new KNotifyWidget( this, "knotify widget", true );
     connect( m_notifyWidget, TQT_SIGNAL( changed( bool )), TQT_SIGNAL( changed(bool)));
 
-    tqlayout->addWidget( m_notifyWidget );
+    layout->addWidget( m_notifyWidget );
 
     connect( m_appCombo, TQT_SIGNAL( activated( const TQString& ) ),
              TQT_SLOT( slotAppActivated( const TQString& )) );
diff --git a/kcontrol/knotify/playersettings.ui b/kcontrol/knotify/playersettings.ui
index 81e0ff8a0..f990fc995 100644
--- a/kcontrol/knotify/playersettings.ui
+++ b/kcontrol/knotify/playersettings.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>PlayerSettingsUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -84,7 +84,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -93,7 +93,7 @@
                 </spacer>
                 <widget class="QLayoutWidget" row="1" column="1" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -109,7 +109,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -118,7 +118,7 @@
                         </spacer>
                         <widget class="QLayoutWidget" row="0" column="1" rowspan="2" colspan="1">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -140,7 +140,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>233</width>
                                             <height>20</height>
@@ -205,7 +205,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -265,7 +265,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -321,7 +321,7 @@
     <tabstop>cbExternal</tabstop>
     <tabstop>cbNone</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg
index 321b35b8d..daa451531 100644
Binary files a/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg and b/kcontrol/knotify/sounds/KDE_Star_Ship_1.ogg differ
diff --git a/kcontrol/knotify/sounds/KDE_Startup_1.ogg b/kcontrol/knotify/sounds/KDE_Startup_1.ogg
index 251683347..2fca9715b 100644
Binary files a/kcontrol/knotify/sounds/KDE_Startup_1.ogg and b/kcontrol/knotify/sounds/KDE_Startup_1.ogg differ
diff --git a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav
index 52bc44bf1..55b4e4598 100644
Binary files a/kcontrol/knotify/sounds/KDE_Window_Iconify.wav and b/kcontrol/knotify/sounds/KDE_Window_Iconify.wav differ
diff --git a/kcontrol/konq/README b/kcontrol/konq/README
index 22d05d7ff..11ad5c7b5 100644
--- a/kcontrol/konq/README
+++ b/kcontrol/konq/README
@@ -1,7 +1,7 @@
-This module tqcontains a combination of configuration items which at first
+This module contains a combination of configuration items which at first
 sight seem to be a rather weird combination.
 
-It tqcontains configuration for:
+It contains configuration for:
 * KDesktop
 * Konqueror 
 * Number of virtual desktops. (Handled by KWin via NETWM)
diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp
index 75a46c717..af6c12cc4 100644
--- a/kcontrol/konq/behaviour.cpp
+++ b/kcontrol/konq/behaviour.cpp
@@ -58,7 +58,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     winPixmap->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
     winPixmap->setPixmap(TQPixmap(locate("data",
                                         "kcontrol/pics/onlyone.png")));
-    winPixmap->setFixedSize( winPixmap->tqsizeHint() );
+    winPixmap->setFixedSize( winPixmap->sizeHint() );
 
 
    // ----
@@ -103,7 +103,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
     TQHBox *hboxpreview = new TQHBox(vbox);
     TQWidget* spacer = new TQWidget( hboxpreview );
     spacer->setMinimumSize( 20, 0 );
-    spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
+    spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum );
 
     cbShowPreviewsInTips = new TQCheckBox( i18n( "Show &previews in file tips" ), hboxpreview );
     connect(cbShowPreviewsInTips, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
@@ -146,7 +146,7 @@ KBehaviourOptions::KBehaviourOptions(KConfig *config, TQString group, TQWidget *
 						"while calling 'Move to Trash'."));
 
     TQButtonGroup *bg = new TQVButtonGroup( i18n("Ask Confirmation For"), this );
-    bg->tqlayout()->setSpacing( KDialog::spacingHint() );
+    bg->layout()->setSpacing( KDialog::spacingHint() );
     TQWhatsThis::add( bg, i18n("This option tells Konqueror whether to ask"
        " for a confirmation when you \"delete\" a file."
        " <ul><li><em>Move To Trash:</em> moves the file to your trash folder,"
diff --git a/kcontrol/konq/browser.cpp b/kcontrol/konq/browser.cpp
index a17631927..cb1b5c47e 100644
--- a/kcontrol/konq/browser.cpp
+++ b/kcontrol/konq/browser.cpp
@@ -33,18 +33,18 @@
 KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *parent, const char *name)
     : KCModule( parent, "kcmkonq" ) 
 {
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   TQTabWidget *tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   appearance = new KonqFontOptions(config, group, false, tab, name);
-  appearance->tqlayout()->setMargin( KDialog::marginHint() );
+  appearance->layout()->setMargin( KDialog::marginHint() );
 
   behavior = new KBehaviourOptions(config, group, tab, name);
-  behavior->tqlayout()->setMargin( KDialog::marginHint() );
+  behavior->layout()->setMargin( KDialog::marginHint() );
 
   previews = new KPreviewOptions(tab, name);
-  previews->tqlayout()->setMargin( KDialog::marginHint() );
+  previews->layout()->setMargin( KDialog::marginHint() );
 
   kuick = KCModuleLoader::loadModule("kcmkuick", tab);
 
@@ -53,7 +53,7 @@ KBrowserOptions::KBrowserOptions(KConfig *config, TQString group, TQWidget *pare
   tab->addTab(previews, i18n("&Previews && Meta-Data"));
   if (kuick)
   {
-    kuick->tqlayout()->setMargin( KDialog::marginHint() );
+    kuick->layout()->setMargin( KDialog::marginHint() );
     tab->addTab(kuick, i18n("&Quick Copy && Move"));
   }
 
diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp
index f0f922845..98275995c 100644
--- a/kcontrol/konq/desktop.cpp
+++ b/kcontrol/konq/desktop.cpp
@@ -59,7 +59,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
 
   Q_ASSERT(maxDesktops % 2 == 0);
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 
   // number group
   TQGroupBox *number_group = new TQGroupBox(this);
@@ -82,7 +82,7 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   lay->addWidget(_numInput);
   lay->setStretchFactor( _numInput, 2 );
 
-  tqlayout->addWidget(number_group);
+  layout->addWidget(number_group);
 
   // name group
   TQGroupBox *name_group = new TQGroupBox(i18n("Desktop &Names"), this);
@@ -109,13 +109,13 @@ KDesktopConfig::KDesktopConfig(TQWidget *parent, const char * /*name*/)
   for(int i = 1; i < maxDesktops; i++)
       setTabOrder( _nameInput[i-1], _nameInput[i] );
 
-  tqlayout->addWidget(name_group);
+  layout->addWidget(name_group);
 
   _wheelOption = new TQCheckBox(i18n("Mouse wheel over desktop background switches desktop"), this);
   connect(_wheelOption,TQT_SIGNAL(toggled(bool)), TQT_SLOT( changed() ));
 
-  tqlayout->addWidget(_wheelOption);
-  tqlayout->addStretch(1);
+  layout->addWidget(_wheelOption);
+  layout->addStretch(1);
 
   load();
 }
diff --git a/kcontrol/konq/desktopbehavior.ui b/kcontrol/konq/desktopbehavior.ui
index 30da90234..6e614b022 100644
--- a/kcontrol/konq/desktopbehavior.ui
+++ b/kcontrol/konq/desktopbehavior.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>DesktopBehaviorBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -58,7 +58,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="1" column="0">
                         <property name="name">
-                            <cstring>tqlayout1</cstring>
+                            <cstring>layout1</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -74,7 +74,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -268,7 +268,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>191</width>
                                         <height>80</height>
@@ -287,7 +287,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -410,7 +410,7 @@
     <tabstop>enableMediaBox</tabstop>
     <tabstop>mediaListView</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>klistview.h</includehint>
diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp
index a48550628..6b4aaadb0 100644
--- a/kcontrol/konq/desktopbehavior_impl.cpp
+++ b/kcontrol/konq/desktopbehavior_impl.cpp
@@ -49,9 +49,9 @@ const int customMenu2ID = 6;
 DesktopBehaviorModule::DesktopBehaviorModule(KConfig *config, TQWidget *parent, const char * )
     : KCModule( parent, "kcmkonq" )
 {
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(this);
+    TQVBoxLayout* layout = new TQVBoxLayout(this);
     m_behavior = new DesktopBehavior(config, this);
-    tqlayout->addWidget(m_behavior);
+    layout->addWidget(m_behavior);
     connect(m_behavior, TQT_SIGNAL(changed()), this, TQT_SLOT(changed()));
 }
 
@@ -124,7 +124,7 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
    */
   bool leftHandedMouse = ( KGlobalSettings::mouseSettings().handed == KGlobalSettings::KMouseSettings::LeftHanded);
 
-  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media"));
+  m_bHasMedia = KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media"));
 
   connect(desktopMenuGroup, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL(changed()));
   connect(iconsEnabledBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(enableChanged()));
@@ -144,8 +144,8 @@ DesktopBehavior::DesktopBehavior(KConfig *config, TQWidget *parent, const char *
 
   if ( leftHandedMouse )
   {
-     tqSwap(strMouseButton1, strMouseButton3);
-     tqSwap(strButtonTxt1, strButtonTxt3);
+     qSwap(strMouseButton1, strMouseButton3);
+     qSwap(strButtonTxt1, strButtonTxt3);
   }
 
   leftLabel->setText( strMouseButton1 );
@@ -259,7 +259,7 @@ void DesktopBehavior::fillMediaListView()
     for (; it2 != mimetypes.end(); ++it2) {
         if ( ((*it2)->name().startsWith("media/")) )
         {
-            bool ok=excludedMedia.tqcontains((*it2)->name())==0;
+            bool ok=excludedMedia.contains((*it2)->name())==0;
             new DesktopBehaviorMediaItem (this, mediaListView, (*it2)->comment(), (*it2)->name(),ok);
         }
     }
@@ -309,8 +309,8 @@ void DesktopBehavior::load( bool useDefaults )
     previewListView->clear();
     TQStringList previews = g_pConfig->readListEntry("Preview");
     for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it)
-        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.tqcontains((*it)->desktopEntryName()));
-    new DesktopBehaviorPreviewItem(this, previewListView, previews.tqcontains("audio/"));
+        new DesktopBehaviorPreviewItem(this, previewListView, *it, previews.contains((*it)->desktopEntryName()));
+    new DesktopBehaviorPreviewItem(this, previewListView, previews.contains("audio/"));
     //
     g_pConfig->setGroup( "FMSettings" );
     toolTipBox->setChecked(g_pConfig->readBoolEntry( "ShowFileTips", true ) );
diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp
index 66a49309f..0e3ea0861 100644
--- a/kcontrol/konq/previews.cpp
+++ b/kcontrol/konq/previews.cpp
@@ -198,7 +198,7 @@ void KPreviewOptions::save()
         group.writeEntry( protocol, it.current()->isOn(), true, true );
     }
     // config key is in bytes, numinput is in MB
-    group.writeEntry( "MaximumSize", tqRound( m_maxSize->value() *1024*1024 ), true, true );
+    group.writeEntry( "MaximumSize", qRound( m_maxSize->value() *1024*1024 ), true, true );
     group.writeEntry( "BoostSize", m_boostSize->isChecked(), true, true );
     group.writeEntry( "UseFileThumbnails", m_useFileThumbnails->isChecked(), true, true );
     group.sync();
diff --git a/kcontrol/konq/previews.h b/kcontrol/konq/previews.h
index 03c3a175e..8cf3ceade 100644
--- a/kcontrol/konq/previews.h
+++ b/kcontrol/konq/previews.h
@@ -24,7 +24,7 @@
 
 /*
 
-The "Previews" Tab tqcontains :
+The "Previews" Tab contains :
 
 List of protocols that support listing, with a checkbox for each
 Configuration of the maximum image size
diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp
index c4e2c26d2..f4111cfda 100644
--- a/kcontrol/konq/rootopts.cpp
+++ b/kcontrol/konq/rootopts.cpp
@@ -78,7 +78,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   tmpLabel->setBuddy( urDesktop );
   lay->addMultiCellWidget(urDesktop, row, row, 1, RO_LASTCOL);
   connect(urDesktop, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
-  TQString wtstr = i18n("This folder tqcontains all the files"
+  TQString wtstr = i18n("This folder contains all the files"
                        " which you see on your desktop. You can change the location of this"
                        " folder if you want to, and the contents will move automatically"
                        " to the new location as well.");
@@ -93,7 +93,7 @@ DesktopPathConfig::DesktopPathConfig(TQWidget *parent, const char * )
   tmpLabel->setBuddy( urAutostart );
   lay->addMultiCellWidget(urAutostart, row, row, 1, RO_LASTCOL);
   connect(urAutostart, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changed()));
-  wtstr = i18n("This folder tqcontains applications or"
+  wtstr = i18n("This folder contains applications or"
                " links to applications (shortcuts) that you want to have started"
                " automatically whenever KDE starts. You can change the location of this"
                " folder if you want to, and the contents will move automatically"
@@ -286,7 +286,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::ListJob* job = KIO::listDir( src );
             connect( job, TQT_SIGNAL( entries( KIO::Job *, const KIO::UDSEntryList& ) ),
                      this, TQT_SLOT( slotEntries( KIO::Job *, const KIO::UDSEntryList& ) ) );
-            tqApp->enter_loop();
+            qApp->enter_loop();
 
             if (m_ok)
             {
@@ -298,7 +298,7 @@ bool DesktopPathConfig::moveDir( const KURL & src, const KURL & dest, const TQSt
             KIO::Job * job = KIO::move( src, dest );
             connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
             // wait for job
-            tqApp->enter_loop();
+            qApp->enter_loop();
         }
     }
     kdDebug() << "DesktopPathConfig::slotResult returning " << m_ok << endl;
@@ -325,9 +325,9 @@ void DesktopPathConfig::slotEntries( KIO::Job * job, const KIO::UDSEntryList& li
 
         KIO::Job * moveJob = KIO::move( file.url(), m_copyToDest );
         connect( moveJob, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) );
-        tqApp->enter_loop();
+        qApp->enter_loop();
     }
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 void DesktopPathConfig::slotResult( KIO::Job * job )
@@ -341,7 +341,7 @@ void DesktopPathConfig::slotResult( KIO::Job * job )
 
         job->showErrorDialog(this);
     }
-    tqApp->exit_loop();
+    qApp->exit_loop();
 }
 
 #include "rootopts.moc"
diff --git a/kcontrol/konq/rootopts.h b/kcontrol/konq/rootopts.h
index 51737f8d0..7af18f1ae 100644
--- a/kcontrol/konq/rootopts.h
+++ b/kcontrol/konq/rootopts.h
@@ -30,7 +30,7 @@ class KURLRequester;
 namespace KIO { class Job; }
 
 //-----------------------------------------------------------------------------
-// The "Path" Tab tqcontains :
+// The "Path" Tab contains :
 // The paths for Desktop, Autostart and Documents
 
 class DesktopPathConfig : public KCModule
diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp
index 9c533c9e2..681863cb6 100644
--- a/kcontrol/konqhtml/advancedTabDialog.cpp
+++ b/kcontrol/konqhtml/advancedTabDialog.cpp
@@ -52,11 +52,11 @@ advancedTabDialog::advancedTabDialog(TQWidget* parent, KConfig* config, const ch
             this, TQT_SLOT(save()));
     actionButton(Apply)->setEnabled(false);
     TQFrame* page = plainPage();
-    TQVBoxLayout* tqlayout = new TQVBoxLayout(page);
+    TQVBoxLayout* layout = new TQVBoxLayout(page);
     m_advancedWidget = new advancedTabOptions(page);
-    tqlayout->addWidget(m_advancedWidget);
-    tqlayout->addSpacing( 20 );
-    tqlayout->addStretch();
+    layout->addWidget(m_advancedWidget);
+    layout->addSpacing( 20 );
+    layout->addStretch();
 
     connect(m_advancedWidget->m_pNewTabsInBackground, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
     connect(m_advancedWidget->m_pOpenAfterCurrentPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(changed()));
diff --git a/kcontrol/konqhtml/advancedTabOptions.ui b/kcontrol/konqhtml/advancedTabOptions.ui
index 886d602c5..7116bc1ee 100644
--- a/kcontrol/konqhtml/advancedTabOptions.ui
+++ b/kcontrol/konqhtml/advancedTabOptions.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>advancedTabOptions</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -43,7 +43,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout</cstring>
+                <cstring>layout</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
@@ -150,6 +150,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/konqhtml/domainlistview.cpp b/kcontrol/konqhtml/domainlistview.cpp
index 3eff2fd25..29dccb14b 100644
--- a/kcontrol/konqhtml/domainlistview.cpp
+++ b/kcontrol/konqhtml/domainlistview.cpp
@@ -36,10 +36,10 @@ DomainListView::DomainListView(KConfig *config,const TQString &title,
 		TQWidget *parent,const char *name) :
 	TQGroupBox(title, parent, name), config(config) {
   setColumnLayout(0, Qt::Vertical);
-  tqlayout()->setSpacing(0);
-  tqlayout()->setMargin(0);
-  TQGridLayout* thisLayout = new TQGridLayout(tqlayout());
-  thisLayout->tqsetAlignment(Qt::AlignTop);
+  layout()->setSpacing(0);
+  layout()->setMargin(0);
+  TQGridLayout* thisLayout = new TQGridLayout(layout());
+  thisLayout->setAlignment(Qt::AlignTop);
   thisLayout->setSpacing(KDialog::spacingHint());
   thisLayout->setMargin(KDialog::marginHint());
 
diff --git a/kcontrol/konqhtml/domainlistview.h b/kcontrol/konqhtml/domainlistview.h
index 7d0d30b82..a8238bbb4 100644
--- a/kcontrol/konqhtml/domainlistview.h
+++ b/kcontrol/konqhtml/domainlistview.h
@@ -85,21 +85,21 @@ public:
   /**
    * returns the add push-button.
    *
-   * Note: The add button already tqcontains a default "what's this" text.
+   * Note: The add button already contains a default "what's this" text.
    */
   TQPushButton *addButton() const { return addDomainPB; }
 
   /**
    * returns the change push-button.
    *
-   * Note: The change button already tqcontains a default "what's this" text.
+   * Note: The change button already contains a default "what's this" text.
    */
   TQPushButton *changeButton() const { return changeDomainPB; }
 
   /**
    * returns the delete push-button.
    *
-   * Note: The delete button already tqcontains a default "what's this" text.
+   * Note: The delete button already contains a default "what's this" text.
    */
   TQPushButton *deleteButton() const { return deleteDomainPB; }
 
diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp
index e1fcb28c7..79ab4d45a 100644
--- a/kcontrol/konqhtml/filteropts.cpp
+++ b/kcontrol/konqhtml/filteropts.cpp
@@ -323,5 +323,5 @@ TQString KCMFilter::quickHelp() const
 {
     return i18n("<h1>Konqueror AdBlocK</h1> Konqueror AdBlocK allows you to create a list of filters"
                 " that are checked against linked images and frames. URL's that match are either discarded or"
-                " tqreplaced with a placeholder image. ");
+                " replaced with a placeholder image. ");
 }
diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp
index e6a6c59bb..3cca58732 100644
--- a/kcontrol/konqhtml/htmlopts.cpp
+++ b/kcontrol/konqhtml/htmlopts.cpp
@@ -81,7 +81,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     // Tabbed Browsing
 
     TQGroupBox *bgTabbedBrowsing = new TQGroupBox( 0, Qt::Vertical, i18n("Tabbed Browsing"), this );
-    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->tqlayout(), KDialog::spacingHint() );
+    TQVBoxLayout *laygroup = new TQVBoxLayout(bgTabbedBrowsing->layout(), KDialog::spacingHint() );
 
     m_pShowMMBInTabs = new TQCheckBox( i18n( "Open &links in new tab instead of in new window" ), bgTabbedBrowsing );
     TQWhatsThis::add( m_pShowMMBInTabs, i18n("This will open a new tab instead of a new window in various situations, "
@@ -108,7 +108,7 @@ KMiscHTMLOptions::KMiscHTMLOptions(KConfig *config, TQString group, TQWidget *pa
     TQVGroupBox *bgMouse = new TQVGroupBox( i18n("Mouse Beha&vior"), this );
 
     m_cbCursor = new TQCheckBox(i18n("Chan&ge cursor over links"), bgMouse );
-    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the tqshape of the cursor will change "
+    TQWhatsThis::add( m_cbCursor, i18n("If this option is set, the shape of the cursor will change "
        "(usually to a hand) if it is moved over a hyperlink.") );
     connect(m_cbCursor, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged()));
 
diff --git a/kcontrol/konqhtml/htmlopts.h b/kcontrol/konqhtml/htmlopts.h
index 3f19d3b98..503eadfdd 100644
--- a/kcontrol/konqhtml/htmlopts.h
+++ b/kcontrol/konqhtml/htmlopts.h
@@ -15,7 +15,7 @@
 
 
 //-----------------------------------------------------------------------------
-// The "Misc Options" Tab for the HTML view tqcontains :
+// The "Misc Options" Tab for the HTML view contains :
 
 // Change cursor over links
 // Underline links
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index 54186a6bb..af168ed1f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -123,14 +123,14 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group,
     TQWhatsThis::add( enableJavaGloballyCB, i18n("Enables the execution of scripts written in Java "
           "that can be contained in HTML pages. "
           "Note that, as with any browser, enabling active contents can be a security problem.") );
-    TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+    TQString wtstr = i18n("This box contains the domains and hosts you have set "
                          "a specific Java policy for. This policy will be used "
                          "instead of the default policy for enabling or disabling Java applets on pages sent by these "
                          "domains or hosts. <p>Select a policy and use the controls on "
                          "the right to modify it.");
     TQWhatsThis::add( domainSpecific->listView(), wtstr );
 #if 0
-    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                           "the Java policies. These policies will be merged "
                                           "with the existing ones. Duplicate entries are ignored.") );
     TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the Java policy to a zipped "
@@ -163,7 +163,7 @@ KJavaOptions::KJavaOptions( KConfig* config, TQString group,
     TQWhatsThis::add( pathED, i18n("Enter the path to the java executable. If you want to use the jre in "
                                   "your path, simply leave it as 'java'. If you need to use a different jre, "
                                   "enter the path to the java executable (e.g. /usr/lib/jdk/bin/java), "
-                                  "or the path to the directory that tqcontains 'bin/java' (e.g. /opt/IBMJava2-13).") );
+                                  "or the path to the directory that contains 'bin/java' (e.g. /opt/IBMJava2-13).") );
 
     TQWhatsThis::add( addArgED, i18n("If you want special arguments to be passed to the virtual machine, enter them here.") );
 
diff --git a/kcontrol/konqhtml/javaopts.h b/kcontrol/konqhtml/javaopts.h
index fbced3897..de8f7c7eb 100644
--- a/kcontrol/konqhtml/javaopts.h
+++ b/kcontrol/konqhtml/javaopts.h
@@ -41,10 +41,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
diff --git a/kcontrol/konqhtml/jsopts.cpp b/kcontrol/konqhtml/jsopts.cpp
index cf0124395..ae73fc686 100644
--- a/kcontrol/konqhtml/jsopts.cpp
+++ b/kcontrol/konqhtml/jsopts.cpp
@@ -79,14 +79,14 @@ KJavaScriptOptions::KJavaScriptOptions( KConfig* config, TQString group, TQWidge
                                           "button allows you to easily share your policies with other people by allowing "
                                           "you to save and retrieve them from a zipped file.") );
 
-  TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+  TQString wtstr = i18n("This box contains the domains and hosts you have set "
                        "a specific JavaScript policy for. This policy will be used "
                        "instead of the default policy for enabling or disabling JavaScript on pages sent by these "
                        "domains or hosts. <p>Select a policy and use the controls on "
                        "the right to modify it.");
   TQWhatsThis::add( domainSpecific->listView(), wtstr );
 
-  TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+  TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                         "the JavaScript policies. These policies will be merged "
                                         "with the existing ones. Duplicate entries are ignored.") );
   TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the JavaScript policy to a zipped "
diff --git a/kcontrol/konqhtml/jspolicies.cpp b/kcontrol/konqhtml/jspolicies.cpp
index 0360f2bf8..5196af8dd 100644
--- a/kcontrol/konqhtml/jspolicies.cpp
+++ b/kcontrol/konqhtml/jspolicies.cpp
@@ -68,9 +68,9 @@ void JSPolicies::load() {
   window_focus = config->readUnsignedNumEntry(key,
   	is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY);
 
-  key = prefix + "WindowtqStatusPolicy";
+  key = prefix + "WindowStatusPolicy";
   window_status = config->readUnsignedNumEntry(key,
-  	is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY);
+  	is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY);
 }
 
 void JSPolicies::defaults() {
@@ -83,7 +83,7 @@ void JSPolicies::defaults() {
   window_resize = is_global ? KHTMLSettings::KJSWindowResizeAllow : INHERIT_POLICY;
   window_move = is_global ? KHTMLSettings::KJSWindowMoveAllow : INHERIT_POLICY;
   window_focus = is_global ? KHTMLSettings::KJSWindowFocusAllow : INHERIT_POLICY;
-  window_status = is_global ? KHTMLSettings::KJSWindowtqStatusAllow : INHERIT_POLICY;
+  window_status = is_global ? KHTMLSettings::KJSWindowStatusAllow : INHERIT_POLICY;
 }
 
 void JSPolicies::save() {
@@ -114,7 +114,7 @@ void JSPolicies::save() {
   else
     config->deleteEntry(key);
 
-  key = prefix + "WindowtqStatusPolicy";
+  key = prefix + "WindowStatusPolicy";
   if (window_status != INHERIT_POLICY)
     config->writeEntry(key, window_status);
   else
@@ -133,12 +133,12 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   bool is_per_domain = !policies->isGlobal();
 
   setColumnLayout(0, Qt::Vertical);
-  tqlayout()->setSpacing(0);
-  tqlayout()->setMargin(0);
-  TQGridLayout *this_tqlayout = new TQGridLayout(tqlayout(),5,10+is_per_domain*2);
-  this_tqlayout->tqsetAlignment(Qt::AlignTop);
-  this_tqlayout->setSpacing(3);
-  this_tqlayout->setMargin(11);
+  layout()->setSpacing(0);
+  layout()->setMargin(0);
+  TQGridLayout *this_layout = new TQGridLayout(layout(),5,10+is_per_domain*2);
+  this_layout->setAlignment(Qt::AlignTop);
+  this_layout->setSpacing(3);
+  this_layout->setMargin(11);
 
   TQString wtstr;	// what's this description
   int colIdx;		// column index
@@ -146,7 +146,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.open ================================
   colIdx = 0;
   TQLabel *label = new TQLabel(i18n("Open new windows:"),this);
-  this_tqlayout->addWidget(label,0,colIdx++);
+  this_layout->addWidget(label,0,colIdx++);
 
   js_popup = new TQButtonGroup(this);
   js_popup->setExclusive(true);
@@ -157,35 +157,35 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_popup->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,0,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,0,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Accept all popup window requests."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAllow);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ask"), this);
   TQWhatsThis::add(policy_btn,i18n("Prompt every time a popup window is requested."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenAsk);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Deny"), this);
   TQWhatsThis::add(policy_btn,i18n("Reject all popup window requests."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenDeny);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Smart"), this);
   TQWhatsThis::add(policy_btn, i18n("Accept popup window requests only when "
                                    "links are activated through an explicit "
                                    "mouse click or keyboard operation."));
   js_popup->insert(policy_btn,KHTMLSettings::KJSWindowOpenSmart);
-  this_tqlayout->addWidget(policy_btn,0,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,0,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("If you disable this, Konqueror will stop "
                "interpreting the <i>window.open()</i> "
@@ -202,7 +202,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.resizeBy/resizeTo ================================
   colIdx = 0;
   label = new TQLabel(i18n("Resize window:"),this);
-  this_tqlayout->addWidget(label,1,colIdx++);
+  this_layout->addWidget(label,1,colIdx++);
 
   js_resize = new TQButtonGroup(this);
   js_resize->setExclusive(true);
@@ -212,23 +212,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_resize->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,1,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,1,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window size."));
   js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeAllow);
-  this_tqlayout->addWidget(policy_btn,1,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,1,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the window size. "
   				"The web page will <i>think</i> it changed the "
 				"size but the actual window is not affected."));
   js_resize->insert(policy_btn,KHTMLSettings::KJSWindowResizeIgnore);
-  this_tqlayout->addWidget(policy_btn,1,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,1,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the window size on their own by using "
   		"<i>window.resizeBy()</i> or <i>window.resizeTo()</i>. "
@@ -240,7 +240,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.moveBy/moveTo ================================
   colIdx = 0;
   label = new TQLabel(i18n("Move window:"),this);
-  this_tqlayout->addWidget(label,2,colIdx++);
+  this_layout->addWidget(label,2,colIdx++);
 
   js_move = new TQButtonGroup(this);
   js_move->setExclusive(true);
@@ -250,23 +250,23 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_move->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,2,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,2,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the window position."));
   js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveAllow);
-  this_tqlayout->addWidget(policy_btn,2,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,2,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add(policy_btn,i18n("Ignore attempts of scripts to change the window position. "
   				"The web page will <i>think</i> it moved the "
 				"window but the actual position is not affected."));
   js_move->insert(policy_btn,KHTMLSettings::KJSWindowMoveIgnore);
-  this_tqlayout->addWidget(policy_btn,2,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,2,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the window position on their own by using "
   		"<i>window.moveBy()</i> or <i>window.moveTo()</i>. "
@@ -278,7 +278,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.focus ================================
   colIdx = 0;
   label = new TQLabel(i18n("Focus window:"),this);
-  this_tqlayout->addWidget(label,3,colIdx++);
+  this_layout->addWidget(label,3,colIdx++);
 
   js_focus = new TQButtonGroup(this);
   js_focus->setExclusive(true);
@@ -288,15 +288,15 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_focus->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,3,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,3,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add( policy_btn,i18n("Allow scripts to focus the window.") );
   js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusAllow);
-  this_tqlayout->addWidget(policy_btn,3,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,3,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to focus the window. "
@@ -304,8 +304,8 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
 				"the focus to the window but the actual "
 				"focus will remain unchanged.") );
   js_focus->insert(policy_btn,KHTMLSettings::KJSWindowFocusIgnore);
-  this_tqlayout->addWidget(policy_btn,3,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  this_layout->addWidget(policy_btn,3,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites set the focus to their browser window on their "
   		"own by using <i>window.focus()</i>. This usually leads to "
@@ -319,7 +319,7 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
   // === window.status ================================
   colIdx = 0;
   label = new TQLabel(i18n("Modify status bar text:"),this);
-  this_tqlayout->addWidget(label,4,colIdx++);
+  this_layout->addWidget(label,4,colIdx++);
 
   js_statusbar = new TQButtonGroup(this);
   js_statusbar->setExclusive(true);
@@ -329,32 +329,32 @@ JSPoliciesFrame::JSPoliciesFrame(JSPolicies *policies, const TQString &title,
     policy_btn = new TQRadioButton(i18n("Use global"), this);
     TQWhatsThis::add(policy_btn,i18n("Use setting from global policy."));
     js_statusbar->insert(policy_btn,INHERIT_POLICY);
-    this_tqlayout->addWidget(policy_btn,4,colIdx++);
-    this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+    this_layout->addWidget(policy_btn,4,colIdx++);
+    this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
   }/*end if*/
 
   policy_btn = new TQRadioButton(i18n("Allow"), this);
   TQWhatsThis::add(policy_btn,i18n("Allow scripts to change the text of the status bar."));
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusAllow);
-  this_tqlayout->addWidget(policy_btn,4,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusAllow);
+  this_layout->addWidget(policy_btn,4,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   policy_btn = new TQRadioButton(i18n("Ignore"), this);
   TQWhatsThis::add( policy_btn,i18n("Ignore attempts of scripts to change the status bar text. "
   				"The web page will <i>think</i> it changed "
 				"the text but the actual text will remain "
 				"unchanged.") );
-  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowtqStatusIgnore);
-  this_tqlayout->addWidget(policy_btn,4,colIdx++);
-  this_tqlayout->addItem(new TQSpacerItem(10,0),0,colIdx++);
+  js_statusbar->insert(policy_btn,KHTMLSettings::KJSWindowStatusIgnore);
+  this_layout->addWidget(policy_btn,4,colIdx++);
+  this_layout->addItem(new TQSpacerItem(10,0),0,colIdx++);
 
   wtstr = i18n("Some websites change the status bar text by setting "
-  		"<i>window.status</i> or <i>window.defaulttqStatus</i>, "
+  		"<i>window.status</i> or <i>window.defaultStatus</i>, "
 		"thus sometimes preventing displaying the real URLs of hyperlinks. "
 		"This option specifies the treatment of such "
 		"attempts.");
   TQWhatsThis::add(label, wtstr);
-  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowtqStatusPolicy(int)));
+  connect(js_statusbar, TQT_SIGNAL(clicked(int)), TQT_SLOT(setWindowStatusPolicy(int)));
 }
 
 JSPoliciesFrame::~JSPoliciesFrame() {
@@ -399,7 +399,7 @@ void JSPoliciesFrame::setWindowFocusPolicy(int id) {
   emit changed();
 }
 
-void JSPoliciesFrame::setWindowtqStatusPolicy(int id) {
+void JSPoliciesFrame::setWindowStatusPolicy(int id) {
   policies->window_status = id;
   emit changed();
 }
diff --git a/kcontrol/konqhtml/jspolicies.h b/kcontrol/konqhtml/jspolicies.h
index b2d08c11d..45352fbb9 100644
--- a/kcontrol/konqhtml/jspolicies.h
+++ b/kcontrol/konqhtml/jspolicies.h
@@ -50,16 +50,16 @@ public:
    * Enumeration for all policies
    */
   enum Policies { JavaScriptEnabled = 0, WindowOpen, WindowResize,
-  		WindowMove, WindowFocus, WindowtqStatus, NumPolicies };
+  		WindowMove, WindowFocus, WindowStatus, NumPolicies };
 #endif
 
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
@@ -141,19 +141,19 @@ public:
   }
 
   /**
-   * Returns whether the WindowtqStatus policy is inherited.
+   * Returns whether the WindowStatus policy is inherited.
    */
-  bool isWindowtqStatusPolicyInherited() const {
+  bool isWindowStatusPolicyInherited() const {
     return window_status == INHERIT_POLICY;
   }
   /**
-   * Returns the current value of the WindowtqStatus policy.
+   * Returns the current value of the WindowStatus policy.
    *
-   * This will return an illegal value if isWindowtqStatusPolicyInherited is
+   * This will return an illegal value if isWindowStatusPolicyInherited is
    * true.
    */
-  KHTMLSettings::KJSWindowtqStatusPolicy windowtqStatusPolicy() const {
-    return (KHTMLSettings::KJSWindowtqStatusPolicy)window_status;
+  KHTMLSettings::KJSWindowStatusPolicy windowStatusPolicy() const {
+    return (KHTMLSettings::KJSWindowStatusPolicy)window_status;
   }
 
   /**
@@ -178,7 +178,7 @@ private:
   unsigned int window_move;
   // one of KHTMLSettings::KJSWindowFocusPolicy or INHERIT_POLICY
   unsigned int window_focus;
-  // one of KHTMLSettings::KJSWindowtqStatusPolicy or INHERIT_POLICY
+  // one of KHTMLSettings::KJSWindowStatusPolicy or INHERIT_POLICY
   unsigned int window_status;
 
   friend class JSPoliciesFrame;	// for changing policies
@@ -187,7 +187,7 @@ private:
 /**
  * @short Provides a framed widget with controls for the JavaScript policy settings.
  *
- * This widget tqcontains controls for changing all JavaScript policies
+ * This widget contains controls for changing all JavaScript policies
  * except the JavaScript enabled policy itself. The rationale behind this is
  * that the enabled policy be separate from the rest in a prominent
  * place.
@@ -253,7 +253,7 @@ private slots:
   void setWindowResizePolicy(int id);
   void setWindowMovePolicy(int id);
   void setWindowFocusPolicy(int id);
-  void setWindowtqStatusPolicy(int id);
+  void setWindowStatusPolicy(int id);
 
 private:
 
diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp
index de08bf995..28654869e 100644
--- a/kcontrol/konqhtml/main.cpp
+++ b/kcontrol/konqhtml/main.cpp
@@ -97,9 +97,9 @@ KJSParts::KJSParts(KConfig *config, TQWidget *parent, const char *name)
 
   setAboutData( about );
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
   tab = new TQTabWidget(this);
-  tqlayout->addWidget(tab);
+  layout->addWidget(tab);
 
   // ### the groupname is duplicated in KJSParts::save
   java = new KJavaOptions( config, "Java/JavaScript Settings", this, name );
diff --git a/kcontrol/konqhtml/nsconfigwidget.ui b/kcontrol/konqhtml/nsconfigwidget.ui
index 3bbbe9f8e..d772595c2 100644
--- a/kcontrol/konqhtml/nsconfigwidget.ui
+++ b/kcontrol/konqhtml/nsconfigwidget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>NSConfigWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -16,7 +16,7 @@
     <property name="caption">
         <string>Netscape Plugin Config</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -72,7 +72,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -96,7 +96,7 @@
                         <property name="name">
                             <cstring>GroupBox1</cstring>
                         </property>
-                        <property name="tqminimumSize">
+                        <property name="minimumSize">
                             <size>
                                 <width>300</width>
                                 <height>0</height>
@@ -184,7 +184,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -261,8 +261,8 @@
     <include location="global" impldecl="in declaration">klistbox.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>qwidget.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp
index ee434b710..d5cd4cc2b 100644
--- a/kcontrol/konqhtml/pluginopts.cpp
+++ b/kcontrol/konqhtml/pluginopts.cpp
@@ -72,14 +72,14 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
 
     TQFrame *hrule = new TQFrame(globalGB);
     hrule->setFrameStyle(TQFrame::HLine | TQFrame::Sunken);
-    hrule->tqsetSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
+    hrule->setSizePolicy(TQSizePolicy::MinimumExpanding,TQSizePolicy::Fixed);
 
     /**************************************************************************
      ********************* Domain-specific Settings ***************************
      *************************************************************************/
     TQPushButton *domainSpecPB = new TQPushButton(i18n("Domain-Specific Settin&gs"),
     						globalGB);
-    domainSpecPB->tqsetSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
+    domainSpecPB->setSizePolicy(TQSizePolicy::Fixed,TQSizePolicy::Fixed);
     connect(domainSpecPB,TQT_SIGNAL(clicked()),TQT_SLOT(slotShowDomainDlg()));
 
     domainSpecificDlg = new KDialogBase(KDialogBase::Swallow,
@@ -99,13 +99,13 @@ KPluginOptions::KPluginOptions( KConfig* config, TQString group, TQWidget *paren
           "that can be contained in HTML pages, e.g. Macromedia Flash. "
           "Note that, as with any browser, enabling active contents can be a security problem.") );
 
-    TQString wtstr = i18n("This box tqcontains the domains and hosts you have set "
+    TQString wtstr = i18n("This box contains the domains and hosts you have set "
                          "a specific plugin policy for. This policy will be used "
                          "instead of the default policy for enabling or disabling plugins on pages sent by these "
                          "domains or hosts. <p>Select a policy and use the controls on "
                          "the right to modify it.");
     TQWhatsThis::add( domainSpecific->listView(), wtstr );
-    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that tqcontains "
+    TQWhatsThis::add( domainSpecific->importButton(), i18n("Click this button to choose the file that contains "
                                           "the plugin policies. These policies will be merged "
                                           "with the existing ones. Duplicate entries are ignored.") );
     TQWhatsThis::add( domainSpecific->exportButton(), i18n("Click this button to save the plugin policy to a zipped "
diff --git a/kcontrol/konqhtml/pluginopts.h b/kcontrol/konqhtml/pluginopts.h
index c51ad5ffe..8b61f8f16 100644
--- a/kcontrol/konqhtml/pluginopts.h
+++ b/kcontrol/konqhtml/pluginopts.h
@@ -37,10 +37,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if this instance tqcontains policies specific for a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if this instance contains policies specific for a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    */
diff --git a/kcontrol/konqhtml/policies.h b/kcontrol/konqhtml/policies.h
index 4943ac373..a9814396a 100644
--- a/kcontrol/konqhtml/policies.h
+++ b/kcontrol/konqhtml/policies.h
@@ -42,10 +42,10 @@ public:
   /**
    * constructor
    * @param config configuration to initialize this instance from
-   * @param group config group to use if this instance tqcontains the global
+   * @param group config group to use if this instance contains the global
    *	policies (global == true)
-   * @param global true if this instance tqcontains the global policy settings,
-   *	false if it tqcontains policies specific to a domain.
+   * @param global true if this instance contains the global policy settings,
+   *	false if it contains policies specific to a domain.
    * @param domain name of the domain this instance is used to configure the
    *	policies for (case insensitive, ignored if global == true)
    * @param prefix prefix to use for configuration keys. The domain-specific
diff --git a/kcontrol/konqhtml/policydlg.h b/kcontrol/konqhtml/policydlg.h
index bc10b3b5c..e4a176fb3 100644
--- a/kcontrol/konqhtml/policydlg.h
+++ b/kcontrol/konqhtml/policydlg.h
@@ -99,7 +99,7 @@ public:
     void refresh();
 
     /**
-     * Adds another panel which tqcontains controls for more policies.
+     * Adds another panel which contains controls for more policies.
      *
      * The widget is inserted between the "feature enabled" combo box and
      * the dialog buttons at the bottom.
diff --git a/kcontrol/konsole/kcmkonsoledialog.ui b/kcontrol/konsole/kcmkonsoledialog.ui
index 36c294b4a..bb805ed4b 100644
--- a/kcontrol/konsole/kcmkonsoledialog.ui
+++ b/kcontrol/konsole/kcmkonsoledialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KCMKonsoleDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -12,9 +12,9 @@
             <height>490</height>
         </rect>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -30,9 +30,9 @@
             <property name="margin">
                 <number>0</number>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <widget class="QWidget">
                 <property name="name">
@@ -55,7 +55,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -184,7 +184,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -282,7 +282,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -377,8 +377,8 @@
     <include location="global" impldecl="in declaration">knuminput.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/kcontrol/konsole/schemadialog.ui b/kcontrol/konsole/schemadialog.ui
index 62a4380e4..64fda6a49 100644
--- a/kcontrol/konsole/schemadialog.ui
+++ b/kcontrol/konsole/schemadialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SchemaDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,9 +15,9 @@
     <property name="caption">
         <string>Konsole Schema Editor</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <grid>
         <property name="name">
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -158,7 +158,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -357,7 +357,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -498,13 +498,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>180</width>
                             <height>120</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>180</width>
                             <height>120</height>
@@ -540,7 +540,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -626,6 +626,6 @@
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/konsole/sessiondialog.ui b/kcontrol/konsole/sessiondialog.ui
index fa3f89327..a86a74077 100644
--- a/kcontrol/konsole/sessiondialog.ui
+++ b/kcontrol/konsole/sessiondialog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SessionDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,9 +15,9 @@
     <property name="caption">
         <string>Konsole Session Editor</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
-    <property name="tqlayoutSpacing" stdset="0">
+    <property name="layoutSpacing" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -28,7 +28,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -184,13 +184,13 @@
                             <property name="name">
                                 <cstring>previewIcon</cstring>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>100</width>
                                     <height>100</height>
                                 </size>
                             </property>
-                            <property name="tqmaximumSize">
+                            <property name="maximumSize">
                                 <size>
                                     <width>100</width>
                                     <height>100</height>
@@ -212,7 +212,7 @@
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="tqminimumSize">
+                            <property name="minimumSize">
                                 <size>
                                     <width>90</width>
                                     <height>100</height>
@@ -221,7 +221,7 @@
                             <property name="text">
                                 <string>&amp;Icon:</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignTop|AlignLeft</set>
                             </property>
                             <property name="buddy" stdset="0">
@@ -280,7 +280,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -312,7 +312,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout6</cstring>
+                                <cstring>layout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -320,7 +320,7 @@
                                 </property>
                                 <widget class="QLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout5</cstring>
+                                        <cstring>layout5</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -371,7 +371,7 @@
                                 </widget>
                                 <widget class="QLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout4</cstring>
+                                        <cstring>layout4</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -435,8 +435,8 @@
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
     <includehint>kurlrequester.h</includehint>
diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp
index 6cd4cc2d0..ccb906301 100644
--- a/kcontrol/krdb/krdb.cpp
+++ b/kcontrol/krdb/krdb.cpp
@@ -80,7 +80,7 @@ static void applyGtkStyles(bool active, int version)
    TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
    if (list.count() == 0)
    {
-      list.append(TQString::tqfromLatin1(sysGtkrc(version)));
+      list.append(TQString::fromLatin1(sysGtkrc(version)));
       list.append(TQDir::homeDirPath()+userGtkrc(version));
    }
    list.remove(gtkkde);
@@ -174,9 +174,9 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
     // end it with.. So keep a TQMap to bool, specifying whether the path is KDE-specified..
 
   TQString qversion = qVersion();
-  if ( qversion.tqcontains( '.' ) > 1 )
+  if ( qversion.contains( '.' ) > 1 )
      qversion.truncate( qversion.findRev( '.' ) );
-  if ( qversion.tqcontains( '-' ) )
+  if ( qversion.contains( '-' ) )
      qversion.truncate( qversion.findRev( '-' ) );
 
   TQStringList kdeAdded =
@@ -220,8 +220,8 @@ static void applyQtSettings( KConfig& kglobals, TQSettings& settings )
 
     pathDb[path]=true;
 
-    if(path.tqcontains("/lib64/"))
-        path.tqreplace("/lib64/","/lib/");
+    if(path.contains("/lib64/"))
+        path.replace("/lib64/","/lib/");
     pathDb[path]=true;
   }
 
@@ -347,7 +347,7 @@ static void createGtkrc( bool exportColors, const TQColorGroup& cg, int version
             "# Appearance & Themes -> Colors in the Control Center and disable the checkbox\n"
             "# \"Apply colors to non-KDE applications\"\n"
             "#\n"
-            "#\n").arg(TQDateTime::tqcurrentDateTime().toString());
+            "#\n").arg(TQDateTime::currentDateTime().toString());
 
     t << "style \"default\"" << endl;
     t << "{" << endl;
@@ -590,7 +590,7 @@ void runRdb( uint flags )
     // Qt-only apps without adversely affecting ourselves.
 
     // Cheat and use the current timestamp, since we just saved to qtrc.
-    TQDateTime settingsstamp = TQDateTime::tqcurrentDateTime();
+    TQDateTime settingsstamp = TQDateTime::currentDateTime();
 
     static Atom qt_settings_timestamp = 0;
     if (!qt_settings_timestamp) {
diff --git a/kcontrol/kthememanager/knewthemedlg.h b/kcontrol/kthememanager/knewthemedlg.h
index 8ea226d8b..5a0df045a 100644
--- a/kcontrol/kthememanager/knewthemedlg.h
+++ b/kcontrol/kthememanager/knewthemedlg.h
@@ -26,7 +26,7 @@
 class NewThemeWidget;
 
 /**
- * Dialog for creating new themes, tqcontains just
+ * Dialog for creating new themes, contains just
  * getters and setters used for the theme general properties
  * @author Lukas Tinkl <lukas@kde.org>
  */
diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp
index f2d0395ed..b78a354be 100644
--- a/kcontrol/kthememanager/ktheme.cpp
+++ b/kcontrol/kthememanager/ktheme.cpp
@@ -469,14 +469,14 @@ void KTheme::apply()
                 iconConf->setGroup( "ToolbarIcons" );
 
             TQString iconName = iconSubElem.tagName();
-            if ( iconName.tqcontains( "Color" ) )
+            if ( iconName.contains( "Color" ) )
             {
                 TQColor iconColor = TQColor( iconSubElem.attribute( "rgb" ) );
                 iconConf->writeEntry( iconName, iconColor, true, true );
             }
-            else if ( iconName.tqcontains( "Value" ) || iconName == "Size" )
+            else if ( iconName.contains( "Value" ) || iconName == "Size" )
                 iconConf->writeEntry( iconName, iconSubElem.attribute( "value" ).toUInt(), true, true );
-            else if ( iconName.tqcontains( "Effect" ) )
+            else if ( iconName.contains( "Effect" ) )
                 iconConf->writeEntry( iconName, iconSubElem.attribute( "name" ), true, true );
             else
                 iconConf->writeEntry( iconName, static_cast<bool>( iconSubElem.attribute( "value" ).toUInt() ), true, true );
@@ -738,18 +738,18 @@ void KTheme::createIconElems( const TQString & group, const TQString & object,
               << "DisabledColor" << "DisabledColor2" << "DisabledEffect"
               << "DisabledSemiTransparent" << "DisabledValue";
     for ( TQStringList::ConstIterator it = elemNames.begin(); it != elemNames.end(); ++it ) {
-        if ( (*it).tqcontains( "Color" ) )
+        if ( (*it).contains( "Color" ) )
             createColorElem( *it, object, parent, cfg );
         else
         {
             TQDomElement tmpCol = m_dom.createElement( *it );
             tmpCol.setAttribute( "object", object );
 
-            if ( (*it).tqcontains( "Value" ) || *it == "Size" )
+            if ( (*it).contains( "Value" ) || *it == "Size" )
                 tmpCol.setAttribute( "value", cfg->readNumEntry( *it, 1 ) );
-            else if ( (*it).tqcontains( "DisabledEffect" ) )
+            else if ( (*it).contains( "DisabledEffect" ) )
                 tmpCol.setAttribute( "name", cfg->readEntry( *it, "togray" ) );
-	    else if ( (*it).tqcontains( "Effect" ) )
+	    else if ( (*it).contains( "Effect" ) )
                 tmpCol.setAttribute( "name", cfg->readEntry( *it, "none" ) );
             else
                 tmpCol.setAttribute( "value", cfg->readBoolEntry( *it, false ) );
@@ -832,7 +832,7 @@ TQString KTheme::processFilePath( const TQString & section, const TQString & pat
 TQString KTheme::unprocessFilePath( const TQString & section, TQString path )
 {
     if ( path.startsWith( "theme:/" ) )
-        return path.tqreplace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
+        return path.replace( TQRegExp( "^theme:/" ), m_kgd->findResourceDir( "themes", m_name + "/" + m_name + ".xml") + m_name + "/" );
 
     if ( TQFile::exists( path ) )
         return path;
diff --git a/kcontrol/kthememanager/kthemedlg.ui b/kcontrol/kthememanager/kthemedlg.ui
index 361ca5129..4b46fdc26 100644
--- a/kcontrol/kthememanager/kthemedlg.ui
+++ b/kcontrol/kthememanager/kthemedlg.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>KThemeDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -30,7 +30,7 @@
         </property>
         <widget class="QLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -60,7 +60,7 @@
                     <property name="sizeType">
                         <enum>MinimumExpanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>170</width>
                             <height>20</height>
@@ -88,7 +88,7 @@
         </widget>
         <widget class="QLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -109,7 +109,7 @@
                     <property name="frameShape">
                         <enum>Box</enum>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -193,7 +193,7 @@
         </widget>
         <widget class="QLayoutWidget" row="4" column="0">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -211,13 +211,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -251,13 +251,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -291,13 +291,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -331,13 +331,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -371,13 +371,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -411,13 +411,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>60</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>60</height>
@@ -511,7 +511,7 @@
     <slot specifier="non virtual">startFonts()</slot>
     <slot specifier="non virtual">startSaver()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurllabel.h</includehint>
 </includehints>
diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp
index e64642109..2668bd87c 100644
--- a/kcontrol/kthememanager/kthememanager.cpp
+++ b/kcontrol/kthememanager/kthememanager.cpp
@@ -298,7 +298,7 @@ void kthememanager::slotCreateTheme()
             m_theme->setAuthor( dlg.getAuthor() );
             m_theme->setEmail( dlg.getEmail() );
             m_theme->setHomepage( dlg.getHomepage() );
-            m_theme->setComment( dlg.getComment().tqreplace( "\n", "" ) );
+            m_theme->setComment( dlg.getComment().replace( "\n", "" ) );
             m_theme->setVersion( dlg.getVersion() );
 
             TQString result = m_theme->createYourself( true );
diff --git a/kcontrol/kthememanager/newthemewidget.ui b/kcontrol/kthememanager/newthemewidget.ui
index ae9ef90d0..905b0749a 100644
--- a/kcontrol/kthememanager/newthemewidget.ui
+++ b/kcontrol/kthememanager/newthemewidget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>NewThemeWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -88,7 +88,7 @@
             <property name="text">
                 <string>Co&amp;mment:</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignTop</set>
             </property>
             <property name="buddy" stdset="0">
@@ -126,5 +126,5 @@
     <tabstop>leVersion</tabstop>
     <tabstop>teComment</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp
index f73303bc0..ba6193107 100644
--- a/kcontrol/launch/kcmlaunch.cpp
+++ b/kcontrol/launch/kcmlaunch.cpp
@@ -57,10 +57,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "given in the section 'Startup indication timeout'"));
 
     GroupBox1->setColumnLayout(0, Qt::Vertical );
-    GroupBox1->tqlayout()->setSpacing( 0 );
-    GroupBox1->tqlayout()->setMargin( 0 );
+    GroupBox1->layout()->setSpacing( 0 );
+    GroupBox1->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox1 );
-    TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->tqlayout(), 3, 2 );
+    TQGridLayout* GroupBox1Layout = new TQGridLayout( GroupBox1->layout(), 3, 2 );
     GroupBox1Layout->setSpacing( 6 );
     GroupBox1Layout->setMargin( 11 );
     GroupBox1Layout->setColStretch( 1, 1 );
@@ -97,10 +97,10 @@ LaunchConfig::LaunchConfig(TQWidget * parent, const char * name, const TQStringL
      "given in the section 'Startup indication timeout'"));
 
     GroupBox2->setColumnLayout( 0, Qt::Vertical );
-    GroupBox2->tqlayout()->setSpacing( 0 );
-    GroupBox2->tqlayout()->setMargin( 0 );
+    GroupBox2->layout()->setSpacing( 0 );
+    GroupBox2->layout()->setMargin( 0 );
     Form1Layout->addWidget( GroupBox2 );
-    TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->tqlayout(), 2, 2 );
+    TQGridLayout* GroupBox2Layout = new TQGridLayout( GroupBox2->layout(), 2, 2 );
     GroupBox2Layout->setSpacing( 6 );
     GroupBox2Layout->setMargin( 11 );
     GroupBox2Layout->setColStretch( 1, 1 );
diff --git a/kcontrol/locale/kcmlocale.cpp b/kcontrol/locale/kcmlocale.cpp
index 9b4ff303c..baa127e2f 100644
--- a/kcontrol/locale/kcmlocale.cpp
+++ b/kcontrol/locale/kcmlocale.cpp
@@ -59,7 +59,7 @@ KLocaleConfig::KLocaleConfig(KLocale *locale,
            this, TQT_SLOT(changedCountry(const TQString &)) );
 
   m_labLang = new TQLabel(this, I18N_NOOP("Languages:"));
-  m_labLang->tqsetAlignment( AlignTop );
+  m_labLang->setAlignment( AlignTop );
 
   m_languages = new TQListBox(this);
   connect(m_languages, TQT_SIGNAL(selectionChanged()),
@@ -270,7 +270,7 @@ void KLocaleConfig::loadLanguageList()
         it != first.end();
         ++it )
   {
-    TQString str = locate("locale", TQString::tqfromLatin1("%1/entry.desktop")
+    TQString str = locate("locale", TQString::fromLatin1("%1/entry.desktop")
                          .arg(*it));
     if (!str.isNull())
       prilang << str;
@@ -278,7 +278,7 @@ void KLocaleConfig::loadLanguageList()
 
   // add all languages to the list
   TQStringList alllang = KGlobal::dirs()->findAllResources("locale",
-                               TQString::tqfromLatin1("*/entry.desktop"), 
+                               TQString::fromLatin1("*/entry.desktop"), 
                                false, true);
   TQStringList langlist = prilang;
   if (langlist.count() > 0)
@@ -293,7 +293,7 @@ void KLocaleConfig::loadLanguageList()
     if ((*it).isNull())
     {
       m_addLanguage->insertSeparator();
-      submenu = TQString::tqfromLatin1("other");
+      submenu = TQString::fromLatin1("other");
       m_addLanguage->insertSubmenu(m_locale->translate("Other"),
                                    submenu, TQString::null, -1);
       menu_index = -2; // first entries should _not_ be sorted
@@ -322,13 +322,13 @@ void KLocaleConfig::loadCountryList()
   KLocale *lsave = KGlobal::_locale;
   KGlobal::_locale = m_locale;
 
-  TQString sub = TQString::tqfromLatin1("l10n/");
+  TQString sub = TQString::fromLatin1("l10n/");
 
   // clear the list
   m_comboCountry->clear();
 
   TQStringList regionlist = KGlobal::dirs()->findAllResources("locale",
-                                 sub + TQString::tqfromLatin1("*.desktop"), 
+                                 sub + TQString::fromLatin1("*.desktop"), 
                                  false, true );
 
   for ( TQStringList::ConstIterator it = regionlist.begin();
@@ -352,7 +352,7 @@ void KLocaleConfig::loadCountryList()
                                    m_locale->translate("without name"));
 
     TQString map( locate( "locale",
-                          TQString::tqfromLatin1( "l10n/%1.png" )
+                          TQString::fromLatin1( "l10n/%1.png" )
                           .arg(tag) ) );
     TQIconSet icon;
     if ( !map.isNull() )
@@ -362,7 +362,7 @@ void KLocaleConfig::loadCountryList()
 
   // add all languages to the list
   TQStringList countrylist = KGlobal::dirs()->findAllResources
-    ("locale", sub + TQString::tqfromLatin1("*/entry.desktop"), false, true);
+    ("locale", sub + TQString::fromLatin1("*/entry.desktop"), false, true);
 
   for ( TQStringList::ConstIterator it = countrylist.begin();
         it != countrylist.end(); ++it )
@@ -381,7 +381,7 @@ void KLocaleConfig::loadCountryList()
     int menu_index = submenu.isEmpty() ? -1 : -2;
 
     TQString flag( locate( "locale",
-                          TQString::tqfromLatin1( "l10n/%1/flag.png" )
+                          TQString::fromLatin1( "l10n/%1/flag.png" )
                           .arg(tag) ) );
     TQIconSet icon( KGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
     m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
@@ -399,7 +399,7 @@ void KLocaleConfig::readLocale(const TQString &path, TQString &name,
   KGlobal::_locale = m_locale;
 
   // read the name
-  TQString filepath = TQString::tqfromLatin1("%1%2/entry.desktop")
+  TQString filepath = TQString::fromLatin1("%1%2/entry.desktop")
     .arg(sub)
     .arg(path);
 
@@ -419,7 +419,7 @@ void KLocaleConfig::save()
 
   config->writeEntry("Country", m_locale->country(), true, true);
   if ( m_locale->languageList().isEmpty() )
-    config->writeEntry("Language", TQString::tqfromLatin1(""), true, true);
+    config->writeEntry("Language", TQString::fromLatin1(""), true, true);
   else
     config->writeEntry("Language",
                        m_locale->languageList(), ':', true, true);
@@ -502,7 +502,7 @@ void KLocaleConfig::slotTranslate()
 TQStringList KLocaleConfig::languageList() const
 {
   TQString fileName = locate("locale",
-                            TQString::tqfromLatin1("l10n/%1/entry.desktop")
+                            TQString::fromLatin1("l10n/%1/entry.desktop")
                             .arg(m_locale->country()));
 
   KSimpleConfig entry(fileName);
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp
index b7dbe5088..bf4cc8b32 100644
--- a/kcontrol/locale/klocalesample.cpp
+++ b/kcontrol/locale/klocalesample.cpp
@@ -88,7 +88,7 @@ KLocaleSample::~KLocaleSample()
 
 void KLocaleSample::slotUpdateTime()
 {
-  TQDateTime dt = TQDateTime::tqcurrentDateTime();
+  TQDateTime dt = TQDateTime::currentDateTime();
 
   m_dateSample->setText(m_locale->formatDate(dt.date(), false));
   m_dateShortSample->setText(m_locale->formatDate(dt.date(), true));
@@ -98,11 +98,11 @@ void KLocaleSample::slotUpdateTime()
 void KLocaleSample::slotLocaleChanged()
 {
   m_numberSample->setText(m_locale->formatNumber(1234567.89) +
-                          TQString::tqfromLatin1(" / ") +
+                          TQString::fromLatin1(" / ") +
                           m_locale->formatNumber(-1234567.89));
 
   m_moneySample->setText(m_locale->formatMoney(123456789.00) +
-                         TQString::tqfromLatin1(" / ") +
+                         TQString::fromLatin1(" / ") +
                          m_locale->formatMoney(-123456789.00));
 
   slotUpdateTime();
diff --git a/kcontrol/locale/localemon.cpp b/kcontrol/locale/localemon.cpp
index b4c516ecf..9fa1ad708 100644
--- a/kcontrol/locale/localemon.cpp
+++ b/kcontrol/locale/localemon.cpp
@@ -131,7 +131,7 @@ void KLocaleConfigMoney::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-                           TQString::tqfromLatin1("l10n/%1/entry.desktop")
+                           TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
@@ -139,24 +139,24 @@ void KLocaleConfigMoney::save()
   int i;
   bool b;
 
-  str = ent.readEntry("CurrencySymbol", TQString::tqfromLatin1("$"));
+  str = ent.readEntry("CurrencySymbol", TQString::fromLatin1("$"));
   config->deleteEntry("CurrencySymbol", false, true);
   if (str != m_locale->currencySymbol())
     config->writeEntry("CurrencySymbol",
                        m_locale->currencySymbol(), true, true);
 
-  str = ent.readEntry("MonetaryDecimalSymbol", TQString::tqfromLatin1("."));
+  str = ent.readEntry("MonetaryDecimalSymbol", TQString::fromLatin1("."));
   config->deleteEntry("MonetaryDecimalSymbol", false, true);
   if (str != m_locale->monetaryDecimalSymbol())
     config->writeEntry("MonetaryDecimalSymbol",
                        m_locale->monetaryDecimalSymbol(), true, true);
 
-  str = ent.readEntry("MonetaryThousandsSeparator", TQString::tqfromLatin1(","));
-  str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null);
+  str = ent.readEntry("MonetaryThousandsSeparator", TQString::fromLatin1(","));
+  str.replace(TQString::fromLatin1("$0"), TQString::null);
   config->deleteEntry("MonetaryThousandsSeparator", false, true);
   if (str != m_locale->monetaryThousandsSeparator())
     config->writeEntry("MonetaryThousandsSeparator",
-                       TQString::tqfromLatin1("$0%1$0")
+                       TQString::fromLatin1("$0%1$0")
                        .arg(m_locale->monetaryThousandsSeparator()),
                        true, true);
 
diff --git a/kcontrol/locale/localenum.cpp b/kcontrol/locale/localenum.cpp
index 79ae74c67..537cc99ab 100644
--- a/kcontrol/locale/localenum.cpp
+++ b/kcontrol/locale/localenum.cpp
@@ -89,26 +89,26 @@ void KLocaleConfigNumber::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-			   TQString::tqfromLatin1("l10n/%1/entry.desktop")
+			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
   TQString str;
 
   str = ent.readEntry("DecimalSymbol",
-		      TQString::tqfromLatin1("."));
+		      TQString::fromLatin1("."));
   config->deleteEntry("DecimalSymbol", false, true);
   if (str != m_locale->decimalSymbol())
     config->writeEntry("DecimalSymbol",
 		       m_locale->decimalSymbol(), true, true);
 
   str = ent.readEntry("ThousandsSeparator",
-		      TQString::tqfromLatin1(","));
+		      TQString::fromLatin1(","));
   config->deleteEntry("ThousandsSeparator", false, true);
-  str.tqreplace(TQString::tqfromLatin1("$0"), TQString::null);
+  str.replace(TQString::fromLatin1("$0"), TQString::null);
   if (str != m_locale->thousandsSeparator())
     config->writeEntry("ThousandsSeparator",
-		       TQString::tqfromLatin1("$0%1$0")
+		       TQString::fromLatin1("$0%1$0")
 		       .arg(m_locale->thousandsSeparator()), true, true);
 
   str = ent.readEntry("PositiveSign");
@@ -116,7 +116,7 @@ void KLocaleConfigNumber::save()
   if (str != m_locale->positiveSign())
     config->writeEntry("PositiveSign", m_locale->positiveSign(), true, true);
 
-  str = ent.readEntry("NegativeSign", TQString::tqfromLatin1("-"));
+  str = ent.readEntry("NegativeSign", TQString::fromLatin1("-"));
   config->deleteEntry("NegativeSign", false, true);
   if (str != m_locale->negativeSign())
     config->writeEntry("NegativeSign", m_locale->negativeSign(), true, true);
diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp
index 33b039c6e..1cf6b949b 100644
--- a/kcontrol/locale/localeother.cpp
+++ b/kcontrol/locale/localeother.cpp
@@ -80,7 +80,7 @@ void KLocaleConfigOther::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-                           TQString::tqfromLatin1("l10n/%1/entry.desktop")
+                           TQString::fromLatin1("l10n/%1/entry.desktop")
                            .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
diff --git a/kcontrol/locale/localetime.cpp b/kcontrol/locale/localetime.cpp
index 17b78a79c..2519ea794 100644
--- a/kcontrol/locale/localetime.cpp
+++ b/kcontrol/locale/localetime.cpp
@@ -253,28 +253,28 @@ void KLocaleConfigTime::save()
   KConfigGroupSaver saver(config, "Locale");
 
   KSimpleConfig ent(locate("locale",
-			   TQString::tqfromLatin1("l10n/%1/entry.desktop")
+			   TQString::fromLatin1("l10n/%1/entry.desktop")
 			   .arg(m_locale->country())), true);
   ent.setGroup("KCM Locale");
 
   TQString str;
 
-  str = ent.readEntry("CalendarSystem", TQString::tqfromLatin1("gregorian"));
+  str = ent.readEntry("CalendarSystem", TQString::fromLatin1("gregorian"));
   config->deleteEntry("CalendarSystem", false, true);
   if (str != m_locale->calendarType())
     config->writeEntry("CalendarSystem", m_locale->calendarType(), true, true);
 
-  str = ent.readEntry("TimeFormat", TQString::tqfromLatin1("%H:%M:%S"));
+  str = ent.readEntry("TimeFormat", TQString::fromLatin1("%H:%M:%S"));
   config->deleteEntry("TimeFormat", false, true);
   if (str != m_locale->timeFormat())
     config->writeEntry("TimeFormat", m_locale->timeFormat(), true, true);
 
-  str = ent.readEntry("DateFormat", TQString::tqfromLatin1("%A %d %B %Y"));
+  str = ent.readEntry("DateFormat", TQString::fromLatin1("%A %d %B %Y"));
   config->deleteEntry("DateFormat", false, true);
   if (str != m_locale->dateFormat())
     config->writeEntry("DateFormat", m_locale->dateFormat(), true, true);
 
-  str = ent.readEntry("DateFormatShort", TQString::tqfromLatin1("%Y-%m-%d"));
+  str = ent.readEntry("DateFormatShort", TQString::fromLatin1("%Y-%m-%d"));
   config->deleteEntry("DateFormatShort", false, true);
   if (str != m_locale->dateFormatShort())
     config->writeEntry("DateFormatShort",
@@ -345,7 +345,7 @@ void KLocaleConfigTime::slotLocaleChanged()
   TQString calendarType = m_locale->calendarType();
   int calendarSystem = 0;
 
-  CalendarVector::iterator it = tqFind(calendars.begin(), calendars.end(),
+  CalendarVector::iterator it = qFind(calendars.begin(), calendars.end(),
 calendarType);
   if ( it != calendars.end() )
     calendarSystem = it - calendars.begin();
@@ -371,7 +371,7 @@ calendarType);
   kdDebug(173) << storeToUser(timeMap(),
 			   m_locale->timeFormat()) << endl;
   kdDebug(173) << userToStore(timeMap(),
-			   TQString::tqfromLatin1("HH:MM:SS AMPM test")) << endl;
+			   TQString::fromLatin1("HH:MM:SS AMPM test")) << endl;
 
 }
 
@@ -416,7 +416,7 @@ void KLocaleConfigTime::slotTranslate()
 {
   TQString str;
 
-  TQString sep = TQString::tqfromLatin1("\n");
+  TQString sep = TQString::fromLatin1("\n");
 
   TQString old;
 
@@ -462,7 +462,7 @@ void KLocaleConfigTime::slotTranslate()
 
   str = m_locale->translate
     ("<p>The text in this textbox will be used to format "
-     "time strings. The sequences below will be tqreplaced:</p>"
+     "time strings. The sequences below will be replaced:</p>"
      "<table>"
      "<tr><td><b>HH</b></td><td>The hour as a decimal number using a 24-hour "
      "clock (00-23).</td></tr>"
@@ -506,14 +506,14 @@ void KLocaleConfigTime::slotTranslate()
 
   str = m_locale->translate
     ( "<p>The text in this textbox will be used to format long "
-      "dates. The sequences below will be tqreplaced:</p>") + datecodes;
+      "dates. The sequences below will be replaced:</p>") + datecodes;
   TQWhatsThis::add( m_labDateFmt, str );
   TQWhatsThis::add( m_comboDateFmt,  str );
 
   str = m_locale->translate
     ( "<p>The text in this textbox will be used to format short "
       "dates. For instance, this is used when listing files. "
-      "The sequences below will be tqreplaced:</p>") + datecodes;
+      "The sequences below will be replaced:</p>") + datecodes;
   TQWhatsThis::add( m_labDateFmtShort, str );
   TQWhatsThis::add( m_comboDateFmtShort,  str );
 
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 523fa50ea..de47ce661 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -62,7 +62,7 @@ KLocaleApplication::KLocaleApplication(TQWidget *parent, const char* /*name*/,
   m_nullConfig = new KConfig(TQString::null, false, false);
   m_globalConfig = new KConfig(TQString::null, false, true);
 
-  m_locale = new KLocale(TQString::tqfromLatin1("kcmlocale"), m_nullConfig);
+  m_locale = new KLocale(TQString::fromLatin1("kcmlocale"), m_nullConfig);
   TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   l->setAutoAdd(TRUE);
 
@@ -162,7 +162,7 @@ void KLocaleApplication::load( bool useDefaults )
 {
 	m_globalConfig->setReadDefaults( useDefaults );
 	m_globalConfig->reparseConfiguration();
-	*m_locale = KLocale(TQString::tqfromLatin1("kcmlocale"), m_globalConfig);
+	*m_locale = KLocale(TQString::fromLatin1("kcmlocale"), m_globalConfig);
 	
 	emit localeChanged();
 	emit languageChanged();
@@ -180,7 +180,7 @@ void KLocaleApplication::save()
                             "language of all programs, you will have to "
                             "logout first."),
                            m_locale->translate("Applying Language Settings"),
-                           TQString::tqfromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
+                           TQString::fromLatin1("LanguageChangesApplyOnlyToNewlyStartedPrograms"));
   // restore the old global locale
   KGlobal::_locale = lsave;
 
diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp
index 0e97bbf5e..5bc340f7b 100644
--- a/kcontrol/nics/nic.cpp
+++ b/kcontrol/nics/nic.cpp
@@ -74,7 +74,7 @@ struct MyNIC
 {
    TQString name;
    TQString addr;
-   TQString nettqmask;
+   TQString netmask;
    TQString state;
    TQString type;
    TQString HWaddr;
@@ -123,7 +123,7 @@ void KCMNic::update()
    NICList *nics=findNICs();
    nics->setAutoDelete(true);
    for (MyNIC* tmp=nics->first(); tmp!=0; tmp=nics->next())
-      new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->nettqmask, tmp->type, tmp->state, tmp->HWaddr);
+      new TQListViewItem(m_list,tmp->name, tmp->addr, tmp->netmask, tmp->type, tmp->state, tmp->HWaddr);
    delete nics;
 }
 
@@ -211,10 +211,10 @@ NICList* findNICs()
          if (result==0)
          {
             sinptr = (struct sockaddr_in *) &ifcopy.ifr_addr;
-            tmp->nettqmask=inet_ntoa(sinptr->sin_addr);
+            tmp->netmask=inet_ntoa(sinptr->sin_addr);
          }
          else
-            tmp->nettqmask=i18n("Unknown");
+            tmp->netmask=i18n("Unknown");
 
          ifcopy=*ifr;
          result=-1;  // if none of the two #ifs below matches, ensure that result!=0 so that "Unknown" is returned as result
@@ -265,10 +265,10 @@ NICList* findNICs()
       getnameinfo(ifa->ifa_addr, ifa->ifa_addr->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
       tmp->addr = buf;
 
-      if (ifa->ifa_nettqmask != NULL) {
+      if (ifa->ifa_netmask != NULL) {
 	bzero(buf, 128);
-	getnameinfo(ifa->ifa_nettqmask, ifa->ifa_nettqmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
-	tmp->nettqmask = buf;
+	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
+	tmp->netmask = buf;
       }
 
       tmp->state= (ifa->ifa_flags & IFF_UP) ? upMessage : downMessage;
@@ -298,21 +298,21 @@ TQString flags_tos (unsigned int flags)
 
   if (flags & IFF_BROADCAST) {
     if (tmp.length()) {
-      tmp += TQString::tqfromLatin1(", ");
+      tmp += TQString::fromLatin1(", ");
     }
     tmp += i18n("Broadcast");
   }
   
   if (flags & IFF_MULTICAST) {
     if (tmp.length()) {
-      tmp += TQString::tqfromLatin1(", ");
+      tmp += TQString::fromLatin1(", ");
     }
     tmp += i18n("Multicast");
   }
   
   if (flags & IFF_LOOPBACK) {
     if (tmp.length()) {
-      tmp += TQString::tqfromLatin1(", ");
+      tmp += TQString::fromLatin1(", ");
     }
     tmp += i18n("Loopback");
   }
diff --git a/kcontrol/performance/kcmperformance.cpp b/kcontrol/performance/kcmperformance.cpp
index afa6e4847..b85dca5d8 100644
--- a/kcontrol/performance/kcmperformance.cpp
+++ b/kcontrol/performance/kcmperformance.cpp
@@ -51,11 +51,11 @@ Config::Config( TQWidget* parent_P, const char* )
     TQVBoxLayout *topLayout = new TQVBoxLayout( this );
     TQTabWidget* tabs = new TQTabWidget( this );
     konqueror_widget = new Konqueror( tabs );
-    konqueror_widget->tqlayout()->setMargin( KDialog::marginHint() );
+    konqueror_widget->layout()->setMargin( KDialog::marginHint() );
     connect( konqueror_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
     tabs->addTab( konqueror_widget, i18n( "Konqueror" ));
     system_widget = new SystemWidget( tabs );
-    system_widget->tqlayout()->setMargin( KDialog::marginHint() );
+    system_widget->layout()->setMargin( KDialog::marginHint() );
     connect( system_widget, TQT_SIGNAL( changed()), TQT_SLOT( changed()));
     tabs->addTab( system_widget, i18n( "System" ));
     topLayout->add( tabs );
diff --git a/kcontrol/performance/konqueror_ui.ui b/kcontrol/performance/konqueror_ui.ui
index ca92c6ad9..3ace0b5db 100644
--- a/kcontrol/performance/konqueror_ui.ui
+++ b/kcontrol/performance/konqueror_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Konqueror_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -69,7 +69,7 @@
                 </property>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -101,7 +101,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -138,7 +138,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>160</height>
@@ -150,6 +150,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/performance/system_ui.ui b/kcontrol/performance/system_ui.ui
index f6e7e6a15..a8d0e7956 100644
--- a/kcontrol/performance/system_ui.ui
+++ b/kcontrol/performance/system_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>System_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -64,6 +64,6 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/privacy/kcmprivacydialog.ui b/kcontrol/privacy/kcmprivacydialog.ui
index 01cb00c21..df79e2ec1 100644
--- a/kcontrol/privacy/kcmprivacydialog.ui
+++ b/kcontrol/privacy/kcmprivacydialog.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>KCMPrivacyDialog</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -79,13 +79,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="tqminimumSize">
+                <property name="minimumSize">
                     <size>
                         <width>0</width>
                         <height>50</height>
                     </size>
                 </property>
-                <property name="tqmaximumSize">
+                <property name="maximumSize">
                     <size>
                         <width>32767</width>
                         <height>200</height>
@@ -104,7 +104,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -114,13 +114,13 @@
                     <property name="name">
                         <cstring>selectAllButton</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -134,13 +134,13 @@
                     <property name="name">
                         <cstring>selectNoneButton</cstring>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>80</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -160,7 +160,7 @@
                     <property name="sizeType">
                         <enum>Maximum</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
@@ -179,7 +179,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>32767</width>
                             <height>32767</height>
@@ -197,5 +197,5 @@
     <include location="global" impldecl="in implementation">klistview.h</include>
     <include location="global" impldecl="in implementation">ktextedit.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/privacy/kprivacysettings.ui b/kcontrol/privacy/kprivacysettings.ui
index 686d0c2fe..93afe5dff 100644
--- a/kcontrol/privacy/kprivacysettings.ui
+++ b/kcontrol/privacy/kprivacysettings.ui
@@ -9,7 +9,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
     <property name="name">
         <cstring>KPrivacySettings</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -246,7 +246,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -272,7 +272,7 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="1">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -303,6 +303,6 @@ Derived from AT&amp;T's Privacy Bird settings panel screenshot originally.
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/randr/configdialog.cpp b/kcontrol/randr/configdialog.cpp
index f48d621cf..e97cf4836 100644
--- a/kcontrol/randr/configdialog.cpp
+++ b/kcontrol/randr/configdialog.cpp
@@ -60,7 +60,7 @@ void ConfigDialog::show()
 {
     if ( !isVisible() ) {
 	KWinModule module(0, KWinModule::INFO_DESKTOP);
-	TQSize s1 = tqsizeHint();
+	TQSize s1 = sizeHint();
 	TQSize s2 = module.workArea().size();
 	int w = s1.width();
 	int h = s1.height();
diff --git a/kcontrol/randr/configdialog.h b/kcontrol/randr/configdialog.h
index 615d9a2f5..584237975 100644
--- a/kcontrol/randr/configdialog.h
+++ b/kcontrol/randr/configdialog.h
@@ -62,11 +62,11 @@ public:
     ListView( ConfigDialog* configWidget, TQWidget *parent, const char *name )
 	: KListView( parent, name ), _configWidget( configWidget ),
           _regExpEditor(0L) {}
-    // TQListView has a weird idea of a tqsizeHint...
-    virtual TQSize tqsizeHint () const {
-	int w = tqminimumSizeHint().width();
+    // TQListView has a weird idea of a sizeHint...
+    virtual TQSize sizeHint () const {
+	int w = minimumSizeHint().width();
 	int h = header()->height();
-	h += viewport()->tqsizeHint().height();
+	h += viewport()->sizeHint().height();
 	h += horizontalScrollBar()->height();
 	
 	TQListViewItem *item = firstChild();
diff --git a/kcontrol/randr/krandrmodule.cpp b/kcontrol/randr/krandrmodule.cpp
index 4c918c583..087585d3f 100644
--- a/kcontrol/randr/krandrmodule.cpp
+++ b/kcontrol/randr/krandrmodule.cpp
@@ -131,7 +131,7 @@ KRandRModule::KRandRModule(TQWidget *parent, const char *name, const TQStringLis
 	connect(m_applyOnStartup, TQT_SIGNAL(clicked()), TQT_SLOT(setChanged()));
 
 	TQHBox* syncBox = new TQHBox(this);
-	syncBox->tqlayout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
+	syncBox->layout()->addItem(new TQSpacerItem(20, 1, TQSizePolicy::Maximum));
 	m_syncTrayApp = new TQCheckBox(i18n("Allow tray application to change startup settings"), syncBox);
 	topLayout->addWidget(syncBox);
 	TQWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary."));
diff --git a/kcontrol/randr/krandrpassivepopup.cpp b/kcontrol/randr/krandrpassivepopup.cpp
index 98c6c0a18..5cf6fa6b2 100644
--- a/kcontrol/randr/krandrpassivepopup.cpp
+++ b/kcontrol/randr/krandrpassivepopup.cpp
@@ -94,14 +94,14 @@ void KRandrPassivePopup::startWatchingWidget( TQWidget* widget_P )
 bool KRandrPassivePopup::eventFilter( TQObject* o, TQEvent* e )
     {
     if( e->type() == TQEvent::Move && o->isWidgetType()
-	&& watched_widgets.tqcontains( static_cast< TQWidget* >( o )))
+	&& watched_widgets.contains( static_cast< TQWidget* >( o )))
         TQTimer::singleShot( 0, this, TQT_SLOT( slotPositionSelf()));
     return false;
     }
 
 bool KRandrPassivePopup::x11Event( XEvent* e )
     {
-    if( e->type == ConfigureNotify && watched_windows.tqcontains( e->xconfigure.window ))
+    if( e->type == ConfigureNotify && watched_windows.contains( e->xconfigure.window ))
 	{
 	if( !update_timer.isActive())
 	    update_timer.start( 10, true );
diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index e712b71d6..e35fba9d2 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -54,7 +54,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
 {
 	setPixmap(KSystemTray::loadSizedIcon("randr", width()));
-	tqsetAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
+	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 	connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(_quit()));
 	TQToolTip::add(this, i18n("Screen resize & rotate"));
 	my_parent = parent;
@@ -509,7 +509,7 @@ void KRandRSystemTray::slotCycleDisplays()
 	int current_on_index = -1;
 	int max_index = -1;
 	int prev_on_index;
-	tqStatus s;
+	Status s;
 
 	randr_screen_info = read_screen_info(randr_display);
 
@@ -782,7 +782,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 	char *output_name;
 	RROutput output_id;
 	int i;
-	tqStatus s;
+	Status s;
 	int num_outputs_on;
 
 	num_outputs_on = 0;
diff --git a/kcontrol/randr/ktimerdialog.cpp b/kcontrol/randr/ktimerdialog.cpp
index 3af8fdf1c..071088e9b 100644
--- a/kcontrol/randr/ktimerdialog.cpp
+++ b/kcontrol/randr/ktimerdialog.cpp
@@ -20,7 +20,7 @@
  */
 
 #include <qhbox.h>
-#include <qtqlayout.h>
+#include <qlayout.h>
 #include <qvbox.h>
 #include <qtimer.h>
 #include <qprogressbar.h>
@@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, QWidget *parent,
     if ( buttonMask & Cancel )
         buttonOnTimeout = Cancel;
 
-    connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) );
-    connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) );
+    connect( totalTimer, SIGNAL( timeout() ), SLOT( slotInternalTimeout() ) );
+    connect( updateTimer, SIGNAL( timeout() ), SLOT( slotUpdateTime() ) );
 
     // create the widgets
     mainWidget = new QVBox( this, "mainWidget" );
@@ -95,7 +95,7 @@ void KTimerDialog::setMainWidget( QWidget *widget )
     // yuck, here goes.
     QVBox *newWidget = new QVBox( this );
 
-    if ( widget->tqparentWidget() != mainWidget ) {
+    if ( widget->parentWidget() != mainWidget ) {
         widget->reparent( newWidget, 0, QPoint(0,0) );
     } else {
         newWidget->insertChild( widget );
diff --git a/kcontrol/randr/ktimerdialog.h b/kcontrol/randr/ktimerdialog.h
index c4037e389..23b4a92b0 100644
--- a/kcontrol/randr/ktimerdialog.h
+++ b/kcontrol/randr/ktimerdialog.h
@@ -144,7 +144,7 @@ class KTimerDialog : public KDialogBase
 
   private:
     /**
-     * Prepares the tqlayout that manages the widgets of the dialog
+     * Prepares the layout that manages the widgets of the dialog
      */
     void setupLayout();
 
diff --git a/kcontrol/samba/AUTHORS b/kcontrol/samba/AUTHORS
index 71854fa7a..0bebeaa06 100644
--- a/kcontrol/samba/AUTHORS
+++ b/kcontrol/samba/AUTHORS
@@ -1,4 +1,4 @@
-Samba tqStatus Module:
+Samba Status Module:
 
   Michael Glauche <glauche@isa.rwth-aachen.de>
 
diff --git a/kcontrol/samba/kcmsambaimports.cpp b/kcontrol/samba/kcmsambaimports.cpp
index 8540fc4b2..fd31f7800 100644
--- a/kcontrol/samba/kcmsambaimports.cpp
+++ b/kcontrol/samba/kcmsambaimports.cpp
@@ -74,13 +74,13 @@ void ImportsView::updateList()
       if (e!=0)
       {
          s=buf;
-         if ((s.tqcontains(" nfs ")) || (s.tqcontains(" smbfs ")))
+         if ((s.contains(" nfs ")) || (s.contains(" smbfs ")))
          {
             strSource=s.left(s.find(" on /"));
             strMount=s.mid(s.find(" on /")+4,s.length());
-            if ((s.tqcontains(" nfs ")) || (s.tqcontains("/remote on ")))
+            if ((s.contains(" nfs ")) || (s.contains("/remote on ")))
                strType="NFS";
-            else if (s.tqcontains(" smbfs "))
+            else if (s.contains(" smbfs "))
                strType="SMB";
             int pos(strMount.find(" type "));
             if (pos==-1) pos=strMount.find(" read/");
diff --git a/kcontrol/samba/kcmsambalog.cpp b/kcontrol/samba/kcmsambalog.cpp
index 935944ea5..224bc6fa2 100644
--- a/kcontrol/samba/kcmsambalog.cpp
+++ b/kcontrol/samba/kcmsambalog.cpp
@@ -62,7 +62,7 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
    mainLayout->addWidget(&updateButton,0,Qt::AlignLeft);
 
    TQWhatsThis::add( &logFileName, i18n("This page presents the contents of"
-     " your samba log file in a friendly tqlayout. Check that the correct log"
+     " your samba log file in a friendly layout. Check that the correct log"
      " file for your computer is listed here. If you need to, correct the name"
      " or location of the log file, and then click the \"Update\" button.") );
 
@@ -116,14 +116,14 @@ LogView::LogView(TQWidget *parent,KConfig *config, const char *name)
    connect(&updateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(updateList()));
    emit contentsChanged(&viewHistory,0,0);
 
-   label.setMinimumSize(label.tqsizeHint());
-   logFileName.setMinimumSize(250,logFileName.tqsizeHint().height());
+   label.setMinimumSize(label.sizeHint());
+   logFileName.setMinimumSize(250,logFileName.sizeHint().height());
    viewHistory.setMinimumSize(425,200);
-   showConnOpen.setMinimumSize(showConnOpen.tqsizeHint());
-   showConnClose.setMinimumSize(showConnClose.tqsizeHint());
-   showFileOpen.setMinimumSize(showFileOpen.tqsizeHint());
-   showFileClose.setMinimumSize(showFileClose.tqsizeHint());
-   updateButton.setFixedSize(updateButton.tqsizeHint());
+   showConnOpen.setMinimumSize(showConnOpen.sizeHint());
+   showConnClose.setMinimumSize(showConnClose.sizeHint());
+   showFileOpen.setMinimumSize(showFileOpen.sizeHint());
+   showFileClose.setMinimumSize(showFileClose.sizeHint());
+   updateButton.setFixedSize(updateButton.sizeHint());
 }
 
 void LogView::loadSettings()
diff --git a/kcontrol/samba/kcmsambastatistics.cpp b/kcontrol/samba/kcmsambastatistics.cpp
index 6fd788b2e..f75fd72e5 100644
--- a/kcontrol/samba/kcmsambastatistics.cpp
+++ b/kcontrol/samba/kcmsambastatistics.cpp
@@ -80,18 +80,18 @@ StatisticsView::StatisticsView(TQWidget *parent,KConfig *config, const char *nam
    hostLe->setText("*");
    
    viewStatistics->setMinimumSize(375,200);
-   connectionsL->setMinimumSize(connectionsL->tqsizeHint());
-   filesL->setMinimumSize(filesL->tqsizeHint());
-   eventL->setMinimumSize(eventL->tqsizeHint());
-   eventCb->setMinimumSize(eventCb->tqsizeHint());
-   hostL->setMinimumSize(hostL->tqsizeHint());
-   hostLe->setMinimumSize(120,hostLe->tqsizeHint().height());
-   serviceL->setMinimumSize(serviceL->tqsizeHint());
-   serviceLe->setMinimumSize(120,serviceLe->tqsizeHint().height());
-   calcButton->setMinimumSize(calcButton->tqsizeHint());
-   clearButton->setMinimumSize(clearButton->tqsizeHint());
-   expandedInfoCb->setMinimumSize(expandedInfoCb->tqsizeHint());
-   expandedUserCb->setMinimumSize(expandedUserCb->tqsizeHint());
+   connectionsL->setMinimumSize(connectionsL->sizeHint());
+   filesL->setMinimumSize(filesL->sizeHint());
+   eventL->setMinimumSize(eventL->sizeHint());
+   eventCb->setMinimumSize(eventCb->sizeHint());
+   hostL->setMinimumSize(hostL->sizeHint());
+   hostLe->setMinimumSize(120,hostLe->sizeHint().height());
+   serviceL->setMinimumSize(serviceL->sizeHint());
+   serviceLe->setMinimumSize(120,serviceLe->sizeHint().height());
+   calcButton->setMinimumSize(calcButton->sizeHint());
+   clearButton->setMinimumSize(clearButton->sizeHint());
+   expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint());
+   expandedUserCb->setMinimumSize(expandedUserCb->sizeHint());
    
    TQVBoxLayout *topLayout=new TQVBoxLayout(this, KDialog::marginHint(),
       KDialog::spacingHint());
@@ -150,8 +150,8 @@ void StatisticsView::calculate()
       {
          if (connCount)
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
             {
                if (expandedInfoCb->isChecked()) item2=item->text(2);
                else item2=serviceLe->text();
@@ -163,8 +163,8 @@ void StatisticsView::calculate()
          }
          else
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
             {
                if (expandedInfoCb->isChecked()) item2=item->text(2);
                else item2=serviceLe->text();
@@ -201,14 +201,14 @@ void StatisticsView::calculate()
       {
          if (connCount)
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("CONNECTION OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("CONNECTION OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          }
          else
          {
-            if ((TQString(item->text(1)).tqcontains(i18n("FILE OPENED")))
-                && (TQString(item->text(2)).tqcontains(rService)) && (TQString(item->text(3)).tqcontains(rHost)))
+            if ((TQString(item->text(1)).contains(i18n("FILE OPENED")))
+                && (TQString(item->text(2)).contains(rService)) && (TQString(item->text(3)).contains(rHost)))
                count++;
          };
          item=item->nextSibling();
diff --git a/kcontrol/samba/ksmbstatus.cpp b/kcontrol/samba/ksmbstatus.cpp
index 89263c2c6..c94bc5129 100644
--- a/kcontrol/samba/ksmbstatus.cpp
+++ b/kcontrol/samba/ksmbstatus.cpp
@@ -32,7 +32,7 @@
 
 
 #define Before(ttf,in) in.left(in.find(ttf))
-#define After(ttf,in)  (in.tqcontains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
+#define After(ttf,in)  (in.contains(ttf)?TQString(in.mid(in.find(ttf)+TQString(ttf).length())):TQString(""))
 
 NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
    : TQWidget(parent, name)
@@ -77,7 +77,7 @@ NetMon::NetMon( TQWidget * parent, KConfig *config, const char * name )
 void NetMon::processNFSLine(char *bufline, int)
 {
    TQCString line(bufline);
-   if (line.tqcontains(":/"))
+   if (line.contains(":/"))
       new TQListViewItem(list,"NFS",After(":",line),Before(":/",line));
 }
 
@@ -87,14 +87,14 @@ void NetMon::processSambaLine(char *bufline, int)
    rownumber++;
    if (rownumber == 2)
       version->setText(bufline); // second line = samba version
-   if ((readingpart==header) && line.tqcontains("Service"))
+   if ((readingpart==header) && line.contains("Service"))
    {
       iUser=line.find("uid");
       iGroup=line.find("gid");
       iPid=line.find("pid");
       iMachine=line.find("machine");
    }
-   else if ((readingpart==header) && (line.tqcontains("---")))
+   else if ((readingpart==header) && (line.contains("---")))
    {
       readingpart=connexions;
    }
diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp
index 52669c2f8..88d95680a 100644
--- a/kcontrol/samba/main.cpp
+++ b/kcontrol/samba/main.cpp
@@ -58,8 +58,8 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
 ,logView(&tabs,&config)
 ,statisticsView(&tabs,&config)
 {
-   TQVBoxLayout *tqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
-   tqlayout->addWidget(&tabs);
+   TQVBoxLayout *layout = new TQVBoxLayout( this, 0, KDialog::spacingHint() );
+   layout->addWidget(&tabs);
    tabs.addTab(&status,i18n("&Exports"));
    tabs.addTab(&imports,i18n("&Imports"));
    tabs.addTab(&logView,i18n("&Log"));
@@ -68,7 +68,7 @@ SambaContainer::SambaContainer(TQWidget *parent, const char* name, const TQStrin
    setButtons(Help);
    load();
 
-   setQuickHelp( i18n("The Samba and NFS tqStatus Monitor is a front end to the programs"
+   setQuickHelp( i18n("The Samba and NFS Status Monitor is a front end to the programs"
      " <em>smbstatus</em> and <em>showmount</em>. Smbstatus reports on current"
      " Samba connections, and is part of the suite of Samba tools, which"
      " implements the SMB (Session Message Block) protocol, also called the"
diff --git a/kcontrol/samba/smbstatus.desktop b/kcontrol/samba/smbstatus.desktop
index 02ab8aebf..14b8425ed 100644
--- a/kcontrol/samba/smbstatus.desktop
+++ b/kcontrol/samba/smbstatus.desktop
@@ -9,20 +9,20 @@ X-KDE-Library=samba
 X-KDE-FactoryName=samba
 X-KDE-ParentApp=kinfocenter
 
-Name=Samba tqStatus
+Name=Samba Status
 Name[ar]=حالة Samba
 Name[az]=Samba'nın Vəziyyəti
 Name[be]=Стан Samba
 Name[bg]=Сървър Samba
 Name[bn]=সাম্বা স্ট্যাটাস
 Name[br]=Saviad Samba
-Name[bs]=tqStatus Sambe
+Name[bs]=Status Sambe
 Name[ca]=Estat de Samba
 Name[cs]=Stav Samby
 Name[csb]=Sztaus Samba
 Name[cy]=Cyflwr Samba
 Name[da]=Samba-status
-Name[de]=Samba-tqStatus
+Name[de]=Samba-Status
 Name[el]=Κατάσταση samba
 Name[eo]=Sambo-stato
 Name[es]=Estado de Samba
@@ -38,7 +38,7 @@ Name[he]=מצב Samba
 Name[hi]=साम्बा स्थिति
 Name[hr]=Stanje Sambe
 Name[hu]=Samba
-Name[id]=tqStatus Samba
+Name[id]=Status Samba
 Name[is]=Staða Samba
 Name[it]=Stato di Samba
 Name[ja]=Samba の状態
@@ -48,13 +48,13 @@ Name[km]=ស្ថានភាព Samba
 Name[ko]=삼바 상태
 Name[lo]=ສະຖານະຂອງ Samba
 Name[lt]=Samba būsena
-Name[lv]=Samba tqStatuss
+Name[lv]=Samba Statuss
 Name[mk]=Статус на Samba
 Name[mn]=Samba-Төлөв
-Name[ms]=tqStatus Samba
+Name[ms]=Status Samba
 Name[mt]=Stat tas-Samba
 Name[nb]=Samba-status
-Name[nds]=Samba-tqStatus
+Name[nds]=Samba-Status
 Name[ne]=साम्बा वस्तुस्थिति
 Name[nl]=Samba-status
 Name[nn]=Samba-status
@@ -68,9 +68,9 @@ Name[ru]=Сервер Samba
 Name[rw]=Imimerere Samba
 Name[se]=Samba stáhtus
 Name[sk]=Stav systému Samba
-Name[sl]=tqStatus Sambe
+Name[sl]=Status Sambe
 Name[sr]=Статус Самбе
-Name[sr@Latn]=tqStatus Sambe
+Name[sr@Latn]=Status Sambe
 Name[ss]=Simo se Samba 
 Name[sv]=Samba-status
 Name[ta]=சம்பா நிலை
@@ -102,7 +102,7 @@ Comment[cs]=Monitor stavu Samby
 Comment[csb]=Mònitor stónu Sambë
 Comment[cy]=Monitr cyflwr samba
 Comment[da]=Overvågning af samba-status
-Comment[de]=Samba-tqStatusmonitor
+Comment[de]=Samba-Statusmonitor
 Comment[el]=Εποπτεία της Samba
 Comment[eo]=Rigardilo por la stato de Sambo
 Comment[es]=Monitor de estado de Samba
@@ -133,7 +133,7 @@ Comment[mn]=Samba-Төлөв харуулагч
 Comment[ms]=Monitor status Samba
 Comment[mt]=Monitur tal-istat tas-Samba
 Comment[nb]=Overvåking av Samba-status
-Comment[nds]=tqStatuskieker för Samba
+Comment[nds]=Statuskieker för Samba
 Comment[ne]=साम्बा वस्तुस्थिति मोनिटर
 Comment[nl]=Sambastatusmonitor
 Comment[nn]=Overvaking av Samba-status
diff --git a/kcontrol/screensaver/advanceddialogimpl.ui b/kcontrol/screensaver/advanceddialogimpl.ui
index fda54f257..814a3867c 100644
--- a/kcontrol/screensaver/advanceddialogimpl.ui
+++ b/kcontrol/screensaver/advanceddialogimpl.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -69,7 +69,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -99,7 +99,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout8</cstring>
+                        <cstring>layout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -107,7 +107,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout1</cstring>
+                                <cstring>layout1</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -153,7 +153,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -162,7 +162,7 @@
                         </spacer>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout3</cstring>
+                                <cstring>layout3</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -202,7 +202,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -210,7 +210,7 @@
                         </property>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -256,7 +256,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -265,7 +265,7 @@
                         </spacer>
                         <widget class="QLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout2</cstring>
+                                <cstring>layout2</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -305,7 +305,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -321,7 +321,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -346,7 +346,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -365,7 +365,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -382,7 +382,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -393,5 +393,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/screensaver/category_list b/kcontrol/screensaver/category_list
index c0b1d5687..61115c0dc 100644
--- a/kcontrol/screensaver/category_list
+++ b/kcontrol/screensaver/category_list
@@ -1,4 +1,4 @@
-// This list tqcontains all screen saver categories.
+// This list contains all screen saver categories.
 // The categories are extracted for translation (see Makefile.am).
 
 // To show a screen saver in the list under a category, add the
diff --git a/kcontrol/screensaver/kswidget.cpp b/kcontrol/screensaver/kswidget.cpp
index 0f799c4a2..d13d131dc 100644
--- a/kcontrol/screensaver/kswidget.cpp
+++ b/kcontrol/screensaver/kswidget.cpp
@@ -54,7 +54,7 @@ KSWidget::KSWidget( TQWidget* parent, const char* name, int f )
             }
         }
     }
-    Window w = XCreateWindow( x11Display(), tqparentWidget() ? tqparentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
+    Window w = XCreateWindow( x11Display(), parentWidget() ? parentWidget()->winId() : RootWindow( x11Display(), x11Screen()),
         x(), y(), width(), height(), 0, x11Depth(), InputOutput, visual, flags, &attrs );
     create( w );
 #endif
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
index 5dd0ca5c3..f80cc19e9 100644
--- a/kcontrol/screensaver/scrnsave.cpp
+++ b/kcontrol/screensaver/scrnsave.cpp
@@ -50,7 +50,7 @@
 
 template class TQPtrList<SaverConfig>;
 
-const uint widgetEventMask =                 // X event tqmask
+const uint widgetEventMask =                 // X event mask
 (uint)(
        ExposureMask |
        PropertyChangeMask |
@@ -133,12 +133,12 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSaverGroup->setColumnLayout( 0, Qt::Horizontal );
     vLayout->addWidget(mSaverGroup);
     vLayout->setStretchFactor( mSaverGroup, 10 );
-    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->tqlayout(),
+    TQBoxLayout *groupLayout = new TQVBoxLayout( mSaverGroup->layout(),
         KDialog::spacingHint() );
 
     mSaverListView = new TQListView( mSaverGroup );
     mSaverListView->setMinimumHeight( 120 );
-    mSaverListView->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
+    mSaverListView->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Expanding);
     mSaverListView->addColumn("");
     mSaverListView->header()->hide();
     mSelected = -1;
@@ -162,7 +162,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mSettingsGroup = new TQGroupBox( i18n("Settings"), this );
     mSettingsGroup->setColumnLayout( 0, Qt::Vertical );
     leftColumnLayout->addWidget( mSettingsGroup );
-    groupLayout = new TQVBoxLayout( mSettingsGroup->tqlayout(),
+    groupLayout = new TQVBoxLayout( mSettingsGroup->layout(),
         KDialog::spacingHint() );
 
     mEnabledCheckBox = new TQCheckBox(i18n(
@@ -221,14 +221,14 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     mWaitLockEdit->setSuffix(i18n(" sec"));
     mWaitLockEdit->setValue(mLockTimeout/1000);
     mWaitLockEdit->setEnabled(mEnabled && mLock);
-    if ( mWaitLockEdit->tqsizeHint().width() <
-         mWaitEdit->tqsizeHint().width() ) {
-        mWaitLockEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
-        mWaitEdit->setFixedWidth( mWaitEdit->tqsizeHint().width() );
+    if ( mWaitLockEdit->sizeHint().width() <
+         mWaitEdit->sizeHint().width() ) {
+        mWaitLockEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
+        mWaitEdit->setFixedWidth( mWaitEdit->sizeHint().width() );
     }
     else {
-        mWaitEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
-        mWaitLockEdit->setFixedWidth( mWaitLockEdit->tqsizeHint().width() );
+        mWaitEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
+        mWaitLockEdit->setFixedWidth( mWaitLockEdit->sizeHint().width() );
     }
     connect(mWaitLockEdit, TQT_SIGNAL(valueChanged(int)),
             this, TQT_SLOT(slotLockTimeoutChanged(int)));
@@ -246,7 +246,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
         new TQVBoxLayout(topLayout, KDialog::spacingHint());
 
     mMonitorLabel = new TQLabel( this );
-    mMonitorLabel->tqsetAlignment( AlignCenter );
+    mMonitorLabel->setAlignment( AlignCenter );
     mMonitorLabel->setPixmap( TQPixmap(locate("data",
                          "kcontrol/pics/monitor.png")));
     rightColumnLayout->addWidget(mMonitorLabel, 0);
@@ -256,7 +256,7 @@ KScreenSaver::KScreenSaver(TQWidget *parent, const char *name, const TQStringLis
     advancedLayout->addWidget( new TQWidget( this ) );
     TQPushButton* advancedBt = new TQPushButton(
         i18n( "Advanced &Options" ), this, "advancedBtn" );
-    advancedBt->tqsetSizePolicy( TQSizePolicy(
+    advancedBt->setSizePolicy( TQSizePolicy(
         TQSizePolicy::Fixed, TQSizePolicy::Fixed) );
     connect( advancedBt, TQT_SIGNAL( clicked() ),
              this, TQT_SLOT( slotAdvanced() ) );
@@ -739,7 +739,7 @@ void KScreenSaver::slotSetup()
 //
 void KScreenSaver::slotAdvanced()
 {
-   KScreenSaverAdvancedDialog dlg( tqtopLevelWidget() );
+   KScreenSaverAdvancedDialog dlg( topLevelWidget() );
    if ( dlg.exec() ) {
        mChanged = true;
        emit changed(true);
diff --git a/kcontrol/smartcard/nosmartcardbase.ui b/kcontrol/smartcard/nosmartcardbase.ui
index 44fdf064a..fe8c4fa06 100644
--- a/kcontrol/smartcard/nosmartcardbase.ui
+++ b/kcontrol/smartcard/nosmartcardbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>NoSmartcardBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -23,7 +23,7 @@
             <property name="text">
                 <string>&lt;b&gt;Unable to contact the KDE smartcard service.&lt;/b&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -48,7 +48,7 @@
 
 2) You don't appear to have smartcard support in the KDE libraries. You will need to recompile the kdelibs package with libpcsclite installed.</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -64,7 +64,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -76,6 +76,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp
index ce2a8027d..0a1ea39ef 100644
--- a/kcontrol/smartcard/smartcard.cpp
+++ b/kcontrol/smartcard/smartcard.cpp
@@ -47,7 +47,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
   : KCModule(parent, name),DCOPObject(name)
 {
 
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
   config = new KConfig("ksmartcardrc", false, false);
 
   DCOPClient *dc = KApplication::kApplication()->dcopClient();
@@ -67,7 +67,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
 
 
      base = new SmartcardBase(this);
-     tqlayout->add(base);
+     layout->add(base);
 
      _popUpKardChooser = new KPopupMenu(this,"KpopupKardChooser");
      _popUpKardChooser->insertItem(i18n("Change Module..."),
@@ -107,7 +107,7 @@ KSmartcardConfig::KSmartcardConfig(TQWidget *parent, const char *name)
      _cardDB= new KCardDB();
      load();
   } else {
-     tqlayout->add(new NoSmartcardBase(this));
+     layout->add(new NoSmartcardBase(this));
   }
 }
 
diff --git a/kcontrol/smartcard/smartcardbase.ui b/kcontrol/smartcard/smartcardbase.ui
index c1fe3f0ed..b5dda006b 100644
--- a/kcontrol/smartcard/smartcardbase.ui
+++ b/kcontrol/smartcard/smartcardbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SmartcardBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -74,7 +74,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>15</width>
                                         <height>20</height>
@@ -118,7 +118,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -231,7 +231,7 @@
                                     <property name="name">
                                         <cstring>TextLabel2</cstring>
                                     </property>
-                                    <property name="tqgeometry">
+                                    <property name="geometry">
                                         <rect>
                                             <x>10</x>
                                             <y>20</y>
@@ -250,7 +250,7 @@
                                     <property name="text">
                                         <string>To add new readers you have to modify /etc/readers.conf file and re-start pcscd</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>WordBreak|AlignVCenter</set>
                                     </property>
                                 </widget>
@@ -305,6 +305,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/smserver/smserverconfigdlg.ui b/kcontrol/smserver/smserverconfigdlg.ui
index b4df94d96..518052675 100644
--- a/kcontrol/smserver/smserverconfigdlg.ui
+++ b/kcontrol/smserver/smserverconfigdlg.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SMServerConfigDlg</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Session Manager</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -190,7 +190,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>130</height>
@@ -243,6 +243,6 @@
 <slots>
     <slot>configChanged()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp
index c0972f520..a7ed79b46 100644
--- a/kcontrol/spellchecking/spellchecking.cpp
+++ b/kcontrol/spellchecking/spellchecking.cpp
@@ -34,13 +34,13 @@ K_EXPORT_COMPONENT_FACTORY (kcm_spellchecking, SpellFactory("kcmspellchecking")
 KSpellCheckingConfig::KSpellCheckingConfig(TQWidget *parent, const char *name, const TQStringList &):
     KCModule(SpellFactory::instance(), parent, name)
 {
-  TQBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+  TQBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
   TQGroupBox *box = new TQVGroupBox( i18n("Spell Checking Settings"), this );
-  box->tqlayout()->setSpacing( KDialog::spacingHint() );
-  tqlayout->addWidget(box);
+  box->layout()->setSpacing( KDialog::spacingHint() );
+  layout->addWidget(box);
 
   spellConfig = new KSpellConfig(box, 0L ,0L, false );
-  tqlayout->addStretch(1);
+  layout->addStretch(1);
   connect(spellConfig,TQT_SIGNAL(configChanged()), TQT_SLOT( changed() ));
 
   setQuickHelp( i18n("<h1>Spell Checker</h1><p>This control module allows you to configure the KDE spell checking system. You can configure:<ul><li> which spell checking program to use<li> which types of spelling errors are identified<li> which dictionary is used by default.</ul><br>The KDE spell checking system (KSpell) provides support for two common spell checking utilities: ASpell and ISpell. This allows you to share dictionaries between KDE applications and non-KDE applications.</p>"));
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index a9a3e00aa..f351d3f2c 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -157,11 +157,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	// -----------------
 	gbWidgetStyle = new TQGroupBox( i18n("Widget Style"), page1, "gbWidgetStyle" );
 	gbWidgetStyle->setColumnLayout( 0, Qt::Vertical );
-	gbWidgetStyle->tqlayout()->setMargin( KDialog::marginHint() );
-	gbWidgetStyle->tqlayout()->setSpacing( KDialog::spacingHint() );
+	gbWidgetStyle->layout()->setMargin( KDialog::marginHint() );
+	gbWidgetStyle->layout()->setSpacing( KDialog::spacingHint() );
 
-	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->tqlayout() );
-	gbWidgetStyleLayout->tqsetAlignment( Qt::AlignTop );
+	gbWidgetStyleLayout = new TQVBoxLayout( gbWidgetStyle->layout() );
+	gbWidgetStyleLayout->setAlignment( Qt::AlignTop );
 	hbLayout = new TQHBoxLayout( KDialog::spacingHint(), "hbLayout" );
 
 	cbStyle = new KComboBox( gbWidgetStyle, "cbStyle" );
@@ -169,7 +169,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	hbLayout->addWidget( cbStyle );
 
 	pbConfigStyle = new TQPushButton( i18n("Con&figure..."), gbWidgetStyle );
-	pbConfigStyle->tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
+	pbConfigStyle->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
 	pbConfigStyle->setEnabled( FALSE );
 	hbLayout->addWidget( pbConfigStyle );
 
@@ -189,11 +189,11 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 
     TQGroupBox *gbPreview = new TQGroupBox( i18n( "Preview" ), page1 );
 	gbPreview->setColumnLayout( 0, Vertical );
-	gbPreview->tqlayout()->setMargin( 0 );
-	gbPreview->tqlayout()->setSpacing( KDialog::spacingHint() );
+	gbPreview->layout()->setMargin( 0 );
+	gbPreview->layout()->setSpacing( KDialog::spacingHint() );
 	gbPreview->setFlat( true );
 	stylePreview = new StylePreview( gbPreview );
-	gbPreview->tqlayout()->add( stylePreview );
+	gbPreview->layout()->add( stylePreview );
 
 	page1Layout->addWidget( gbWidgetStyle );
 	page1Layout->addWidget( gbPreview );
@@ -294,16 +294,16 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
 	box1->setSpacing( KDialog::spacingHint() );
 	box1->setMargin( 0 );
 	TQLabel* lbl = new TQLabel( i18n("0%"), box1 );
-	lbl->tqsetAlignment( AlignLeft );
+	lbl->setAlignment( AlignLeft );
 	lbl = new TQLabel( i18n("50%"), box1 );
-	lbl->tqsetAlignment( AlignHCenter );
+	lbl->setAlignment( AlignHCenter );
 	lbl = new TQLabel( i18n("100%"), box1 );
-	lbl->tqsetAlignment( AlignRight );
+	lbl->setAlignment( AlignRight );
 
 	lblMenuEffectType = new TQLabel( comboMenuEffectType, i18n("Menu trans&lucency type:"), menuContainer );
-	lblMenuEffectType->tqsetAlignment( AlignBottom | AlignLeft );
+	lblMenuEffectType->setAlignment( AlignBottom | AlignLeft );
 	lblMenuOpacity    = new TQLabel( slOpacity, i18n("Menu &opacity:"), menuContainer );
-	lblMenuOpacity->tqsetAlignment( AlignBottom | AlignLeft );
+	lblMenuOpacity->setAlignment( AlignBottom | AlignLeft );
 
 	menuContainerLayout->addWidget( lblMenuEffectType, 0, 0 );
 	menuContainerLayout->addWidget( comboMenuEffectType, 1, 0 );
@@ -795,9 +795,9 @@ void KCMStyle::loadStyle( KConfig& config )
 		item = i;
 		if ( id == cfgStyle )	// ExactMatch
 			break;
-		else if ( id.tqcontains( cfgStyle ) )
+		else if ( id.contains( cfgStyle ) )
 			break;
-		else if ( id.tqcontains( TQApplication::style().className() ) )
+		else if ( id.contains( TQApplication::style().className() ) )
 			break;
 		item = 0;
 	}
@@ -837,7 +837,7 @@ void KCMStyle::switchStyle(const TQString& styleName, bool force)
 	setStyleRecursive( stylePreview, style );
 
 	// this flickers, but reliably draws the widgets correctly.
-	stylePreview->resize( stylePreview->tqsizeHint() );
+	stylePreview->resize( stylePreview->sizeHint() );
 
 	delete appliedStyle;
 	appliedStyle = style;
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index d238efab7..0350ab969 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -41,17 +41,17 @@ extern "C"
 KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
 {
 	//Should have no margins here, the dialog provides them
-	TQVBoxLayout* tqlayout = new TQVBoxLayout(this, 0, 0);
+	TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
 	KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
 
 	//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
 	highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
 	animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
 
-	//tqlayout->add(highlightLineEdits);
-	tqlayout->add(highlightScrollBar);
-	tqlayout->add(animateProgressBar);
-	tqlayout->addStretch(1);
+	//layout->add(highlightLineEdits);
+	layout->add(highlightScrollBar);
+	layout->add(animateProgressBar);
+	layout->addStretch(1);
 
 	TQSettings s;
 	//origHlLineEdit = s.readBoolEntry("/keramik/Settings/highlightLineEdits", false);
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 64ca00fff..112f2c241 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -68,7 +68,7 @@ void MenuPreview::createPixmaps()
 	if (pixBlended)
 		pixBlended->resize( w, h );
 	
-	TQColorGroup cg = tqcolorGroup();
+	TQColorGroup cg = colorGroup();
 	TQColor c1 = cg.background();
 	TQColor c2 = cg.mid();
 
@@ -96,7 +96,7 @@ void MenuPreview::createPixmaps()
 
 void MenuPreview::blendPixmaps()
 {
-	// Rebuild pixmaps, and tqrepaint
+	// Rebuild pixmaps, and repaint
 	if (pixBlended && pixBackground) 
 	{
 		if (mode == Blend && pixOverlay) {
@@ -105,7 +105,7 @@ void MenuPreview::blendPixmaps()
 			KImageEffect::blend(src, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
 		} else if (mode == Tint) {
-			TQColor clr = tqcolorGroup().button();
+			TQColor clr = colorGroup().button();
 			TQImage dst = pixBackground->convertToImage();
 			KImageEffect::blend(clr, dst, menuOpacity);
 			pixBlended->convertFromImage( dst );
@@ -121,7 +121,7 @@ void MenuPreview::setOpacity( int opacity )
 	if ((int)(menuOpacity*100) != opacity) {
 		menuOpacity = opacity/100.0;
 		blendPixmaps();
-		tqrepaint( false );
+		repaint( false );
 	}
 }
 
@@ -130,14 +130,14 @@ void MenuPreview::setPreviewMode( PreviewMode pvm )
 	if (mode != pvm) {
 		mode = pvm;
 		blendPixmaps();
-		tqrepaint( false );
+		repaint( false );
 	}
 }
 
 void MenuPreview::paintEvent( TQPaintEvent* /* pe */ )
 {
 	// Paint the frame and blended pixmap
-	TQColorGroup cg = tqcolorGroup();
+	TQColorGroup cg = colorGroup();
 	int x2 = width()-1;
 	int y2 = height()-1;
 
diff --git a/kcontrol/style/stylepreview.ui b/kcontrol/style/stylepreview.ui
index 7dcee7930..fbb4929f2 100644
--- a/kcontrol/style/stylepreview.ui
+++ b/kcontrol/style/stylepreview.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>StylePreview</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -161,7 +161,7 @@
                     </widget>
                     <widget class="QLayoutWidget" row="2" column="1">
                         <property name="name">
-                            <cstring>tqlayout3</cstring>
+                            <cstring>layout3</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -177,7 +177,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>40</width>
                                         <height>20</height>
@@ -196,13 +196,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -224,13 +224,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
                                     </size>
                                 </property>
-                                <property name="tqmaximumSize">
+                                <property name="maximumSize">
                                     <size>
                                         <width>200</width>
                                         <height>32767</height>
@@ -250,7 +250,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>30</width>
                                         <height>20</height>
@@ -280,6 +280,6 @@
     <slot>init()</slot>
     <slot returnType="bool">eventFilter( QObject *, QEvent * ev )</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="10"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="10"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp
index 155865440..a13963e09 100644
--- a/kcontrol/taskbar/kcmtaskbar.cpp
+++ b/kcontrol/taskbar/kcmtaskbar.cpp
@@ -121,9 +121,9 @@ TQStringList TaskbarConfig::i18nGroupModeList()
 TaskbarConfig::TaskbarConfig(TQWidget *parent, const char* name, const TQStringList&)
   : KCModule(TaskBarFactory::instance(), parent, name)
 {
-    TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+    TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
     m_widget = new TaskbarConfigUI(this);
-    tqlayout->addWidget(m_widget);
+    layout->addWidget(m_widget);
 
     // TODO: Load these from .desktop files?
     m_appearances.append(TaskbarAppearance(i18n("Elegant"), false, false, true));
diff --git a/kcontrol/taskbar/kcmtaskbarui.ui b/kcontrol/taskbar/kcmtaskbarui.ui
index dda71c6c3..d234683ca 100644
--- a/kcontrol/taskbar/kcmtaskbarui.ui
+++ b/kcontrol/taskbar/kcmtaskbarui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>TaskbarConfigUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Taskbar</string>
     </property>
-    <property name="tqlayoutMargin" stdset="0">
+    <property name="layoutMargin" stdset="0">
     </property>
     <vbox>
         <property name="name">
@@ -31,9 +31,9 @@
             <property name="title">
                 <string>Taskbar</string>
             </property>
-            <property name="tqlayoutMargin" stdset="0">
+            <property name="layoutMargin" stdset="0">
             </property>
-            <property name="tqlayoutSpacing" stdset="0">
+            <property name="layoutSpacing" stdset="0">
             </property>
             <grid>
                 <property name="name">
@@ -193,7 +193,7 @@ By default, this option is selected and all windows are shown.</string>
                 </widget>
                 <widget class="QLayoutWidget" row="10" column="0" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -209,7 +209,7 @@ By default, this option is selected and all windows are shown.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>191</width>
                                     <height>20</height>
@@ -234,7 +234,7 @@ By default, this option is selected and all windows are shown.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>191</width>
                                     <height>20</height>
@@ -300,7 +300,7 @@ By default, this option is selected and all windows are shown.</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>191</width>
                                     <height>20</height>
@@ -319,7 +319,7 @@ By default, this option is selected and all windows are shown.</string>
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -434,7 +434,7 @@ By default, this option is selected and all windows are shown.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -472,8 +472,8 @@ By default, this option is selected and all windows are shown.</string>
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp
index 5939e5997..f3a5a85df 100644
--- a/kcontrol/usbview/kcmusb.cpp
+++ b/kcontrol/usbview/kcmusb.cpp
@@ -39,7 +39,7 @@ USBViewer::USBViewer(TQWidget *parent, const char *name, const TQStringList &)
   gbox->setColumnLayout( 0, Qt::Horizontal );
   vbox->addWidget(gbox);
 
-  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->tqlayout(), KDialog::spacingHint());
+  TQVBoxLayout *vvbox = new TQVBoxLayout(gbox->layout(), KDialog::spacingHint());
 
   TQSplitter *splitter = new TQSplitter(gbox);
   vvbox->addWidget(splitter);
@@ -87,12 +87,12 @@ void USBViewer::load()
   refresh();
 }
 
-static TQ_UINT32 key( USBDevice &dev )
+static Q_UINT32 key( USBDevice &dev )
 {
   return dev.bus()*256 + dev.device();
 }
 
-static TQ_UINT32 key_parent( USBDevice &dev )
+static Q_UINT32 key_parent( USBDevice &dev )
 {
   return dev.bus()*256 + dev.parent();
 }
@@ -130,7 +130,7 @@ void USBViewer::refresh()
       for ( ; it.current(); ++it)
 	if (it.current()->level() == level)
 	  {
-	    TQ_UINT32 k = key(*it.current());
+	    Q_UINT32 k = key(*it.current());
 	    if (level == 0)
 	      {
 		TQListViewItem *item = _items.find(k);
@@ -178,7 +178,7 @@ void USBViewer::selectionChanged(TQListViewItem *item)
 {
   if (item)
     {
-      TQ_UINT32 busdev = item->text(1).toUInt();
+      Q_UINT32 busdev = item->text(1).toUInt();
       USBDevice *dev = USBDevice::find(busdev>>8, busdev&255);
       if (dev)
 	{
diff --git a/kcontrol/usbview/kcmusb.desktop b/kcontrol/usbview/kcmusb.desktop
index 8a0f5afb9..76729bb5d 100644
--- a/kcontrol/usbview/kcmusb.desktop
+++ b/kcontrol/usbview/kcmusb.desktop
@@ -132,11 +132,11 @@ Comment[mk]=Видете ги USB-уредите закачени на овој
 Comment[mn]=Энэ компьютерт залгагдсан USB-төхөөрөмж харуулах
 Comment[ms]=Papar peranti USB yang dilekapkan pada komputer
 Comment[mt]=Ara l-apparat USB imqabbad ma' dal-kompjuter
-Comment[nb]=Se hvilke USB-enheter som er koblet til denne tqmaskinen
+Comment[nb]=Se hvilke USB-enheter som er koblet til denne maskinen
 Comment[nds]=de USB-Reedschappen ankieken, de dissen Reekner tokoppelt sünd
 Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका USB यन्त्र देखाउनुहोस्
 Comment[nl]=Hier kunt u de USB-apparaten die op deze computer zijn aangesloten bekijken
-Comment[nn]=Viser USB-einingane knytte til datatqmaskina
+Comment[nn]=Viser USB-einingane knytte til datamaskina
 Comment[nso]=Bona maano a USB ao a kgwathisitswego go computer ye
 Comment[pa]=ਇਸ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ USB ਜੰਤਰ ਵੇਖੋ
 Comment[pl]=Informacja o urządzeniach USB podłączonych do tego komputera
diff --git a/kcontrol/usbview/usb.ids b/kcontrol/usbview/usb.ids
index d05480250..c2d3e4da9 100644
--- a/kcontrol/usbview/usb.ids
+++ b/kcontrol/usbview/usb.ids
@@ -1833,8 +1833,8 @@
 	0202  Apple Keyboard [ALPS]
 	0205  Apple Extended Keyboard [Mitsumi]
 	0206  Apple Extended Keyboard [Mitsumi]
-	020b  Apple Pro Keyboard [Mitsumi, A1048/US tqlayout]
-	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS tqlayout]
+	020b  Apple Pro Keyboard [Mitsumi, A1048/US layout]
+	020d  Apple Pro Keyboard [Mitsumi, A1048/JIS layout]
 	020e  Apple Internal Keyboard/Trackpad
 	020f  Apple Internal Keyboard/Trackpad
 	0301  Apple USB Mouse [Mitsumi, M4848]
@@ -5895,7 +5895,7 @@ HUT 0f  PID Page
 	087  Move Destination
 	088  Move Length
 	089  PID Block Load Report
-	08B  Block Load tqStatus
+	08B  Block Load Status
 	08C  Block Load Success
 	08D  Block Load Full
 	08E  Block Load Error
@@ -5940,7 +5940,7 @@ HUT 14  Alphanumeric Display
 	02a  Horizontal Scroll
 	02b  Character Report
 	02c  Display Data
-	02d  Display tqStatus
+	02d  Display Status
 	02e  Stat Not Ready
 	02f  Stat Ready
 	030  Err Not a loadable Character
@@ -6015,8 +6015,8 @@ HUT 82  Monitor VESA Virtual Controls
 HUT 84  Power Device Page
 	000  Undefined
 	001  iName
-	002  Present tqStatus
-	003  Changed tqStatus
+	002  Present Status
+	003  Changed Status
 	004  UPS
 	005  Power Supply
 	010  Battery System
@@ -6095,10 +6095,10 @@ HUT 84  Power Device Page
 HUT 85  Battery System Page
 	000  Undefined
 	001  SMB Battery Mode
-	002  SMB Battery tqStatus
+	002  SMB Battery Status
 	003  SMB Alarm Warning
 	004  SMB Charger Mode
-	005  SMB Charger tqStatus
+	005  SMB Charger Status
 	006  SMB Charger Spec Info
 	007  SMB Selector State
 	008  SMB Selector Presets
@@ -6195,7 +6195,7 @@ HUT f0  Cash Device
 	0f1  Cash Drawer
 	0f2  Cash Drawer Number
 	0f3  Cash Drawer Set
-	0f4  Cash Drawer tqStatus
+	0f4  Cash Drawer Status
 HUT ff  Vendor Specific
 
 # List of Languages
diff --git a/kcontrol/usbview/usbdevices.cpp b/kcontrol/usbview/usbdevices.cpp
index 8c116eb16..466fd9a98 100644
--- a/kcontrol/usbview/usbdevices.cpp
+++ b/kcontrol/usbview/usbdevices.cpp
@@ -103,7 +103,7 @@ void USBDevice::parseSysDir(int bus, int parent, int level, TQString dname)
   TQStringList list = dir.entryList();
 
   for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) {
-    if ((*it).tqcontains(':'))
+    if ((*it).contains(':'))
       continue;
 
     USBDevice* dev = new USBDevice();
@@ -277,7 +277,7 @@ bool USBDevice::parse(TQString fname)
   // read in the device infos
   USBDevice *device = 0;
   int start=0, end;
-  result.tqreplace(TQRegExp("^\n"),"");
+  result.replace(TQRegExp("^\n"),"");
   while ((end = result.find('\n', start)) > 0)
     {
       TQString line = result.mid(start, end-start);
@@ -332,10 +332,10 @@ void USBDevice::collectData( int fd, int level, usb_device_info &di, int parent)
 	
 	_bus          = di.udi_bus;
 	_device       = di.udi_addr;
-	_product      = TQString::tqfromLatin1(di.udi_product);
+	_product      = TQString::fromLatin1(di.udi_product);
 	if ( _device == 1 )
 		_product += " " + TQString::number( _bus );
-	_manufacturer = TQString::tqfromLatin1(di.udi_vendor);
+	_manufacturer = TQString::fromLatin1(di.udi_vendor);
 	_prodID       = di.udi_productNo;
 	_vendorID     = di.udi_vendorNo;
 	_class        = di.udi_class;
diff --git a/kcontrol/view1394/kcmview1394.desktop b/kcontrol/view1394/kcmview1394.desktop
index ea0340e4a..fb1b7ad79 100644
--- a/kcontrol/view1394/kcmview1394.desktop
+++ b/kcontrol/view1394/kcmview1394.desktop
@@ -122,11 +122,11 @@ Comment[mk]=Видете ги IEEE 1394 уредите закачени на о
 Comment[mn]=Энэ компьютерт залгагдсан IEEE 1394-төхөөрөмж харуулах
 Comment[ms]=Papar peranti IEEE 1394 yang dilekapkan pada komputer ini
 Comment[mt]=Ara l-apparat IEEE 1394 imqabbad ma' dal-kompjuter
-Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne tqmaskinen
+Comment[nb]=Se hvilke IEEE 1394-enheter som er koblet til denne maskinen
 Comment[nds]=De IEEE1394-Reedschappen ankieken, de dissen Reekner tokoppelt sünd
 Comment[ne]=यो कम्प्युटरमा सङ्लग्न गरिएका IEEE 1394 यन्त्र देखाउनुहोस्
 Comment[nl]=Hier kunt u de IEEE 1394-apparaten die op deze computer zijn aangesloten bekijken
-Comment[nn]=Viser IEE 1394-einingane knytte til datatqmaskina
+Comment[nn]=Viser IEE 1394-einingane knytte til datamaskina
 Comment[pa]=ਆਪਣੇ ਕੰਪਿਊਟਰ ਨਾਲ ਜੁੜੇ IEEE 1394 ਜੰਤਰ ਵੇਖੋ
 Comment[pl]=Informacja o urządzeniach IEEE 1394 podłączonych do tego komputera
 Comment[pt]=Ver os dispositivos IEEE 1394 ligados a este computador
diff --git a/kcontrol/view1394/oui.db b/kcontrol/view1394/oui.db
index dfe302b5b..76f80cc84 100644
--- a/kcontrol/view1394/oui.db
+++ b/kcontrol/view1394/oui.db
@@ -3509,7 +3509,7 @@
 000E02 Advantech AMT Inc.
 000E03 Aarohi Communications, Inc.
 000E05 WIRELESS MATRIX CORP.
-000E06 Team Sitqmoco Ltd
+000E06 Team Simoco Ltd
 000E07 Sony Ericsson Mobile Communications AB
 000E08 Sipura Technology, Inc.
 000E09 Shenzhen Coship Software Co.,LTD.
diff --git a/kcontrol/view1394/view1394widget.ui b/kcontrol/view1394/view1394widget.ui
index 1677e9ab0..5b6ba13e8 100644
--- a/kcontrol/view1394/view1394widget.ui
+++ b/kcontrol/view1394/view1394widget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>View1394Widget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -147,7 +147,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -182,5 +182,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp
index a481e8f86..df9cbb6a6 100644
--- a/kcontrol/xinerama/kcmxinerama.cpp
+++ b/kcontrol/xinerama/kcmxinerama.cpp
@@ -223,10 +223,10 @@ TQWidget *KCMXinerama::indicator(int dpy) {
 	si->setFont(fnt);
 	si->setFrameStyle(TQFrame::Panel);
 	si->setFrameShadow(TQFrame::Plain);
-	si->tqsetAlignment(Qt::AlignCenter);
+	si->setAlignment(Qt::AlignCenter);
 
 	TQPoint screenCenter(TQApplication::desktop()->screenGeometry(dpy).center());
-	TQRect targetGeometry(TQPoint(0,0), si->tqsizeHint());
+	TQRect targetGeometry(TQPoint(0,0), si->sizeHint());
         targetGeometry.moveCenter(screenCenter);
 	si->setGeometry(targetGeometry);
 	si->show();
diff --git a/kcontrol/xinerama/xineramawidget.ui b/kcontrol/xinerama/xineramawidget.ui
index d0b69c183..cab732afd 100644
--- a/kcontrol/xinerama/xineramawidget.ui
+++ b/kcontrol/xinerama/xineramawidget.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>XineramaWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -156,7 +156,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>431</width>
                     <height>21</height>
@@ -165,7 +165,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -321,6 +321,6 @@
 <slots>
     <slot access="private">emitConfigChanged()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdcop/kdcopview.ui b/kdcop/kdcopview.ui
index ec9928480..5d1de7a93 100644
--- a/kdcop/kdcopview.ui
+++ b/kdcop/kdcopview.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>kdcopview</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -50,7 +50,7 @@
                 </widget>
             <widget class="QLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout18</cstring>
+                    <cstring>layout18</cstring>
                 </property>
                 <grid>
                     <property name="name">
@@ -98,7 +98,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>0</width>
                             <height>0</height>
@@ -139,8 +139,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>klistviewsearchline.h</includehint>
     <includehint>kdcoplistview.h</includehint>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 06f6a6e28..b7b21bd7f 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
 {
   setExpandable(true);
   setText(0, TQString::fromUtf8(app_));
-  setPixmap(0,  KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "exec" ), KIcon::Small ));
+  setPixmap(0,  KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
 
 
 	/* Get the icon:  we use the icon from a mainwindow in that class.
@@ -467,7 +467,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "unsigned"  || type == "uint" || type == "unsigned int"
-             || type == "TQ_UINT32" )
+             || type == "Q_UINT32" )
       {
         TQLabel* n = new TQLabel( name, frame );
         grid->addWidget( n, i, 0 );
@@ -493,7 +493,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         e->setValidator( new TQIntValidator( e ) );
       }
       else if ( type == "ulong" || type == "unsigned long" || type == "unsigned long int"
-             || type == "TQ_UINT64" )
+             || type == "Q_UINT64" )
       {
         TQLabel* n = new TQLabel( name, frame );
         grid->addWidget( n, i, 0 );
@@ -697,7 +697,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         arg << e->text().toInt();
       }
       else if ( type == "unsigned" || type == "uint" || type == "unsigned int"
-             || type == "TQ_UINT32" )
+             || type == "Q_UINT32" )
       {
         KLineEdit* e = (KLineEdit*)wl.at( i );
         arg << e->text().toUInt();
@@ -722,7 +722,7 @@ void KDCOPWindow::slotCallFunction( TQListViewItem* it )
         KLineEdit* e = (KLineEdit*)wl.at( i );
         arg << e->text().toUShort();
       }
-      else if ( type == "TQ_UINT64" )
+      else if ( type == "Q_UINT64" )
       {
         KLineEdit* e = ( KLineEdit* )wl.at( i );
         arg << e->text().toULongLong();
@@ -936,7 +936,7 @@ bool KDCOPWindow::demarshal
   if ( replyType == "TQVariant" )
   {
     // read data type from stream
-    TQ_INT32 type;
+    Q_INT32 type;
     reply >> type;
 
     // change replyType to real typename
@@ -952,7 +952,7 @@ bool KDCOPWindow::demarshal
     ret << TQString::number(i);
   }
   else if ( replyType == "uint" || replyType == "unsigned int"
-         || replyType == "TQ_UINT32" )
+         || replyType == "Q_UINT32" )
   {
     uint i;
     reply >> i;
@@ -970,9 +970,9 @@ bool KDCOPWindow::demarshal
     reply >> l;
     ret << TQString::number(l);
   }
-  else if ( replyType == "TQ_UINT64" )
+  else if ( replyType == "Q_UINT64" )
   {
-    TQ_UINT64 i;
+    Q_UINT64 i;
     reply >> i;
     ret << TQString::number(i);
   }
@@ -1053,7 +1053,7 @@ bool KDCOPWindow::demarshal
 	TQCursor r;
 	reply >> r;
 	//theList->insertItem(r, 1);
-	ret << "Cursor #" + TQString::number(r.tqshape());
+	ret << "Cursor #" + TQString::number(r.shape());
   }
   else if (replyType == "TQPixmap")
   {
@@ -1191,7 +1191,7 @@ KDCOPWindow::getParameters
 
       int s = (*it).findRev(' ');
 
-      if (-1 != s && !intTypes.tqcontains((*it).mid(s + 1)))
+      if (-1 != s && !intTypes.contains((*it).mid(s + 1)))
       {
         names.append((*it).mid(s + 1));
 
diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp
index 43d6699dd..bdf267dd1 100644
--- a/kdebugdialog/kabstractdebugdialog.cpp
+++ b/kdebugdialog/kabstractdebugdialog.cpp
@@ -52,11 +52,11 @@ void KAbstractDebugDialog::buildButtons( TQVBoxLayout * topLayout )
   pCancelButton = new KPushButton( KStdGuiItem::cancel(), this );
   hbox->addWidget( pCancelButton );
 
-  int w1 = pHelpButton->tqsizeHint().width();
-  int w2 = pOKButton->tqsizeHint().width();
-  int w3 = pCancelButton->tqsizeHint().width();
+  int w1 = pHelpButton->sizeHint().width();
+  int w2 = pOKButton->sizeHint().width();
+  int w3 = pCancelButton->sizeHint().width();
   int w4 = QMAX( w1, QMAX( w2, w3 ) );
-  int w5 = pApplyButton->tqsizeHint().width();
+  int w5 = pApplyButton->sizeHint().width();
   w4 = QMAX(w4, w5);
 
   pHelpButton->setFixedWidth( w4 );
diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp
index ed823e262..2660356fc 100644
--- a/kdebugdialog/kdebugdialog.cpp
+++ b/kdebugdialog/kdebugdialog.cpp
@@ -54,7 +54,7 @@ KDebugDialog::KDebugDialog( TQStringList areaList, TQWidget *parent, const char
 
   // Build combo of debug areas
   pDebugAreas = new TQComboBox( false, this );
-  pDebugAreas->setFixedHeight( pDebugAreas->tqsizeHint().height() );
+  pDebugAreas->setFixedHeight( pDebugAreas->sizeHint().height() );
   pDebugAreas->insertStringList( areaList );
   topLayout->addWidget( pDebugAreas );
 
diff --git a/kdebugdialog/klistdebugdialog.cpp b/kdebugdialog/klistdebugdialog.cpp
index a947d0ec5..7ddb2b559 100644
--- a/kdebugdialog/klistdebugdialog.cpp
+++ b/kdebugdialog/klistdebugdialog.cpp
@@ -83,7 +83,7 @@ void KListDebugDialog::generateCheckBoxes( const TQString& filter )
   for ( ; it != m_areaList.end() ; ++it )
   {
     TQString data = (*it).simplifyWhiteSpace();
-    if ( filter.isEmpty() || data.lower().tqcontains( filter.lower() ) )
+    if ( filter.isEmpty() || data.lower().contains( filter.lower() ) )
     {
       int space = data.find(" ");
       if (space == -1)
@@ -182,7 +182,7 @@ void KListDebugDialog::activateArea( TQCString area, bool activate )
   for ( ; it.current() ; ++it )
   {
       if ( area == (*it)->name()  // debug area code = cb's name
-          || (*it)->text().find( TQString::tqfromLatin1(area) ) != -1 ) // area name included in cb text
+          || (*it)->text().find( TQString::fromLatin1(area) ) != -1 ) // area name included in cb text
       {
           (*it)->setChecked( activate );
           return;
diff --git a/kdepasswd/kcm/chfnprocess.cpp b/kdepasswd/kcm/chfnprocess.cpp
index 76d5209ea..4f6af0add 100644
--- a/kdepasswd/kcm/chfnprocess.cpp
+++ b/kdepasswd/kcm/chfnprocess.cpp
@@ -60,7 +60,7 @@ int ChfnProcess::ConverseChfn(const char *pass)
     if ( line.isEmpty() )
       continue;// discard line
 
-    if ( line.tqcontains( "Password: " )/*isPrompt( line, "password" )*/ )
+    if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ )
     {
       WaitSlave();
       write(m_Fd, pass, strlen(pass));
@@ -69,11 +69,11 @@ int ChfnProcess::ConverseChfn(const char *pass)
 
     line = readLine(); // Let's see what the outcome was
 
-    if ( line.tqcontains( "Changing finger info" ) )
+    if ( line.contains( "Changing finger info" ) )
     {
       // do nothing
     }
-    else if ( line.tqcontains( "information changed" ) )
+    else if ( line.contains( "information changed" ) )
     {
       status=0;
       break;
@@ -83,7 +83,7 @@ int ChfnProcess::ConverseChfn(const char *pass)
 	    status=0;
 	    break;
     }
-    else if ( line.tqcontains( "Password error" ) || line.tqcontains("Incorrect password") )
+    else if ( line.contains( "Password error" ) || line.contains("Incorrect password") )
     {
       status=PasswordError;
       break;
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp
index c521a73b1..a3a25c0f3 100644
--- a/kdepasswd/kcm/main.cpp
+++ b/kdepasswd/kcm/main.cpp
@@ -150,11 +150,11 @@ void KCMUserAccount::load()
 		KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces/";
 
 	TQString fs = KCFGUserAccount::faceSource();
-	if (fs == TQString::tqfromLatin1("UserOnly"))
+	if (fs == TQString::fromLatin1("UserOnly"))
 		_facePerm = userOnly;
-	else if (fs == TQString::tqfromLatin1("PreferUser"))
+	else if (fs == TQString::fromLatin1("PreferUser"))
 		_facePerm = userFirst;
-	else if (fs == TQString::tqfromLatin1("PreferAdmin"))
+	else if (fs == TQString::fromLatin1("PreferAdmin"))
 		_facePerm = adminFirst;
 	else
 		_facePerm = adminOnly; // Admin Only
diff --git a/kdepasswd/kcm/main_widget.ui b/kdepasswd/kcm/main_widget.ui
index 4852ab5b8..29adb0835 100644
--- a/kdepasswd/kcm/main_widget.ui
+++ b/kdepasswd/kcm/main_widget.ui
@@ -5,7 +5,7 @@
     <property name="name">
         <cstring>MainWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -32,13 +32,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>74</width>
                     <height>74</height>
                 </size>
             </property>
-            <property name="tqmaximumSize">
+            <property name="maximumSize">
                 <size>
                     <width>74</width>
                     <height>74</height>
@@ -154,7 +154,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -163,7 +163,7 @@
         </spacer>
         <widget class="QLayoutWidget" row="0" column="1" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -182,7 +182,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -193,7 +193,7 @@
                     <property name="text">
                         <string>&lt;i&gt;(Click the button to change your image)&lt;/i&gt;</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter</set>
                     </property>
                 </widget>
@@ -217,7 +217,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>111</width>
                     <height>20</height>
@@ -289,6 +289,6 @@
 <includes>
     <include location="local" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/kdepasswd/passwd.cpp b/kdepasswd/passwd.cpp
index 6e3bb223f..89bbbdf82 100644
--- a/kdepasswd/passwd.cpp
+++ b/kdepasswd/passwd.cpp
@@ -158,7 +158,7 @@ int PasswdProcess::ConversePasswd(const char *oldpass, const char *newpass,
 
 	case 2: 
 	    m_Error = "";
-	    if( line.tqcontains("again"))
+	    if( line.contains("again"))
 	    {
 		m_Error = line;
 		kill(m_Pid, SIGKILL);
@@ -278,7 +278,7 @@ bool PasswdProcess::isPrompt(TQCString line, const char *word)
 	return false;
     if (word == 0L)
 	return true;
-    return line.tqcontains(word, false);
+    return line.contains(word, false);
 }
 
 
diff --git a/kdeprint/descriptions/sortthem.cpp b/kdeprint/descriptions/sortthem.cpp
index 1e1a37d93..9adc284b1 100644
--- a/kdeprint/descriptions/sortthem.cpp
+++ b/kdeprint/descriptions/sortthem.cpp
@@ -15,7 +15,7 @@ char buf[1024];
    while (!feof(stdin)) {
       char *cline = fgets(buf, 1000, stdin);
       if (!cline) break;
-      if (!have.tqcontains(cline)) {
+      if (!have.contains(cline)) {
          have << cline;
          fprintf(stdout, "%s", cline);
       }
diff --git a/kdeprint/kdeprint_part/printpart.cpp b/kdeprint/kdeprint_part/printpart.cpp
index 8b1e7169e..c8d6ccb15 100644
--- a/kdeprint/kdeprint_part/printpart.cpp
+++ b/kdeprint/kdeprint_part/printpart.cpp
@@ -33,7 +33,7 @@
 typedef KParts::GenericFactory<PrintPart> PrintPartFactory;
 K_EXPORT_COMPONENT_FACTORY( libkdeprint_part, PrintPartFactory )
 
-PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ ,
+PrintPart::PrintPart(TQWidget *parentWidget, const char * /*widgetName*/ ,
 	             TQObject *parent, const char *name,
 		     const TQStringList & /*args*/ )
 : KParts::ReadOnlyPart(parent, name)
@@ -42,7 +42,7 @@ PrintPart::PrintPart(TQWidget *tqparentWidget, const char * /*widgetName*/ ,
     instance()->iconLoader()->addAppDir("kdeprint");
 	m_extension = new PrintPartExtension(this);
 
-	m_view = new KMMainView(tqparentWidget, "MainView", actionCollection());
+	m_view = new KMMainView(parentWidget, "MainView", actionCollection());
 	m_view->setFocusPolicy(TQWidget::ClickFocus);
 	m_view->enableToolbar(false);
 	setWidget(m_view);
diff --git a/kdeprint/kdeprint_part/printpart.h b/kdeprint/kdeprint_part/printpart.h
index f89a3574b..c84fed1cc 100644
--- a/kdeprint/kdeprint_part/printpart.h
+++ b/kdeprint/kdeprint_part/printpart.h
@@ -31,7 +31,7 @@ class PrintPart : public KParts::ReadOnlyPart
 {
 	Q_OBJECT
 public:
-	PrintPart(TQWidget *tqparentWidget, const char *widgetName,
+	PrintPart(TQWidget *parentWidget, const char *widgetName,
 		  TQObject *parent, const char *name,
 		  const TQStringList & );
 	virtual ~PrintPart();
diff --git a/kdeprint/kdeprintfax/confgeneral.cpp b/kdeprint/kdeprintfax/confgeneral.cpp
index e19cdf94b..757c54af7 100644
--- a/kdeprint/kdeprintfax/confgeneral.cpp
+++ b/kdeprint/kdeprintfax/confgeneral.cpp
@@ -45,11 +45,11 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 	QLabel	*m_numberlabel = new TQLabel(i18n("N&umber:"), this);
         m_numberlabel->setBuddy(m_number);
 	KSeparator *sep = new KSeparator( this );
-	m_tqreplace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this );
-	m_tqreplace_int_char_val = new TQLineEdit( this );
-	m_tqreplace_int_char_val->setEnabled( false );
+	m_replace_int_char = new TQCheckBox( i18n( "Replace international prefix '+' with:" ), this );
+	m_replace_int_char_val = new TQLineEdit( this );
+	m_replace_int_char_val->setEnabled( false );
 
-	connect( m_tqreplace_int_char, TQT_SIGNAL( toggled( bool ) ), m_tqreplace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
+	connect( m_replace_int_char, TQT_SIGNAL( toggled( bool ) ), m_replace_int_char_val, TQT_SLOT( setEnabled( bool ) ) );
 
 	QGridLayout	*l0 = new TQGridLayout(this, 6, 2, 10, 10);
 	l0->setColStretch(1, 1);
@@ -63,8 +63,8 @@ ConfGeneral::ConfGeneral(TQWidget *parent, const char *name)
 	l0->addMultiCellWidget( sep, 3, 3, 0, 1 );
 	TQHBoxLayout *l1 = new TQHBoxLayout( this, 0, 10 );
 	l0->addMultiCellLayout( l1, 4, 4, 0, 1 );
-	l1->addWidget( m_tqreplace_int_char );
-	l1->addWidget( m_tqreplace_int_char_val );
+	l1->addWidget( m_replace_int_char );
+	l1->addWidget( m_replace_int_char_val );
 }
 
 void ConfGeneral::load()
@@ -74,8 +74,8 @@ void ConfGeneral::load()
 	m_name->setText(conf->readEntry("Name", getenv("USER")));
 	m_number->setText(conf->readEntry("Number"));
 	m_company->setText(conf->readEntry("Company"));
-	m_tqreplace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) );
-	m_tqreplace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) );
+	m_replace_int_char->setChecked( conf->readBoolEntry( "ReplaceIntChar", false ) );
+	m_replace_int_char_val->setText( conf->readEntry( "ReplaceIntCharVal" ) );
 }
 
 void ConfGeneral::save()
@@ -85,6 +85,6 @@ void ConfGeneral::save()
 	conf->writeEntry("Name", m_name->text());
 	conf->writeEntry("Number", m_number->text());
 	conf->writeEntry("Company", m_company->text());
-	conf->writeEntry( "ReplaceIntChar", m_tqreplace_int_char->isChecked() );
-	conf->writeEntry( "ReplaceIntCharVal", m_tqreplace_int_char_val->text() );
+	conf->writeEntry( "ReplaceIntChar", m_replace_int_char->isChecked() );
+	conf->writeEntry( "ReplaceIntCharVal", m_replace_int_char_val->text() );
 }
diff --git a/kdeprint/kdeprintfax/confgeneral.h b/kdeprint/kdeprintfax/confgeneral.h
index da5bba2e0..5a3ee6ca9 100644
--- a/kdeprint/kdeprintfax/confgeneral.h
+++ b/kdeprint/kdeprintfax/confgeneral.h
@@ -36,8 +36,8 @@ public:
 
 private:
 	QLineEdit	*m_name, *m_company, *m_number;
-	TQCheckBox   *m_tqreplace_int_char;
-	TQLineEdit   *m_tqreplace_int_char_val;
+	TQCheckBox   *m_replace_int_char;
+	TQLineEdit   *m_replace_int_char_val;
 };
 
 #endif
diff --git a/kdeprint/kdeprintfax/confsystem.cpp b/kdeprint/kdeprintfax/confsystem.cpp
index 0a0a4968d..51ea326c8 100644
--- a/kdeprint/kdeprintfax/confsystem.cpp
+++ b/kdeprint/kdeprintfax/confsystem.cpp
@@ -178,13 +178,13 @@ void ConfSystem::slotSystemChanged(int ID)
 	m_commands[m_current] = m_command->text();
 	m_current = ID;
 	if (ID == EFAX_ID)
-		m_device->tqparentWidget()->show();
+		m_device->parentWidget()->show();
 	else
-		m_device->tqparentWidget()->hide();
+		m_device->parentWidget()->hide();
 	if (ID == HYLAFAX_ID)
-		m_server->tqparentWidget()->show();
+		m_server->parentWidget()->show();
 	else
-		m_server->tqparentWidget()->hide();
+		m_server->parentWidget()->hide();
 	m_command->setText(m_commands[m_current]);
 }
 
diff --git a/kdeprint/kdeprintfax/defcmds.cpp b/kdeprint/kdeprintfax/defcmds.cpp
index f0f5cfdd5..09631b51d 100644
--- a/kdeprint/kdeprintfax/defcmds.cpp
+++ b/kdeprint/kdeprintfax/defcmds.cpp
@@ -32,7 +32,7 @@ TQString defaultCommand(const TQString& cmd)
 		QString	exe = KStandardDirs::findExe(r.cap(1));
 		if (exe.isEmpty())
 			exe = "/usr/bin/"+r.cap(1);
-		str.tqreplace(p, r.matchedLength(), exe);
+		str.replace(p, r.matchedLength(), exe);
 	}
 	return str;
 }
diff --git a/kdeprint/kdeprintfax/faxab.cpp b/kdeprint/kdeprintfax/faxab.cpp
index 49a9be89e..ebd6b9cb2 100644
--- a/kdeprint/kdeprintfax/faxab.cpp
+++ b/kdeprint/kdeprintfax/faxab.cpp
@@ -163,7 +163,7 @@ bool FaxAB::getEntry(TQStringList& number, TQStringList& name, TQStringList& ent
 		/*
 		number = kab.m_fax->currentText();
 		name = kab.m_name->currentText();
-		if (kab.m_entries.tqcontains(name))
+		if (kab.m_entries.contains(name))
 		{
 			enterprise = kab.m_entries[name][0];
 		}
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index 6638c1b7f..1d1cd1fa5 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -87,9 +87,9 @@ static TQString stripNumber( const TQString& s )
 
 	// removes any non-numeric character, except ('+','*','#') (hope it's supported by faxing tools)
 	TQString strip_s = s;
-	strip_s.tqreplace( TQRegExp( "[^\\d+*#]" ), "" );
+	strip_s.replace( TQRegExp( "[^\\d+*#]" ), "" );
 	if ( strip_s.find( '+' ) != -1 && conf->readBoolEntry( "ReplaceIntChar", false ) )
-		strip_s.tqreplace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
+		strip_s.replace( "+", conf->readEntry( "ReplaceIntCharVal" ) );
 	return strip_s;
 }
 
@@ -172,7 +172,7 @@ static TQString processTag( const TQString& match, const TQString& value )
 			if ( match[ p+1 ] == '{' )
 			{
 				v = match.mid( p+2, match.length()-p-3 );
-				v.tqreplace( "@@", quote( value ) );
+				v.replace( "@@", quote( value ) );
 			}
 			else
 				v = ( "-" + match.mid( p+1 ) + " " + quote( value ) );
@@ -188,9 +188,9 @@ static bool isTag( const TQString& m, const TQString& t )
 	return ( m == t || m.startsWith( t+"_" ) );
 }
 
-static TQString tqreplaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() )
+static TQString replaceTags( const TQString& s, const TQString& tags, KdeprintFax *fax = NULL, const KdeprintFax::FaxItem& item = KdeprintFax::FaxItem() )
 {
-	// unquote variables (they will be tqreplaced with quoted values later)
+	// unquote variables (they will be replaced with quoted values later)
 
 	TQValueStack<bool> stack;
 	KConfig	*conf = KGlobal::config();
@@ -244,7 +244,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint
 		else if (cmd[i]=='`')
 		{
 			// Replace all `...` with safer $(...)
-			cmd.tqreplace (i, 1, "$(");
+			cmd.replace (i, 1, "$(");
 			TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)");
 			for (	int i2=re_backticks.search(cmd,i+2);
 				i2!=-1;
@@ -253,7 +253,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint
 			{
 				if (cmd[i2] == '`')
 				{
-					cmd.tqreplace (i2, 1, ")");
+					cmd.replace (i2, 1, ")");
 					i2=cmd.length(); // leave loop
 				}
 				else
@@ -291,7 +291,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint
 				if (v.isEmpty())
 					v = getenv("FAXSERVER");
 				if (v.isEmpty())
-					v = TQString::tqfromLatin1("localhost");
+					v = TQString::fromLatin1("localhost");
 				v = processTag( match, v );
 			}
 			else if (isTag( match, "%page" ))
@@ -343,7 +343,7 @@ static TQString tqreplaceTags( const TQString& s, const TQString& tags, Kdeprint
 			else if (issinglequote)
 				v="'"+v+"'";
 
-			cmd.tqreplace (i, match.length(), v);
+			cmd.replace (i, match.length(), v);
 			i+=v.length();
 		}
 	}
@@ -375,8 +375,8 @@ bool FaxCtrl::send(KdeprintFax *f)
 	if (m_command.isEmpty())
 		return false;
 
-	// tqreplace tags common to all fax "operations"
-	m_command = tqreplaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f );
+	// replace tags common to all fax "operations"
+	m_command = replaceTags( m_command, tagList( 11, "%dev", "%server", "%page", "%res", "%user", "%from", "%email", "%comment", "%time", "%subject", "%cover" ), f );
 
 	m_log = TQString::null;
 	m_filteredfiles.clear();
@@ -447,11 +447,11 @@ void FaxCtrl::sendFax()
 {
 	if ( m_command.find( "%files" ) != -1 )
 	{
-		// tqreplace %files tag
+		// replace %files tag
 		QString	filestr;
 		for (TQStringList::ConstIterator it=m_filteredfiles.begin(); it!=m_filteredfiles.end(); ++it)
 			filestr += (quote(*it)+" ");
-		m_command.tqreplace("%files", filestr);
+		m_command.replace("%files", filestr);
 	}
 
 	if ( !m_faxlist.isEmpty() )
@@ -461,7 +461,7 @@ void FaxCtrl::sendFax()
 
 		addLogTitle( i18n( "Sending fax to %1 (%2)" ).arg( item.number ).arg( item.name ) );
 
-		TQString cmd = tqreplaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item );
+		TQString cmd = replaceTags( m_command, tagList( 4, "%number", "%name", "%enterprise", "%rawnumber" ), NULL, item );
 		m_process->clearArguments();
 		*m_process << cmd;
 		addLog(i18n("Sending to fax using: %1").arg(cmd));
@@ -491,7 +491,7 @@ void FaxCtrl::filter()
 			m_tempfiles.append(tmp);
 			m_process->clearArguments();
 			*m_process << locate("data","kdeprintfax/anytops") << "-m" << KProcess::quote(locate("data","kdeprintfax/faxfilters"))
-				<< TQString::tqfromLatin1("--mime=%1").arg(mimeType)
+				<< TQString::fromLatin1("--mime=%1").arg(mimeType)
 				<< "-p" << pageSize()
 				<<  KProcess::quote(m_files[0]) << KProcess::quote(tmp);
 			if (!m_process->start(KProcess::NotifyOnExit, KProcess::AllOutput))
@@ -553,7 +553,7 @@ void FaxCtrl::viewLog(TQWidget *)
 	}
 	else
 	{
-		KWin::activateWindow(m_logview->tqparentWidget()->winId());
+		KWin::activateWindow(m_logview->parentWidget()->winId());
 	}
 }
 
@@ -605,7 +605,7 @@ void FaxCtrl::slotCloseLog()
 		QTextEdit	*view = m_logview;
 		m_logview = 0;
 		if (obj && obj->inherits("QPushButton"))
-			delete view->tqparentWidget();
+			delete view->parentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
 }
@@ -617,7 +617,7 @@ void FaxCtrl::slotPrintLog()
 		KPrinter printer;
 		printer.setDocName( i18n( "Fax log" ) );
 		printer.setDocFileName( "faxlog" );
-		if ( printer.setup( m_logview->tqtopLevelWidget(), i18n( "Fax Log" ) ) )
+		if ( printer.setup( m_logview->topLevelWidget(), i18n( "Fax Log" ) ) )
 		{
 			TQPainter painter( &printer );
 			TQPaintDeviceMetrics metric( &printer );
@@ -625,7 +625,7 @@ void FaxCtrl::slotPrintLog()
 			//TQString txt = m_logview->text();
 			TQString txt = m_log;
 
-			txt.tqreplace( '\n', "<br>" );
+			txt.replace( '\n', "<br>" );
 			txt.prepend( "<h2>" + i18n( "KDEPrint Fax Tool Log" ) + "</h2>" );
 
 			kdDebug() << "Log: " << txt << endl;
@@ -634,7 +634,7 @@ void FaxCtrl::slotPrintLog()
 			richText.setWidth( &painter, body.width() );
 			do
 			{
-				richText.draw( &painter, body.left(), body.top(), view, m_logview->tqcolorGroup() );
+				richText.draw( &painter, body.left(), body.top(), view, m_logview->colorGroup() );
 				view.moveBy( 0, body.height() );
 				painter.translate( 0, -body.height() );
 				if ( view.top() >= richText.height() )
diff --git a/kdeprint/kdeprintfax/kdeprintfax.cpp b/kdeprint/kdeprintfax/kdeprintfax.cpp
index 81f144b9a..a5f66992b 100644
--- a/kdeprint/kdeprintfax/kdeprintfax.cpp
+++ b/kdeprint/kdeprintfax/kdeprintfax.cpp
@@ -429,14 +429,14 @@ void KdeprintFax::updateState()
 	if ( !m_cover->isEnabled() )
 		m_cover->setChecked(false);
 	m_comment->setEnabled(cmd.find("%comment") != -1 && m_cover->isChecked());
-	//m_comment->setPaper(m_comment->isEnabled() ? tqcolorGroup().brush(TQColorGroup::Base) : tqcolorGroup().brush(TQColorGroup::Background));
+	//m_comment->setPaper(m_comment->isEnabled() ? colorGroup().brush(TQColorGroup::Base) : colorGroup().brush(TQColorGroup::Background));
 	if (!m_comment->isEnabled())
 	{
 		m_comment->setText("");
-		m_comment->setPaper( tqcolorGroup().background() );
+		m_comment->setPaper( colorGroup().background() );
 	}
 	else
-		m_comment->setPaper( tqcolorGroup().base() );
+		m_comment->setPaper( colorGroup().base() );
 	/*
 	m_enterprise->setEnabled(cmd.find("%enterprise") != -1);
 	if (!m_enterprise->isEnabled())
diff --git a/kdeprint/kprinter/printwrapper.cpp b/kdeprint/kprinter/printwrapper.cpp
index 25ec75e28..f5e67f96e 100644
--- a/kdeprint/kprinter/printwrapper.cpp
+++ b/kdeprint/kprinter/printwrapper.cpp
@@ -66,7 +66,7 @@ void showmsgdialog(const TQString& msg, int type = 0)
 
 void showmsgconsole(const TQString& msg, int type = 0)
 {
-	QString	errmsg = TQString::tqfromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
+	QString	errmsg = TQString::fromLatin1("%1 : ").arg((type == 0 ? i18n("Print info") : (type == 1 ? i18n("Print warning") : i18n("Print error"))));
 	kdDebug() << errmsg << msg << endl;
 }
 
@@ -237,7 +237,7 @@ void PrintWrapper::slotPrint()
 
 		mgr->printerList(false);
 		if (!printer.isEmpty())
-			prt = mgr->tqfindPrinter(printer);
+			prt = mgr->findPrinter(printer);
 		else
 			prt = mgr->defaultPrinter();
 
diff --git a/kdeprint/slave/kio_print.cpp b/kdeprint/slave/kio_print.cpp
index 4871b74de..4613edeb8 100644
--- a/kdeprint/slave/kio_print.cpp
+++ b/kdeprint/slave/kio_print.cpp
@@ -180,23 +180,23 @@ void KIO_Print::listDir(const KURL& url)
 	{
 		PRINT_DEBUG << "listing group " << path[0] << endl;
 
-		int	tqmask;
+		int	mask;
 		QString	mimeType;
 		KIO::UDSEntry	entry;
 
 		if (group == "printers")
 		{
-			tqmask = KMPrinter::Printer;
+			mask = KMPrinter::Printer;
 			mimeType = "print/printer";
 		}
 		else if (group == "classes")
 		{
-			tqmask = KMPrinter::Class | KMPrinter::Implicit;
+			mask = KMPrinter::Class | KMPrinter::Implicit;
 			mimeType = "print/class";
 		}
 		else if (group == "specials")
 		{
-			tqmask = KMPrinter::Special;
+			mask = KMPrinter::Special;
 			mimeType = "print/printer";
 		}
 		else
@@ -208,7 +208,7 @@ void KIO_Print::listDir(const KURL& url)
 		TQPtrListIterator<KMPrinter>	it(*(KMManager::self()->printerList()));
 		for (;it.current();++it)
 		{
-			if (!(it.current()->type() & tqmask) || !it.current()->instanceName().isEmpty())
+			if (!(it.current()->type() & mask) || !it.current()->instanceName().isEmpty())
 			{
 				PRINT_DEBUG << "rejecting " << it.current()->name() << endl;
 				continue;
@@ -587,7 +587,7 @@ void KIO_Print::get(const KURL& url)
 	PRINT_DEBUG << "extracted printer name = " << printer << endl;
 
 	KMManager::self()->printerList(false);
-	mprinter = KMManager::self()->tqfindPrinter(printer);
+	mprinter = KMManager::self()->findPrinter(printer);
 	if (!mprinter)
 		path = locateData(printer.isEmpty() ? group : printer);
 
@@ -635,7 +635,7 @@ void KIO_Print::showPrinterInfo(KMPrinter *printer)
 		mimeType("text/html");
 
 		QString	content;
-		if (!loadTemplate(TQString::tqfromLatin1("printer.template"), content))
+		if (!loadTemplate(TQString::fromLatin1("printer.template"), content))
 		{
 			error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("printer.template"));
 			return;
@@ -676,7 +676,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
 		mimeType("text/html");
 
 		QString	content;
-		if (!loadTemplate(TQString::tqfromLatin1("class.template"), content))
+		if (!loadTemplate(TQString::fromLatin1("class.template"), content))
 		{
 			error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("class.template"));
 			return;
@@ -686,7 +686,7 @@ void KIO_Print::showClassInfo(KMPrinter *printer)
 		QStringList	members(printer->members());
 		for (TQStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
 		{
-			memberContent.append(TQString::tqfromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
+			memberContent.append(TQString::fromLatin1("<li><a href=\"print:/printers/%1\">%2</a></li>\n").arg(*it).arg(*it));
 		}
 		memberContent.append("</ul>\n");
 
@@ -719,7 +719,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
 	mimeType("text/html");
 
 	QString	content;
-	if (!loadTemplate(TQString::tqfromLatin1("pseudo.template"), content))
+	if (!loadTemplate(TQString::fromLatin1("pseudo.template"), content))
 	{
 		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
@@ -755,7 +755,7 @@ void KIO_Print::showSpecialInfo(KMPrinter *printer)
 
 bool KIO_Print::loadTemplate(const TQString& filename, TQString& buffer)
 {
-	QFile	f(locate("data", TQString::tqfromLatin1("kdeprint/template/")+filename));
+	QFile	f(locate("data", TQString::fromLatin1("kdeprint/template/")+filename));
 	if (f.exists() && f.open(IO_ReadOnly))
 	{
 		QTextStream	t(&f);
@@ -820,7 +820,7 @@ void KIO_Print::showJobs(KMPrinter *prt, bool completed)
 	}
 
 	QString	content;
-	if (!loadTemplate(TQString::tqfromLatin1("jobs.template"), content))
+	if (!loadTemplate(TQString::fromLatin1("jobs.template"), content))
 	{
 		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
@@ -891,7 +891,7 @@ void KIO_Print::showDriver(KMPrinter *prt)
 	mimeType("text/html");
 
 	QString	content;
-	if (!loadTemplate(TQString::tqfromLatin1("driver.template"), content))
+	if (!loadTemplate(TQString::fromLatin1("driver.template"), content))
 	{
 		error(KIO::ERR_INTERNAL, i18n("Unable to load template %1").arg("pseudo.template"));
 		return;
diff --git a/kdesktop/DESIGN b/kdesktop/DESIGN
index ca2d6fb46..e2a6a2b8b 100644
--- a/kdesktop/DESIGN
+++ b/kdesktop/DESIGN
@@ -74,7 +74,7 @@ Multiple monitors
 Two monitors showing different things (not a mirror-setup) can be configured
 in X to either use one X screen, or 2 X screens.  Difference is that if I
 drag a window from one monitor to the other the application gets asked to
-tqrepaint itself on a 2 screen setup and a simple move of the window will be
+repaint itself on a 2 screen setup and a simple move of the window will be
 done in memory (by XFree) if you have a 1 screen setup.
 
 Monitors example:
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index 3c81e26db..6d106a484 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -334,7 +334,7 @@ void KBackgroundManager::slotChangeNumberOfDesktops(int num)
 /*
  * Call this when the desktop has been changed.
  * Desk is in KWin convention: [1..desks], instead of [0..desks-1].
- * 0 tqrepaints the current desktop.
+ * 0 repaints the current desktop.
  */
 void KBackgroundManager::slotChangeDesktop(int desk)
 {
@@ -394,7 +394,7 @@ void KBackgroundManager::slotChangeDesktop(int desk)
 /*
  * Call this when the viewport has been changed.
  * Desk is in KWin convention: [1..desks], instead of [0..desks-1].
- * 0 tqrepaints the current viewport.
+ * 0 repaints the current viewport.
  */
 void KBackgroundManager::slotChangeViewport(int desk, const TQPoint& viewport)
 {
@@ -518,11 +518,11 @@ void KBackgroundManager::setPixmap(KPixmap *pm, int hash, int desk)
     {
        TQScrollView* sv = dynamic_cast<TQScrollView*>( m_pDesktop );
        if ( sv ) {
-         // Qt eats tqrepaint events in this case :-((
+         // Qt eats repaint events in this case :-((
          sv->viewport()->update();
        }
        m_pDesktop->setErasePixmap(*ep);
-       m_pDesktop->tqrepaint();
+       m_pDesktop->repaint();
        static bool root_cleared = false;
        if( !root_cleared )
        { // clear the root window pixmap set by kdm
@@ -920,10 +920,10 @@ void KBackgroundManager::setWallpaper(int desk, TQString wallpaper, int mode)
     slotChangeDesktop(sdesk);
 }
 
-void KBackgroundManager::tqrepaintBackground()
+void KBackgroundManager::repaintBackground()
 {
     if (m_pDesktop)
-       m_pDesktop->tqrepaint();
+       m_pDesktop->repaint();
     else
         KApplication::desktop()->screen()->erase();
 }
@@ -952,10 +952,10 @@ void KBackgroundManager::desktopResized()
     
     m_Hash = 0;
     if( m_pDesktop )
-        m_pDesktop->resize( kapp->desktop()->tqgeometry().size());
+        m_pDesktop->resize( kapp->desktop()->geometry().size());
     // Repaint desktop
     slotChangeDesktop(0);
-    tqrepaintBackground();
+    repaintBackground();
 
     // Redraw all desktops so that applications relying on exported data, e.g. kpager, continue to work properly
     TQSize s(m_pKwinmodule->numberOfViewports(m_pKwinmodule->currentDesktop()));
diff --git a/kdesktop/bgmanager.h b/kdesktop/bgmanager.h
index 2923fd1b5..5b9bf70f1 100644
--- a/kdesktop/bgmanager.h
+++ b/kdesktop/bgmanager.h
@@ -84,7 +84,7 @@ private slots:
     void slotChangeDesktop(int);
     void slotChangeViewport(int, const TQPoint&);
     void slotChangeNumberOfDesktops(int);
-    void tqrepaintBackground();
+    void repaintBackground();
     void desktopResized();
     void clearRoot();
     void saveImages();
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc
index 2a35eacd0..f923d953d 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cc
@@ -159,7 +159,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
   kapp->dcopClient()->connectDCOPSignal(kicker_name, kicker_name, "desktopIconsAreaChanged(TQRect, int)",
                                         "KDesktopIface", "desktopIconsAreaChanged(TQRect, int)", false);
 
-  // Dont tqrepaint on configuration changes during construction
+  // Dont repaint on configuration changes during construction
   m_bInit = true;
 
   // It's the child widget that gets the focus, not us
@@ -179,7 +179,7 @@ KDesktop::KDesktop( bool x_root_hack, bool wait_for_kded ) :
 
   }
 
-  setGeometry( TQApplication::desktop()->tqgeometry() );
+  setGeometry( TQApplication::desktop()->geometry() );
   lower();
 
   connect( kapp, TQT_SIGNAL( shutDown() ),
@@ -230,7 +230,7 @@ KDesktop::initRoot()
      TQToolTip::add( &w, "foo" );
      }
      // NOTE: If mouse clicks stop working again, it's most probably something doing XSelectInput()
-     // on the root window after this, and setting it to some fixed value instead of adding its tqmask.
+     // on the root window after this, and setting it to some fixed value instead of adding its mask.
      XWindowAttributes attrs;
      XGetWindowAttributes(dpy, root, &attrs);
      XSelectInput(dpy, root, attrs.your_event_mask | ButtonPressMask);
@@ -279,7 +279,7 @@ KDesktop::initRoot()
      m_pIconView->viewport()->setBackgroundMode( X11ParentRelative );
      m_pIconView->setFocusPolicy( StrongFocus );
      m_pIconView->viewport()->setFocusPolicy( StrongFocus );
-     m_pIconView->setGeometry( tqgeometry() );
+     m_pIconView->setGeometry( geometry() );
      m_pIconView->show();
 
      // Geert Jansen: backgroundmanager belongs here
@@ -1168,7 +1168,7 @@ void KDesktop::addIcon(const TQString & _url, const TQString & _dest, int x, int
     i.uDest   = KURL::fromPathOrURL( _dest );
     i.uDest.addPath( filename );
     files.append(i);
-    if (!TQFile::exists(i.uDest.prettyURL().tqreplace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
+    if (!TQFile::exists(i.uDest.prettyURL().replace("file://",TQString::null))) { m_pIconView->slotAboutToCreate( TQPoint( x, y ), files );
     KIO::copy( i.uSource, i.uDest, false ); }
 
 //    m_pIconView->addFuturePosition(filename, x, y);
diff --git a/kdesktop/init.cc b/kdesktop/init.cc
index 1d4411ce6..27441b170 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cc
@@ -123,7 +123,7 @@ static TQString realDesktopPath()
     if (kdesktop_screen_number != 0) {
 	TQString dn = "Desktop";
 	dn += TQString::number(kdesktop_screen_number);
-	desktopPath.tqreplace("Desktop", dn);
+	desktopPath.replace("Desktop", dn);
     }
     return desktopPath;
 }
diff --git a/kdesktop/init/Templates/linkFloppy.desktop b/kdesktop/init/Templates/linkFloppy.desktop
index 6e18b2888..2a86dd575 100644
--- a/kdesktop/init/Templates/linkFloppy.desktop
+++ b/kdesktop/init/Templates/linkFloppy.desktop
@@ -53,7 +53,7 @@ Name[pt_BR]=Dispositivo de disquete...
 Name[ro]=Dispozitiv Floppy...
 Name[ru]=Дисковод...
 Name[rw]=Apareye Disikete...
-Name[se]=Dibtqmaskearroovttadat …
+Name[se]=Dibmaskearroovttadat …
 Name[sk]=Disketová mechanika...
 Name[sl]=Disketna naprava ...
 Name[sr]=Флопи уређај...
@@ -131,7 +131,7 @@ Comment[pt_BR]=Novo dispositivo de disquete
 Comment[ro]=Dispozitiv Floppy nou
 Comment[ru]=Ссылка на устройство дисковода
 Comment[rw]=Apareye Disikete Nshya
-Comment[se]=Ođđa dibtqmaskearroovttadat
+Comment[se]=Ođđa dibmaskearroovttadat
 Comment[sk]=Nová disketová mechanika
 Comment[sl]=Nova disketna naprava
 Comment[sr]=Нови флопи уређај
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc
index 2a6b64ec6..1d39a093d 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cc
@@ -81,8 +81,8 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
     TQString serviceName = s->name();
 
     // item names may contain ampersands. To avoid them being converted
-    // to accelators, tqreplace them with two ampersands.
-    serviceName.tqreplace("&", "&&");
+    // to accelators, replace them with two ampersands.
+    serviceName.replace("&", "&&");
 
     TQPixmap normal = KGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
                                                                  0, KIcon::DefaultState, 0L, true);
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 3c7611be4..5d20aa12d 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -67,7 +67,7 @@ extern int kdesktop_screen_number;
 TQRect KDIconView::desktopRect()
 {
     return ( kdesktop_screen_number == 0 )
-            ? TQApplication::desktop()->tqgeometry() // simple case, or xinerama
+            ? TQApplication::desktop()->geometry() // simple case, or xinerama
             : TQApplication::desktop()->screenGeometry( kdesktop_screen_number ); // multi-head
 }
 
@@ -296,7 +296,7 @@ void KDIconView::initConfig( bool init )
     m_bSortDirectoriesFirst = KDesktopSettings::directoriesFirst();
     m_itemsAlwaysFirst = KDesktopSettings::alwaysFirstItems(); // Distributor plug-in
 
-    if (KProtocolInfo::isKnownProtocol(TQString::tqfromLatin1("media")))
+    if (KProtocolInfo::isKnownProtocol(TQString::fromLatin1("media")))
         m_enableMedia=KDesktopSettings::mediaEnabled();
     else
         m_enableMedia=false;
@@ -321,7 +321,7 @@ void KDIconView::initConfig( bool init )
     if ( previewSettings().count() )
     {
         for ( TQStringList::ConstIterator it = oldPreview.begin(); it != oldPreview.end(); ++it)
-            if ( !previewSettings().tqcontains( *it ) ){
+            if ( !previewSettings().contains( *it ) ){
                 kdDebug(1204) << "Disabling preview for " << *it << endl;
                 if ( *it == "audio/" )
                     disableSoundPreviews();
@@ -581,7 +581,7 @@ KURL KDIconView::desktopURL()
     if (kdesktop_screen_number != 0) {
         TQString dn = "Desktop";
         dn += TQString::number(kdesktop_screen_number);
-        desktopPath.tqreplace("Desktop", dn);
+        desktopPath.replace("Desktop", dn);
     }
 
     KURL desktopURL;
@@ -748,7 +748,7 @@ void KDIconView::fillMediaListView()
     for (; it2 != mimetypes.end(); ++it2) {
        if ( ((*it2)->name().startsWith("media/")) )
 	{
-    	    bool ok=excludedMedia.tqcontains((*it2)->name())==0;
+    	    bool ok=excludedMedia.contains((*it2)->name())==0;
 		new DesktopBehaviorMediaItem (mMediaListView, (*it2)->comment(), (*it2)->name(),ok);
         }
     }
@@ -960,20 +960,20 @@ bool KDIconView::isDesktopFile( KFileItem * _item ) const
     return false;
 
   // return true if desktop file
-  return ( (_item->mimetype() == TQString::tqfromLatin1("application/x-desktop"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mydocuments"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mycomputer"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-mynetworkplaces"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-printers"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-trash"))
-       || (_item->mimetype() == TQString::tqfromLatin1("media/builtin-webbrowser")) );
+  return ( (_item->mimetype() == TQString::fromLatin1("application/x-desktop"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mydocuments"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mycomputer"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-mynetworkplaces"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-printers"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-trash"))
+       || (_item->mimetype() == TQString::fromLatin1("media/builtin-webbrowser")) );
 }
 
 TQString KDIconView::stripDesktopExtension( const TQString & text )
 {
-    if (text.right(7) == TQString::tqfromLatin1(".kdelnk"))
+    if (text.right(7) == TQString::fromLatin1(".kdelnk"))
       return text.left(text.length() - 7);
-    else if (text.right(8) == TQString::tqfromLatin1(".desktop"))
+    else if (text.right(8) == TQString::fromLatin1(".desktop"))
       return text.left(text.length() - 8);
     return text;
 }
@@ -1009,12 +1009,12 @@ bool KDIconView::makeFriendlyText( KFileIVI *fileIVI )
         TQStringList tmpList;
         if (cfg.hasKey("OnlyShowIn"))
         {
-            if (!cfg.readListEntry("OnlyShowIn", ';').tqcontains("KDE"))
+            if (!cfg.readListEntry("OnlyShowIn", ';').contains("KDE"))
                 return false;
         }
         if (cfg.hasKey("NotShowIn"))
         {
-            if (cfg.readListEntry("NotShowIn", ';').tqcontains("KDE"))
+            if (cfg.readListEntry("NotShowIn", ';').contains("KDE"))
                 return false;
         }
         if (cfg.hasKey("TryExec"))
@@ -1055,7 +1055,7 @@ void KDIconView::slotNewItems( const KFileItemList & entries )
   KURL desktop_URL = desktopURL();
   if (desktop_URL.isLocalFile())
     desktopPath = desktop_URL.path();
-  // We have new items, so we'll need to tqrepaint in slotCompleted
+  // We have new items, so we'll need to repaint in slotCompleted
   m_bNeedRepaint = true;
   kdDebug(1214) << "KDIconView::slotNewItems count=" << entries.count() << endl;
   KFileItemListIterator it(entries);
@@ -1198,7 +1198,7 @@ void KDIconView::slotRefreshItems( const KFileItemList & entries )
     }
     else
     {
-        // In case we tqreplace a big icon with a small one, need to tqrepaint.
+        // In case we replace a big icon with a small one, need to repaint.
         updateContents();
         // Can't do that with m_bNeedRepaint since slotCompleted isn't called
         m_bNeedRepaint = false;
@@ -1305,7 +1305,7 @@ void KDIconView::slotCompleted()
     if (!m_hasExistingPos)
         rearrangeIcons();
 
-//    kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " tqrepaint:" << m_bNeedRepaint << endl;
+//    kdDebug(1204) << "KDIconView::slotCompleted save:" << m_bNeedSave << " repaint:" << m_bNeedRepaint << endl;
     if ( m_bNeedSave )
     {
         // Done here because we want to align icons only once initially, and each time new icons appear.
@@ -1317,7 +1317,7 @@ void KDIconView::slotCompleted()
     }
     if ( m_bNeedRepaint )
     {
-        viewport()->tqrepaint();
+        viewport()->repaint();
         m_bNeedRepaint = false;
     }
 }
@@ -1463,7 +1463,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
 {
     kdDebug(1204)<<"void KDIconView::contentsDropEvent( TQDropEvent * e )\n";
     // mind: if it's a filedrag which itself is an image, libkonq is called. There's a popup for drops as well
-    // that tqcontains the same line "Set as Wallpaper" in void KonqOperations::asyncDrop
+    // that contains the same line "Set as Wallpaper" in void KonqOperations::asyncDrop
     bool isColorDrag = KColorDrag::canDecode(e);
     bool isImageDrag = TQImageDrag::canDecode(e);
     bool isUrlDrag = KURLDrag::canDecode(e);
@@ -1471,7 +1471,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     bool isImmutable = KGlobal::config()->isImmutable();
 
     if ( (isColorDrag || isImageDrag) && !isUrlDrag ) {
-        // Hack to clear the drag tqshape
+        // Hack to clear the drag shape
         bool bMovable = itemsMovable();
         bool bSignals = signalsBlocked();
         setItemsMovable(false);
@@ -1499,7 +1499,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     bool adjustedAnyItems = false;
     for( TQIconViewItem *item = firstItem(); item; item = item->nextItem() )
     {
-        if( !desk.tqcontains( item->rect(), true ))
+        if( !desk.contains( item->rect(), true ))
         {
             TQRect r = item->rect();
 
@@ -1519,7 +1519,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
     if( adjustedAnyItems )
     {
         // Make sure the viewport isn't unnecessarily resized by now,
-        // then schedule a tqrepaint to remove any garbage pixels.
+        // then schedule a repaint to remove any garbage pixels.
         resizeContents( width(), height() );
         viewport()->update();
     }
@@ -1541,7 +1541,7 @@ void KDIconView::updateWorkArea( const TQRect &wr )
 {
     m_gotIconsArea = true;  // now we have it!
 
-    if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return;  // nothing changed; avoid tqrepaint/saveIconPosition ...
+    if (( iconArea() == wr ) && (m_needDesktopAlign == false)) return;  // nothing changed; avoid repaint/saveIconPosition ...
 
     TQRect oldArea = iconArea();
     setIconArea( wr );
@@ -1593,8 +1593,8 @@ void KDIconView::updateWorkArea( const TQRect &wr )
             }
         }
         if ( needRepaint ) {
-            viewport()->tqrepaint( FALSE );
-            tqrepaint( FALSE );
+            viewport()->repaint( FALSE );
+            repaint( FALSE );
             saveIconPositions();
         }
     }
@@ -1718,7 +1718,7 @@ void KDIconView::moveToFreePosition(TQIconViewItem *item )
     TQRect rect=item->rect();
     if (m_bVertAlign)
     {
-	kdDebug(1214)<<"moveToFreePosition for vertical tqalignment"<<endl;
+	kdDebug(1214)<<"moveToFreePosition for vertical alignment"<<endl;
 
 	rect.moveTopLeft(TQPoint(spacing(),spacing()));
       do
diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h
index c9a680b4f..6afde0e4b 100644
--- a/kdesktop/kdiconview.h
+++ b/kdesktop/kdiconview.h
@@ -43,7 +43,7 @@ class KDesktopShadowSettings;
  *
  * Added shadow capability by Laur Ivan (C) 2003
  * The shadow is supported by the new KFileIVIDesktop objects
- * which tqreplace KFileIVI objects.
+ * which replace KFileIVI objects.
  */
 class KDIconView : public KonqIconViewWidget, public KDirNotify
 {
diff --git a/kdesktop/kfileividesktop.cpp b/kdesktop/kfileividesktop.cpp
index 7d0f201ab..d5e367bc0 100644
--- a/kdesktop/kfileividesktop.cpp
+++ b/kdesktop/kfileividesktop.cpp
@@ -73,15 +73,15 @@ void KFileIVIDesktop::calcRect( const TQString& _text )
 
     int spread = shadowThickness();
     TQRect itemTextRect = textRect();
-    TQRect tqitemRect = rect();
+    TQRect itemRect = rect();
 
     itemTextRect.setBottom( itemTextRect.bottom() + spread );
     itemTextRect.setRight( itemTextRect.right() + spread );
-    tqitemRect.setBottom( tqitemRect.bottom() + spread );
-    tqitemRect.setRight( tqitemRect.right() + spread );
+    itemRect.setBottom( itemRect.bottom() + spread );
+    itemRect.setRight( itemRect.right() + spread );
 
     setTextRect( itemTextRect );
-    setItemRect( tqitemRect );
+    setItemRect( itemRect );
 }
 
 void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)
@@ -191,7 +191,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
     else {
       text = settings->textColor();
       shadow = ( settings->bgColor().isValid() ) ? settings->bgColor() :
-               ( tqGray( text.rgb() ) > 127 ) ? black : white;
+               ( qGray( text.rgb() ) > 127 ) ? black : white;
       if (rebuild) {
         setNormalImage(buildShadow(p, align, shadow));
         _normalUID = uid;
diff --git a/kdesktop/kfileividesktop.h b/kdesktop/kfileividesktop.h
index b0a7ff33f..129abec07 100644
--- a/kdesktop/kfileividesktop.h
+++ b/kdesktop/kfileividesktop.h
@@ -40,7 +40,7 @@ class TQFont;
 class KShadowEngine;
 
 /**
- * This class tqreplaces KFileIVI in the desktop only.
+ * This class replaces KFileIVI in the desktop only.
  * If the shadow object is NULL, then the class should behave almost identical
  * to its parent.
  * @since 3.2
@@ -91,7 +91,7 @@ class KFileIVIDesktop : public KFileIVI
      * Builds the shadow. As the algorithm is pretty slow (at pixel level),
      * This method is triggered only if the configuration has changed.
      * @param p the painter for drawing the item
-     * @param align the shadow tqalignment
+     * @param align the shadow alignment
      * @param shadowColor the shadow color
      */
     virtual TQImage *buildShadow(TQPainter *p, const int align, TQColor &shadowColor);
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc
index 036061ccb..e44c027c2 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cc
@@ -243,7 +243,7 @@ void KRootWm::initConfig()
     if (s == s_choices[c])
       { rightButtonChoice = (menuChoice) c; break; }
 
-  // Read configuration for icons tqalignment
+  // Read configuration for icons alignment
   if ( m_bDesktopEnabled ) {
     bool startup = true; m_pDesktop->iconView()->setAutoAlign( KDesktopSettings::autoLineUpIcons() ); 
     if ( kapp->authorize( "editable_desktop_icons" ) ) {
@@ -630,14 +630,14 @@ void KRootWm::slotWindowList() {
   TQDesktopWidget* desktop = KApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
-      r = desktop->tqgeometry();
+      r = desktop->geometry();
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   windowListMenu->init();
   disconnect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotWindowListAboutToShow() ) ); // avoid calling init() twice
-  // windowListMenu->rect() is not valid before showing, use tqsizeHint()
-  windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->tqsizeHint()).center());
+  // windowListMenu->rect() is not valid before showing, use sizeHint()
+  windowListMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), windowListMenu->sizeHint()).center());
   windowListMenu->selectActiveWindow(); // make the popup more useful
   connect( windowListMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotWindowListAboutToShow() ) );
@@ -650,13 +650,13 @@ void KRootWm::slotSwitchUser() {
   TQDesktopWidget* desktop = KApplication::desktop();
   TQRect r;
   if (desktop->numScreens() < 2)
-      r = desktop->tqgeometry();
+      r = desktop->geometry();
   else
       r = desktop->screenGeometry( desktop->screenNumber(TQCursor::pos()));
   slotPopulateSessions();
   disconnect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
            this, TQT_SLOT( slotPopulateSessions() ) ); // avoid calling init() twice
-  sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->tqsizeHint()).center());
+  sessionsMenu->popup(r.center() - TQRect( TQPoint( 0, 0 ), sessionsMenu->sizeHint()).center());
   connect( sessionsMenu, TQT_SIGNAL( aboutToShow() ),
            TQT_SLOT( slotPopulateSessions() ) );
 }
diff --git a/kdesktop/kshadowengine.cpp b/kdesktop/kshadowengine.cpp
index e8493b92b..893eac8e0 100644
--- a/kdesktop/kshadowengine.cpp
+++ b/kdesktop/kshadowengine.cpp
@@ -110,7 +110,7 @@ TQImage KShadowEngine::makeShadow(const TQPixmap& textPixmap, const TQColor &bgC
       alphaShadow = (alphaShadow > m_shadowSettings->maxOpacity()) ? m_shadowSettings->maxOpacity() : alphaShadow;
 
       // update the shadow's i,j pixel.
-      result.setPixel(i,j, tqRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
+      result.setPixel(i,j, qRgba(bgRed, bgGreen , bgBlue, (int) alphaShadow));
     }
   }
   return result;
@@ -127,15 +127,15 @@ double KShadowEngine::defaultDecay(TQImage& source, int i, int j)
     return 0;
 
   double alphaShadow;
-  alphaShadow =(tqGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
-		tqGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
+  alphaShadow =(qGray(source.pixel(i-1,j-1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i-1,j  )) * AXIS_FACTOR +
+		qGray(source.pixel(i-1,j+1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i  ,j-1)) * AXIS_FACTOR +
 		0                         +
-		tqGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
-		tqGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
-		tqGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
-		tqGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
+		qGray(source.pixel(i  ,j+1)) * AXIS_FACTOR +
+		qGray(source.pixel(i+1,j-1)) * DIAGONAL_FACTOR +
+		qGray(source.pixel(i+1,j  )) * AXIS_FACTOR +
+		qGray(source.pixel(i+1,j+1)) * DIAGONAL_FACTOR) / m_shadowSettings->multiplicationFactor();
 
   return alphaShadow;
 }
@@ -185,7 +185,7 @@ double KShadowEngine::noDecay(TQImage& source, int i, int j)
 	else
 	  sy = j + m;
 
-	opacity += tqGray(source.pixel(sx, sy));
+	opacity += qGray(source.pixel(sx, sy));
       }
     }
     alphaShadow += opacity / m_shadowSettings->multiplicationFactor();
diff --git a/kdesktop/kshadowengine.h b/kdesktop/kshadowengine.h
index 4a9d6b7eb..33391e464 100644
--- a/kdesktop/kshadowengine.h
+++ b/kdesktop/kshadowengine.h
@@ -92,13 +92,13 @@ class KShadowEngine
 
 		/*
 		 * a slower algorithm where the influence of a pixel
-		 * is  tqGray(px)/(abs(dx) + abs(dy) +1).
+		 * is  qGray(px)/(abs(dx) + abs(dy) +1).
 		 */
 		double doubleLinearDecay(TQImage& source, int x, int y);
 
 		/*
 		 * a very slow algorithm where the influence of a pixel
-		 * is  tqGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
+		 * is  qGray(px)/(sqrt(sqr(dx) + sqr(dy)) +1).
 		 */
 		double radialDecay(TQImage& source, int x, int y);
 
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 01792ad76..ff173c842 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -52,9 +52,9 @@ void readXdgUserDirs(TQString *desktop, TQString *documents)
 	while (!line.isNull())
 	{
 		if (line.startsWith("XDG_DESKTOP_DIR="))
-			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 		else if (line.startsWith("XDG_DOCUMENTS_DIR="))
-			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").tqreplace("$HOME", TQDir::homeDirPath());
+			*documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath());
 
 		line = s.readLine();
 	}
@@ -132,7 +132,7 @@ int main( int argc, char **argv)
 						}
 						if (directoryOk == true) {
 							TQString xdgModifiedDirectory = newDirectory;
-							xdgModifiedDirectory = xdgModifiedDirectory.tqreplace(TQDir::homeDirPath(), "$HOME");
+							xdgModifiedDirectory = xdgModifiedDirectory.replace(TQDir::homeDirPath(), "$HOME");
 							while (xdgModifiedDirectory.endsWith("/")) {
 								xdgModifiedDirectory.truncate(xdgModifiedDirectory.length()-1);
 							}
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc
index 79a59787b..b51791d98 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cc
@@ -39,8 +39,8 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
     TQLabel *greetLabel = new TQLabel(i18n("<nobr><qt><b>Automatic Log Out</b></qt><nobr>"), frame);
     TQLabel *infoLabel = new TQLabel(i18n("<qt>To prevent being logged out, resume using this session by moving the mouse or pressing a key.</qt>"), frame);
 
-    mtqStatusLabel = new TQLabel("<b> </b>", frame);
-    mtqStatusLabel->tqsetAlignment(TQLabel::AlignCenter);
+    mStatusLabel = new TQLabel("<b> </b>", frame);
+    mStatusLabel->setAlignment(TQLabel::AlignCenter);
 
     TQLabel *mProgressLabel = new TQLabel("Time Remaining:", frame);
     mProgressRemaining = new TQProgressBar(frame);
@@ -52,7 +52,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
     frameLayout = new TQGridLayout(frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint());
     frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | Qt::AlignTop);
     frameLayout->addWidget(greetLabel, 0, 1);
-    frameLayout->addWidget(mtqStatusLabel, 1, 1);
+    frameLayout->addWidget(mStatusLabel, 1, 1);
     frameLayout->addWidget(infoLabel, 2, 1);
     frameLayout->addWidget(mProgressLabel, 3, 1);
     frameLayout->addWidget(mProgressRemaining, 4, 1);
@@ -66,7 +66,7 @@ AutoLogout::AutoLogout(LockProcess *parent) : TQDialog(parent, "password dialog"
 
     mCountdownTimerId = startTimer(1000/25);
 
-    connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
+    connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()));
 }
 
 AutoLogout::~AutoLogout()
@@ -76,7 +76,7 @@ AutoLogout::~AutoLogout()
 
 void AutoLogout::updateInfo(int timeout)
 {
-    mtqStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>",
+    mStatusLabel->setText(i18n("<nobr><qt>You will be automatically logged out in 1 second</qt></nobr>",
                                "<nobr><qt>You will be automatically logged out in %n seconds</qt></nobr>",
                                timeout / 25) );
     mProgressRemaining->setProgress(timeout);
diff --git a/kdesktop/lock/autologout.h b/kdesktop/lock/autologout.h
index 355ac8635..f40ac5f0d 100644
--- a/kdesktop/lock/autologout.h
+++ b/kdesktop/lock/autologout.h
@@ -39,7 +39,7 @@ private:
     void        updateInfo(int);
     TQFrame      *frame;
     TQGridLayout *frameLayout;
-    TQLabel      *mtqStatusLabel;
+    TQLabel      *mStatusLabel;
     int         mCountdownTimerId;
     int         mRemaining;
     TQTimer      countDownTimer;
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc
index 460c8d590..2249dc46e 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cc
@@ -71,18 +71,18 @@ InfoDlg::InfoDlg(LockProcess *parent)
 
     KUser user;
 
-    mtqStatusLabel = new TQLabel( "<b> </b>", frame );
-    mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
+    mStatusLabel = new TQLabel( "<b> </b>", frame );
+    mStatusLabel->setAlignment( TQLabel::AlignCenter );
 
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
 
-    TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
-    laytqStatus->addWidget( mtqStatusLabel );
+    TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
+    layStatus->addWidget( mStatusLabel );
 
     frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
     frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
-    frameLayout->addLayout( laytqStatus, 1, 1 );
+    frameLayout->addLayout( layStatus, 1, 1 );
 
     installEventFilter(this);
 }
@@ -94,8 +94,8 @@ InfoDlg::~InfoDlg()
 
 void InfoDlg::updateLabel(TQString &txt)
 {
-    mtqStatusLabel->setPaletteForegroundColor(Qt::black);
-    mtqStatusLabel->setText("<b>" + txt + "</b>");
+    mStatusLabel->setPaletteForegroundColor(Qt::black);
+    mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
 void InfoDlg::setUnlockIcon()
diff --git a/kdesktop/lock/infodlg.h b/kdesktop/lock/infodlg.h
index 687a7c28a..a0ca3b8c0 100644
--- a/kdesktop/lock/infodlg.h
+++ b/kdesktop/lock/infodlg.h
@@ -43,11 +43,11 @@ public:
 private:
     TQFrame      *frame;
     TQGridLayout *frameLayout;
-    TQLabel      *mtqStatusLabel;
+    TQLabel      *mStatusLabel;
     TQLabel      *mpixLabel;
     int         mCapsLocked;
     bool        mUnlockingFailed;
-    TQStringList tqlayoutsList;
+    TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
 };
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc
index 67c2a063e..2efe56a8a 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cc
@@ -82,8 +82,8 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
             i18n("<nobr><b>The session is locked</b><br>") :
             i18n("<nobr><b>The session was locked by %1</b><br>").arg( user.fullName() ), frame );
 
-    mtqStatusLabel = new TQLabel( "<b> </b>", frame );
-    mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
+    mStatusLabel = new TQLabel( "<b> </b>", frame );
+    mStatusLabel->setAlignment( TQLabel::AlignCenter );
 
     mLayoutButton = new TQPushButton( frame );
     mLayoutButton->setFlat( true );
@@ -101,9 +101,9 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
 
-    TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
-    laytqStatus->addWidget( mtqStatusLabel );
-    laytqStatus->addWidget( mLayoutButton );
+    TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
+    layStatus->addWidget( mStatusLabel );
+    layStatus->addWidget( mLayoutButton );
 
     TQHBoxLayout *layButtons = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
     layButtons->addWidget( mNewSessButton );
@@ -115,7 +115,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     frameLayout->addMultiCellWidget( pixLabel, 0, 2, 0, 0, AlignTop );
     frameLayout->addWidget( greetLabel, 0, 1 );
     frameLayout->addItem( greet->getLayoutItem(), 1, 1 );
-    frameLayout->addLayout( laytqStatus, 2, 1 );
+    frameLayout->addLayout( layStatus, 2, 1 );
     frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
     frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
 
@@ -123,7 +123,7 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
     setTabOrder( cancel, mNewSessButton );
     setTabOrder( mNewSessButton, mLayoutButton );
 
-    connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(tqlayoutClicked()));
+    connect(mLayoutButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(layoutClicked()));
     connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()));
     connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotOK()));
     connect(mNewSessButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSwitchUser()));
@@ -135,17 +135,17 @@ PasswordDlg::PasswordDlg(LockProcess *parent, GreeterPluginHandle *plugin)
 
     mFailedTimerId = 0;
     mTimeoutTimerId = startTimer(PASSDLG_HIDE_TIMEOUT);
-    connect(tqApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
+    connect(qApp, TQT_SIGNAL(activity()), TQT_SLOT(slotActivity()) );
 
     greet->start();
 
     DCOPRef kxkb("kxkb", "kxkb");
     if( !kxkb.isNull() ) {
-        tqlayoutsList = kxkb.call("getLayoutsList");
+        layoutsList = kxkb.call("getLayoutsList");
         TQString currentLayout = kxkb.call("getCurrentLayout");
-        if( !currentLayout.isEmpty() && tqlayoutsList.count() > 1 ) {
-            currLayout = tqlayoutsList.find(currentLayout);
-            if (currLayout == tqlayoutsList.end())
+        if( !currentLayout.isEmpty() && layoutsList.count() > 1 ) {
+            currLayout = layoutsList.find(currentLayout);
+            if (currLayout == layoutsList.end())
                 setLayoutText("err");
             else
                 setLayoutText(*currLayout);
@@ -164,11 +164,11 @@ PasswordDlg::~PasswordDlg()
     delete greet;
 }
 
-void PasswordDlg::tqlayoutClicked()
+void PasswordDlg::layoutClicked()
 {
 
-    if( ++currLayout == tqlayoutsList.end() )
-        currLayout = tqlayoutsList.begin();
+    if( ++currLayout == layoutsList.end() )
+        currLayout = layoutsList.begin();
 
     DCOPRef kxkb("kxkb", "kxkb");
     setLayoutText( kxkb.call("setLayout", *currLayout) ? *currLayout : "err" );
@@ -179,7 +179,7 @@ void PasswordDlg::setLayoutText( const TQString &txt )
 {
     mLayoutButton->setText( txt );
     TQSize sz = mLayoutButton->fontMetrics().size( 0, txt );
-    int mrg = mLayoutButton->style().tqpixelMetric( TQStyle::PM_ButtonMargin ) * 2;
+    int mrg = mLayoutButton->style().pixelMetric( TQStyle::PM_ButtonMargin ) * 2;
     mLayoutButton->setFixedSize( sz.width() + mrg, sz.height() + mrg );
 }
 
@@ -187,18 +187,18 @@ void PasswordDlg::updateLabel()
 {
     if (mUnlockingFailed)
     {
-        mtqStatusLabel->setPaletteForegroundColor(Qt::black);
-        mtqStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
+        mStatusLabel->setPaletteForegroundColor(Qt::black);
+        mStatusLabel->setText(i18n("<b>Unlocking failed</b>"));
     }
     else
     if (mCapsLocked)
     {
-        mtqStatusLabel->setPaletteForegroundColor(Qt::red);
-        mtqStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
+        mStatusLabel->setPaletteForegroundColor(Qt::red);
+        mStatusLabel->setText(i18n("<b>Warning: Caps Lock on</b>"));
     }
     else
     {
-        mtqStatusLabel->setText("<b> </b>");
+        mStatusLabel->setText("<b> </b>");
     }
 }
 
@@ -480,7 +480,7 @@ void PasswordDlg::gplugMsgBox( TQMessageBox::Icon type, const TQString &text )
     TQLabel *label2 = new TQLabel( text, winFrame );
     KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
     button->setDefault( true );
-    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( accept() ) );
 
     TQGridLayout *grid = new TQGridLayout( winFrame, 2, 2, 10 );
@@ -667,9 +667,9 @@ void PasswordDlg::slotSwitchUser()
             ns++;
         }
         int fw = lv->frameWidth() * 2;
-        TQSize hds( lv->header()->tqsizeHint() );
+        TQSize hds( lv->header()->sizeHint() );
         lv->setMinimumWidth( fw + hds.width() +
-            (ns > 10 ? style().tqpixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
+            (ns > 10 ? style().pixelMetric(TQStyle::PM_ScrollBarExtent) : 0 ) );
         lv->setFixedHeight( fw + hds.height() +
             itm->height() * (ns < 6 ? 6 : ns > 10 ? 10 : ns) );
         lv->header()->adjustHeaderSize();
@@ -709,11 +709,11 @@ void PasswordDlg::slotSessionActivated()
 
 void PasswordDlg::capsLocked()
 {
-    unsigned int ltqmask;
+    unsigned int lmask;
     Window dummy1, dummy2;
     int dummy3, dummy4, dummy5, dummy6;
-    XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &ltqmask);
-    mCapsLocked = ltqmask & LockMask;
+    XQueryPointer(qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ), &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6, &lmask);
+    mCapsLocked = lmask & LockMask;
     updateLabel();
 }
 
diff --git a/kdesktop/lock/lockdlg.h b/kdesktop/lock/lockdlg.h
index fa506ee50..258339314 100644
--- a/kdesktop/lock/lockdlg.h
+++ b/kdesktop/lock/lockdlg.h
@@ -55,7 +55,7 @@ private slots:
     void slotSessionActivated();
     void slotStartNewSession();
     void slotOK();
-    void tqlayoutClicked();
+    void layoutClicked();
     void slotActivity();
 
 private:
@@ -77,14 +77,14 @@ private:
     KGreeterPlugin *greet;
     TQFrame      *frame;
     TQGridLayout *frameLayout;
-    TQLabel      *mtqStatusLabel;
+    TQLabel      *mStatusLabel;
     KPushButton *mNewSessButton, *ok, *cancel;
     TQPushButton *mLayoutButton;
     int         mFailedTimerId;
     int         mTimeoutTimerId;
     int         mCapsLocked;
     bool        mUnlockingFailed;
-    TQStringList tqlayoutsList;
+    TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
     TQListView   *lv;
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 3d264a08c..cdd5581e7 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -88,7 +88,7 @@ extern "C" {
 #include <X11/extensions/dpms.h>
 
 #ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 #endif
 }
 #endif
@@ -195,7 +195,7 @@ LockProcess::LockProcess(bool child, bool useBlankOnly)
 
     TQStringList dmopt =
         TQStringList::split(TQChar(','),
-                            TQString::tqfromLatin1( ::getenv( "XDM_MANAGED" )));
+                            TQString::fromLatin1( ::getenv( "XDM_MANAGED" )));
     for (TQStringList::ConstIterator it = dmopt.begin(); it != dmopt.end(); ++it)
         if ((*it).startsWith("method="))
             mMethod = (*it).mid(7);
@@ -944,7 +944,7 @@ void LockProcess::stopSaver()
 TQVariant LockProcess::getConf(void *ctx, const char *key, const TQVariant &dflt)
 {
     LockProcess *that = (LockProcess *)ctx;
-    TQString fkey = TQString::tqfromLatin1( key ) + '=';
+    TQString fkey = TQString::fromLatin1( key ) + '=';
     for (TQStringList::ConstIterator it = that->mPluginOptions.begin();
          it != that->mPluginOptions.end(); ++it)
         if ((*it).startsWith( fkey ))
@@ -1174,7 +1174,7 @@ int LockProcess::execDialog( TQDialog *dlg )
     currentDialog=dlg;
     dlg->adjustSize();
 
-    TQRect rect = dlg->tqgeometry();
+    TQRect rect = dlg->geometry();
     rect.moveCenter(KGlobalSettings::desktopGeometry(TQCursor::pos()).center());
     dlg->move( rect.topLeft() );
 
@@ -1341,7 +1341,7 @@ bool LockProcess::x11Event(XEvent *event)
     {
         XEvent ev2 = *event;
         ev2.xkey.window = ev2.xkey.subwindow = mDialogs.first()->winId();
-        tqApp->x11ProcessEvent( &ev2 );
+        qApp->x11ProcessEvent( &ev2 );
         return true;
     }
 
@@ -1453,7 +1453,7 @@ void LockProcess::msgBox( TQMessageBox::Icon type, const TQString &txt )
     TQLabel *label2 = new TQLabel( txt, winFrame );
     KPushButton *button = new KPushButton( KStdGuiItem::ok(), winFrame );
     button->setDefault( true );
-    button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+    button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
     connect( button, TQT_SIGNAL( clicked() ), &box, TQT_SLOT( accept() ) );
 
     TQVBoxLayout *vbox = new TQVBoxLayout( &box );
@@ -1481,7 +1481,7 @@ void LockProcess::showVkbd()
         mKWinModule = new KWinModule( NULL, KWinModule::INFO_WINDOWS );
         connect( mKWinModule, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
         mVkbdProcess = new KProcess;
-        *mVkbdProcess << "xvkbd" << "-compact" << "-tqgeometry" << "-0-0" << "-xdm";
+        *mVkbdProcess << "xvkbd" << "-compact" << "-geometry" << "-0-0" << "-xdm";
         mVkbdProcess->start();
     }
 }
@@ -1525,7 +1525,7 @@ void LockProcess::windowAdded( WId w, bool managed )
                                         &length, &after, &data );
             bool withdrawn = true;
             if ( r == Success && data && format == 32 ) {
-                TQ_UINT32 *wstate = (TQ_UINT32*)data;
+                Q_UINT32 *wstate = (Q_UINT32*)data;
                 withdrawn  = (*wstate == WithdrawnState );
                 XFree( (char *)data );
             }
@@ -1576,15 +1576,15 @@ bool LockProcess::forwardVkbdEvent( XEvent* event )
     for( TQValueList< VkbdWindow >::ConstIterator it = mVkbdWindows.begin();
          it != mVkbdWindows.end();
          ++it ) {
-        if( (*it).rect.tqcontains( pos )) {
+        if( (*it).rect.contains( pos )) {
             // Find the subwindow where the event should actually go.
             // Not exactly cheap in the number of X roundtrips but oh well.
             Window window = (*it).id;
             Window root, child;
             int root_x, root_y, x, y;
-            unsigned int tqmask;
+            unsigned int mask;
             for(;;) {
-                if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &tqmask ))
+                if( !XQueryPointer( qt_xdisplay(), window, &root, &child, &root_x, &root_y, &x, &y, &mask ))
                     return false;
                 if( child == None )
                     break;
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc
index ea1d1bc06..d4ad06e88 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cc
@@ -71,9 +71,9 @@ QueryDlg::QueryDlg(LockProcess *parent)
 
     KUser user;
 
-    mtqStatusLabel = new TQLabel( "<b> </b>", frame );
-    //mtqStatusLabel->tqsetAlignment( TQLabel::AlignCenter );
-    mtqStatusLabel->tqsetAlignment( TQLabel::AlignLeft );
+    mStatusLabel = new TQLabel( "<b> </b>", frame );
+    //mStatusLabel->setAlignment( TQLabel::AlignCenter );
+    mStatusLabel->setAlignment( TQLabel::AlignLeft );
 
     KSeparator *sep = new KSeparator( KSeparator::HLine, frame );
 
@@ -82,8 +82,8 @@ QueryDlg::QueryDlg(LockProcess *parent)
     TQVBoxLayout *unlockDialogLayout = new TQVBoxLayout( this );
     unlockDialogLayout->addWidget( frame );
 
-    TQHBoxLayout *laytqStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
-    laytqStatus->addWidget( mtqStatusLabel );
+    TQHBoxLayout *layStatus = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
+    layStatus->addWidget( mStatusLabel );
 
     TQHBoxLayout *layPin = new TQHBoxLayout( 0, 0, KDialog::spacingHint());
     pin_box = new KPasswordEdit( this, "pin_box" );
@@ -96,7 +96,7 @@ QueryDlg::QueryDlg(LockProcess *parent)
 
     frameLayout = new TQGridLayout( frame, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
     frameLayout->addMultiCellWidget( mpixLabel, 0, 2, 0, 0, AlignTop );
-    frameLayout->addLayout( laytqStatus, 0, 1 );
+    frameLayout->addLayout( layStatus, 0, 1 );
     frameLayout->addLayout( layPin, 2, 1 );
     frameLayout->addMultiCellWidget( sep, 3, 3, 0, 1 );
     frameLayout->addMultiCellLayout( layButtons, 4, 4, 0, 1 );
@@ -123,8 +123,8 @@ const char * QueryDlg::getEntry()
 
 void QueryDlg::updateLabel(TQString &txt)
 {
-    mtqStatusLabel->setPaletteForegroundColor(Qt::black);
-    mtqStatusLabel->setText("<b>" + txt + "</b>");
+    mStatusLabel->setPaletteForegroundColor(Qt::black);
+    mStatusLabel->setText("<b>" + txt + "</b>");
 }
 
 void QueryDlg::setUnlockIcon()
diff --git a/kdesktop/lock/querydlg.h b/kdesktop/lock/querydlg.h
index 698d7805d..e6a768369 100644
--- a/kdesktop/lock/querydlg.h
+++ b/kdesktop/lock/querydlg.h
@@ -46,11 +46,11 @@ private slots:
 private:
     TQFrame      *frame;
     TQGridLayout *frameLayout;
-    TQLabel      *mtqStatusLabel;
+    TQLabel      *mStatusLabel;
     TQLabel      *mpixLabel;
     int         mCapsLocked;
     bool        mUnlockingFailed;
-    TQStringList tqlayoutsList;
+    TQStringList layoutsList;
     TQStringList::iterator currLayout;
     int         sPid, sFd;
     KPushButton *ok;
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc
index 601efb1c4..43c39f19f 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cc
@@ -157,7 +157,7 @@ bool SaverEngine::enable( bool e )
 	}
         mXAutoLock->setTimeout(mTimeout);
         mXAutoLock->setDPMS(true);
-	//mXAutoLock->changeCornerLocktqStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
+	//mXAutoLock->changeCornerLockStatus( mLockCornerTopLeft, mLockCornerTopRight, mLockCornerBottomLeft, mLockCornerBottomRight);
 
         // We'll handle blanking
         XSetScreenSaver(qt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures);
diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp
index c036a4306..027aa0bfc 100644
--- a/kdesktop/minicli.cpp
+++ b/kdesktop/minicli.cpp
@@ -89,7 +89,7 @@ Minicli::Minicli( TQWidget *parent, const char *name)
   mainLayout->addWidget(m_dlg);
 
   m_dlg->lbRunIcon->setPixmap(DesktopIcon("kmenu"));
-  m_dlg->lbComment->tqsetAlignment( Qt::WordBreak );
+  m_dlg->lbComment->setAlignment( Qt::WordBreak );
 
   m_dlg->cbCommand->setDuplicatesEnabled( false );
   m_dlg->cbCommand->setTrapReturnKey( true );
@@ -179,9 +179,9 @@ void Minicli::setCommand(const TQString& command)
   }
 }
 
-TQSize Minicli::tqsizeHint() const
+TQSize Minicli::sizeHint() const
 {
-  int maxWidth = tqApp->desktop()->screenGeometry((TQWidget*)this).width();
+  int maxWidth = qApp->desktop()->screenGeometry((TQWidget*)this).width();
   if (maxWidth < 603)
   {
     // a sensible max for smaller screens
@@ -389,7 +389,7 @@ TQString Minicli::terminalCommand (const TQString& cmd, const TQString& args)
   else
     terminal += TQString(" -e /bin/sh -c \"%1 %2\"").arg(cmd).arg(args);
 
-  if (!m_terminalAppList.tqcontains(cmd))
+  if (!m_terminalAppList.contains(cmd))
     m_terminalAppList << cmd;
 
   return terminal;
@@ -414,13 +414,13 @@ int Minicli::runCommand()
     cmd = uri.url();
     
   TQCString asn;
-  if( tqApp->desktop()->isVirtualDesktop())
+  if( qApp->desktop()->isVirtualDesktop())
   {
     asn = KStartupInfo::createNewStartupId();
     KStartupInfoId id;
     id.initId( asn );
     KStartupInfoData data;
-    data.setXinerama( tqApp->desktop()->screenNumber( this ));
+    data.setXinerama( qApp->desktop()->screenNumber( this ));
     KStartupInfo::sendChange( id, data );
   }
 
@@ -558,7 +558,7 @@ int Minicli::runCommand()
         case KURIFilterData::HELP:
         {
           // No need for kfmclient, KRun does it all (David)
-          (void) new KRun( m_filterData->uri(), tqparentWidget(), asn );
+          (void) new KRun( m_filterData->uri(), parentWidget(), asn );
           return 0;
         }
         case KURIFilterData::EXECUTABLE:
@@ -570,7 +570,7 @@ int Minicli::runCommand()
             if (service && service->isValid() && service->type() == "Application")
             {
               notifyServiceStarted(service);
-              KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+              KRun::run(*service, KURL::List(), parentWidget(), asn );
               return 0;
             }
           }
@@ -605,7 +605,7 @@ int Minicli::runCommand()
           if (service && service->isValid() && service->type() == "Application")
           {
             notifyServiceStarted(service);
-            KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+            KRun::run(*service, KURL::List(), parentWidget(), asn );
             return 0;
           }
 
@@ -613,7 +613,7 @@ int Minicli::runCommand()
           if (service && service->isValid() && service->type() == "Application")
           {
             notifyServiceStarted(service);
-            KRun::run(*service, KURL::List(), tqparentWidget(), asn );
+            KRun::run(*service, KURL::List(), parentWidget(), asn );
             return 0;
           }
 
@@ -625,7 +625,7 @@ int Minicli::runCommand()
       }
     }
 
-    if ( KRun::runCommand( cmd, exec, m_iconName, tqparentWidget(), asn ) )
+    if ( KRun::runCommand( cmd, exec, m_iconName, parentWidget(), asn ) )
       return 0;
     else
     {
@@ -674,7 +674,7 @@ void Minicli::slotCmdChanged(const TQString& text)
     // Also use autocompletion if it appears that I am using some kind of ioslave, except the http:// ioslave
     m_urlCompletionStarted = true; // flag for slotMatch()
 
-    if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.tqcontains("://", false) != 0)) && (text.tqcontains("http://", false) == 0)) {
+    if ((text.startsWith( "/" ) || text.startsWith( "~" ) || (text.contains("://", false) != 0)) && (text.contains("http://", false) == 0)) {
         TQString completion = m_pURLCompletion->makeCompletion( text );
     }
   }
@@ -730,7 +730,7 @@ void Minicli::slotAdvanced()
 
     // Set the focus back to the widget that had it to begin with, i.e.
     // do not put the focus on the "Options" button.
-    m_FocusWidget = tqfocusWidget();
+    m_FocusWidget = focusWidget();
 
     if( m_FocusWidget )
       m_FocusWidget->setFocus();
@@ -763,7 +763,7 @@ void Minicli::parseLine( bool final )
     KURIFilter::self()->filterURI( *(m_filterData), m_middleFilters );
 
   bool isTerminalApp = ((m_filterData->uriType() == KURIFilterData::EXECUTABLE) &&
-                        m_terminalAppList.tqcontains(m_filterData->uri().url()));
+                        m_terminalAppList.contains(m_filterData->uri().url()));
 
   if( !isTerminalApp )
   {
@@ -792,7 +792,7 @@ void Minicli::parseLine( bool final )
 void Minicli::setIcon ()
 {
   if( m_iconName.isEmpty() || m_iconName == "unknown" || m_iconName == "kde" )
-    m_iconName = TQString::tqfromLatin1("kmenu");
+    m_iconName = TQString::fromLatin1("kmenu");
 
   TQPixmap icon = DesktopIcon( m_iconName );
 
@@ -806,14 +806,14 @@ void Minicli::setIcon ()
     {
       int x = icon.width() - overlay.width();
       int y = icon.height() - overlay.height();
-      if ( icon.tqmask() )
+      if ( icon.mask() )
       {
-        TQBitmap tqmask = *icon.tqmask();
-        bitBlt( &tqmask, x, y,
-                overlay.tqmask() ? const_cast<TQBitmap *>(overlay.tqmask()) : &overlay,
+        TQBitmap mask = *icon.mask();
+        bitBlt( &mask, x, y,
+                overlay.mask() ? const_cast<TQBitmap *>(overlay.mask()) : &overlay,
                 0, 0, overlay.width(), overlay.height(),
-                overlay.tqmask() ? OrROP : SetROP );
-        icon.setMask(tqmask);
+                overlay.mask() ? OrROP : SetROP );
+        icon.setMask(mask);
       }
       bitBlt( &icon, x, y, &overlay );
     }
@@ -837,9 +837,9 @@ void Minicli::updateAuthLabel()
       m_prevChecked = m_dlg->cbRunAsOther->isChecked();
       m_prevCached = true;
     }
-    if (m_dlg->leUsername->text() != TQString::tqfromLatin1("root"))
+    if (m_dlg->leUsername->text() != TQString::fromLatin1("root"))
       m_dlg->lePassword->setText(TQString::null);
-    m_dlg->leUsername->setText(TQString::tqfromLatin1("root"));
+    m_dlg->leUsername->setText(TQString::fromLatin1("root"));
     m_dlg->cbRunAsOther->setChecked(true);
     m_dlg->cbRunAsOther->setEnabled(false);
     m_dlg->leUsername->setEnabled(false);
@@ -884,7 +884,7 @@ void Minicli::slotTerminal(bool enable)
   if (enable)
   {
     m_prevIconName = m_iconName;
-    m_iconName = TQString::tqfromLatin1( "konsole" );
+    m_iconName = TQString::fromLatin1( "konsole" );
     setIcon();
   }
   else if (!m_prevIconName.isEmpty())
diff --git a/kdesktop/minicli.h b/kdesktop/minicli.h
index 93c296600..4ae49cf7c 100644
--- a/kdesktop/minicli.h
+++ b/kdesktop/minicli.h
@@ -57,7 +57,7 @@ public:
   void clearHistory();
   
   virtual void show();
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
 public slots:
   void saveConfig();
diff --git a/kdesktop/minicli_ui.ui b/kdesktop/minicli_ui.ui
index e426a4725..3809eb852 100644
--- a/kdesktop/minicli_ui.ui
+++ b/kdesktop/minicli_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>MinicliDlgUI</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -29,7 +29,7 @@
         </property>
         <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>80</width>
                             <height>20</height>
@@ -107,7 +107,7 @@
         </widget>
         <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>57</width>
                             <height>20</height>
@@ -157,7 +157,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>30</height>
@@ -286,7 +286,7 @@
                         </widget>
                         <widget class="QLayoutWidget" row="6" column="1">
                             <property name="name">
-                                <cstring>tqlayout30</cstring>
+                                <cstring>layout30</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -319,7 +319,7 @@
                                     <property name="sizeType">
                                         <enum>Minimum</enum>
                                     </property>
-                                    <property name="tqsizeHint">
+                                    <property name="sizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>9</height>
@@ -360,7 +360,7 @@
                         </widget>
                         <widget class="QLayoutWidget" row="6" column="2" rowspan="1" colspan="2">
                             <property name="name">
-                                <cstring>tqlayout29</cstring>
+                                <cstring>layout29</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -393,7 +393,7 @@
                                     <property name="text">
                                         <string>High</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
@@ -448,7 +448,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -515,7 +515,7 @@
             <property name="text">
                 <string></string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -531,7 +531,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>388</width>
                     <height>0</height>
@@ -556,7 +556,7 @@
             <property name="text">
                 <string>Enter the name of the application you want to run or the URL you want to view</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -636,8 +636,8 @@
     <include location="local" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <pixmapfunction>BarIcon</pixmapfunction>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc
index 30da39f01..bc869d341 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cc
@@ -58,7 +58,7 @@ KPixmapServer::~KPixmapServer()
 
 void KPixmapServer::add(TQString name, TQPixmap *pm, bool overwrite)
 {
-    if (m_Names.tqcontains(name)) 
+    if (m_Names.contains(name)) 
     {
 	if (overwrite)
 	    remove(name);
@@ -174,7 +174,7 @@ bool KPixmapServer::x11Event(XEvent *event)
 	}
 
 	// Check if there is no transaction in progress to the same property
-	if (m_Active.tqcontains(ev->property)) 
+	if (m_Active.contains(ev->property)) 
 	{
 	    kdDebug(1204) << ID << "selection is busy.\n";
 	    XSendEvent(qt_xdisplay(), ev->requestor, false, 0, &reply);
diff --git a/kdesktop/programs/xplanet.desktop b/kdesktop/programs/xplanet.desktop
index db0df2c47..5590a53e0 100644
--- a/kdesktop/programs/xplanet.desktop
+++ b/kdesktop/programs/xplanet.desktop
@@ -1,5 +1,5 @@
 [KDE Desktop Program]
-Command=xplanet --tqgeometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f
+Command=xplanet --geometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f
 Comment=XPlanet by Hari Nair
 Comment[af]=XPlaneet deur Hari Nair
 Comment[ar]=XPlanet من تليف Hari Nair
@@ -76,5 +76,5 @@ Comment[zh_CN]=Hari Nair 的 XPlanet
 Comment[zh_TW]=XPlanet (Hari Nair 繪製)
 Comment[zu]=XPlanet ngu-Hari Nair
 Executable=xplanet
-PreviewCommand=xplanet --tqgeometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f
+PreviewCommand=xplanet --geometry %xx%y --num_times 1 --output %f.jpg && mv %f.jpg %f
 Refresh=10
diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp
index d8c9be53f..720dd4bba 100644
--- a/kdesktop/startupid.cpp
+++ b/kdesktop/startupid.cpp
@@ -82,7 +82,7 @@ void StartupId::configure()
 
 void StartupId::gotNewStartup( const KStartupInfoId& id_P, const KStartupInfoData& data_P )
     {
-    TQString icon = data_P.tqfindIcon();
+    TQString icon = data_P.findIcon();
     current_startup = id_P;
     startups[ id_P ] = icon;
     start_startupid( icon );
@@ -92,7 +92,7 @@ void StartupId::gotStartupChange( const KStartupInfoId& id_P, const KStartupInfo
     {
     if( current_startup == id_P )
         {
-        TQString icon = data_P.tqfindIcon();
+        TQString icon = data_P.findIcon();
         if( !icon.isEmpty() && icon != startups[ current_startup ] )
             {
             startups[ id_P ] = icon;
@@ -218,8 +218,8 @@ void StartupId::start_startupid( const TQString& icon_P )
         }
     else
         {
-        if( icon_pixmap.tqmask() != NULL )
-            startup_widget->setMask( *icon_pixmap.tqmask());
+        if( icon_pixmap.mask() != NULL )
+            startup_widget->setMask( *icon_pixmap.mask());
         else
             startup_widget->clearMask();
         startup_widget->setBackgroundPixmap( icon_pixmap );
@@ -257,8 +257,8 @@ void StartupId::update_startupid()
         yoffset = frame_to_yoffset[ frame ];
         TQPixmap pm = pixmaps[ frame_to_pixmap[ frame ] ];
         startup_widget->setBackgroundPixmap( pm );
-        if ( pm.tqmask() != NULL )
-            startup_widget->setMask( *pm.tqmask() );
+        if ( pm.mask() != NULL )
+            startup_widget->setMask( *pm.mask() );
         else
             startup_widget->clearMask();
         if ( ++frame >= ( sizeof( frame_to_yoffset ) / sizeof( frame_to_yoffset[ 0 ] ) ) )
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc
index 40f26e58a..b69325f17 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cc
@@ -32,7 +32,7 @@ extern "C" {
 #include <X11/extensions/dpms.h>
 
 #ifndef HAVE_DPMSINFO_PROTO
-tqStatus DPMSInfo ( Display *, CARD16 *, BOOL * );
+Status DPMSInfo ( Display *, CARD16 *, BOOL * );
 #endif
 }
 #endif
diff --git a/kdesktop/xautolock_diy.c b/kdesktop/xautolock_diy.c
index 52a4254d5..b9df2f895 100644
--- a/kdesktop/xautolock_diy.c
+++ b/kdesktop/xautolock_diy.c
@@ -115,7 +115,7 @@ selectEvents (Window window, Bool substructureOnly)
   if (nofChildren) (void) XFree ((char*) children);
 
  /*
-  *  Build the appropriate event tqmask. The basic idea is that we don't
+  *  Build the appropriate event mask. The basic idea is that we don't
   *  want to interfere with the normal event propagation mechanism if
   *  we don't have to.
   *
@@ -134,8 +134,8 @@ selectEvents (Window window, Bool substructureOnly)
   {
     if (parent == None) /* the *real* rootwindow */
     {
-      attribs.all_event_tqmasks = 
-      attribs.do_not_propagate_tqmask = KeyPressMask;
+      attribs.all_event_masks = 
+      attribs.do_not_propagate_mask = KeyPressMask;
     }
     else if (!XGetWindowAttributes (queue.display, window, &attribs))
 #else
@@ -149,19 +149,19 @@ selectEvents (Window window, Bool substructureOnly)
 #if 0
     (void) XSelectInput (queue.display, window, 
                            SubstructureNotifyMask
-                         | (  (  attribs.all_event_tqmasks
-                               | attribs.do_not_propagate_tqmask)
+                         | (  (  attribs.all_event_masks
+                               | attribs.do_not_propagate_mask)
                             & KeyPressMask));
 #else
     {
-    int tqmask = SubstructureNotifyMask | attribs.your_event_mask;
+    int mask = SubstructureNotifyMask | attribs.your_event_mask;
     if( !substructureOnly )
         {
-        tqmask |=            (  (  attribs.all_event_masks
+        mask |=            (  (  attribs.all_event_masks
                                | attribs.do_not_propagate_mask)
                             & KeyPressMask  );
         }
-    (void) XSelectInput (queue.display, window, tqmask );
+    (void) XSelectInput (queue.display, window, mask );
     }
 #endif
 
diff --git a/kdesktop/xautolock_engine.c b/kdesktop/xautolock_engine.c
index 64c542bfb..1825b7fe2 100644
--- a/kdesktop/xautolock_engine.c
+++ b/kdesktop/xautolock_engine.c
@@ -74,7 +74,7 @@ xautolock_queryPointer (Display* d)
 {
   Window           dummyWin;         /* as it says                    */
   int              dummyInt;         /* as it says                    */
-  unsigned         tqmask;             /* modifier tqmask                 */
+  unsigned         mask;             /* modifier mask                 */
   int              rootX;            /* as it says                    */
   int              rootY;            /* as it says                    */
   int              corner;           /* corner index                  */
@@ -104,7 +104,7 @@ xautolock_queryPointer (Display* d)
   *  of pointer events.
   */
   if (!XQueryPointer (d, root, &root, &dummyWin, &rootX, &rootY,
-                      &dummyInt, &dummyInt, &tqmask))
+                      &dummyInt, &dummyInt, &mask))
   {
    /*
     *  Pointer has moved to another screen, so let's find out which one.
@@ -121,7 +121,7 @@ xautolock_queryPointer (Display* d)
 
   if (   rootX == prevRootX
       && rootY == prevRootY
-      && tqmask == prevMask)
+      && mask == prevMask)
   {
   xautolock_corner_t* corners = xautolock_corners;
    /*
@@ -186,7 +186,7 @@ xautolock_queryPointer (Display* d)
 #endif
     prevRootX = rootX;
     prevRootY = rootY;
-    prevMask = tqmask;
+    prevMask = mask;
 
     xautolock_resetTriggers ();
   }
@@ -224,7 +224,7 @@ evaluateTriggers (Display* d)
   *  when we are finally re-enabled.
   */
 #ifdef VMS
-  if (vmstqStatus == 0)  
+  if (vmsStatus == 0)  
   {
 #else /* VMS */
   if (lockerPid)
@@ -336,7 +336,7 @@ evaluateTriggers (Display* d)
       || now >= lockTrigger)
   {
 #ifdef VMS
-    if (vmstqStatus != 0)
+    if (vmsStatus != 0)
 #else /* VMS */
     if (!lockerPid)
 #endif /* VMS */
@@ -350,9 +350,9 @@ evaluateTriggers (Display* d)
         case 0:
           (void) close (ConnectionNumber (d));
 #ifdef VMS
-          vmstqStatus = 0;
+          vmsStatus = 0;
           lockerPid = lib$spawn ((lockNow ? &nowLockerDescr : &lockerDescr),
-	                         0, 0, &1, 0, 0, &vmstqStatus);
+	                         0, 0, &1, 0, 0, &vmsStatus);
 
 	  if (!(lockerPid & 1)) exit (lockerPid);
 
@@ -380,7 +380,7 @@ evaluateTriggers (Display* d)
           *  Nevertheless, simply resetting the screensaver is a
           *  convenience action that aids many xlock users, and doesn't
           *  harm anyone (*). The problem with older versions of xlock 
-	  *  is that they can be told to tqreplace (= disable) the real
+	  *  is that they can be told to replace (= disable) the real
 	  *  screensaver, but forget to reset that same screensaver if
 	  *  it was already active at the time xlock starts. I guess 
 	  *  xlock initially wasn't designed to be run without a user
diff --git a/kdesu/kdesud/handler.cpp b/kdesu/kdesud/handler.cpp
index 3e3e97c96..1d52a58ac 100644
--- a/kdesu/kdesud/handler.cpp
+++ b/kdesu/kdesud/handler.cpp
@@ -304,9 +304,9 @@ int ConnectionHandler::doCommand(TQCString buf)
             SuProcess proc;
             proc.setCommand(command);
             proc.setUser(user);
-            if (options.tqcontains('x'))
+            if (options.contains('x'))
                proc.setXOnly(true);
-            if (options.tqcontains('f'))
+            if (options.contains('f'))
                proc.setDCOPForwarding(true);
             proc.setPriority(m_Priority);
             proc.setScheduler(m_Scheduler);
diff --git a/kdesu/kdesud/kdesud.cpp b/kdesu/kdesud/kdesud.cpp
index f699c65de..49006a401 100644
--- a/kdesu/kdesud/kdesud.cpp
+++ b/kdesu/kdesud/kdesud.cpp
@@ -166,7 +166,7 @@ int create_socket()
     }
 
     // strip the screen number from the display
-    display.tqreplace(TQRegExp("\\.[0-9]+$"), "");
+    display.replace(TQRegExp("\\.[0-9]+$"), "");
 
     sock = TQFile::encodeName(locateLocal("socket", TQString("kdesud_%1").arg(display)));
     int stat_err=lstat(sock, &s);
diff --git a/kdesu/kdesud/repo.cpp b/kdesu/kdesud/repo.cpp
index 539dc35ed..cdbbcaed1 100644
--- a/kdesu/kdesud/repo.cpp
+++ b/kdesu/kdesud/repo.cpp
@@ -134,7 +134,7 @@ TQCString Repository::findKeys(const TQCString &group, const char *sep ) const
                 if (!list.isEmpty())
                 {
                     // Add the same keys only once please :)
-                    if( !list.tqcontains(key) )
+                    if( !list.contains(key) )
                     {
                         kdDebug(1205) << "Key added to list: " << key << endl;
                         list += '\007'; // I do not know
diff --git a/kdialog/README b/kdialog/README
index e7df11e1f..d029419c0 100644
--- a/kdialog/README
+++ b/kdialog/README
@@ -3,7 +3,7 @@ The syntax is very much inspired from the "dialog" command
 (which shows text mode dialogs).
 
 However the width and height attributes have been removed for
-most dialogs - Qt/KDE have tqlayouts ;)
+most dialogs - Qt/KDE have layouts ;)
 
 A tutorial on using kdialog is available at
 http://developer.kde.org/documentation/tutorials/kdialog/t1.html
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index 297822e96..8cf9b581f 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -108,10 +108,10 @@ class WinIdEmbedder: public QObject
 {
 public:
     WinIdEmbedder(bool printID, WId winId):
-        TQObject(tqApp), print(printID), id(winId)
+        TQObject(qApp), print(printID), id(winId)
     {
-        if (tqApp)
-            tqApp->installEventFilter(this);
+        if (qApp)
+            qApp->installEventFilter(this);
     }
 protected:
     bool eventFilter(TQObject *o, TQEvent *e);
@@ -241,9 +241,9 @@ static int directCommand(KCmdLineArgs *args)
 
         TQString text = TQString::fromLocal8Bit(args->getOption( option ));
         int pos;
-        while ((pos = text.find( TQString::tqfromLatin1("\\n") )) >= 0)
+        while ((pos = text.find( TQString::fromLatin1("\\n") )) >= 0)
         {
-            text.tqreplace(pos, 2, TQString::tqfromLatin1("\n"));
+            text.replace(pos, 2, TQString::fromLatin1("\n"));
         }
 
         if ( type == KMessageBox::WarningContinueCancel ) {
@@ -491,7 +491,7 @@ static int directCommand(KCmdLineArgs *args)
         if (args->count() >= 1)  {
             filter = TQString::fromLocal8Bit(args->arg(0));
         }
-	// copied from KFileDialog::getSaveFileName(), so we can add tqgeometry
+	// copied from KFileDialog::getSaveFileName(), so we can add geometry
 	bool specialDir = ( startDir.at(0) == ':' );
 	KFileDialog dlg( specialDir ? startDir : TQString::null, filter, 0, "filedialog", true );
 	if ( !specialDir )
@@ -597,44 +597,44 @@ static int directCommand(KCmdLineArgs *args)
             contextStr = TQString::fromLocal8Bit(args->arg(0));
         }
         KIcon::Group group = KIcon::NoGroup;
-        if ( groupStr == TQString::tqfromLatin1( "Desktop" ) )
+        if ( groupStr == TQString::fromLatin1( "Desktop" ) )
             group = KIcon::Desktop;
-        else if ( groupStr == TQString::tqfromLatin1( "Toolbar" ) )
+        else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
             group = KIcon::Toolbar;
-        else if ( groupStr == TQString::tqfromLatin1( "MainToolbar" ) )
+        else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
             group = KIcon::MainToolbar;
-        else if ( groupStr == TQString::tqfromLatin1( "Small" ) )
+        else if ( groupStr == TQString::fromLatin1( "Small" ) )
             group = KIcon::Small;
-        else if ( groupStr == TQString::tqfromLatin1( "Panel" ) )
+        else if ( groupStr == TQString::fromLatin1( "Panel" ) )
             group = KIcon::Panel;
-        else if ( groupStr == TQString::tqfromLatin1( "User" ) )
+        else if ( groupStr == TQString::fromLatin1( "User" ) )
             group = KIcon::User;
         KIcon::Context context = KIcon::Any;
         // From kicontheme.cpp
-        if ( contextStr == TQString::tqfromLatin1( "Devices" ) )
+        if ( contextStr == TQString::fromLatin1( "Devices" ) )
             context = KIcon::Device;
-        else if ( contextStr == TQString::tqfromLatin1( "MimeTypes" ) )
+        else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
             context = KIcon::MimeType;
-        else if ( contextStr == TQString::tqfromLatin1( "FileSystems" ) )
+        else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
             context = KIcon::FileSystem;
-        else if ( contextStr == TQString::tqfromLatin1( "Applications" ) )
+        else if ( contextStr == TQString::fromLatin1( "Applications" ) )
             context = KIcon::Application;
-        else if ( contextStr == TQString::tqfromLatin1( "Actions" ) )
+        else if ( contextStr == TQString::fromLatin1( "Actions" ) )
             context = KIcon::Action;
-        else if ( contextStr == QString::tqfromLatin1( "Animations" ) )
+        else if ( contextStr == QString::fromLatin1( "Animations" ) )
             context = KIcon::Animation;
-        else if ( contextStr == QString::tqfromLatin1( "Categories" ) )
+        else if ( contextStr == QString::fromLatin1( "Categories" ) )
             context = KIcon::Category;
-        else if ( contextStr == QString::tqfromLatin1( "Emblems" ) )
+        else if ( contextStr == QString::fromLatin1( "Emblems" ) )
             context = KIcon::Emblem;
-        else if ( contextStr == QString::tqfromLatin1( "Emotes" ) )
+        else if ( contextStr == QString::fromLatin1( "Emotes" ) )
             context = KIcon::Emote;
-        else if ( contextStr == QString::tqfromLatin1( "International" ) )
+        else if ( contextStr == QString::fromLatin1( "International" ) )
             context = KIcon::International;
-        else if ( contextStr == QString::tqfromLatin1( "Places" ) )
+        else if ( contextStr == QString::fromLatin1( "Places" ) )
             context = KIcon::Place;
-        else if ( contextStr == QString::tqfromLatin1( "tqStatus" ) )
-            context = KIcon::tqStatusIcon;
+        else if ( contextStr == QString::fromLatin1( "Status" ) )
+            context = KIcon::StatusIcon;
 
 	KIconDialog dlg(0, "icon dialog");
 	kapp->setTopWidget( &dlg );
diff --git a/kdialog/klistboxdialog.cpp b/kdialog/klistboxdialog.cpp
index 23fe18f53..d7abfb694 100644
--- a/kdialog/klistboxdialog.cpp
+++ b/kdialog/klistboxdialog.cpp
@@ -32,7 +32,7 @@ KListBoxDialog::KListBoxDialog(TQString text, TQWidget *parent)
   TQVBox *page = makeVBoxMainWidget();
 
   label = new TQLabel(text, page);
-  label->tqsetAlignment(AlignCenter);
+  label->setAlignment(AlignCenter);
 
   table = new TQListBox(page);
   table->setFocus();
diff --git a/kdialog/progressdemo b/kdialog/progressdemo
index 6c2ac6afb..e6f4bb48c 100755
--- a/kdialog/progressdemo
+++ b/kdialog/progressdemo
@@ -1,5 +1,5 @@
 #!/bin/sh
-dcopRef=`./kdialog --tqgeometry 300x200+100-100 --progressbar "Initialising" 6`
+dcopRef=`./kdialog --geometry 300x200+100-100 --progressbar "Initialising" 6`
 dcop $dcopRef setProgress 1
 dcop $dcopRef setLabel "Thinking really hard"
 sleep 2
diff --git a/kdialog/test b/kdialog/test
index 442b9c307..0d41dbb0a 100755
--- a/kdialog/test
+++ b/kdialog/test
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "yesno box:"
-./kdialog --tqgeometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no"
+./kdialog --geometry 400x300+100+50 --title "This is a yesno box" --yesno "Choose: yes or no"
 if [ $? = 0 ]; then
   echo " your choice was: yes"
 else
@@ -8,7 +8,7 @@ else
 fi
 
 echo "continue or cancel warning box:"
-./kdialog --tqgeometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel"
+./kdialog --geometry 200x300+100-50 --title "This is a warningcontinuecancel box" --warningcontinuecancel "Choose: continue or cancel"
 if [ $? = 0 ]; then
   echo " your choice was: continue"
 else
@@ -16,7 +16,7 @@ else
 fi
 
 echo "message box:"
-./kdialog --tqgeometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message"
+./kdialog --geometry 300x400-100-50 --title "This is a message" --msgbox "Well, this is it:\nthe message"
 
 echo "input box:"
 ./kdialog --title "This is a input box" --inputbox "What is your name" "Joe User"
@@ -26,8 +26,8 @@ else
   echo " you did not accept"
 fi
 
-echo "input box, with tqgeometry:"
-./kdialog --tqgeometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User"
+echo "input box, with geometry:"
+./kdialog --geometry 300x400-100-50 --title "This is a input box" --inputbox "What is your name" "Joe User"
 if [ $? = 0 ]; then
   echo " you accepted"
 else
@@ -35,25 +35,25 @@ else
 fi
 
 echo "text box:"
-./kdialog --tqgeometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300
+./kdialog --geometry 300x400-100-50 --miniicon "about_kde" --title "This is a text box" --textbox widgets.h 400 300
 
 echo "menu:"
-./kdialog --miniicon "about_kde" --tqgeometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish
+./kdialog --miniicon "about_kde" --geometry 300x400-100-50 --title "This is a menu" --default "French" --menu "Choose one of these" a English b German c French d Spanish
 
 echo "checklist:"
-./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on  b German off  c French off d Spanish on
+./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a checklist" --checklist "Choose some of these" a English on  b German off  c French off d Spanish on
 
 echo "radiolist:"
-./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off
+./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --title "This is a radiolist" --radiolist "Choose one of these" a English off b German off c French on d Spanish off
 
 echo "combobox:"
-./kdialog --tqgeometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge"
+./kdialog --geometry 400x300+100+50 --miniicon "about_kde" --default "Chocolate" --title "This is a combobox" --combobox "Pick your favorite ice-cream flavor:" "Vanilla" "Chocolate" "Strawberry" "Fudge"
 
 echo "passivepopup:"
-./kdialog --tqgeometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10
+./kdialog --geometry 1x1+200+350 --title "This is a passive popup" --passivepopup "It will disappear in about 10 seconds" 10
 
 echo "password:"
-./kdialog --title "This is a password dialog" --tqgeometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:"
+./kdialog --title "This is a password dialog" --geometry 400x300+100+50 --icon "desktop" --miniicon "about_kde" --password "Enter the password:"
 
 echo "Open File:"
 ./kdialog --getopenfilename . "*.cpp *.cc *.c |C and C++ Source Files"
diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp
index be20c51d7..a2064a5ba 100644
--- a/kdialog/widgets.cpp
+++ b/kdialog/widgets.cpp
@@ -218,7 +218,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
   table.setCurrentItem(0); // This is to circumvent a Qt bug
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
-    table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
+    table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
   }
 
   handleXGeometry(&box);
@@ -233,7 +233,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString&
     } else {
       for (unsigned int i=0; i<table.count(); i++)
         if (table.isSelected(i))
-          rs += TQString::tqfromLatin1("\"") + tags[i] + TQString::tqfromLatin1("\" ");
+          rs += TQString::fromLatin1("\"") + tags[i] + TQString::fromLatin1("\" ");
       result.append(rs);
     }
   }
@@ -260,7 +260,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString&
   table.insertStringList(entries);
 
   for (unsigned int i=0; i+2<args.count(); i += 3) {
-    table.setSelected( i/3, args[i+2] == TQString::tqfromLatin1("on") );
+    table.setSelected( i/3, args[i+2] == TQString::fromLatin1("on") );
   }
 
   handleXGeometry(&box);
diff --git a/kdm/ChangeLog b/kdm/ChangeLog
index 6d1674701..0189ab24a 100644
--- a/kdm/ChangeLog
+++ b/kdm/ChangeLog
@@ -1,4 +1,4 @@
-This change log tqcontains only changes relevant to the KDM configuration,
+This change log contains only changes relevant to the KDM configuration,
 startup and packaging. Bug fixes are not listed, and feature changes only
 if they affect the configuration.
 
@@ -22,7 +22,7 @@ if they affect the configuration.
 
 2005-01-23  Oswald Buddenhagen <ossi@kde.org>
 
-	* Added Grub support to boot options. Option UseLilo tqreplaced
+	* Added Grub support to boot options. Option UseLilo replaced
 	  with BootManager { None, Grub, Lilo }. Removed options LiloCmd
 	  and LiloMap.
 
@@ -49,7 +49,7 @@ if they affect the configuration.
 
 2004-07-10  Oswald Buddenhagen <ossi@kde.org>
 
-	* GreeterPosX, GreeterPosY and GreeterPosFixed tqreplaced with
+	* GreeterPosX, GreeterPosY and GreeterPosFixed replaced with
 	  single GreeterPos which is a pair of relative coordinates
 
 2004-07-01  Oswald Buddenhagen <ossi@kde.org>
@@ -98,7 +98,7 @@ if they affect the configuration.
 
 	* The default Xsession no longer tries to merge kdm's PATH into the
 	  one set up by the shell startup scripts. Instead, kde.desktop
-	  tqcontains a full pathname and startkde fixes up PATH if necessary.
+	  contains a full pathname and startkde fixes up PATH if necessary.
 	* The default Xsession will emulate the startup behaviour of more
 	  shells, in particular bash, zsh and csh/tcsh.
 	* Setting up the session log is now done by kdm, not the Session
@@ -363,7 +363,7 @@ if they affect the configuration.
 	  - AutoPass -> [X-<dpy>-Core]/AutoLoginPass
 	  - AutoString -> [X-<dpy>-Core]/AutoLoginSession
 	  - remaining server & session resources -> [X-<dpy>-Core]/
-	* In GreetString the HOSTNAME substitution was tqreplaced with the
+	* In GreetString the HOSTNAME substitution was replaced with the
 	  %%, %d, %h, %n, %s, %r & %m expandos
 	* EchoMode does not understand "NoStars" any more. Use "NoEcho".
 	* Defaults changed: AuthDir to /var/lib/kdm, KeyFile to
@@ -444,7 +444,7 @@ if they affect the configuration.
 	* Default for PidFile and Setup changed back to empty
 	* Displays restarting too fast are disabled; resource StartInterval
 	* Option UserView, and NoUsers dependency on Users being empty
-	  tqreplaced with explicit option ShowUsers {All,Selected,None}
+	  replaced with explicit option ShowUsers {All,Selected,None}
 	* Made the greeter dynamically loadable (libKdmGreet.so)
 	* Moved chooser and greeter to separate directories,
 	  same for unused stuff (misc/)
@@ -483,7 +483,7 @@ if they affect the configuration.
 
 1999-11-15  Matthias Hoelzer-Kluepfel <hoelzer@kde.org>
 
-	* kdmdesktop tqreplaced with ../kdesktop/kdmdesktop. Uses new config
+	* kdmdesktop replaced with ../kdesktop/kdmdesktop. Uses new config
 	  file (kdmdesktoprc) with new options (all in section [Desktop0]):
 
 1999-07-01  Steffen Hansen <hansen@kde.org>
diff --git a/kdm/README b/kdm/README
index 0422dcae2..bdf34814e 100644
--- a/kdm/README
+++ b/kdm/README
@@ -1,5 +1,5 @@
 This is the K Display Manager (KDM) for KDE 3.4,
-the KDE tqreplacement for the X Display Manager (XDM).
+the KDE replacement for the X Display Manager (XDM).
 
 Semi-official home page: http://devel-home.kde.org/~ossi/sw/kdm.html
 
@@ -40,11 +40,11 @@ configure options that affect KDM
   Compile KDM without XDMCP support.
 
 --with-kdm-xconsole
-  Compile KDM with a builtin "xconsole" tqreplacement in the greeter. I don't
+  Compile KDM with a builtin "xconsole" replacement in the greeter. I don't
   consider this too useful, but SuSE wanted it, so it's there. ;)
 
 
-KDM's file system tqlayout
+KDM's file system layout
 ------------------------
 
 ${kde_confdir} is usually ${prefix}/share/config
@@ -107,7 +107,7 @@ directory ${kde_confdir}/kdm/sessions and add this to kdmrc:
 SessionsDirs=${kde_confdir}/kdm/sessions,${kde_datadir}/kdm/sessions
 
 (Note that you must use actual paths instead of variables, see the section
-about KDM's file system tqlayout.)
+about KDM's file system layout.)
 Do any changes only in the config directory - any changes in the data
 directory will be lost after the next KDE update.
 
@@ -418,7 +418,7 @@ switch to the X server's vt, press alt-ctrl-f7 (the exact function key may
 be different on your system). You may also use a remote login from a
 second machine. In any case it is advantageous to have mouse support on the
 debugging console for copying the backtrace.
-Note that a backtrace is usually _much_ more useful if the binary tqcontains
+Note that a backtrace is usually _much_ more useful if the binary contains
 debugging info, so you should install from source with the --enable-debug
 configure flag if at all possible.
 
diff --git a/kdm/TODO b/kdm/TODO
index 4b932f81d..12a1ec545 100644
--- a/kdm/TODO
+++ b/kdm/TODO
@@ -1,6 +1,6 @@
 theming (#37349):
 - maybe add a Themable plugin flag. if not set and no talker, abort.
-- minor: show QWidgets only when the tqlayout is ready and the theme was painted.
+- minor: show QWidgets only when the layout is ready and the theme was painted.
   but one can't hide the widgets in a QLayout, as they have no size then.
 - add attribute inheritance. apply attributes extracted from particular
   elements of the (hidden) talker.
diff --git a/kdm/backend/auth.c b/kdm/backend/auth.c
index 7d7af6e54..3fb18ac4c 100644
--- a/kdm/backend/auth.c
+++ b/kdm/backend/auth.c
@@ -1038,16 +1038,16 @@ static void
 startUserAuth( char *buf, char *nbuf, FILE **old, FILE **new )
 {
 	const char *home;
-	int locktqStatus;
+	int lockStatus;
 
 	initAddrs();
 	*new = 0;
 	if ((home = getEnv( userEnviron, "HOME" )) && strlen( home ) < NBSIZE - 12) {
 		sprintf( buf, "%s/.Xauthority", home );
 		Debug( "XauLockAuth %s\n", buf );
-		locktqStatus = XauLockAuth( buf, 1, 2, 10 );
-		Debug( "lock is %d\n", locktqStatus );
-		if (locktqStatus == LOCK_SUCCESS)
+		lockStatus = XauLockAuth( buf, 1, 2, 10 );
+		Debug( "lock is %d\n", lockStatus );
+		if (lockStatus == LOCK_SUCCESS)
 			if (!openFiles( buf, nbuf, old, new ))
 				XauUnlockAuth( buf );
 	}
diff --git a/kdm/backend/dm.c b/kdm/backend/dm.c
index d54cccb87..a372686df 100644
--- a/kdm/backend/dm.c
+++ b/kdm/backend/dm.c
@@ -288,11 +288,11 @@ main( int argc, char **argv )
 			LogError( "Failed to execute shutdown command %\"s\n", cmd );
 			exit( 1 );
 		} else {
-			sigset_t tqmask;
-			sigemptyset( &tqmask );
-			sigaddset( &tqmask, SIGCHLD );
-			sigaddset( &tqmask, SIGHUP );
-			sigsuspend( &tqmask );
+			sigset_t mask;
+			sigemptyset( &mask );
+			sigaddset( &mask, SIGCHLD );
+			sigaddset( &mask, SIGHUP );
+			sigsuspend( &mask );
 		}
 	}
 	Debug( "nothing left to do, exiting\n" );
@@ -997,8 +997,8 @@ ReapChildren( void )
 				/* don't kill again */
 				break;
 			case running:
-				if (startingServer == d && d->servertqStatus != ignore) {
-					if (d->servertqStatus == starting && waitCode( status ) != 47)
+				if (startingServer == d && d->serverStatus != ignore) {
+					if (d->serverStatus == starting && waitCode( status ) != 47)
 						LogError( "X server died during startup\n" );
 					StartServerFailed();
 					break;
@@ -1183,7 +1183,7 @@ MainLoop( void )
 					break;
 				case SIGUSR1:
 					if (startingServer &&
-					    startingServer->servertqStatus == starting)
+					    startingServer->serverStatus == starting)
 						StartServerSuccess();
 					break;
 				}
@@ -1214,7 +1214,7 @@ MainLoop( void )
 }
 
 static void
-CheckDisplaytqStatus( struct display *d )
+CheckDisplayStatus( struct display *d )
 {
 	if ((d->displayType & d_origin) == dFromFile && !d->stillThere)
 		StopDisplay( d );
@@ -1235,7 +1235,7 @@ KickDisplay( struct display *d )
 {
 	if (d->status == notRunning)
 		StartDisplay( d );
-	if (d->servertqStatus == awaiting && !startingServer)
+	if (d->serverStatus == awaiting && !startingServer)
 		StartServer( d );
 }
 
@@ -1314,7 +1314,7 @@ AllocateVT( struct display *d )
 static void
 StartDisplays( void )
 {
-	ForEachDisplay( CheckDisplaytqStatus );
+	ForEachDisplay( CheckDisplayStatus );
 	CloseGetter();
 #ifdef HAVE_VTS
 	active_vts = -1;
@@ -1356,7 +1356,7 @@ StartDisplay( struct display *d )
 				kill( d->serverPid, d->resetSignal );
 		}
 		if (d->serverPid == -1) {
-			d->servertqStatus = awaiting;
+			d->serverStatus = awaiting;
 			return;
 		}
 	} else {
diff --git a/kdm/backend/dm.h b/kdm/backend/dm.h
index f73f68e10..c05d4c865 100644
--- a/kdm/backend/dm.h
+++ b/kdm/backend/dm.h
@@ -181,11 +181,11 @@ typedef struct GProc {
 	int pid;
 } GProc;
 
-typedef enum displaytqStatus { notRunning = 0, running, zombie, phoenix, raiser,
-                             textMode, reserve, remoteLogin } DisplaytqStatus;
+typedef enum displayStatus { notRunning = 0, running, zombie, phoenix, raiser,
+                             textMode, reserve, remoteLogin } DisplayStatus;
 
-typedef enum servertqStatus { ignore = 0, awaiting, starting,
-                            terminated, killed, pausing } ServertqStatus;
+typedef enum serverStatus { ignore = 0, awaiting, starting,
+                            terminated, killed, pausing } ServerStatus;
 
 typedef struct RcStr {
 	struct RcStr *next;
@@ -241,7 +241,7 @@ struct display {
 	CfgArr cfg;                 /* config data array */
 
 	/* display state */
-	DisplaytqStatus status;       /* current status */
+	DisplayStatus status;       /* current status */
 	int zstatus;                /* substatus while zombie */
 	int pid;                    /* process id of child */
 	int serverPid;              /* process id of server (-1 if none) */
@@ -249,7 +249,7 @@ struct display {
 	int serverVT;               /* server VT (0 = none, -1 = pending) */
 	struct display *follower;   /* on exit, hand VT to this display */
 #endif
-	ServertqStatus servertqStatus;  /* X server startup state */
+	ServerStatus serverStatus;  /* X server startup state */
 	Time_t lastStart;           /* time of last display start */
 	int startTries;             /* current start try */
 	int stillThere;             /* state during HUP processing */
diff --git a/kdm/backend/greet.h b/kdm/backend/greet.h
index 2b7b28504..985edc29c 100644
--- a/kdm/backend/greet.h
+++ b/kdm/backend/greet.h
@@ -111,7 +111,7 @@ from the copyright holder.
 #endif
 
 /*
- * tqStatus/command codes greeter -> core
+ * Status/command codes greeter -> core
  */
 #define G_Ready	   0	/* nop */
 #define G_Cancel   1	/* abort login, etc. */
@@ -194,7 +194,7 @@ from the copyright holder.
 #define DM_PANIC  4
 
 /*
- * tqStatus codes from Verify
+ * Status codes from Verify
  */
 /* terminal status codes */
 #define V_OK              0
diff --git a/kdm/backend/server.c b/kdm/backend/server.c
index c5f0c3136..e78d8a66c 100644
--- a/kdm/backend/server.c
+++ b/kdm/backend/server.c
@@ -77,7 +77,7 @@ StartServerOnce( void )
 	int pid;
 
 	Debug( "StartServerOnce for %s, try %d\n", d->name, ++d->startTries );
-	d->servertqStatus = starting;
+	d->serverStatus = starting;
 	switch (pid = Fork()) {
 	case 0:
 		argv = PrepServerArgv( d, d->serverArgsLocal );
@@ -136,9 +136,9 @@ AbortStartServer( struct display *d )
 {
 	if (startingServer == d)
 	{
-		if (d->servertqStatus != ignore)
+		if (d->serverStatus != ignore)
 		{
-			d->servertqStatus = ignore;
+			d->serverStatus = ignore;
 			serverTimeout = TO_INF;
 			Debug( "aborting X server start\n" );
 		}
@@ -150,7 +150,7 @@ void
 StartServerSuccess()
 {
 	struct display *d = startingServer;
-	d->servertqStatus = ignore;
+	d->serverStatus = ignore;
 	serverTimeout = TO_INF;
 	Debug( "X server ready, starting session\n" );
 	StartDisplayP2( d );
@@ -161,10 +161,10 @@ StartServerFailed()
 {
 	struct display *d = startingServer;
 	if (!d->serverAttempts || d->startTries < d->serverAttempts) {
-		d->servertqStatus = pausing;
+		d->serverStatus = pausing;
 		serverTimeout = d->openDelay + now;
 	} else {
-		d->servertqStatus = ignore;
+		d->serverStatus = ignore;
 		serverTimeout = TO_INF;
 		startingServer = 0;
 		LogError( "X server for display %s can't be started,"
@@ -177,20 +177,20 @@ void
 StartServerTimeout()
 {
 	struct display *d = startingServer;
-	switch (d->servertqStatus) {
+	switch (d->serverStatus) {
 	case ignore:
 	case awaiting:
 		break; /* cannot happen */
 	case starting:
 		LogError( "X server startup timeout, terminating\n" );
 		kill( d->serverPid, d->termSignal );
-		d->servertqStatus = d->termSignal == SIGKILL ? killed : terminated;
+		d->serverStatus = d->termSignal == SIGKILL ? killed : terminated;
 		serverTimeout = d->serverTimeout + now;
 		break;
 	case terminated:
 		LogInfo( "X server termination timeout, killing\n" );
 		kill( d->serverPid, SIGKILL );
-		d->servertqStatus = killed;
+		d->serverStatus = killed;
 		serverTimeout = 10 + now;
 		break;
 	case killed:
diff --git a/kdm/backend/session.c b/kdm/backend/session.c
index d603c6b44..9a12ce312 100644
--- a/kdm/backend/session.c
+++ b/kdm/backend/session.c
@@ -154,13 +154,13 @@ AutoLogon( Time_t tdiff )
 	                           !td->hstent->lastExit)) ||
 	            td->autoAgain))
 	{
-		unsigned int ltqmask;
+		unsigned int lmask;
 		Window dummy1, dummy2;
 		int dummy3, dummy4, dummy5, dummy6;
 		XQueryPointer( dpy, DefaultRootWindow( dpy ),
 		               &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
-		               &ltqmask );
-		if (ltqmask & ShiftMask)
+		               &lmask );
+		if (lmask & ShiftMask)
 			return 0;
 		DoAutoLogon();
 		return 1;
diff --git a/kdm/config.def b/kdm/config.def
index 64a6429ac..1dfb26ba6 100644
--- a/kdm/config.def
+++ b/kdm/config.def
@@ -182,7 +182,7 @@
 </kdmrc>
 
 # The contents of this section are copied into kdmrc-ref.docbook.
-# The macro %REF% is tqreplaced with the accumulated Description:s from the key
+# The macro %REF% is replaced with the accumulated Description:s from the key
 # definitions below.
 <docu>
 <chapter id="kdm-files">
@@ -205,7 +205,7 @@ issue non-fatal error messages.</para>
 are ignored as well.</para>
 
 <para>Sections are denoted by
-<literal>[</literal><tqreplaceable>Name of Section</tqreplaceable><literal>]</literal>.
+<literal>[</literal><replaceable>Name of Section</replaceable><literal>]</literal>.
 </para>
 
 <para>You can configure every X-display individually.</para>
@@ -216,16 +216,16 @@ Additionally, a display belongs to a
 display class (which can be ignored in most cases).</para>
 
 <para>Sections with display-specific settings have the formal syntax
-<literal>[X-</literal>&nbsp;<tqreplaceable>host</tqreplaceable>&nbsp;[&nbsp;<literal>:</literal>&nbsp;<tqreplaceable>number</tqreplaceable>&nbsp;[&nbsp;<literal>_</literal>&nbsp;<tqreplaceable>class</tqreplaceable>&nbsp;]&nbsp;]&nbsp;<literal>-</literal>&nbsp;<tqreplaceable>sub-section</tqreplaceable>&nbsp;<literal>]</literal>
+<literal>[X-</literal>&nbsp;<replaceable>host</replaceable>&nbsp;[&nbsp;<literal>:</literal>&nbsp;<replaceable>number</replaceable>&nbsp;[&nbsp;<literal>_</literal>&nbsp;<replaceable>class</replaceable>&nbsp;]&nbsp;]&nbsp;<literal>-</literal>&nbsp;<replaceable>sub-section</replaceable>&nbsp;<literal>]</literal>
 </para>
-<para>All sections with the same <tqreplaceable>sub-section</tqreplaceable>
+<para>All sections with the same <replaceable>sub-section</replaceable>
 make up a section class.</para>
 
 <para>You can use the wildcard <literal>*</literal> (match any) for
-<tqreplaceable>host</tqreplaceable>, <tqreplaceable>number</tqreplaceable>, 
-and <tqreplaceable>class</tqreplaceable>. You may omit trailing components;
+<replaceable>host</replaceable>, <replaceable>number</replaceable>, 
+and <replaceable>class</replaceable>. You may omit trailing components;
 they are assumed to be <literal>*</literal> then. The host part may be a
-domain specification like <tqreplaceable>.inf.tu-dresden.de</tqreplaceable>
+domain specification like <replaceable>.inf.tu-dresden.de</replaceable>
 or the wildcard <literal>+</literal> (match non-empty).</para>
 
 <para>From which section a setting is actually taken is determined by
@@ -289,7 +289,7 @@ Example: display name <quote>myhost.foo:0</quote>, class <quote>dpy</quote>
 and [X-:0] (the first local display).</para>
 
 <para>The format for all keys is
-<userinput><option><tqreplaceable>key</tqreplaceable></option>&nbsp;<literal>=</literal>&nbsp;<parameter>value</parameter></userinput>.
+<userinput><option><replaceable>key</replaceable></option>&nbsp;<literal>=</literal>&nbsp;<parameter>value</parameter></userinput>.
 Keys are only valid in the section class they are defined for.
 Some keys do not apply to particular displays, in which case they are ignored.
 </para>
@@ -329,12 +329,12 @@ local machine or rather remotely.</para>
 
 <para>The formal syntax of a specification is
 <screen>
-<userinput><tqreplaceable>display&nbsp;name</tqreplaceable>&nbsp;[<literal>_</literal><tqreplaceable>display&nbsp;class</tqreplaceable>]</userinput>
+<userinput><replaceable>display&nbsp;name</replaceable>&nbsp;[<literal>_</literal><replaceable>display&nbsp;class</replaceable>]</userinput>
 </screen>
 for all &X-Server;s. <quote>Foreign</quote> displays differ in having
 a host name in the display name, may it be <literal>localhost</literal>.</para>
 
-<para>The <tqreplaceable>display name</tqreplaceable> must be something that can
+<para>The <replaceable>display name</replaceable> must be something that can
 be passed in the <option>-display</option> option to an X program. This string
 is used to generate the display-specific section names, so be careful to match
 the names.
@@ -344,7 +344,7 @@ reverse host name resolution. For configuration purposes, the
 <emphasis>not</emphasis> stripped to make them distinguishable from local
 &X-Server;s started by &kdm;.</para>
 
-<para>The <tqreplaceable>display class</tqreplaceable> portion is also used in the
+<para>The <replaceable>display class</replaceable> portion is also used in the
 display-specific sections. This is useful if you have a large collection of
 similar displays (such as a corral of X terminals) and would like to set
 options for groups of them.
@@ -364,7 +364,7 @@ reserve displays available, the menu item will be disabled.</para>
 
 <para>When &kdm; starts a session, it sets up authorization data for the
 &X-Server;. For local servers, &kdm; passes
-<command><option>-auth</option>&nbsp;<filename><tqreplaceable>filename</tqreplaceable></filename></command>
+<command><option>-auth</option>&nbsp;<filename><replaceable>filename</replaceable></filename></command>
 on the &X-Server;'s command line to point it at its authorization data.
 For &XDMCP; displays, &kdm; passes the authorization data to the &X-Server;
 via the <quote>Accept</quote> &XDMCP; message.</para>
@@ -377,7 +377,7 @@ via the <quote>Accept</quote> &XDMCP; message.</para>
 <para>The file specified by the <option>AccessFile</option> option provides
 information which &kdm; uses to control access from displays requesting service
 via &XDMCP;.
-The file tqcontains four types of entries: entries which control the response
+The file contains four types of entries: entries which control the response
 to <quote>Direct</quote> and <quote>Broadcast</quote> queries, entries which
 control the response to <quote>Indirect</quote> queries, macro definitions for
 <quote>Indirect</quote> entries, and entries which control on which network
@@ -409,7 +409,7 @@ it can be followed by the optional <literal>NOBROADCAST</literal> keyword.
 This can be used to prevent a &kdm; server from appearing on menus based on
 <quote>Broadcast</quote> queries.</para>
 
-<para>An <quote>Indirect</quote> entry also tqcontains a host name or pattern,
+<para>An <quote>Indirect</quote> entry also contains a host name or pattern,
 but follows it with a list of host names or macros to which the queries
 should be forwarded. <quote>Indirect</quote> entries can be excluding as well,
 in which case a (valid) dummy host name must be supplied to make the entry
@@ -422,7 +422,7 @@ character and hop count. If no hop count is specified, the multicast hop count
 defaults to 1, keeping the packet on the local network. For IPv4 multicasting,
 the hop count is used as the TTL.
 -->
-If the indirect host list tqcontains the keyword <literal>CHOOSER</literal>,
+If the indirect host list contains the keyword <literal>CHOOSER</literal>,
 <quote>Indirect</quote> queries are not forwarded, but instead a host chooser
 dialog is displayed by &kdm;. The chooser will send a <quote>Direct</quote>
 query to each of the remaining host names in the list and offer a menu of
@@ -437,27 +437,27 @@ in turn and the first matching entry determines the response.
 <quote>Direct</quote> and <quote>Broadcast</quote> entries are ignored when
 scanning for an <quote>Indirect</quote> entry and vice-versa.</para>
 
-<para>A macro definition tqcontains a macro name and a list of host names and
+<para>A macro definition contains a macro name and a list of host names and
 other macros that the macro expands to. To distinguish macros from hostnames,
 macro names start with a <literal>%</literal> character.</para>
 
 <para>The last entry type is the <literal>LISTEN</literal> directive.
 The formal syntax is
 <screen>
-<userinput>&nbsp;<literal>LISTEN</literal>&nbsp;[<tqreplaceable>interface</tqreplaceable>&nbsp;[<tqreplaceable>multicast&nbsp;list</tqreplaceable>]]</userinput>
+<userinput>&nbsp;<literal>LISTEN</literal>&nbsp;[<replaceable>interface</replaceable>&nbsp;[<replaceable>multicast&nbsp;list</replaceable>]]</userinput>
 </screen>
 If one or more <literal>LISTEN</literal> lines are specified, &kdm; listens
 for &XDMCP; requests only on the specified interfaces.
-<tqreplaceable>interface</tqreplaceable> may be a hostname or IP address
+<replaceable>interface</replaceable> may be a hostname or IP address
 representing a network interface on this machine, or the wildcard
 <literal>*</literal> to represent all available network interfaces.
 If multicast group addresses are listed on a <literal>LISTEN</literal> line,
 &kdm; joins the multicast groups on the given interface. For IPv6 multicasts,
-the IANA has assigned ff0<tqreplaceable>X</tqreplaceable>:0:0:0:0:0:0:12b as the
+the IANA has assigned ff0<replaceable>X</replaceable>:0:0:0:0:0:0:12b as the
 permanently assigned range of multicast addresses for &XDMCP;. The
-<tqreplaceable>X</tqreplaceable> in the prefix may be tqreplaced by any valid scope
+<replaceable>X</replaceable> in the prefix may be replaced by any valid scope
 identifier, such as 1 for Node-Local, 2 for Link-Local, 5 for Site-Local, and
-so on (see IETF RFC 2373 or its tqreplacement for further details and scope
+so on (see IETF RFC 2373 or its replacement for further details and scope
 definitions). &kdm; defaults to listening on the Link-Local scope address
 ff02:0:0:0:0:0:0:12b to most closely match the IPv4 subnet broadcast behavior. 
 If no <literal>LISTEN</literal> lines are given, &kdm; listens on all
@@ -770,7 +770,7 @@ or unmounting directories from file servers.</para>
 #     The contents are automatically enclosed in <para></para>.
 #     If "-" is given to Description, no comment is generated at all.
 #     If "!" is given, enums are not treated specially; otherwise, the macro
-#     %ENUM% is tqreplaced with a list of the defined element/description pairs,
+#     %ENUM% is replaced with a list of the defined element/description pairs,
 #     or - if the macro is not present - the list is appended to the
 #     description.
 #     Finally, a sentence with the Default (or CDefault, if given) is appended,
@@ -782,7 +782,7 @@ or unmounting directories from file servers.</para>
 
 Section: General
 Description:
- This section tqcontains global options that do not fit into any specific section.
+ This section contains global options that do not fit into any specific section.
 
 Key: ConfigVersion
 Type: string
@@ -1064,7 +1064,7 @@ Description:
 Section: Xdmcp
 If: defined(XDMCP)
 Description:
- This section tqcontains options that control &kdm;'s handling of
+ This section contains options that control &kdm;'s handling of
  &XDMCP; requests.
 # See <xref linkend="xdmcp-with-kdm"/> to find out what &XDMCP; is.
 
@@ -1118,7 +1118,7 @@ Comment:
  &XDMCP; access control file in the usual XDM-Xaccess format.
 Description:
  To prevent unauthorized &XDMCP; service and to allow forwarding of &XDMCP;
- IndirectQuery requests, this file tqcontains a database of hostnames which
+ IndirectQuery requests, this file contains a database of hostnames which
  are either allowed direct access to this machine, or have a list of hosts
  to which queries should be forwarded to. The format of this file is
  described in <xref linkend="kdmrc-xaccess"/>.
@@ -1193,7 +1193,7 @@ Description:
 
 Section: Shutdown
 Description:
- This section tqcontains global options concerning system shutdown.
+ This section contains global options concerning system shutdown.
 
 Key: HaltCmd
 Type: string
@@ -1264,7 +1264,7 @@ Description:
 
 Section: -Core
 Description:
- This section class tqcontains options concerning the configuration
+ This section class contains options concerning the configuration
  of the &kdm; backend (core).
 
 Key: OpenDelay
@@ -1946,7 +1946,7 @@ Instance: */".xsession-errors-%s"
 Instance: :0/".xsession-errors"
 Comment:
  The file (relative to $HOME) to redirect the session output to. This is
- a printf format string; one %s will be tqreplaced with the display name.
+ a printf format string; one %s will be replaced with the display name.
 Description:
  The file (relative to the user's home directory) to redirect the session
  output to. One occurrence of <parameter>%s</parameter> in this string will be
@@ -1970,7 +1970,7 @@ Description:
 
 Section: -Greeter
 Description:
- This section class tqcontains options concerning the configuration
+ This section class contains options concerning the configuration
  of the &kdm; frontend (greeter).
 
 Key: GUIStyle
@@ -2066,7 +2066,7 @@ Default: "Welcome to Trinity at %n"
 User: greeter
 Instance: #*/"Welcome to Trinity at %n"
 Comment:
- The headline in the greeter. The following character pairs are tqreplaced:
+ The headline in the greeter. The following character pairs are replaced:
  - %d -> current display
  - %h -> host name, possibly with domain name
  - %n -> node name, most probably the host name without domain name
@@ -2077,7 +2077,7 @@ Comment:
 Description:
  The headline in the greeter. An empty greeting means none at all.
  </para><para>
- The following character pairs are tqreplaced by their value:
+ The following character pairs are replaced by their value:
  <variablelist>
  <varlistentry>
  <term><parameter>%d</parameter></term>
@@ -2157,7 +2157,7 @@ Type: enum
  On: turn on
  Keep: do not change the state
 Default: Keep
-User: greeter(numLocktqStatus)
+User: greeter(numLockStatus)
 Instance: #*/Off
 Comment: &
 Description:
@@ -2206,7 +2206,7 @@ Description: !
  This option controls which users will be shown in the user view
  (<option>UserList</option>) and/or offered for autocompletion
  (<option>UserCompletion</option>).
- If it is <literal>Selected</literal>, <option>SelectedUsers</option> tqcontains
+ If it is <literal>Selected</literal>, <option>SelectedUsers</option> contains
  the final list of users.
  If it is <literal>NotHidden</literal>, the initial user list are all users
  found on the system. Users contained in <option>HiddenUsers</option> are
@@ -2399,7 +2399,7 @@ Comment:
  The configuration file to be used by krootimage.
 Description:
  The configuration file to be used by <command>krootimage</command>.
- It tqcontains a section named <literal>[Desktop0]</literal> like
+ It contains a section named <literal>[Desktop0]</literal> like
  <filename>kdesktoprc</filename> does. Its options are not described
  herein; guess their meanings or use the control center.
 
@@ -2552,7 +2552,7 @@ Description:
  Specify conversation plugins for the login dialog; the first in the list
  is selected initially.
  Each plugin can be specified as a base name (which expands to
- <filename>$<envar>kde_modulesdir</envar>/kgreet_<tqreplaceable>base</tqreplaceable></filename>)
+ <filename>$<envar>kde_modulesdir</envar>/kgreet_<replaceable>base</replaceable></filename>)
  or as a full pathname.
  </para><para>
  Conversation plugins are modules for the greeter which obtain authentication
@@ -2578,7 +2578,7 @@ Comment:
  these settings; it is up to them what possible keys are.
 Description:
  A list of options of the form
- <tqreplaceable>Key</tqreplaceable><literal>=</literal><tqreplaceable>Value</tqreplaceable>.
+ <replaceable>Key</replaceable><literal>=</literal><replaceable>Value</replaceable>.
  The conversation plugins can query these settings; it is up to them what
  possible keys are.
 
diff --git a/kdm/kfrontend/genkdmconf.c b/kdm/kfrontend/genkdmconf.c
index 43ef6d5b0..f0981afe8 100644
--- a/kdm/kfrontend/genkdmconf.c
+++ b/kdm/kfrontend/genkdmconf.c
@@ -580,7 +580,7 @@ static const char def_setup[] =
 "#! /bin/sh\n"
 "# Xsetup - run as root before the login dialog appears\n"
 "\n"
-"#xconsole -tqgeometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n";
+"#xconsole -geometry 480x130-0-0 -notify -verbose -fn fixed -exitOnFail -file /dev/xconsole &\n";
 
 static const char def_startup[] =
 "#! /bin/sh\n"
@@ -591,7 +591,7 @@ static const char def_startup[] =
 "if [ -e /etc/nologin ]; then\n"
 "  # always display the nologin message, if possible\n"
 "  if [ -s /etc/nologin ] && which xmessage > /dev/null 2>&1; then\n"
-"    xmessage -file /etc/nologin -tqgeometry 640x480\n"
+"    xmessage -file /etc/nologin -geometry 640x480\n"
 "  fi\n"
 "  if [ \"$(id -u)\" != \"0\" ] && \\\n"
 "     ! grep -qs '^ignore-nologin' /etc/kde3/kdm/kdm.options; then\n"
@@ -940,7 +940,7 @@ mem_mem( char *mem, int lmem, const char *smem, int lsmem )
 	return 0;
 }
 
-static int maxTTY, TTYtqmask;
+static int maxTTY, TTYmask;
 
 static void
 getInitTab( void )
@@ -953,7 +953,7 @@ getInitTab( void )
 		return;
 	if (!maxTTY) {
 		maxTTY = 6;
-		TTYtqmask = 0x3f;
+		TTYmask = 0x3f;
 	}
 }
 #endif
@@ -1111,7 +1111,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 	char *sdpys, *rdpys;
 	StrList **argp, **arglp, *ap, *ap2;
 	File file;
-	int nldpys = 0, nrdpys = 0, dpytqmask = 0;
+	int nldpys = 0, nrdpys = 0, dpymask = 0;
 	int cpcmd, cpcmdl;
 #ifdef HAVE_VTS
 	int dn, cpvt, mtty;
@@ -1193,7 +1193,7 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 		*argp = *arglp = 0;
 		if ((se->type & dLocation) == dLocal) {
 			nldpys++;
-			dpytqmask |= 1 << atoi( se->name + 1 );
+			dpymask |= 1 << atoi( se->name + 1 );
 			if (se->reserve)
 				nrdpys++;
 		}
@@ -1266,8 +1266,8 @@ absorb_xservers( const char *sect ATTR_UNUSED, char **value )
 	/* add reserve dpys */
 	if (nldpys < 4 && nldpys && !nrdpys)
 		for (; nldpys < 4; nldpys++) {
-			for (dn = 0; dpytqmask & (1 << dn); dn++);
-			dpytqmask |= (1 << dn);
+			for (dn = 0; dpymask & (1 << dn); dn++);
+			dpymask |= (1 << dn);
 			StrCat( &rdpys, ",:%d", dn );
 		}
 #endif
@@ -1302,7 +1302,7 @@ upd_consolettys( Entry *ce, Section *cs ATTR_UNUSED )
 
 		getInitTab();
 		for (i = 0, buf = 0; i < 16; i++)
-			if (TTYtqmask & (1 << i))
+			if (TTYmask & (1 << i))
 				StrCat( &buf, ",tty%d", i + 1 );
 		if (buf) {
 			ce->value = buf + 1;
diff --git a/kdm/kfrontend/kchooser.cpp b/kdm/kfrontend/kchooser.cpp
index fb1954d95..df602efea 100644
--- a/kdm/kfrontend/kchooser.cpp
+++ b/kdm/kfrontend/kchooser.cpp
@@ -59,13 +59,13 @@ ChooserDlg::ChooserDlg()
 	TQBoxLayout *vbox = new TQVBoxLayout( this, 10, 10 );
 
 	TQLabel *title = new TQLabel( i18n("XDMCP Host Menu"), this );
-	title->tqsetAlignment( AlignCenter );
+	title->setAlignment( AlignCenter );
 	vbox->addWidget( title );
 
 	host_view = new TQListView( this, "hosts" );
 	host_view->addColumn( i18n("Hostname") );
 	host_view->setColumnWidth( 0, fontMetrics().width( "login.crap.net" ) );
-	host_view->addColumn( i18n("tqStatus") );
+	host_view->addColumn( i18n("Status") );
 	host_view->setMinimumWidth( fontMetrics().width( "login.crap.com Display not authorized to connect this server" ) );
 	host_view->setResizeMode( TQListView::LastColumn );
 	host_view->setAllColumnsShowFocus( true );
@@ -145,14 +145,14 @@ void ChooserDlg::pingHosts()
 
 void ChooserDlg::accept()
 {
-	if (tqfocusWidget() == iline) {
+	if (focusWidget() == iline) {
 		if (!iline->text().isEmpty()) {
 			GSendInt( G_Ch_DirectChoice );
 			GSendStr( iline->text().latin1() );
 			iline->clear();
 		}
 		return;
-	} else /*if (tqfocusWidget() == host_view)*/ {
+	} else /*if (focusWidget() == host_view)*/ {
 		TQListViewItem *item = host_view->currentItem();
 		if (item) {
 			GSendInt( G_Ready );
@@ -170,7 +170,7 @@ TQString ChooserDlg::recvStr()
 {
 	char *arr = GRecvStr();
 	if (arr) {
-		TQString str = TQString::tqfromLatin1( arr );
+		TQString str = TQString::fromLatin1( arr );
 		free( arr );
 		return str;
 	} else
diff --git a/kdm/kfrontend/kdm_greet.c b/kdm/kfrontend/kdm_greet.c
index d9c39e35f..b03d96e15 100644
--- a/kdm/kfrontend/kdm_greet.c
+++ b/kdm/kfrontend/kdm_greet.c
@@ -4,7 +4,7 @@ KDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org>
 
-This file tqcontains code from the old xdm core,
+This file contains code from the old xdm core,
 Copyright 1988, 1998  Keith Packard, MIT X Consortium/The Open Group
 
 This program is free software; you can redistribute it and/or modify
@@ -560,7 +560,7 @@ xkb_init( Display *dpy )
 }
 
 static unsigned int
-xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name )
+xkb_modifier_mask_work( XkbDescPtr xkb, const char *name )
 {
 	int i;
 
@@ -569,23 +569,23 @@ xkb_modifier_tqmask_work( XkbDescPtr xkb, const char *name )
 	for (i = 0; i < XkbNumVirtualMods; i++) {
 		char *modStr = XGetAtomName( xkb->dpy, xkb->names->vmods[i] );
 		if (modStr != NULL && strcmp( name, modStr ) == 0) {
-			unsigned int tqmask;
-			XkbVirtualModsToReal( xkb, 1 << i, &tqmask );
-			return tqmask;
+			unsigned int mask;
+			XkbVirtualModsToReal( xkb, 1 << i, &mask );
+			return mask;
 		}
 	}
 	return 0;
 }
 
 static unsigned int
-xkb_modifier_tqmask( Display *dpy, const char *name )
+xkb_modifier_mask( Display *dpy, const char *name )
 {
 	XkbDescPtr xkb;
 
 	if ((xkb = XkbGetKeyboard( dpy, XkbAllComponentsMask, XkbUseCoreKbd ))) {
-		unsigned int tqmask = xkb_modifier_tqmask_work( xkb, name );
+		unsigned int mask = xkb_modifier_mask_work( xkb, name );
 		XkbFreeKeyboard( xkb, 0, True );
-		return tqmask;
+		return mask;
 	}
 	return 0;
 }
@@ -593,23 +593,23 @@ xkb_modifier_tqmask( Display *dpy, const char *name )
 static int
 xkb_get_modifier_state( Display *dpy, const char *name )
 {
-	unsigned int tqmask;
+	unsigned int mask;
 	XkbStateRec state;
 
-	if (!(tqmask = xkb_modifier_tqmask( dpy, name )))
+	if (!(mask = xkb_modifier_mask( dpy, name )))
 		return 0;
 	XkbGetState( dpy, XkbUseCoreKbd, &state );
-	return (tqmask & state.locked_mods) != 0;
+	return (mask & state.locked_mods) != 0;
 }
 
 static int
 xkb_set_modifier( Display *dpy, const char *name, int sts )
 {
-	unsigned int tqmask;
+	unsigned int mask;
 
-	if (!(tqmask = xkb_modifier_tqmask( dpy, name )))
+	if (!(mask = xkb_modifier_mask( dpy, name )))
 		return 0;
-	XkbLockModifiers( dpy, XkbUseCoreKbd, tqmask, sts ? tqmask : 0 );
+	XkbLockModifiers( dpy, XkbUseCoreKbd, mask, sts ? mask : 0 );
 	return 1;
 }
 #endif /* HAVE_XKB */
@@ -620,7 +620,7 @@ xtest_get_modifier_state( Display *dpy, int key )
 {
 	XModifierKeymap *map;
 	KeyCode modifier_keycode;
-	unsigned int i, tqmask;
+	unsigned int i, mask;
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 
@@ -632,8 +632,8 @@ xtest_get_modifier_state( Display *dpy, int key )
 			XFreeModifiermap( map );
 			XQueryPointer( dpy, DefaultRootWindow( dpy ),
 			               &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
-			               &tqmask );
-			return (tqmask & (1 << i)) != 0;
+			               &mask );
+			return (mask & (1 << i)) != 0;
 		}
 	XFreeModifiermap( map );
 	return 0;
@@ -700,11 +700,11 @@ restore_modifiers( void )
 }
 
 void
-setCursor( Display *mdpy, int window, int tqshape )
+setCursor( Display *mdpy, int window, int shape )
 {
 	Cursor xcursor;
 
-	if ((xcursor = XCreateFontCursor( mdpy, tqshape ))) {
+	if ((xcursor = XCreateFontCursor( mdpy, shape ))) {
 		XDefineCursor( mdpy, window, xcursor );
 		XFreeCursor( mdpy, xcursor );
 		XFlush( mdpy );
diff --git a/kdm/kfrontend/kdm_greet.h b/kdm/kfrontend/kdm_greet.h
index eaead7b62..df325c28d 100644
--- a/kdm/kfrontend/kdm_greet.h
+++ b/kdm/kfrontend/kdm_greet.h
@@ -4,7 +4,7 @@ KDE Greeter module for xdm
 
 Copyright (C) 2001-2003 Oswald Buddenhagen <ossi@kde.org>
 
-This file tqcontains code from the old xdm core,
+This file contains code from the old xdm core,
 Copyright 1988, 1998  Keith Packard, MIT X Consortium/The Open Group
 
 This program is free software; you can redistribute it and/or modify
@@ -77,7 +77,7 @@ int PingServer( struct _XDisplay *dpy );
 void setup_modifiers( struct _XDisplay *mdpy, int numlock );
 void restore_modifiers( void );
 
-void setCursor( struct _XDisplay *mdpy, int window, int tqshape );
+void setCursor( struct _XDisplay *mdpy, int window, int shape );
 
 
 extern int rfd; /* for select() loops */
diff --git a/kdm/kfrontend/kdmadmindialog.cpp b/kdm/kfrontend/kdmadmindialog.cpp
index 7c9bbb7d5..637d6dd90 100644
--- a/kdm/kfrontend/kdmadmindialog.cpp
+++ b/kdm/kfrontend/kdmadmindialog.cpp
@@ -75,10 +75,10 @@ KDMAdmin::KDMAdmin( const TQString &user, TQWidget *_parent )
     box->addWidget( new KSeparator( KSeparator::HLine, this ) );
 
     okButton = new KPushButton( KStdGuiItem::ok(), this );
-    okButton->tqsetSizePolicy( fp );
+    okButton->setSizePolicy( fp );
     okButton->setDefault( true );
     cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-    cancelButton->tqsetSizePolicy( fp );
+    cancelButton->setSizePolicy( fp );
 
     hlay = new TQHBoxLayout( box );
     hlay->addStretch( 1 );
@@ -103,8 +103,8 @@ void
 KDMAdmin::slotActivatePlugMenu()
 {
     TQPopupMenu *cmnu = verify->getPlugMenu();
-    TQSize sh( cmnu->tqsizeHint() / 2 );
-    cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+    TQSize sh( cmnu->sizeHint() / 2 );
+    cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 }
 
 void
diff --git a/kdm/kfrontend/kdmclock.cpp b/kdm/kfrontend/kdmclock.cpp
index 87e6a32ba..88cd53970 100644
--- a/kdm/kfrontend/kdmclock.cpp
+++ b/kdm/kfrontend/kdmclock.cpp
@@ -50,7 +50,7 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 	mBorder = false;//config->readNumEntry( "border", FALSE );
 
 	//config->setGroup( "Font" );
-	mFont.setFamily( TQString::tqfromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
+	mFont.setFamily( TQString::fromLatin1("Utopia")/*config->readEntry( "Family", "Utopia")*/ );
 	mFont.setPointSize( 51/*config->readNumEntry( "Point Size", 51)*/ );
 	mFont.setWeight( 75/*config->readNumEntry( "Weight", 75)*/ );
 	mFont.setItalic( TRUE/*config->readNumEntry( "Italic",TRUE )*/ );
@@ -76,19 +76,19 @@ KdmClock::KdmClock( TQWidget *parent, const char *name )
 	//setBackgroundOrigin( WindowOrigin );
 	mBackgroundBrush = backgroundBrush();
 	setBackgroundMode( NoBackground );
-	tqrepaint();
+	repaint();
 }
 
 
 void KdmClock::showEvent( TQShowEvent * )
 {
-	tqrepaint();
+	repaint();
 }
 
 
 void KdmClock::timeout()
 {
-	tqrepaint();
+	repaint();
 }
 
 void KdmClock::paintEvent( TQPaintEvent * )
diff --git a/kdm/kfrontend/kdmconfig.cpp b/kdm/kfrontend/kdmconfig.cpp
index 6c79a6918..15a63fa67 100644
--- a/kdm/kfrontend/kdmconfig.cpp
+++ b/kdm/kfrontend/kdmconfig.cpp
@@ -72,7 +72,7 @@ Str2Font( const TQString &aValue )
 	TQFont aRetFont;
 	TQString chStr;
 
-	TQStringList sl = TQStringList::split( TQString::tqfromLatin1(","), aValue );
+	TQStringList sl = TQStringList::split( TQString::fromLatin1(","), aValue );
 
 	if (sl.count() == 1) {
 		/* X11 font spec */
@@ -160,7 +160,7 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("vt%1").arg( sess->vt ) :
 #endif
-				TQString::tqfromLatin1( *sess->from ? sess->from : sess->display );
+				TQString::fromLatin1( *sess->from ? sess->from : sess->display );
 	} else {
 		user =
 			!sess->user ?
@@ -174,6 +174,6 @@ decodeSess( dpySpec *sess, TQString &user, TQString &loc )
 			sess->vt ?
 				TQString("%1, vt%2").arg( sess->display ).arg( sess->vt ) :
 #endif
-				TQString::tqfromLatin1( sess->display );
+				TQString::fromLatin1( sess->display );
 	}
 }
diff --git a/kdm/kfrontend/kdmshutdown.cpp b/kdm/kfrontend/kdmshutdown.cpp
index 1097e0074..dcd8a4cf1 100644
--- a/kdm/kfrontend/kdmshutdown.cpp
+++ b/kdm/kfrontend/kdmshutdown.cpp
@@ -115,7 +115,7 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
 	hlay->addStretch( 1 );
 	if (mayOk) {
 		okButton = new KPushButton( KStdGuiItem::ok(), this );
-		okButton->tqsetSizePolicy( fp );
+		okButton->setSizePolicy( fp );
 		okButton->setDefault( true );
 		hlay->addWidget( okButton );
 		hlay->addStretch( 1 );
@@ -124,13 +124,13 @@ KDMShutdownBase::complete( TQWidget *prevWidget )
 	if (maySched) {
 		KPushButton *schedButton =
 			new KPushButton( KGuiItem( i18n("&Schedule...") ), this );
-		schedButton->tqsetSizePolicy( fp );
+		schedButton->setSizePolicy( fp );
 		hlay->addWidget( schedButton );
 		hlay->addStretch( 1 );
 		connect( schedButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSched()) );
 	}
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-	cancelButton->tqsetSizePolicy( fp );
+	cancelButton->setSizePolicy( fp );
 	if (!mayOk)
 		cancelButton->setDefault( true );
 	hlay->addWidget( cancelButton );
@@ -147,8 +147,8 @@ KDMShutdownBase::slotActivatePlugMenu()
 		TQPopupMenu *cmnu = verify->getPlugMenu();
 		if (!cmnu)
 			return;
-		TQSize sh( cmnu->tqsizeHint() / 2 );
-		cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+		TQSize sh( cmnu->sizeHint() / 2 );
+		cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 	}
 }
 
@@ -272,7 +272,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 		freeStrArr( tlist );
 		targets->setCurrentItem( oldTarget == -1 ? defaultTarget : oldTarget );
 		TQHBoxLayout *hb = new TQHBoxLayout( hlp, 0, KDsh );
-		int spc = kapp->style().tqpixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
+		int spc = kapp->style().pixelMetric( TQStyle::PM_ExclusiveIndicatorWidth )
 		          + howGroup->insideSpacing();
 		hb->addSpacing( spc );
 		hb->addWidget( targets );
@@ -280,7 +280,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 	}
 	GSet( 0 );
 
-	howGroup->tqsetSizePolicy( fp );
+	howGroup->setSizePolicy( fp );
 
 	schedGroup = new TQGroupBox( i18n("Scheduling"), this );
 	hlay->addWidget( schedGroup, 0, AlignTop );
@@ -306,7 +306,7 @@ KDMShutdown::KDMShutdown( int _uid, TQWidget *_parent )
 	grid->addWidget( le_timeout, 2, 1 );
 	grid->addMultiCellWidget( cb_force, 3,3, 0,1 );
 
-	schedGroup->tqsetSizePolicy( fp );
+	schedGroup->setSizePolicy( fp );
 
 	le_start->setText( "0" );
 	if (_defSdMode == SHUT_SCHEDULE)
@@ -477,7 +477,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 	if(doUbuntuLogout)
 	{		
 		lfrm->setFrameStyle( TQFrame::StyledPanel | TQFrame::Raised );
-		lfrm->setLineWidth( style().tqpixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
+		lfrm->setLineWidth( style().pixelMetric( TQStyle::PM_DefaultFrameWidth, lfrm ) );
 		// we need to set the minimum size for the logout box, since it
 		// gets too small if there isn't all options available
 		lfrm->setMinimumSize(300,120);
@@ -487,7 +487,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 
 		// first line of buttons
 		hbuttonbox = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint() );
-		hbuttonbox->tqsetAlignment( Qt::AlignHCenter );
+		hbuttonbox->setAlignment( Qt::AlignHCenter );
 
 		// Reboot
 		FlatButton* btnReboot = new FlatButton( lfrm );
@@ -531,7 +531,7 @@ KDMSlimShutdown::KDMSlimShutdown( TQWidget *_parent )
 
 		// cancel buttonbox
 		TQHBoxLayout* hbuttonbox2 = new TQHBoxLayout( vbox, 8 * KDialog::spacingHint()  );
-		hbuttonbox2->tqsetAlignment( Qt::AlignRight );
+		hbuttonbox2->setAlignment( Qt::AlignRight );
 
 		// Back to kdm
 		KSMPushButton* btnBack = new KSMPushButton( KStdGuiItem::cancel(), lfrm );
diff --git a/kdm/kfrontend/kfdialog.cpp b/kdm/kfrontend/kfdialog.cpp
index 8fd5a8097..78359e237 100644
--- a/kdm/kfrontend/kfdialog.cpp
+++ b/kdm/kfrontend/kfdialog.cpp
@@ -59,7 +59,7 @@ FDialog::resizeEvent( TQResizeEvent *e )
 void
 FDialog::adjustGeometry()
 {
-	TQDesktopWidget *dsk = tqApp->desktop();
+	TQDesktopWidget *dsk = qApp->desktop();
 
 	if (_greeterScreen < 0)
 		_greeterScreen = _greeterScreen == -2 ?
@@ -74,7 +74,7 @@ FDialog::adjustGeometry()
 		adjustSize();
 	}
 
-	if (tqparentWidget())
+	if (parentWidget())
 		return;
 
 	TQRect grt( rect() );
@@ -140,10 +140,10 @@ KFMsgBox::KFMsgBox( TQWidget *parent, TQMessageBox::Icon type, const TQString &t
 	TQLabel *label2 = new TQLabel( text, this );
 	TQRect d = KGlobalSettings::desktopGeometry(this);
 	if ( label2->fontMetrics().size( 0, text).width() > d.width() * 3 / 5) 
-		label2->tqsetAlignment(Qt::WordBreak | Qt::AlignAuto );
+		label2->setAlignment(Qt::WordBreak | Qt::AlignAuto );
 	KPushButton *button = new KPushButton( KStdGuiItem::ok(), this );
 	button->setDefault( true );
-	button->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
+	button->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ) );
 	connect( button, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
 
 	TQGridLayout *grid = new TQGridLayout( this, 2, 2, 10 );
diff --git a/kdm/kfrontend/kgapp.cpp b/kdm/kfrontend/kgapp.cpp
index 2f1ba913c..50e65e916 100644
--- a/kdm/kfrontend/kgapp.cpp
+++ b/kdm/kfrontend/kgapp.cpp
@@ -167,7 +167,7 @@ kg_main( const char *argv0 )
 
 	app.setFont( _normalFont );
 
-	setup_modifiers( dpy, _numLocktqStatus );
+	setup_modifiers( dpy, _numLockStatus );
 	SecureDisplay( dpy );
 	KProcess *proc = 0;
 	if (!_grabServer) {
@@ -201,7 +201,7 @@ kg_main( const char *argv0 )
 		}
 
 		if (cmd == G_ErrorGreet) {
-			if (KGVerify::handleFailVerify( tqApp->desktop()->screen( _greeterScreen ) ))
+			if (KGVerify::handleFailVerify( qApp->desktop()->screen( _greeterScreen ) ))
 				break;
 			_autoLoginDelay = 0;
 			cmd = G_Greet;
diff --git a/kdm/kfrontend/kgdialog.cpp b/kdm/kfrontend/kgdialog.cpp
index d85157bce..f4ed918c6 100644
--- a/kdm/kfrontend/kgdialog.cpp
+++ b/kdm/kfrontend/kgdialog.cpp
@@ -134,8 +134,8 @@ void
 KGDialog::slotActivateMenu( int id )
 {
 	TQPopupMenu *cmnu = optMenu->findItem( id )->popup();
-	TQSize sh( cmnu->tqsizeHint() / 2 );
-	cmnu->exec( tqgeometry().center() - TQPoint( sh.width(), sh.height() ) );
+	TQSize sh( cmnu->sizeHint() / 2 );
+	cmnu->exec( geometry().center() - TQPoint( sh.width(), sh.height() ) );
 }
 
 void
diff --git a/kdm/kfrontend/kgreeter.cpp b/kdm/kfrontend/kgreeter.cpp
index 8e144f06f..bd2e2651a 100644
--- a/kdm/kfrontend/kgreeter.cpp
+++ b/kdm/kfrontend/kgreeter.cpp
@@ -79,7 +79,7 @@ class UserListView : public KListView {
 		: KListView( parent, name )
 		, themed(_them), cachedSizeHint( -1, 0 )
 	{
-		tqsetSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
+		setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Ignored );
 		header()->hide();
 		addColumn( TQString::null );
 		setColumnAlignment( 0, AlignVCenter );
@@ -105,10 +105,10 @@ class UserListView : public KListView {
         return sum;
     }
 public:
-	virtual TQSize tqsizeHint() const
+	virtual TQSize sizeHint() const
 	{
 	  if (themed)
-            return KListView::tqsizeHint();
+            return KListView::sizeHint();
 
 		if (!cachedSizeHint.isValid()) {
 			constPolish();
@@ -119,7 +119,7 @@ public:
 					maxw = thisw;
 			}
 			cachedSizeHint.setWidth(
-				style().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) +
+				style().pixelMetric( TQStyle::PM_ScrollBarExtent ) +
 				frameWidth() * 2 + maxw );
 		}
 		return cachedSizeHint;
@@ -235,12 +235,12 @@ class UserListViewItem : public KListViewItem {
 		parent->cachedSizeHint.setWidth( -1 );
 	}
 
-        virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
+        virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
     {
       if (((UserListView*)listView())->themed)
-        TQListViewItem::paintCell(p, cg, column, width, tqalignment);
+        TQListViewItem::paintCell(p, cg, column, width, alignment);
       else
-	KListViewItem::paintCell(p, cg, column, width, tqalignment);
+	KListViewItem::paintCell(p, cg, column, width, alignment);
     }
 
 	TQString login;
@@ -343,7 +343,7 @@ KGreeter::insertUser( const TQImage &default_pix,
 
 class KCStringList : public TQValueList<TQCString> {
   public:
-	bool tqcontains( const char *str ) const
+	bool contains( const char *str ) const
 	{
 		for (ConstIterator it = begin(); it != end(); ++it)
 			if (*it == str)
@@ -355,7 +355,7 @@ class KCStringList : public TQValueList<TQCString> {
 class UserList {
   public:
 	UserList( char **in );
-	bool hasUser( const char *str ) const { return users.tqcontains( str ); }
+	bool hasUser( const char *str ) const { return users.contains( str ); }
 	bool hasGroup( gid_t gid ) const
 		{ return groups.find( gid ) != groups.end(); }
 	bool hasGroups() const { return !groups.isEmpty(); }
@@ -786,14 +786,14 @@ KStdGreeter::KStdGreeter()
 		               i18n("This display requires no X authorization.\n"
 		                    "This means that anybody can connect to it,\n"
 		                    "open windows on it or intercept your input.") );
-		complainLabel->tqsetAlignment( AlignCenter );
+		complainLabel->setAlignment( AlignCenter );
 		complainLabel->setFont( _failFont );
 		complainLabel->setPaletteForegroundColor( Qt::red );
 		inner_box->addWidget( complainLabel );
 	}
 	if (!_greetString.isEmpty()) {
 		TQLabel *welcomeLabel = new TQLabel( _greetString, this );
-		welcomeLabel->tqsetAlignment( AlignCenter );
+		welcomeLabel->setAlignment( AlignCenter );
 		welcomeLabel->setFont( _greetFont );
 		inner_box->addWidget( welcomeLabel );
 	}
@@ -1092,7 +1092,7 @@ TQString KThemedGreeter::timedUser = TQString::null;
 int KThemedGreeter::timedDelay = -1;
 
 void
-KThemedGreeter::updatetqStatus( bool fail, bool caps, int timedleft )
+KThemedGreeter::updateStatus( bool fail, bool caps, int timedleft )
 {
 	if (pam_error) {
 		if (fail)
diff --git a/kdm/kfrontend/kgreeter.h b/kdm/kfrontend/kgreeter.h
index 2eb76674b..fdbd56209 100644
--- a/kdm/kfrontend/kgreeter.h
+++ b/kdm/kfrontend/kgreeter.h
@@ -149,7 +149,7 @@ class KThemedGreeter : public KGreeter {
 	void slotAskAdminPassword();
 
   protected:
-	virtual void updatetqStatus( bool fail, bool caps, int timedleft );
+	virtual void updateStatus( bool fail, bool caps, int timedleft );
 	virtual void pluginSetup();
 	virtual void keyPressEvent( TQKeyEvent * );
 	virtual bool event( TQEvent *e );
diff --git a/kdm/kfrontend/kgverify.cpp b/kdm/kfrontend/kgverify.cpp
index 460336d45..98abb4fb5 100644
--- a/kdm/kfrontend/kgverify.cpp
+++ b/kdm/kfrontend/kgverify.cpp
@@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <X11/Xlib.h> // for updateLocktqStatus()
+#include <X11/Xlib.h> // for updateLockStatus()
 #include <fixx11h.h> // ... and make eventFilter() work again
 
 #define FULL_GREET_TO 40 // normal inactivity timeout
@@ -62,7 +62,7 @@ void KGVerifyHandler::verifyClear()
 {
 }
 
-void KGVerifyHandler::updatetqStatus( bool, bool, int )
+void KGVerifyHandler::updateStatus( bool, bool, int )
 {
 }
 
@@ -150,7 +150,7 @@ KGVerify::pluginName() const
 	TQString name( greetPlugins[pluginList[curPlugin]].library->fileName() );
 	uint st = name.findRev( '/' ) + 1;
 	uint en = name.find( '.', st );
-	if (en - st > 7 && TQConstString( name.tqunicode() + st, 7 ).string() == "kgreet_")
+	if (en - st > 7 && TQConstString( name.unicode() + st, 7 ).string() == "kgreet_")
 		st += 7;
 	return name.mid( st, en - st );
 }
@@ -163,7 +163,7 @@ showWidgets( TQLayoutItem *li )
 
 	if ((w = li->widget()))
 		w->show();
-	else if ((l = li->tqlayout())) {
+	else if ((l = li->layout())) {
 		TQLayoutIterator it = l->iterator();
 		for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 			 showWidgets( itm );
@@ -233,7 +233,7 @@ KGVerify::scheduleAutoLogin( bool initial )
 			timedLeft = QMAX( _autoLoginDelay - TIMED_GREET_TO, MIN_TIMED_TO );
 			deadTicks = DEAD_TIMED_TO;
 		}
-		updatetqStatus();
+		updateStatus();
 		running = false;
 		isClear = true;
 		return true;
@@ -310,7 +310,7 @@ KGVerify::suspend()
 		greet->abort();
 	}
 	suspended = true;
-	updatetqStatus();
+	updateStatus();
 	timer.suspend();
 }
 
@@ -319,7 +319,7 @@ KGVerify::resume()
 {
 	timer.resume();
 	suspended = false;
-	updateLocktqStatus();
+	updateLockStatus();
 	if (running) {
 		Debug( "%s->start()\n", pName.data() );
 		greet->start();
@@ -373,7 +373,7 @@ KGVerify::setEnabled( bool on )
 	Debug( "%s->setEnabled(%s)\n", pName.data(), on ? "true" : "false" );
 	greet->setEnabled( on );
 	enabled = on;
-	updatetqStatus();
+	updateStatus();
 }
 
 void // private
@@ -381,7 +381,7 @@ KGVerify::slotTimeout()
 {
 	if (failed) {
 		failed = false;
-		updatetqStatus();
+		updateStatus();
 		Debug( "%s->revive()\n", pName.data() );
 		greet->revive();
 		handler->verifyRetry();
@@ -402,7 +402,7 @@ KGVerify::slotTimeout()
 			performAutoLogin();
 		else
 			timer.start( 1000 );
-		updatetqStatus();
+		updateStatus();
 	} else {
 		// assert( ctx == Login );
 		isClear = true;
@@ -420,7 +420,7 @@ KGVerify::slotActivity()
 		greet->start();
 		running = true;
 		timedLeft = 0;
-		updatetqStatus();
+		updateStatus();
 		timer.start( TIMED_GREET_TO * SECONDS );
 	} else if (timeable)
 		timer.start( TIMED_GREET_TO * SECONDS );
@@ -709,7 +709,7 @@ KGVerify::handleVerify()
 		if (ret == V_AUTH) {
 			Debug( " V_AUTH\n" );
 			failed = true;
-			updatetqStatus();
+			updateStatus();
 			handler->verifyFailed();
 			timer.start( 1500 + kapp->random()/(RAND_MAX/1000) );
 			return;
@@ -733,7 +733,7 @@ void
 KGVerify::gplugReturnText( const char *text, int tag )
 {
 	Debug( "%s: gplugReturnText(%\"s, %d)\n", pName.data(),
-	       tag & V_IS_SECRET ? "<tqmasked>" : text, tag );
+	       tag & V_IS_SECRET ? "<masked>" : text, tag );
 	GSendStr( text );
 	if (text) {
 		GSendInt( tag );
@@ -813,7 +813,7 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e )
 		}
 		/* fall through */
 	case TQEvent::KeyRelease:
-		updateLocktqStatus();
+		updateLockStatus();
 		/* fall through */
 	default:
 		break;
@@ -822,16 +822,16 @@ KGVerify::eventFilter( TQObject *o, TQEvent *e )
 }
 
 void
-KGVerify::updateLocktqStatus()
+KGVerify::updateLockStatus()
 {
-	unsigned int ltqmask;
+	unsigned int lmask;
 	Window dummy1, dummy2;
 	int dummy3, dummy4, dummy5, dummy6;
 	XQueryPointer( qt_xdisplay(), DefaultRootWindow( qt_xdisplay() ),
 	               &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, &dummy6,
-	               &ltqmask );
-	capsLocked = ltqmask & LockMask;
-	updatetqStatus();
+	               &lmask );
+	capsLocked = lmask & LockMask;
+	updateStatus();
 }
 
 void
@@ -849,7 +849,7 @@ KGVerify::getConf( void *, const char *key, const TQVariant &dflt )
 	if (!qstrcmp( key, "EchoMode" ))
 		return TQVariant( _echoMode );
 	else {
-		TQString fkey = TQString::tqfromLatin1( key ) + '=';
+		TQString fkey = TQString::fromLatin1( key ) + '=';
 		for (TQStringList::ConstIterator it = _pluginOptions.begin();
 		     it != _pluginOptions.end(); ++it)
 			if ((*it).startsWith( fkey ))
@@ -923,13 +923,13 @@ KGStdVerify::KGStdVerify( KGVerifyHandler *_handler, TQWidget *_parent,
 	, failedLabelState( 0 )
 {
 	grid = new TQGridLayout;
-	grid->tqsetAlignment( AlignCenter );
+	grid->setAlignment( AlignCenter );
 
 	failedLabel = new TQLabel( parent );
 	failedLabel->setFont( _failFont );
 	grid->addWidget( failedLabel, 1, 0, AlignCenter );
 
-	updateLocktqStatus();
+	updateLockStatus();
 }
 
 KGStdVerify::~KGStdVerify()
@@ -965,7 +965,7 @@ KGStdVerify::slotPluginSelected( int id )
 }
 
 void
-KGStdVerify::updatetqStatus()
+KGStdVerify::updateStatus()
 {
 	int nfls;
 
@@ -1019,7 +1019,7 @@ KGThemedVerify::KGThemedVerify( KGVerifyHandler *_handler,
 	: inherited( _handler, _themer, _parent, _predecessor, _fixedUser,
 	             _pluginList, _func, _ctx )
 {
-	updateLocktqStatus();
+	updateLockStatus();
 }
 
 KGThemedVerify::~KGThemedVerify()
@@ -1063,9 +1063,9 @@ KGThemedVerify::slotPluginSelected( int id )
 }
 
 void
-KGThemedVerify::updatetqStatus()
+KGThemedVerify::updateStatus()
 {
-	handler->updatetqStatus( enabled && failed,
+	handler->updateStatus( enabled && failed,
 	                       enabled && !suspended && capsLocked,
 	                       timedLeft );
 }
@@ -1080,10 +1080,10 @@ KGChTok::KGChTok( TQWidget *_parent, const TQString &user,
 {
 	TQSizePolicy fp( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
 	okButton = new KPushButton( KStdGuiItem::ok(), this );
-	okButton->tqsetSizePolicy( fp );
+	okButton->setSizePolicy( fp );
 	okButton->setDefault( true );
 	cancelButton = new KPushButton( KStdGuiItem::cancel(), this );
-	cancelButton->tqsetSizePolicy( fp );
+	cancelButton->setSizePolicy( fp );
 
 	verify = new KGStdVerify( this, this, cancelButton, user, pluginList, func, ctx );
 	verify->selectPlugin( curPlugin );
diff --git a/kdm/kfrontend/kgverify.h b/kdm/kfrontend/kgverify.h
index b5daad969..0276b2f97 100644
--- a/kdm/kfrontend/kgverify.h
+++ b/kdm/kfrontend/kgverify.h
@@ -68,7 +68,7 @@ class KGVerifyHandler {
 	virtual void verifyFailed() = 0;
 	virtual void verifyRetry() = 0;
 	virtual void verifySetUser( const TQString &user ) = 0;
-	virtual void updatetqStatus( bool fail, bool caps, int left ); // for themed only
+	virtual void updateStatus( bool fail, bool caps, int left ); // for themed only
 };
 
 class TQWidget;
@@ -126,8 +126,8 @@ class KGVerify : public TQObject, public KGreeterPluginHandler {
 	bool eventFilter( TQObject *, TQEvent * );
 	void MsgBox( TQMessageBox::Icon typ, const TQString &msg );
 	void setTimer();
-	void updateLocktqStatus();
-	virtual void updatetqStatus() = 0;
+	void updateLockStatus();
+	virtual void updateStatus() = 0;
 	void handleVerify();
 
 	QXTimer timer;
@@ -188,7 +188,7 @@ class KGStdVerify : public KGVerify {
 	void selectPlugin( int id );
 
   protected:
-	void updatetqStatus();
+	void updateStatus();
 
   private:
 	TQGridLayout *grid;
@@ -214,7 +214,7 @@ class KGThemedVerify : public KGVerify {
 	void selectPlugin( int id );
 
   protected:
-	void updatetqStatus();
+	void updateStatus();
 
   private slots:
 	void slotPluginSelected( int id );
diff --git a/kdm/kfrontend/krootimage.cpp b/kdm/kfrontend/krootimage.cpp
index bb9d897b2..67b575c5f 100644
--- a/kdm/kfrontend/krootimage.cpp
+++ b/kdm/kfrontend/krootimage.cpp
@@ -61,7 +61,7 @@ void
 MyApplication::renderDone()
 {
 	desktop()->setBackgroundPixmap( renderer.pixmap() );
-	desktop()->tqrepaint( true );
+	desktop()->repaint( true );
 	renderer.saveCacheFile();
 	renderer.cleanup();
 	for (unsigned i=0; i<renderer.numRenderers(); ++i)
diff --git a/kdm/kfrontend/sessions/ratpoison.desktop b/kdm/kfrontend/sessions/ratpoison.desktop
index ededb43d8..1127db151 100644
--- a/kdm/kfrontend/sessions/ratpoison.desktop
+++ b/kdm/kfrontend/sessions/ratpoison.desktop
@@ -59,7 +59,7 @@ Comment[ne]=पर्दा पछाडि सञ्झ्याल प्र
 Comment[nl]=Een eenvoudige windowmanager die alleen met het toetsenbord te bedienen is, geïnspireerd door Screen
 Comment[nn]=Ein enkel tastaturbasert vindaugssjef, med Screen som førebilete
 Comment[pa]=ਪਰਦੇ ਮੈਡੀਊਲ ਬਾਅਦ ਸਿਰਫ ਕੀ-ਬੋਰਡ ਤੇ ਆਧਾਰਿਤ ਝਰੋਖਾ ਮੈਨੇਜਰ
-Comment[pl]=Prosty menedżer okien obsługiwany wyłącznie za potqmocą klawiatury, stworzony na podobieństwo programu screen
+Comment[pl]=Prosty menedżer okien obsługiwany wyłącznie za pomocą klawiatury, stworzony na podobieństwo programu screen
 Comment[pt]=Um gestor de janelas simples, só para o teclado e modelado sobre o Screen
 Comment[pt_BR]=Um simples gerenciador de janelas baseado somente em teclado, modelado após a tela
 Comment[ro]=Un manager de ferestre manipulat din tastatură, modelat după Screen
diff --git a/kdm/kfrontend/sessions/sawfish.desktop b/kdm/kfrontend/sessions/sawfish.desktop
index 59482d1f9..668620fff 100644
--- a/kdm/kfrontend/sessions/sawfish.desktop
+++ b/kdm/kfrontend/sessions/sawfish.desktop
@@ -52,7 +52,7 @@ Comment[ne]=इमाक्स लिस्प जस्तो भाषसँ
 Comment[nl]=Een uitbreidbare windowmanager, scriptbaar via een Emacs Lisp-achtige taal
 Comment[nn]=Ein utvidbar vindaugssjef som kan skriptast med eit språk som liknar Emacs Lisp
 Comment[pa]= Emacs Lisp-ਵਰਗੀ ਭਾਸ਼ਾ ਸਕ੍ਰਿਪਟਯੋਗ ਝਰੋਖਾ ਮੈਨੇਜਰ
-Comment[pl]=Menedżer okien, który można rozszerzać za potqmocą skrytów w języku podobnym do Emacs Lisp
+Comment[pl]=Menedżer okien, który można rozszerzać za pomocą skrytów w języku podobnym do Emacs Lisp
 Comment[pt]=Um gestor de janelas extensível e programável com uma linguagem semelhante ao Emacs Lisp
 Comment[pt_BR]=um gerenciador de janelas extensível, baseado em scripts, com uma linguagem parecida com o Lisp do Emacs
 Comment[ro]=Un manager de ferestre extensibil scriptabil cu un limbaj similar cu Emacs Lisp
diff --git a/kdm/kfrontend/themer/kdmitem.cpp b/kdm/kfrontend/themer/kdmitem.cpp
index 1233a96d2..a171bd1bb 100644
--- a/kdm/kfrontend/themer/kdmitem.cpp
+++ b/kdm/kfrontend/themer/kdmitem.cpp
@@ -66,7 +66,7 @@ KdmItem::KdmItem( TQWidget *parent, const TQDomNode &node, const char *name )
 void
 KdmItem::init( const TQDomNode &node, const char * )
 {
-	// Set default tqlayout for every item
+	// Set default layout for every item
 	currentManager = MNone;
 	pos.x = pos.y = 0;
 	pos.width = pos.height = 1;
@@ -146,7 +146,7 @@ KdmItem::show( bool force )
 
 	if (myWidget)
 		myWidget->show();
-	// XXX showing of tqlayouts not implemented, prolly pointless anyway
+	// XXX showing of layouts not implemented, prolly pointless anyway
 
 	needUpdate();
 }
@@ -170,7 +170,7 @@ KdmItem::hide( bool force )
 
 	if (myWidget)
 		myWidget->hide();
-	// XXX hiding of tqlayouts not implemented, prolly pointless anyway
+	// XXX hiding of layouts not implemented, prolly pointless anyway
 
 	needUpdate();
 }
@@ -236,14 +236,14 @@ KdmItem::setLayoutItem( TQLayoutItem *item )
 	// XXX hiding not supported - it think it's pointless here
 	if (myLayoutItem->widget())
 		connect( myLayoutItem->widget(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(tqlayoutItemGone()) );
-	else if (myLayoutItem->tqlayout())
-		connect( myLayoutItem->tqlayout(), TQT_SIGNAL(destroyed()),
-		         TQT_SLOT(tqlayoutItemGone()) );
+		         TQT_SLOT(layoutItemGone()) );
+	else if (myLayoutItem->layout())
+		connect( myLayoutItem->layout(), TQT_SIGNAL(destroyed()),
+		         TQT_SLOT(layoutItemGone()) );
 }
 
 void
-KdmItem::tqlayoutItemGone()
+KdmItem::layoutItemGone()
 {
 	myLayoutItem = 0;
 }
@@ -278,7 +278,7 @@ KdmItem::setGeometry( const TQRect &newGeometry, bool force )
 	if (fixedManager && !fixedManager->isEmpty())
 		fixedManager->update( newGeometry, force );
 
-	// TODO send *selective* tqrepaint signal
+	// TODO send *selective* repaint signal
 }
 
 void
@@ -295,8 +295,8 @@ KdmItem::paint( TQPainter *p, const TQRect &rect )
             // Maybe set a darker version of the background instead of an exact copy?
             if ( myWidget && myWidget->isA( "KListView" ) ) {
                 TQPixmap copy( myWidget->size() );
-                kdDebug() <<  myWidget->tqgeometry() << " " << area << " " << myWidget->size() << endl;
-                bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->tqgeometry(), Qt::CopyROP );
+                kdDebug() <<  myWidget->geometry() << " " << area << " " << myWidget->size() << endl;
+                bitBlt( &copy, TQPoint( 0, 0), p->device(), myWidget->geometry(), Qt::CopyROP );
                 // Lighten it slightly
                 TQImage lightVersion;
                 lightVersion = copy.convertToImage();
@@ -368,7 +368,7 @@ KdmItem::mouseEvent( int x, int y, bool pressed, bool released )
 	}
 
 	ItemState oldState = state;
-	if (area.tqcontains( x, y )) {
+	if (area.contains( x, y )) {
 		if (released && oldState == Sactive) {
 			if (buttonParent)
 				emit activated( id );
@@ -415,12 +415,12 @@ KdmItem::statusChanged()
 // BEGIN protected inheritable
 
 QSize
-KdmItem::tqsizeHint()
+KdmItem::sizeHint()
 {
 	if (myWidget)
 		return myWidget->size();
 	if (myLayoutItem)
-		return myLayoutItem->tqsizeHint();
+		return myLayoutItem->sizeHint();
 	int w = pos.wType == DTpixel ? kAbs( pos.width ) : -1,
 	    h = pos.hType == DTpixel ? kAbs( pos.height ) : -1;
 	return TQSize( w, h );
@@ -429,7 +429,7 @@ KdmItem::tqsizeHint()
 QRect
 KdmItem::placementHint( const TQRect &parentRect )
 {
-	TQSize hintedSize = tqsizeHint();
+	TQSize hintedSize = sizeHint();
 	TQSize boxHint;
 
 	int x = parentRect.left(),
@@ -446,7 +446,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 		else {
 			if (!boxManager)
 				return parentRect;
-			boxHint = boxManager->tqsizeHint();
+			boxHint = boxManager->sizeHint();
 		}
 		kdDebug() << timestamp() << " boxHint " << boxHint << endl;
 	}
@@ -456,21 +456,21 @@ KdmItem::placementHint( const TQRect &parentRect )
 	else if (pos.xType == DTnpixel)
 		x = parentRect.right() - pos.x;
 	else if (pos.xType == DTpercent)
-		x += tqRound( parentRect.width() / 100.0 * pos.x );
+		x += qRound( parentRect.width() / 100.0 * pos.x );
 
 	if (pos.yType == DTpixel)
 		y += pos.y;
 	else if (pos.yType == DTnpixel)
 		y = parentRect.bottom() - pos.y;
 	else if (pos.yType == DTpercent)
-		y += tqRound( parentRect.height() / 100.0 * pos.y );
+		y += qRound( parentRect.height() / 100.0 * pos.y );
 
 	if (pos.wType == DTpixel)
 		w = pos.width;
 	else if (pos.wType == DTnpixel)
 		w -= pos.width;
 	else if (pos.wType == DTpercent)
-		w = tqRound( parentRect.width() / 100.0 * pos.width );
+		w = qRound( parentRect.width() / 100.0 * pos.width );
 	else if (pos.wType == DTbox)
 		w = boxHint.width();
 	else if (hintedSize.width() > 0)
@@ -483,7 +483,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 	else if (pos.hType == DTnpixel)
 		h -= pos.height;
 	else if (pos.hType == DTpercent)
-		h = tqRound( parentRect.height() / 100.0 * pos.height );
+		h = qRound( parentRect.height() / 100.0 * pos.height );
 	else if (pos.hType == DTbox)
 		h = boxHint.height();
 	else if (hintedSize.height() > 0) {
@@ -496,7 +496,7 @@ KdmItem::placementHint( const TQRect &parentRect )
 
 	// we choose to take the hinted size, but it's better to listen to the aspect ratio
 	if (pos.wType == DTnone && pos.hType != DTnone && h && w) {
-	        w = tqRound(float(hintedSize.width() * h) / hintedSize.height());
+	        w = qRound(float(hintedSize.width() * h) / hintedSize.height());
 	}
 
 	// defaults to center
@@ -559,7 +559,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 		dType = DTpercent;
 		TQString sCopy = s;
 		sCopy.remove( p, 1 );
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	} else {		// int value
 		dType = DTpixel;
@@ -568,7 +568,7 @@ KdmItem::parseAttribute( const TQString &s, int &val, enum DataType &dType )
 			sCopy.remove( 0, 1 );
 			dType = DTnpixel;
 		}
-		sCopy.tqreplace( ',', '.' );
+		sCopy.replace( ',', '.' );
 		val = (int)sCopy.toDouble();
 	}
 }
@@ -614,7 +614,7 @@ KdmItem::setFixedLayout( const TQDomNode &node )
 }
 
 TQWidget *
-KdmItem::tqparentWidget() const
+KdmItem::parentWidget() const
 {
   if (myWidget)
     return myWidget;
@@ -623,7 +623,7 @@ KdmItem::tqparentWidget() const
 
   if (parent()->qt_cast("TQWidget"))
     return (TQWidget*)parent();
-  return ((KdmItem*)parent())->tqparentWidget();
+  return ((KdmItem*)parent())->parentWidget();
 }
 
 #include "kdmitem.moc"
diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 975033b33..230ed71c4 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -52,14 +52,14 @@ class TQLayoutItem;
  */
 
 /**
- * A note on tqlayouting - how does it work?
- *  - settqgeometry is called by parent (passing the new tqgeometry)
- *    - item changes its tqgeometry
+ * A note on layouting - how does it work?
+ *  - setgeometry is called by parent (passing the new geometry)
+ *    - item changes its geometry
  *    - if item embeds a widget, reposition it too
  *    - call children's box manager. box->update( my geom )
  *      - sum up the whole space taken by children (via *hint calls) if
  *        needed for box width / height computation. note that the computed
- *        tqgeometry should be equal or similar to parent's tqgeometry.
+ *        geometry should be equal or similar to parent's geometry.
  *      - pad the rectangle bounding box' contents
  *      - for every child
  *        - if vertical
@@ -74,7 +74,7 @@ class TQLayoutItem;
  *            and insertion entry points are vertical lines
  *    - call to children's fix manager. fixed->update( my geom )
  *      - for every child
- *          - S = get child's tqgeometry hint (and we'll give item the whole
+ *          - S = get child's geometry hint (and we'll give item the whole
  *            space it needs, without constraints)
  *          - call to child->setGeometry( S )
  *    - TODO: send a selective redraw signal also merging children's areas
@@ -95,8 +95,8 @@ public:
 	virtual ~KdmItem();
 
 	/**
-	 * Fixup the tqgeometry of an item and its children (even if fixed
-	 * or boxed ones). Note that this will generate tqrepaint signals
+	 * Fixup the geometry of an item and its children (even if fixed
+	 * or boxed ones). Note that this will generate repaint signals
 	 * when needed. The default implementation should fit all needs.
 	 */
 	virtual void setGeometry( const TQRect &newGeometry, bool force );
@@ -109,7 +109,7 @@ public:
 	void paint( TQPainter *painter, const TQRect &boundaries );
 
 	/**
-	 * Update representation of contents and tqrepaint.
+	 * Update representation of contents and repaint.
 	 */
 	virtual void update();
 
@@ -120,22 +120,22 @@ public:
 	void mouseEvent( int x, int y, bool pressed = false, bool released = false );
 
 	/**
-	 * Similar to tqsizeHint(..), this returns the area of the item
+	 * Similar to sizeHint(..), this returns the area of the item
 	 * given the @p parentGeometry. The default implementation
-	 * takes into account geometric constraints and tqlayoutings.
-	 * @param parentGeometry the tqgeometry of the caller item or a
-	 * null rect if the tqgeometry of the parent is not yet defined.
+	 * takes into account geometric constraints and layoutings.
+	 * @param parentGeometry the geometry of the caller item or a
+	 * null rect if the geometry of the parent is not yet defined.
 	 */
 	virtual TQRect placementHint( const TQRect &parentGeometry );
 
 	/**
-	 * Create the box tqlayout manager; next children will be
-	 * managed by the box tqlayouter
+	 * Create the box layout manager; next children will be
+	 * managed by the box layouter
 	 */
 	void setBoxLayout( const TQDomNode &node = TQDomNode() );
 
 	/**
-	 * Create the fixed tqlayout manager; next children will be
+	 * Create the fixed layout manager; next children will be
 	 * in fixed position relative to this item
 	 */
 	void setFixedLayout( const TQDomNode &node = TQDomNode() );
@@ -163,7 +163,7 @@ public:
 	bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
 	TQRect rect() const { return area; }
 
-	TQWidget *tqparentWidget() const;
+	TQWidget *parentWidget() const;
 	TQString getId() const { return id; }
 
 signals:
@@ -172,7 +172,7 @@ signals:
 
 protected slots:
 	void widgetGone();
-	void tqlayoutItemGone();
+	void layoutItemGone();
 
 protected:
 	/**
@@ -181,7 +181,7 @@ protected:
 	 * @return (-1,-1) if no size can be determined (so it should
 	 * default to parent's size).
 	 */
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	/**
 	 * Low level graphical function to paint the item.
@@ -195,7 +195,7 @@ protected:
 
 	/**
 	 * Called when item changes its 'state' variable. This must
-	 * handle item's tqrepaint.
+	 * handle item's repaint.
 	 */
 	virtual void statusChanged();
 
diff --git a/kdm/kfrontend/themer/kdmlabel.cpp b/kdm/kfrontend/themer/kdmlabel.cpp
index fb6a03b91..e83ae9dc7 100644
--- a/kdm/kfrontend/themer/kdmlabel.cpp
+++ b/kdm/kfrontend/themer/kdmlabel.cpp
@@ -115,8 +115,8 @@ KdmLabel::setTextInt( const TQString &txt)
 	myAccel = 0;
 	if (cAccel != -1) {
 	  cText.remove('&');
-	  myAccel = new TQAccel(tqparentWidget());
-	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().tqunicode());
+	  myAccel = new TQAccel(parentWidget());
+	  myAccel->insertItem(ALT + UNICODE_ACCEL + cText.at(cAccel).lower().unicode());
 	  connect(myAccel, TQT_SIGNAL(activated(int)), TQT_SLOT(slotAccel()));
 	}
 }
@@ -138,7 +138,7 @@ KdmLabel::setText( const TQString &txt )
 }
 
 QSize
-KdmLabel::tqsizeHint()
+KdmLabel::sizeHint()
 {
 	// choose the correct label class
 	struct LabelStruct::LabelClass *l = &label.normal;
@@ -250,7 +250,7 @@ KdmLabel::lookupText( const TQString &t )
 {
 	TQString text = t;
 
-	text.tqreplace( '_', '&' );
+	text.replace( '_', '&' );
 
 	TQMap<TQChar,TQString> m;
 	struct utsname uts;
@@ -268,7 +268,7 @@ KdmLabel::lookupText( const TQString &t )
 	m['s'] = KThemedGreeter::timedUser;
 	// xgettext:no-c-format
 	KGlobal::locale()->setDateFormat( i18n("date format", "%a %d %B") );
-	m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::tqcurrentDateTime(), false, false );
+	m['c'] = KGlobal::locale()->formatDateTime( TQDateTime::currentDateTime(), false, false );
 
 	return KMacroExpander::expandMacros( text, m );
 }
diff --git a/kdm/kfrontend/themer/kdmlabel.h b/kdm/kfrontend/themer/kdmlabel.h
index 33ce1cc00..1ec2f88ec 100644
--- a/kdm/kfrontend/themer/kdmlabel.h
+++ b/kdm/kfrontend/themer/kdmlabel.h
@@ -42,7 +42,7 @@ public:
 
 protected:
 	// reimplemented; returns the minimum size of rendered text
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	// draw the label
 	virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmlayout.cpp b/kdm/kfrontend/themer/kdmlayout.cpp
index bc1a059c5..b17d2e7b7 100644
--- a/kdm/kfrontend/themer/kdmlayout.cpp
+++ b/kdm/kfrontend/themer/kdmlayout.cpp
@@ -38,7 +38,7 @@ KdmLayoutFixed::update( const TQRect &parentGeometry, bool force )
 {
 	kdDebug() << timestamp() << " KdmLayoutFixed::update " << parentGeometry << endl;
 
-	// I can't tqlayout children if the parent rectangle is not valid
+	// I can't layout children if the parent rectangle is not valid
 	if (parentGeometry.width() < 0 || parentGeometry.height() < 0) {
 		kdDebug() << timestamp() << " invalid\n";
 		return;
@@ -67,14 +67,14 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
 {
 	kdDebug() << this << " update " << parentGeometry << endl;
 
-	// I can't tqlayout children if the parent rectangle is not valid
+	// I can't layout children if the parent rectangle is not valid
 	if (!parentGeometry.isValid() || parentGeometry.isEmpty())
 		return;
 
 	// Check if box size was computed. If not compute it
 	// TODO check if this prevents updating changing items
 //	if (!hintedSize.isValid())
-//		tqsizeHint();
+//		sizeHint();
 
 //	kdDebug() << this << " hintedSize " << hintedSize << endl;
 
@@ -114,30 +114,30 @@ KdmLayoutBox::update( const TQRect &parentGeometry, bool force )
 			if ((*it)->isExplicitlyHidden())
 				continue;
 
-			TQRect temp = childrenRect, tqitemRect;
+			TQRect temp = childrenRect, itemRect;
 			if (box.isVertical) {
 				temp.setHeight( 0 );
-				tqitemRect = (*it)->placementHint( temp );
-				temp.setHeight( tqitemRect.height() );
-				childrenRect.setTop( childrenRect.top() + tqitemRect.size().height() + box.spacing );
+				itemRect = (*it)->placementHint( temp );
+				temp.setHeight( itemRect.height() );
+				childrenRect.setTop( childrenRect.top() + itemRect.size().height() + box.spacing );
 			} else {
 				temp.setWidth( 0 );
-				tqitemRect = (*it)->placementHint( temp );
-				kdDebug() << this << " placementHint " << *it << " " << temp << " " << tqitemRect << endl;
-				temp.setWidth( tqitemRect.width() );
-				childrenRect.setLeft( childrenRect.left() + tqitemRect.size().width() + box.spacing );
+				itemRect = (*it)->placementHint( temp );
+				kdDebug() << this << " placementHint " << *it << " " << temp << " " << itemRect << endl;
+				temp.setWidth( itemRect.width() );
+				childrenRect.setLeft( childrenRect.left() + itemRect.size().width() + box.spacing );
 				kdDebug() << timestamp() << " childrenRect after " << *it << " " << childrenRect << endl;
 			}
-			tqitemRect = (*it)->placementHint( temp );
-			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << tqitemRect << endl;
-			(*it)->setGeometry( tqitemRect, force );
+			itemRect = (*it)->placementHint( temp );
+			kdDebug() << this << " placementHint2 " << *it << " " << temp << " " << itemRect << endl;
+			(*it)->setGeometry( itemRect, force );
 		}
 	}
 }
 
-//FIXME truly experimental (is so close to greeter_tqgeometry.c)
+//FIXME truly experimental (is so close to greeter_geometry.c)
 QSize
-KdmLayoutBox::tqsizeHint()
+KdmLayoutBox::sizeHint()
 {
 	// Sum up area taken by children
 	int w = 0, h = 0;
diff --git a/kdm/kfrontend/themer/kdmlayout.h b/kdm/kfrontend/themer/kdmlayout.h
index 75e90d573..4c73e9a1b 100644
--- a/kdm/kfrontend/themer/kdmlayout.h
+++ b/kdm/kfrontend/themer/kdmlayout.h
@@ -43,11 +43,11 @@ public:
 	// Adds an item that will be managed
 	void addItem( KdmItem *item ) { m_children.append( item ); }
 
-	// Return false if any item are managed by this tqlayouter
+	// Return false if any item are managed by this layouter
 	bool isEmpty() { return m_children.isEmpty(); }
 
-	// Updates the tqlayout of all items knowing that the parent
-	// has the @p parentGeometry tqgeometry
+	// Updates the layout of all items knowing that the parent
+	// has the @p parentGeometry geometry
 //	virtual void update( const TQRect &parentGeometry ) = 0;
 
 protected:
@@ -59,8 +59,8 @@ class KdmLayoutFixed : public KdmLayout {
 public:
 	KdmLayoutFixed( const TQDomNode &node );
 
-	// Updates the tqlayout of all boxed items knowing that the parent
-	// has the @p parentGeometry tqgeometry
+	// Updates the layout of all boxed items knowing that the parent
+	// has the @p parentGeometry geometry
 	void update( const TQRect &parentGeometry, bool force );
 };
 
@@ -74,13 +74,13 @@ class KdmLayoutBox : public KdmLayout {
 public:
 	KdmLayoutBox( const TQDomNode &node );
 
-	// Updates the tqlayout of all boxed items knowing that they
+	// Updates the layout of all boxed items knowing that they
 	// should fit into @p parentGeometry container
 	void update( const TQRect &parentGeometry, bool force );
 
 	// Computes the size hint of the box, telling which is the
 	// smallest size inside which boxed items will fit
-	TQSize tqsizeHint();
+	TQSize sizeHint();
 
 private:
 	struct {
diff --git a/kdm/kfrontend/themer/kdmpixmap.cpp b/kdm/kfrontend/themer/kdmpixmap.cpp
index ce7ef8e07..0fcbc065c 100644
--- a/kdm/kfrontend/themer/kdmpixmap.cpp
+++ b/kdm/kfrontend/themer/kdmpixmap.cpp
@@ -97,7 +97,7 @@ KdmPixmap::KdmPixmap( KdmItem *parent, const TQDomNode &node, const char *name )
 }
 
 QSize
-KdmPixmap::tqsizeHint()
+KdmPixmap::sizeHint()
 {
 	// choose the correct pixmap class
 	PixmapStruct::PixmapClass * pClass = &pixmap.normal;
@@ -108,7 +108,7 @@ KdmPixmap::tqsizeHint()
 	// use the pixmap size as the size hint
 	if (!pClass->pixmap.isNull())
 		return pClass->pixmap.size();
-	return KdmItem::tqsizeHint();
+	return KdmItem::sizeHint();
 }
 
 void
@@ -268,11 +268,11 @@ KdmPixmap::drawContents( TQPainter *p, const TQRect &r )
 				QRgb *ls = (QRgb *)scaledImage.scanLine( y );
 				for (int x = 0; x < w; ++x) {
 					QRgb l = ls[x];
-					int r = int( tqRed( l ) * tint_red );
-					int g = int( tqGreen( l ) * tint_green );
-					int b = int( tqBlue( l ) * tint_blue );
-					int a = int( tqAlpha( l ) * tint_alpha );
-					ls[x] = tqRgba( r, g, b, a );
+					int r = int( qRed( l ) * tint_red );
+					int g = int( qGreen( l ) * tint_green );
+					int b = int( qBlue( l ) * tint_blue );
+					int a = int( qAlpha( l ) * tint_alpha );
+					ls[x] = qRgba( r, g, b, a );
 				}
 			}
 
diff --git a/kdm/kfrontend/themer/kdmpixmap.h b/kdm/kfrontend/themer/kdmpixmap.h
index d49394bc9..a12c9fea4 100644
--- a/kdm/kfrontend/themer/kdmpixmap.h
+++ b/kdm/kfrontend/themer/kdmpixmap.h
@@ -42,7 +42,7 @@ public:
 
 protected:
 	// reimplemented; returns the size of loaded pixmap
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	// draw the pixmap
 	virtual void drawContents( TQPainter *p, const TQRect &r );
diff --git a/kdm/kfrontend/themer/kdmrect.cpp b/kdm/kfrontend/themer/kdmrect.cpp
index 5a252151c..1d854d213 100644
--- a/kdm/kfrontend/themer/kdmrect.cpp
+++ b/kdm/kfrontend/themer/kdmrect.cpp
@@ -141,7 +141,7 @@ KdmRect::recursiveSetAttribs( TQLayoutItem *li )
 
     if ((w = li->widget()))
 	setAttribs( w );
-    else if ((l = li->tqlayout())) {
+    else if ((l = li->layout())) {
 	TQLayoutIterator it = l->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 	     recursiveSetAttribs( itm );
diff --git a/kdm/kfrontend/themer/kdmthemer.cpp b/kdm/kfrontend/themer/kdmthemer.cpp
index 16d9e4f86..9e6db33db 100644
--- a/kdm/kfrontend/themer/kdmthemer.cpp
+++ b/kdm/kfrontend/themer/kdmthemer.cpp
@@ -223,7 +223,7 @@ KdmThemer::generateItems( KdmItem *parent, const TQDomNode &node )
 			TQString id = el.attribute("id");
 			if (id.startsWith("plugin-specific-")) {
 			        id = id.mid(strlen("plugin-specific-"));
-			        if (!_pluginsLogin.tqcontains(id))
+			        if (!_pluginsLogin.contains(id))
 			               continue;
 			}
 
diff --git a/kdm/kfrontend/themer/kdmthemer.h b/kdm/kfrontend/themer/kdmthemer.h
index 0c4cd3753..6dc2318dd 100644
--- a/kdm/kfrontend/themer/kdmthemer.h
+++ b/kdm/kfrontend/themer/kdmthemer.h
@@ -60,9 +60,9 @@ public:
 
 	bool isOK() { return rootItem != 0; }
 	/*
-	 * Gives a tqsizeHint to the widget (parent size)
+	 * Gives a sizeHint to the widget (parent size)
 	 */
-	//TQSize tqsizeHint() const{ return tqparentWidget()->size(); }
+	//TQSize sizeHint() const{ return parentWidget()->size(); }
 
 	/*
 	 * Takes a shot of the current widget
diff --git a/kdm/kfrontend/themes/o2_enterprise/gpl.txt b/kdm/kfrontend/themes/o2_enterprise/gpl.txt
index 4ab04989b..b6f92f3db 100644
--- a/kdm/kfrontend/themes/o2_enterprise/gpl.txt
+++ b/kdm/kfrontend/themes/o2_enterprise/gpl.txt
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means 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 executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kdmlib/dmctl.cpp b/kdmlib/dmctl.cpp
index ac52d5353..58d4f8379 100644
--- a/kdmlib/dmctl.cpp
+++ b/kdmlib/dmctl.cpp
@@ -121,7 +121,7 @@ DM::exec( const char *cmd )
  *   @p ret might contain addional results.
  *  @li If false and @p ret is empty, a communication error occurred
  *   (most probably KDM is not running).
- *  @li If false and @p ret is non-empty, it tqcontains the error message
+ *  @li If false and @p ret is non-empty, it contains the error message
  *   from KDM.
  */
 bool
@@ -249,7 +249,7 @@ DM::bootOptions( TQStringList &opts, int &defopt, int &current )
 
 	opts = TQStringList::split( ' ', opts[1] );
 	for (TQStringList::Iterator it = opts.begin(); it != opts.end(); ++it)
-		(*it).tqreplace( "\\s", " " );
+		(*it).replace( "\\s", " " );
 
 	return true;
 }
diff --git a/kdmlib/kgreet_classic.cpp b/kdmlib/kgreet_classic.cpp
index bc4bda77e..fd2e65bd8 100644
--- a/kdmlib/kgreet_classic.cpp
+++ b/kdmlib/kgreet_classic.cpp
@@ -63,7 +63,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 	TQGridLayout *grid = 0;
 	int line = 0;
 
-	tqlayoutItem = 0;
+	layoutItem = 0;
 
 	if (themer &&
 	    (!(user_entry = themer->findNode( "user-entry" )) ||
@@ -71,7 +71,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 		themer = 0;
 
 	if (!themer)
-		tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 );
+		layoutItem = grid = new TQGridLayout( 0, 0, 10 );
 
 	loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	loginEdit = 0;
@@ -161,15 +161,15 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler,
 KClassicGreeter::~KClassicGreeter()
 {
 	abort();
-	if (!tqlayoutItem) {
+	if (!layoutItem) {
 		delete loginEdit;
 		delete passwdEdit;
 		return;
 	}
-	TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
-	delete tqlayoutItem;
+	delete layoutItem;
 }
 
 void // virtual
diff --git a/kdmlib/kgreet_pam.cpp b/kdmlib/kgreet_pam.cpp
index 5ac93e074..b43952488 100644
--- a/kdmlib/kgreet_pam.cpp
+++ b/kdmlib/kgreet_pam.cpp
@@ -94,12 +94,12 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
 
         debug("KPamGreeter constructed\n");
 
-	m_tqparentWidget = parent;
+	m_parentWidget = parent;
 
 	KdmItem *user_entry = 0, *pw_entry = 0;
 	int line = 0;
 
-	tqlayoutItem = 0;
+	layoutItem = 0;
 
 	if (themer &&
 	    (!(user_entry = themer->findNode( "user-entry" )) ||
@@ -109,7 +109,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler,
         m_themer = themer;
 
 	if (!themer)
-		tqlayoutItem = new TQGridLayout( 0, 0, 10 );
+		layoutItem = new TQGridLayout( 0, 0, 10 );
 
         loginLabel = 0;
         authLabel.clear();
@@ -205,14 +205,14 @@ KPamGreeter::~KPamGreeter()
 {
         debug("KPamGreeter::~KPamGreeter");
 	abort();
-	if (!tqlayoutItem) {
+	if (!layoutItem) {
 		delete loginEdit;
 		return;
 	}
-	TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		 delete itm->widget();
-	delete tqlayoutItem;
+	delete layoutItem;
         debug("destructor finished, good bye");
 }
 
@@ -314,7 +314,7 @@ KPamGreeter::textMessage( const char *text, bool err )
 	    return false;
 
     if (getLayoutItem()) {
-      TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_tqparentWidget);
+      TQLabel* label = new TQLabel(TQString::fromUtf8(text), m_parentWidget);
       getLayoutItem()->addWidget(label, state+1, 0, 0);
     }
 
@@ -341,9 +341,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
     }
     else if (state >= authEdit.size()) {
 	if (getLayoutItem()) {
-   	    TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_tqparentWidget);
+   	    TQLabel* label = new TQLabel(TQString::fromUtf8(prompt), m_parentWidget);
 	    getLayoutItem()->addWidget(label, state+1, 0, 0);
-            debug("added label widget to tqlayout");
+            debug("added label widget to layout");
         }
         else if (m_themer) {
             debug("themer found!");
@@ -361,9 +361,9 @@ KPamGreeter::textPrompt( const char *prompt, bool echo, bool nonBlocking )
 	KDMPasswordEdit* passwdEdit;
 
 	if (echoMode == -1)
-	    passwdEdit = new KDMPasswordEdit( m_tqparentWidget );
+	    passwdEdit = new KDMPasswordEdit( m_parentWidget );
 	else
-	    passwdEdit = new KDMPasswordEdit( echoMode, m_tqparentWidget);
+	    passwdEdit = new KDMPasswordEdit( echoMode, m_parentWidget);
 	connect( passwdEdit, TQT_SIGNAL(textChanged( const TQString & )),
 		TQT_SLOT(slotActivity()) );
 	connect( passwdEdit, TQT_SIGNAL(lostFocus()), TQT_SLOT(slotActivity()) );
diff --git a/kdmlib/kgreet_pam.h b/kdmlib/kgreet_pam.h
index 16dc0d7ea..f0bea7d02 100644
--- a/kdmlib/kgreet_pam.h
+++ b/kdmlib/kgreet_pam.h
@@ -64,7 +64,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
 	virtual void revive();
 	virtual void clear();
 
-        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(tqlayoutItem); }
+        TQGridLayout *getLayoutItem() const { return static_cast<TQGridLayout*>(layoutItem); }
 
   public slots:
 	void slotLoginLostFocus();
@@ -78,7 +78,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin {
         TQLabel *loginLabel;
         TQValueList<TQLabel*> authLabel;
 	KLineEdit *loginEdit;
-        TQWidget* m_tqparentWidget;
+        TQWidget* m_parentWidget;
         TQValueList<KPasswordEdit*> authEdit;
 	KSimpleConfig *stsFile;
         KdmThemer *m_themer;
diff --git a/kdmlib/kgreet_winbind.cpp b/kdmlib/kgreet_winbind.cpp
index 0e188ba3b..5f6530707 100644
--- a/kdmlib/kgreet_winbind.cpp
+++ b/kdmlib/kgreet_winbind.cpp
@@ -80,7 +80,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 	TQGridLayout *grid = 0;
 
 	int line = 0;
-	tqlayoutItem = 0;
+	layoutItem = 0;
 
 	if (themer &&
 	    (!(user_entry = themer->findNode( "user-entry" )) ||
@@ -89,7 +89,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 		themer = 0;
 
 	if (!themer)
-		tqlayoutItem = grid = new TQGridLayout( 0, 0, 10 );
+		layoutItem = grid = new TQGridLayout( 0, 0, 10 );
 
 	domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0;
 	domainCombo = 0;
@@ -206,16 +206,16 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler,
 KWinbindGreeter::~KWinbindGreeter()
 {
 	abort();
-	if (!tqlayoutItem) {
+	if (!layoutItem) {
 		delete loginEdit;
 		delete passwdEdit;
 		delete domainCombo;
 		return;
 	}
-	TQLayoutIterator it = static_cast<TQLayout *>(tqlayoutItem)->iterator();
+	TQLayoutIterator it = static_cast<TQLayout *>(layoutItem)->iterator();
 	for (TQLayoutItem *itm = it.current(); itm; itm = ++it)
 		delete itm->widget();
-	delete tqlayoutItem;
+	delete layoutItem;
         delete m_domainLister;
 }
 
@@ -593,7 +593,7 @@ KWinbindGreeter::slotEndDomainList()
     for (TQStringList::const_iterator it = mDomainListing.begin();
          it != mDomainListing.end(); ++it) {
 
-        if (!domainList.tqcontains(*it))
+        if (!domainList.contains(*it))
             domainList.append(*it);
     }
 
@@ -625,7 +625,7 @@ static bool init( const TQString &,
 {
 	echoMode = getConf( ctx, "EchoMode", TQVariant( -1 ) ).toInt();
 	staticDomains = TQStringList::split( ':', getConf( ctx, "winbind.Domains", TQVariant( "" ) ).toString() );
-	if (!staticDomains.tqcontains("<local>"))
+	if (!staticDomains.contains("<local>"))
 		staticDomains << "<local>";
 
 	defaultDomain = getConf( ctx, "winbind.DefaultDomain", TQVariant( staticDomains.first() ) ).toString();
diff --git a/kdmlib/kgreeterplugin.h b/kdmlib/kgreeterplugin.h
index c4591e14b..44799a622 100644
--- a/kdmlib/kgreeterplugin.h
+++ b/kdmlib/kgreeterplugin.h
@@ -280,11 +280,11 @@ public:
      * Obtain the TQLayoutItem containg the widget(s) to actually handle the
      * conversation. See TQLayout and TQWidgetItem for possible implementations.
      */
-    TQLayoutItem *getLayoutItem() const { return tqlayoutItem; }
+    TQLayoutItem *getLayoutItem() const { return layoutItem; }
 
 protected:
     KGreeterPluginHandler *handler;
-    TQLayoutItem *tqlayoutItem;
+    TQLayoutItem *layoutItem;
 };
 
 struct KDE_EXPORT kgreeterplugin_info {
diff --git a/kfind/ChangeLog b/kfind/ChangeLog
index fedc124f2..c13408a52 100644
--- a/kfind/ChangeLog
+++ b/kfind/ChangeLog
@@ -10,7 +10,7 @@ Fri Jul 30 22:33:25 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 1999-06-13  Harri Porten  <porten@kde.org>
 
-	* kftabdlg.cpp: introduced flexible tqgeometry managment. Patch provided
+	* kftabdlg.cpp: introduced flexible geometry managment. Patch provided
 	by Dima Rogozin <dima@mercury.co.il>.
 
 1999-04-30  Harri Porten  <porten@kde.org>
@@ -21,7 +21,7 @@ Fri Jul 30 22:33:25 1999  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 1999-04-06  Harri Porten  <porten@kde.org>
 
-	* kfind.cpp: tqreplaced simple delete and free() with delete [] iBuffer
+	* kfind.cpp: replaced simple delete and free() with delete [] iBuffer
 
 1998-12-07  Mario Weilguni <mweilguni@kde.org>
 
@@ -55,7 +55,7 @@ ver. 0.4.1: Mario Weilguni <mweilguni@kde.org>
 	* kfind compiles now without warnings with -Wall
 	* result list is now scrollable without having the focus (only page
 	  up and page down)
-	* tqmoc files are now #included in tqmoc.cpp instead of compiling
+	* moc files are now #included in moc.cpp instead of compiling
 	  separate files. Speeds up compilation and makes binary smaller
 	* file patterns are remembered between sessions
 	* introduced new filetypes for searching: files, folders,
diff --git a/kfind/README b/kfind/README
index cf31826fd..7b6c24890 100644
--- a/kfind/README
+++ b/kfind/README
@@ -1,7 +1,7 @@
 kfind
 =====
 
-Kfind is a graphical tqreplacement for the utility `find' inspired by 
+Kfind is a graphical replacement for the utility `find' inspired by 
 the find utility from NT.
 
 At this time it is fully functional. All options available in kfind
diff --git a/kfind/TODO b/kfind/TODO
index a4552bf2c..0bf6ac832 100644
--- a/kfind/TODO
+++ b/kfind/TODO
@@ -6,7 +6,7 @@ TODO
 DONE:
 
  o drag found files to somewhere
- o some tqlayout managment
+ o some layout managment
  o context menus
  o get preference dialog to work 
  o find pattern history
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index 9f62b0eb5..95e4045ac 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -18,7 +18,7 @@
 
 KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name)
 {
-  TQDate date = TQDate::tqcurrentDate();
+  TQDate date = TQDate::currentDate();
   initObject(date, parent, name);
 }
 
@@ -33,7 +33,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *)
   popupFrame = new KPopupFrame(this, "popupFrame");
   popupFrame->installEventFilter(this);
   datePicker = new KDatePicker(popupFrame, date, "datePicker");
-  datePicker->setMinimumSize(datePicker->tqsizeHint());
+  datePicker->setMinimumSize(datePicker->sizeHint());
   datePicker->installEventFilter(this);
   popupFrame->setMainWidget(datePicker);
   setDate(date);
@@ -57,9 +57,9 @@ TQDate & KDateCombo::string2Date(const TQString & str, TQDate *qd)
   return *qd = KGlobal::locale()->readDate(str);
 }
 
-TQDate & KDateCombo::getDate(TQDate *tqcurrentDate)
+TQDate & KDateCombo::getDate(TQDate *currentDate)
 {
-  return string2Date(currentText(), tqcurrentDate);
+  return string2Date(currentText(), currentDate);
 }
 
 bool KDateCombo::setDate(const TQDate & newDate)
@@ -86,7 +86,7 @@ void KDateCombo::mousePressEvent (TQMouseEvent * e)
 {
   if (e->button() & TQMouseEvent::LeftButton)
   {
-    if  (rect().tqcontains( e->pos()))
+    if  (rect().contains( e->pos()))
     {
       TQDate tempDate;
       getDate(& tempDate);
@@ -103,7 +103,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e)
   {
       TQMouseEvent *me = (TQMouseEvent *)e;
       TQPoint p = mapFromGlobal( me->globalPos() );
-      if (rect().tqcontains( p ) )
+      if (rect().contains( p ) )
       {
         TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent()));
         return true;
diff --git a/kfind/kdatecombo.h b/kfind/kdatecombo.h
index d8da787b8..ab714a3ba 100644
--- a/kfind/kdatecombo.h
+++ b/kfind/kdatecombo.h
@@ -26,7 +26,7 @@ public:
 	KDateCombo(const TQDate & date, TQWidget *parent=0, const char *name=0);
 	~KDateCombo();
 
-	TQDate & getDate(TQDate *tqcurrentDate);
+	TQDate & getDate(TQDate *currentDate);
 	bool setDate(const TQDate & newDate);
 
 private:
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index ee978d446..8908b26c8 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -65,12 +65,12 @@ Kfind::Kfind(TQWidget *parent, const char *name)
 
   // create button box
   TQVBox * mButtonBox = new TQVBox( this );
-  TQVBoxLayout *lay = (TQVBoxLayout*)mButtonBox->tqlayout();
+  TQVBoxLayout *lay = (TQVBoxLayout*)mButtonBox->layout();
   lay->addStretch(1);
   mTopLayout->addWidget(mButtonBox);
 
   mSearch = new KPushButton( KGuiItem(i18n("&Find"), "find"), mButtonBox );
-  mButtonBox->setSpacing( (tabWidget->tqsizeHint().height()-4*mSearch->tqsizeHint().height()) / 4);
+  mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4);
   connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) );
   mStop = new KPushButton( KGuiItem(i18n("Stop"), "stop"), mButtonBox );
   connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) );
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 252aca295..92082019f 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -33,7 +33,7 @@ class KonqDirPart;
 typedef KParts::GenericFactory<KFindPart> KFindFactory;
 K_EXPORT_COMPONENT_FACTORY( libkfindpart, KFindFactory )
 
-KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName, 
+KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, 
 	              TQObject *parent, const char *name ,
 		      const TQStringList & /*args*/ )
     : KonqDirPart (parent, name )/*KParts::ReadOnlyPart*/
@@ -43,8 +43,8 @@ KFindPart::KFindPart( TQWidget * tqparentWidget, const char *widgetName,
     setBrowserExtension( new KonqDirPartBrowserExtension( this ) );
 
     kdDebug() << "KFindPart::KFindPart " << this << endl;
-    m_kfindWidget = new Kfind( tqparentWidget, widgetName );
-    m_kfindWidget->setMaximumHeight(m_kfindWidget->tqminimumSizeHint().height());
+    m_kfindWidget = new Kfind( parentWidget, widgetName );
+    m_kfindWidget->setMaximumHeight(m_kfindWidget->minimumSizeHint().height());
     const KFileItem *item = ((KonqDirPart*)parent)->currentItem();
     kdDebug() << "Kfind: currentItem:  " << ( item ? item->url().path().local8Bit() : TQString("null") ) << endl;
     TQDir d;
diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h
index f9a0d6cde..47d75a53c 100644
--- a/kfind/kfindpart.h
+++ b/kfind/kfindpart.h
@@ -44,7 +44,7 @@ class KFindPart : public KonqDirPart//KParts::ReadOnlyPart
     Q_OBJECT
     Q_PROPERTY( bool showsResult READ showsResult )
 public:
-    KFindPart( TQWidget * tqparentWidget, const char *widgetName, 
+    KFindPart( TQWidget * parentWidget, const char *widgetName, 
 	       TQObject *parent, const char *name, const TQStringList & /*args*/ );
     virtual ~KFindPart();
 
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 9068fd895..3d7615afd 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -60,11 +60,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     pages[0] = new TQWidget( this, "page1" );
 
     nameBox = new KComboBox(TRUE, pages[0], "combo1");
-    nameBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
+    nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named");
     TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") );
     dirBox  = new KComboBox(TRUE, pages[0], "combo2");
-    dirBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
+    dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named");
     subdirsCb  = new TQCheckBox(i18n("Include &subfolders"), pages[0]);
     caseSensCb  = new TQCheckBox(i18n("Case s&ensitive search"), pages[0]);
@@ -158,7 +158,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     betweenType->setCurrentItem(1);
 
 
-    TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::tqcurrentDate(), -1);
+    TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
 
     fromDate = new KDateCombo(dt, pages[1], "fromDate");
     toDate = new KDateCombo(pages[1], "toDate");
@@ -187,7 +187,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     sizeUnitBox ->setCurrentItem(1);
 
     int tmp = sizeEdit->fontMetrics().width(" 000000000 ");
-    sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height());
+    sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
 
     m_usernameBox->setDuplicatesEnabled(FALSE);
     m_groupBox->setDuplicatesEnabled(FALSE);
@@ -245,7 +245,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
     pages[2] = new TQWidget( this, "page3" );
 
     typeBox =new KComboBox(FALSE, pages[2], "typeBox");
-    typeBox->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
+    typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);  // allow smaller than widest entry
     TQLabel * typeL   =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type");
     textEdit=new KLineEdit(pages[2], "textEdit" );
     TQLabel * textL   =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text");
@@ -315,7 +315,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
 
     // Layout
     tmp = sizeEdit->fontMetrics().width(" 00000 ");
-    sizeEdit->setMinimumSize(tmp, sizeEdit->tqsizeHint().height());
+    sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height());
 
     TQGridLayout *grid2 = new TQGridLayout( pages[2], 5, 4,
 					  KDialog::marginHint(),
@@ -522,10 +522,10 @@ void KfindTabWidget::slotSizeBoxChanged(int index)
 
 void KfindTabWidget::setDefaults()
 {
-    TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::tqcurrentDate(), -1);
+    TQDate dt = KGlobal::locale()->calendar()->addYears(TQDate::currentDate(), -1);
 
     fromDate ->setDate(dt);
-    toDate ->setDate(TQDate::tqcurrentDate());
+    toDate ->setDate(TQDate::currentDate());
 
     timeBox->setValue(1);
     betweenType->setCurrentItem(1);
@@ -563,7 +563,7 @@ bool KfindTabWidget::isDateValid()
     str = i18n("The date is not valid.");
   else if ( hi1 > hi2 )
     str = i18n("Invalid date range.");
-  else if ( TQDate::tqcurrentDate() < hi1 )
+  else if ( TQDate::currentDate() < hi1 )
     str = i18n("Unable to search dates in the future.");
 
   if (!str.isNull()) {
@@ -854,15 +854,15 @@ static void save_pattern(TQComboBox *obj,
   conf->writePathEntry(entry, sl);
 }
 
-TQSize KfindTabWidget::tqsizeHint() const
+TQSize KfindTabWidget::sizeHint() const
 {
   // #44662: avoid a huge default size when the comboboxes have very large items
   // Like in minicli, we changed the combobox size policy so that they can resize down,
   // and then we simply provide a reasonable size hint for the whole window, depending
   // on the screen width.
-  TQSize sz = TQTabWidget::tqsizeHint();
+  TQSize sz = TQTabWidget::sizeHint();
   KfindTabWidget* me = const_cast<KfindTabWidget*>( this );
-  const int screenWidth = tqApp->desktop()->screenGeometry(me).width();
+  const int screenWidth = qApp->desktop()->screenGeometry(me).width();
   if ( sz.width() > screenWidth / 2 )
     sz.setWidth( screenWidth / 2 );
   return sz;
diff --git a/kfind/kftabdlg.h b/kfind/kftabdlg.h
index 0c913e6f0..157a1fa44 100644
--- a/kfind/kftabdlg.h
+++ b/kfind/kftabdlg.h
@@ -49,7 +49,7 @@ public:
 
   void setURL( const KURL & url );
 
-  virtual TQSize tqsizeHint() const;
+  virtual TQSize sizeHint() const;
 
 public slots:
   void setFocus();
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index 4d4b12856..2ee69aa14 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -215,14 +215,14 @@ void KfindWindow::saveResults()
   TQFile file(filename);
 
   if ( !file.open(IO_WriteOnly) )
-    KMessageBox::error(tqparentWidget(),
+    KMessageBox::error(parentWidget(),
 		       i18n("Unable to save results."));
   else {
     TQTextStream stream( &file );
     stream.setEncoding( TQTextStream::Locale );
 
     if ( mimeType->name() == "text/html") {
-      stream << TQString::tqfromLatin1("<HTML><HEAD>\n"
+      stream << TQString::fromLatin1("<HTML><HEAD>\n"
 				    "<!DOCTYPE %1>\n"
 				    "<TITLE>%2</TITLE></HEAD>\n"
 				    "<BODY><H1>%3</H1>"
@@ -236,13 +236,13 @@ void KfindWindow::saveResults()
 	{
 	  TQString path=((KfFileLVI*)item)->fileitem.url().url();
 	  TQString pretty=((KfFileLVI*)item)->fileitem.url().htmlURL();
-	  stream << TQString::tqfromLatin1("<DT><A HREF=\"") << path
-		 << TQString::tqfromLatin1("\">") << pretty
-		 << TQString::tqfromLatin1("</A>\n");
+	  stream << TQString::fromLatin1("<DT><A HREF=\"") << path
+		 << TQString::fromLatin1("\">") << pretty
+		 << TQString::fromLatin1("</A>\n");
 
 	  item = item->nextSibling();
 	}
-      stream << TQString::tqfromLatin1("</DL><P></BODY></HTML>\n");
+      stream << TQString::fromLatin1("</DL><P></BODY></HTML>\n");
     }
     else {
       item = firstChild();
@@ -255,7 +255,7 @@ void KfindWindow::saveResults()
     }
 
     file.close();
-    KMessageBox::information(tqparentWidget(),
+    KMessageBox::information(parentWidget(),
 			     i18n("Results were saved to file\n")+
 			     filename);
   }
@@ -287,7 +287,7 @@ void KfindWindow::deleteFiles()
 {
   TQString tmp = i18n("Do you really want to delete the selected file?",
                      "Do you really want to delete the %n selected files?",selectedItems().count());
-  if (KMessageBox::warningContinueCancel(tqparentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
+  if (KMessageBox::warningContinueCancel(parentWidget(), tmp, "", KGuiItem( i18n("&Delete"), "editdelete")) == KMessageBox::Cancel)
     return;
 
   // Iterate on all selected elements
@@ -335,7 +335,7 @@ void KfindWindow::resizeEvent(TQResizeEvent *e)
 {
   KListView::resizeEvent(e);
   resetColumns(false);
-  clipper()->tqrepaint();
+  clipper()->repaint();
 }
 
 TQDragObject * KfindWindow::dragObject()
@@ -372,7 +372,7 @@ void KfindWindow::resetColumns(bool init)
   {
     setColumnWidth(2, QMAX(fm.width(columnText(2)), fm.width("0000000")) + 15);
     TQString sampleDate =
-      KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime());
+      KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
     setColumnWidth(3, QMAX(fm.width(columnText(3)), fm.width(sampleDate)) + 15);
     setColumnWidth(4, QMAX(fm.width(columnText(4)), fm.width(i18n(perm[RO]))) + 15);
     setColumnWidth(5, QMAX(fm.width(columnText(5)), fm.width("some text")) + 15);
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index a51d2dc2f..4231f1aab 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -242,7 +242,7 @@ void KQuery::processQuery( KFileItem* file)
           return;
         break;
       default:
-        if (!m_mimetype.isEmpty() && !m_mimetype.tqcontains(file->mimetype()))
+        if (!m_mimetype.isEmpty() && !m_mimetype.contains(file->mimetype()))
           return;
     }
 
@@ -334,7 +334,7 @@ void KQuery::processQuery( KFileItem* file)
          }
        } else if( !m_search_binary && !file->mimetype().startsWith("text/") &&
            file->url().isLocalFile() ) {
-         KMimeType::Format f = KMimeType::tqfindFormatByFileContent(file->url().path());
+         KMimeType::Format f = KMimeType::findFormatByFileContent(file->url().path());
          if ( !f.text ) {
            kdDebug() << "ignoring, not a text file: " << file->url() << endl;
            return;
@@ -359,7 +359,7 @@ void KQuery::processQuery( KFileItem* file)
 
           if (str.isNull()) break;
           if(isZippedOfficeDocument)
-            str.tqreplace(xmlTags, "");
+            str.replace(xmlTags, "");
 
           if (m_regexpForContent)
           {
@@ -458,7 +458,7 @@ void KQuery::setRegExp(const TQString &regexp, bool caseSensitive)
 //  m_regexpsContainsGlobs.clear();
   for ( TQStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) {
     regExp = new TQRegExp((*it),caseSensitive,true);
-//    m_regexpsContainsGlobs.append(regExp->pattern().tqcontains(globChars));
+//    m_regexpsContainsGlobs.append(regExp->pattern().contains(globChars));
     m_regexps.append(regExp);
   }
 }
diff --git a/khelpcenter/COPYING b/khelpcenter/COPYING
index 9d29098e2..0b84a43fd 100644
--- a/khelpcenter/COPYING
+++ b/khelpcenter/COPYING
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which tqcontains
+  0. This License applies to any program or other work which contains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -96,7 +96,7 @@ above, provided that you also meet all of these conditions:
     stating that you changed the files and the date of any change.
 
     b) You must cause any work that you distribute or publish, that in
-    whole or in part tqcontains or is derived from the Program or any
+    whole or in part contains or is derived from the Program or any
     part thereof, to be licensed as a whole at no charge to all third
     parties under the terms of this License.
 
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means 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 executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN
index 17496f234..003423f5a 100644
--- a/khelpcenter/DESIGN
+++ b/khelpcenter/DESIGN
@@ -78,7 +78,7 @@ KHC::ContentsTab object and a KHC::SearchTab object.
 
 # Alright, after some talk on IRC this structure evolved:
 #
-# - Tasks - tqcontains short, three to four paragraph documents about how to
+# - Tasks - contains short, three to four paragraph documents about how to
 #	        solve an everyday task, examples:
 #		Browsing the web
 #		Send and receive email
@@ -185,15 +185,15 @@ regexp' or 'Search case sensitive'.
 
 # I think this means that we have to create a 'DataCollection' class which
 # gets inherited by all classes which are "searchable". DataCollections should
-# also be able to tqcontains multiple child DataCollection, so that we have e.g.
+# also be able to contains multiple child DataCollection, so that we have e.g.
 # one DataCollection per application manual, and one "Manuals" collection
-# which tqcontains all the application manual collections.
+# which contains all the application manual collections.
 # We'd probably also need a DataCollection for the info pages and man pages.
 # And later, in the far future, we might extent this concept to web searches,
 # so that e.g. Google represents a DataCollection which we can query.
 # I'm not yet decided how to do that properly, perhaps using multiple
 # inheritance, so that each TOCBuilder is a DataCollection - naw, we'd rather
-# have a "TableOfContents" class which tqcontains a TOCBuilder, and is a
+# have a "TableOfContents" class which contains a TOCBuilder, and is a
 # datacollection? Hm, not sure.
 # In any case DataCollections should some sort of plugins, so that we can add
 # e.g. new web search interfaces lateron.
@@ -218,7 +218,7 @@ regexp' or 'Search case sensitive'.
 # from the enhanced browsing thing and treat those as plugin .desktop files.
 # We could show them in a listview on the Search tab, each found search engine
 # being represented by a checkable listview item. So, we just let the user
-# enter a term, tqreplace the \{@} placeholder in the URIs specified in the
+# enter a term, replace the \{@} placeholder in the URIs specified in the
 # selected .desktop files with that term, send out a request via KIO and show
 # the results in our KHTMLPart (after all KHC::View is a KHTMLPart already). A
 # problem with this: How to display the multiple HTML pages returned by the
@@ -250,7 +250,7 @@ regexp' or 'Search case sensitive'.
 # A problem with this would be that we cannot tell how a particular search
 # engine treats boolean expressions (e.g. some search engines use 'foo AND bar',
 # others use '+foo +bar', a third variation is '"foo bar"'). We thus cannot
-# tqreplace the placeholder in the URI but first have to translate the syntax
+# replace the placeholder in the URI but first have to translate the syntax
 # entered by the user into a syntax which is appropriate for each single news
 # engine. Right now I don't know how we could do this with just a .desktop/.xslt
 # pair. We could always use fullblown C++ plugins which hold code which is able
diff --git a/khelpcenter/Help.desktop b/khelpcenter/Help.desktop
index 4b73bf67c..26f21f011 100644
--- a/khelpcenter/Help.desktop
+++ b/khelpcenter/Help.desktop
@@ -53,14 +53,14 @@ Name[nn]=Hjelp
 Name[nso]=Thuso
 Name[oc]=Ajuda
 Name[pa]=ਸਹਾਇਤਾ
-Name[pl]=Potqmoc
+Name[pl]=Pomoc
 Name[pt]=Ajuda
 Name[pt_BR]=Ajuda
 Name[ro]=Ajutor
 Name[ru]=Справка
 Name[rw]=Ifashayobora
 Name[se]=Veahkki
-Name[sk]=Potqmocník
+Name[sk]=Pomocník
 Name[sl]=Pomoč
 Name[sr]=Помоћ
 Name[sr@Latn]=Pomoć
diff --git a/khelpcenter/README.metadata b/khelpcenter/README.metadata
index 2f3f37757..733bb5ef2 100644
--- a/khelpcenter/README.metadata
+++ b/khelpcenter/README.metadata
@@ -3,12 +3,12 @@ KHelpCenter documentation meta data structure
 
 KHelpCenter uses meta data files which describe the documentation available in
 the system. Each document is represented by a meta data file and shown as an
-entry in the KHelpCenter navigation tree view. The meta data tqcontains
+entry in the KHelpCenter navigation tree view. The meta data contains
 information about title and short description of the document, the location of
 the document and some more information like how to search the document and
 translations of title and description. Document hierarchy is represented as
 hierarchy of the meta data files. Directories are also described by a meta data
-file which tqcontains the same information as a document meta data file.
+file which contains the same information as a document meta data file.
 
 Format of the meta data files
 -----------------------------
@@ -46,7 +46,7 @@ X-DOC-Identifier            string    Unique identifier for document, if this
                                       file is used as identifier
 X-DOC-Indexer               command   Command used for creating a search index
                                       for the document.
-                                      The following symbols are tqreplaced by the
+                                      The following symbols are replaced by the
                                       corresponding values:
                                       %f - Filename
 X-DOC-IndexTestFile         filename  Name of file whose existence indicates
@@ -55,7 +55,7 @@ X-DOC-Search                command   Command used for searching, the output
                                       of the command should be HTML which is
                                       shown in KHelpCenter.
                                       The following symbols in the command are
-                                      tqreplaced by the corresponding values:
+                                      replaced by the corresponding values:
                                       %k - Words to be searched for
                                       %n - Maximum number of results
                                       %m - Method for combining search words,
diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp
index 96747696b..716c4d99e 100644
--- a/khelpcenter/docentry.cpp
+++ b/khelpcenter/docentry.cpp
@@ -219,7 +219,7 @@ bool DocEntry::readFromFile( const TQString &fileName )
     mIdentifier = fi.baseName( true );
   }
   mIndexer = file.readEntry( "X-DOC-Indexer" );
-  mIndexer.tqreplace( "%f", fileName );
+  mIndexer.replace( "%f", fileName );
   mIndexTestFile = file.readEntry( "X-DOC-IndexTestFile" );
   mSearchEnabledDefault = file.readBoolEntry( "X-DOC-SearchEnabledDefault",
                                               false );
diff --git a/khelpcenter/docmetainfo.cpp b/khelpcenter/docmetainfo.cpp
index 862e2211b..4d6dd6fad 100644
--- a/khelpcenter/docmetainfo.cpp
+++ b/khelpcenter/docmetainfo.cpp
@@ -77,7 +77,7 @@ DocEntry *DocMetaInfo::addDocEntry( const TQString &fileName )
       mHtmlSearch->setupDocEntry( entry );
     }
     TQString indexer = entry->indexer();
-    indexer.tqreplace( "%f", fileName );
+    indexer.replace( "%f", fileName );
     entry->setIndexer( indexer );
     addDocEntry( entry );
     return entry;
@@ -108,7 +108,7 @@ TQString DocMetaInfo::languageName( const TQString &langcode )
   if ( langcode == "en" ) return i18n("English");
 
   TQString cfgfile = locate( "locale",
-      TQString::tqfromLatin1( "%1/entry.desktop" ).arg( langcode ) );
+      TQString::fromLatin1( "%1/entry.desktop" ).arg( langcode ) );
 
   kdDebug() << "-- langcode: " << langcode << " cfgfile: " << cfgfile << endl;
   
diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index d652b68a9..7aa25aa36 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -58,21 +58,21 @@ void FontDialog::setupFontSizesBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Sizes" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lMinFontSize = new TQLabel( i18n( "M&inimum font size:" ), gb );
-	tqlayout->addWidget( lMinFontSize, 0, 0 );
+	layout->addWidget( lMinFontSize, 0, 0 );
 	m_minFontSize = new KIntNumInput( gb );
-	tqlayout->addWidget( m_minFontSize, 0, 1 );
+	layout->addWidget( m_minFontSize, 0, 1 );
 	m_minFontSize->setRange( 1, 20 );
 	lMinFontSize->setBuddy( m_minFontSize );
 
 	TQLabel *lMedFontSize = new TQLabel( i18n( "M&edium font size:" ), gb );
-	tqlayout->addWidget( lMedFontSize, 1, 0 );
+	layout->addWidget( lMedFontSize, 1, 0 );
 	m_medFontSize = new KIntNumInput( gb );
-	tqlayout->addWidget( m_medFontSize, 1, 1 );
+	layout->addWidget( m_medFontSize, 1, 1 );
 	m_medFontSize->setRange( 4, 28 );
 	lMedFontSize->setBuddy( m_medFontSize );
 }
@@ -81,44 +81,44 @@ void FontDialog::setupFontTypesBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Fonts" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lStandardFont = new TQLabel( i18n( "S&tandard font:" ), gb );
-	tqlayout->addWidget( lStandardFont, 0, 0 );
+	layout->addWidget( lStandardFont, 0, 0 );
 	m_standardFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_standardFontCombo, 0, 1 );
+	layout->addWidget( m_standardFontCombo, 0, 1 );
 	lStandardFont->setBuddy( m_standardFontCombo );
 
 	TQLabel *lFixedFont = new TQLabel( i18n( "F&ixed font:" ), gb );
-	tqlayout->addWidget( lFixedFont, 1, 0 );
+	layout->addWidget( lFixedFont, 1, 0 );
 	m_fixedFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_fixedFontCombo, 1, 1 );
+	layout->addWidget( m_fixedFontCombo, 1, 1 );
 	lFixedFont->setBuddy( m_fixedFontCombo );
 
 	TQLabel *lSerifFont = new TQLabel( i18n( "S&erif font:" ), gb );
-	tqlayout->addWidget( lSerifFont, 2, 0 );
+	layout->addWidget( lSerifFont, 2, 0 );
 	m_serifFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_serifFontCombo, 2, 1 );
+	layout->addWidget( m_serifFontCombo, 2, 1 );
 	lSerifFont->setBuddy( m_serifFontCombo );
 
 	TQLabel *lSansSerifFont = new TQLabel( i18n( "S&ans serif font:" ), gb );
-	tqlayout->addWidget( lSansSerifFont, 3, 0 );
+	layout->addWidget( lSansSerifFont, 3, 0 );
 	m_sansSerifFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_sansSerifFontCombo, 3, 1 );
+	layout->addWidget( m_sansSerifFontCombo, 3, 1 );
 	lSansSerifFont->setBuddy( m_sansSerifFontCombo );
 
 	TQLabel *lItalicFont = new TQLabel( i18n( "&Italic font:" ), gb );
-	tqlayout->addWidget( lItalicFont, 4, 0 );
+	layout->addWidget( lItalicFont, 4, 0 );
 	m_italicFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_italicFontCombo, 4, 1 );
+	layout->addWidget( m_italicFontCombo, 4, 1 );
 	lItalicFont->setBuddy( m_italicFontCombo );
 
 	TQLabel *lFantasyFont = new TQLabel( i18n( "&Fantasy font:" ), gb );
-	tqlayout->addWidget( lFantasyFont, 5, 0 );
+	layout->addWidget( lFantasyFont, 5, 0 );
 	m_fantasyFontCombo = new KFontCombo( gb );
-	tqlayout->addWidget( m_fantasyFontCombo, 5, 1 );
+	layout->addWidget( m_fantasyFontCombo, 5, 1 );
 	lFantasyFont->setBuddy( m_fantasyFontCombo );
 }
 
@@ -126,23 +126,23 @@ void FontDialog::setupFontEncodingBox()
 {
 	TQGroupBox *gb = new TQGroupBox( i18n( "Encoding" ), mainWidget() );
 
-	TQGridLayout *tqlayout = new TQGridLayout( gb );
-	tqlayout->setSpacing( KDialog::spacingHint() );
-	tqlayout->setMargin( KDialog::marginHint() * 2 );
+	TQGridLayout *layout = new TQGridLayout( gb );
+	layout->setSpacing( KDialog::spacingHint() );
+	layout->setMargin( KDialog::marginHint() * 2 );
 
 	TQLabel *lDefaultEncoding = new TQLabel( i18n( "&Default encoding:" ), gb );
-	tqlayout->addWidget( lDefaultEncoding, 0, 0 );
+	layout->addWidget( lDefaultEncoding, 0, 0 );
 	m_defaultEncoding = new KComboBox( false, gb );
-	tqlayout->addWidget( m_defaultEncoding, 0, 1 );
+	layout->addWidget( m_defaultEncoding, 0, 1 );
 	TQStringList encodings = KGlobal::charsets()->availableEncodingNames();
 	encodings.prepend( i18n( "Use Language Encoding" ) );
 	m_defaultEncoding->insertStringList( encodings );
 	lDefaultEncoding->setBuddy( m_defaultEncoding );
 
 	TQLabel *lFontSizeAdjustement = new TQLabel( i18n( "&Font size adjustment:" ), gb );
-	tqlayout->addWidget( lFontSizeAdjustement, 1, 0 );
+	layout->addWidget( lFontSizeAdjustement, 1, 0 );
 	m_fontSizeAdjustement = new TQSpinBox( -5, 5, 1, gb );
-	tqlayout->addWidget( m_fontSizeAdjustement, 1, 1 );
+	layout->addWidget( m_fontSizeAdjustement, 1, 1 );
 	lFontSizeAdjustement->setBuddy( m_fontSizeAdjustement );
 }
 
diff --git a/khelpcenter/formatter.cpp b/khelpcenter/formatter.cpp
index 6c3411fd7..b9f394289 100644
--- a/khelpcenter/formatter.cpp
+++ b/khelpcenter/formatter.cpp
@@ -120,7 +120,7 @@ bool Formatter::readTemplates()
   bool success = true;
   TQStringList::ConstIterator it2;
   for( it2 = requiredSymbols.begin(); it2 != requiredSymbols.end(); ++it2 ) {
-    if ( !mSymbols.tqcontains( *it2 ) ) {
+    if ( !mSymbols.contains( *it2 ) ) {
       success = false;
       kdError() << "Symbol '" << *it2 << "' is missing from main template file."
                 << endl;
@@ -137,7 +137,7 @@ TQString Formatter::header( const TQString &title )
   TQString s;
   if ( mHasTemplate ) {
     s = mSymbols[ "HEADER" ];
-    s.tqreplace( "--TITLE:--", title );
+    s.replace( "--TITLE:--", title );
   } else {
     s = "<html><head><title>" + title + "</title></head>\n<body>\n";
   }
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index 7aebdbea7..dc596372e 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -49,7 +49,7 @@ class SectionItem : public KListViewItem
 		{
 				KListViewItem::setOpen(open);
 				
-				setPixmap( 0, SmallIcon( TQString::tqfromLatin1( open ? "contents" : "contents2" ) ) );
+				setPixmap( 0, SmallIcon( TQString::fromLatin1( open ? "contents" : "contents2" ) ) );
 
 		}
 };
@@ -92,7 +92,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent )
 
 	m_cacheFile = locateLocal( "cache", "help/glossary.xml" );
 
-	m_sourceFile = View::View::langLookup( TQString::tqfromLatin1( "khelpcenter/glossary/index.docbook" ) );
+	m_sourceFile = View::View::langLookup( TQString::fromLatin1( "khelpcenter/glossary/index.docbook" ) );
 
 	m_config = kapp->config();
 	m_config->setGroup( "Glossary" );
@@ -102,7 +102,7 @@ Glossary::Glossary( TQWidget *parent ) : KListView( parent )
 void Glossary::show()
 {
 	if ( !m_initialized ) {
-		if ( cachetqStatus() == NeedRebuild )
+		if ( cacheStatus() == NeedRebuild )
 			rebuildGlossaryCache();
 		else
 			buildGlossaryTree();
@@ -122,7 +122,7 @@ const GlossaryEntry &Glossary::entry( const TQString &id ) const
 	return *m_glossEntries[ id ];
 }
 
-Glossary::CachetqStatus Glossary::cachetqStatus() const
+Glossary::CacheStatus Glossary::cacheStatus() const
 {
 	if ( !TQFile::exists( m_cacheFile ) ||
 	     m_config->readPathEntry( "CachedGlossary" ) != m_sourceFile ||
@@ -150,10 +150,10 @@ void Glossary::rebuildGlossaryCache()
 	connect( meinproc, TQT_SIGNAL( processExited( KProcess * ) ),
 	         this, TQT_SLOT( meinprocExited( KProcess * ) ) );
 
-	*meinproc << locate( "exe", TQString::tqfromLatin1( "meinproc" ) );
-	*meinproc << TQString::tqfromLatin1( "--output" ) << m_cacheFile;
-	*meinproc << TQString::tqfromLatin1( "--stylesheet" )
-	          << locate( "data", TQString::tqfromLatin1( "khelpcenter/glossary.xslt" ) );
+	*meinproc << locate( "exe", TQString::fromLatin1( "meinproc" ) );
+	*meinproc << TQString::fromLatin1( "--output" ) << m_cacheFile;
+	*meinproc << TQString::fromLatin1( "--stylesheet" )
+	          << locate( "data", TQString::fromLatin1( "khelpcenter/glossary.xslt" ) );
 	*meinproc << m_sourceFile;
 
 	meinproc->start( KProcess::NotifyOnExit );
@@ -189,21 +189,21 @@ void Glossary::buildGlossaryTree()
 	if ( !doc.setContent( &cacheFile ) )
 		return;
 
-	TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::tqfromLatin1( "section" ) );
+	TQDomNodeList sectionNodes = doc.documentElement().elementsByTagName( TQString::fromLatin1( "section" ) );
 	for ( unsigned int i = 0; i < sectionNodes.count(); i++ ) {
 		TQDomElement sectionElement = sectionNodes.item( i ).toElement();
-		TQString title = sectionElement.attribute( TQString::tqfromLatin1( "title" ) );
+		TQString title = sectionElement.attribute( TQString::fromLatin1( "title" ) );
 		SectionItem *topicSection = new SectionItem( m_byTopicItem, title );
 
-		TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::tqfromLatin1( "entry" ) );
+		TQDomNodeList entryNodes = sectionElement.elementsByTagName( TQString::fromLatin1( "entry" ) );
 		for ( unsigned int j = 0; j < entryNodes.count(); j++ ) {
 			TQDomElement entryElement = entryNodes.item( j ).toElement();
 			
-			TQString entryId = entryElement.attribute( TQString::tqfromLatin1( "id" ) );
+			TQString entryId = entryElement.attribute( TQString::fromLatin1( "id" ) );
 			if ( entryId.isNull() )
 				continue;
 				
-			TQDomElement termElement = childElement( entryElement, TQString::tqfromLatin1( "term" ) );
+			TQDomElement termElement = childElement( entryElement, TQString::fromLatin1( "term" ) );
 			TQString term = termElement.text().simplifyWhiteSpace();
 
 			EntryItem *entry = new EntryItem(topicSection, term, entryId );
@@ -221,19 +221,19 @@ void Glossary::buildGlossaryTree()
 
 			new EntryItem( alphabSection, term, entryId );
 
-			TQDomElement definitionElement = childElement( entryElement, TQString::tqfromLatin1( "definition" ) );
+			TQDomElement definitionElement = childElement( entryElement, TQString::fromLatin1( "definition" ) );
 			TQString definition = definitionElement.text().simplifyWhiteSpace();
 
 			GlossaryEntryXRef::List seeAlso;
 
-			TQDomElement referencesElement = childElement( entryElement, TQString::tqfromLatin1( "references" ) );
-			TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::tqfromLatin1( "reference" ) );
+			TQDomElement referencesElement = childElement( entryElement, TQString::fromLatin1( "references" ) );
+			TQDomNodeList referenceNodes = referencesElement.elementsByTagName( TQString::fromLatin1( "reference" ) );
 			if ( referenceNodes.count() > 0 )
 				for ( unsigned int k = 0; k < referenceNodes.count(); k++ ) {
 					TQDomElement referenceElement = referenceNodes.item( k ).toElement();
 
-					TQString term = referenceElement.attribute( TQString::tqfromLatin1( "term" ) );
-					TQString id = referenceElement.attribute( TQString::tqfromLatin1( "id" ) );
+					TQString term = referenceElement.attribute( TQString::fromLatin1( "term" ) );
+					TQString id = referenceElement.attribute( TQString::fromLatin1( "id" ) );
 					
 					seeAlso += GlossaryEntryXRef( term, id );
 				}
@@ -279,10 +279,10 @@ TQString Glossary::entryToHtml( const GlossaryEntry &entry )
         GlossaryEntryXRef::List::ConstIterator it = seeAlsos.begin();
         GlossaryEntryXRef::List::ConstIterator end = seeAlsos.end();
         for (; it != end; ++it) {
-            seeAlso += TQString::tqfromLatin1("<a href=\"glossentry:");
+            seeAlso += TQString::fromLatin1("<a href=\"glossentry:");
             seeAlso += (*it).id();
-            seeAlso += TQString::tqfromLatin1("\">") + (*it).term();
-            seeAlso += TQString::tqfromLatin1("</a>, ");
+            seeAlso += TQString::fromLatin1("\">") + (*it).term();
+            seeAlso += TQString::fromLatin1("</a>, ");
         }
         seeAlso = seeAlso.left(seeAlso.length() - 2);
     }
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index 409670796..79ed7fb93 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -121,9 +121,9 @@ class Glossary : public KListView
 		void treeItemSelected( TQListViewItem *item );
 
 	private:
-		enum CachetqStatus { NeedRebuild, CacheOk };
+		enum CacheStatus { NeedRebuild, CacheOk };
 
-		CachetqStatus cachetqStatus() const;
+		CacheStatus cacheStatus() const;
 		int glossaryCTime() const;
 		void rebuildGlossaryCache();
 		void buildGlossaryTree();
@@ -134,7 +134,7 @@ class Glossary : public KListView
 		TQListViewItem *m_alphabItem;
 		TQString m_sourceFile;
 		TQString m_cacheFile;
-		CachetqStatus m_status;
+		CacheStatus m_status;
 		TQDict<GlossaryEntry> m_glossEntries;
     TQDict<EntryItem> m_idDict;
     bool m_initialized;
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index d03e899b5..9a90831f7 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -257,7 +257,7 @@ void History::fillForwardMenu()
 void History::fillGoMenu()
 {
   KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
+  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu || m_goMenuIndex == -1 )
     return;
 
@@ -290,7 +290,7 @@ void History::fillGoMenu()
 void History::goMenuActivated( int id )
 {
   KMainWindow *mainWindow = static_cast<KMainWindow *>( kapp->mainWidget() );
-  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::tqfromLatin1( "go" ), mainWindow ) );
+  TQPopupMenu *goMenu = dynamic_cast<TQPopupMenu *>( mainWindow->guiFactory()->container( TQString::fromLatin1( "go" ), mainWindow ) );
   if ( !goMenu )
     return;
 
@@ -324,7 +324,7 @@ void History::fillHistoryPopup( TQPopupMenu *popup, bool onlyBack, bool onlyForw
   {
     TQString text = it.current()->title;
     text = KStringHandler::csqueeze(text, 50); //CT: squeeze
-    text.tqreplace( "&", "&&" );
+    text.replace( "&", "&&" );
     if ( checkCurrentItem && it.current() == current )
     {
       int id = popup->insertItem( text ); // no pixmap if checked
diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp
index ff5effffe..c47300190 100644
--- a/khelpcenter/htmlsearch/htmlsearch.cpp
+++ b/khelpcenter/htmlsearch/htmlsearch.cpp
@@ -43,7 +43,7 @@ void HTMLSearch::scanDir(const TQString& dir)
         for (it=list.begin(); it != list.end(); ++it)
         {
             file = adir + *it;
-            if ( !_files.tqcontains( file ) ) {
+            if ( !_files.contains( file ) ) {
                 _files.append(file);
                 progress->setFilesScanned(++_filesScanned);
             }
@@ -117,7 +117,7 @@ bool HTMLSearch::createConfig(const TQString& _lang)
         return false;
     images = images.left(images.length() - 8);
 
-    // This is an example tqreplacement for the default bad_words file
+    // This is an example replacement for the default bad_words file
     // distributed with ht://Dig. It was compiled by Marjolein Katsma
     // <HSH@taxon.demon.nl>.
     TQString bad_words = i18n( "List of words to exclude from index",
@@ -467,8 +467,8 @@ TQString HTMLSearch::search(TQString _lang, TQString words, TQString method, int
   delete _proc;
 
   // modify the search result
-  _searchResult = _searchResult.tqreplace("http://localhost/", "file:/");
-  _searchResult = _searchResult.tqreplace("Content-type: text/html", TQString::null);
+  _searchResult = _searchResult.replace("http://localhost/", "file:/");
+  _searchResult = _searchResult.replace("Content-type: text/html", TQString::null);
 
   // dump the search result
   TQFile f(result);
diff --git a/khelpcenter/htmlsearch/htmlsearch.desktop b/khelpcenter/htmlsearch/htmlsearch.desktop
index 866aa649a..1879ae742 100644
--- a/khelpcenter/htmlsearch/htmlsearch.desktop
+++ b/khelpcenter/htmlsearch/htmlsearch.desktop
@@ -211,13 +211,13 @@ Keywords[nl]=help,html,zoeken,index,htdig,htsearch,htmerge,scope,taal
 Keywords[nn]=hjelp,HTML,søk,indeks,htdig,htmerge,område,språk
 Keywords[nso]=Thuso,HTML,Nyako,Palo ya Bangwadi,htdig,htnyako,htmerge,Scope,Leleme
 Keywords[pa]=ਸਹਾਇਤਾ,HTML,Index,htdig,htsearch,htmerge,Scope,ਭਾਸ਼ਾ,ਖੋਜ
-Keywords[pl]=potqmoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,język
+Keywords[pl]=pomoc,HTML,szukaj,indeks,htdig,htsearch,htmerge,zakres,język
 Keywords[pt]=ajuda,html,procura,índice,htdig,htsearch,htmerge,âmbito,língua
 Keywords[pt_BR]=Ajuda,HTML,Procurar,Índice,htdig,htsearch,htmerge,escopo,idioma
 Keywords[ro]=ajutor,HTML,căutare,index,htdig,htsearch,htmerge,domeniu,limbaj
 Keywords[rw]=Ifashayobora,HTML,Ishakisha,htgucukura,htgushakisha,htgukomatanya,Igishushanyombonera,Ururimi
 Keywords[se]=veahkki,HTML,ohcan,indeaksa,indeksa,htdig,htmerge,gaska,giella
-Keywords[sk]=Potqmoc,HTML,Hľadať,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,Potqmocník
+Keywords[sk]=Pomoc,HTML,Hľadať,Katalóg,Index,htdig,htsearch,htmerge,rozsah,jazyk,Pomocník
 Keywords[sl]=Pomoč,HTML,iskanje,indeks,htdig,htsearch,htmerge,doseg,jezik
 Keywords[sr]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,помоћ,претрага,индекс,језик,опсег
 Keywords[sr@Latn]=Help,HTML,Search,Index,htdig,htsearch,htmerge,Scope,Language,pomoć,pretraga,indeks,jezik,opseg
diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
index 64a301be7..9dfc5e350 100644
--- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
+++ b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp
@@ -50,15 +50,15 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
   TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
                   "ht://dig HTML search engine. "
                   "You can get ht://dig at the"), gb);
-  l->tqsetAlignment(TQLabel::WordBreak);
-  l->setMinimumSize(l->tqsizeHint());
+  l->setAlignment(TQLabel::WordBreak);
+  l->setMinimumSize(l->sizeHint());
   grid->addMultiCellWidget(l, 1, 1, 0, 1);
   TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
 
   KURLLabel *url = new KURLLabel(gb);
   url->setURL("http://www.htdig.org");
   url->setText(i18n("ht://dig home page"));
-  url->tqsetAlignment(TQLabel::AlignHCenter);
+  url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
   connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
       this, TQT_SLOT(urlClicked(const TQString&)));
@@ -157,7 +157,7 @@ KHTMLSearchConfig::KHTMLSearchConfig(TQWidget *parent, const char *name)
 
   runButton = new TQPushButton(i18n("Generate Index..."), this);
   TQWhatsThis::add( runButton, i18n( "Click this button to generate the index for the fulltext search." ) );
-  runButton->setFixedSize(runButton->tqsizeHint());
+  runButton->setFixedSize(runButton->sizeHint());
   vbox->addWidget(runButton, AlignRight);
   connect(runButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(generateIndex()));
 
@@ -179,14 +179,14 @@ void KHTMLSearchConfig::loadLanguages()
 
   // add all languages to the list
   TQStringList langs = KGlobal::dirs()->findAllResources("locale",
-							TQString::tqfromLatin1("*/entry.desktop"));
+							TQString::fromLatin1("*/entry.desktop"));
   langs.sort();
 
   for (TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it)
     {
       KSimpleConfig entry(*it);
-      entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
-      TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), KGlobal::locale()->translate("without name"));
+      entry.setGroup(TQString::fromLatin1("KCM Locale"));
+      TQString name = entry.readEntry(TQString::fromLatin1("Name"), KGlobal::locale()->translate("without name"));
 
       TQString path = *it;
       int index = path.findRev('/');
diff --git a/khelpcenter/htmlsearch/klangcombo.cpp b/khelpcenter/htmlsearch/klangcombo.cpp
index 6f4b01c42..308109d12 100644
--- a/khelpcenter/htmlsearch/klangcombo.cpp
+++ b/khelpcenter/htmlsearch/klangcombo.cpp
@@ -39,14 +39,14 @@ KLanguageCombo::KLanguageCombo (TQWidget * parent, const char *name)
 
 void KLanguageCombo::insertLanguage(const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index)
 {
-  TQString output = name + TQString::tqfromLatin1(" (") + path + TQString::tqfromLatin1(")");
-  TQPixmap flag(locate("locale", sub + path + TQString::tqfromLatin1("/flag.png")));
+  TQString output = name + TQString::fromLatin1(" (") + path + TQString::fromLatin1(")");
+  TQPixmap flag(locate("locale", sub + path + TQString::fromLatin1("/flag.png")));
   insertItem(TQIconSet(flag), output, path, submenu, index);
 }
 
 void KLanguageCombo::changeLanguage(const TQString& name, int i)
 {
   if (i < 0 || i >= count()) return;
-  TQString output = name + TQString::tqfromLatin1(" (") + tag(i) + TQString::tqfromLatin1(")");
+  TQString output = name + TQString::fromLatin1(" (") + tag(i) + TQString::fromLatin1(")");
   changeItem(output, i);
 }
diff --git a/khelpcenter/htmlsearch/ktagcombobox.cpp b/khelpcenter/htmlsearch/ktagcombobox.cpp
index 900077c54..6bb74c860 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.cpp
+++ b/khelpcenter/htmlsearch/ktagcombobox.cpp
@@ -83,7 +83,7 @@ void KTagComboBox::internalActivate( int index )
   if (current == index) return;
   current = index;
   emit activated( index );
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::internalHighlight( int index )
@@ -192,7 +192,7 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
   TQRect clip(2, 2, width() - 4, height() - 4);
 #if 0
   if ( hasFocus() && style().guiStyle() != MotifStyle )
-    p.setPen( tqcolorGroup().highlightedText() );
+    p.setPen( colorGroup().highlightedText() );
 #endif
   p.drawText(clip, AlignCenter | SingleLine, popup->text( current ));
 
@@ -204,9 +204,9 @@ void KTagComboBox::paintEvent( TQPaintEvent * ev)
   }
 }
 
-bool KTagComboBox::tqcontainsTag( const TQString &str ) const
+bool KTagComboBox::containsTag( const TQString &str ) const
 {
-  return tags->tqcontains(str) > 0;
+  return tags->contains(str) > 0;
 }
 
 TQString KTagComboBox::currentTag() const
@@ -233,7 +233,7 @@ void KTagComboBox::setCurrentItem(int i)
 {
   if (i < 0 || i >= count()) return;
   current = i;
-  tqrepaint();
+  repaint();
 }
 
 void KTagComboBox::setCurrentItem(const TQString &code)
diff --git a/khelpcenter/htmlsearch/ktagcombobox.h b/khelpcenter/htmlsearch/ktagcombobox.h
index f184b14d7..df58120ce 100644
--- a/khelpcenter/htmlsearch/ktagcombobox.h
+++ b/khelpcenter/htmlsearch/ktagcombobox.h
@@ -56,7 +56,7 @@ public:
    */
   TQString currentTag() const;
   TQString tag ( int i ) const;
-  bool tqcontainsTag (const TQString &str ) const;
+  bool containsTag (const TQString &str ) const;
 
   /*
    * Set the current item
diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp
index 8581b25c8..ea6dff669 100644
--- a/khelpcenter/htmlsearchconfig.cpp
+++ b/khelpcenter/htmlsearchconfig.cpp
@@ -51,15 +51,15 @@ HtmlSearchConfig::HtmlSearchConfig(TQWidget *parent, const char *name)
   TQLabel *l = new TQLabel(i18n("The fulltext search feature makes use of the "
                   "ht://dig HTML search engine. "
                   "You can get ht://dig at the"), gb);
-  l->tqsetAlignment(TQLabel::WordBreak);
-  l->setMinimumSize(l->tqsizeHint());
+  l->setAlignment(TQLabel::WordBreak);
+  l->setMinimumSize(l->sizeHint());
   grid->addMultiCellWidget(l, 1, 1, 0, 1);
   TQWhatsThis::add( gb, i18n( "Information about where to get the ht://dig package." ) );
 
   KURLLabel *url = new KURLLabel(gb);
   url->setURL("http://www.htdig.org");
   url->setText(i18n("ht://dig home page"));
-  url->tqsetAlignment(TQLabel::AlignHCenter);
+  url->setAlignment(TQLabel::AlignHCenter);
   grid->addMultiCellWidget(url, 2,2, 0, 1);
   connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)),
       this, TQT_SLOT(urlClicked(const TQString&)));
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 65ce72c80..aadce700a 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -101,7 +101,7 @@ IndexProgressDialog::IndexProgressDialog( TQWidget *parent )
   topLayout->setSpacing( spacingHint() );
 
   mLabel = new TQLabel( this );
-  mLabel->tqsetAlignment( AlignHCenter );
+  mLabel->setAlignment( AlignHCenter );
   topLayout->addWidget( mLabel );
 
   mProgressBar = new TQProgressBar( this );
@@ -215,7 +215,7 @@ void IndexProgressDialog::hideDetails()
   mLogLabel->hide();
   mLogView->hide();
   mDetailsButton->setText( i18n("Details >>") );
-  tqlayout()->activate();
+  layout()->activate();
   adjustSize();
 }
 
@@ -276,7 +276,7 @@ void KCMHelpCenter::setupMainWidget( TQWidget *parent )
   mListView = new KListView( parent );
   mListView->setFullWidth( true );
   mListView->addColumn( i18n("Search Scope") );
-  mListView->addColumn( i18n("tqStatus") );
+  mListView->addColumn( i18n("Status") );
   mListView->setColumnAlignment( 1, AlignCenter );
   topLayout->addWidget( mListView );
   connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ),
@@ -337,10 +337,10 @@ void KCMHelpCenter::load()
     }
   }
 
-  updatetqStatus();
+  updateStatus();
 }
 
-void KCMHelpCenter::updatetqStatus()
+void KCMHelpCenter::updateStatus()
 {
   TQListViewItemIterator it( mListView );
   while ( it.current() != 0 ) {
@@ -417,9 +417,9 @@ bool KCMHelpCenter::buildIndex()
               .arg( entry->documentType() ) );
             hasError = true;
           } else {
-            indexer.tqreplace( TQRegExp( "%i" ), entry->identifier() );
-            indexer.tqreplace( TQRegExp( "%d" ), Prefs::indexDirectory() );
-            indexer.tqreplace( TQRegExp( "%p" ), entry->url() );
+            indexer.replace( TQRegExp( "%i" ), entry->identifier() );
+            indexer.replace( TQRegExp( "%d" ), Prefs::indexDirectory() );
+            indexer.replace( TQRegExp( "%p" ), entry->url() );
             kdDebug() << "INDEXER: " << indexer << endl;
             *ts << indexer << endl;
 
@@ -574,7 +574,7 @@ void KCMHelpCenter::slotIndexProgress()
 
   kdDebug() << "KCMHelpCenter::slotIndexProgress()" << endl;
 
-  updatetqStatus();
+  updateStatus();
 
   advanceProgress();
 }
diff --git a/khelpcenter/kcmhelpcenter.desktop b/khelpcenter/kcmhelpcenter.desktop
index 8712c56a1..54ae1c7e3 100644
--- a/khelpcenter/kcmhelpcenter.desktop
+++ b/khelpcenter/kcmhelpcenter.desktop
@@ -60,14 +60,14 @@ Name[nl]=Documentatie-index
 Name[nn]=Hjelpindeks
 Name[nso]=Palo ya Thuso
 Name[pa]=ਸਹਾਇਤਾ ਤਤਕਰਾ
-Name[pl]=Indeks potqmocy
+Name[pl]=Indeks pomocy
 Name[pt]=Índice da Ajuda
 Name[pt_BR]=Índice de Ajuda
 Name[ro]=Index ajutor
 Name[ru]=Индекс справки
 Name[rw]=Umubarendanga w'Ifashayobora
 Name[se]=Veahkkeindeaksa
-Name[sk]=Index potqmocníka
+Name[sk]=Index pomocníka
 Name[sl]=Seznam pomoči
 Name[sr]=Индекс помоћи
 Name[sr@Latn]=Indeks pomoći
@@ -136,14 +136,14 @@ Comment[nl]=Zoekindex van het documentatiecentrum instellen en genereren
 Comment[nn]=Oppsett og generering av søkjeindeks for hjelpesenteret
 Comment[nso]=Thlagiso le peakanyo ya palo ya bangwadi le ya nyako ya bogare bja thuso
 Comment[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ ਖੋਜ ਤਤਕਰਾ ਸੰਰਚਨਾ ਅਤੇ ਨਿਰਮਾਣ
-Comment[pl]=Konfiguracja i generowanie indeksu potqmocy
+Comment[pl]=Konfiguracja i generowanie indeksu pomocy
 Comment[pt]=Configuração e geração do índice de pesquisa do centro de ajuda
 Comment[pt_BR]=Configuração e geração do índice de busca do centro de ajuda
 Comment[ro]=Generează și configurează indexul de căutare pentru Centrul de Ajutor
 Comment[ru]=Настройка индексов справочной системы KDE
 Comment[rw]=Iboneza n'irema umubarendanga w'ishakisha ifashayobora hagati
 Comment[se]=Veahkkeguovddáža ohcanindeavssa heiveheapmi ja ráhkadeapmi
-Comment[sk]=Nastavenie a generovanie indexu pre potqmocníka
+Comment[sk]=Nastavenie a generovanie indexu pre pomocníka
 Comment[sl]=Nastavitve in ustvarjanje iskalnega indeksa za Središče za pomoč
 Comment[sr]=Подешавање и генерисање индекса за претрагу Центра за помоћ
 Comment[sr@Latn]=Podešavanje i generisanje indeksa za pretragu Centra za pomoć
@@ -208,13 +208,13 @@ Keywords[nl]=khelpcenter,help,index,search,hulp,zoeken,documentatie,handboek
 Keywords[nn]=KHelpCenter,hjelp,indeks,søk
 Keywords[nso]=kbogare bja thuso,thuso,palo ya bangwadi,nyako
 Keywords[pa]=ਸਹਾਇਤਾ ਕੇਂਦਰ,ਸਹਾਇਤਾ,ਤਤਕਰਾ,ਖੋਜ
-Keywords[pl]=centrum potqmocy,potqmoc,indeks,szukanie
+Keywords[pl]=centrum pomocy,pomoc,indeks,szukanie
 Keywords[pt]=khelpcenter,ajuda,índice,procura
 Keywords[pt_BR]=centro de ajuda,ajuda,índice,busca
 Keywords[ro]=centrul de ajutor,khelpcenter,ajutor,index,căutare
 Keywords[rw]=k-ifashayoborahagati,ifashayobora,umubarendanga,ishakisha 
 Keywords[se]=KHelpCenter,veahkki,indeaksa,indeksa,ohcan
-Keywords[sk]=khelpcenter,help,index,potqmocník,hľadanie
+Keywords[sk]=khelpcenter,help,index,pomocník,hľadanie
 Keywords[sl]=khelpcenter,pomoč,indeks,iskanje
 Keywords[sr]=khelpcenter,помоћ,садржај,претрага
 Keywords[sr@Latn]=khelpcenter,pomoć,sadržaj,pretraga
diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h
index 3c3443ed3..8bf2f3b6c 100644
--- a/khelpcenter/kcmhelpcenter.h
+++ b/khelpcenter/kcmhelpcenter.h
@@ -138,7 +138,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface
 
   protected:
     void setupMainWidget( TQWidget *parent );
-    void updatetqStatus();
+    void updateStatus();
     void startIndexProcess();
 
     void deleteProcess();
diff --git a/khelpcenter/khelpcenter.desktop b/khelpcenter/khelpcenter.desktop
index f14461039..5dad26cfe 100644
--- a/khelpcenter/khelpcenter.desktop
+++ b/khelpcenter/khelpcenter.desktop
@@ -24,7 +24,7 @@ Name[nds]=Trinity-Hülpzentrum
 Name[ne]=केडीई मद्दत केन्द्र
 Name[nso]=KBogare bja Thuso
 Name[pa]=ਕੇਸਹਾਇਤਾਕੇਂਦਰ
-Name[pl]=Centrum Potqmocy
+Name[pl]=Centrum Pomocy
 Name[pt_BR]=Centro de Ajuda
 Name[ro]=Centrul de ajutor Trinity
 Name[ru]=Центр справки
@@ -95,14 +95,14 @@ Comment[nn]=Trinity Hjelpesenter
 Comment[nso]=Bogare bja Thuso ya Trinity
 Comment[oc]=Lo centre d'ajuda Trinity
 Comment[pa]=ਕੇਡੀਈ ਸਹਾਇਤਾ ਕੇਂਦਰ
-Comment[pl]=Centrum Potqmocy Trinity
+Comment[pl]=Centrum Pomocy Trinity
 Comment[pt]=O Centro de Ajuda do Trinity
 Comment[pt_BR]=Centro de Ajuda do Trinity
 Comment[ro]=Centrul de ajutor al Trinity
 Comment[ru]=Центр справки Trinity
 Comment[rw]=Trinity Ifashayobora Hagati
 Comment[se]=Trinity veahkkeguovddáš
-Comment[sk]=Trinity Centrum potqmoci
+Comment[sk]=Trinity Centrum pomoci
 Comment[sl]=Središče pomoči za Trinity
 Comment[sr]=Trinity центар за помоћ
 Comment[sr@Latn]=Trinity centar za pomoć
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index 7b9f9c27f..633bf0085 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -310,7 +310,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
          proto == "ghelp" )
         own = true;
     else if ( url.isLocalFile() ) {
-        KMimeMagicResult *res = KMimeMagic::self()->tqfindFileType( url.path() );
+        KMimeMagicResult *res = KMimeMagic::self()->findFileType( url.path() );
         if ( res->isValid() && res->accuracy() > 40
              && res->mimeType() == "text/html" )
             own = true;
@@ -325,7 +325,7 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args )
 
     mDoc->browserExtension()->setURLArgs( args );
 
-    if ( proto == TQString::tqfromLatin1("glossentry") ) {
+    if ( proto == TQString::fromLatin1("glossentry") ) {
         TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() );
         slotGlossSelected( mNavigator->glossEntry( decodedEntryId ) );
         mNavigator->slotSelectGlossEntry( decodedEntryId );
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index 2285cd069..ad308cfc6 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -262,8 +262,8 @@ void Navigator::insertIOSlaveDocs( const TQString &name, NavigatorItem *topItem
 
 void Navigator::insertAppletDocs( NavigatorItem *topItem )
 {
-  TQDir appletDir( locate( "data", TQString::tqfromLatin1( "kicker/applets/" ) ) );
-  appletDir.setNameFilter( TQString::tqfromLatin1( "*.desktop" ) );
+  TQDir appletDir( locate( "data", TQString::fromLatin1( "kicker/applets/" ) ) );
+  appletDir.setNameFilter( TQString::fromLatin1( "*.desktop" ) );
 
   TQStringList files = appletDir.entryList( TQDir::Files | TQDir::Readable );
   TQStringList::ConstIterator it = files.begin();
@@ -409,7 +409,7 @@ void Navigator::slotItemSelected( TQListViewItem *currentItem )
         if ( !doc.isNull() ) {
           int pos = doc.find( ".html" );
           if ( pos >= 0 ) {
-            doc.tqreplace( pos, 5, ".docbook" );
+            doc.replace( pos, 5, ".docbook" );
           }
           kdDebug( 1400 ) << "slotItemSelected(): doc = " << doc << endl;
 
@@ -563,7 +563,7 @@ void Navigator::slotSearch()
 void Navigator::slotShowSearchResult( const TQString &url )
 {
   TQString u = url;
-  u.tqreplace( "%k", mSearchEdit->text() );
+  u.replace( "%k", mSearchEdit->text() );
 
   emit itemSelected( u );
 }
diff --git a/khelpcenter/plugins/kioslaves.desktop b/khelpcenter/plugins/kioslaves.desktop
index 5b4586200..452ecd502 100644
--- a/khelpcenter/plugins/kioslaves.desktop
+++ b/khelpcenter/plugins/kioslaves.desktop
@@ -2,7 +2,7 @@
 
 Name=Kioslaves
 Name[bg]=Система за вход-изход
-Name[cs]=Potqmocné protokoly KDE
+Name[cs]=Pomocné protokoly KDE
 Name[csb]=Pluginsë wéńdzeniô/wińdzeniô
 Name[da]=Kioslaver
 Name[de]=Ein-/Ausgabemodule
diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp
index 4ee28d21d..20a4b0851 100644
--- a/khelpcenter/scrollkeepertreebuilder.cpp
+++ b/khelpcenter/scrollkeepertreebuilder.cpp
@@ -180,7 +180,7 @@ void ScrollKeeperTreeBuilder::insertDoc( NavigatorItem *parent,
           if ( url.left( 5 ) == "file:" ) url = url.mid( 5 );
           url.prepend( "ghelp:" );
 #if 0
-          url.tqreplace( TQRegExp( ".xml$" ), ".html" );
+          url.replace( TQRegExp( ".xml$" ), ".html" );
 #endif
         } else if ( mimeType == "text/sgml" ) {
           // GNOME docs use this type. We don't have a real viewer for this.
diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp
index 12117712d..b779afc8e 100644
--- a/khelpcenter/searchengine.cpp
+++ b/khelpcenter/searchengine.cpp
@@ -325,16 +325,16 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     if ( lang.lower() == "c" || lang.lower() == "posix" )
 	  lang = "en";
 
-    // if the string tqcontains '&' tqreplace with a '+' and set search method to and
+    // if the string contains '&' replace with a '+' and set search method to and
     if (mWords.find("&") != -1) {
-      mWords.tqreplace("&", " ");
+      mWords.replace("&", " ");
       method = "and";
     }
 
-    // tqreplace whitespace with a '+'
+    // replace whitespace with a '+'
     mWords = mWords.stripWhiteSpace();
     mWords = mWords.simplifyWhiteSpace();
-    mWords.tqreplace(TQRegExp("\\s"), "+");
+    mWords.replace(TQRegExp("\\s"), "+");
 
     commonSearchProgram = substituteSearchQuery( commonSearchProgram );
 
@@ -379,7 +379,7 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
     delete mProc;
 
     // modify the search result
-    mSearchResult = mSearchResult.tqreplace("http://localhost/", "file:/");
+    mSearchResult = mSearchResult.replace("http://localhost/", "file:/");
     mSearchResult = mSearchResult.mid( mSearchResult.find( '<' ) );
 
     mView->beginSearchResult();
@@ -395,11 +395,11 @@ bool SearchEngine::search( TQString words, TQString method, int matches,
 TQString SearchEngine::substituteSearchQuery( const TQString &query )
 {
   TQString result = query;
-  result.tqreplace( "%k", mWords );
-  result.tqreplace( "%n", TQString::number( mMatches ) );
-  result.tqreplace( "%m", mMethod );
-  result.tqreplace( "%l", mLang );
-  result.tqreplace( "%s", mScope );
+  result.replace( "%k", mWords );
+  result.replace( "%n", TQString::number( mMatches ) );
+  result.replace( "%m", mMethod );
+  result.replace( "%l", mLang );
+  result.replace( "%s", mScope );
 
   return result;
 }
@@ -409,15 +409,15 @@ TQString SearchEngine::substituteSearchQuery( const TQString &query,
   Operation operation, const TQString &lang )
 {
   TQString result = query;
-  result.tqreplace( "%i", identifier );
-  result.tqreplace( "%w", words.join( "+" ) );
-  result.tqreplace( "%m", TQString::number( maxResults ) );
+  result.replace( "%i", identifier );
+  result.replace( "%w", words.join( "+" ) );
+  result.replace( "%m", TQString::number( maxResults ) );
   TQString o;
   if ( operation == Or ) o = "or";
   else o = "and";
-  result.tqreplace( "%o", o );
-  result.tqreplace( "%d", Prefs::indexDirectory() );
-  result.tqreplace( "%l", lang );
+  result.replace( "%o", o );
+  result.replace( "%d", Prefs::indexDirectory() );
+  result.replace( "%l", lang );
 
   return result;
 }
diff --git a/khelpcenter/searchhandler.cpp b/khelpcenter/searchhandler.cpp
index 465c2bc80..9c34d7399 100644
--- a/khelpcenter/searchhandler.cpp
+++ b/khelpcenter/searchhandler.cpp
@@ -62,9 +62,9 @@ TQStringList SearchHandler::documentTypes() const
 TQString SearchHandler::indexCommand( const TQString &identifier )
 {
   TQString cmd = mIndexCommand;
-  cmd.tqreplace( "%i", identifier );
-  cmd.tqreplace( "%d", Prefs::indexDirectory() );
-  cmd.tqreplace( "%l", mLang );
+  cmd.replace( "%i", identifier );
+  cmd.replace( "%d", Prefs::indexDirectory() );
+  cmd.replace( "%l", mLang );
   return cmd;
 }
 
diff --git a/khelpcenter/searchhandlers/README.searchhandlers b/khelpcenter/searchhandlers/README.searchhandlers
index f888217ac..cbbfbbbd7 100644
--- a/khelpcenter/searchhandlers/README.searchhandlers
+++ b/khelpcenter/searchhandlers/README.searchhandlers
@@ -6,7 +6,7 @@ handlers. Each searchable document provides provides a document type in its meta
 data and if a corresponding handler is found, it can be searched.
 
 Search handlers are described by a desktop file which is put in the khelpcenter
-app directory in a "searchhandlers" directory. The desktop file tqcontains the
+app directory in a "searchhandlers" directory. The desktop file contains the
 information about which document types the handler covers, how to do a search
 query and how to create a search index.
 
@@ -21,7 +21,7 @@ Search Query
 
 KHelpcenter reads the command to execute for submitting a search query from the
 search handler's desktop file ("SearchCommand"). The search command can contain
-some symbols which are tqreplaced by KHelpcenter with the data for the concrete
+some symbols which are replaced by KHelpcenter with the data for the concrete
 search request:
 
 %i  Identifier of document (usually the name of the document's desktop file)
@@ -44,7 +44,7 @@ Building a Search Index
 
 KHelpcenter reads the command to build a search index from the search handler's
 desktop file ("IndexCommand"). The indexing command can contain some symbols
-which are tqreplaced by KHelpcenter with the data for the concrete index creation
+which are replaced by KHelpcenter with the data for the concrete index creation
 call:
 
 %i  Identifier of document (usually the name of the document's desktop file)
diff --git a/khelpcenter/toc.cpp b/khelpcenter/toc.cpp
index 852dc09a1..7bda95b8c 100644
--- a/khelpcenter/toc.cpp
+++ b/khelpcenter/toc.cpp
@@ -88,17 +88,17 @@ void TOC::build( const TQString &file )
 		}
 	}
 
-	TQString cacheFile = fileName.tqreplace( TQDir::separator(), "__" );
+	TQString cacheFile = fileName.replace( TQDir::separator(), "__" );
 	m_cacheFile = locateLocal( "cache", "help/" + cacheFile );
 	m_sourceFile = file;
 
-	if ( cachetqStatus() == NeedRebuild )
+	if ( cacheStatus() == NeedRebuild )
 		buildCache();
 	else
 		fillTree();
 }
 
-TOC::CachetqStatus TOC::cachetqStatus() const
+TOC::CacheStatus TOC::cacheStatus() const
 {
 	if ( !TQFile::exists( m_cacheFile ) ||
 	     sourceFileCTime() != cachedCTime() )
@@ -188,9 +188,9 @@ void TOC::fillTree()
 	TQDomNodeList chapters = doc.documentElement().elementsByTagName( "chapter" );
 	for ( unsigned int chapterCount = 0; chapterCount < chapters.count(); chapterCount++ ) {
 		TQDomElement chapElem = chapters.item( chapterCount ).toElement();
-		TQDomElement chapTitleElem = childElement( chapElem, TQString::tqfromLatin1( "title" ) );
+		TQDomElement chapTitleElem = childElement( chapElem, TQString::fromLatin1( "title" ) );
 		TQString chapTitle = chapTitleElem.text().simplifyWhiteSpace();
-		TQDomElement chapRefElem = childElement( chapElem, TQString::tqfromLatin1( "anchor" ) );
+		TQDomElement chapRefElem = childElement( chapElem, TQString::fromLatin1( "anchor" ) );
 		TQString chapRef = chapRefElem.text().stripWhiteSpace();
 
 		chapItem = new TOCChapterItem( this, m_parentItem, chapItem, chapTitle, chapRef );
@@ -199,9 +199,9 @@ void TOC::fillTree()
 		TQDomNodeList sections = chapElem.elementsByTagName( "section" );
 		for ( unsigned int sectCount = 0; sectCount < sections.count(); sectCount++ ) {
 			TQDomElement sectElem = sections.item( sectCount ).toElement();
-			TQDomElement sectTitleElem = childElement( sectElem, TQString::tqfromLatin1( "title" ) );
+			TQDomElement sectTitleElem = childElement( sectElem, TQString::fromLatin1( "title" ) );
 			TQString sectTitle = sectTitleElem.text().simplifyWhiteSpace();
-			TQDomElement sectRefElem = childElement( sectElem, TQString::tqfromLatin1( "anchor" ) );
+			TQDomElement sectRefElem = childElement( sectElem, TQString::fromLatin1( "anchor" ) );
 			TQString sectRef = sectRefElem.text().stripWhiteSpace();
 
 			sectItem = new TOCSectionItem( this, chapItem, sectItem, sectTitle, sectRef );
diff --git a/khelpcenter/toc.h b/khelpcenter/toc.h
index 321a97253..6d01fd2ba 100644
--- a/khelpcenter/toc.h
+++ b/khelpcenter/toc.h
@@ -50,9 +50,9 @@ class TOC : public QObject
 		void meinprocExited( KProcess *meinproc );
 
 	private:
-		enum CachetqStatus { NeedRebuild, CacheOk };
+		enum CacheStatus { NeedRebuild, CacheOk };
 
-		CachetqStatus cachetqStatus() const;
+		CacheStatus cacheStatus() const;
 		int sourceFileCTime() const;
 		int cachedCTime() const;
 		TQDomElement childElement( const TQDomElement &e, const TQString &name );
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index 381584d6a..64e6238ed 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -20,9 +20,9 @@
 
 using namespace KHC;
 
-View::View( TQWidget *tqparentWidget, const char *widgetName,
+View::View( TQWidget *parentWidget, const char *widgetName,
                   TQObject *parent, const char *name, KHTMLPart::GUIProfile prof, KActionCollection *col )
-    : KHTMLPart( tqparentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
+    : KHTMLPart( parentWidget, widgetName, parent, name, prof ), mState( Docu ), mActionCollection(col)
 {
     setJScriptEnabled(false);
     setJavaEnabled(false);
diff --git a/khelpcenter/view.h b/khelpcenter/view.h
index 1c5a2bf66..3af2a15b8 100644
--- a/khelpcenter/view.h
+++ b/khelpcenter/view.h
@@ -20,7 +20,7 @@ class View : public KHTMLPart
 {
     Q_OBJECT
   public:
-    View( TQWidget *tqparentWidget, const char *widgetName,
+    View( TQWidget *parentWidget, const char *widgetName,
           TQObject *parent, const char *name, KHTMLPart::GUIProfile prof,
           KActionCollection *col );
 
diff --git a/khotkeys/README b/khotkeys/README
index 658309674..c490cbc5d 100644
--- a/khotkeys/README
+++ b/khotkeys/README
@@ -38,7 +38,7 @@
  at least snapshot 20020108. I haven't tested it with any older versions,
  so I don't know if it will work with them or not.
 
-  During installation, the files will tqreplace the ones that are part
+  During installation, the files will replace the ones that are part
  of the simple version in kdebase. Shortcuts assigned using KMenuEdit
  should still work, and the config file will be converted to the new format.
  However, you should backup all files before removing them ( including
diff --git a/khotkeys/TODO b/khotkeys/TODO
index 1ef563c13..7db646b66 100644
--- a/khotkeys/TODO
+++ b/khotkeys/TODO
@@ -18,7 +18,7 @@ class Condition + tab 'Windows' -> 'Conditions'
 hlaska o uz prirazene kl.kombinaci pro makro se opakuje i vicekrat ( pro kazde uz existujici )
 rucni smazani radku nemaze makro pro editaci v dialogu
 ted uz ten timeout u spusteni funguje ok, ale zase kdyz chci pustit neco 2x naraz, tak se musi cekat ???
-taky to pri jeho rucni editaci neni obcas videt ( je to tqmoc vpravo )
+taky to pri jeho rucni editaci neni obcas videt ( je to moc vpravo )
 grrr, to setSelected()/setCurrent() me stve, vsechny ty listboxy a listview obcas spatne detekuji vybrany :(
   - asi si zkratka udelat vlastni tridy, ktere budou nutit selected==current
 ve windowdef widgetu mit moznost autodetekce, tj. defaultni, kdyz neni nastaven spousteci prikaz
@@ -70,13 +70,13 @@ electric borders u KWin zere jen okraje, ale ne primo rohy - pujde to udelat jak
     - pujdou i okraje, kdyz to bude vypnute u WM ( nebo se budou fackovat ? )
 akce : transformace klavesy ( def. Key_Menu ) na RMB do keyboard focusu ( pro kontext menu )
 akce : kdyz se objevi okno, aplikovat na nej veci, ktere dela kstart ( sticky, atd. )
-strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za tqmoc nestoji
+strokes : kdyz X bere mys pres gpmdata, gpm pekne zasekava u vstupu pri prostrednim tlacitku dole => strokes pak za moc nestoji
 paste pri MMB volitelne jen kdyz MMB neni stisknuto napr. pres 500ms ( kvuli strokes )
 akce : kdyz se stiskne nejaka shortcut a nejaka aplikace nebezi, tak se spusti a pak se ji ta shortcut preda ( napr. pro klipper ? )
 odstranit tu KAccel zmenu, kterou v CVS udelal Coolo - stejne netusim, jestli to ma nebo nema byt i18n, tak at je aspon default
 skupine akci 'KMenuedit entries' by asi nemelo jit zmenit jmeno
 kdyz se v KMenuEdit udela polozka a pak se ten menuentry smaze, asi by se ta shortcut mela aspon disablovat ?!
 at dokaze zvetsovat vsechna 'File Open Dialog' okna
-pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi tqmoc nezvlada )
+pamatovat si menuentries i s polohou v K-Menu ? .desktop files by mely byt unique ( ale kmenuedit tohle asi moc nezvlada )
 neudelat to prirazeni klavesy k menuentry nejak jednodussi ? nebo zkratka doporucovat kmenuedit ?
 i18n("","") pro veci jako "New"
diff --git a/khotkeys/arts/soundrecorder_arts.cpp b/khotkeys/arts/soundrecorder_arts.cpp
index 0faf71002..e600e1730 100644
--- a/khotkeys/arts/soundrecorder_arts.cpp
+++ b/khotkeys/arts/soundrecorder_arts.cpp
@@ -95,7 +95,7 @@ Sound SoundRecorderArts::sound()
 	Sound s;
 	uint BytePS=BITS/8;
 	uint length=m_data.size()/BytePS;
-	TQMemArray<TQ_INT32> da(length);
+	TQMemArray<Q_INT32> da(length);
 	s.max=0;
 	s._fs=FS;
 	for(uint f=0;f<length; f++)
diff --git a/khotkeys/data/kde32b1.khotkeys b/khotkeys/data/kde32b1.khotkeys
index 2ee6f15d7..46db7521d 100644
--- a/khotkeys/data/kde32b1.khotkeys
+++ b/khotkeys/data/kde32b1.khotkeys
@@ -2,7 +2,7 @@
 DataCount=1
 
 [Data_1]
-Comment=This group tqcontains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)
+Comment=This group contains various examples demonstrating most of the features of KHotkeys. (Note that this group and all its actions are disabled by default.)
 Comment[bg]=Тази група съдържа различни примери, демонстриращи повечето от функциите на горещите клавиши. (Имайте предвид, че групата по подразбиране е изключена.)
 Comment[ca]=Aquest grup té varis exemples que demostren la majoria de les funcionalitats del KHotkeys. (Tingueu en compte que aquest grup i totes les seves accions estan deshabilitades per defecte.)
 Comment[csb]=Ta grëpa zamëkô w se różny przëmiôrë pòkazującë wikszy dzél mòżlewòtów KHotkeys. (Bôczë, że ta grëpa ë ji wszëtczé dzejania są domëslno wëłączoné.)
@@ -584,7 +584,7 @@ Comment[pt]=Leia o comentário sobre a acção "Escrever 'Olá'" primeiro.\n\nO
 Comment[pt_BR]=Leia o comentário sobre a ação "Digitar 'Hello'" primeiro.\n\nO Qt Designer usa Ctrl+F4 para fechar as janelas (talvez porque é assim no MS Windows). Mas Ctrl+F4 no KDE significa ir para a área de trabalho virtual 4, portanto não funciona no Qt Designer, e também, o Qt Designer não usa o Ctrl+W padrão do KDE para fechar a janela.\n\nMas o problema pode ser resolvido remapeando Ctrl+W para Ctrl+F4 quando a janela ativa é o Qt Designer. Quanto o Qt Designer está ativo, toda vez que Ctrl+W é pressionado, Ctrl+F4 será enviado para o Qt Designer. Em outros aplicativos, Ctrl+W continua funcionando da maneira usual é claro.\n\nAgora precisamos especificar três coisas: Um novo atalho para o 'Ctrl+W', uma nova ação de entrada do teclado que envia o Ctrl+F4, e uma nova condição de que a janela ativa é o Qt Designer.\nO Qt Designer parece sempre ter o título 'Qt Designer by Trolltech', portanto a condição irá checar se a janela ativa tem aquele título.
 Comment[ro]=Citiți mai întâi comentariul la acțiunea "Tastați 'Hello'". \n\nQt Designer folosește Ctrl+F4 pentru închiderea ferestrelor (poate pentru că MS Windows o face astfel). Dar Ctrl+F4 în KDE este o scurtătură către desktop-ul virtual nr. 4, așa că nu merge în Qt Designer, iar în plus Qt Designer nu folosește standardul KDE Ctrl+W pentru închiderea ferestrei.\n\nDar problema poate fi rezolvată reasociind Ctrl+W la Ctrl+F4 când fereastra activă este Qt Designer. Când Qt Designer este activ, de fiecare dată dată când este apăsat Ctrl+W, la Qt Designer va fi trimis Ctrl+F4. În alte aplicații Ctrl+W va continua să funcționeze ca de obicei.\n\nAcum trebuie să specificăm trei lucruri: o nouă scurtătură pentru 'Ctrl+W', o nouă acțiune trimițând Ctrl+F4 și o nouă condiție cum că fereastra activă este Qt Designer.\nQt Designer pare să aibă întotdeauna titlul 'Qt Designer by Trolltech', așa că condiția va verifica dacă fereastra activă are acest titlu.
 Comment[ru]=По Ctrl+W будет эмулировано нажатие Ctrl+F4 для закрытия окна Qt Designer.\nПоиск окна Qt Designer осуществляется по заголовку "Qt Designer by Trolltech".
-Comment[sk]=Najprv si prečítajte komentár k akcii "Typ 'Hello'".\n\nQt Designer používa na zatváranie okien Ctrl+F4 (možno preto, že to tak robí MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužíva KDE štandardné zatváranie okien potqmocou Ctrl+W.\n\nProblém však môžete vyriešiť premapovaním Ctrl+W na Ctrl+F4, keď je aktívnym oknom okno Qt Designera. Keď je Qt Designer aktívny, vždy, keď stlačíte Ctrl+W, pošle sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovať ako obvykle.\n\nTeraz potrebujeme nastaviť tri veci: nový spúštač klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktívne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovať, či má aktívne okno tento titul.
+Comment[sk]=Najprv si prečítajte komentár k akcii "Typ 'Hello'".\n\nQt Designer používa na zatváranie okien Ctrl+F4 (možno preto, že to tak robí MS Windows (?)). Ale Ctrl+F4 v KDE znamená prechod na virtuálnu plochu 4, takže to nefunguje v Qt Designerovi a tiež, Qt Designer nepoužíva KDE štandardné zatváranie okien pomocou Ctrl+W.\n\nProblém však môžete vyriešiť premapovaním Ctrl+W na Ctrl+F4, keď je aktívnym oknom okno Qt Designera. Keď je Qt Designer aktívny, vždy, keď stlačíte Ctrl+W, pošle sa Qt Designeru Ctrl+F4. V iných aplikáciach bude samozrejme Ctrl+W pracovať ako obvykle.\n\nTeraz potrebujeme nastaviť tri veci: nový spúštač klávesovej skratky 'Ctrl+W', novú vstupnú akciu klávesnice posielajúcu Ctrl+F4 a novú podmienku, že aktívne okno je Qt Designer.\nVyzerá, že Qt Designer má vždy titulok 'Qt Designer by Trolltech', takže podmienka bude kontrolovať, či má aktívne okno tento titul.
 Comment[sr]=Прочитајте прво коментар за радњу „Унос ‘Hello’“.\n\nQt Designer користи Ctrl+F4 за затварање прозора (можда зато што је исто тако у MS Windows-у). Али Ctrl+F4 у KDE-у означава одлазак на виртуелну радну површину 4, тако да не ради у Qt Designer-у. Такође, Qt Designer не користи KDE-ово стандардно Ctrl+W за затварање прозора.\n\nОви проблеми могу бити решени другачијим мапирањем за Ctrl+W и Ctrl+F4 када је активан прозор Qt Designer-а. Тада, сваки пут када се притисне Ctrl+W, уместо тога ће Ctrl+F4 бити послато Qt Designer-у. У другим програмима, Ctrl+W наравно наставља да ради као и обично.\n\nЗа ово морамо навести три ствари: Нови окидач пречице за „Ctrl+W“, нову радњу улаза са тастатуре која даје Ctrl+F4, и нови услов да је активан прозор онај Qt Designer-а.\nИзгледа да његов прозор увек има у наслову „Qt Designer by Trolltech“, тако да ће се то проверавати у услову за активан прозор.
 Comment[sr@Latn]=Pročitajte prvo komentar za radnju „Unos ‘Hello’“.\n\nQt Designer koristi Ctrl+F4 za zatvaranje prozora (možda zato što je isto tako u MS Windows-u). Ali Ctrl+F4 u KDE-u označava odlazak na virtuelnu radnu površinu 4, tako da ne radi u Qt Designer-u. Takođe, Qt Designer ne koristi KDE-ovo standardno Ctrl+W za zatvaranje prozora.\n\nOvi problemi mogu biti rešeni drugačijim mapiranjem za Ctrl+W i Ctrl+F4 kada je aktivan prozor Qt Designer-a. Tada, svaki put kada se pritisne Ctrl+W, umesto toga će Ctrl+F4 biti poslato Qt Designer-u. U drugim programima, Ctrl+W naravno nastavlja da radi kao i obično.\n\nZa ovo moramo navesti tri stvari: Novi okidač prečice za „Ctrl+W“, novu radnju ulaza sa tastature koja daje Ctrl+F4, i novi uslov da je aktivan prozor onaj Qt Designer-a.\nIzgleda da njegov prozor uvek ima u naslovu „Qt Designer by Trolltech“, tako da će se to proveravati u uslovu za aktivan prozor.
 Comment[sv]=Läs kommentaren om åtgärden "Skriv 'Hej'" först.\n\nQt Designer använder Ctrl+F4 för att stänga fönster (kanske för att MS Windows gör det). Men Ctrl+F4 i KDE betyder att gå till virtuellt skrivbord 4, så det fungerar inte i Qt Designer, och dessutom använder inte Qt Designer KDE:s standard för att stänga fönster, Ctrl+W.\n\nProblemet kan lösas genom att ändra Ctrl+W till Ctrl+F4 när det aktiva fönstret är Qt Designer. När Qt Designer är aktiverat, skickas Ctrl+F4 till Qt Designer istället, varje gång Ctrl+W trycks ner. Ctrl+W fortsätter förstås att fungera som vanligt i andra program.\n\nNu måste vi ange tre saker: En ny snabbtangent som utlöses med 'Ctrl+W', en ny inmatningsåtgärd för tangentbordet som skickar Ctrl+F4, och ett nytt villkor att det aktiva fönstret är Qt Designer.\nQt Designer verkar alltid ha titeln 'Qt Designer by Trolltech', så villkoret kontrollerar att det aktiva fönstret har den titeln.
@@ -703,7 +703,7 @@ Comment[km]=ដោយ​ចុច​ជំនួស(Alt)+បញ្ជា(Ctrl)+W
 Comment[nb]=Ved å taste Alt+Ctrl+W et DCOP-kall vil utføres som viser minicli. Man kan bruke hvilken som helst DCOP-kalle, akkurat som å kjøre kommandolinja i 'dcop'-verktøyet.
 Comment[nds]=Dat Drücken vun Strg+Alt+W föhrt en DCOP-Oproop ut, de den Dialoog "Befehl utföhren" opröppt. Du kannst all DCOP-Oprööp bruken, jüst as mit dat Konsool-Programm "dcop".
 Comment[nl]=Door Alt+Ctrl+W in te drukken zal er een DCOP-aanroep uitgevoerd worden dat venster "Commando uitvoeren" laat zien. U kunt iedere andere DCOP-aanroep gebruiken, net zoals met de commandoregelvariant 'dcop'.
-Comment[pl]=Naciśnięcie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazującego mini linię poleceń. Można użyć dowolnego wywołania DCOP, tak jak za potqmocą programu 'dcop' w konsoli.
+Comment[pl]=Naciśnięcie Alt+Ctrl+W spowoduje wykonanie polecenia DCOP pokazującego mini linię poleceń. Można użyć dowolnego wywołania DCOP, tak jak za pomocą programu 'dcop' w konsoli.
 Comment[pt]=Ao carregar em Alt+Ctrl+W, será efectuada uma chamada DCOP que irá mostrar a mini-linha de comandos. Poderá usar qualquer tipo de chamada de DCOP, como se usasse a ferramenta 'dcop' da linha de comandos.
 Comment[pt_BR]=Ao pressionar Alt+Ctrl+W uma chamada DCOP será executada que irá mostrar o diálogo 'Executar Comando...'. Você pode usar qualquer chamada do DCOP, como quando usa a ferramenta 'dcop' na linha de comando.
 Comment[ro]=Apăsând Alt+Ctrl+W va iniția un apel DCOP care va arăta minicli-urile. Puteți folosi orice tip de apel DCOP, ca și cum am folosi utilitarul 'dcop'.
@@ -1037,7 +1037,7 @@ Key=Alt+Ctrl+B
 Type=SHORTCUT
 
 [Data_1_7]
-Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down  - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures tqshapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class tqcontains 'konqueror').
+Comment=Ok, Konqi in KDE3.1 has tabs, and now you can also have gestures. No need to use other browsers >;).\n\nJust press the middle mouse button and start drawing one of the gestures, and after you're finished, release the mouse button. If you only need to paste the selection, it still works, simply only click the middle mouse button. (You can change the mouse button to use in the global settings).\n\nRight now, there are these gestures available:\nmove right and back left - Forward (ALt+Right)\nmove left and back right - Back (Alt+Left)\nmove up and back down  - Up (Alt+Up)\ncircle anticlockwise - Reload (F5)\n (As soon as I find out which ones are in Opera or Mozilla, I'll add more and make sure they are the same. Or if you do it yourself, feel free to help me and send me your khotkeysrc.)\n\nThe gestures shapes (some of the dialogs are from KGesture, thanks to Mike Pilone) can be simply entered by performing them in the configuration dialog. You can also look at your numeric pad to help you, gestures are recognized like a 3x3 grid of fields, numbered 1 to 9.\n\nNote that you must perform exactly the gesture to trigger the action. Because of this, it's possible to enter more gestures for the action. You should try to avoid complicated gestures where you change the direction of mouse moving more than once (i.e. do e.g. 45654 or 74123 as they are simple to perform but e.g. 1236987 may be already quite difficult).\n\nThe condition for all gestures are defined in this group. All these gestures are active only if the active window is Konqueror (class contains 'konqueror').
 Comment[bg]=Konqi в KDE3.1 има подпрозорци, а сега вече има и жестове. Няма нужда от други браузъри >;).\n\nПросто натиснете средният бутон на мишката и започнете да правите жестове, а след като свършите просто пуснете мишката. Ако само трябва да извършите операцията "поставяне", пак ще работи - просто натиснете средния бутон.
 Comment[ca]=Bé, el Konqi en el KDE3.1 tenia pestanyes, i ara podeu tenir gestos de ratolí., No hi ha necessitat d'usar altres navegadors >;).\n\nNomés premeu el botó central del ratolí i comenceu a dibuixar un dels gestos, un cop hageu acabat, allibereu el botó. Si només us cal enganxar la selecció, encara funciona; simplement feu un clic amb el botó central del ratolí (podeu canviar el botó del ratolí a usar a l'arranjament global).\n\nPer ara, hi ha disponibles aquests gestos:\nmoviment a la dreta i retorn a l'esquerra - endavant (Alt+Dreta)\nmoviment a l'esquerra i retorn a la dreta - enrere (Alt+Esquerra)\nmoviment amunt i retorn avall - amunt (Alt+Amunt)\ncercle antihorari - actualitzar (F5)\n (Tant aviat com trobi quins hi ha a l'Opera o al Mozilla, n'afegiré més i asseguraré que són els mateixos. O si voleu fer-ho vós mateix, preneu-vos la llibertat d'ajudar-me i envieu-me el vostre khotkeysrc.) \n\nLes formes dels gestos (alguns dels diàlegs són del KGesture, gràcies a Mike Pilone) es poden introduir simplement executant-los en el diàleg de configuració. També podeu mirar el teclat numèric per ajudar-vos, els gestos es poden assimilar a una graella de 3x3 camps, numerats d'1 a 9.\n\nTingueu en compte que heu d'executar exactament el gest per activar l'acció. Degut a això, és possible introduir més gestos per l'acció. Hauríeu d'intentar evitar gestos complicats quan canvieu la direcció del ratolí més d'una vegada (p.ex. fer 45654 o 74123 és més senzill que fer 1236987, que és força més difícil).\n\nLes condicions de tots els gestos es defineixen en aquest grup. Tots aquests gestos són actius només si la finestra activa és el Konqueror (la classe conté 'konqueror').
 Comment[da]=Ja, Konqueror i KDE3.1 har faneblade, og nu kan du også få gester. Ingen grund til at bruge andre browsere.\n\nTryk blot på musens midterste knap og begynde at tegne en gestus. Slip museknappen når du er færdig. Hvis du kun behøver at indsætte markeringen, fungerer dette også. Klik blot kun med musens midterste knap. (Du kan ændre den museknap som bruges i de generelle indstillinger.)\n\nFor øjeblikket findes følgende gester tilgængelige:\nFlyt til højre og tilbage til venstre - Fremad (Alt+Højrepil)\nFlyt til venstre og tilbage til højre - Tilbage (Alt+Vensterepil)\nFlyt opad og tilbage nedad - Op (Alt+Opadpil)\nCirkel mod uret - Opdatér (F5)\n(Så snart jeg finder ud af hvilke som findes i Opera og Mozilla, vil jeg tilføje flere, og sørge for at de er ligesådan. Eller hvis du gør det selv, så hjælp mig gerne og send mig din khotkeysrc.)\n\nGesternes form kan helt enkelt indtastes ved at udføre dem i indstillingsdialogen (nogle af dialogruterne kommer fra Kgesture, takket være  Mike Pilone). Du kan også kigge på det numeriske tastatur for hjælp. Gester genkendes som et 3x3 gitter af felter, nummererede fra 1 til 9.\n\nBemærk at du skal udføre gesterne nøjagtigt for at handlingen skal udløses. På grund af dette er det muligt at indtaste flere gester for en handling. Du bør forsøge at undgå komplicerede gester hvor musens retning ændres mere end en gang (dvs. brug for eksempel 45654 eller 74123 efter som de er enkle at udføre, mens for eksempel 1236987 kan allerede være ganske svær).\n\nBetingelsen for alle gester defineres i denne gruppe. Alle gester er kun aktive hvis det aktive vindue er Konqueror (klassen indeholder 'konqueror').
diff --git a/khotkeys/data/printscreen.khotkeys b/khotkeys/data/printscreen.khotkeys
index 38e22f0dc..66af14462 100644
--- a/khotkeys/data/printscreen.khotkeys
+++ b/khotkeys/data/printscreen.khotkeys
@@ -2,7 +2,7 @@
 DataCount=1
 
 [Data_1]
-Comment=This group tqcontains actions that are set up by default.
+Comment=This group contains actions that are set up by default.
 Comment[bg]=Тази група съдържа действия, които са зададени по подразбирани.
 Comment[ca]=Aquest grup conté accions que s'han establert per omissió.
 Comment[csb]=Na grëpa zamëkô dzejania jaczé są ùstôwióné domëslno.
diff --git a/khotkeys/kcontrol/action_list_widget.cpp b/khotkeys/kcontrol/action_list_widget.cpp
index 80d9d2031..95aa7db89 100644
--- a/khotkeys/kcontrol/action_list_widget.cpp
+++ b/khotkeys/kcontrol/action_list_widget.cpp
@@ -222,7 +222,7 @@ void Action_list_widget::edit_listview_item( Action_list_item* item_P )
         {
         item_P->set_action( new_action );
         item_P->widthChanged( 0 );
-        actions_listview->tqrepaintItem( item_P );
+        actions_listview->repaintItem( item_P );
         }
     delete dlg;
     }
diff --git a/khotkeys/kcontrol/actions_listview_widget.cpp b/khotkeys/kcontrol/actions_listview_widget.cpp
index 093b7c7ca..5048289df 100644
--- a/khotkeys/kcontrol/actions_listview_widget.cpp
+++ b/khotkeys/kcontrol/actions_listview_widget.cpp
@@ -49,7 +49,7 @@ Actions_listview_widget::Actions_listview_widget( TQWidget* parent_P, const char
 void Actions_listview_widget::action_name_changed( const TQString& )
     {
     current_action()->widthChanged( 0 );
-    actions_listview->tqrepaintItem( current_action());
+    actions_listview->repaintItem( current_action());
     }
 
 void Actions_listview_widget::set_action_data( Action_data_base* data_P, bool recent_action_P )
diff --git a/khotkeys/kcontrol/condition_list_widget.cpp b/khotkeys/kcontrol/condition_list_widget.cpp
index 5c7574a80..86ff8f47c 100644
--- a/khotkeys/kcontrol/condition_list_widget.cpp
+++ b/khotkeys/kcontrol/condition_list_widget.cpp
@@ -328,7 +328,7 @@ void Condition_list_widget::edit_listview_item( Condition_list_item* item_P )
             conditions.insert( pos, new_condition );
             }
         item_P->widthChanged( 0 );
-        conditions_listview->tqrepaintItem( item_P );
+        conditions_listview->repaintItem( item_P );
         }
 #ifdef KHOTKEYS_DEBUG
     kdDebug( 1217 ) << "Condition_list_widget::edit_listview_item():" << endl;
diff --git a/khotkeys/kcontrol/gesturedrawer.cpp b/khotkeys/kcontrol/gesturedrawer.cpp
index d0d144382..817eeab89 100644
--- a/khotkeys/kcontrol/gesturedrawer.cpp
+++ b/khotkeys/kcontrol/gesturedrawer.cpp
@@ -20,7 +20,7 @@ namespace KHotKeys
 GestureDrawer::GestureDrawer(TQWidget *parent, const char *name)
   : TQFrame(parent, name), _data(TQString::null)
     {
-    setBackgroundColor( tqcolorGroup().base());
+    setBackgroundColor( colorGroup().base());
     setFrameStyle(TQFrame::Panel | TQFrame::Sunken);
     setMinimumSize(30, 30);
     }
@@ -33,14 +33,14 @@ void GestureDrawer::setData(const TQString &data)
     {
     _data = data;
 
-    tqrepaint();
+    repaint();
     }
 
 void GestureDrawer::paintEvent(TQPaintEvent *ev)
     {
   // Iterate through the data points and draw a line to each of them
-    TQ_UINT32 startCell = 0;
-    TQ_UINT32 endCell = 0;
+    Q_UINT32 startCell = 0;
+    Q_UINT32 endCell = 0;
     TQPoint startPoint;
     TQPoint endPoint;
 
@@ -51,7 +51,7 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev)
         startCell = TQString(_data[0]).toUInt();
         }
 
-    for (TQ_UINT32 index = 1; index < _data.length(); ++index)
+    for (Q_UINT32 index = 1; index < _data.length(); ++index)
         {
         endCell = TQString(_data[index]).toUInt();
 
@@ -77,14 +77,14 @@ void GestureDrawer::paintEvent(TQPaintEvent *ev)
     TQFrame::paintEvent(ev);
     }
 
-TQPoint GestureDrawer::lookupCellCoords(TQ_UINT32 cell)
+TQPoint GestureDrawer::lookupCellCoords(Q_UINT32 cell)
     {
   // First divide the widget into thirds, horizontally and vertically
-    TQ_UINT32 w = width();
-    TQ_UINT32 h = height();
+    Q_UINT32 w = width();
+    Q_UINT32 h = height();
 
-    TQ_UINT32 wThird = w / 3;
-    TQ_UINT32 hThird = h / 3;
+    Q_UINT32 wThird = w / 3;
+    Q_UINT32 hThird = h / 3;
 
     switch(cell)
         {
diff --git a/khotkeys/kcontrol/gesturedrawer.h b/khotkeys/kcontrol/gesturedrawer.h
index 236c65ae3..50fe5db67 100644
--- a/khotkeys/kcontrol/gesturedrawer.h
+++ b/khotkeys/kcontrol/gesturedrawer.h
@@ -31,13 +31,13 @@ class GestureDrawer : public QFrame
 
         void setData(const TQString &data);
 
-        virtual TQSize tqsizeHint() const { return TQSize(30, 30); }
+        virtual TQSize sizeHint() const { return TQSize(30, 30); }
 
     protected:
         void paintEvent(TQPaintEvent *ev);
 
     private:
-        TQPoint lookupCellCoords(TQ_UINT32 cell);
+        TQPoint lookupCellCoords(Q_UINT32 cell);
         void drawArrowHead(TQPoint &start, TQPoint &end,
                            TQPainter &p);
 
diff --git a/khotkeys/kcontrol/gesturerecorder.cpp b/khotkeys/kcontrol/gesturerecorder.cpp
index df5cf8940..58a177910 100644
--- a/khotkeys/kcontrol/gesturerecorder.cpp
+++ b/khotkeys/kcontrol/gesturerecorder.cpp
@@ -20,7 +20,7 @@ namespace KHotKeys
 GestureRecorder::GestureRecorder(TQWidget *parent, const char *name)
   : TQFrame(parent, name), _mouseButtonDown(false)
     {
-    setBackgroundColor( tqcolorGroup().base());
+    setBackgroundColor( colorGroup().base());
     setFrameStyle(TQFrame::Sunken | TQFrame::Panel);
     setLineWidth(2);
     setMidLineWidth(0);
diff --git a/khotkeys/kcontrol/gesturerecordpage.cpp b/khotkeys/kcontrol/gesturerecordpage.cpp
index ef59a4a99..af2fb8cdc 100644
--- a/khotkeys/kcontrol/gesturerecordpage.cpp
+++ b/khotkeys/kcontrol/gesturerecordpage.cpp
@@ -43,7 +43,7 @@ GestureRecordPage::GestureRecordPage(const TQString &gesture,
                    "button below.\n\nDraw here:");
 
     TQLabel *label = new TQLabel(message, this, "label");
-    label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+    label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
                         TQLabel::AlignVCenter);
 
     _recorder = new GestureRecorder(this, "recorder");
diff --git a/khotkeys/kcontrol/gesturerecordpage.h b/khotkeys/kcontrol/gesturerecordpage.h
index 36e0350ae..99242c518 100644
--- a/khotkeys/kcontrol/gesturerecordpage.h
+++ b/khotkeys/kcontrol/gesturerecordpage.h
@@ -53,7 +53,7 @@ class GestureRecordPage : public QVBox
 
         TQString _gest;
 
-        TQ_UINT32 _tryCount;
+        Q_UINT32 _tryCount;
     };
 
 } // namespace KHotKeys
diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp
index 264bfd032..5d540d4c9 100644
--- a/khotkeys/kcontrol/kcmkhotkeys.cpp
+++ b/khotkeys/kcontrol/kcmkhotkeys.cpp
@@ -272,14 +272,14 @@ void Module::set_gestures_exclude( Windowdef_list* windows )
 
 void Module::import()
     {
-    TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", tqtopLevelWidget(),
+    TQString file = KFileDialog::getOpenFileName( TQString::null, "*.khotkeys", topLevelWidget(),
         i18n( "Select File with Actions to Be Imported" ));
     if( file.isEmpty())
         return;
     KSimpleConfig cfg( file, true );
     if( !settings.import( cfg, true ))
         {
-        KMessageBox::error( tqtopLevelWidget(),
+        KMessageBox::error( topLevelWidget(),
             i18n( "Import of the specified file failed. Most probably the file is not a valid "
                 "file with actions." ));
         return;
diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop
index 3b433608e..f5781da2b 100644
--- a/khotkeys/kcontrol/khotkeys.desktop
+++ b/khotkeys/kcontrol/khotkeys.desktop
@@ -153,7 +153,7 @@ Keywords[cs]=Klávesy,Globální klávesové zkratky,Schéma kláves,Klávesové
 Keywords[csb]=klawisze,globalné klawiszowé skrodzënë,schemë skrodzënów,gestë,mësz
 Keywords[cy]=Bysyll,Bysellau,Rhwymiadau bysell eang,Ystumiau,Ystumiau llygoden
 Keywords[da]=Taster,Globale tastebindinger,Tastebindinger,Gester,Muse-gester
-Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturtqlayout,Gesten,Mausgesten
+Keywords[de]=Tasten,Tastenzuordnung,Tastenkürzel,Kurzbefehle,Tastenschema,Tastaturlayout,Gesten,Mausgesten
 Keywords[el]=Πλήκτρα,Καθολικοί συνδυασμοί πλήκτρων,Συνδυασμοί πλήκτρων,Gestures,Mouse gestures
 Keywords[eo]=klavoj,malloka,signifoj,asocioj,kombinoj,klavkombinoj,muzo
 Keywords[es]=Teclas,Asociaciones de teclas globales,Asociaciones de teclas,Gestos,Gestos del ratón
diff --git a/khotkeys/kcontrol/main_buttons_widget.cpp b/khotkeys/kcontrol/main_buttons_widget.cpp
index ec0671e40..3532cc13f 100644
--- a/khotkeys/kcontrol/main_buttons_widget.cpp
+++ b/khotkeys/kcontrol/main_buttons_widget.cpp
@@ -38,7 +38,7 @@ Main_buttons_widget::Main_buttons_widget( TQWidget* parent_P, const char* name_P
         module, TQT_SLOT( changed()));
     connect( delete_action_button, TQT_SIGNAL( clicked()),
         module, TQT_SLOT( changed()));
-    setMaximumHeight( tqsizeHint().height()); // it gets too high and I have no idea why
+    setMaximumHeight( sizeHint().height()); // it gets too high and I have no idea why
     }
 
 void Main_buttons_widget::enable_delete( bool enable_P )
diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp
index 203a32edf..199f59750 100644
--- a/khotkeys/kcontrol/menuedit.cpp
+++ b/khotkeys/kcontrol/menuedit.cpp
@@ -279,7 +279,7 @@ TQString khotkeys_change_menu_entry_shortcut( const TQString& entry_P,
         }
     else
         {
-        // erase the trigger, i.e. tqreplace with a copy with no trigger and no parent yet
+        // erase the trigger, i.e. replace with a copy with no trigger and no parent yet
         Menuentry_shortcut_action_data* entry_tmp = new Menuentry_shortcut_action_data( NULL,
             entry->name(), entry->comment(), entry->enabled( false ));
         entry_tmp->set_action( new Menuentry_action( entry_tmp, entry_P ));
diff --git a/khotkeys/kcontrol/tab_widget.cpp b/khotkeys/kcontrol/tab_widget.cpp
index 7f8aa1396..243543519 100644
--- a/khotkeys/kcontrol/tab_widget.cpp
+++ b/khotkeys/kcontrol/tab_widget.cpp
@@ -434,7 +434,7 @@ const char* const Tab_widget::tab_labels[ Tab_widget::TAB_END ] = {
 
 void Tab_widget::show_pages( const Pages_set& pages_P )
     {
-    hide(); // this seems to be necessary, otherwise it's not tqrepainter properly
+    hide(); // this seems to be necessary, otherwise it's not repainter properly
     for( tab_pos_t i = TAB_FIRST;
          i < TAB_END;
          ++i )
diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp
index 12cd12452..2533b58a0 100644
--- a/khotkeys/kcontrol/triggers_tab.cpp
+++ b/khotkeys/kcontrol/triggers_tab.cpp
@@ -241,8 +241,8 @@ void Shortcut_trigger_widget::clear_data()
 
 void Shortcut_trigger_widget::capturedShortcut( const KShortcut& s_P )
     {
-    if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, tqtopLevelWidget())
-        || KKeyChooser::checkStandardShortcutsConflict( s_P, true, tqtopLevelWidget()))
+    if( KKeyChooser::checkGlobalShortcutsConflict( s_P, true, topLevelWidget())
+        || KKeyChooser::checkStandardShortcutsConflict( s_P, true, topLevelWidget()))
         return;
     // KHotKeys::Module::changed()
     module->changed();
diff --git a/khotkeys/kcontrol/ui/action_group_tab_ui.ui b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
index 398827bbd..ad4bcceaf 100644
--- a/khotkeys/kcontrol/ui/action_group_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/action_group_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Action_group_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -48,7 +48,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -101,7 +101,7 @@
 <slots>
     <slot access="protected" specifier="pure virtual">action_group_name_changed( const QString&amp; )</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/action_list_widget_ui.ui b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
index a56ca10a4..696b5106a 100644
--- a/khotkeys/kcontrol/ui/action_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/action_list_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Action_list_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -166,6 +166,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
index d5646acba..7c0a88a6f 100644
--- a/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/actions_listview_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Actions_listview_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -78,6 +78,6 @@
     <include location="global" impldecl="in implementation">kdialog.h</include>
     <include location="global" impldecl="in implementation">config.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/command_url_widget_ui.ui b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
index c88e7247e..266dd90d9 100644
--- a/khotkeys/kcontrol/ui/command_url_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/command_url_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Command_url_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -24,7 +24,7 @@
         </property>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -56,8 +56,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
index c5ca0f0e7..a64ef33c1 100644
--- a/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/condition_list_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Condition_list_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -165,6 +165,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/dcop_widget_ui.ui b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
index d4a55cdee..ed6e90337 100644
--- a/khotkeys/kcontrol/ui/dcop_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/dcop_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Dcop_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -48,7 +48,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -81,7 +81,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -147,7 +147,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -178,7 +178,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -203,7 +203,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -228,7 +228,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -268,6 +268,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
index d7db19733..60dc34237 100644
--- a/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_settings_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>General_settings_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,7 +26,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -67,7 +67,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -86,7 +86,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
@@ -109,8 +109,8 @@
 <slots>
     <slot access="protected" specifier="pure virtual">import_clicked()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/general_tab_ui.ui b/khotkeys/kcontrol/ui/general_tab_ui.ui
index f386b30d6..93f3a6a2c 100644
--- a/khotkeys/kcontrol/ui/general_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/general_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>General_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -105,7 +105,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -140,8 +140,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
index 8a4dc33f4..29f8f88d5 100644
--- a/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gesture_triggers_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Gesture_triggers_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>30</height>
@@ -77,7 +77,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -121,7 +121,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>100</height>
@@ -138,7 +138,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -163,7 +163,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -182,7 +182,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>30</height>
@@ -213,7 +213,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -238,7 +238,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -257,7 +257,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>100</height>
@@ -274,7 +274,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -299,7 +299,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -318,7 +318,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>30</height>
@@ -349,7 +349,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -374,7 +374,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -393,7 +393,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>100</width>
                             <height>100</height>
@@ -410,7 +410,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -435,7 +435,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>30</width>
                             <height>0</height>
@@ -454,7 +454,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>30</height>
@@ -514,6 +514,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
index 6798d5d6e..3bee7daf0 100644
--- a/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/gestures_settings_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Gestures_settings_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -26,7 +26,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -52,7 +52,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -116,7 +116,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -152,8 +152,8 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>knuminput.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/info_tab_ui.ui b/khotkeys/kcontrol/ui/info_tab_ui.ui
index f8c4fa6a7..9f82ccdcc 100644
--- a/khotkeys/kcontrol/ui/info_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/info_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Info_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -33,7 +33,7 @@
                 <string>&lt;p&gt;This module allows configuring input actions, like mouse gestures, keyboard shortcuts for performing commands, launching applications or DCOP calls, and similar.&lt;/p&gt;
 &lt;p&gt;&lt;b&gt;NOTE: &lt;/b&gt;If you are not an experienced user, you should be careful with modifying the actions, and should limit your changes mainly to enabling/disabling actions, and changing triggers.&lt;/p&gt;</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -47,7 +47,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -59,6 +59,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
index 4f82823b0..f3947dd54 100644
--- a/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/keyboard_input_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Keyboard_input_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -185,8 +185,8 @@
 <slots>
     <slot access="protected" specifier="pure virtual">modify_pressed()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>ktextedit.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
index c88fb04b9..a46ee0a0f 100644
--- a/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/main_buttons_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Main_buttons_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -81,6 +81,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
index 2c97b461d..ae6c613f3 100644
--- a/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/menuentry_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Menuentry_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -72,7 +72,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -95,6 +95,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/triggers_tab_ui.ui b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
index ae4450be8..13ac0530b 100644
--- a/khotkeys/kcontrol/ui/triggers_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/triggers_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Triggers_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -166,6 +166,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
index 4be6d001f..007610fca 100644
--- a/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_input_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Form1</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -28,7 +28,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>150</width>
                     <height>0</height>
@@ -95,7 +95,7 @@
     <slot access="protected" specifier="pure virtual">slotPlayPressed()</slot>
     <slot access="protected" specifier="pure virtual">slotStopPressed()</slot>
 </slots>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
index a9fa76b94..2c254dcc8 100644
--- a/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
+++ b/khotkeys/kcontrol/ui/voice_settings_tab_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Voice_settings_tab_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -23,13 +23,13 @@
             <property name="text">
                 <string>In order to trigger a spoken action, you have to press the key (or combination of keys) configured below, speak the command and then press the same key again once you have finished speaking.</string>
             </property>
-            <property name="tqalignment">
+            <property name="alignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>241</width>
                             <height>21</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>90</height>
@@ -100,7 +100,7 @@ make sure &lt;i&gt;Full duplex&lt;/i&gt; is checked in your &lt;i&gt;Sound Syste
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kkeybutton.h</includehint>
 </includehints>
diff --git a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
index c49cced98..58d15e3cf 100644
--- a/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/window_trigger_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Window_trigger_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -126,6 +126,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
index 12a802be8..5e9007e9e 100644
--- a/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_list_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Windowdef_list_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -40,7 +40,7 @@
         </widget>
         <widget class="QLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -165,6 +165,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
index bc67b8efb..01d54da98 100644
--- a/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
+++ b/khotkeys/kcontrol/ui/windowdef_simple_widget_ui.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>Windowdef_simple_widget_ui</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -48,7 +48,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -226,7 +226,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -315,7 +315,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -346,7 +346,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -371,7 +371,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
@@ -390,7 +390,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>0</width>
                     <height>20</height>
@@ -488,6 +488,6 @@
 <includes>
     <include location="global" impldecl="in implementation">kdialog.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="6" margin="11"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 </UI>
diff --git a/khotkeys/kcontrol/voicerecordpage.cpp b/khotkeys/kcontrol/voicerecordpage.cpp
index fa103e6b1..fec07e22f 100644
--- a/khotkeys/kcontrol/voicerecordpage.cpp
+++ b/khotkeys/kcontrol/voicerecordpage.cpp
@@ -31,7 +31,7 @@ VoiceRecordPage::VoiceRecordPage( const TQString &voiceid_P, TQWidget *parent, c
 	  _message = i18n("Enter a code for the sound (e.g. the word you are saying) and record the same word twice.");
 
     _label = new TQLabel(_message, this, "label");
-    _label->tqsetAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
+    _label->setAlignment(TQLabel::AlignLeft | TQLabel::WordBreak |
                         TQLabel::AlignVCenter);
 	
 	_lineEdit = new KLineEdit( this );
diff --git a/khotkeys/kcontrol/windowdef_list_widget.cpp b/khotkeys/kcontrol/windowdef_list_widget.cpp
index cad3437ec..471aab743 100644
--- a/khotkeys/kcontrol/windowdef_list_widget.cpp
+++ b/khotkeys/kcontrol/windowdef_list_widget.cpp
@@ -192,7 +192,7 @@ void Windowdef_list_widget::edit_listview_item( Windowdef_list_item* item_P )
         {
         item_P->set_window( new_window );
         item_P->widthChanged( 0 ); // SELI tohle i u dalsich listview?
-        windows_listview->tqrepaintItem( item_P );
+        windows_listview->repaintItem( item_P );
         }
     delete dlg;
     }
diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp
index f58c7e308..e37ef395f 100644
--- a/khotkeys/shared/actions.cpp
+++ b/khotkeys/shared/actions.cpp
@@ -391,7 +391,7 @@ void Keyboard_input_action::execute()
 TQString Keyboard_input_action::description() const
     {
     TQString tmp = input();
-    tmp.tqreplace( '\n', ' ' );
+    tmp.replace( '\n', ' ' );
     tmp.truncate( 30 );
     return i18n( "Keyboard input : " ) + tmp;
     }
diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp
index 28560e03d..60b1d93b4 100644
--- a/khotkeys/shared/gestures.cpp
+++ b/khotkeys/shared/gestures.cpp
@@ -105,7 +105,7 @@ void Gesture::active_window_changed( WId )
 
 void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
     {
-    if( handlers.tqcontains( receiver_P ))
+    if( handlers.contains( receiver_P ))
         return;
     handlers[ receiver_P ] = true;
     connect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
@@ -116,7 +116,7 @@ void Gesture::register_handler( TQObject* receiver_P, const char* slot_P )
 
 void Gesture::unregister_handler( TQObject* receiver_P, const char* slot_P )
     {
-    if( !handlers.tqcontains( receiver_P ))
+    if( !handlers.contains( receiver_P ))
         return;
     handlers.remove( receiver_P );
     disconnect( this, TQT_SIGNAL( handle_gesture( const TQString&, WId )),
@@ -197,7 +197,7 @@ void Gesture::grab_mouse( bool grab_P )
     if( grab_P )
         {
         KXErrorHandler handler;
-        static int tqmask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask,
+        static int mask[] = { 0, Button1MotionMask, Button2MotionMask, Button3MotionMask,
             Button4MotionMask, Button5MotionMask, ButtonMotionMask, ButtonMotionMask,
             ButtonMotionMask, ButtonMotionMask };
 #define XCapL KKeyNative::modXLock()
@@ -216,7 +216,7 @@ void Gesture::grab_mouse( bool grab_P )
              i < 8;
              ++i )
             XGrabButton( qt_xdisplay(), button, mods[ i ], qt_xrootwin(), False,
-                ButtonPressMask | ButtonReleaseMask | tqmask[ button ], GrabModeAsync, GrabModeAsync,
+                ButtonPressMask | ButtonReleaseMask | mask[ button ], GrabModeAsync, GrabModeAsync,
                 None, None );
         bool err = handler.error( true );
         kdDebug( 1217 ) << "Gesture grab:" << err << endl;
diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp
index 90e789282..f9bfec6d3 100644
--- a/khotkeys/shared/input.cpp
+++ b/khotkeys/shared/input.cpp
@@ -55,7 +55,7 @@ Kbd::~Kbd()
     
 void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
     {
-    Receiver_data& rcv = tqreceivers[ receiver_P ];
+    Receiver_data& rcv = receivers[ receiver_P ];
     rcv.shortcuts.append( shortcut_P );
     if( rcv.active )
         grab_shortcut( shortcut_P );
@@ -63,17 +63,17 @@ void Kbd::insert_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
 
 void Kbd::remove_item( const KShortcut& shortcut_P, Kbd_receiver* receiver_P )
     {
-    Receiver_data& rcv = tqreceivers[ receiver_P ];
+    Receiver_data& rcv = receivers[ receiver_P ];
     rcv.shortcuts.remove( shortcut_P );
     if( rcv.active )
         ungrab_shortcut( shortcut_P );
     if( rcv.shortcuts.count() == 0 )
-        tqreceivers.remove( receiver_P );
+        receivers.remove( receiver_P );
     }
     
 void Kbd::activate_receiver( Kbd_receiver* receiver_P )
     {
-    Receiver_data& rcv = tqreceivers[ receiver_P ];
+    Receiver_data& rcv = receivers[ receiver_P ];
     if( rcv.active )
         return;
     rcv.active = true;
@@ -85,7 +85,7 @@ void Kbd::activate_receiver( Kbd_receiver* receiver_P )
 
 void Kbd::deactivate_receiver( Kbd_receiver* receiver_P )
     {
-    Receiver_data& rcv = tqreceivers[ receiver_P ];
+    Receiver_data& rcv = receivers[ receiver_P ];
     if( !rcv.active )
         return;
     rcv.active = false;
@@ -97,7 +97,7 @@ void Kbd::deactivate_receiver( Kbd_receiver* receiver_P )
 
 void Kbd::grab_shortcut( const KShortcut& shortcut_P )
     {
-    if( grabs.tqcontains( shortcut_P ))
+    if( grabs.contains( shortcut_P ))
         ++grabs[ shortcut_P ];
     else
         {
@@ -117,7 +117,7 @@ void Kbd::grab_shortcut( const KShortcut& shortcut_P )
     
 void Kbd::ungrab_shortcut( const KShortcut& shortcut_P )
     {
-    if( !grabs.tqcontains( shortcut_P ))
+    if( !grabs.contains( shortcut_P ))
         return;
     if( --grabs[ shortcut_P ] == 0 )
         {
@@ -142,12 +142,12 @@ void Kbd::key_slot( TQString key_P )
     {
     kdDebug( 1217 ) << "Key pressed:" << key_P << endl;
     KShortcut shortcut( key_P );
-    if( !grabs.tqcontains( shortcut ))
+    if( !grabs.contains( shortcut ))
         return;
-    for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = tqreceivers.begin();
-         it != tqreceivers.end();
+    for( TQMap< Kbd_receiver*, Receiver_data >::ConstIterator it = receivers.begin();
+         it != receivers.end();
          ++it )
-        if( ( *it ).shortcuts.tqcontains( shortcut ) && ( *it ).active
+        if( ( *it ).shortcuts.contains( shortcut ) && ( *it ).active
             && it.key()->handle_key( shortcut ))
             return;
     }
diff --git a/khotkeys/shared/input.h b/khotkeys/shared/input.h
index eff131c44..22df89284 100644
--- a/khotkeys/shared/input.h
+++ b/khotkeys/shared/input.h
@@ -58,7 +58,7 @@ class Kbd
             TQValueList< KShortcut > shortcuts;
             bool active;
             };
-        TQMap< Kbd_receiver*, Receiver_data > tqreceivers;
+        TQMap< Kbd_receiver*, Receiver_data > receivers;
         TQMap< KShortcut, int > grabs;
         KGlobalAccel* kga;
     };
diff --git a/khotkeys/shared/settings.cpp b/khotkeys/shared/settings.cpp
index a6434be06..fdab2be56 100644
--- a/khotkeys/shared/settings.cpp
+++ b/khotkeys/shared/settings.cpp
@@ -63,7 +63,7 @@ bool Settings::read_settings( KConfig& cfg_P, bool include_disabled_P, ImportTyp
         TQString import_id = cfg_P.readEntry( "ImportId" );
         if( !import_id.isEmpty())
             {
-            if( already_imported.tqcontains( import_id ))
+            if( already_imported.contains( import_id ))
                 {
                 if( import_P == ImportSilent
                     || KMessageBox::warningContinueCancel( NULL,
diff --git a/khotkeys/shared/sound.cpp b/khotkeys/shared/sound.cpp
index ddaec44b8..c90eb2e02 100644
--- a/khotkeys/shared/sound.cpp
+++ b/khotkeys/shared/sound.cpp
@@ -50,7 +50,7 @@ Sound::~Sound()
 void Sound::load(const TQString& filename)
 {
 	kdDebug() << k_funcinfo << filename << endl;
-	data=TQMemArray<TQ_INT32>();
+	data=TQMemArray<Q_INT32>();
 	TQFile file(filename);
 	if(!file.open(IO_ReadOnly))
 	{
@@ -59,20 +59,20 @@ void Sound::load(const TQString& filename)
 	}
 	TQDataStream stream(&file);
 	stream.setByteOrder( TQDataStream::LittleEndian );
-	TQ_INT32 magic;
+	Q_INT32 magic;
 	
 	MAGIC("RIFF");
-	READ_FROM_STREAM(TQ_UINT32,ChunkSize);
+	READ_FROM_STREAM(Q_UINT32,ChunkSize);
 	MAGIC("WAVE");
 	MAGIC("fmt ");
-	READ_FROM_STREAM(TQ_UINT32,ChunkSize2);
-	READ_FROM_STREAM(TQ_INT16,AudioFormat);
-	READ_FROM_STREAM(TQ_UINT16,NumberOfChannels);
-	READ_FROM_STREAM(TQ_UINT32,SampleRate);
+	READ_FROM_STREAM(Q_UINT32,ChunkSize2);
+	READ_FROM_STREAM(Q_INT16,AudioFormat);
+	READ_FROM_STREAM(Q_UINT16,NumberOfChannels);
+	READ_FROM_STREAM(Q_UINT32,SampleRate);
 	_fs=SampleRate;
-	READ_FROM_STREAM(TQ_UINT32,ByteRate);
-	READ_FROM_STREAM(TQ_UINT16,BlockAlign);
-	READ_FROM_STREAM(TQ_UINT16,BitsPerSample);
+	READ_FROM_STREAM(Q_UINT32,ByteRate);
+	READ_FROM_STREAM(Q_UINT16,BlockAlign);
+	READ_FROM_STREAM(Q_UINT16,BitsPerSample);
 	MAGIC("data");
 	READ_FROM_STREAM(TQByteArray,SoundData);
 	NumberOfChannels=1; //Wav i play are broken
@@ -90,7 +90,7 @@ void Sound::load(const TQString& filename)
 	max=0;
 	for(unsigned long int f=0;f<NumberOfSamples;f++)
 	{
-		TQ_INT32 nb=0;
+		Q_INT32 nb=0;
 		for(uint k=0;k<BytePS;k++)
 		{
 			nb |= (SoundData[f*BytePS+k]&0x000000FF) << (k*8);
@@ -110,7 +110,7 @@ void Sound::load(const TQString& filename)
 
 }
 
-#define SMAGIC(CH) { stream << ( TQ_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; }
+#define SMAGIC(CH) { stream << ( Q_INT32) ( (CH)[0] | (CH)[1]<<8 | (CH)[2]<< 16 | (CH)[3] << 24 ) ; }
 
 void Sound::save(const TQString& filename) const
 {
@@ -129,35 +129,35 @@ void Sound::save(const TQString& filename) const
 	
 	for(unsigned long int f=0;f<data.size();f++)
 	{
-		TQ_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max)  ) );
+		Q_UINT16 val= (signed short int) ( (data.at(f) * ((double)(1<<13)/(signed)max)  ) );
 		SoundData[ 2*f ]=   val & 0x00FF;
 		SoundData[2*f+1]=  (val & 0xFF00) >> 8;
 		
 //		kdDebug( 1217 ) << k_funcinfo << data.at(f) << " / " << max << " = " << val << "  |  " <<   SoundData[ 2*f ] << " "<< SoundData[ 2*f+1 ] <<  endl;
 	}
 
-	TQ_UINT16 NumberOfChannels=2;
-	TQ_UINT32 SampleRate=_fs;
+	Q_UINT16 NumberOfChannels=2;
+	Q_UINT32 SampleRate=_fs;
 
 	SMAGIC("RIFF");
-	//READ_FROM_STREAM(TQ_UINT32,ChunkSize);
-	stream <<  (TQ_UINT32)(36+ SoundData.size());
+	//READ_FROM_STREAM(Q_UINT32,ChunkSize);
+	stream <<  (Q_UINT32)(36+ SoundData.size());
 	SMAGIC("WAVE");
 	SMAGIC("fmt ");
-	//READ_FROM_STREAM(TQ_UINT32,ChunkSize2);
-	stream <<  (TQ_UINT32)(16);
-	//READ_FROM_STREAM(TQ_INT16,AudioFormat);
-	stream <<  (TQ_INT16)(1);
-	//READ_FROM_STREAM(TQ_UINT16,NumberOfChannels);
-	stream <<  (TQ_UINT16)(NumberOfChannels);
-	//READ_FROM_STREAM(TQ_UINT32,SampleRate);
-	stream <<  (TQ_UINT32)(SampleRate);
-	//READ_FROM_STREAM(TQ_UINT32,ByteRate);
-	stream <<  (TQ_UINT32)(NumberOfChannels*SampleRate*16/8);
-	//READ_FROM_STREAM(TQ_UINT16,BlockAlign);
-	stream <<  (TQ_UINT16)(16/8 *NumberOfChannels);
-	//READ_FROM_STREAM(TQ_UINT16,BitsPerSample);
-	stream <<  (TQ_UINT16)(16);
+	//READ_FROM_STREAM(Q_UINT32,ChunkSize2);
+	stream <<  (Q_UINT32)(16);
+	//READ_FROM_STREAM(Q_INT16,AudioFormat);
+	stream <<  (Q_INT16)(1);
+	//READ_FROM_STREAM(Q_UINT16,NumberOfChannels);
+	stream <<  (Q_UINT16)(NumberOfChannels);
+	//READ_FROM_STREAM(Q_UINT32,SampleRate);
+	stream <<  (Q_UINT32)(SampleRate);
+	//READ_FROM_STREAM(Q_UINT32,ByteRate);
+	stream <<  (Q_UINT32)(NumberOfChannels*SampleRate*16/8);
+	//READ_FROM_STREAM(Q_UINT16,BlockAlign);
+	stream <<  (Q_UINT16)(16/8 *NumberOfChannels);
+	//READ_FROM_STREAM(Q_UINT16,BitsPerSample);
+	stream <<  (Q_UINT16)(16);
 	SMAGIC("data");
 	//READ_FROM_STREAM(TQByteArray,SoundData);
 	stream <<  SoundData;
diff --git a/khotkeys/shared/sound.h b/khotkeys/shared/sound.h
index 6453563de..2c2d97d93 100644
--- a/khotkeys/shared/sound.h
+++ b/khotkeys/shared/sound.h
@@ -50,8 +50,8 @@ public:
 		return _fs;
 	}
 
-	TQMemArray<TQ_INT32> data;
-	TQ_UINT32 max;
+	TQMemArray<Q_INT32> data;
+	Q_UINT32 max;
 	uint _fs;
 };
 
diff --git a/khotkeys/shared/triggers.cpp b/khotkeys/shared/triggers.cpp
index b3042f00f..7cac2b98c 100644
--- a/khotkeys/shared/triggers.cpp
+++ b/khotkeys/shared/triggers.cpp
@@ -225,7 +225,7 @@ void Window_trigger::window_added( WId window_P )
 
 void Window_trigger::window_removed( WId window_P )
     {
-    if( existing_windows.tqcontains( window_P ))
+    if( existing_windows.contains( window_P ))
         {
         bool matches = existing_windows[ window_P ];
         kdDebug( 1217 ) << "Window_trigger::w_removed() : " << matches << endl;
@@ -244,7 +244,7 @@ void Window_trigger::window_removed( WId window_P )
 void Window_trigger::active_window_changed( WId window_P )
     {
     bool was_match = false;
-    if( existing_windows.tqcontains( last_active_window ))
+    if( existing_windows.contains( last_active_window ))
         was_match = existing_windows[ last_active_window ];
     if( active && was_match && ( window_actions & WINDOW_DEACTIVATES ))
         {
@@ -253,7 +253,7 @@ void Window_trigger::active_window_changed( WId window_P )
         }
 /*    bool matches = windows()->match( Window_data( window_P ));
     existing_windows[ window_P ] = matches;*/
-    bool matches = existing_windows.tqcontains( window_P )
+    bool matches = existing_windows.contains( window_P )
         ? existing_windows[ window_P ] : false;
     if( active && matches && ( window_actions & WINDOW_ACTIVATES ))
         {
@@ -272,7 +272,7 @@ void Window_trigger::window_changed( WId window_P, unsigned int dirty_P )
         return;
     kdDebug( 1217 ) << "Window_trigger::w_changed()" << endl;
     bool was_match = false;
-    if( existing_windows.tqcontains( window_P ))
+    if( existing_windows.contains( window_P ))
         was_match = existing_windows[ window_P ];
     bool matches = windows()->match( Window_data( window_P ));
     existing_windows[ window_P ] = matches;
diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp
index e19f66eec..a6515fecf 100644
--- a/khotkeys/shared/voices.cpp
+++ b/khotkeys/shared/voices.cpp
@@ -79,7 +79,7 @@ void Voice::enable( bool enabled_P )
 
 void Voice::register_handler( Voice_trigger *trigger_P )
     {
-    if( !_references.tqcontains( trigger_P ))
+    if( !_references.contains( trigger_P ))
         _references.append(trigger_P);
     }
 
@@ -179,7 +179,7 @@ void Voice::slot_sound_recorded(const Sound &sound_P)
 	
 	//kdDebug(1217) << k_funcinfo << keyNative.key().toString() << endl; 
 
-	if(_shortcut.tqcontains(keyNative))
+	if(_shortcut.contains(keyNative))
 	{
 		if(pEvent->type == XKeyPress  && !_recording )
 		{
diff --git a/khotkeys/shared/voicesignature.cpp b/khotkeys/shared/voicesignature.cpp
index 4f4266b7e..773f28731 100644
--- a/khotkeys/shared/voicesignature.cpp
+++ b/khotkeys/shared/voicesignature.cpp
@@ -154,14 +154,14 @@ static TQMemArray<double> fft(const Sound& sound, unsigned int start, unsigned i
 	{
 		samples[f]=sound.at(start2+rev_carry)* hamming(rev_carry, size);
 //		KDEBUG(rev_carry);
-		int tqmask = size>>1;  // N / 2
+		int mask = size>>1;  // N / 2
         // add 1 backwards
-		while (rev_carry >= tqmask)
+		while (rev_carry >= mask)
 		{
-			rev_carry -= tqmask; // turn off this bit
-			tqmask >>= 1;
+			rev_carry -= mask; // turn off this bit
+			mask >>= 1;
 		}
-		rev_carry += tqmask;
+		rev_carry += mask;
 	}
 	samples[size-1]=sound.at(start2+size-1)*hamming(size-1, size);
 
diff --git a/khotkeys/shared/windows.cpp b/khotkeys/shared/windows.cpp
index a1394b731..b8e86f694 100644
--- a/khotkeys/shared/windows.cpp
+++ b/khotkeys/shared/windows.cpp
@@ -339,7 +339,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString&
         case NOT_IMPORTANT :
           return true;
         case CONTAINS :
-          return str1_P.tqcontains( str2_P ) > 0;
+          return str1_P.contains( str2_P ) > 0;
         case IS :
           return str1_P == str2_P;
         case REGEXP :
@@ -348,7 +348,7 @@ bool Windowdef_simple::is_substr_match( const TQString& str1_P, const TQString&
           return rg.search( str1_P ) >= 0;
             }
         case CONTAINS_NOT :
-          return str1_P.tqcontains( str2_P ) == 0;
+          return str1_P.contains( str2_P ) == 0;
         case IS_NOT :
           return str1_P != str2_P;
         case REGEXP_NOT :
diff --git a/kicker/ChangeLog b/kicker/ChangeLog
index dedec11d6..6ba662f7e 100644
--- a/kicker/ChangeLog
+++ b/kicker/ChangeLog
@@ -1,13 +1,13 @@
 2004-06-10   Dan Bullok <dan.kde@bullok.com>
-	* Fixed Bug 42278 - Strange tqlayout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels.
+	* Fixed Bug 42278 - Strange layout with Kicker and custom size. Now buttons are never wider (for horizontal) or taller (for vertical) than 58 pixels.
 	* Added some symbolic constants for some kicker values (max size, min size, default custom size), that were previously hard-coded in a few places.
 
 2002-01-03  John Firebaugh <jfirebaugh@kde.org>
 	* Use mouse polling instead of enter/leave events to trigger auto-unhiding. Much more reliable and will allow us to do things like only unhide at the corners or when the mouse hits the edge of the screen with a certain velocity. Also fixes #27660.
-	* New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen tqlayout of the panels.
+	* New class core/panelmanager.cpp. For now, just has code for auto-hide, but will soon handle the screen layout of the panels.
 
 2002-01-02  John Firebaugh <jfirebaugh@kde.org>
-	* Now you can set the tqalignment by dnd.
+	* Now you can set the alignment by dnd.
 2002-01-01  John Firebaugh <jfirebaugh@kde.org>
 	* Make the action taken for each mouse button on a task container configurable.
 	* Add Task::lower() method.
diff --git a/kicker/TODO b/kicker/TODO
index 2ef26260f..cf43fa146 100644
--- a/kicker/TODO
+++ b/kicker/TODO
@@ -7,7 +7,7 @@ Issues Of Import
 Layout management
     autoexpending panels on the same side of the screen need to stop expanding
         at the point they run into each other.
-    make autohiding panels respect tqlayout tqgeometry too? e.g. don't overlap
+    make autohiding panels respect layout geometry too? e.g. don't overlap
     autounhiding panels should not obscure other panels
 ContainerArea completness
     doesn't autoscroll when moving a container
@@ -45,7 +45,7 @@ libkicker
             poor name =/
             shouldn't be so menu-centric either
 Optimize!
-    hiding: it seems there are more tqgeometry calls made than really needed
+    hiding: it seems there are more geometry calls made than really needed
     get rid of movies (which nobody really uses) in PanelButton
 Code clean ups
     remove pseudo transparency in favour of composite
@@ -89,7 +89,7 @@ Unnasigned
 ++++  Floating panels
 ****  When a panel is set to "floating" the following entries are added
       to the [General] config group:
-      FloatingPosition <-- tqgeometry.topLeft();
+      FloatingPosition <-- geometry.topLeft();
       FloatingOrientation <-- horizontal or vertical
 
 ++++  Drag and drop enhancements
@@ -100,8 +100,8 @@ Unnasigned
       There are many DnD reports on bugs.kde.org which can provide
       further inspiration.
 
-++++  Systray icon tqlayout
-****  The systray applet does a very basic homebrew tqlayout of the icons
+++++  Systray icon layout
+****  The systray applet does a very basic homebrew layout of the icons
       that currently has several flawed assumptions that break when used
       with certain applications. These assumptions include that all icons
       in a given row will be approximately the same width and that things
diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index db20618b1..4a20312ec 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>AnalogWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -97,7 +97,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>tqlayout9</cstring>
+                        <cstring>layout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -149,7 +149,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -241,7 +241,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>310</width>
                             <height>20</height>
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>50</height>
@@ -334,8 +334,8 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kfontrequester.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index 096b0301b..26f1ae4c0 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -134,7 +134,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     connect(fuzzyPage->kcfg_FuzzyShowDayOfWeek, TQT_SIGNAL(toggled(bool)),
             TQT_SLOT(dateToggled()));
 
-    addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings"));
+    addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
 }
 
 void KConfigDialogSingle::updateSettings()
@@ -253,7 +253,7 @@ void PlainClock::updateClock()
 void PlainClock::loadSettings()
 {
     setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame);
-    tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine);
+    setAlignment(AlignVCenter | AlignHCenter | SingleLine);
 
     setFont(_prefs->plainFont());
 }
@@ -837,8 +837,8 @@ void FuzzyClock::drawContents(TQPainter *p)
               // so we only have to update phStart
           }
           if (phStart >= 0)
-              newTimeStr.tqreplace(phStart, phLength, hourNames[realHour]);
-          newTimeStr.tqreplace(0, 1, TQString(newTimeStr.at(0).upper()));
+              newTimeStr.replace(phStart, phLength, hourNames[realHour]);
+          newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
       }
     } else if (_prefs->fuzzyness() == 3) {
         newTimeStr = dayTime[_time.hour() / 3];
@@ -902,8 +902,8 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
       _disableCalendar(false),
       _clock(0),
       _timer(new TQTimer(this, "ClockApplet::_timer")),
-      m_tqlayoutTimer(new TQTimer(this, "m_tqlayoutTimer")),
-      m_tqlayoutDelay(0),
+      m_layoutTimer(new TQTimer(this, "m_layoutTimer")),
+      m_layoutDelay(0),
       m_followBackgroundSetting(true),
       m_dateFollowBackgroundSetting(true),
       TZoffset(0),
@@ -919,16 +919,16 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     setBackgroundOrigin(AncestorOrigin);
 
     _dayOfWeek = new TQLabel(this);
-    _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
+    _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
     _dayOfWeek->setBackgroundOrigin(AncestorOrigin);
     _dayOfWeek->installEventFilter(this);   // catch mouse clicks
 
     _date = new TQLabel(this);
-    _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
+    _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
     _date->setBackgroundOrigin(AncestorOrigin);
     _date->installEventFilter(this);   // catch mouse clicks
 
-    connect(m_tqlayoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
+    connect(m_layoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(fixupLayout()));
     connect(_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdate()));
     connect(kapp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(globalPaletteChange()));
 
@@ -991,18 +991,18 @@ int ClockApplet::widthForHeight(int h) const
     bool mustShowDate = showDate || (zone->zoneIndex() != 0);
     if (mustShowDate)
     {
-        _date->tqsetAlignment(AlignVCenter | AlignHCenter);
+        _date->setAlignment(AlignVCenter | AlignHCenter);
         if (!dateToSide)
         {
-            shareDateHeight = _date->tqsizeHint().height();
+            shareDateHeight = _date->sizeHint().height();
         }
     }
     if (showDayOfWeek)
     {
-        _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter);
+        _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
         if (!dateToSide)
         {
-            shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height();
+            shareDayOfWeekHeight = _dayOfWeek->sizeHint().height();
         }
     }
 
@@ -1018,8 +1018,8 @@ int ClockApplet::widthForHeight(int h) const
     }
     else
     {
-        int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0;
-        int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0;
+        int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0;
+        int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0;
 
         if (dateToSide)
         {
@@ -1075,13 +1075,13 @@ int ClockApplet::widthForHeight(int h) const
             _clock->widget()->move(0, 0);
             if (showDayOfWeek)
             {
-                _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height());
+                _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height());
                 _dayOfWeek->move(0, _clock->widget()->height());
             }
 
             if (mustShowDate)
             {
-                _date->setFixedSize(w, _date->tqsizeHint().height());
+                _date->setFixedSize(w, _date->sizeHint().height());
                 _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight);
             }
         }
@@ -1105,16 +1105,16 @@ int ClockApplet::heightForWidth(int w) const
     // add 4 pixels in height for each of date+dayOfWeek, if visible
     if (showDayOfWeek)
     {
-        if (_dayOfWeek->tqminimumSizeHint().width() > w)
+        if (_dayOfWeek->minimumSizeHint().width() > w)
         {
-            _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak);
+            _dayOfWeek->setAlignment(AlignVCenter | WordBreak);
         }
         else
         {
-            _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
+            _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
         }
 
-        _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height());
+        _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height());
         _dayOfWeek->move(0, clockHeight);
 
         clockHeight += _dayOfWeek->height();
@@ -1127,10 +1127,10 @@ int ClockApplet::heightForWidth(int w) const
         // display on panel that is too narrow and then they made it wider
         const_cast<ClockApplet*>(this)->updateDateLabel(false);
 
-        if (_date->tqminimumSizeHint().width() > w)
+        if (_date->minimumSizeHint().width() > w)
         {
             TQString dateStr = _date->text();
-            // if we're too wide to fit, tqreplace the first non-digit from the end with a space
+            // if we're too wide to fit, replace the first non-digit from the end with a space
             int p = dateStr.findRev(TQRegExp("[^0-9]"));
             if (p > 0)
             {
@@ -1138,13 +1138,13 @@ int ClockApplet::heightForWidth(int w) const
             }
         }
 
-        if (_date->tqminimumSizeHint().width() > w)
+        if (_date->minimumSizeHint().width() > w)
         {
-            _date->tqsetAlignment(AlignVCenter | WordBreak);
+            _date->setAlignment(AlignVCenter | WordBreak);
         }
         else
         {
-            _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
+            _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
         }
         _date->setFixedSize(w, _date->heightForWidth(w));
         _date->move(0, clockHeight);
@@ -1283,7 +1283,7 @@ void ClockApplet::reconfigure()
     _clock->widget()->installEventFilter(this);   // catch mouse clicks
     _clock->widget()->show();
 
-    _clock->forceUpdate(); /* force tqrepaint */
+    _clock->forceUpdate(); /* force repaint */
 
     if (showDayOfWeek)
     {
@@ -1552,7 +1552,7 @@ void ClockApplet::aboutToShowContextMenu()
     menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
 
     KLocale *loc = KGlobal::locale();
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
     dt = dt.addSecs(TZoffset);
 
     KPopupMenu *copyMenu = new KPopupMenu( menu );
@@ -1579,7 +1579,7 @@ void ClockApplet::aboutToShowContextMenu()
             }
             else
             {
-                zoneMenu->insertItem(i18n(zone->zone(i).utf8()).tqreplace("_", " "), 500 + i);
+                zoneMenu->insertItem(i18n(zone->zone(i).utf8()).replace("_", " "), 500 + i);
             }
         }
         zoneMenu->setItemChecked(500 + zone->zoneIndex(),true);
@@ -1626,7 +1626,7 @@ TQTime ClockApplet::clockGetTime()
 
 TQDate ClockApplet::clockGetDate()
 {
-    return TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date();
+    return TQDateTime::currentDateTime().addSecs(TZoffset).date();
 }
 
 void ClockApplet::showZone(int z)
@@ -1634,7 +1634,7 @@ void ClockApplet::showZone(int z)
     zone->setZone(z);
     TZoffset = zone->calc_TZ_offset( zone->zone() );
     updateDateLabel();
-    _clock->forceUpdate(); /* force tqrepaint */
+    _clock->forceUpdate(); /* force repaint */
 }
 
 void ClockApplet::nextZone()
@@ -1710,7 +1710,7 @@ void ClockApplet::updateDateLabel(bool reLayout)
     if (zone->zoneIndex() != 0)
     {
         TQString zone_s = i18n(zone->zone().utf8());
-        _date->setText(zone_s.mid(zone_s.find('/') + 1).tqreplace("_", " "));
+        _date->setText(zone_s.mid(zone_s.find('/') + 1).replace("_", " "));
         _date->setShown(true);
     }
     else
@@ -1727,8 +1727,8 @@ void ClockApplet::updateDateLabel(bool reLayout)
             _calendar->setDate(_lastDate);
         }
 
-        m_tqlayoutTimer->stop();
-        m_tqlayoutTimer->start(m_tqlayoutDelay, true);
+        m_layoutTimer->stop();
+        m_layoutTimer->start(m_layoutDelay, true);
     }
 }
 
@@ -1748,7 +1748,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
         if (!activeZone.isEmpty())
         {
             activeZone = i18n(activeZone.utf8());
-            data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).tqreplace("_", " "));
+            data.subtext.append("<br>").append(activeZone.mid(activeZone.find('/') + 1).replace("_", " "));
         }
     }
     else
@@ -1771,7 +1771,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
 
             if (activeIndex == i)
             {
-                data.message = m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ");
+                data.message = m_zone.mid(m_zone.find('/') + 1).replace("_", " ");
                 data.message += "  " + _time + "<br>" + _date;
             }
             else
@@ -1782,7 +1782,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
                 }
                 else
                 {
-                    data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).tqreplace("_", " ") + "</b>";
+                    data.subtext += "<b>" + m_zone.mid(m_zone.find('/') + 1).replace("_", " ") + "</b>";
                 }
                 data.subtext += " " + _time + ", " + _date + "<br>";
             }
@@ -1798,7 +1798,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
 
 void ClockApplet::fixupLayout()
 {
-    m_tqlayoutDelay = 0;
+    m_layoutDelay = 0;
 
     // ensure we have the right widget line up in horizontal mode
     // when we are showing date beside the clock
@@ -1851,7 +1851,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
          (m_clock->type() == Prefs::EnumType::Analog) )
     {
         // show full time (incl. hour) as tooltip for Fuzzy clock
-        tipText = KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset));
+        tipText = KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset));
     }
     else
     {
@@ -1863,7 +1863,7 @@ void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
         tipText += "\n" + i18n("Showing time for %1").arg(i18n(m_clock->timezones()->zone().utf8()), false);
     }
 
-    tip(m_clock->tqgeometry(), tipText);
+    tip(m_clock->geometry(), tipText);
 }
 
 //************************************************************
diff --git a/kicker/applets/clock/clock.h b/kicker/applets/clock/clock.h
index 753598e18..144fb50c6 100644
--- a/kicker/applets/clock/clock.h
+++ b/kicker/applets/clock/clock.h
@@ -326,8 +326,8 @@ class ClockApplet : public KPanelApplet, public KickerTip::Client, public DCOPOb
         TQLabel *_dayOfWeek;
         TQDate _lastDate;
         TQTimer *_timer;
-        TQTimer *m_tqlayoutTimer;
-        int m_tqlayoutDelay;
+        TQTimer *m_layoutTimer;
+        int m_layoutDelay;
         bool m_followBackgroundSetting;
         bool m_dateFollowBackgroundSetting;
         int TZoffset;
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index f63b783c1..256bca99b 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>DigitalWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -83,7 +83,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -116,7 +116,7 @@
                 </widget>
                 <widget class="QLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout14</cstring>
+                        <cstring>layout14</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -193,7 +193,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>110</width>
                                     <height>20</height>
@@ -226,7 +226,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -295,8 +295,8 @@
 <slots>
     <slot>kcfg_DigitalLCDStyle_stateChanged( int )</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index e67bf0c7a..04e910340 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>FuzzyWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -79,7 +79,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -126,7 +126,7 @@
                 </widget>
                 <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>tqlayout11</cstring>
+                        <cstring>layout11</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -153,7 +153,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
@@ -277,8 +277,8 @@
     <include location="local" impldecl="in implementation">kdialog.h</include>
     <include location="local" impldecl="in implementation">kfontrequester.h</include>
 </includes>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 02baca77b..215aa5433 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>SettingsWidget</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -36,7 +36,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -102,7 +102,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -188,7 +188,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
@@ -284,7 +284,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>230</width>
                                                     <height>20</height>
@@ -306,7 +306,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="tqsizeHint">
+                                            <property name="sizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
@@ -371,7 +371,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>343</width>
                                         <height>20</height>
@@ -380,7 +380,7 @@
                             </spacer>
                             <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                                 <property name="name">
-                                    <cstring>tqlayout2</cstring>
+                                    <cstring>layout2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -421,7 +421,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>100</height>
@@ -501,8 +501,8 @@
 <slots>
     <slot>configureType()</slot>
 </slots>
-<tqlayoutdefaults spacing="3" margin="6"/>
-<tqlayoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
+<layoutdefaults spacing="3" margin="6"/>
+<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
 <includehints>
     <includehint>kcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
diff --git a/kicker/applets/clock/zone.cpp b/kicker/applets/clock/zone.cpp
index b44ba0de5..320d84b4c 100644
--- a/kicker/applets/clock/zone.cpp
+++ b/kicker/applets/clock/zone.cpp
@@ -105,7 +105,7 @@ void Zone::readZoneList(KListView *listView )
     if (!comment.isEmpty())
       comment = i18n(comment.utf8());
 
-    const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).tqreplace("_", " "));
+    const TQStringList KontCity = TQStringList::split("/", i18n(tzName.utf8()).replace("_", " "));
     TQListViewItem* Kontinent = KontinentMap[KontCity[0]];
     if (!Kontinent) {
 	KontinentMap[KontCity[0]] = new TQListViewItem(listView, KontCity[0]);
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index 7a2ded479..bfb1bc4e6 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>ConfigDlgBase</cstring>
     </property>
-    <property name="tqgeometry">
+    <property name="geometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>332</width>
                             <height>20</height>
@@ -97,7 +97,7 @@
                 </property>
                 <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -130,7 +130,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>140</width>
                                     <height>20</height>
@@ -144,7 +144,7 @@
                             <property name="text">
                                 <string>Short Term</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -155,7 +155,7 @@
                             <property name="text">
                                 <string>Long Term</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -184,7 +184,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -265,7 +265,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connect