Rename a number of old tq methods that are no longer tq specific

30 files changed, 179 insertions, 179 deletions

diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index ebf7d59..698fa1c 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -36,7 +36,7 @@
 
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <kled.h>
 
 extern "C"
@@ -68,7 +68,7 @@ SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Setting
  * Update the preview
  */
 void SettingsImp::updatePreview(){
-	int tqshape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
+	int shape = Shape_Circular->isChecked() ? Prefs::EnumShape::Circular : Prefs::EnumShape::Rectangular;
 	int look = KLed::Raised;
 	look = Look_Flat->isChecked() ? Prefs::EnumLook::Flat : look;
 	look = Look_Sunken->isChecked() ? Prefs::EnumLook::Sunken : look;
@@ -84,12 +84,12 @@ void SettingsImp::updatePreview(){
 	kLed5->setBackgroundColor(backgroundColor);
 	kLed6->setBackgroundColor(backgroundColor);
 
-	kLed1->setShape((KLed::Shape)tqshape);
-	kLed2->setShape((KLed::Shape)tqshape);
-	kLed3->setShape((KLed::Shape)tqshape);
-	kLed4->setShape((KLed::Shape)tqshape);
-	kLed5->setShape((KLed::Shape)tqshape);
-	kLed6->setShape((KLed::Shape)tqshape);
+	kLed1->setShape((KLed::Shape)shape);
+	kLed2->setShape((KLed::Shape)shape);
+	kLed3->setShape((KLed::Shape)shape);
+	kLed4->setShape((KLed::Shape)shape);
+	kLed5->setShape((KLed::Shape)shape);
+	kLed6->setShape((KLed::Shape)shape);
 
 	kLed1->setColor(color);
 	kLed2->setColor(color);
@@ -173,14 +173,14 @@ void KBinaryClock::resizeEvent( TQResizeEvent *e ) {
  * Load the settings for the clock.
  */
 void KBinaryClock::loadSettings(){
-	int tqshape = prefs->shape();
+	int shape = prefs->shape();
 	int look = prefs->look();
 	TQColor color = prefs->color();
 
 	int darkFactor = prefs->darkFactor();
 	TQColor backgroundColor = prefs->background();
 	bool modifyBackground = false;
-	if(backgroundColor != KApplication::tqpalette().active().background()){
+	if(backgroundColor != KApplication::palette().active().background()){
 		setPaletteBackgroundColor(backgroundColor);
 		modifyBackground = true;
 	}
@@ -197,7 +197,7 @@ void KBinaryClock::loadSettings(){
 	}
 	for(int i=0; i < 4; i++){
 		for(int j=0; j < ledWidth;j++){
-			ledMatrix[j][i]->setShape((KLed::Shape)tqshape);
+			ledMatrix[j][i]->setShape((KLed::Shape)shape);
 			ledMatrix[j][i]->setColor(color);
 			ledMatrix[j][i]->setLook((KLed::Look)look);
 			ledMatrix[j][i]->setDarkFactor(darkFactor);
@@ -290,7 +290,7 @@ void KBinaryClock::openContextMenu() {
 		menu->insertTitle( SmallIcon( "clock" ), i18n( "KBinaryClock" ) );
 
 		KLocale *loc = KGlobal::locale();
-		TQDateTime dt = TQDateTime::tqcurrentDateTime();
+		TQDateTime dt = TQDateTime::currentDateTime();
 
 		KPopupMenu *copyMenu = new KPopupMenu( menu );
 		copyMenu->insertItem(loc->formatDateTime(dt), 201);
@@ -329,8 +329,8 @@ void KBinaryClock::openContextMenu() {
 		proc << locate("exe", "tdesu");
 		proc << "--nonewdcop";
 		proc << TQString("%1 clock --lang %2")
-				.tqarg(locate("exe", "kcmshell"))
-				.tqarg(KGlobal::locale()->language());
+				.arg(locate("exe", "kcmshell"))
+				.arg(KGlobal::locale()->language());
 		proc.start(KProcess::DontCare);
 		break;
 	case 104:
@@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() {
 void KBinaryClock::slotCopyMenuActivated( int id ) {
 	TQPopupMenu *m = (TQPopupMenu *) sender();
 	TQString s = m->text(id);
-	TQApplication::tqclipboard()->setText(s);
+	TQApplication::clipboard()->setText(s);
 }
 
 void KBinaryClock::toggleCalendar()
@@ -361,15 +361,15 @@ void KBinaryClock::toggleCalendar()
 	if (_calendar || _disableCalendar){
 		return;
 	}
-	_calendar = new DatePicker(this, TQDateTime::tqcurrentDateTime().date());
+	_calendar = new DatePicker(this, TQDateTime::currentDateTime().date());
 	connect( _calendar, TQT_SIGNAL( destroyed() ), TQT_SLOT( slotCalendarDeleted() ));
 
 	// some extra spacing is included if aligned on a desktop edge
 	TQPoint c = mapToGlobal(TQPoint(0,0));
 
-	int w = _calendar->tqsizeHint().width() + 28;
+	int w = _calendar->sizeHint().width() + 28;
 															// Added 28 px. to size poperly as said in API
-	int h = _calendar->tqsizeHint().height();
+	int h = _calendar->sizeHint().height();
 
 	switch (position()) {
 	case KPanelApplet::pLeft:	c.setX(c.x()+width()+2);	break;
@@ -405,7 +405,7 @@ ClockAppletToolTip::ClockAppletToolTip( KBinaryClock *clock ) : TQToolTip( clock
 
 void ClockAppletToolTip::maybeTip( const TQPoint & /*point*/ )
 {
-	tip(m_clock->tqgeometry(), KGlobal::locale()->formatDate(TQDateTime::tqcurrentDateTime().date(), false));
+	tip(m_clock->geometry(), KGlobal::locale()->formatDate(TQDateTime::currentDateTime().date(), false));
 }
 
 #include "kbinaryclock.moc"
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
index 84f35c3..b5a5fb3 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg
+++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="Background" type="Color">
       <label>Background color</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="Show_Seconds" type="Bool">
       <label>Whether to show seconds</label>
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 321f913..59c5f6f 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>21</width>
                             <height>20</height>
@@ -110,7 +110,7 @@
                     <property name="text">
                         <string>Dark</string>
                     </property>
-                    <property name="tqalignment">
+                    <property name="alignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -169,7 +169,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -252,7 +252,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -287,7 +287,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="name">
                                         <cstring>kLed1</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -346,7 +346,7 @@
                                     <property name="name">
                                         <cstring>kLed2</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -357,7 +357,7 @@
                                     <property name="name">
                                         <cstring>kLed4</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -368,7 +368,7 @@
                                     <property name="name">
                                         <cstring>kLed3</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -382,7 +382,7 @@
                                     <property name="name">
                                         <cstring>kLed6</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -396,7 +396,7 @@
                                     <property name="name">
                                         <cstring>kLed5</cstring>
                                     </property>
-                                    <property name="tqminimumSize">
+                                    <property name="minimumSize">
                                         <size>
                                             <width>32</width>
                                             <height>32</height>
@@ -415,7 +415,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -434,7 +434,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>84</height>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index fbce8cf..5f36ea8 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -20,10 +20,10 @@ $Id$
 */
 
 #include <tqfile.h>
-#include <tqtextstream.h>
-#include <tqlayout.h>
+#include <textstream.h>
+#include <layout.h>
 #include <tqimage.h>
-#include <tqclipboard.h>
+#include <clipboard.h>
 #include <tqregexp.h>
 #include <tqbitmap.h>
 #include <tqpainter.h>
@@ -140,7 +140,7 @@ void KolourPicker::slotHistory()
 		TQPopupMenu *sub = copyPopup(*it, false);
 		subMenus.append(sub);
 		popup.insertItem(colorPixmap(*it),
-			TQString("%1, %2, %3").tqarg((*it).red()).tqarg((*it).green()).tqarg((*it).blue()),
+			TQString("%1, %2, %3").arg((*it).red()).arg((*it).green()).arg((*it).blue()),
 			sub);
 	}
 	popup.insertSeparator();
@@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
 // set both clipboard and selection
 void KolourPicker::setClipboard(const TQString& text)
 {
-	TQClipboard *clip = TQApplication::tqclipboard();
+	TQClipboard *clip = TQApplication::clipboard();
 	bool oldMode = clip->selectionModeEnabled();
 	clip->setSelectionMode(true);
 	clip->setText(text);
@@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons()
 		h = height();
 		if (h > 40)
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (h - 40)/3;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(2, 2*p+20, 20, 20);
 		}
 		else
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (h - 20)/2;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(24, p, 20, 20);
@@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons()
 		w = width();
 		if (w > 40)
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (w - 40)/3;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(2*p+20, 2, 20, 20);
 		}
 		else
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (w - 20)/2;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(p, 24, 20, 20);
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index f232377..4760982 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
     update();
 }
 
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqsizeHint();
+        return TQButton::sizeHint();
     else
         return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
 }
 
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqminimumSizeHint();
+        return TQButton::minimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
     _inside = false;
 }
 
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
 {
     return TQSize( 12, 12 );
 }
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/kolourpicker/simplebutton.h
+++ b/kicker-applets/kolourpicker/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
-        TQSize tqsizeHint() const;
-        TQSize tqminimumSizeHint() const;
+        TQSize sizeHint() const;
+        TQSize minimumSizeHint() const;
 
     protected:
         void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
     public:
         SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
-        TQSize tqsizeHint() const;
+        TQSize sizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc
index c694f5c..832faf3 100644
--- a/kicker-applets/ktimemon/confdlg.cc
+++ b/kicker-applets/ktimemon/confdlg.cc
@@ -14,7 +14,7 @@
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
 #include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqvgroupbox.h>
 #include <tqcheckbox.h>
@@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t)
   bl->addWidget(b);
   bl->addStretch();
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() );
 
   gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 );
 
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc
index 54d1edf..99ea20b 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cc
@@ -102,7 +102,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
     KMessageBox::error(timemon,
                        i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
                             "This file is required to determine current memory usage.\n"
-                            "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                            "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
     exit(1);
   }
 
@@ -112,7 +112,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
     KMessageBox::error(timemon,
                        i18n("Unable to open the file '%1'. The diagnostics are:\n%2.\n"
                             "This file is required to determine current system info. "
-                            "Maybe your proc filesystem is non-Linux standard?").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                            "Maybe your proc filesystem is non-Linux standard?").arg(MEMINFO_NAME).arg(strerror(errno)));
     exit(1);
   }
 
@@ -125,7 +125,7 @@ KSample::KSample(KTimeMon *t, bool a, unsigned p, unsigned s, unsigned c) :
                                      "The diagnostics are:\n%1.\n"
                                      "Are you really running Solaris? "
                                      "Please contact the maintainer at mueller@kde.org "
-                                     "who will try to figure out what went wrong.").tqarg(strerror(errno)));
+                                     "who will try to figure out what went wrong.").arg(strerror(errno)));
     exit(1);
   }
 #endif
@@ -210,7 +210,7 @@ void KSample::readSample()
     if ((l = read(memFD, buffer, sizeof(buffer) - 1)) < 0)
     {
         fatal(i18n("Unable to read the memory usage file '%1'.\n"
-                   "The diagnostics are: %2").tqarg(MEMINFO_NAME).tqarg(strerror(errno)));
+                   "The diagnostics are: %2").arg(MEMINFO_NAME).arg(strerror(errno)));
     }
     buffer[l] = '\0';
     l = 0;
@@ -223,7 +223,7 @@ void KSample::readSample()
                        "different file format than expected.\n"
                        "Maybe your version of the proc filesystem is "
                        "incompatible with supported versions. "
-		       "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").tqarg(MEMINFO_NAME));
+		       "Please contact the developer at http://bugs.kde.org/ who will try to sort this out.").arg(MEMINFO_NAME));
         l++;
     }
 
@@ -237,7 +237,7 @@ void KSample::readSample()
     lseek(statFD, 0, 0);
     if ((l = read(statFD, buffer, sizeof(buffer)-1)) < 0)
         fatal(i18n("Unable to read the system usage file '%1'.\n"
-                   "The diagnostics are: %2").tqarg(STAT_NAME).tqarg(strerror(errno)));
+                   "The diagnostics are: %2").arg(STAT_NAME).arg(strerror(errno)));
 
     buffer[l] = '\0';
 
@@ -271,7 +271,7 @@ void KSample::readSample()
 
     struct tbl_sysinfo sysinfo;
     if (table(TBL_SYSINFO, 0, &sysinfo, 1, sizeof(sysinfo)) != 1)
-        fatal(msg.tqarg("TBL_SYSINFO"));
+        fatal(msg.arg("TBL_SYSINFO"));
 
     sample.user = sysinfo.si_user;
     sample.nice = sysinfo.si_nice;
@@ -281,7 +281,7 @@ void KSample::readSample()
 
     struct tbl_vmstats vmstats;
     if (table(TBL_VMSTATS, 0, &vmstats, 1, sizeof(vmstats)) != 1)
-        fatal(msg.tqarg("TBL_VMSTATS"));
+        fatal(msg.arg("TBL_VMSTATS"));
 
     sample.mtotal = vmstats.free_count + vmstats.active_count +
         vmstats.inactive_count + vmstats.wire_count;
@@ -291,7 +291,7 @@ void KSample::readSample()
 
     struct tbl_swapinfo swapinfo;
     if (table(TBL_SWAPINFO, -1, &swapinfo, 1, sizeof(swapinfo)) != 1)
-        fatal(msg.tqarg("TBL_SWAPINFO"));
+        fatal(msg.arg("TBL_SWAPINFO"));
 
     sample.stotal = swapinfo.size;
     sample.sfree = swapinfo.free;
@@ -324,7 +324,7 @@ void KSample::readSample()
             kstat_read(kc, ksp, &cstat) == -1) // and read into buffer
             fatal(i18n("Unable to read the CPU statistics entry "
                        "from the 'kstat' library. The diagnostics are '%1'.\n"
-                       "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                       "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
         // fields are: idle user kernel iowait (no nice info?)
         sample.user += cstat.cpu_sysinfo.cpu[1] / sample.cpus;
@@ -338,7 +338,7 @@ void KSample::readSample()
         fatal(i18n("The number of CPUs appears to have changed at "
                    "very short notice, or the 'kstat' library returns "
                    "inconsistent results (%1 vs. %2 CPUs).\n"
-                   "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").tqarg(sample.cpus).tqarg(cpus));
+                   "Please contact the maintainer via http://bugs.kde.org/ who will try to sort this out.").arg(sample.cpus).arg(cpus));
 
     // availrmem = pages of core for user-proc ( == physmem - kernelmem)
     // freemem = no of free pages
@@ -350,7 +350,7 @@ void KSample::readSample()
         fatal(i18n("Unable to read the memory statistics entry "
                    "from the 'kstat' library. The diagnostics are '%1'\n"
                    "You might want to contact the maintainer at "
-                   "http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                   "http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
     int i;
     unsigned long physmem = 0, freemem = 0, availrmem = 0;
@@ -367,7 +367,7 @@ void KSample::readSample()
         fatal(i18n("There seems to be a problem with KTimeMon's handling "
                    "of the 'kstat' library: 0 bytes of physical memory determined!\n"
                    "Free memory is %1, available memory is %2.\n"
-                   "Please contact the maintainer at mueller@kde.org who will try to sort this out.").tqarg(freemem).tqarg(availrmem));
+                   "Please contact the maintainer at mueller@kde.org who will try to sort this out.").arg(freemem).arg(availrmem));
 
     sample.mtotal = physmem;
     sample.free = freemem;
@@ -378,7 +378,7 @@ void KSample::readSample()
     if ((swapentries = swapctl(SC_GETNSWP, 0)) == -1)
         fatal(i18n("Unable to determine the number of "
                    "swap spaces. The diagnostics are '%1'.\n"
-                   "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                   "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
     if (swapentries != 0) {
                                 // 2* to get some space for padding??
@@ -389,8 +389,8 @@ void KSample::readSample()
                        "trying to determine the swap usage.\n"
                        "Attempted to allocate %1 bytes of memory (2 * %2 + %3 * %4).\n"
                        "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.")
-                  .tqarg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
-                  .tqarg(sizeof(int)).tqarg(swapentries).tqarg(sizeof(struct swapent)));
+                  .arg(2 * sizeof(int) + swapentries * sizeof(struct swapent))
+                  .arg(sizeof(int)).arg(swapentries).arg(sizeof(struct swapent)));
 
         char path[1024];
         stbl->swt_n = swapentries;
@@ -399,7 +399,7 @@ void KSample::readSample()
         if ((swapentries = swapctl(SC_LIST, stbl)) == -1)
             fatal(i18n("Unable to determine the swap usage.\n"
                        "The diagnostics are '%1'.\n"
-                       "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(strerror(errno)));
+                       "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(strerror(errno)));
 
 
         if (!warned && swapentries != stbl->swt_n) {
@@ -407,7 +407,7 @@ void KSample::readSample()
             nonfatal(i18n("Information was requested for "
                           "%1 swap spaces, but only %2 swap entries were returned.\n"
                           "KTimeMon will attempt to continue.\n"
-                          "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").tqarg(stbl->swt_n).tqarg(swapentries));
+                          "Please contact the maintainer at http://bugs.kde.org/ who will try to sort this out.").arg(stbl->swt_n).arg(swapentries));
         }
 
         for (i = 0; i < swapentries; i++) {
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index 2c78031..991a2e9 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -111,7 +111,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     b = r / 3;            // bar width
     r -= b;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -125,7 +125,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     b = r / 2;
     r -= b;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -138,7 +138,7 @@ void KTimeMon::paintEvent(TQPaintEvent *)
     x += b;
     b = r;
 
-    if (bgColour != tqcolorGroup().background())
+    if (bgColour != colorGroup().background())
     {
         paintRect(x, 0, b, h, bgColour, &painter);
     }
@@ -171,11 +171,11 @@ void KTimeMon::maybeTip(const TQPoint& p)
     if ( idle < 0 )
         idle = 0;
     TQString str = i18n("cpu: %1% idle\nmem: %2 MB %3% free\nswap: %4 MB %5% free")
-                .tqarg(idle)
-                .tqarg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
-                .tqarg(100-s.used)
-                .tqarg(KGlobal::locale()->formatNumber(s.stotal, 0))
-                .tqarg(100-s.sused);
+                .arg(idle)
+                .arg(KGlobal::locale()->formatNumber(s.used/100.*s.mtotal, 0))
+                .arg(100-s.used)
+                .arg(KGlobal::locale()->formatNumber(s.stotal, 0))
+                .arg(100-s.sused);
 
     tip(rect(), str);
 }
@@ -192,7 +192,7 @@ KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
     niceColour("yellow"), iowaitColour("darkgreen"),
     usedColour("blue1"), buffersColour("yellow"),
     cachedColour("darkgreen"), mkernelColour("red1"),
-    swapColour("cyan3"), bgColour(tqcolorGroup().background())
+    swapColour("cyan3"), bgColour(colorGroup().background())
 {
     mouseAction[0] = NOTHING;
     mouseAction[1] = NOTHING;
@@ -337,7 +337,7 @@ void KTimeMon::writeConfiguration()
     conf->sync();
 }
 
-// Make the KSample object update its internal sample and tqrepaint the
+// Make the KSample object update its internal sample and repaint the
 // object.
 void KTimeMon::timeout()
 {
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 772afeb..37e0bd6 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -157,14 +157,14 @@ void MathApplet::resizeEvent(TQResizeEvent*)
 	    _input->reparent(this, TQPoint(0,0), true);
 	    _label->setGeometry(0,0, width(), _label->height());
 
-	    if(height() >= _input->tqsizeHint().height() + _label->height())
+	    if(height() >= _input->sizeHint().height() + _label->height())
 		{
-                    int inputVOffset = height() - _input->tqsizeHint().height() - 2;
-                    int labelHeight = _label->tqsizeHint().height();
+                    int inputVOffset = height() - _input->sizeHint().height() - 2;
+                    int labelHeight = _label->sizeHint().height();
 		    _label->setGeometry(0, inputVOffset - labelHeight,
                                         width(), labelHeight);
 		    _input->setGeometry(0, inputVOffset,
-					width(), _input->tqsizeHint().height());
+					width(), _input->sizeHint().height());
 		    _label->show();
 		}
 	    else
@@ -174,7 +174,7 @@ void MathApplet::resizeEvent(TQResizeEvent*)
                     // make it as high as the combobox naturally wants to be
                     // but no taller than the panel is!
                     // don't forget to center it vertically either.
-                    int newHeight = _input->tqsizeHint().height();
+                    int newHeight = _input->sizeHint().height();
                     if (newHeight > height())
                         newHeight = height();
 		    _input->setGeometry(0, (height() - newHeight) / 2,
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index e1dee3e..8a58064 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -656,41 +656,41 @@ int Parser::getfix(TQString name)
 int Parser::errmsg()
 {   switch(err)
 	{  case 1:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Syntax error").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Syntax error").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 2:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Missing parenthesis").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Missing parenthesis").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 3:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Function name unknown").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Function name unknown").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 4:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Void function variable").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Void function variable").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 5:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Too many functions").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Too many functions").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 6:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Token-memory overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Token-memory overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 7:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Stack overflow").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Stack overflow").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 
        case 8:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "Name of function not free").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "Name of function not free").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
 	   
        case 9:  KMessageBox::error(0, i18n("Parser error at position %1:\n"
-		                                   "recursive function not allowed").tqarg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
+		                                   "recursive function not allowed").arg(TQString::number(errpos)), i18n("Math Expression Evaluator"));
 		        break;
-       case 10:  KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).tqarg(TQString::number(errpos)),
+       case 10:  KMessageBox::error(0, i18n("Could not find a defined constant at position %1" ).arg(TQString::number(errpos)),
                                                    i18n("Math Expression Evaluator"));
      			break;
        case 11:  KMessageBox::error(0, i18n("Empty function"), i18n("Math Expression Evaluator"));
diff --git a/kicker-applets/mediacontrol/amarokInterface.cpp b/kicker-applets/mediacontrol/amarokInterface.cpp
index b77b5d2..e2265a7 100644
--- a/kicker-applets/mediacontrol/amarokInterface.cpp
+++ b/kicker-applets/mediacontrol/amarokInterface.cpp
@@ -146,7 +146,7 @@ void AmarokInterface::updateSlider ( )
       time = 0;
    }
    emit newSliderPosition(len,time);
-   emit playingStatusChanged(playingtqStatus());
+   emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -289,7 +289,7 @@ bool AmarokInterface::findRunningAmarok()
 }
 
 
-int AmarokInterface::playingtqStatus()
+int AmarokInterface::playingStatus()
 {
    TQByteArray data, replyData;
    TQCString replyType;
diff --git a/kicker-applets/mediacontrol/amarokInterface.h b/kicker-applets/mediacontrol/amarokInterface.h
index f863208..5e8c689 100644
--- a/kicker-applets/mediacontrol/amarokInterface.h
+++ b/kicker-applets/mediacontrol/amarokInterface.h
@@ -48,7 +48,7 @@ class AmarokInterface : public PlayerInterface
       virtual void dragEnterEvent(TQDragEnterEvent* event);
       virtual void dropEvent(TQDropEvent* event);
       virtual const TQString getTrackTitle() const;
-      virtual int playingtqStatus();
+      virtual int playingStatus();
 
    private slots:
       void myInit();
diff --git a/kicker-applets/mediacontrol/jukInterface.cpp b/kicker-applets/mediacontrol/jukInterface.cpp
index b055424..27ce45e 100644
--- a/kicker-applets/mediacontrol/jukInterface.cpp
+++ b/kicker-applets/mediacontrol/jukInterface.cpp
@@ -148,7 +148,7 @@ void JuKInterface::updateSlider ()
 		time = 0;
 	}
 	emit ( newSliderPosition(len,time) );
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -291,7 +291,7 @@ bool JuKInterface::findRunningJuK()
 	return false;
 }
 
-int JuKInterface::playingtqStatus()
+int JuKInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/jukInterface.h b/kicker-applets/mediacontrol/jukInterface.h
index fa74fba..51bd6de 100644
--- a/kicker-applets/mediacontrol/jukInterface.h
+++ b/kicker-applets/mediacontrol/jukInterface.h
@@ -49,7 +49,7 @@ class JuKInterface : public PlayerInterface
 		void dragEnterEvent(TQDragEnterEvent* event);
 		void dropEvent(TQDropEvent* event);
 		const TQString getTrackTitle() const;
-		int playingtqStatus();
+		int playingStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 67eb931..6621c53 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -126,7 +126,7 @@ void KsCDInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len,time);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 // Drag-n-Drop stuff =================================================================
@@ -256,7 +256,7 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("artist - trackname", "%1 - %2").tqarg(artist, title);
+				result = i18n("artist - trackname", "%1 - %2").arg(artist, title);
 			}
 		}
 	}
@@ -270,18 +270,18 @@ const TQString KsCDInterface::getTrackTitle() const
 			}
 			else
 			{
-				result = i18n("(album) - trackname", "(%1) - %2").tqarg(artist, title);
+				result = i18n("(album) - trackname", "(%1) - %2").arg(artist, title);
 			}
 		}
 		else // artist is non-empty
 		{
 			if(title.isEmpty())
 			{
-				result = i18n("artistname (albumname)", "%1 (%2)").tqarg(artist, album);
+				result = i18n("artistname (albumname)", "%1 (%2)").arg(artist, album);
 			}
 			else
 			{
-				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").tqarg(artist, album, title);
+				result = i18n("artistname (albumname) - trackname", "%1 (%2) - %3").arg(artist, album, title);
 			}
 		}
 	}
@@ -305,7 +305,7 @@ bool KsCDInterface::findRunningKsCD()
 	return false;
 }
 
-int KsCDInterface::playingtqStatus()
+int KsCDInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/kscdInterface.h b/kicker-applets/mediacontrol/kscdInterface.h
index 2d37e42..2448080 100644
--- a/kicker-applets/mediacontrol/kscdInterface.h
+++ b/kicker-applets/mediacontrol/kscdInterface.h
@@ -48,7 +48,7 @@ class KsCDInterface : public PlayerInterface
 		void dragEnterEvent(TQDragEnterEvent* event);
 		void dropEvent(TQDropEvent* event);
 		const TQString getTrackTitle() const;
-		int playingtqStatus();
+		int playingStatus();
 
 	private slots:
 		void myInit();
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index a2bf77b..95cf81c 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -226,10 +226,10 @@ void MediaControl::disableAll()
 
 void MediaControl::slotPlayingStatusChanged(int status)
 {
-	if (mLasttqStatus == status)
+	if (mLastStatus == status)
 		return;
 
-	mLasttqStatus = status;
+	mLastStatus = status;
 	TQString skindir = locate("data", "mediacontrol/"+_configFrontend->theme()+"/");
 
 	switch (status)
@@ -255,7 +255,7 @@ void MediaControl::slotIconChanged()
 	if(!_configFrontend->useCustomTheme())
 	{
 		prev_button->setIconSet(SmallIconSet("player_start"));
-		if (_player->playingtqStatus() == PlayerInterface::Playing)
+		if (_player->playingStatus() == PlayerInterface::Playing)
 			playpause_button->setIconSet(SmallIconSet("player_pause"));
 		else
 			playpause_button->setIconSet(SmallIconSet("player_play"));
@@ -350,7 +350,7 @@ void MediaControl::reparseConfig()
 
 	mLastLen = -1;
 	mLastTime = -1;
-	mLasttqStatus = -1;
+	mLastStatus = -1;
 
 	TQString playerString = _configFrontend->player();
 
@@ -413,7 +413,7 @@ void MediaControl::reparseConfig()
 		if (TQFile(skindir+"play.png").exists())
 		{
 			prev_button->setIconSet(SmallIconSet(locate("data",skindir+"prev.png")));
-			if (_player->playingtqStatus() == PlayerInterface::Playing)
+			if (_player->playingStatus() == PlayerInterface::Playing)
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"play.png")));
 			else
 				playpause_button->setIconSet(SmallIconSet(locate("data",skindir+"pause.png")));
@@ -424,7 +424,7 @@ void MediaControl::reparseConfig()
 		{
 			KNotifyClient::event(winId(), KNotifyClient::warning,
 				i18n("There was trouble loading theme %1. Please choose" \
-					" a different theme.").tqarg(skindir));
+					" a different theme.").arg(skindir));
 
 			// default to kde-icons, they have to be installed :)
 			slotIconChanged();
@@ -461,10 +461,10 @@ void MediaControl::reparseConfig()
 int MediaControl::widthForHeight(int height) const
 {
 //	kdDebug(90200) << "kicker height: " << height << endl;
-//	kdDebug(90200) << "slider needs: " << time_slider->tqminimumSizeHint().height() << endl;
+//	kdDebug(90200) << "slider needs: " << time_slider->minimumSizeHint().height() << endl;
 
 	// slider height + button height
-	if ( height >= (time_slider->tqminimumSizeHint().height()+MC_BUTTONSIZE) )
+	if ( height >= (time_slider->minimumSizeHint().height()+MC_BUTTONSIZE) )
 	{	// slider UNDER buttons
 		// (5 * button width + spaces between them);
 		return (4*MC_BUTTONSIZE+10);
@@ -483,7 +483,7 @@ int MediaControl::heightForWidth(int width) const
 //	kdDebug(90200) << "kicker width: " << width << endl;
 
 	// slider height + button height
-	if ( width >= (time_slider->tqminimumSizeHint().width()+MC_BUTTONSIZE) )
+	if ( width >= (time_slider->minimumSizeHint().width()+MC_BUTTONSIZE) )
 	{	// slider ASIDE icons
 		// (5 * button width + spaces between them);
 		return (4*MC_BUTTONSIZE+10);
@@ -535,7 +535,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
 	if ( orientation() ==Qt::Vertical )
 	{		// ====== VERTICAL =================================================
 		time_slider->setOrientation(Qt::Vertical);
-		int slider_width = time_slider->tqminimumSizeHint().width();
+		int slider_width = time_slider->minimumSizeHint().width();
 		// some styles need more space for sliders than avilable in very small panels :(
 		if ( slider_width > w ) slider_width = w;
 
@@ -567,7 +567,7 @@ void MediaControl::resizeEvent( TQResizeEvent* )
 	else	// ====== HORIZONTAL ===============================================
 	{
 		time_slider->setOrientation(Qt::Horizontal);
-		int slider_height = time_slider->tqminimumSizeHint().height();
+		int slider_height = time_slider->minimumSizeHint().height();
 		// some styles need more space for sliders than avilable in very small panels :(
 		if ( slider_height > h ) slider_height = h;
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 161db39..ab1cec5 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -29,7 +29,7 @@
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
 
-#include <tqpalette.h>
+#include <palette.h>
 
 // used everywhere :)
 #include <tqstring.h>
@@ -95,7 +95,7 @@ class MediaControl : public KPanelApplet, virtual public MediaControlIface
 		TrayButton *stop_button;  // Stop the music
 		TrayButton *next_button;  // GoTo Next Playlist-Item
 		MCSlider *time_slider;
-		int mLastLen, mLastTime, mLasttqStatus;
+		int mLastLen, mLastTime, mLastStatus;
 		KPopupMenu *rmbMenu;
 
 		virtual void mousePressEvent(TQMouseEvent* e);
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 6df8886..e87f6b9 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -29,7 +29,7 @@
 #include <tqcheckbox.h>
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqgroupbox.h>
 
 #include <kapplication.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
index 36a3e0e..df36762 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
+++ b/kicker-applets/mediacontrol/mediacontrolconfigwidget.ui
@@ -156,7 +156,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
@@ -199,13 +199,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -227,13 +227,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -255,13 +255,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -283,13 +283,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -311,13 +311,13 @@
                                                 <verstretch>0</verstretch>
                                             </sizepolicy>
                                         </property>
-                                        <property name="tqminimumSize">
+                                        <property name="minimumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
                                             </size>
                                         </property>
-                                        <property name="tqmaximumSize">
+                                        <property name="maximumSize">
                                             <size>
                                                 <width>18</width>
                                                 <height>18</height>
@@ -339,7 +339,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>0</height>
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index ea350d2..98ba0cb 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -118,7 +118,7 @@ void MpdInterface::connected()
     {
         //kdDebug(90200) << "Connected ok\n";
         emit playerStarted();
-        emit playingStatusChanged(playingtqStatus());
+        emit playingStatusChanged(playingStatus());
     }
     else
     {
@@ -137,10 +137,10 @@ void MpdInterface::connectionError(int e)
         switch (e)
         {
             case TQSocket::ErrConnectionRefused:
-                message=i18n("Connection refused to %1:%2.\nIs mpd running?").tqarg(hostname).tqarg(port);
+                message=i18n("Connection refused to %1:%2.\nIs mpd running?").arg(hostname).arg(port);
                 break;
             case TQSocket::ErrHostNotFound:
-                message=i18n("Host '%1' not found.").tqarg(hostname);
+                message=i18n("Host '%1' not found.").arg(hostname);
                 break;
             case TQSocket::ErrSocketRead:
                 message=i18n("Error reading socket.");
@@ -265,7 +265,7 @@ void MpdInterface::updateSlider()
         }
         else if (time_re.search(res)>=0)
         {
-            TQStringList timeinfo=time_re.tqcapturedTexts();
+            TQStringList timeinfo=time_re.capturedTexts();
             timeinfo.pop_front();
             int elapsed_seconds=timeinfo.first().toInt();
             timeinfo.pop_front();
@@ -298,7 +298,7 @@ void MpdInterface::jumpToTime(int sec)
     {
         if (songid_re.search(res)>=0)
         {
-            TQStringList songidinfo=songid_re.tqcapturedTexts();
+            TQStringList songidinfo=songid_re.capturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -306,7 +306,7 @@ void MpdInterface::jumpToTime(int sec)
 
     if (songid>-1)
     {
-        if (dispatch(TQString("seekid %1 %2\n").tqarg(songid).tqarg(sec).latin1()))
+        if (dispatch(TQString("seekid %1 %2\n").arg(songid).arg(sec).latin1()))
         {
             fetchOk(); // unlocks
         }
@@ -316,7 +316,7 @@ void MpdInterface::jumpToTime(int sec)
 void MpdInterface::playpause()
 {
     reconnect();
-    if (playingtqStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
+    if (playingStatus()==Stopped ? dispatch("play\n") : dispatch("pause\n"))
     {
         fetchOk();
     }
@@ -355,7 +355,7 @@ void MpdInterface::changeVolume(int delta)
     {
         if (volume_re.search(res)>=0)
         {
-            TQStringList info=volume_re.tqcapturedTexts();
+            TQStringList info=volume_re.capturedTexts();
             info.pop_front();
             volume=info.first().toInt();
         }
@@ -366,7 +366,7 @@ void MpdInterface::changeVolume(int delta)
         volume+=delta;
         if (volume<0) volume=0;
         if (volume>100) volume=100;
-        if (dispatch(TQString("setvol %1\n").tqarg(volume).latin1()))
+        if (dispatch(TQString("setvol %1\n").arg(volume).latin1()))
         {
             fetchOk();
         }
@@ -411,7 +411,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                     TQRegExp id_re("Id: (.+)");
                     if (file.isEmpty() && file_re.search(res)>=0)
                     {
-                        TQStringList info=file_re.tqcapturedTexts();
+                        TQStringList info=file_re.capturedTexts();
                         info.pop_front();
                         // if the dropped file ends with the same name, record it
                         if (list.front().path().endsWith(info.first()))
@@ -422,7 +422,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                     else if (!file.isEmpty() && id_re.search(res)>=0)
                     {
                         // when we have the file, pick up the id (file scomes first)
-                        TQStringList info=id_re.tqcapturedTexts();
+                        TQStringList info=id_re.capturedTexts();
                         info.pop_front();
                         songid=info.first().toInt();
                         fetchOk(); // skip to the end
@@ -433,7 +433,7 @@ void MpdInterface::dropEvent(TQDropEvent* event)
                 // found song, so lets play it
                 if (songid>-1)
                 {
-                    if (dispatch((TQString("playid %1\n").tqarg(songid)).latin1()))
+                    if (dispatch((TQString("playid %1\n").arg(songid)).latin1()))
                     {
                         if (fetchOk()) list.pop_front();
                         return;
@@ -483,7 +483,7 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp songid_re("songid: (\\d+)");
         if (songid_re.search(res)>=0)
         {
-            TQStringList songidinfo=songid_re.tqcapturedTexts();
+            TQStringList songidinfo=songid_re.capturedTexts();
             songidinfo.pop_front();
             songid=songidinfo.first().toInt();
         }
@@ -491,7 +491,7 @@ const TQString MpdInterface::getTrackTitle() const
 
     if (!(songid>-1)) return result;
 
-    if (!dispatch(TQString("playlistid %1\n").tqarg(songid).latin1()))
+    if (!dispatch(TQString("playlistid %1\n").arg(songid).latin1()))
         return result;
 
     TQString artist;
@@ -508,31 +508,31 @@ const TQString MpdInterface::getTrackTitle() const
         TQRegExp file_re("file: (.+)");
         if (artist_re.search(res)>=0)
         {
-            TQStringList info=artist_re.tqcapturedTexts();
+            TQStringList info=artist_re.capturedTexts();
             info.pop_front();
             artist=info.first();
         }
         else if (album_re.search(res)>=0)
         {
-            TQStringList info=album_re.tqcapturedTexts();
+            TQStringList info=album_re.capturedTexts();
             info.pop_front();
             album=info.first();
         }
         else if (title_re.search(res)>=0)
         {
-            TQStringList info=title_re.tqcapturedTexts();
+            TQStringList info=title_re.capturedTexts();
             info.pop_front();
             title=info.first();
         }
         else if (track_re.search(res)>=0)
         {
-            TQStringList info=track_re.tqcapturedTexts();
+            TQStringList info=track_re.capturedTexts();
             info.pop_front();
             track=info.first();
         }
         else if (file_re.search(res)>=0)
         {
-            TQStringList info=file_re.tqcapturedTexts();
+            TQStringList info=file_re.capturedTexts();
             info.pop_front();
             file=info.first();
         }
@@ -559,15 +559,15 @@ const TQString MpdInterface::getTrackTitle() const
         else
             return album;
     }
-    return i18n("No tags: %1").tqarg(file);
+    return i18n("No tags: %1").arg(file);
 }
 
-int MpdInterface::playingtqStatus()
+int MpdInterface::playingStatus()
 {
     //kdDebug(90200) << "looking up playing status\n";
     if (!dispatch("status\n")) return Stopped;
 
-    PlayingtqStatus status=Stopped;
+    PlayingStatus status=Stopped;
     TQString res;
     while(fetchLine(res))
     {
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index b7512b9..4ba2034 100644
--- a/kicker-applets/mediacontrol/mpdInterface.h
+++ b/kicker-applets/mediacontrol/mpdInterface.h
@@ -51,7 +51,7 @@ class MpdInterface
         virtual void dragEnterEvent(TQDragEnterEvent* event);
         virtual void dropEvent(TQDropEvent* event);
         virtual const TQString getTrackTitle() const;
-        virtual int playingtqStatus();
+        virtual int playingStatus();
 
         void changeVolume(int delta);
 
diff --git a/kicker-applets/mediacontrol/noatunInterface.cpp b/kicker-applets/mediacontrol/noatunInterface.cpp
index 4ba4333..397dc10 100644
--- a/kicker-applets/mediacontrol/noatunInterface.cpp
+++ b/kicker-applets/mediacontrol/noatunInterface.cpp
@@ -145,10 +145,10 @@ void NoatunInterface::updateSlider()
 		time = 0;
 	}
 	emit newSliderPosition(len/1000,time/1000);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
-int NoatunInterface::playingtqStatus()
+int NoatunInterface::playingStatus()
 {
 	TQByteArray data, replyData;
 	TQCString replyType;
diff --git a/kicker-applets/mediacontrol/noatunInterface.h b/kicker-applets/mediacontrol/noatunInterface.h
index 64f9ab9..0349458 100644
--- a/kicker-applets/mediacontrol/noatunInterface.h
+++ b/kicker-applets/mediacontrol/noatunInterface.h
@@ -49,7 +49,7 @@ class NoatunInterface : public PlayerInterface
 		const TQString getTrackTitle() const;
 		void appRegistered(const TQCString &appId);
 		void appRemoved(const TQCString &appId);
-		int playingtqStatus();
+		int playingStatus();
 
 		void myInit(void);
 
diff --git a/kicker-applets/mediacontrol/playerInterface.h b/kicker-applets/mediacontrol/playerInterface.h
index 916d387..1225290 100644
--- a/kicker-applets/mediacontrol/playerInterface.h
+++ b/kicker-applets/mediacontrol/playerInterface.h
@@ -29,7 +29,7 @@ class PlayerInterface : public TQObject
 		PlayerInterface();
 		virtual ~PlayerInterface();
 
-		enum PlayingtqStatus { Stopped=0, Playing, Paused };
+		enum PlayingStatus { Stopped=0, Playing, Paused };
 
 	public slots:
 		virtual void updateSlider()=0; // gets called on timer-timeout
@@ -45,7 +45,7 @@ class PlayerInterface : public TQObject
 		virtual void dragEnterEvent(TQDragEnterEvent* event)=0;
 		virtual void dropEvent(TQDropEvent* event)=0;
 		virtual const TQString getTrackTitle() const=0;
-		virtual int playingtqStatus()=0;
+		virtual int playingStatus()=0;
 
 		void startPlayer(const TQString &desktopname);
 
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index f232377..4760982 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -63,22 +63,22 @@ void SimpleButton::setOrientation(Qt::Orientation orientation)
     update();
 }
 
-TQSize SimpleButton::tqsizeHint() const
+TQSize SimpleButton::sizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqsizeHint();
+        return TQButton::sizeHint();
     else
         return TQSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
 }
 
-TQSize SimpleButton::tqminimumSizeHint() const
+TQSize SimpleButton::minimumSizeHint() const
 {
     const TQPixmap* pm = pixmap();
 
     if (!pm)
-        return TQButton::tqminimumSizeHint();
+        return TQButton::minimumSizeHint();
     else
         return TQSize(pm->width(), pm->height());
 }
@@ -174,7 +174,7 @@ void SimpleButton::enterEvent( TQEvent *e )
 {
     m_highlight = true;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -182,7 +182,7 @@ void SimpleButton::leaveEvent( TQEvent *e )
 {
     m_highlight = false;
 
-    tqrepaint( false );
+    repaint( false );
     TQButton::enterEvent( e );
 }
 
@@ -200,7 +200,7 @@ SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, con
     _inside = false;
 }
 
-TQSize SimpleArrowButton::tqsizeHint() const
+TQSize SimpleArrowButton::sizeHint() const
 {
     return TQSize( 12, 12 );
 }
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, tqcolorGroup(), flags);
+    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 0cf11e5..9c66f85 100644
--- a/kicker-applets/mediacontrol/simplebutton.h
+++ b/kicker-applets/mediacontrol/simplebutton.h
@@ -35,8 +35,8 @@ class KDE_EXPORT SimpleButton : public TQButton
         SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
-        TQSize tqsizeHint() const;
-        TQSize tqminimumSizeHint() const;
+        TQSize sizeHint() const;
+        TQSize minimumSizeHint() const;
 
     protected:
         void drawButton( TQPainter *p );
@@ -69,7 +69,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
     public:
         SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
-        TQSize tqsizeHint() const;
+        TQSize sizeHint() const;
     
     protected:
         virtual void enterEvent( TQEvent *e );
diff --git a/kicker-applets/mediacontrol/xmmsInterface.cpp b/kicker-applets/mediacontrol/xmmsInterface.cpp
index 05fc2b0..7d8e236 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.cpp
+++ b/kicker-applets/mediacontrol/xmmsInterface.cpp
@@ -79,7 +79,7 @@ void XmmsInterface::updateSlider ( void )
 	}
 
 	emit newSliderPosition(len,time);
-	emit playingStatusChanged(playingtqStatus());
+	emit playingStatusChanged(playingStatus());
 }
 
 
@@ -163,7 +163,7 @@ void XmmsInterface::volumeDown()
 	xmms_remote_set_main_volume(XMMS_SESSION, cur-1);
 }
 
-int XmmsInterface::playingtqStatus()
+int XmmsInterface::playingStatus()
 {
 	if (xmms_remote_is_paused(XMMS_SESSION))
 		return Paused;
diff --git a/kicker-applets/mediacontrol/xmmsInterface.h b/kicker-applets/mediacontrol/xmmsInterface.h
index 59bea23..d67f8df 100644
--- a/kicker-applets/mediacontrol/xmmsInterface.h
+++ b/kicker-applets/mediacontrol/xmmsInterface.h
@@ -49,7 +49,7 @@ class XmmsInterface : public PlayerInterface
 		virtual void dragEnterEvent(TQDragEnterEvent* event);
 		virtual void dropEvent(TQDropEvent* event);
 		virtual const TQString getTrackTitle() const;
-		virtual int playingtqStatus();
+		virtual int playingStatus();
 
 	private:
 		TQTimer *xmms_timer;