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

This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab.

24 files changed, 150 insertions, 150 deletions

diff --git a/kicker/applets/clock/analog.ui b/kicker/applets/clock/analog.ui
index 024caaefe..ea0135ceb 100644
--- a/kicker/applets/clock/analog.ui
+++ b/kicker/applets/clock/analog.ui
@@ -75,7 +75,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -149,7 +149,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>16</width>
                                     <height>20</height>
@@ -241,7 +241,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>310</width>
                             <height>20</height>
@@ -269,7 +269,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>50</height>
diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp
index ba5f7eb26..74e6a6c99 100644
--- a/kicker/applets/clock/clock.cpp
+++ b/kicker/applets/clock/clock.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqtabwidget.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
@@ -86,23 +86,23 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     settings = new SettingsWidgetImp(prefs, zone, 0, "General");
     connect(TQT_TQOBJECT(settings->kcfg_Type), TQT_SIGNAL(activated(int)), TQT_SLOT(selectPage(int)));
 
-    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::palette().active().background());
-    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    settings->kcfg_PlainBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
+    settings->kcfg_DateBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
 
     // Digital
     digitalPage = new DigitalWidget(0, "DigitalClock");
     settings->widgetStack->addWidget(digitalPage, 1);
-    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    digitalPage->kcfg_DigitalBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
 
     // Analog
     analogPage = new AnalogWidget(0, "AnalogClock");
     settings->widgetStack->addWidget(analogPage, 2);
-    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    analogPage->kcfg_AnalogBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
 
     // Fuzzy
     fuzzyPage = new FuzzyWidget(0, "FuzzyClock");
     settings->widgetStack->addWidget(fuzzyPage, 3);
-    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::palette().active().background());
+    fuzzyPage->kcfg_FuzzyBackgroundColor->setDefaultColor(KApplication::tqpalette().active().background());
 
     connect(TQT_TQOBJECT(settings->kcfg_PlainShowDate), TQT_SIGNAL(toggled(bool)),
             TQT_SLOT(dateToggled()));
@@ -123,7 +123,7 @@ KConfigDialogSingle::KConfigDialogSingle(Zone *zone, TQWidget *parent,
     connect(TQT_TQOBJECT(fuzzyPage->kcfg_FuzzyShowDayOfWeek), TQT_SIGNAL(toggled(bool)),
             TQT_SLOT(dateToggled()));
 
-    addPage(settings, i18n("General"), TQString::fromLatin1("package_settings"));
+    addPage(settings, i18n("General"), TQString::tqfromLatin1("package_settings"));
 }
 
 void KConfigDialogSingle::updateSettings()
@@ -242,7 +242,7 @@ void PlainClock::updateClock()
 void PlainClock::loadSettings()
 {
     setFrameStyle(_prefs->plainShowFrame() ? Panel | Sunken : NoFrame);
-    setAlignment(AlignVCenter | AlignHCenter | SingleLine);
+    tqsetAlignment(AlignVCenter | AlignHCenter | SingleLine);
 
     setFont(_prefs->plainFont());
 }
@@ -353,9 +353,9 @@ void DigitalClock::updateClock()
     if (_force || newStr != _timeStr)
     {
         _timeStr = newStr;
-        setUpdatesEnabled( FALSE );
+        tqsetUpdatesEnabled( FALSE );
         display(_timeStr);
-        setUpdatesEnabled( TRUE );
+        tqsetUpdatesEnabled( TRUE );
         update();
     }
     
@@ -386,7 +386,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
         p.drawTiledPixmap(0, 0, width(), height(), lcdPattern);
     }
     else if (_prefs->digitalBackgroundColor() !=
-             KApplication::palette().active().background())
+             KApplication::tqpalette().active().background())
     {
         p.fillRect(0, 0, width(), height(), _prefs->digitalBackgroundColor());
     }
@@ -415,7 +415,7 @@ void DigitalClock::paintEvent(TQPaintEvent*)
 // but other colors would break the lcd-lock anyway
 void DigitalClock::drawContents( TQPainter * p)
 {
-    setUpdatesEnabled( FALSE );
+    tqsetUpdatesEnabled( FALSE );
     TQPalette pal = palette();
     if (_prefs->digitalLCDStyle())
         pal.setColor( TQColorGroup::Foreground, TQColor(128,128,128));
@@ -430,7 +430,7 @@ void DigitalClock::drawContents( TQPainter * p)
         pal.setColor( TQColorGroup::Foreground, _prefs->digitalForegroundColor());
     setPalette( pal );
     p->translate( -2, -2 );
-    setUpdatesEnabled( TRUE );
+    tqsetUpdatesEnabled( TRUE );
     TQLCDNumber::drawContents( p );
     p->translate( +1, +1 );
 }
@@ -553,7 +553,7 @@ void AnalogClock::paintEvent( TQPaintEvent * )
 
         paint.drawTiledPixmap(0, 0, spWidth, spHeight, lcdPattern);
     }
-    else if (_prefs->analogBackgroundColor() != KApplication::palette().active().background())
+    else if (_prefs->analogBackgroundColor() != KApplication::tqpalette().active().background())
     {
         _spPx->fill(_prefs->analogBackgroundColor());
     }
@@ -827,7 +827,7 @@ void FuzzyClock::drawContents(TQPainter *p)
           }
           if (phStart >= 0)
               newTimeStr.replace(phStart, phLength, hourNames[realHour]);
-          newTimeStr.replace(0, 1, TQString(newTimeStr.at(0).upper()));
+          newTimeStr.replace(0, 1, TQString(newTimeStr.tqat(0).upper()));
       }
     } else if (_prefs->fuzzyness() == 3) {
         newTimeStr = dayTime[_time.hour() / 3];
@@ -908,12 +908,12 @@ ClockApplet::ClockApplet(const TQString& configFile, Type t, int actions,
     setBackgroundOrigin(AncestorOrigin);
 
     _dayOfWeek = new TQLabel(this);
-    _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+    _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
     _dayOfWeek->setBackgroundOrigin(AncestorOrigin);
     _dayOfWeek->installEventFilter(this);   // catch mouse clicks
 
     _date = new TQLabel(this);
-    _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+    _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
     _date->setBackgroundOrigin(AncestorOrigin);
     _date->installEventFilter(this);   // catch mouse clicks
 
@@ -980,18 +980,18 @@ int ClockApplet::widthForHeight(int h) const
     bool mustShowDate = showDate || (zone->zoneIndex() != 0);
     if (mustShowDate)
     {
-        _date->setAlignment(AlignVCenter | AlignHCenter);
+        _date->tqsetAlignment(AlignVCenter | AlignHCenter);
         if (!dateToSide)
         {
-            shareDateHeight = _date->sizeHint().height();
+            shareDateHeight = _date->tqsizeHint().height();
         }
     }
     if (showDayOfWeek)
     {
-        _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter);
+        _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter);
         if (!dateToSide)
         {
-            shareDayOfWeekHeight = _dayOfWeek->sizeHint().height();
+            shareDayOfWeekHeight = _dayOfWeek->tqsizeHint().height();
         }
     }
 
@@ -1007,8 +1007,8 @@ int ClockApplet::widthForHeight(int h) const
     }
     else
     {
-        int dateWidth = mustShowDate ? _date->sizeHint().width() + 4 : 0;
-        int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->sizeHint().width() + 4 : 0;
+        int dateWidth = mustShowDate ? _date->tqsizeHint().width() + 4 : 0;
+        int dayOfWeekWidth = showDayOfWeek ? _dayOfWeek->tqsizeHint().width() + 4 : 0;
 
         if (dateToSide)
         {
@@ -1020,7 +1020,7 @@ int ClockApplet::widthForHeight(int h) const
                 // if the date format STARTS with a year, assume it's in descending
                 // order and should therefore PRECEED the date.
                 TQString dateFormat = KGlobal::locale()->dateFormatShort();
-                dateFirst = dateFormat.at(1) == 'y' || dateFormat.at(1) == 'Y';
+                dateFirst = dateFormat.tqat(1) == 'y' || dateFormat.tqat(1) == 'Y';
             }
 
             if (dateFirst)
@@ -1064,13 +1064,13 @@ int ClockApplet::widthForHeight(int h) const
             _clock->widget()->move(0, 0);
             if (showDayOfWeek)
             {
-                _dayOfWeek->setFixedSize(w, _dayOfWeek->sizeHint().height());
+                _dayOfWeek->setFixedSize(w, _dayOfWeek->tqsizeHint().height());
                 _dayOfWeek->move(0, _clock->widget()->height());
             }
 
             if (mustShowDate)
             {
-                _date->setFixedSize(w, _date->sizeHint().height());
+                _date->setFixedSize(w, _date->tqsizeHint().height());
                 _date->move(0, _clock->widget()->height() + shareDayOfWeekHeight);
             }
         }
@@ -1094,16 +1094,16 @@ int ClockApplet::heightForWidth(int w) const
     // add 4 pixels in height for each of date+dayOfWeek, if visible
     if (showDayOfWeek)
     {
-        if (_dayOfWeek->minimumSizeHint().width() > w)
+        if (_dayOfWeek->tqminimumSizeHint().width() > w)
         {
-            _dayOfWeek->setAlignment(AlignVCenter | WordBreak);
+            _dayOfWeek->tqsetAlignment(AlignVCenter | WordBreak);
         }
         else
         {
-            _dayOfWeek->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+            _dayOfWeek->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
         }
 
-        _dayOfWeek->setFixedSize(w, _dayOfWeek->minimumSizeHint().height());
+        _dayOfWeek->setFixedSize(w, _dayOfWeek->tqminimumSizeHint().height());
         _dayOfWeek->move(0, clockHeight);
 
         clockHeight += _dayOfWeek->height();
@@ -1116,7 +1116,7 @@ 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->minimumSizeHint().width() > w)
+        if (_date->tqminimumSizeHint().width() > w)
         {
             TQString dateStr = _date->text();
             // if we're too wide to fit, replace the first non-digit from the end with a space
@@ -1127,13 +1127,13 @@ int ClockApplet::heightForWidth(int w) const
             }
         }
 
-        if (_date->minimumSizeHint().width() > w)
+        if (_date->tqminimumSizeHint().width() > w)
         {
-            _date->setAlignment(AlignVCenter | WordBreak);
+            _date->tqsetAlignment(AlignVCenter | WordBreak);
         }
         else
         {
-            _date->setAlignment(AlignVCenter | AlignHCenter | WordBreak);
+            _date->tqsetAlignment(AlignVCenter | AlignHCenter | WordBreak);
         }
         _date->setFixedSize(w, _date->heightForWidth(w));
         _date->move(0, clockHeight);
@@ -1169,7 +1169,7 @@ void ClockApplet::preferences(bool timezone)
 
 void ClockApplet::updateFollowBackground()
 {
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
     TQColor bgColor;
     
     switch (_prefs->type())
@@ -1272,7 +1272,7 @@ void ClockApplet::reconfigure()
     _clock->widget()->installEventFilter(this);   // catch mouse clicks
     _clock->widget()->show();
 
-    _clock->forceUpdate(); /* force repaint */
+    _clock->forceUpdate(); /* force tqrepaint */
 
     if (showDayOfWeek)
     {
@@ -1306,7 +1306,7 @@ void ClockApplet::setTimerTo60()
 
 void ClockApplet::setBackground()
 {
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
     TQColor fgColor, bgColor;
     
     if (!_clock)
@@ -1371,7 +1371,7 @@ void ClockApplet::globalPaletteChange()
     if (!m_dateFollowBackgroundSetting && !m_followBackgroundSetting)
         return;
     
-    TQColor globalBgroundColor = KApplication::palette().active().background();
+    TQColor globalBgroundColor = KApplication::tqpalette().active().background();
     
     if (m_dateFollowBackgroundSetting)
         _prefs->setDateBackgroundColor(globalBgroundColor);
@@ -1541,7 +1541,7 @@ void ClockApplet::aboutToShowContextMenu()
     menu->insertTitle( SmallIcon( "clock" ), i18n( "Clock" ) );
 
     KLocale *loc = KGlobal::locale();
-    TQDateTime dt = TQDateTime::currentDateTime();
+    TQDateTime dt = TQDateTime::tqcurrentDateTime();
     dt = TQT_TQDATETIME_OBJECT(dt.addSecs(TZoffset));
 
     KPopupMenu *copyMenu = new KPopupMenu( menu );
@@ -1605,7 +1605,7 @@ void ClockApplet::slotCopyMenuActivated( int id )
 {
     TQPopupMenu *m = (TQPopupMenu *) sender();
     TQString s = m->text(id);
-    TQApplication::clipboard()->setText(s);
+    TQApplication::tqclipboard()->setText(s);
 }
 
 TQTime ClockApplet::clockGetTime()
@@ -1615,7 +1615,7 @@ TQTime ClockApplet::clockGetTime()
 
 TQDate ClockApplet::clockGetDate()
 {
-    return TQT_TQDATE_OBJECT(TQDateTime::currentDateTime().addSecs(TZoffset).date());
+    return TQT_TQDATE_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(TZoffset).date());
 }
 
 void ClockApplet::showZone(int z)
@@ -1623,7 +1623,7 @@ void ClockApplet::showZone(int z)
     zone->setZone(z);
     TZoffset = zone->calc_TZ_offset( zone->zone() );
     updateDateLabel();
-    _clock->forceUpdate(); /* force repaint */
+    _clock->forceUpdate(); /* force tqrepaint */
 }
 
 void ClockApplet::nextZone()
@@ -1840,7 +1840,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(TQT_TQDATETIME_OBJECT(TQDateTime::currentDateTime().addSecs(m_clock->TZoffset)));
+        tipText = KGlobal::locale()->formatDateTime(TQT_TQDATETIME_OBJECT(TQDateTime::tqcurrentDateTime().addSecs(m_clock->TZoffset)));
     }
     else
     {
diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg
index 04beba322..6abd26ceb 100644
--- a/kicker/applets/clock/clockapplet.kcfg
+++ b/kicker/applets/clock/clockapplet.kcfg
@@ -20,11 +20,11 @@
   <group name="Date">
     <entry name="DateForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">KApplication::tqpalette().active().text()</default>
     </entry>
     <entry name="DateBackgroundColor" type="Color" key="Background_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
     <entry name="DateFont" type="Font" key="Font">
       <label>Font for the clock.</label>
@@ -63,11 +63,11 @@ defFont.setBold(true);
     </entry>
     <entry name="PlainForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">KApplication::tqpalette().active().text()</default>
     </entry>
     <entry name="PlainBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
   </group>
   <group name="Digital">
@@ -89,15 +89,15 @@ defFont.setBold(true);
     </entry>
     <entry name="DigitalForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">KApplication::tqpalette().active().text()</default>
     </entry>
     <entry name="DigitalBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
     <entry name="DigitalShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::palette().active().mid()</default>
+      <default code="true">KApplication::tqpalette().active().mid()</default>
     </entry>
     <entry name="DigitalBlink" type="Bool" key="Blink">
       <label>Blink</label>
@@ -127,15 +127,15 @@ defFont.setBold(true);
     </entry>
     <entry name="AnalogForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">KApplication::tqpalette().active().text()</default>
     </entry>
     <entry name="AnalogBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
     <entry name="AnalogShadowColor" type="Color" key="Shadow_Color">
       <label>Shadow color.</label>
-      <default code="true">KApplication::palette().active().mid()</default>
+      <default code="true">KApplication::tqpalette().active().mid()</default>
     </entry>
     <entry name="AnalogLCDStyle" type="Bool" key="LCD_Style">
       <label>LCD Style</label>
@@ -168,11 +168,11 @@ defFont=KGlobalSettings::generalFont();
     </entry>
     <entry name="FuzzyForegroundColor" type="Color" key="Foreground_Color">
       <label>Foreground color.</label>
-      <default code="true">KApplication::palette().active().text()</default>
+      <default code="true">KApplication::tqpalette().active().text()</default>
     </entry>
     <entry name="FuzzyBackgroundColor" type="Color" key="Background_Color">
       <label>Background color.</label>
-      <default code="true">KApplication::palette().active().background()</default>
+      <default code="true">KApplication::tqpalette().active().background()</default>
     </entry>
     <entry name="Fuzzyness" type="Int">
       <label>Fuzzyness</label>
diff --git a/kicker/applets/clock/digital.ui b/kicker/applets/clock/digital.ui
index 1450e6f4f..fc2b66cac 100644
--- a/kicker/applets/clock/digital.ui
+++ b/kicker/applets/clock/digital.ui
@@ -83,7 +83,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -193,7 +193,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>110</width>
                                     <height>20</height>
@@ -226,7 +226,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kicker/applets/clock/fuzzy.ui b/kicker/applets/clock/fuzzy.ui
index 6906808c7..ebe6af9fc 100644
--- a/kicker/applets/clock/fuzzy.ui
+++ b/kicker/applets/clock/fuzzy.ui
@@ -79,7 +79,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -109,7 +109,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>30</height>
@@ -153,7 +153,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp
index a5a7cac30..a21a62757 100644
--- a/kicker/applets/clock/init.cpp
+++ b/kicker/applets/clock/init.cpp
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqtabwidget.h>
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
diff --git a/kicker/applets/clock/settings.ui b/kicker/applets/clock/settings.ui
index 560ddcc7f..6cf1d30f0 100644
--- a/kicker/applets/clock/settings.ui
+++ b/kicker/applets/clock/settings.ui
@@ -102,7 +102,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -188,7 +188,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
@@ -284,7 +284,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>230</width>
                                                     <height>20</height>
@@ -306,7 +306,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
@@ -371,7 +371,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>343</width>
                                         <height>20</height>
@@ -421,7 +421,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>100</height>
diff --git a/kicker/applets/launcher/configdlgbase.ui b/kicker/applets/launcher/configdlgbase.ui
index edfa6f02f..e551864b1 100644
--- a/kicker/applets/launcher/configdlgbase.ui
+++ b/kicker/applets/launcher/configdlgbase.ui
@@ -83,7 +83,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>332</width>
                             <height>20</height>
@@ -138,7 +138,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>140</width>
                                     <height>20</height>
@@ -152,7 +152,7 @@
                             <property name="text">
                                 <string>Short Term</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -163,7 +163,7 @@
                             <property name="text">
                                 <string>Long Term</string>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -192,7 +192,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp
index 248614811..0c19e5326 100644
--- a/kicker/applets/launcher/quickbutton.cpp
+++ b/kicker/applets/launcher/quickbutton.cpp
@@ -163,7 +163,7 @@ QuickButton::QuickButton(const TQString &u, KAction* configAction,
 
     TQToolTip::add(this, _qurl->name());
     resize(int(DEFAULT_ICON_DIM),int(DEFAULT_ICON_DIM));
-    TQBrush bgbrush(colorGroup().brush(TQColorGroup::Background));
+    TQBrush bgbrush(tqcolorGroup().brush(TQColorGroup::Background));
 
     QuickAddAppsMenu *addAppsMenu = new QuickAddAppsMenu(
         parent, this, _qurl->url());
diff --git a/kicker/applets/launcher/quickbuttongroup.h b/kicker/applets/launcher/quickbuttongroup.h
index 1c153d85c..37d04ef9e 100644
--- a/kicker/applets/launcher/quickbuttongroup.h
+++ b/kicker/applets/launcher/quickbuttongroup.h
@@ -24,15 +24,15 @@ public:
     void setDragging(bool drag);
     void setEnableDrag(bool enable);
     void deleteContents();
-    void setUpdatesEnabled(bool enable);
+    void tqsetUpdatesEnabled(bool enable);
 };
 
 QuickButtonGroup::Index QuickButtonGroup::findDescriptor(const TQString &desc)
 {   return findProperty(desc, std::mem_fun(&QuickButton::url));}
 
-inline void QuickButtonGroup::setUpdatesEnabled(bool enable)
+inline void QuickButtonGroup::tqsetUpdatesEnabled(bool enable)
 {   for (QuickButtonGroup::iterator i=begin();i!=end();++i) {
-        (*i)->setUpdatesEnabled(enable);
+        (*i)->tqsetUpdatesEnabled(enable);
         if (enable) { (*i)->update();}
     }
 }
diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp
index 30b125726..7ead9eced 100644
--- a/kicker/applets/launcher/quicklauncher.cpp
+++ b/kicker/applets/launcher/quicklauncher.cpp
@@ -770,8 +770,8 @@ void QuickLauncher::refreshContents()
 
     unsigned index;
     TQPoint pos;
-    setUpdatesEnabled(false);
-    m_buttons->setUpdatesEnabled(false);
+    tqsetUpdatesEnabled(false);
+    m_buttons->tqsetUpdatesEnabled(false);
     for (index = 0; index < m_buttons->size(); index++)
     {
         pos = m_manager->pos(index);
@@ -791,9 +791,9 @@ void QuickLauncher::refreshContents()
         m_dragButtons->setDragging(true);
     }
     m_buttons->show();
-    setUpdatesEnabled(true);
+    tqsetUpdatesEnabled(true);
     update();
-    m_buttons->setUpdatesEnabled(true);
+    m_buttons->tqsetUpdatesEnabled(true);
     updateGeometry();
     emit updateLayout();
     updateStickyHighlightLayer();
@@ -1097,7 +1097,7 @@ void QuickLauncher::updateStickyHighlightLayer()
             }
         }
     }
-    repaint();
+    tqrepaint();
 }
 
 void QuickLauncher::paintEvent(TQPaintEvent* e)
diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 98d0e1708..882c8286b 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqpopupmenu.h>
@@ -94,8 +94,8 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
     if (!kapp->authorize("logout"))
        logoutButton->hide();
 
-    lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
-    logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+    lockButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
+    logoutButton->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
     if ( !kapp->dcopClient()->isAttached() )
         kapp->dcopClient()->attach();
@@ -113,7 +113,7 @@ Lockout::~Lockout()
 // direction and wasting a lot of space.
 void Lockout::checkLayout( int height ) const
 {
-    TQSize s = minimumSizeHint();
+    TQSize s = tqminimumSizeHint();
     TQBoxLayout::Direction direction = layout->direction();
 
     if ( direction == TQBoxLayout::LeftToRight &&
@@ -131,13 +131,13 @@ void Lockout::checkLayout( int height ) const
 int Lockout::widthForHeight( int height ) const
 {
     checkLayout( height );
-    return sizeHint().width();
+    return tqsizeHint().width();
 }
 
 int Lockout::heightForWidth( int width ) const
 {
     checkLayout( width );
-    return sizeHint().height();
+    return tqsizeHint().height();
 }
 
 void Lockout::lock()
@@ -177,9 +177,9 @@ void Lockout::mouseMoveEvent(TQMouseEvent* e)
 void Lockout::propagateMouseEvent(TQMouseEvent* e)
 {
     if ( !isTopLevel()  ) {
-        TQMouseEvent me(e->type(), mapTo( topLevelWidget(), e->pos() ),
+        TQMouseEvent me(e->type(), mapTo( tqtopLevelWidget(), e->pos() ),
                        e->globalPos(), e->button(), e->state() );
-        TQApplication::sendEvent( topLevelWidget(), &me );
+        TQApplication::sendEvent( tqtopLevelWidget(), &me );
     }
 }
 
diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp
index da2b30564..1e71fbd6f 100644
--- a/kicker/applets/media/mediumbutton.cpp
+++ b/kicker/applets/media/mediumbutton.cpp
@@ -20,7 +20,7 @@
 #include "mediumbutton.h"
 
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqpainter.h>
 #include <tqdrawutil.h>
 #include <tqpopupmenu.h>
@@ -145,7 +145,7 @@ void MediumButton::slotCopy()
 {
     KonqDrag * obj = KonqDrag::newDrag(mFileItem.url(), false);
     
-    TQApplication::clipboard()->setData( obj );
+    TQApplication::tqclipboard()->setData( obj );
 }
 
 void MediumButton::dragEnterEvent(TQDragEnterEvent* e)
diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp
index df34a78ac..f0a86946f 100644
--- a/kicker/applets/menu/menuapplet.cpp
+++ b/kicker/applets/menu/menuapplet.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "menuapplet.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqvariant.h> // avoid X11 #define's
 
@@ -264,7 +264,7 @@ void Applet::positionChange( Position )
 // Kicker's frame).
 void Applet::updateTopEdgeOffset()
     {
-    TQPoint p = topLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
+    TQPoint p = tqtopLevelWidget()->mapToGlobal( TQPoint( 0, 0 ));
     if( p.y() <= 2 ) // 2 = work also when running in appletproxy
         topEdgeOffset = mapToGlobal( TQPoint( 0, 0 )).y() - p.y();
     else
diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp
index 3bb7f65d4..a684aa6f8 100644
--- a/kicker/applets/minipager/pagerapplet.cpp
+++ b/kicker/applets/minipager/pagerapplet.cpp
@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqlineedit.h>
 #include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 
 #include <dcopref.h>
@@ -365,7 +365,7 @@ void KMiniPager::updateDesktopLayout(int o, int x, int y)
     if( m_desktopLayoutOwner == NULL )
     { // must own manager selection before setting global desktop layout
         int screen = DefaultScreen( qt_xdisplay());
-        m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).arg( screen ).latin1(),
+        m_desktopLayoutOwner = new KSelectionOwner( TQString( "_NET_DESKTOP_LAYOUT_S%1" ).tqarg( screen ).latin1(),
             screen, TQT_TQOBJECT(this) );
         if( !m_desktopLayoutOwner->claim( false ))
         {
@@ -865,7 +865,7 @@ void KMiniPager::slotDesktopNamesChanged()
     {
         TQString name = m_twin->desktopName(i);
         (*it)->setDesktopName(name);
-        (*it)->repaint();
+        (*it)->tqrepaint();
         TQToolTip::remove((*it));
         TQToolTip::add((*it), name);
     }
diff --git a/kicker/applets/minipager/pagerbutton.cpp b/kicker/applets/minipager/pagerbutton.cpp
index 1dfa5ee25..e494d538d 100644
--- a/kicker/applets/minipager/pagerbutton.cpp
+++ b/kicker/applets/minipager/pagerbutton.cpp
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqlineedit.h>
 #include <tqpainter.h>
 #include <tqpopupmenu.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 
 #include <netwm.h>
 #include <dcopclient.h>
@@ -157,8 +157,8 @@ bool KMiniPagerButton::shouldPaintWindow( KWin::WindowInfo *info ) const
         TQRect r = mapGeometryToViewport(*info);
 
         if (!info->hasState(NET::Sticky) &&
-            !TQApplication::desktop()->geometry().contains(r.topLeft()) &&
-            !TQApplication::desktop()->geometry().contains(r.topRight()))
+            !TQApplication::desktop()->tqgeometry().contains(r.topLeft()) &&
+            !TQApplication::desktop()->tqgeometry().contains(r.topRight()))
             return false;
     }
 
@@ -404,16 +404,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
             // transparent windows get an 1 pixel frame...
             if (on)
             {
-                bp->setPen(colorGroup().midlight());
+                bp->setPen(tqcolorGroup().midlight());
             }
             else if (down)
             {
-                bp->setPen(KickerLib::blendColors(colorGroup().mid(),
-                                                 colorGroup().midlight()));
+                bp->setPen(KickerLib::blendColors(tqcolorGroup().mid(),
+                                                 tqcolorGroup().midlight()));
             }
             else
             {
-                bp->setPen(colorGroup().dark());
+                bp->setPen(tqcolorGroup().dark());
             }
 
             bp->drawRect(0, 0, w, h);
@@ -424,16 +424,16 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
             if (on)
             {
-                background = colorGroup().brush(TQColorGroup::Midlight);
+                background = tqcolorGroup().brush(TQColorGroup::Midlight);
             }
             else if (down)
             {
-                background = TQBrush(KickerLib::blendColors(colorGroup().mid(),
-                                                    colorGroup().midlight()));
+                background = TQBrush(KickerLib::blendColors(tqcolorGroup().mid(),
+                                                    tqcolorGroup().midlight()));
             }
             else
             {
-                background = colorGroup().brush(TQColorGroup::Mid);
+                background = tqcolorGroup().brush(TQColorGroup::Mid);
             }
 
             bp->fillRect(0, 0, w, h, background);
@@ -462,12 +462,12 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
 
                 if (twin->activeWindow() == info->win())
                 {
-                    TQBrush brush = colorGroup().brush(TQColorGroup::Highlight);
-                    qDrawShadeRect(bp, r, colorGroup(), false, 1, 0, &brush);
+                    TQBrush brush = tqcolorGroup().brush(TQColorGroup::Highlight);
+                    qDrawShadeRect(bp, r, tqcolorGroup(), false, 1, 0, &brush);
                 }
                 else
                 {
-                    TQBrush brush = colorGroup().brush(TQColorGroup::Button);
+                    TQBrush brush = tqcolorGroup().brush(TQColorGroup::Button);
 
                     if (on)
                     {
@@ -475,7 +475,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
                     }
 
                     bp->fillRect(r, brush);
-                    qDrawShadeRect(bp, r, colorGroup(), true, 1, 0);
+                    qDrawShadeRect(bp, r, tqcolorGroup(), true, 1, 0);
                 }
 
                 if (m_pager->windowIcons() && r.width() > 15 && r.height() > 15)
@@ -498,11 +498,11 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         // makes it look a bit more finished.
         if (on)
         {
-            bp->setPen(colorGroup().midlight());
+            bp->setPen(tqcolorGroup().midlight());
         }
         else
         {
-            bp->setPen(colorGroup().mid());
+            bp->setPen(tqcolorGroup().mid());
         }
 
         bp->drawRect(0, 0, w, h);
@@ -515,7 +515,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
         
         if (transparent || liveBkgnd)
         {
-            bp->setPen(on ? colorGroup().midlight() : colorGroup().buttonText());
+            bp->setPen(on ? tqcolorGroup().midlight() : tqcolorGroup().buttonText());
             m_pager->shadowEngine()->drawText(*bp, TQRect(0, 0, w, h), AlignCenter, label, size());
         }
         else
@@ -523,7 +523,7 @@ void KMiniPagerButton::drawButton(TQPainter *bp)
     }
     
     if (m_inside)
-        KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), colorGroup().foreground());
+        KickerLib::drawBlendedRect(bp, TQRect(1, 1, width() - 2, height() - 2), tqcolorGroup().foreground());
 }
 
 void KMiniPagerButton::mousePressEvent(TQMouseEvent * e)
@@ -586,9 +586,9 @@ void KMiniPagerButton::mouseMoveEvent(TQMouseEvent* e)
         TQPixmap windowImage(ww, wh);
         TQPainter bp(&windowImage, this);
 
-        bp.setPen(colorGroup().foreground());
+        bp.setPen(tqcolorGroup().foreground());
         bp.drawRect(0, 0, ww, wh);
-        bp.fillRect(1, 1, ww - 2, wh - 2, colorGroup().background());
+        bp.fillRect(1, 1, ww - 2, wh - 2, tqcolorGroup().background());
 
         Task::List tasklist;
         tasklist.append(m_currentWindow);
diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp
index bf1d96232..953bcacbd 100644
--- a/kicker/applets/naughty/NaughtyApplet.cpp
+++ b/kicker/applets/naughty/NaughtyApplet.cpp
@@ -24,7 +24,7 @@
 
 #include <tqmessagebox.h>
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kiconloader.h>
 #include <kglobal.h>
diff --git a/kicker/applets/naughty/NaughtyProcessMonitor.cpp b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
index 4bff5f851..aaca4213e 100644
--- a/kicker/applets/naughty/NaughtyProcessMonitor.cpp
+++ b/kicker/applets/naughty/NaughtyProcessMonitor.cpp
@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqtimer.h>
 #include <tqmap.h>
@@ -255,7 +255,7 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
 
  // Now strip 'tdeinit:' prefix.
-  TQString unicode(TQString::fromLocal8Bit(s));
+  TQString tqunicode(TQString::fromLocal8Bit(s));
 
 #elif defined(__OpenBSD__)
   int mib[4] ;
@@ -280,12 +280,12 @@ NaughtyProcessMonitor::processName(ulong pid) const
   }
   
  // Now strip 'tdeinit:' prefix.
-  TQString unicode(TQString::fromLocal8Bit(argv[0]));
+  TQString tqunicode(TQString::fromLocal8Bit(argv[0]));
 
   free (argv) ;
 #endif
 
-  TQStringList parts(TQStringList::split(' ', unicode));
+  TQStringList parts(TQStringList::split(' ', tqunicode));
 
   TQString processName = parts[0] == "tdeinit:" ? parts[1] : parts[0];
 
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index fb7ac107b..8f441a397 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -121,14 +121,14 @@ void RunApplet::resizeEvent(TQResizeEvent*)
 	    _input->reparent(this, TQPoint(0,0), true);
 	    _label->setGeometry(0,0, width(), _label->height());
 
-	    if(height() >= _input->sizeHint().height() + _label->height())
+	    if(height() >= _input->tqsizeHint().height() + _label->height())
 		{
-                    int inputVOffset = height() - _input->sizeHint().height() - 2;
-                    int labelHeight = _label->sizeHint().height();
+                    int inputVOffset = height() - _input->tqsizeHint().height() - 2;
+                    int labelHeight = _label->tqsizeHint().height();
 		    _label->setGeometry(0, inputVOffset - labelHeight,
                                         width(), labelHeight);
 		    _input->setGeometry(0, inputVOffset,
-					width(), _input->sizeHint().height());
+					width(), _input->tqsizeHint().height());
 		    _label->show();
 		}
 	    else
@@ -138,7 +138,7 @@ void RunApplet::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->sizeHint().height();
+                    int newHeight = _input->tqsizeHint().height();
                     if (newHeight > height())
                         newHeight = height();
 		    _input->setGeometry(0, (height() - newHeight) / 2,
@@ -184,7 +184,7 @@ void RunApplet::setButtonText()
 
 int RunApplet::widthForHeight(int ) const
 {
-    return _label->sizeHint().width();
+    return _label->tqsizeHint().width();
 }
 
 int RunApplet::heightForWidth(int ) const
diff --git a/kicker/applets/swallow/prefwidgetbase.ui b/kicker/applets/swallow/prefwidgetbase.ui
index bd2673efa..1d3ef95bf 100644
--- a/kicker/applets/swallow/prefwidgetbase.ui
+++ b/kicker/applets/swallow/prefwidgetbase.ui
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp
index f171b1099..03be831e3 100644
--- a/kicker/applets/swallow/swallow.cpp
+++ b/kicker/applets/swallow/swallow.cpp
@@ -20,7 +20,7 @@
 
 #include <stdlib.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 
 #include <kapplication.h>
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp
index 3303135b3..570db2f92 100644
--- a/kicker/applets/systemtray/systemtrayapplet.cpp
+++ b/kicker/applets/systemtray/systemtrayapplet.cpp
@@ -388,7 +388,7 @@ void SystemTrayApplet::checkAutoRetract()
         return;
     }
 
-    if (!geometry().contains(mapFromGlobal(TQCursor::pos())))
+    if (!tqgeometry().contains(mapFromGlobal(TQCursor::pos())))
     {
         m_autoRetractTimer->stop();
         if (m_autoRetract)
@@ -427,12 +427,12 @@ void SystemTrayApplet::showExpandButton(bool show)
             if (orientation() == Qt::Vertical)
             {
                 m_expandButton->setFixedSize(width() - 4,
-                                             m_expandButton->sizeHint()
+                                             m_expandButton->tqsizeHint()
                                                             .height());
             }
             else
             {
-                m_expandButton->setFixedSize(m_expandButton->sizeHint()
+                m_expandButton->setFixedSize(m_expandButton->tqsizeHint()
                                                             .width(),
                                              height() - 4);
             }
@@ -869,7 +869,7 @@ int SystemTrayApplet::widthForHeight(int h) const
         me->setFixedHeight(h);
     }
 
-    return sizeHint().width(); 
+    return tqsizeHint().width(); 
 }
 
 int SystemTrayApplet::heightForWidth(int w) const
@@ -888,7 +888,7 @@ int SystemTrayApplet::heightForWidth(int w) const
         me->setFixedWidth(w);
     }
 
-    return sizeHint().height(); 
+    return tqsizeHint().height(); 
 }
 
 void SystemTrayApplet::moveEvent( TQMoveEvent* )
@@ -906,7 +906,7 @@ void SystemTrayApplet::resizeEvent( TQResizeEvent* )
 
 void SystemTrayApplet::layoutTray()
 {
-    setUpdatesEnabled(false);
+    tqsetUpdatesEnabled(false);
 
     int iconCount = m_shownWins.count();
 
@@ -927,11 +927,11 @@ void SystemTrayApplet::layoutTray()
     {
         if (orientation() == Qt::Vertical)
         {
-            m_expandButton->setFixedSize(width() - 4, m_expandButton->sizeHint().height());
+            m_expandButton->setFixedSize(width() - 4, m_expandButton->tqsizeHint().height());
         }
         else
         {
-            m_expandButton->setFixedSize(m_expandButton->sizeHint().width(), height() - 4);
+            m_expandButton->setFixedSize(m_expandButton->tqsizeHint().width(), height() - 4);
         }
     }
 
@@ -1102,7 +1102,7 @@ void SystemTrayApplet::layoutTray()
         }
     }
 
-    setUpdatesEnabled(true);
+    tqsetUpdatesEnabled(true);
     updateGeometry();
     setBackground();
 
@@ -1138,7 +1138,7 @@ TrayEmbed::TrayEmbed( bool kdeTray, TQWidget* parent )
 
 void TrayEmbed::getIconSize(int defaultIconSize)
 {
-    TQSize minSize = minimumSizeHint();
+    TQSize minSize = tqminimumSizeHint();
     
     int width = minSize.width();
     int height = minSize.height();
diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h
index 237921884..92aab7268 100644
--- a/kicker/applets/systemtray/systemtrayapplet.h
+++ b/kicker/applets/systemtray/systemtrayapplet.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqvaluevector.h>
 #include <tqstringlist.h>
 #include <tqevent.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <qxembed.h>
 
diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp
index f52fdc059..ebeec601f 100644
--- a/kicker/applets/taskbar/taskbarapplet.cpp
+++ b/kicker/applets/taskbar/taskbarapplet.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#include <layout.h>
-#include <palette.h>
+#include <tqlayout.h>
+#include <tqpalette.h>
 
 #include <kapplication.h>
 #include <kglobal.h>
@@ -82,7 +82,7 @@ int TaskbarApplet::widthForHeight(int h) const
     KPanelExtension::Position d = orientation() == Qt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
-    return container->sizeHint(d, TQSize(200, h)).width();
+    return container->tqsizeHint(d, TQSize(200, h)).width();
 }
 
 int TaskbarApplet::heightForWidth(int w) const
@@ -97,7 +97,7 @@ int TaskbarApplet::heightForWidth(int w) const
     KPanelExtension::Position d = orientation() == Qt::Horizontal ?
                                   KPanelExtension::Top :
                                   KPanelExtension::Left;
-    return container->sizeHint(d, TQSize(w, 200)).height();
+    return container->tqsizeHint(d, TQSize(w, 200)).height();
 }
 
 void TaskbarApplet::preferences()