Enable compilation with TQt for Qt4 3.4.0 TP2

This should not break compatibility with TQt for Qt3; if it does please fix it ASAP!


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

43 files changed, 409 insertions, 409 deletions

diff --git a/kicker/kicker/ui/addapplet.cpp b/kicker/kicker/ui/addapplet.cpp
index 796920ed4..47a2c5835 100644
--- a/kicker/kicker/ui/addapplet.cpp
+++ b/kicker/kicker/ui/addapplet.cpp
@@ -61,7 +61,7 @@ AppletWidget::AppletWidget(const AppletInfo& info, bool odd, TQWidget *parent)
       m_odd(odd),
       m_selected(false)
 {
-    setFocusPolicy(TQWidget::StrongFocus);
+    setFocusPolicy(TQ_StrongFocus);
     setSelected(m_selected);
     
     itemTitle->setText("<h3>" + info.name() + "</h3>");
@@ -84,8 +84,8 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 {
     if (e->type() == TQEvent::MouseButtonPress)
     {
-        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
-        if (me->button() & LeftButton)
+        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
+        if (me->button() & Qt::LeftButton)
         {
             m_dragStart = me->pos();
         }
@@ -97,7 +97,7 @@ bool AppletWidget::eventFilter(TQObject*, TQEvent* e)
 
     if (e->type() == TQEvent::MouseMove)
     {
-        TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+        TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
         if ((me->pos() - m_dragStart).manhattanLength() >
             KGlobalSettings::dndEventDelay())
         {
@@ -130,7 +130,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
     }
     else if (e->key() == Qt::Key_Up)
     {
-        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, Qt::Key_BackTab, 0, 0);
+        TQKeyEvent fakedKeyPress(TQEvent::KeyPress, TQt::Key_BackTab, 0, 0);
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_BackTab, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
@@ -150,7 +150,7 @@ void AppletWidget::keyPressEvent(TQKeyEvent *e)
 
 void AppletWidget::mousePressEvent(TQMouseEvent *e)
 {
-    if (e->button() == TQMouseEvent::LeftButton)
+    if (e->button() == Qt::LeftButton)
     {
         emit clicked(this);
         m_dragStart = e->pos();
@@ -162,7 +162,7 @@ void AppletWidget::mousePressEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseMoveEvent(TQMouseEvent *e)
 {
-    if (e->button() == TQMouseEvent::LeftButton &&
+    if (e->button() == Qt::LeftButton &&
         !m_dragStart.isNull() &&
         (e->pos() - m_dragStart).manhattanLength() >
          KGlobalSettings::dndEventDelay())
@@ -186,7 +186,7 @@ void AppletWidget::mouseReleaseEvent(TQMouseEvent *e)
 
 void AppletWidget::mouseDoubleClickEvent(TQMouseEvent *e)
 {
-    if (!e->button() == TQMouseEvent::LeftButton)
+    if (!e->button() == Qt::LeftButton)
     {
         AppletItem::mouseDoubleClickEvent(e);
         return;
@@ -291,7 +291,7 @@ void AddAppletDialog::resizeAppletView()
     {
         m_appletBox->layout()->activate();
         w = v->visibleWidth();
-        h = m_appletBox->layout()->minimumSize().height();
+        h = m_appletBox->tqlayout()->tqminimumSize().height();
         v->resizeContents(w, QMAX(h, v->visibleHeight()));
         if (w == m_appletBox->width() && h == m_appletBox->height())
         break;
@@ -305,7 +305,7 @@ bool AddAppletDialog::eventFilter(TQObject *o, TQEvent *e)
     if (e->type() == TQEvent::Resize)
         TQTimer::singleShot(0, this, TQT_SLOT(resizeAppletView()));
     
-    return TQObject::eventFilter(o, e);
+    return TQT_TQOBJECT(this)->TQObject::eventFilter(o, e);
 }
 
 void AddAppletDialog::populateApplets()
@@ -435,7 +435,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet)
 
             // reset the odd/even colouring from this item on down in the list
             bool odd = applet->odd();
-            AppletWidget::List::const_iterator it = m_appletWidgetList.find(applet);
+            AppletWidget::List::const_iterator it = m_appletWidgetList.tqfind(applet);
             for (; it != m_appletWidgetList.constEnd(); ++it)
             {
                 if ((*it)->isHidden())
@@ -456,7 +456,7 @@ void AddAppletDialog::addApplet(AppletWidget* applet)
     if (appletContainer)
     {
         ExtensionContainer* ec =
-           dynamic_cast<ExtensionContainer*>(m_containerArea->topLevelWidget());
+           dynamic_cast<ExtensionContainer*>(m_containerArea->tqtopLevelWidget());
 
         if (ec)
         {
@@ -484,8 +484,8 @@ bool AddAppletDialog::appletMatchesSearch(const AppletWidget* w,
 
     return (m_selectedType == AppletInfo::Undefined ||
             w->info().type() & m_selectedType) &&
-           (w->info().name().contains(s, false) ||
-            w->info().comment().contains(s, false));
+           (w->info().name().tqcontains(s, false) ||
+            w->info().comment().tqcontains(s, false));
 }
 
 void AddAppletDialog::delayedSearch()
diff --git a/kicker/kicker/ui/addapplet_mnu.cpp b/kicker/kicker/ui/addapplet_mnu.cpp
index 6d5c4482f..19bbf0f11 100644
--- a/kicker/kicker/ui/addapplet_mnu.cpp
+++ b/kicker/kicker/ui/addapplet_mnu.cpp
@@ -54,11 +54,11 @@ void PanelAddAppletMenu::slotAboutToShow()
 
         if (ai.icon().isEmpty() || ai.icon() == "unknown")
         {
-            insertItem(ai.name().replace( "&", "&&" ), i);
+            insertItem(ai.name().tqreplace( "&", "&&" ), i);
         }
         else
         {
-            insertItem(SmallIconSet(ai.icon()), ai.name().replace( "&", "&&" ), i);
+            insertItem(SmallIconSet(ai.icon()), ai.name().tqreplace( "&", "&&" ), i);
         }
 
         if (ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai))
diff --git a/kicker/kicker/ui/addapplet_mnu.h b/kicker/kicker/ui/addapplet_mnu.h
index caedb4fdb..79c539687 100644
--- a/kicker/kicker/ui/addapplet_mnu.h
+++ b/kicker/kicker/ui/addapplet_mnu.h
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ContainerArea;
 
-class PanelAddAppletMenu : public QPopupMenu
+class PanelAddAppletMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/addappletvisualfeedback.cpp b/kicker/kicker/ui/addappletvisualfeedback.cpp
index acd82a066..7f4f90676 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.cpp
+++ b/kicker/kicker/ui/addappletvisualfeedback.cpp
@@ -54,7 +54,7 @@ AddAppletVisualFeedback::AddAppletVisualFeedback(AppletWidget* widget,
       m_moveTimer(0, "m_moveTimer"),
       m_dirty(false)
 {
-    setFocusPolicy(NoFocus);
+    setFocusPolicy(TQ_NoFocus);
     setBackgroundMode(NoBackground);
     connect(&m_moveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(swoopCloser()));
 
@@ -157,7 +157,7 @@ void AddAppletVisualFeedback::displayInternal()
     // draw background
     TQPainter bufferPainter(&m_pixmap);
     bufferPainter.setPen(Qt::black);
-    bufferPainter.setBrush(colorGroup().background());
+    bufferPainter.setBrush(tqcolorGroup().background());
     bufferPainter.drawRoundRect(0, 0, width, height,
                                 1600 / width, 1600 / height);
 
@@ -175,14 +175,14 @@ void AddAppletVisualFeedback::displayInternal()
         int textY = (height - textRect.height()) / 2;
 
         // draw text shadow
-        TQColorGroup cg = colorGroup();
+        TQColorGroup cg = tqcolorGroup();
         cg.setColor(TQColorGroup::Text, cg.background().dark(115));
         int shadowOffset = TQApplication::reverseLayout() ? -1 : 1;
         m_richText->draw(&bufferPainter, 5 + textX + shadowOffset,
                          textY + 1, TQRect(), cg);
 
         // draw text
-        cg = colorGroup();
+        cg = tqcolorGroup();
         m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
     }
 }
@@ -225,7 +225,7 @@ void AddAppletVisualFeedback::swoopCloser()
 void AddAppletVisualFeedback::internalUpdate()
 {
     m_dirty = true;
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "addappletvisualfeedback.moc"
diff --git a/kicker/kicker/ui/addappletvisualfeedback.h b/kicker/kicker/ui/addappletvisualfeedback.h
index 02899ee36..dc660bff1 100644
--- a/kicker/kicker/ui/addappletvisualfeedback.h
+++ b/kicker/kicker/ui/addappletvisualfeedback.h
@@ -38,7 +38,7 @@ class TQPaintEvent;
 class TQSimpleRichText;
 class TQTimer;
 
-class AddAppletVisualFeedback : QWidget
+class AddAppletVisualFeedback : TQWidget
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/addbutton_mnu.cpp b/kicker/kicker/ui/addbutton_mnu.cpp
index 02c4718d4..c04a832e6 100644
--- a/kicker/kicker/ui/addbutton_mnu.cpp
+++ b/kicker/kicker/ui/addbutton_mnu.cpp
@@ -46,7 +46,7 @@ PanelAddButtonMenu::PanelAddButtonMenu(ContainerArea* cArea, TQWidget * parent,
 
 void PanelAddButtonMenu::slotExec(int id)
 {
-    if (!entryMap_.contains(id))
+    if (!entryMap_.tqcontains(id))
 	return;
 
     KSycocaEntry * e = entryMap_[id];
diff --git a/kicker/kicker/ui/addextension_mnu.cpp b/kicker/kicker/ui/addextension_mnu.cpp
index b22187443..325897a8c 100644
--- a/kicker/kicker/ui/addextension_mnu.cpp
+++ b/kicker/kicker/ui/addextension_mnu.cpp
@@ -44,7 +44,7 @@ void PanelAddExtensionMenu::slotAboutToShow()
     AppletInfo::List::const_iterator it = extensions.constBegin();
     for( int i = 0; it != extensions.constEnd(); ++it, ++i ) {
         const AppletInfo& ai = (*it);
-        insertItem( ai.name().replace( "&", "&&" ), i );
+        insertItem( ai.name().tqreplace( "&", "&&" ), i );
         if ( ai.isUniqueApplet() && PluginManager::the()->hasInstance(ai) ) {
             setItemEnabled( i, false );
             setItemChecked( i, true );
diff --git a/kicker/kicker/ui/addextension_mnu.h b/kicker/kicker/ui/addextension_mnu.h
index a91986e19..76163250f 100644
--- a/kicker/kicker/ui/addextension_mnu.h
+++ b/kicker/kicker/ui/addextension_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "appletinfo.h"
 
-class PanelAddExtensionMenu : public QPopupMenu
+class PanelAddExtensionMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/appletitem.ui b/kicker/kicker/ui/appletitem.ui
index d9cc2d9b0..dc6faab50 100644
--- a/kicker/kicker/ui/appletitem.ui
+++ b/kicker/kicker/ui/appletitem.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AppletItem</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AppletItem</cstring>
     </property>
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>80</height>
@@ -39,7 +39,7 @@
         <property name="margin">
             <number>2</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>layout11</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemTitle</cstring>
                     </property>
@@ -65,11 +65,11 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemDescription</cstring>
                     </property>
@@ -87,13 +87,13 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -101,11 +101,11 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemPixmap</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>64</width>
                             <height>64</height>
@@ -117,7 +117,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
diff --git a/kicker/kicker/ui/appletop_mnu.cpp b/kicker/kicker/ui/appletop_mnu.cpp
index e0e162d33..2bd8f7bd0 100644
--- a/kicker/kicker/ui/appletop_mnu.cpp
+++ b/kicker/kicker/ui/appletop_mnu.cpp
@@ -41,7 +41,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
     bool isButton = (parent && parent->inherits("ButtonContainer"));
     bool isMenu = false;
     TQString titleText = title;
-    titleText = titleText.replace('&', "&&");
+    titleText = titleText.tqreplace('&', "&&");
     if (isButton)
     {
         isMenu = static_cast<ButtonContainer*>(parent)->isAMenu();
@@ -52,13 +52,13 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         TQString text = isButton ? (isMenu ? i18n("&Move %1 Menu") :
                                             i18n("&Move %1 Button")) :
                                   i18n("&Move %1");
-        insertItem(SmallIcon("move"), text.arg(titleText), Move);
+        insertItem(SmallIcon("move"), text.tqarg(titleText), Move);
 
         // we look for a container area to see if we can add containers
         // this is part of the kiosk support in kicker, allowing
         // one to block users from adding new containers
         ContainerArea* area = 0;
-        TQObject* findTheArea = parent ? parent->parent() : 0;
+        TQObject* findTheArea = parent ? parent->tqparent() : 0;
         while (findTheArea)
         {
             area = dynamic_cast<ContainerArea*>(findTheArea);
@@ -68,7 +68,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
                 break;
             }
 
-            findTheArea = findTheArea->parent();
+            findTheArea = findTheArea->tqparent();
         }
 
         if  (!area || area->canAddContainers())
@@ -76,7 +76,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
             text = isButton ? (isMenu ? i18n("&Remove %1 Menu") :
                                         i18n("&Remove %1 Button")) :
                               i18n("&Remove %1");
-            insertItem(SmallIcon("remove"), text.arg(titleText), Remove);
+            insertItem(SmallIcon("remove"), text.tqarg(titleText), Remove);
             needSeparator = true;
         }
     }
@@ -103,7 +103,7 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
                                                      KIcon::Small, 0,
                                                      KIcon::DefaultState,
                                                      0, true));
-        insertItem(iconPix, i18n("&About %1").arg( titleText ), About);
+        insertItem(iconPix, i18n("&About %1").tqarg( titleText ), About);
         needSeparator = !(actions & KPanelApplet::Help);
     }
 
@@ -123,12 +123,12 @@ PanelAppletOpMenu::PanelAppletOpMenu(int actions, TQPopupMenu *opMenu, const TQP
         if (isButton)
         {
             insertItem(SmallIcon("configure"),
-                       i18n("&Configure %1 Button...").arg(titleText), Preferences);
+                       i18n("&Configure %1 Button...").tqarg(titleText), Preferences);
         }
         else
         {
             insertItem(SmallIcon("configure"),
-                       i18n("&Configure %1...").arg(titleText), Preferences);
+                       i18n("&Configure %1...").tqarg(titleText), Preferences);
         }
         needSeparator = true;
     }
diff --git a/kicker/kicker/ui/appletop_mnu.h b/kicker/kicker/ui/appletop_mnu.h
index 4b396a83d..35e10be3c 100644
--- a/kicker/kicker/ui/appletop_mnu.h
+++ b/kicker/kicker/ui/appletop_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class AppletInfo;
 
 // The button operations menu (usually right click)
-class PanelAppletOpMenu : public QPopupMenu
+class PanelAppletOpMenu : public TQPopupMenu
 {
 Q_OBJECT
 
diff --git a/kicker/kicker/ui/appletview.ui b/kicker/kicker/ui/appletview.ui
index a2fa1e91b..4ba0f38e8 100644
--- a/kicker/kicker/ui/appletview.ui
+++ b/kicker/kicker/ui/appletview.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AppletView</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AppletView</cstring>
     </property>
@@ -19,7 +19,7 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout8</cstring>
             </property>
@@ -27,7 +27,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel8</cstring>
                     </property>
@@ -38,7 +38,7 @@
                         <cstring>appletSearch</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>appletSearch</cstring>
                     </property>
@@ -54,7 +54,7 @@
                         <string>&lt;qt&gt;Type here some text to filter on the applet names and comments&lt;/qt&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel1</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <cstring>appletFilter</cstring>
                     </property>
                 </widget>
-                <widget class="QComboBox">
+                <widget class="TQComboBox">
                     <item>
                         <property name="text">
                             <string>All</string>
@@ -98,7 +98,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QScrollView">
+        <widget class="TQScrollView">
             <property name="name">
                 <cstring>appletScrollView</cstring>
             </property>
@@ -110,7 +110,7 @@
                     <verstretch>1</verstretch>
                 </sizepolicy>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>32767</width>
                     <height>32767</height>
@@ -123,7 +123,7 @@
                 <string>&lt;qt&gt;This is the applet list. Select an applet and click on &lt;b&gt;Add to panel&lt;/b&gt; to add it&lt;/qt&gt;</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>layout3</cstring>
             </property>
@@ -141,7 +141,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>284</width>
                             <height>20</height>
@@ -171,7 +171,7 @@
 <customwidgets>
     <customwidget>
         <class>QScrollView</class>
-        <header location="global">qscrollview.h</header>
+        <header location="global">tqscrollview.h</header>
         <sizehint>
             <width>-1</width>
             <height>-1</height>
@@ -197,7 +197,7 @@
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>qscrollview.h</includehint>
+    <includehint>tqscrollview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
 </includehints>
diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp
index 2250475b4..46f79db2b 100644
--- a/kicker/kicker/ui/browser_mnu.cpp
+++ b/kicker/kicker/ui/browser_mnu.cpp
@@ -129,7 +129,7 @@ void PanelBrowserMenu::initialize()
     }
 
     // get entry list
-    const QFileInfoList *list = dir.entryInfoList();
+    const TQFileInfoList *list = dir.entryInfoList();
 
     // no list -> read error
     if (!list) {
@@ -163,7 +163,7 @@ void PanelBrowserMenu::initialize()
     int run_id = _startid;
 
     // get list iterator
-    QFileInfoListIterator it(*list);
+    TQFileInfoListIterator it(*list);
 
     // jump to startid
     it += _startid;
@@ -244,7 +244,7 @@ void PanelBrowserMenu::initialize()
                 title = c.readEntry("Name", title);
 
                 TQString s = c.readEntry("Icon");
-                if(!_icons->contains(s)) {
+                if(!_icons->tqcontains(s)) {
                     icon  = KGlobal::iconLoader()->loadIcon(s, KIcon::Small, KIcon::SizeSmall,
                                                             KIcon::DefaultState, 0, true);
 
@@ -344,7 +344,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, con
     // avoid &'s being converted to accelerators
     TQString newTitle = title;
     newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 );
-    newTitle.replace("&", "&&");
+    newTitle.tqreplace("&", "&&");
 
     // insert menu item
     int id = insertItem(pixmap, newTitle);
@@ -362,7 +362,7 @@ void PanelBrowserMenu::append(const TQPixmap &pixmap, const TQString &title, Pan
     // avoid &'s being converted to accelerators
     TQString newTitle = title;
     newTitle = KStringHandler::cEmSqueeze( newTitle, fontMetrics(), 20 );
-    newTitle.replace("&", "&&");
+    newTitle.tqreplace("&", "&&");
 
     // insert submenu
     insertItem(pixmap, newTitle, subMenu);
@@ -380,7 +380,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
 {
     TQPopupMenu::mouseMoveEvent(e);
 
-    if (!(e->state() & LeftButton)) return;
+    if (!(e->state() & Qt::LeftButton)) return;
     if(_lastpress == TQPoint(-1, -1)) return;
 
     // DND delay
@@ -388,7 +388,7 @@ void PanelBrowserMenu::mouseMoveEvent(TQMouseEvent *e)
 
     // get id
     int id = idAt(_lastpress);
-    if(!_filemap.contains(id)) return;
+    if(!_filemap.tqcontains(id)) return;
 
     // reset _lastpress
     _lastpress = TQPoint(-1, -1);
@@ -429,7 +429,7 @@ void PanelBrowserMenu::dragMoveEvent(TQDragMoveEvent *ev)
 void PanelBrowserMenu::dropEvent( TQDropEvent *ev )
 {
     KURL u( path() );
-    KFileItem item( u, TQString::fromLatin1( "inode/directory" ),  KFileItem::Unknown );
+    KFileItem item( u, TQString::tqfromLatin1( "inode/directory" ),  KFileItem::Unknown );
     KonqOperations::doDrop( &item, u, ev, this );
     KPanelMenu::dropEvent(ev);
     // ### TODO: Update list
@@ -439,7 +439,7 @@ void PanelBrowserMenu::slotExec(int id)
 {
     kapp->propagateSessionManager();
 
-    if(!_filemap.contains(id)) return;
+    if(!_filemap.tqcontains(id)) return;
 
     KURL url;
     url.setPath(path() + "/" + _filemap[id]);
@@ -494,9 +494,9 @@ void PanelBrowserMenu::slotMimeCheck()
 //    kdDebug() << url.url() << ": " << icon << endl;
 
     file = KStringHandler::cEmSqueeze( file, fontMetrics(), 20 );
-    file.replace("&", "&&");
+    file.tqreplace("&", "&&");
 
-    if(!_icons->contains(icon)) {
+    if(!_icons->tqcontains(icon)) {
         TQPixmap pm = SmallIcon(icon);
         if( pm.height() > 16 )
         {
diff --git a/kicker/kicker/ui/clicklineedit.cpp b/kicker/kicker/ui/clicklineedit.cpp
index 52cb8776d..debe91d3e 100644
--- a/kicker/kicker/ui/clicklineedit.cpp
+++ b/kicker/kicker/ui/clicklineedit.cpp
@@ -22,7 +22,7 @@
 
 #include "clicklineedit.h"
 
-#include "qpainter.h"
+#include "tqpainter.h"
 
 using namespace KPIM;
 
@@ -39,13 +39,13 @@ ClickLineEdit::~ClickLineEdit() {}
 void ClickLineEdit::setClickMessage( const TQString &msg )
 {
   mClickMessage = msg;
-  repaint();
+  tqrepaint();
 }
 
 void ClickLineEdit::setText( const TQString &txt )
 {
   mDrawClickMsg = txt.isEmpty();
-  repaint();
+  tqrepaint();
   KLineEdit::setText( txt );
 }
 
@@ -67,7 +67,7 @@ void ClickLineEdit::focusInEvent( TQFocusEvent *ev )
   if ( mDrawClickMsg == true ) 
   { 
     mDrawClickMsg = false;
-    repaint();
+    tqrepaint();
   }
   TQLineEdit::focusInEvent( ev );
 }
@@ -77,7 +77,7 @@ void ClickLineEdit::focusOutEvent( TQFocusEvent *ev )
   if ( text().isEmpty() )
   {
     mDrawClickMsg = true;
-    repaint();
+    tqrepaint();
   }
   TQLineEdit::focusOutEvent( ev );
 }
diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp
index 9736351e1..deaae70b9 100644
--- a/kicker/kicker/ui/client_mnu.cpp
+++ b/kicker/kicker/ui/client_mnu.cpp
@@ -59,7 +59,7 @@ void KickerClientMenu::insertItem( TQString text, int id )
 TQCString KickerClientMenu::insertMenu( TQPixmap icon, TQString text, int id )
 {
     TQString subname("%1-submenu%2");
-    TQCString subid = subname.arg(objId()).arg(id).local8Bit();
+    TQCString subid = subname.tqarg(static_cast<const char *>(objId())).tqarg(id).local8Bit();
     KickerClientMenu *sub = new KickerClientMenu(this, subid);
     int globalid = TQPopupMenu::insertItem( icon, text, sub, id);
     setItemParameter( globalid, id );
diff --git a/kicker/kicker/ui/dirdrop_mnu.h b/kicker/kicker/ui/dirdrop_mnu.h
index d05187400..ffa157c85 100644
--- a/kicker/kicker/ui/dirdrop_mnu.h
+++ b/kicker/kicker/ui/dirdrop_mnu.h
@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpopupmenu.h>
 
 // The directory dropped menu
-class PanelDirDropMenu : public QPopupMenu
+class PanelDirDropMenu : public TQPopupMenu
 {
 public:
     enum OpButton{Url=1, Browser};
diff --git a/kicker/kicker/ui/exe_dlg.cpp b/kicker/kicker/ui/exe_dlg.cpp
index cb0d42c56..0829f6ccb 100644
--- a/kicker/kicker/ui/exe_dlg.cpp
+++ b/kicker/kicker/ui/exe_dlg.cpp
@@ -78,8 +78,8 @@ PanelExeDialog::PanelExeDialog(const TQString& title, const TQString& descriptio
             this, TQT_SLOT(slotIconChanged(TQString)));
 
     // leave decent space for the commandline
-    resize(sizeHint().width() > 300 ? sizeHint().width() : 300,
-           sizeHint().height());
+    resize(tqsizeHint().width() > 300 ? tqsizeHint().width() : 300,
+           tqsizeHint().height());
 }
 
 void PanelExeDialog::slotOk()
@@ -135,11 +135,11 @@ void PanelExeDialog::fillCompletion()
         TQDir d( (*it) );
         d.setFilter( TQDir::Files | TQDir::Executable );
 
-        const QFileInfoList *list = d.entryInfoList();
+        const TQFileInfoList *list = d.entryInfoList();
         if (!list)
             continue;
 
-        QFileInfoListIterator it2( *list );
+        TQFileInfoListIterator it2( *list );
         TQFileInfo *fi;
 
         while ( (fi = it2.current()) != 0 ) {
@@ -164,7 +164,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
     }
 
     TQString exeLocation = str;
-    TQMap<TQString, TQString>::iterator it = m_partialPath2full.find(str);
+    TQMap<TQString, TQString>::iterator it = m_partialPath2full.tqfind(str);
 
     if (it != m_partialPath2full.end())
         exeLocation = it.data();
@@ -174,7 +174,7 @@ void PanelExeDialog::slotTextChanged(const TQString &str)
 
 void PanelExeDialog::slotReturnPressed()
 {
-    if (m_partialPath2full.contains(ui->m_exec->url()))
+    if (m_partialPath2full.tqcontains(ui->m_exec->url()))
         ui->m_exec->setURL(m_partialPath2full[ui->m_exec->url()]);
 }
 
diff --git a/kicker/kicker/ui/extensionop_mnu.cpp b/kicker/kicker/ui/extensionop_mnu.cpp
index a30434a48..582c44b46 100644
--- a/kicker/kicker/ui/extensionop_mnu.cpp
+++ b/kicker/kicker/ui/extensionop_mnu.cpp
@@ -59,7 +59,7 @@ PanelExtensionOpMenu::PanelExtensionOpMenu(const TQString& extension, int action
 
     if (!Kicker::the()->isImmutable() && (actions & KPanelExtension::Preferences)) {
 	insertSeparator();
-	insertItem(SmallIcon("configure"), i18n("&Configure %1...").arg(extension), Preferences);
+	insertItem(SmallIcon("configure"), i18n("&Configure %1...").tqarg(extension), Preferences);
     }
 
     adjustSize();
diff --git a/kicker/kicker/ui/extensionop_mnu.h b/kicker/kicker/ui/extensionop_mnu.h
index 01bda4340..a1fa63cd6 100644
--- a/kicker/kicker/ui/extensionop_mnu.h
+++ b/kicker/kicker/ui/extensionop_mnu.h
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpopupmenu.h>
 
-class PanelExtensionOpMenu : public QPopupMenu
+class PanelExtensionOpMenu : public TQPopupMenu
 {
 public:
     enum OpButton{Move = 9900, Remove = 9901, Help = 9902, About = 9903, Preferences = 9904, ReportBug = 9905, Shade = 9906 };
diff --git a/kicker/kicker/ui/flipscrollview.cpp b/kicker/kicker/ui/flipscrollview.cpp
index ae96ebcaa..fb5cfd422 100644
--- a/kicker/kicker/ui/flipscrollview.cpp
+++ b/kicker/kicker/ui/flipscrollview.cpp
@@ -57,7 +57,7 @@ void BackFrame::drawContents( TQPainter *p )
 {
     TQColor gray( 230, 230, 230 );
     if ( mouse_inside )
-        p->fillRect( 3, 3, width() - 6, height() - 6, colorGroup().color( TQColorGroup::Highlight ) );
+        p->fillRect( 3, 3, width() - 6, height() - 6, tqcolorGroup().color( TQColorGroup::Highlight ) );
     else
         p->fillRect( 3, 3, width() - 6, height() - 6, gray );
     p->setPen( gray.dark(110) );
@@ -270,7 +270,7 @@ void FlipScrollView::slotScrollTimer()
         if (!mSelectMenuPath.isEmpty()) {
             if (mSelectMenuPath=="kicker:/goup/") {
                 currentView()->setSelected(currentView()->firstChild(),true);
-                currentView()->firstChild()->repaint();
+                currentView()->firstChild()->tqrepaint();
             }
             else {
                 TQListViewItem * child = currentView()->firstChild();
@@ -278,8 +278,8 @@ void FlipScrollView::slotScrollTimer()
                     KMenuItem* kitem = dynamic_cast<KMenuItem*>(child);
                     if (kitem && kitem->menuPath()==mSelectMenuPath) {
                         currentView()->setSelected(child,true);
-                        kdDebug() << "child repaint\n";
-                        child->repaint();
+                        kdDebug() << "child tqrepaint\n";
+                        child->tqrepaint();
                         break;
                     }
                     child = child->nextSibling();
diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp
index a73e0a48d..58bde0457 100644
--- a/kicker/kicker/ui/hidebutton.cpp
+++ b/kicker/kicker/ui/hidebutton.cpp
@@ -51,22 +51,22 @@ void HideButton::drawButton(TQPainter *p)
 {
     if (m_arrow == Qt::LeftArrow)
     {
-        p->setPen(colorGroup().mid());
+        p->setPen(tqcolorGroup().mid());
         p->drawLine(width()-1, 0, width()-1, height());
     }
     else if (m_arrow == Qt::RightArrow)
     {
-        p->setPen(colorGroup().mid());
+        p->setPen(tqcolorGroup().mid());
         p->drawLine(0, 0, 0, height());
     }
     else if (m_arrow == Qt::UpArrow)
     {
-        p->setPen(colorGroup().mid());
+        p->setPen(tqcolorGroup().mid());
         p->drawLine(0, height()-1, width(), height()-1);
     }
     else if (m_arrow == Qt::DownArrow)
     {
-        p->setPen(colorGroup().mid());
+        p->setPen(tqcolorGroup().mid());
         p->drawLine(0, 0, width(), 0);
     }
 
@@ -138,7 +138,7 @@ void HideButton::generateIcons()
     }
 
     TQImage image = pixmap()->convertToImage();
-    image = image.smoothScale(size() - TQSize(4, 4), TQImage::ScaleMin);
+    image = image.smoothScale(size() - TQSize(4, 4), TQ_ScaleMin);
 
     KIconEffect effect;
 
@@ -173,14 +173,14 @@ void HideButton::slotIconChanged(int group)
     }
 
     generateIcons();
-    repaint(false);
+    tqrepaint(false);
 }
 
 void HideButton::enterEvent(TQEvent *e)
 {
     m_highlight = true;
 
-    repaint(false);
+    tqrepaint(false);
     TQButton::enterEvent(e);
 }
 
@@ -188,7 +188,7 @@ void HideButton::leaveEvent(TQEvent *e)
 {
     m_highlight = false;
 
-    repaint(false);
+    tqrepaint(false);
     TQButton::enterEvent(e);
 }
 
diff --git a/kicker/kicker/ui/hidebutton.h b/kicker/kicker/ui/hidebutton.h
index 9a6c4612e..bb68929a1 100644
--- a/kicker/kicker/ui/hidebutton.h
+++ b/kicker/kicker/ui/hidebutton.h
@@ -23,7 +23,7 @@
 #include <tqbutton.h>
 #include <tqpixmap.h>
 
-class HideButton : public QButton
+class HideButton : public TQButton
 {
   Q_OBJECT
 
diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp
index dcb4760c1..d7df05170 100644
--- a/kicker/kicker/ui/itemview.cpp
+++ b/kicker/kicker/ui/itemview.cpp
@@ -99,16 +99,16 @@ static double pointSize( double pixelSize, TQPaintDevice *w )
 
 static int pixelSize( double pixelSize, TQPaintDevice *w )
 {
-    return qRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. );
+    return tqRound( pixelSize * TQPaintDevice::x11AppDpiY( w->x11Screen () ) / 72. );
 }
 
 void KMenuItem::init()
 {
     setMultiLinesEnabled(true);
     m_s = 0;
-    m_path = TQString::null;
-    m_icon = TQString::null;
-    m_menuPath = TQString::null;
+    m_path = TQString();
+    m_icon = TQString();
+    m_menuPath = TQString();
     setDragEnabled(true);
     m_has_children = false;
     m_old_width = -1;
@@ -145,28 +145,28 @@ void KMenuItem::setIcon(const TQString& icon, int size)
 void KMenuItem::setHasChildren( bool flag )
 {
     m_has_children = flag;
-    repaint();
+    tqrepaint();
 }
 
 void KMenuItem::setup()
 {
     // if someone configured a larger generalFont than 10pt, he might have a _real_ problem with 7pt
     // the 7pt could be read out of konquerorrc I guess
-    float min_font_size = 7. * QMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.);
+    float min_font_size = 7. * TQMAX(1., KGlobalSettings::generalFont().pointSizeFloat() / 10.);
 
     const int expected_height = 38;
-    description_font_size = QMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
-    title_font_size = QMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
+    description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ;
+    title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 );
 
     //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl;
     TQListViewItem::setup();
-    setHeight( (int)QMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView())));
+    setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView()))));
 }
 
 void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align)
 {
     ItemView *listview = static_cast<ItemView*>( listView() );
-    int bottom = listView()->itemRect( this ).bottom();
+    int bottom = listView()->tqitemRect( this ).bottom();
     int diff = bottom - listView()->viewport()->height();
 
     KPixmap pm;
@@ -197,7 +197,7 @@ void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int
             else
                 listview->m_lastOne = static_cast<KMenuItem*>( itemBelow() );
             listview->m_old_contentY = -1;
-            repaint();
+            tqrepaint();
         }
     }
 }
@@ -275,7 +275,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
     if ( m_description.isEmpty() )
         spacing = ( height() - f1h ) / 2;
 
-    int right_triangle_size = pixelSize( 7, listView() );
+    int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) );
 
     int right_margin = listView()->verticalScrollBar()->width();
     if ( m_has_children )
@@ -315,7 +315,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
         pp.fillRect( 0, 0, off.width(), off.height(), backg );
 
         TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 );
-        if ( qGray( myColor.rgb() ) == 0 )
+        if ( tqGray( myColor.rgb() ) == 0 )
             myColor = TQColor( 100, 100, 110 );
         pp.setPen( myColor );
         pp.setPen( isSelected() ? cg.color( TQColorGroup::Mid ) : myColor );
@@ -350,7 +350,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column
     {
         // the listview caches paint events
         m_old_width = width;
-        repaint();
+        tqrepaint();
     }
 }
 
@@ -371,9 +371,9 @@ void KMenuItemSeparator::setup()
     TQFontMetrics fm(f);
     f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() );
     if ( itemAbove() && !text( 0 ).isEmpty() )
-        setHeight( (int)QMAX( 34., fm.height() * 1.4) );
+        setHeight( (int)TQMAX( 34., fm.height() * 1.4) );
     else
-        setHeight( (int)QMAX( 26., fm.height() * 1.4 ) );
+        setHeight( (int)TQMAX( 26., fm.height() * 1.4 ) );
 }
 
 void KMenuItemSeparator::setLink( const TQString &text, const TQString &url )
@@ -385,7 +385,7 @@ void KMenuItemSeparator::setLink( const TQString &text, const TQString &url )
 
 bool KMenuItemSeparator::hitsLink( const TQPoint &pos )
 {
-    return m_link_rect.contains( pos );
+    return m_link_rect.tqcontains( pos );
 }
 
 void KMenuItemSeparator::preparePixmap( int width )
@@ -424,7 +424,7 @@ void KMenuItemSeparator::paintCell(TQPainter* p, const TQColorGroup & cg, int co
       f.setPointSize( 8 + KickerSettings::kickoffFontPointSizeOffset() );
       p->setFont( f );
       TQColor myColor = cg.color( TQColorGroup::Text ).light( 200 );
-      if ( qGray( myColor.rgb() ) == 0 )
+      if ( tqGray( myColor.rgb() ) == 0 )
           myColor = TQColor( 100, 100, 110 );
       p->setPen( myColor );
       int twidth = p->fontMetrics().width(text(0));
@@ -501,7 +501,7 @@ void KMenuItemHeader::setup()
     KMenuItem::setup();
 
     TQFontMetrics fm( listView()->font() );
-    setHeight( QMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) );
+    setHeight( TQMAX( int( texts.count() * fm.height() + ( texts.count() + 1 ) * 2 + 10 ), height()) );
     // nada
 }
 
@@ -528,7 +528,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int
     int r = left_margin + margin * 2;
 
     const int min_font_size = 7;
-    int title_font_pixelSize = qRound( pixelSize( QMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) );
+    int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) );
 
     TQFont f1 = p->font();
     f1.setPixelSize( title_font_pixelSize );
@@ -538,7 +538,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int
     p->setPen( cg.color( TQColorGroup::Text ) );
 
     const int text_margin = 2;
-    int spacing = ( height() - texts.count() * f1h - QMAX( texts.count() - 1, 0 ) * text_margin ) / 2;
+    int spacing = ( height() - texts.count() * f1h - TQMAX( texts.count() - 1, 0 ) * text_margin ) / 2;
 
     for ( uint i = 0; i < texts.count(); ++i )
     {
@@ -608,7 +608,7 @@ void ItemViewTip::maybeTip( const TQPoint &pos )
     if ( item->toolTip().isNull() )
         return;
 
-    TQRect r = view->itemRect( item );
+    TQRect r = view->tqitemRect( item );
     int headerPos = view->header()->sectionPos( 0 );
     r.setLeft( headerPos );
     r.setRight( headerPos + view->header()->sectionSize( 0 ) );
@@ -632,7 +632,7 @@ ItemView::ItemView(TQWidget* parent, const char* name)
     setItemMargin(0);
     setSorting(-1);
     setTreeStepSize(38);
-    setFocusPolicy(TQWidget::NoFocus);
+    setFocusPolicy(TQ_NoFocus);
 
     m_lastOne = 0;
     m_old_contentY = -1;
@@ -715,7 +715,7 @@ KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, con
 KMenuItem* ItemView::insertItem( const TQString& icon, const TQString& text, const TQString& description,
                                  int nId, int nIndex, KMenuItem *parent)
 {
-   return insertItem( icon, text, description, TQString::null, nId, nIndex, parent);
+   return insertItem( icon, text, description, TQString(), nId, nIndex, parent);
 }
 
 int ItemView::setItemEnabled(int id, bool enabled)
@@ -761,8 +761,8 @@ void ItemView::slotMoveContent()
     int item_height = 0;
     TQListViewItemIterator it( this );
     while ( it.current() ) {
-        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() )  {
-            it.current()->invalidateHeight();
+        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() )  {
+            it.current()->tqinvalidateHeight();
             item_height += it.current()->totalHeight();
         }
         ++it;
@@ -915,7 +915,7 @@ void ItemView::contentsMousePressEvent ( TQMouseEvent * e )
     KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( itemAt( vp ) );
     if ( si )
     {
-        if ( si->hitsLink( vp - itemRect(si).topLeft() ) )
+        if ( si->hitsLink( vp - tqitemRect(si).topLeft() ) )
             emit startURL( si->linkUrl() );
     }
 }
@@ -928,7 +928,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
     bool link_cursor = false;
     KMenuItemSeparator *si = dynamic_cast<KMenuItemSeparator*>( i );
     if ( si )
-        link_cursor = si->hitsLink( vp - itemRect(si).topLeft() );
+        link_cursor = si->hitsLink( vp - tqitemRect(si).topLeft() );
 
     if (i && !i->isSelectable() && !link_cursor) {
       unsetCursor();
@@ -941,7 +941,7 @@ void ItemView::contentsMouseMoveEvent(TQMouseEvent *e)
     if (m_mouseMoveSelects) {
       if(i && i->isEnabled() && !i->isSelected() &&
          // FIXME: This is wrong if you drag over the items.
-         (e->state() & (LeftButton|MidButton|RightButton)) == 0)
+         (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
           KListView::setSelected(i, true);
       else if (!i && selectedItem())
           KListView::setSelected(selectedItem(), false);
@@ -965,7 +965,7 @@ void ItemView::resizeEvent ( TQResizeEvent * e )
 {
     KListView::resizeEvent( e );
 //    if ( m_lastOne )
-//        int diff = itemRect( m_lastOne ).bottom() - viewport()->height();
+//        int diff = tqitemRect( m_lastOne ).bottom() - viewport()->height();
 }
 
 void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
@@ -975,7 +975,7 @@ void ItemView::viewportPaintEvent ( TQPaintEvent * pe )
 
     if ( m_lastOne && m_old_contentY != contentsY() ) {
         m_old_contentY = contentsY();
-        m_lastOne->repaint();
+        m_lastOne->tqrepaint();
     }
 }
 
@@ -984,7 +984,7 @@ void ItemView::clear()
     KListView::clear();
     m_lastOne = 0;
     m_old_contentY = -1;
-    m_back_url = TQString::null;
+    m_back_url = TQString();
 }
 
 void ItemView::contentsWheelEvent(TQWheelEvent *e)
@@ -996,7 +996,7 @@ void ItemView::contentsWheelEvent(TQWheelEvent *e)
 
     if(i && i->isEnabled() && !i->isSelected() &&
        // FIXME: This is wrong if you drag over the items.
-       (e->state() & (LeftButton|MidButton|RightButton)) == 0)
+       (e->state() & (Qt::LeftButton|Qt::MidButton|Qt::RightButton)) == 0)
         KListView::setSelected(i, true);
     else if (!i && selectedItem())
         KListView::setSelected(selectedItem(), false);
@@ -1022,14 +1022,14 @@ TQDragObject * ItemView::dragObject()
 
       TQBitmap mask;
 
-      if (pix.mask())
-          mask = *pix.mask();
+      if (pix.tqmask())
+          mask = *pix.tqmask();
       else {
 	  mask.resize(pix.size());
 	  mask.fill(Qt::color1);
       }
 
-      bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.mask(), 0, 0, add.width(), add.height(), OrROP );
+      bitBlt( &mask, pix.width()-add.width(), pix.height()-add.height(), add.tqmask(), 0, 0, add.width(), add.height(), OrROP );
       pix.setMask( mask );
       o->setPixmap(pix);
 
@@ -1052,7 +1052,7 @@ TQDragObject * ItemView::dragObject()
       else if(!kitem->path().isEmpty() && !kitem->path().startsWith("kicker:/") && !kitem->path().startsWith("kaddressbook:/")) {
          TQString uri = kitem->path();
 
-         if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
+         if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) {
              KDesktopFile df(uri,true);
              uri=df.readURL();
          }
@@ -1070,7 +1070,7 @@ int ItemView::goodHeight()
     int item_height = 0;
     TQListViewItemIterator it( this );
     while ( it.current() ) {
-        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->parent() && it.current()->isVisible() )  {
+        if ( !dynamic_cast<KMenuSpacer*>( it.current() ) && !it.current()->tqparent() && it.current()->isVisible() )  {
             item_height += it.current()->height();
         }
         ++it;
@@ -1087,7 +1087,7 @@ KMenuItemDrag::KMenuItemDrag(KMenuItem& item, TQWidget *dragSource)
     buff.open(IO_WriteOnly);
     TQDataStream s(&buff);
 
-    s << item.id() << (item.service() ? item.service()->storageId() : TQString::null)
+    s << item.id() << (item.service() ? item.service()->storageId() : TQString())
       << item.title() << item.description() << item.icon() << item.path();
 }
 
@@ -1103,7 +1103,7 @@ const char * KMenuItemDrag::format(int i) const
     return 0;
 }
 
-TQByteArray KMenuItemDrag::encodedData(const char* mimeType) const
+TQByteArray KMenuItemDrag::tqencodedData(const char* mimeType) const
 {
     if (TQString("application/kmenuitem") == mimeType)
         return a;
@@ -1138,7 +1138,7 @@ bool ItemView::acceptDrag (TQDropEvent* event) const
 
 bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item)
 {
-    TQByteArray a = e->encodedData("application/kmenuitem");
+    TQByteArray a = e->tqencodedData("application/kmenuitem");
 
     if (a.isEmpty()) {
         TQStringList l;
@@ -1162,7 +1162,7 @@ bool KMenuItemDrag::decode(const TQMimeSource* e, KMenuItemInfo& item)
                     item.m_title = item.m_path;
                     item.m_icon = KMimeType::iconForURL( url );
                     item.m_title = item.m_path.section( '/', -1, -1 );
-                    int last_slash = url.findRev ('/', -1);
+                    int last_slash = url.tqfindRev ('/', -1);
                     if (last_slash == 0)
                         item.m_description = i18n("Directory: /)");
                     else
@@ -1205,13 +1205,13 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
         TQStringList favs = KickerSettings::favorites();
 
         if (item.m_s)
-            return favs.find(item.m_s->storageId())==favs.end();
+            return favs.tqfind(item.m_s->storageId())==favs.end();
         else {
             TQStringList::Iterator it;
 
             TQString uri = item.m_path;
 
-            if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
+            if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) {
                KDesktopFile df(uri,true);
                uri=df.readURL();
             }
@@ -1219,7 +1219,7 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
             for (it = favs.begin(); it != favs.end(); ++it) {
                 if ((*it)[0]=='/') {
                     KDesktopFile df((*it),true);
-                    if (df.readURL().replace("file://",TQString::null)==uri)
+                    if (df.readURL().tqreplace("file://",TQString())==uri)
                         break;
                 }
             }
@@ -1233,15 +1233,15 @@ bool FavoritesItemView::acceptDrag (TQDropEvent* event) const
         TQStringList favs = KickerSettings::favorites();
 
         if (text.endsWith(".desktop")) {
-            KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null));
-            return (p && favs.find(p->storageId())==favs.end());
+            KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString()));
+            return (p && favs.tqfind(p->storageId())==favs.end());
         }
         else {
             TQStringList::Iterator it;
             for (it = favs.begin(); it != favs.end(); ++it) {
                 if ((*it)[0]=='/') {
                     KDesktopFile df((*it),true);
-                    if (df.readURL().replace("file://",TQString::null)==text)
+                    if (df.readURL().tqreplace("file://",TQString())==text)
                         break;
                 }
             }
diff --git a/kicker/kicker/ui/itemview.h b/kicker/kicker/ui/itemview.h
index c8b95ee42..2a6b7e68b 100644
--- a/kicker/kicker/ui/itemview.h
+++ b/kicker/kicker/ui/itemview.h
@@ -248,7 +248,7 @@ class KMenuItemDrag : public TQDragObject
         ~KMenuItemDrag();
 
         virtual const char * format(int i = 0) const;
-        virtual TQByteArray encodedData(const char *) const;
+        virtual TQByteArray tqencodedData(const char *) const;
 
         static bool canDecode(const TQMimeSource * e);
         static bool decode(const TQMimeSource* e, KMenuItemInfo& item);
diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp
index 0506201f5..d2952d93a 100644
--- a/kicker/kicker/ui/k_mnu.cpp
+++ b/kicker/kicker/ui/k_mnu.cpp
@@ -94,7 +94,7 @@ PanelKMenu::PanelKMenu()
         "slotServiceStartedByStorageId(TQString,TQString)",
         false);
     displayRepairTimer = new TQTimer( this );
-    connect( displayRepairTimer, SIGNAL(timeout()), this, SLOT(repairDisplay()) );
+    connect( displayRepairTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(repairDisplay()) );
 }
 
 PanelKMenu::~PanelKMenu()
@@ -125,7 +125,7 @@ void PanelKMenu::hideMenu()
     while (isShown() == true)
         kapp->eventLoop()->processEvents(1000);
     TQTimer *windowtimer = new TQTimer( this );
-    connect( windowtimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) );
+    connect( windowtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
     windowtimer->start( 0, TRUE );	// Wait for all window system events to be processed
     while (windowTimerTimedOut == false)
@@ -138,7 +138,7 @@ void PanelKMenu::hideMenu()
     // thereby removing a bad shutdown screen artifact while still providing
     // a somewhat snappy user interface.
     TQTimer *delaytimer = new TQTimer( this );
-    connect( delaytimer, SIGNAL(timeout()), this, SLOT(windowClearTimeout()) );
+    connect( delaytimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(windowClearTimeout()) );
     windowTimerTimedOut = false;
     delaytimer->start( 100, TRUE );	// Wait for 100 milliseconds
     while (windowTimerTimedOut == false)
@@ -207,7 +207,7 @@ void PanelKMenu::paletteChanged()
     if (!loadSidePixmap())
     {
         sidePixmap = sideTilePixmap = TQPixmap();
-        setMinimumSize( sizeHint() );
+        setMinimumSize( tqsizeHint() );
     }
 }
 
@@ -261,7 +261,7 @@ void PanelKMenu::initialize()
         TQHBox* hbox = new TQHBox( this );
         KToolBarButton *clearButton = new KToolBarButton( "locationbar_erase", 0, hbox );
         searchEdit = new KPIM::ClickLineEdit(hbox, " "+i18n("Press '/' to search..."));
-        hbox->setFocusPolicy(TQWidget::StrongFocus);
+        hbox->setFocusPolicy(TQ_StrongFocus);
         hbox->setFocusProxy(searchEdit);
         hbox->setSpacing( 3 );
         connect(clearButton, TQT_SIGNAL(clicked()), searchEdit, TQT_SLOT(clear()));
@@ -415,10 +415,10 @@ void PanelKMenu::repairDisplay(void) {
         displayRepairTimer->stop();
 
         // Now do a nasty hack to prevent search bar merging into the side image
-        // This forces a layout/repaint of the qpopupmenu
-        repaint();			// This ensures that the side bar image was applied
-        styleChange(style());		// This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
-        update();			// This repaints the entire popup menu to apply the widget size/alignment changes made above
+        // This forces a layout/tqrepaint of the qpopupmenu
+        tqrepaint();			// This ensures that the side bar image was applied
+        styleChange(tqstyle());		// This forces a call to the private function updateSize(TRUE) inside the qpopupmenu.
+        update();			// This tqrepaints the entire popup menu to apply the widget size/tqalignment changes made above
     }
 }
 
@@ -444,7 +444,7 @@ void PanelKMenu::slotLock()
     TQCString appname( "kdesktop" );
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", "");
+    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void PanelKMenu::slotLogout()
@@ -493,7 +493,7 @@ void PanelKMenu::slotSessionActivated( int ent )
 void PanelKMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
+        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -579,7 +579,7 @@ void PanelKMenu::showMenu()
 
 TQRect PanelKMenu::sideImageRect()
 {
-    return TQStyle::visualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(),
+    return TQStyle::tqvisualRect( TQRect( frameWidth(), frameWidth(), sidePixmap.width(),
                                       height() - 2*frameWidth() ), this );
 }
 
@@ -590,21 +590,21 @@ void PanelKMenu::resizeEvent(TQResizeEvent * e)
 
     PanelServiceMenu::resizeEvent(e);
 
-    setFrameRect( TQStyle::visualRect( TQRect( sidePixmap.width(), 0,
+    setFrameRect( TQStyle::tqvisualRect( TQRect( sidePixmap.width(), 0,
                                       width() - sidePixmap.width(), height() ), this ) );
 }
 
 //Workaround Qt3.3.x sizing bug, by ensuring we're always wide enough.
 void PanelKMenu::resize(int width, int height)
 {
-    width = kMax(width, maximumSize().width());
+    width = kMax(width, tqmaximumSize().width());
     PanelServiceMenu::resize(width, height);
 }
 
-TQSize PanelKMenu::sizeHint() const
+TQSize PanelKMenu::tqsizeHint() const
 {
-    TQSize s = PanelServiceMenu::sizeHint();
-//    kdDebug(1210) << "PanelKMenu::sizeHint()" << endl;
+    TQSize s = PanelServiceMenu::tqsizeHint();
+//    kdDebug(1210) << "PanelKMenu::tqsizeHint()" << endl;
 //    kdDebug(1210) << s.width() << ", " << s.height() << endl;
     return s;
 }
@@ -619,9 +619,9 @@ void PanelKMenu::paintEvent(TQPaintEvent * e)
     TQPainter p(this);
     p.setClipRegion(e->region());
 
-    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
+    tqstyle().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
-                           colorGroup(), TQStyle::Style_Default,
+                           tqcolorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );
 
     TQRect r = sideImageRect();
@@ -648,7 +648,7 @@ TQMouseEvent PanelKMenu::translateMouseEvent( TQMouseEvent* e )
 {
     TQRect side = sideImageRect();
 
-    if ( !side.contains( e->pos() ) )
+    if ( !side.tqcontains( e->pos() ) )
         return *e;
 
     TQPoint newpos( e->pos() );
diff --git a/kicker/kicker/ui/k_mnu.h b/kicker/kicker/ui/k_mnu.h
index 16655bdd6..d91ddf032 100644
--- a/kicker/kicker/ui/k_mnu.h
+++ b/kicker/kicker/ui/k_mnu.h
@@ -59,7 +59,7 @@ public:
     int insertClientMenu(KickerClientMenu *p);
     void removeClientMenu(int id);
 
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
     virtual void setMinimumSize(const TQSize &);
     virtual void setMaximumSize(const TQSize &);
     virtual void setMinimumSize(int, int);
diff --git a/kicker/kicker/ui/k_mnu_stub.cpp b/kicker/kicker/ui/k_mnu_stub.cpp
index b02d2bcbf..16e755d48 100644
--- a/kicker/kicker/ui/k_mnu_stub.cpp
+++ b/kicker/kicker/ui/k_mnu_stub.cpp
@@ -97,11 +97,11 @@ void KMenuStub::resize(int w, int h)
     return m_w.panelkmenu->resize(w, h);
 }
 
-TQSize KMenuStub::sizeHint() const
+TQSize KMenuStub::tqsizeHint() const
 {
     if(m_type == t_KMenu)
-	return m_w.kmenu->sizeHint();
-    return m_w.panelkmenu->sizeHint();
+	return m_w.kmenu->tqsizeHint();
+    return m_w.panelkmenu->tqsizeHint();
 }
 
 bool KMenuStub::highlightMenuItem( const TQString &menuId )
diff --git a/kicker/kicker/ui/k_mnu_stub.h b/kicker/kicker/ui/k_mnu_stub.h
index 362d132b2..17fe92b7c 100644
--- a/kicker/kicker/ui/k_mnu_stub.h
+++ b/kicker/kicker/ui/k_mnu_stub.h
@@ -53,7 +53,7 @@ public:
     void popup(const TQPoint &pos, int indexAtPoint = -1);
     void selectFirstItem();
     void resize(int, int);
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
     bool highlightMenuItem( const TQString &menuId );
     void clearRecentMenuItems();
     void initialize();
diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp
index a2a8cb2fc..3fa259189 100644
--- a/kicker/kicker/ui/k_new_mnu.cpp
+++ b/kicker/kicker/ui/k_new_mnu.cpp
@@ -141,12 +141,12 @@ static TQString workaroundStringFreeze(const TQString& str)
 {
     TQString s = str;
 
-    s.replace("<u>","&");
+    s.tqreplace("<u>","&");
     TQRegExp re("<[^>]+>");
     re.setMinimal(true);
     re.setCaseSensitive(false);
 
-    s.replace(re, "");
+    s.tqreplace(re, "");
     s = s.simplifyWhiteSpace();
 
     return s;
@@ -168,7 +168,7 @@ static int used_size( TQLabel *label, int oldsize )
 KMenu::KMenu()
   : KMenuBase(0, "SUSE::Kickoff::KMenu")
   , m_sloppyTimer(0, "KNewMenu::sloppyTimer"), m_mediaFreeTimer(0, "KNewMenu::mediaFreeTimer"),
-    m_iconName(TQString::null),  m_orientation(UnDetermined), m_search_plugin( 0 )
+    m_iconName(TQString()),  m_orientation(UnDetermined), m_search_plugin( 0 )
 {
     setMouseTracking(true);
     connect(&m_sloppyTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotSloppyTimeout()));
@@ -194,7 +194,7 @@ KMenu::KMenu()
 
     m_userInfo->setBackgroundMode( PaletteBase );
     TQColor userInfoColor = TQApplication::palette().color( TQPalette::Normal, TQColorGroup::Mid );
-    if ( qGray( userInfoColor.rgb() ) > 120 )
+    if ( tqGray( userInfoColor.rgb() ) > 120 )
         userInfoColor = userInfoColor.dark( 200 );
     else
         userInfoColor = userInfoColor.light( 200 );
@@ -296,13 +296,13 @@ KMenu::KMenu()
     m_searchResultsWidget->setItemMargin(4);
     m_searchResultsWidget->setIconSize(16);
     m_searchActions = new ItemView (m_searchWidget, "m_searchActions");
-    m_searchActions->setFocusPolicy(TQWidget::NoFocus);
+    m_searchActions->setFocusPolicy(TQ_NoFocus);
     m_searchActions->setItemMargin(4);
     m_searchInternet = new TQListViewItem(m_searchActions, i18n("Search Internet"));
     m_searchInternet->setPixmap(0,icon);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
-    m_kerryInstalled = !KStandardDirs::findExe(TQString::fromLatin1("kerry")).isEmpty();
+    m_kerryInstalled = !KStandardDirs::findExe(TQString::tqfromLatin1("kerry")).isEmpty();
     m_isShowing = false;
 
     if (!m_kerryInstalled) {
@@ -421,11 +421,11 @@ void KMenu::setupUi()
 {
     m_stacker = new TQWidgetStack( this, "m_stacker" );
     m_stacker->setGeometry( TQRect( 90, 260, 320, 220 ) );
-    m_stacker->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
+    m_stacker->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)3, (TQSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) );
     m_stacker->setPaletteBackgroundColor( TQColor( 255, 255, 255 ) );
-   // m_stacker->setFocusPolicy( TQWidget::StrongFocus );
+   // m_stacker->setFocusPolicy( TQ_StrongFocus );
     m_stacker->setLineWidth( 0 );
-    m_stacker->setFocusPolicy(TQWidget::NoFocus);
+    m_stacker->setFocusPolicy(TQ_NoFocus);
     connect(m_stacker, TQT_SIGNAL(aboutToShow(TQWidget*)), TQT_SLOT(stackWidgetRaised(TQWidget*)));
 
     m_kcommand->setName("m_kcommand");
@@ -453,16 +453,16 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         TQPoint p;
 
         if (e->type() == TQEvent::MouseMove || e->type() == TQEvent::MouseButtonPress) {
-            TQMouseEvent* me = static_cast<TQMouseEvent*>(e);
+            TQMouseEvent* me = TQT_TQMOUSEEVENT(e);
             p = me->globalPos();
         }
         else if (e->type() == TQEvent::Wheel) {
-            TQWheelEvent* we = static_cast<TQWheelEvent*>(e);
+            TQWheelEvent* we = TQT_TQWHEELEVENT(e);
             p = we->globalPos();
         }
 
         while (receiver) {
-            if (receiver == m_tabBar && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
+            if (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_tabBar) && (e->type()!=TQEvent::MouseMove || KickerSettings::kickoffSwitchTabsOnHover() ) ) {
                 TQTab* s = m_tabBar->selectTab(m_tabBar->mapFromGlobal(p));
                 if (s && s->identifier() == ApplicationsTab)
                     raiseWidget = m_browserView;
@@ -482,8 +482,8 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
 
             /* we do not want hover activation for the search line edit as this can be
              * pretty disturbing */
-            if ( (receiver == m_searchPixmap ||
-                 ( ( receiver == m_searchLabel || receiver==m_kcommand->lineEdit() ) &&
+            if ( (TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchPixmap) ||
+                 ( ( TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_searchLabel) || TQT_BASE_OBJECT(receiver)==TQT_BASE_OBJECT(m_kcommand->lineEdit()) ) &&
                  ( e->type() == TQEvent::KeyPress || e->type() == TQEvent::Wheel
                    || e->type() == TQEvent::MouseButtonPress ) ) ) &&
                     !m_isShowing) {
@@ -495,34 +495,34 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
             if(raiseWidget)
                 break;
             if(receiver->isWidgetType())
-                receiver = static_cast<TQWidget*>(receiver)->parentWidget(true);
+                receiver = TQT_TQOBJECT(TQT_TQWIDGET(receiver)->tqparentWidget(true));
             else
                 break;
         }
 
         if (e->type() == TQEvent::FocusIn && receiver && raiseWidget) {
-            m_searchResultsWidget->setFocusPolicy(TQWidget::StrongFocus);
+            m_searchResultsWidget->setFocusPolicy(TQ_StrongFocus);
             m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
-                    TQWidget::StrongFocus : TQWidget::NoFocus);
+                    TQ_StrongFocus : TQ_NoFocus);
             setTabOrder(raiseWidget, m_searchResultsWidget);
             if (raiseWidget != m_stacker->visibleWidget()
-                && static_cast<TQWidget*>(receiver)->focusPolicy() == TQWidget::NoFocus
+                && TQT_TQWIDGET(receiver)->focusPolicy() == TQ_NoFocus
                 && m_stacker->id(raiseWidget) >= 0) {
 
                 m_stacker->raiseWidget(raiseWidget);
                 return true;
             }
 
-            if (raiseWidget->focusPolicy() != TQWidget::NoFocus)
+            if (raiseWidget->focusPolicy() != TQ_NoFocus)
                 return false;
         }
 
-	if (m_sloppyRegion.contains(p)) {
+	if (m_sloppyRegion.tqcontains(p)) {
             if (e->type() ==  TQEvent::MouseButtonPress /*&& m_sloppyTimer.isActive()*/)
                 m_sloppySourceClicked = true;
 
             if (!m_sloppyTimer.isActive() || m_sloppySource != raiseRect) {
-                int timeout= style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay);
+                int timeout= tqstyle().tqstyleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay);
                 if (m_sloppySourceClicked)
                     timeout = 3000;
                 m_sloppyTimer.start(timeout);
@@ -535,7 +535,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
     }
 
     if(e->type() == TQEvent::Enter && receiver->isWidgetType()) {
-	static_cast<TQWidget*>(receiver)->setMouseTracking(true);
+	TQT_TQWIDGET(receiver)->setMouseTracking(true);
         TQToolTip::hide();
     }
 
@@ -562,7 +562,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         if (view)
         {
             bool handled = true;
-            switch (static_cast<TQKeyEvent*>(e)->key()) {
+            switch (TQT_TQKEYEVENT(e)->key()) {
                 case Key_Up:
                     if (view->selectedItem()) {
                         view->setSelected(view->selectedItem()->itemAbove(),true);
@@ -639,7 +639,7 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
         r = true;
     }
 
-    if (e->type() == TQEvent::Enter && receiver == m_stacker)
+    if (e->type() == TQEvent::Enter && TQT_BASE_OBJECT(receiver) == TQT_BASE_OBJECT(m_stacker))
     {
         TQRect r(m_stacker->mapToGlobal(TQPoint(-8,-32)), m_stacker->size());
         r.setSize(r.size()+TQSize(16,128));
@@ -682,9 +682,9 @@ bool KMenu::eventFilter ( TQObject * receiver, TQEvent* e)
 
 void KMenu::slotSloppyTimeout()
 {
-    if (m_sloppyRegion.contains(TQCursor::pos()) && !m_sloppySource.isNull())
+    if (m_sloppyRegion.tqcontains(TQCursor::pos()) && !m_sloppySource.isNull())
     {
-        if ( m_sloppySource.contains(TQCursor::pos()))
+        if ( m_sloppySource.tqcontains(TQCursor::pos()))
         {
             m_stacker->raiseWidget(m_sloppyWidget);
 
@@ -753,12 +753,12 @@ void KMenu::stackWidgetRaised(TQWidget* raiseWidget)
 
     if (raiseWidget == m_browserView) {
         if ( m_tabBar->currentTab() == ApplicationsTab)
-            slotGoSubMenu(TQString::null);
+            slotGoSubMenu(TQString());
         if (m_browserDirty ) {
           createNewProgramList();
           m_browserView->prepareRightMove();
           m_browserView->currentView()->clear();
-          fillSubMenu(TQString::null, m_browserView->currentView());
+          fillSubMenu(TQString(), m_browserView->currentView());
           m_browserDirty = false;
         }
     }
@@ -828,7 +828,7 @@ void KMenu::paletteChanged()
 void KMenu::tabClicked(TQTab* t)
 {
     if (t==m_tabs[ApplicationsTab])
-	slotGoSubMenu(TQString::null);
+	slotGoSubMenu(TQString());
     else if (t==m_tabs[LeaveTab])
 	slotGoExitMainMenu();
 }
@@ -843,7 +843,7 @@ void KMenu::slotGoExitMainMenu()
     if (m_exitView->currentView()==m_exitView->rightView()) {
       m_exitView->prepareLeftMove(false);
       m_exitView->showBackButton(false);
-      m_exitView->flipScroll(TQString::null);
+      m_exitView->flipScroll(TQString());
     }
 }
 
@@ -882,13 +882,13 @@ void KMenu::slotGoExitSubMenu(const TQString& url)
         m_exitView->rightView()->insertItem( "switchuser", i18n( "Start New Session" ),
                      i18n( "Start a parallel session" ), "kicker:/switchuser", nId++, index++ );
 
-        m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").replace("&&","&"),
+        m_exitView->rightView()->insertItem( "lock", i18n( "Lock Current && Start New Session").tqreplace("&&","&"),
                      i18n( "Lock screen and start a parallel session" ), "kicker:/switchuserafterlock", nId++, index++ );
 
        SessList sess;
        if (DM().localSessions( sess )) {
           if (sess.count()>1)
-              m_exitView->rightView()->insertSeparator( nId++, TQString::null, index++ );
+              m_exitView->rightView()->insertSeparator( nId++, TQString(), index++ );
           for (SessList::ConstIterator it = sess.begin(); it != sess.end(); ++it) {
               if ((*it).vt && !(*it).self) {
                   TQString user, loc;
@@ -902,7 +902,7 @@ void KMenu::slotGoExitSubMenu(const TQString& url)
 
         m_exitView->rightView()->insertHeader( nId++, "kicker:/switchuser/" );
     }
-    m_exitView->flipScroll(TQString::null);
+    m_exitView->flipScroll(TQString());
 }
 
 void KMenu::slotGoSubMenu(const TQString& relPath)
@@ -918,16 +918,16 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard)
         int index = rel.length() - 1;
         if ( rel.endsWith( "/" ) )
             index--;
-        index = rel.findRev( '/', index );
+        index = rel.tqfindRev( '/', index );
         kdDebug() << "goup, rel '" << rel << "' " << index << endl;
         TQString currel = rel;
         rel = rel.left( index + 1 );
         if ( rel == "/" )
-            rel = TQString::null;
+            rel = TQString();
 
         kdDebug() << "goup, rel '" << rel << "' " << rel.isEmpty() << endl;
         fillSubMenu( rel, m_browserView->prepareLeftMove() );
-        m_browserView->flipScroll(keyboard ? currel : TQString::null);
+        m_browserView->flipScroll(keyboard ? currel : TQString());
         return;
     } else if (relPath.isEmpty())
     {
@@ -952,7 +952,7 @@ void KMenu::goSubMenu(const TQString& relPath, bool keyboard)
         //m_browserView->clear();
         fillSubMenu(relPath, m_browserView->prepareRightMove());
     }
-    m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString::null);
+    m_browserView->flipScroll(keyboard ? "kicker:/goup/": TQString());
 }
 
 void KMenu::fillSubMenu(const TQString& relPath, ItemView *view)
@@ -973,9 +973,9 @@ void KMenu::fillSubMenu(const TQString& relPath, ItemView *view)
     }
     else if ( m_newInstalledPrograms.count() ) {
         KMenuItem *item = view->insertItem( "clock", i18n( "New Applications" ),
-                              TQString::null, "kicker:/new/", nId++, -1 );
+                              TQString(), "kicker:/new/", nId++, -1 );
         item->setHasChildren( true );
-        view->insertSeparator( nId++, TQString::null, -1 );
+        view->insertSeparator( nId++, TQString(), -1 );
     }
 
     view->path = relPath;
@@ -1136,7 +1136,7 @@ void KMenu::fillMenu(KServiceGroup::Ptr&
                 continue;
             }
 
-            KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString::null, g->relPath(), id++, -1);
+            KMenuItem *item = view->insertItem(g->icon(), groupCaption, TQString(), g->relPath(), id++, -1);
 	    item->setMenuPath(g->relPath());
             item->setHasChildren( true );
 
@@ -1165,11 +1165,11 @@ void KMenu::fillMenu(KServiceGroup::Ptr&
             KService::Ptr s(static_cast<KService *>(e));
             if (_relPath.isEmpty()) {
                 TQStringList favs = KickerSettings::favorites();
-                if (favs.find(s->storageId())!=favs.end())
+                if (favs.tqfind(s->storageId())!=favs.end())
                   continue;
             }
 #ifdef KDELIBS_SUSE
-            KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString::null, specialTitle[s->name()], categoryIcon[s->name()] );
+            KMenuItem *item = view->insertMenuItem(s, id++, -1, 0, TQString(), specialTitle[s->name()], categoryIcon[s->name()] );
             if (shortenedMenuPath[s->name()].isEmpty())
 	       item->setMenuPath(_relPath+s->menuId());
             else
@@ -1259,7 +1259,7 @@ void KMenu::initialize()
        if ((*it)[0]=='/') {
           KDesktopFile df((*it),true);
           TQString url = df.readURL();
-          if (!KURL(url).isLocalFile() || TQFile::exists(url.replace("file://",TQString::null)))
+          if (!KURL(url).isLocalFile() || TQFile::exists(url.tqreplace("file://",TQString())))
             m_favoriteView->insertItem(df.readIcon(),df.readName(),df.readGenericName(), url, nId++, index++);
        }
        else {
@@ -1268,7 +1268,7 @@ void KMenu::initialize()
        }
     }
 
-    //nId = m_favoriteView->insertSeparator( nId, TQString::null, index++ );
+    //nId = m_favoriteView->insertSeparator( nId, TQString(), index++ );
 //    m_favoriteView->insertDocument(KURL("help:/khelpcenter/userguide/index.html"), nId++);
 
     insertStaticItems();
@@ -1314,7 +1314,7 @@ void KMenu::insertStaticExitItems()
         m_exitView->leftView()->insertItem( "exit", i18n( "Shutdown Computer" ),
                                    i18n( "Turn off computer" ), "kicker:/shutdown", nId++, index++ );
 
-        m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).replace("&",""),
+        m_exitView->leftView()->insertItem( "reload", i18n( "&Restart Computer" ).tqreplace("&",""),
                                             i18n( "Restart and boot the default system" ),
                                             "kicker:/restart", nId++, index++ );
 
@@ -1365,7 +1365,7 @@ void KMenu::insertStaticItems()
     m_systemView->insertItem( "network", i18n( "Network Folders" ),
                               "remote:/", "remote:/", nId++, index++ );
 
-    m_mediaWatcher = new MediaWatcher( this );
+    m_mediaWatcher = new MediaWatcher( TQT_TQOBJECT(this) );
     connect( m_mediaWatcher, TQT_SIGNAL( mediumChanged() ), TQT_SLOT( updateMedia() ) );
     m_media_id = 0;
 
@@ -1399,7 +1399,7 @@ void KMenu::slotLock()
     TQCString appname( "kdesktop" );
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", "");
+    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void KMenu::slotOpenHomepage()
@@ -1454,7 +1454,7 @@ void KMenu::slotSessionActivated( int ent )
 void KMenu::doNewSession( bool lock )
 {
     int result = KMessageBox::warningContinueCancel(
-        kapp->desktop()->screen(kapp->desktop()->screenNumber(this)),
+        TQT_TQWIDGET(kapp->desktop()->screen(kapp->desktop()->screenNumber(this))),
         i18n("<p>You have chosen to open another desktop session.<br>"
                "The current session will be hidden "
                "and a new login screen will be displayed.<br>"
@@ -1512,7 +1512,7 @@ void KMenu::searchAccept()
         int kicker_screen_number = qt_xscreen();
         if ( kicker_screen_number )
             appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-        kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", "");
+        kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
     }
 }
 
@@ -1556,7 +1556,7 @@ bool KMenu::runCommand()
       case KURIFilterData::HELP:
       {
         // No need for kfmclient, KRun does it all (David)
-        (void) new KRun( m_filterData->uri(), parentWidget());
+        (void) new KRun( m_filterData->uri(), tqparentWidget());
         return false;
       }
       case KURIFilterData::EXECUTABLE:
@@ -1672,7 +1672,7 @@ void KMenu::setOrientation(MenuOrientation orientation)
 
     m_orientation=orientation;
 
-    m_resizeHandle->setCursor(m_orientation == BottomUp ? Qt::sizeBDiagCursor : Qt::sizeFDiagCursor);
+    m_resizeHandle->setCursor(m_orientation == BottomUp ? tqsizeBDiagCursor : tqsizeFDiagCursor);
 
     TQPixmap pix;
     if ( m_orientation == BottomUp )
@@ -1699,14 +1699,14 @@ void KMenu::setOrientation(MenuOrientation orientation)
         TQWidget *footer = m_footer->mainWidget();
         TQPixmap pix( 64, footer->height() );
         TQPainter p( &pix );
-        p.fillRect( 0, 0, 64, footer->height(), m_branding->colorGroup().brush( TQColorGroup::Base ) );
+        p.fillRect( 0, 0, 64, footer->height(), m_branding->tqcolorGroup().brush( TQColorGroup::Base ) );
         p.fillRect( 0, m_orientation == BottomUp ? footer->height() - 2 : 0,
                 64, 3, KNewButton::self()->borderColor() );
         p.end();
         footer->setPaletteBackgroundPixmap( pix );
     }
 
-    resizeEvent(new TQResizeEvent(sizeHint(), sizeHint()));
+    resizeEvent(new TQResizeEvent(tqsizeHint(), tqsizeHint()));
 }
 
 void KMenu::showMenu()
@@ -1762,7 +1762,7 @@ void KMenu::paintEvent(TQPaintEvent * e)
 
     const BackgroundMode bgmode = backgroundMode();
     const TQColorGroup::ColorRole crole = TQPalette::backgroundRoleFromMode( bgmode );
-    p.setBrush( colorGroup().brush( crole ) );
+    p.setBrush( tqcolorGroup().brush( crole ) );
 
     p.drawRect( 0, 0, width(), height() );
     int ypos = m_search->mainWidget()->geometry().bottom();
@@ -1906,13 +1906,13 @@ bool KMenu::dontQueryNow (const TQString& str)
     if (str == current_query.get())
 	return true;
     int length = str.length ();
-    int last_whitespace = str.findRev (' ', -1);
+    int last_whitespace = str.tqfindRev (' ', -1);
     if (last_whitespace == length-1)
         return false; // if the user typed a space, search
     if (last_whitespace >= length-2)
         return true; // dont search if the user only typed one character
     TQChar lastchar = str[length-1];
-    if (lastchar == ":" || lastchar == "=")
+    if (lastchar == ':' || lastchar == '=')
         return true;
     return false;
 }
@@ -1923,11 +1923,11 @@ void KMenu::createNewProgramList()
     m_seenPrograms = KickerSettings::firstSeenApps();
     m_newInstalledPrograms.clear();
 
-    m_currentDate = TQDate::currentDate().toString(Qt::ISODate);
+    m_tqcurrentDate = TQDate::currentDate().toString(Qt::ISODate);
 
     bool initialize = (m_seenPrograms.count() == 0);
 
-    createNewProgramList(TQString::null);
+    createNewProgramList(TQString());
 
     if (initialize) {
        for (TQStringList::Iterator it = m_seenPrograms.begin(); it != m_seenPrograms.end(); ++it)
@@ -1964,7 +1964,7 @@ void KMenu::createNewProgramList(TQString relPath)
 		} else if(e->isType(KST_KService)) {
 			KService::Ptr s(static_cast<KService *>(e));
 			if(s->type() == "Application" && !s->noDisplay() ) {
-                            TQString shortStorageId = s->storageId().replace(".desktop",TQString::null);
+                            TQString shortStorageId = s->storageId().tqreplace(".desktop",TQString());
                             TQStringList::Iterator it_find = m_seenPrograms.begin();
                             TQStringList::Iterator it_end = m_seenPrograms.end();
  			    bool found = false;
@@ -1978,8 +1978,8 @@ void KMenu::createNewProgramList(TQString relPath)
                             if (!found) {
                                 m_seenProgramsChanged=true;
                                 m_seenPrograms+=shortStorageId;
-                                m_seenPrograms+=m_currentDate;
-                                if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
+                                m_seenPrograms+=m_tqcurrentDate;
+                                if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end())
                                   m_newInstalledPrograms+=s->storageId();
                             }
                             else {
@@ -1987,7 +1987,7 @@ void KMenu::createNewProgramList(TQString relPath)
                                 if (*(it_find)!="-") {
                                    TQDate date = TQDate::fromString(*(it_find),Qt::ISODate);
                                    if (date.daysTo(TQDate::currentDate())<3) {
-                                      if (m_newInstalledPrograms.find(s->storageId())==m_newInstalledPrograms.end())
+                                      if (m_newInstalledPrograms.tqfind(s->storageId())==m_newInstalledPrograms.end())
                                          m_newInstalledPrograms+=s->storageId();
                                    }
                                    else {
@@ -2033,24 +2033,24 @@ void KMenu::searchProgramList(TQString relPath)
 				int score = 0;
 				if (s->exec()==input)
 					score = 100;
-				else if (s->exec().find(input)==0)
+				else if (s->exec().tqfind(input)==0)
 					score = 50;
-				else if (s->exec().find(input)!=-1)
+				else if (s->exec().tqfind(input)!=-1)
 					score = 10;
 				else if (s->name().lower()==input)
 					score = 100;
 				else if (s->genericName().lower()==input)
 					score = 100;
-				else if (s->name().lower().find(input)==0)
+				else if (s->name().lower().tqfind(input)==0)
 					score = 50;
-				else if (s->genericName().lower().find(input)==0)
+				else if (s->genericName().lower().tqfind(input)==0)
 					score = 50;
-				else if (s->name().lower().find(input)!=-1)
+				else if (s->name().lower().tqfind(input)!=-1)
 					score = 10;
-				else if (s->genericName().lower().find(input)!=-1)
+				else if (s->genericName().lower().tqfind(input)!=-1)
 					score = 10;
 
-				if (s->exec().find(' ')==-1)
+				if (s->exec().tqfind(' ')==-1)
 					score+=1;
 
 				if (s->substituteUid())
@@ -2074,7 +2074,7 @@ void KMenu::searchProgramList(TQString relPath)
 				}
 
         			HitMenuItem *hit_item = new HitMenuItem (firstLine, secondLine,
-                                s->desktopEntryPath(), TQString::null, 0, APPS, s->icon(), score);
+                                s->desktopEntryPath(), TQString(), 0, APPS, s->icon(), score);
         			if (hit_item == NULL)
 					continue;
 
@@ -2082,7 +2082,7 @@ void KMenu::searchProgramList(TQString relPath)
         			insertSearchResult(hit_item);
 
                                 TQString exe = s->exec();
-                                int pos = exe.find(' ');
+                                int pos = exe.tqfind(' ');
                                 if (pos>0)
                                   exe=exe.left(pos);
 				m_programsInMenu+=KGlobal::dirs()->findExe(exe);
@@ -2105,7 +2105,7 @@ void KMenu::searchBookmarks(KBookmarkGroup group)
                                 }
 
         			HitMenuItem *hit_item = new HitMenuItem (bookmark.fullText(), bookmark.fullText(),
-                                bookmark.url(), TQString::null, 0, BOOKMARKS, bookmark.icon());
+                                bookmark.url(), TQString(), 0, BOOKMARKS, bookmark.icon());
 
         			insertSearchResult(hit_item);
 		}
@@ -2162,7 +2162,7 @@ void KMenu::searchAddressbook()
             }
 
             hit_item = new HitMenuItem (i18n("Send Email to %1").arg(realName), (*it).preferredEmail(),
-                                "mailto:"+(*it).preferredEmail(), TQString::null, 0, ACTIONS, "mail_new");
+                                "mailto:"+(*it).preferredEmail(), TQString(), 0, ACTIONS, "mail_new");
 
         			insertSearchResult(hit_item);
         }
@@ -2173,7 +2173,7 @@ void KMenu::searchAddressbook()
         }
 
         hit_item = new HitMenuItem (i18n("Open Addressbook at %1").arg(realName), (*it).preferredEmail(),
-                                "kaddressbook:/"+(*it).uid(), TQString::null, 0, ACTIONS, "kaddressbook");
+                                "kaddressbook:/"+(*it).uid(), TQString(), 0, ACTIONS, "kaddressbook");
 
         			insertSearchResult(hit_item);
 
@@ -2205,7 +2205,7 @@ TQString KMenu::insertBreaks(const TQString& text, TQFontMetrics fm, int width,
 void KMenu::clearSearchResults(bool showHelp)
 {
     m_searchResultsWidget->clear();
-    m_searchResultsWidget->setFocusPolicy(showHelp ? TQWidget::NoFocus : TQWidget::StrongFocus);
+    m_searchResultsWidget->setFocusPolicy(showHelp ? TQ_NoFocus : TQ_StrongFocus);
     setTabOrder(m_kcommand, m_searchResultsWidget);
 
     if (showHelp) {
@@ -2280,8 +2280,8 @@ void KMenu::doQuery (bool return_pressed)
         if (!result.isEmpty())
         {
             categorised_hit_total[ACTIONS] ++;
-            HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString::null,
-                    "kcalc", TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "kcalc");
+            HitMenuItem *hit_item = new HitMenuItem (i18n("%1 = %2").arg(query_str, result), TQString(),
+                    "kcalc", TQString(), (++max_category_id [ACTIONS]), ACTIONS, "kcalc");
             int index = getHitMenuItemPosition (hit_item);
             m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
                     hit_item->display_info, KGlobal::dirs()->findExe("kcalc"), max_category_id [ACTIONS], index);
@@ -2291,15 +2291,15 @@ void KMenu::doQuery (bool return_pressed)
     // detect email address
     if (emailRegExp.exactMatch(query_str)) {
       categorised_hit_total[ACTIONS] ++;
-      HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString::null,
-                                "mailto:"+query_str, TQString::null, (++max_category_id [ACTIONS]), ACTIONS, "mail_new");
+      HitMenuItem *hit_item = new HitMenuItem (i18n("Send Email to %1").arg(query_str), TQString(),
+                                "mailto:"+query_str, TQString(), (++max_category_id [ACTIONS]), ACTIONS, "mail_new");
       int index = getHitMenuItemPosition (hit_item);
       m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name, hit_item->display_info, "mailto:"+query_str, max_category_id [ACTIONS], index);
     }
 
     // quick own application search
     m_programsInMenu.clear();
-    searchProgramList(TQString::null);
+    searchProgramList(TQString());
 
     KURIFilterData filterData;
     filterData.setData(query_str);
@@ -2329,18 +2329,18 @@ void KMenu::doQuery (bool return_pressed)
             if (exe.endsWith("/bin/gimp")) {
                TQStringList::ConstIterator it = m_programsInMenu.begin();
                for (; it != m_programsInMenu.end(); ++it)
-                  if ((*it).find("bin/gimp-remote-")!=-1) {
+                  if ((*it).tqfind("bin/gimp-remote-")!=-1) {
                     gimp_hack = true;
                     break;
                   }
             }
 #endif
-            if (m_programsInMenu.find(exe)!=m_programsInMenu.end()
+            if (m_programsInMenu.tqfind(exe)!=m_programsInMenu.end()
 #ifdef KDELIBS_SUSE
                 || gimp_hack
 #endif
                 )
-                exe = TQString::null;
+                exe = TQString();
             else if (kapp->authorize("shell_access"))
             {
                 if( filterData.hasArgsAndOptions() )
@@ -2356,8 +2356,8 @@ void KMenu::doQuery (bool return_pressed)
 
         if (!description.isEmpty()) {
             categorised_hit_total[ACTIONS] ++;
-            HitMenuItem *hit_item = new HitMenuItem (description, TQString::null,
-                    exe.isEmpty() ? filterData.uri() : exe, TQString::null,
+            HitMenuItem *hit_item = new HitMenuItem (description, TQString(),
+                    exe.isEmpty() ? filterData.uri() : exe, TQString(),
                     (++max_category_id [ACTIONS]), ACTIONS, exe.isEmpty() ? "fileopen": "run");
             int index = getHitMenuItemPosition (hit_item);
             m_searchResultsWidget->insertItem(iconForHitMenuItem(hit_item), hit_item->display_name,
@@ -2521,7 +2521,7 @@ void KMenu::updateCategoryTitles()
                 sep->setText( 0, i18n( "%1 (top %2 of %3)" ).arg( i18n(categories [i].utf8()) ).arg( max ).arg( categorised_hit_total [i] ) );
         }
         else {
-            sep->setLink( TQString::null );
+            sep->setLink( TQString() );
         }
     }
     delete[] already_added;
@@ -2540,15 +2540,15 @@ TQString KMenu::iconForHitMenuItem(HitMenuItem *hit_item)
 	    return favicon;
     }
 
-    if (mimetype_iconstore.contains (hit_item->mimetype))
+    if (mimetype_iconstore.tqcontains (hit_item->mimetype))
         return (mimetype_iconstore [hit_item->mimetype]);
     else {
         KMimeType::Ptr mimetype_ptr = KMimeType::mimeType (hit_item->mimetype);
-        TQString mimetype_icon = mimetype_ptr->icon(TQString::null, FALSE);
+        TQString mimetype_icon = mimetype_ptr->icon(TQString(), FALSE);
         mimetype_iconstore [hit_item->mimetype] = mimetype_icon;
         return mimetype_icon;
     }
-    return TQString::null;
+    return TQString();
 }
 
 void KMenu::slotStartService(KService::Ptr ptr)
@@ -2621,7 +2621,7 @@ void KMenu::slotStartURL(const TQString& u)
 #ifdef KDELIBS_SUSE
         TQByteArray params;
         TQDataStream stream(params, IO_WriteOnly);
-        stream << 1 << -1 << TQString::null;
+        stream << 1 << -1 << TQString();
 
         kapp->dcopClient()->send("ksmserver", "default", "logoutTimed(int,int,TQString)", params);
 #else
@@ -2715,13 +2715,13 @@ void KMenu::slotStartURL(const TQString& u)
         }
 
         kapp->propagateSessionManager();
-        (void) new KRun( u, parentWidget());
+        (void) new KRun( u, tqparentWidget());
     }
 }
 
 void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos, int /*col*/ )
 {
-    const TQObject* source = sender();
+    const TQObject* source = TQT_TQOBJECT_CONST(sender());
 
     if (!item)
         return;
@@ -2744,7 +2744,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         m_popupPath.path = kitem->path();
         m_popupPath.icon = kitem->icon();
 
-        if (m_popupPath.path.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
+        if (m_popupPath.path.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) {
                KDesktopFile df(m_popupPath.path,true);
                m_popupPath.path=df.readURL();
         }
@@ -2756,7 +2756,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
 
     m_popupMenu->insertTitle(SmallIcon(kitem->icon()),kitem->title());
 
-     if (source==m_favoriteView)
+     if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView))
      {
          hasEntries = true;
          m_popupMenu->insertItem(SmallIconSet("remove"),
@@ -2770,7 +2770,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
              i18n("Add to Favorites"), AddToFavorites);
 
          TQStringList favs = KickerSettings::favorites();
-         if (m_popupService && favs.find(m_popupService->storageId())!=favs.end())
+         if (m_popupService && favs.tqfind(m_popupService->storageId())!=favs.end())
             m_popupMenu->setItemEnabled(num, false);
          else {
             TQStringList::Iterator it;
@@ -2779,7 +2779,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                 if ((*it)[0]=='/')
                 {
                     KDesktopFile df((*it),true);
-                    if (df.readURL().replace("file://",TQString::null)==m_popupPath.path)
+                    if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path)
                         break;
                 }
             }
@@ -2788,7 +2788,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
          }
      }
 
-     if (source!=m_exitView) {
+     if (TQT_BASE_OBJECT_CONST(source)!=TQT_BASE_OBJECT(m_exitView)) {
         if (m_popupService || (!m_popupPath.path.startsWith("kicker:/") && !m_popupPath.path.startsWith("system:/") && !m_popupPath.path.startsWith("kaddressbook:/"))) {
             if (hasEntries)
                 m_popupMenu->insertSeparator();
@@ -2828,14 +2828,14 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
                i18n("Put Into Run Dialog"), PutIntoRunDialog);
             }
         }
-        if (source==m_searchResultsWidget || ((source==m_favoriteView || source==m_recentlyView || source == m_systemView) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
+        if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_searchResultsWidget) || ((TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_favoriteView) || TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView) || TQT_BASE_OBJECT_CONST(source) == TQT_BASE_OBJECT(m_systemView)) && !m_popupService && !m_popupPath.path.startsWith("kicker:/")) ) {
             TQString uri;
             if (m_popupService)
                 uri = locate("apps", m_popupService->desktopEntryPath());
             else
                 uri = m_popupPath.path;
 
-            TQString mimetype = TQString::null;
+            TQString mimetype = TQString();
             if ( m_popupPath.path.startsWith( "system:/media/" ) )
                 mimetype = media_mimetypes[m_popupPath.path];
 
@@ -2865,7 +2865,7 @@ void KMenu::slotContextMenuRequested( TQListViewItem * item, const TQPoint & pos
         }
     }
 
-    if (source==m_recentlyView) {
+    if (TQT_BASE_OBJECT_CONST(source)==TQT_BASE_OBJECT(m_recentlyView)) {
        m_popupMenu->insertSeparator();
        if (m_popupService)
          m_popupMenu->insertItem(SmallIconSet("history_clear"),
@@ -2935,8 +2935,8 @@ void KMenu::slotContextMenu(int selected)
 	case EditItem:
         case EditMenu:
 	    accept();
-            proc = new KProcess(this);
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            proc = new KProcess(TQT_TQOBJECT(this));
+            *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit"));
             *proc << "/"+m_popupPath.menuPath.section('/',-200,-2) << m_popupPath.menuPath.section('/', -1);
             proc->start();
 	    break;
@@ -2971,7 +2971,7 @@ void KMenu::slotContextMenu(int selected)
 
         case AddToFavorites:
 	    if (m_popupService) {
-              if (favs.find(m_popupService->storageId())==favs.end()) {
+              if (favs.tqfind(m_popupService->storageId())==favs.end()) {
                 KService::Ptr p = KService::serviceByStorageId(m_popupService->storageId());
                 m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1);
                 favs+=m_popupService->storageId();
@@ -2982,7 +2982,7 @@ void KMenu::slotContextMenu(int selected)
                for (it = favs.begin(); it != favs.end(); ++it) {
                   if ((*it)[0]=='/') {
                      KDesktopFile df((*it),true);
-                     if (df.readURL().replace("file://",TQString::null)==m_popupPath.path)
+                     if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path)
                         break;
                   }
                }
@@ -3010,7 +3010,7 @@ void KMenu::slotContextMenu(int selected)
 
         case RemoveFromFavorites:
 	    if (m_popupService) {
-              favs.erase(favs.find(m_popupService->storageId()));
+              favs.erase(favs.tqfind(m_popupService->storageId()));
 
               for (TQListViewItemIterator it(m_favoriteView); it.current(); ++it) {
                  KMenuItem* kitem = static_cast<KMenuItem*>(it.current());
@@ -3024,7 +3024,7 @@ void KMenu::slotContextMenu(int selected)
                for (TQStringList::Iterator it = favs.begin(); it != favs.end(); ++it) {
                   if ((*it)[0]=='/') {
                      KDesktopFile df((*it),true);
-                     if (df.readURL().replace("file://",TQString::null)==m_popupPath.path) {
+                     if (df.readURL().tqreplace("file://",TQString())==m_popupPath.path) {
 			TQFile::remove((*it));
                         favs.erase(it);
                         break;
@@ -3074,24 +3074,24 @@ void KMenu::resizeEvent ( TQResizeEvent * e )
         // put the search widget at the top of the menu and give it its desired
         // height
         m_search->mainWidget()->setGeometry( 0, ypos, width(),
-                m_search->minimumSize().height() );
-        left_height -= m_search->minimumSize().height();
-        ypos += m_search->minimumSize().height();
+                m_search->tqminimumSize().height() );
+        left_height -= m_search->tqminimumSize().height();
+        ypos += m_search->tqminimumSize().height();
 
         // place the footer widget at the bottom of the menu and give it its desired
         // height
-        m_footer->mainWidget()->setGeometry( 0, height() - m_footer->minimumSize().height(),
-                width(), m_footer->minimumSize().height() );
-        left_height -= m_footer->minimumSize().height();
+        m_footer->mainWidget()->setGeometry( 0, height() - m_footer->tqminimumSize().height(),
+                width(), m_footer->tqminimumSize().height() );
+        left_height -= m_footer->tqminimumSize().height();
 
         // place the button box above the footer widget, horizontal placement
         // has the width of the edge graphics subtracted
         m_tabBar->setGeometry(button_box_left.width(),
-                height() - m_footer->minimumSize().height() -
-                m_tabBar->sizeHint().height(),
+                height() - m_footer->tqminimumSize().height() -
+                m_tabBar->tqsizeHint().height(),
                 width() - button_box_left.width(),
-                m_tabBar->sizeHint().height() );
-        left_height -= m_tabBar->sizeHint().height();
+                m_tabBar->tqsizeHint().height() );
+        left_height -= m_tabBar->tqsizeHint().height();
 
         // place the main (stacker) widget below the search widget,
         // in the remaining vertical space
@@ -3105,28 +3105,28 @@ void KMenu::resizeEvent ( TQResizeEvent * e )
         // place the 'footer' widget at the top of the menu and give it
         // its desired height
         m_footer->mainWidget()->setGeometry( 0,
-                ypos /*height() - m_footer->minimumSize().height()*/,
+                ypos /*height() - m_footer->tqminimumSize().height()*/,
                 width(),
-                m_footer->minimumSize().height() );
-        ypos += m_footer->minimumSize().height();
-        left_height -= m_footer->minimumSize().height();
+                m_footer->tqminimumSize().height() );
+        ypos += m_footer->tqminimumSize().height();
+        left_height -= m_footer->tqminimumSize().height();
 
         // place the button box next at the top of the menu.
         // has the width of the edge graphics subtracted
         m_tabBar->setGeometry(button_box_left.width(), ypos, width() - button_box_left.width(),
-                m_tabBar->sizeHint().height());
+                m_tabBar->tqsizeHint().height());
 
-        ypos += m_tabBar->sizeHint().height();
-        left_height -= m_tabBar->sizeHint().height();
+        ypos += m_tabBar->tqsizeHint().height();
+        left_height -= m_tabBar->tqsizeHint().height();
 
         // put the search widget above the footer widget
         // height
         m_search->mainWidget()->setGeometry( 0,
-                height() - m_search->minimumSize().height(),
+                height() - m_search->tqminimumSize().height(),
                 width(),
-                m_search->minimumSize().height()
+                m_search->tqminimumSize().height()
                 );
-        left_height -= m_search->minimumSize().height();
+        left_height -= m_search->tqminimumSize().height();
 
         // place the main (stacker) widget below the button box,
         // in the remaining vertical space
@@ -3167,14 +3167,14 @@ void KMenu::mouseMoveEvent ( TQMouseEvent * e )
     if ( hasMouseTracking() && m_isresizing ) {
         m_stacker->setMinimumSize( TQSize(0, 0) );
         m_stacker->setMaximumSize( TQSize(32000, 32000) );
-        int newWidth = QMAX( e->x() - x(), minimumSizeHint().width() );
+        int newWidth = QMAX( e->x() - x(), tqminimumSizeHint().width() );
         if ( m_orientation == BottomUp ) {
-          int newHeight = QMAX( height() - e->y(), minimumSizeHint().height() + 10 );
+          int newHeight = QMAX( height() - e->y(), tqminimumSizeHint().height() + 10 );
           int newY = y() + height() - newHeight;
           setGeometry( x(), newY, newWidth, newHeight);
         }
         else {
-          setGeometry( x(), y(), newWidth, QMAX( e->y(), minimumSizeHint().height() + 10 ));
+          setGeometry( x(), y(), newWidth, QMAX( e->y(), tqminimumSizeHint().height() + 10 ));
         }
     }
 }
@@ -3277,10 +3277,10 @@ void KMenu::searchActionClicked(TQListViewItem* item)
 
      if( !KURIFilter::self()->filterURI(data, list) ) {
          KDesktopFile file("searchproviders/google.desktop", true, "services");
-         data.setData(file.readEntry("Query").replace("\\{@}", m_kcommand->currentText()));
+         data.setData(file.readEntry("Query").tqreplace("\\{@}", m_kcommand->currentText()));
      }
 
-     (void) new KRun( data.uri(), parentWidget());
+     (void) new KRun( data.uri(), tqparentWidget());
    }
 }
 
@@ -3320,7 +3320,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service)
     TQString strItem(service->desktopEntryPath());
 
     // don't add an item from root kmenu level
-    if (!strItem.contains('/'))
+    if (!strItem.tqcontains('/'))
     {
         return;
     }
@@ -3331,7 +3331,7 @@ void KMenu::updateRecentlyUsedApps(KService::Ptr &service)
     RecentlyLaunchedApps::the().m_bNeedToUpdate = true;
 }
 
-TQSize KMenu::sizeHint() const
+TQSize KMenu::tqsizeHint() const
 {
 #warning FIXME
     // this should be only for the inner area so layout changes do not break it
@@ -3339,28 +3339,28 @@ TQSize KMenu::sizeHint() const
 
     const int height = kMin(KickerSettings::kMenuHeight(), TQApplication::desktop()->screen()->height()-50);
     TQSize wanted(width, height);
-    kdDebug() << "show " << minimumSizeHint() << " " << m_stacker->minimumSizeHint() << " "
-              << m_searchFrame->minimumSizeHint() << " " << wanted << endl;
+    kdDebug() << "show " << tqminimumSizeHint() << " " << m_stacker->tqminimumSizeHint() << " "
+              << m_searchFrame->tqminimumSizeHint() << " " << wanted << endl;
     bool isDefault = wanted.isNull();
-    wanted = wanted.expandedTo(minimumSizeHint());
+    wanted = wanted.expandedTo(tqminimumSizeHint());
     if ( isDefault )
-        wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->minimumSizeHint().height() ) );
+        wanted.setHeight( wanted.height() + ( m_favoriteView->goodHeight() - m_stacker->tqminimumSizeHint().height() ) );
 
     return wanted;
 }
 
-TQSize KMenu::minimumSizeHint() const
+TQSize KMenu::tqminimumSizeHint() const
 {
     TQSize minsize;
-    minsize.setWidth( minsize.width() + m_tabBar->sizeHint().width() );
+    minsize.setWidth( minsize.width() + m_tabBar->tqsizeHint().width() );
     minsize.setWidth( QMAX( minsize.width(),
-                            m_search->minimumSize().width() ) );
+                            m_search->tqminimumSize().width() ) );
     minsize.setWidth( QMAX( minsize.width(),
-                            m_search->minimumSize().width() ) );
+                            m_search->tqminimumSize().width() ) );
 
     minsize.setHeight( minsize.height() +
-                       m_search->minimumSize().height() +
-                       m_footer->minimumSize().height() +
+                       m_search->tqminimumSize().height() +
+                       m_footer->tqminimumSize().height() +
                        180 ); // 180 is a very rough guess for 32 icon size
     return minsize;
 }
@@ -3372,12 +3372,12 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
 
     TQStringList favs = KickerSettings::favorites();
     TQStringList::Iterator it;
-    TQString addFav = TQString::null;
+    TQString addFav = TQString();
 
     // remove at old position
     if (kitem->service())
     {
-        favs.erase(favs.find(kitem->service()->storageId()));
+        favs.erase(favs.tqfind(kitem->service()->storageId()));
         addFav = kitem->service()->storageId();
     }
     else
@@ -3387,7 +3387,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
             if ((*it)[0]=='/')
             {
                 KDesktopFile df((*it),true);
-                if (df.readURL().replace("file://",TQString::null)==kitem->path())
+                if (df.readURL().tqreplace("file://",TQString())==kitem->path())
                 {
                     addFav = *it;
                     favs.erase(it);
@@ -3412,7 +3412,7 @@ void KMenu::slotFavoritesMoved( TQListViewItem* item, TQListViewItem* /*afterFir
             if ((*it)[0]=='/' && !kafterNow->service())
             {
                 KDesktopFile df((*it),true);
-                if (df.readURL().replace("file://",TQString::null)==kafterNow->path())
+                if (df.readURL().tqreplace("file://",TQString())==kafterNow->path())
                 {
                     kdDebug() << "insert after " << kafterNow->path() << endl;
                     favs.insert(++it,addFav);
@@ -3480,7 +3480,7 @@ void KMenu::updateMedia()
         if ( iconName.isEmpty() ) // no user icon, query the MIME type
         {
             KMimeType::Ptr mime = KMimeType::mimeType( mimeType );
-            iconName = mime->icon( TQString::null, false );
+            iconName = mime->icon( TQString(), false );
         }
 
         TQString descr = deviceNode;
@@ -3549,7 +3549,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
 
         if (item.m_s)
         {
-            if (favs.find(item.m_s->storageId())==favs.end())
+            if (favs.tqfind(item.m_s->storageId())==favs.end())
             {
                 newItem = m_favoriteView->insertMenuItem(item.m_s, serviceMenuEndId()+favs.count()+1);
                 favs += item.m_s->storageId();
@@ -3558,7 +3558,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
         else
         {
             TQString uri = item.m_path;
-            if (uri.startsWith(locateLocal("data", TQString::fromLatin1("RecentDocuments/")))) {
+            if (uri.startsWith(locateLocal("data", TQString::tqfromLatin1("RecentDocuments/")))) {
                KDesktopFile df(uri,true);
                uri=df.readURL();
             }
@@ -3569,7 +3569,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
                 if ((*it)[0]=='/')
                 {
                     KDesktopFile df((*it),true);
-                    if (df.readURL().replace("file://",TQString::null)==uri)
+                    if (df.readURL().tqreplace("file://",TQString())==uri)
                         break;
                 }
             }
@@ -3597,8 +3597,8 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
 
         if (text.endsWith(".desktop"))
         {
-            KService::Ptr p = KService::serviceByDesktopPath(text.replace("file://",TQString::null));
-            if (p && favs.find(p->storageId())==favs.end()) {
+            KService::Ptr p = KService::serviceByDesktopPath(text.tqreplace("file://",TQString()));
+            if (p && favs.tqfind(p->storageId())==favs.end()) {
                 newItem = m_favoriteView->insertMenuItem(p, serviceMenuEndId()+favs.count()+1);
                 favs+=p->storageId();
             }
@@ -3611,13 +3611,13 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
                 if ((*it)[0]=='/')
                 {
                     KDesktopFile df((*it),true);
-                    if (df.readURL().replace("file://",TQString::null)==text)
+                    if (df.readURL().tqreplace("file://",TQString())==text)
                         break;
                 }
             }
             if (it==favs.end())
             {
-                KFileItem* item = new KFileItem(text, TQString::null, KFileItem::Unknown);
+                KFileItem* item = new KFileItem(text, TQString(), KFileItem::Unknown);
                 KURL kurl(text);
 
                 TQString file = KickerLib::newDesktopFile(text);
@@ -3625,7 +3625,7 @@ void KMenu::slotFavDropped(TQDropEvent * ev, TQListViewItem *after )
                 df.writeEntry("Encoding", "UTF-8");
                 df.writeEntry("Type","Link");
                 df.writeEntry("Name", item->name());
-                df.writeEntry("GenericName", i18n("Directory: %1").arg(kurl.upURL().path()));
+                df.writeEntry("GenericName", i18n("Directory: %1").tqarg(kurl.upURL().path()));
                 df.writeEntry("Icon", item->iconName());
                 df.writeEntry("URL", text);
 
diff --git a/kicker/kicker/ui/k_new_mnu.h b/kicker/kicker/ui/k_new_mnu.h
index ef45ef815..73549cfa0 100644
--- a/kicker/kicker/ui/k_new_mnu.h
+++ b/kicker/kicker/ui/k_new_mnu.h
@@ -104,8 +104,8 @@ public:
 
     enum MaskEffect { Plain, Dissolve };
 
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     void searchOver();
     void initCategoryTitlesUpdate();
@@ -319,7 +319,7 @@ private:
     TQStringList m_programsInMenu;
     TQStringList m_newInstalledPrograms, m_seenPrograms;
     bool m_seenProgramsChanged;
-    TQString m_currentDate;
+    TQString m_tqcurrentDate;
 
     MenuOrientation m_orientation;
     bool m_toolTipsEnabled;
diff --git a/kicker/kicker/ui/kickoff_bar.cpp b/kicker/kicker/ui/kickoff_bar.cpp
index 2f0de9aea..6fe731933 100644
--- a/kicker/kicker/ui/kickoff_bar.cpp
+++ b/kicker/kicker/ui/kickoff_bar.cpp
@@ -56,10 +56,10 @@ void KickoffTabBar::paint(TQPainter* p, TQTab* t, bool selected) const
 //    else if(t == d->pressed)
 //        flags |= TQStyle::Style_Sunken;
     //selection flags
-    if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
+    if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    style().drawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
-            colorGroup(), flags, TQStyleOption(t) );
+    tqstyle().tqdrawControl( TQStyle::CE_TabBarTab, p, this, t->rect(),
+            tqcolorGroup(), flags, TQStyleOption(t) );
 
     paintLabel( p, t->rect(), t, t->identifier() == keyboardFocusTab() );
 }
@@ -70,11 +70,11 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
     TQRect r = br;
 
     bool selected = m_tabsActivated && (currentTab() == t->identifier());
-    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this );
 
     p->setFont( font() );
     TQFontMetrics fm = p->fontMetrics();
-    int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, t->text() ).width();
+    int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, t->text() ).width();
 
     TQRect rt(r);
     rt.setWidth(fw);
@@ -114,30 +114,30 @@ void KickoffTabBar::paintLabel(TQPainter* p, const TQRect& br, TQTab* t, bool ha
         flags |= TQStyle::Style_Selected;
  //   else if(t == d->pressed)
  //       flags |= TQStyle::Style_Sunken;
-    if(t->rect().contains(mapFromGlobal(TQCursor::pos())))
+    if(t->rect().tqcontains(mapFromGlobal(TQCursor::pos())))
         flags |= TQStyle::Style_MouseOver;
-    style().drawControl( TQStyle::CE_TabBarLabel, p, this, rt,
-            t->isEnabled() ? colorGroup(): palette().disabled(),
+    tqstyle().tqdrawControl( TQStyle::CE_TabBarLabel, p, this, rt,
+            t->isEnabled() ? tqcolorGroup(): tqpalette().disabled(),
             flags, TQStyleOption(t) );
 }
 
-TQSize KickoffTabBar::sizeHint() const
+TQSize KickoffTabBar::tqsizeHint() const
 {
-    TQSize s = TQTabBar::sizeHint();
+    TQSize s = TQTabBar::tqsizeHint();
 
     return s;
 }
 
 void KickoffTabBar::layoutTabs()
 {
-    TQTabBar::layoutTabs();
+    TQTabBar::tqlayoutTabs();
 
     TQFontMetrics fm = fontMetrics();
     int fh = ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + 4;
 
-    int hframe = style().pixelMetric( TQStyle::PM_TabBarTabHSpace, this );
-    int vframe = style().pixelMetric( TQStyle::PM_TabBarTabVSpace, this );
-    int overlap = style().pixelMetric( TQStyle::PM_TabBarTabOverlap, this );
+    int hframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabHSpace, this );
+    int vframe = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabVSpace, this );
+    int overlap = tqstyle().tqpixelMetric( TQStyle::PM_TabBarTabOverlap, this );
 
     TQSize s;
     for (int t = 0; t < count(); ++t)
@@ -155,13 +155,13 @@ void KickoffTabBar::layoutTabs()
             h += 4 + s.height() + 4;
         TQRect r = tab->rect();
 
-        int fw = fm.size( Qt::SingleLine|Qt::ShowPrefix, tab->text() ).width();
+        int fw = fm.size( TQt::SingleLine|TQt::ShowPrefix, tab->text() ).width();
         int iw = 0;
         if ( tab->iconSet() != 0 )
             iw = tab->iconSet()->pixmap( TQIconSet::Large, TQIconSet::Normal ).width();
         int w = QMAX(iw, fw + 6 + 6 ) + hframe;
         h += ((KickerSettings::kickoffTabBarFormat() != KickerSettings::IconOnly) ? fm.height() : 0) + vframe;
-        tab->setRect(TQRect(TQPoint(x, 0), style().sizeFromContents(TQStyle::CT_TabBarTab, this,
+        tab->setRect(TQRect(TQPoint(x, 0), tqstyle().tqsizeFromContents(TQStyle::CT_TabBarTab, this,
                     TQSize(w, h), TQStyleOption(tab))));
         x += tab->rect().width() - overlap;
     }
@@ -185,7 +185,7 @@ void KickoffTabBar::dragMoveEvent(TQDragMoveEvent* event)
 
 void KickoffTabBar::mousePressEvent( TQMouseEvent * e )
 {
-    if ( e->button() != LeftButton ) {
+    if ( e->button() != Qt::LeftButton ) {
 	e->ignore();
 	return;
     }
diff --git a/kicker/kicker/ui/kickoff_bar.h b/kicker/kicker/ui/kickoff_bar.h
index 2330ffe39..55f94c3dd 100644
--- a/kicker/kicker/ui/kickoff_bar.h
+++ b/kicker/kicker/ui/kickoff_bar.h
@@ -32,7 +32,7 @@ public:
     KickoffTabBar(TQWidget* parent, const char* name);
 
     void deactivateTabs(bool b);
-    virtual TQSize sizeHint() const;
+    virtual TQSize tqsizeHint() const;
 
 protected:
     virtual void paint(TQPainter*, TQTab*, bool) const;
diff --git a/kicker/kicker/ui/kmenuitembase.ui b/kicker/kicker/ui/kmenuitembase.ui
index 0cbea1155..0b49763a1 100644
--- a/kicker/kicker/ui/kmenuitembase.ui
+++ b/kicker/kicker/ui/kmenuitembase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>KMenuItemBase</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>KMenuItemBase</cstring>
     </property>
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>80</height>
@@ -42,7 +42,7 @@
         <property name="margin">
             <number>2</number>
         </property>
-        <widget class="QLayoutWidget" row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>layout11</cstring>
             </property>
@@ -50,7 +50,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemTitle</cstring>
                     </property>
@@ -73,11 +73,11 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemDescription</cstring>
                     </property>
@@ -102,13 +102,13 @@
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignTop</set>
                     </property>
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>layout4</cstring>
             </property>
@@ -116,11 +116,11 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>itemPixmap</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>64</width>
                             <height>64</height>
@@ -129,7 +129,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop|AlignHCenter</set>
                     </property>
                 </widget>
diff --git a/kicker/kicker/ui/nonKDEButtonSettings.ui b/kicker/kicker/ui/nonKDEButtonSettings.ui
index 5c44aca85..a3f04e6a8 100644
--- a/kicker/kicker/ui/nonKDEButtonSettings.ui
+++ b/kicker/kicker/ui/nonKDEButtonSettings.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>NonKDEButtonSettings</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NonKDEButtonSettings</cstring>
     </property>
@@ -30,7 +30,7 @@
                 <string>Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="8" column="0" rowspan="1" colspan="2">
+        <widget class="TQLabel" row="8" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
@@ -46,7 +46,7 @@
 &lt;i&gt;Example&lt;/i&gt;: For the command `rm -rf` enter "-rf" in this text box.</string>
             </property>
         </widget>
-        <widget class="QCheckBox" row="10" column="0" rowspan="1" colspan="2">
+        <widget class="TQCheckBox" row="10" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_inTerm</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <string>Select this option if the command is a command line application and you wish to be able to see its output when run.</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="9" column="0" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="9" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_commandLine</cstring>
             </property>
@@ -67,7 +67,7 @@
 &lt;i&gt;Example&lt;/i&gt;: For the command `rm -rf` enter "-rf" in this text box.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="6" column="0">
+        <widget class="TQLabel" row="6" column="0">
             <property name="name">
                 <cstring>textLabel2</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <string>Enter the name of the executable file to be run when this button is selected. If it is not in your $PATH then you will need to provide an absolute path.</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="1" column="1">
+        <widget class="TQLineEdit" row="1" column="1">
             <property name="name">
                 <cstring>m_title</cstring>
             </property>
@@ -97,7 +97,7 @@
                 <string>Enter the name you would like to appear for this button here.</string>
             </property>
         </widget>
-        <widget class="QLabel" row="0" column="1">
+        <widget class="TQLabel" row="0" column="1">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -121,7 +121,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -140,13 +140,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>58</width>
                     <height>58</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>58</width>
                     <height>58</height>
@@ -159,7 +159,7 @@
                 <number>48</number>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="TQLabel" row="4" column="0">
             <property name="name">
                 <cstring>textLabel4</cstring>
             </property>
@@ -173,7 +173,7 @@
                 <string>Enter the name you would like to appear for this button here.</string>
             </property>
         </widget>
-        <widget class="QLineEdit" row="5" column="0" rowspan="1" colspan="2">
+        <widget class="TQLineEdit" row="5" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>m_description</cstring>
             </property>
@@ -199,7 +199,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>8</height>
diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h
index 439fc195f..e5f565c1a 100644
--- a/kicker/kicker/ui/popupmenutitle.h
+++ b/kicker/kicker/ui/popupmenutitle.h
@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kapplication.h>
 
-class PopupMenuTitle : public QCustomMenuItem
+class PopupMenuTitle : public TQCustomMenuItem
 {
 public:
     PopupMenuTitle(const TQString &name, const TQFont &font);
@@ -46,7 +46,7 @@ public:
     {
         p->save();
         TQRect r(x, y, w, h);
-        kapp->style().drawPrimitive(TQStyle::PE_HeaderSection, 
+        kapp->tqstyle().tqdrawPrimitive(TQStyle::PE_HeaderSection, 
                                     p, r, cg);
 
         if (!m_desktopName.isEmpty())
@@ -69,11 +69,11 @@ public:
         m_font.setBold(true);
     }
 
-    TQSize sizeHint()
+    TQSize tqsizeHint()
     {
       TQSize size = TQFontMetrics(m_font).size(AlignHCenter, m_desktopName);
       size.setHeight(size.height() + 
-                     (kapp->style().pixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
+                     (kapp->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth) * 2 + 1));
       return size;
     }
 
diff --git a/kicker/kicker/ui/query.cpp b/kicker/kicker/ui/query.cpp
index 12b9b6910..0bcff59c1 100644
--- a/kicker/kicker/ui/query.cpp
+++ b/kicker/kicker/ui/query.cpp
@@ -111,7 +111,7 @@ bool Query::matches(const TQString &term)
       bool next_alternative = false;
 
       for ( TQStringList::ConstIterator it = alt->excludes.begin(); it != alt->excludes.end(); ++it ) {
-         if ( lower_term.find(*it)!=-1 ) {
+         if ( lower_term.tqfind(*it)!=-1 ) {
             next_alternative = true;
             continue;
          }
@@ -120,7 +120,7 @@ bool Query::matches(const TQString &term)
          continue;
 
       for ( TQStringList::ConstIterator it = alt->includes.begin(); it != alt->includes.end(); ++it ) {
-         if ( lower_term.find(*it)==-1 ) {
+         if ( lower_term.tqfind(*it)==-1 ) {
             next_alternative = true;
             continue;
          }
diff --git a/kicker/kicker/ui/removeapplet_mnu.cpp b/kicker/kicker/ui/removeapplet_mnu.cpp
index 2e0543dae..3c14a74aa 100644
--- a/kicker/kicker/ui/removeapplet_mnu.cpp
+++ b/kicker/kicker/ui/removeapplet_mnu.cpp
@@ -63,7 +63,7 @@ void PanelRemoveAppletMenu::slotAboutToShow()
         }
 
         items.append(PanelMenuItemInfo(container->icon(),
-                                       container->visibleName().replace("&", "&&"),
+                                       container->visibleName().tqreplace("&", "&&"),
                                        id));
         ++id;
         ++it;
diff --git a/kicker/kicker/ui/removeapplet_mnu.h b/kicker/kicker/ui/removeapplet_mnu.h
index b444b8540..895ded710 100644
--- a/kicker/kicker/ui/removeapplet_mnu.h
+++ b/kicker/kicker/ui/removeapplet_mnu.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ContainerArea;
 
-class PanelRemoveAppletMenu : public QPopupMenu
+class PanelRemoveAppletMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/removebutton_mnu.h b/kicker/kicker/ui/removebutton_mnu.h
index d326a2f62..211edd771 100644
--- a/kicker/kicker/ui/removebutton_mnu.h
+++ b/kicker/kicker/ui/removebutton_mnu.h
@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ContainerArea;
 
-class PanelRemoveButtonMenu : public QPopupMenu
+class PanelRemoveButtonMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/removecontainer_mnu.h b/kicker/kicker/ui/removecontainer_mnu.h
index 6dd28dc30..bd6d03d89 100644
--- a/kicker/kicker/ui/removecontainer_mnu.h
+++ b/kicker/kicker/ui/removecontainer_mnu.h
@@ -28,7 +28,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class ContainerArea;
 
-class RemoveContainerMenu : public QPopupMenu
+class RemoveContainerMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/removeextension_mnu.cpp b/kicker/kicker/ui/removeextension_mnu.cpp
index 9d5d80d2b..e1d8d62c4 100644
--- a/kicker/kicker/ui/removeextension_mnu.cpp
+++ b/kicker/kicker/ui/removeextension_mnu.cpp
@@ -57,7 +57,7 @@ void PanelRemoveExtensionMenu::slotAboutToShow()
     for (ExtensionList::iterator it = m_containers.begin(); it != itEnd; ++it)
     {
         const AppletInfo info = (*it)->info();
-        TQString name = info.name().replace("&", "&&");
+        TQString name = info.name().tqreplace("&", "&&");
         switch ((*it)->position())
         {
             case KPanelExtension::Top:
diff --git a/kicker/kicker/ui/removeextension_mnu.h b/kicker/kicker/ui/removeextension_mnu.h
index 2fc83008a..e77522bc8 100644
--- a/kicker/kicker/ui/removeextension_mnu.h
+++ b/kicker/kicker/ui/removeextension_mnu.h
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "container_extension.h"
 
-class PanelRemoveExtensionMenu : public QPopupMenu
+class PanelRemoveExtensionMenu : public TQPopupMenu
 {
     Q_OBJECT
 
diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp
index 3042eddfe..76aa6162e 100644
--- a/kicker/kicker/ui/service_mnu.cpp
+++ b/kicker/kicker/ui/service_mnu.cpp
@@ -231,7 +231,7 @@ void PanelServiceMenu::fillMenu(KServiceGroup::Ptr& _root,
             TQString inlineHeaderName = g->showInlineHeader() ? groupCaption : "";
             // Item names may contain ampersands. To avoid them being converted
             // to accelerators, replace them with two ampersands.
-            groupCaption.replace("&", "&&");
+            groupCaption.tqreplace("&", "&&");
 
             if ( nbChildCount == 1 && g->allowInline() && g->inlineAlias())
             {
@@ -411,10 +411,10 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
         if (KickerSettings::menuEntryFormat() == KickerSettings::NameAndDescription)
         {
             if ((!suppressGenericNames ||
-                 !suppressGenericNames->contains(s->untranslatedGenericName())) &&
-                serviceName.find(comment, 0, true) == -1)
+                 !suppressGenericNames->tqcontains(s->untranslatedGenericName())) &&
+                serviceName.tqfind(comment, 0, true) == -1)
             {
-                if (comment.find(serviceName, 0, true) == -1)
+                if (comment.tqfind(serviceName, 0, true) == -1)
                 {
                     serviceName = i18n("Entries in K-menu: %1 app name, %2 description", "%1 - %2").arg(serviceName, comment);
                 }
@@ -450,7 +450,7 @@ void PanelServiceMenu::insertMenuItem(KService::Ptr & s, int nId,
 
     // item names may contain ampersands. To avoid them being converted
     // to accelerators, replace them with two ampersands.
-    serviceName.replace("&", "&&");
+    serviceName.tqreplace("&", "&&");
 
     TQString icon = s->icon();
     if (icon=="unknown")
@@ -544,7 +544,7 @@ bool PanelServiceMenu::highlightMenuItem( const TQString &menuItemId )
 
 void PanelServiceMenu::slotExec(int id)
 {
-    if (!entryMap_.contains(id))
+    if (!entryMap_.tqcontains(id))
     {
         return;
     }
@@ -569,7 +569,7 @@ void PanelServiceMenu::mousePressEvent(TQMouseEvent * ev)
 
 void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
 {
-    if (ev->button() == RightButton && !Kicker::the()->isKioskImmutable())
+    if (ev->button() == Qt::RightButton && !Kicker::the()->isKioskImmutable())
     {
         int id = idAt( ev->pos() );
 
@@ -578,7 +578,7 @@ void PanelServiceMenu::mouseReleaseEvent(TQMouseEvent * ev)
             return;
         }
 
-        if (!entryMap_.contains(id))
+        if (!entryMap_.tqcontains(id))
         {
             kdDebug(1210) << "Cannot find service with menu id " << id << endl;
             return;
@@ -694,8 +694,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
 	case EditItem:
-            proc = new KProcess(this);
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            proc = new KProcess(TQT_TQOBJECT(this));
+            *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit"));
             *proc << "/"+relPath_ << static_cast<KService *>(contextKSycocaEntry_)->menuId();
             proc->start();
 	    break;
@@ -738,8 +738,8 @@ void PanelServiceMenu::slotContextMenu(int selected)
         }
 
         case EditMenu:
-            proc = new KProcess(this);
-            *proc << KStandardDirs::findExe(TQString::fromLatin1("kmenuedit"));
+            proc = new KProcess(TQT_TQOBJECT(this));
+            *proc << KStandardDirs::findExe(TQString::tqfromLatin1("kmenuedit"));
             *proc << "/"+static_cast<KServiceGroup *>(contextKSycocaEntry_)->relPath();
             proc->start();
 	    break;
@@ -756,7 +756,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     if (Kicker::the()->isKioskImmutable())
         return;
 
-    if ( (ev->state() & LeftButton ) != LeftButton )
+    if ( (ev->state() & Qt::LeftButton ) != Qt::LeftButton )
         return;
 
     TQPoint p = ev->pos() - startPos_;
@@ -769,7 +769,7 @@ void PanelServiceMenu::mouseMoveEvent(TQMouseEvent * ev)
     if (id < serviceMenuStartId())
         return;
 
-    if (!entryMap_.contains(id)) {
+    if (!entryMap_.tqcontains(id)) {
         kdDebug(1210) << "Cannot find service with menu id " << id << endl;
         return;
     }
@@ -838,7 +838,7 @@ void PanelServiceMenu::dragEnterEvent(TQDragEnterEvent *event)
 void PanelServiceMenu::dragLeaveEvent(TQDragLeaveEvent *)
 {
     // see PanelServiceMenu::dragEnterEvent why this is nescessary
-    if (!frameGeometry().contains(TQCursor::pos()))
+    if (!TQT_TQRECT_OBJECT(frameGeometry()).tqcontains(TQCursor::pos()))
     {
         KURLDrag::setTarget(0);
     }
@@ -932,12 +932,12 @@ void PanelServiceMenu::setSearchString(const TQString &searchString)
         int id = *menuItemIt;
         KService* s = dynamic_cast< KService* >( static_cast< KSycocaEntry* >( entryMap_[ id ]));
         TQString menuText = text(id);
-        if (menuText.contains(searchString, false) > 0
-            || ( s != NULL && ( s->name().contains(searchString, false) > 0
-                               || s->exec().contains(searchString, false) > 0
-                               || s->comment().contains(searchString, false) > 0
-                               || s->genericName().contains(searchString, false) > 0
-                               || s->exec().contains(searchString, false) > 0 )
+        if (menuText.tqcontains(searchString, false) > 0
+            || ( s != NULL && ( s->name().tqcontains(searchString, false) > 0
+                               || s->exec().tqcontains(searchString, false) > 0
+                               || s->comment().tqcontains(searchString, false) > 0
+                               || s->genericName().tqcontains(searchString, false) > 0
+                               || s->exec().tqcontains(searchString, false) > 0 )
                 )) {
             setItemEnabled(id, true);
             foundSomething = true;
@@ -951,7 +951,7 @@ void PanelServiceMenu::setSearchString(const TQString &searchString)
     /*for (int i=count()-1; i>=0; --i) {
         int id = idAt(i);
         TQString menuText = text(id);
-        if (menuText.contains(searchString, false) > 0) {
+        if (menuText.tqcontains(searchString, false) > 0) {
             setItemEnabled(id, true);
             foundSomething = true;
             nonemptyMenus.insert(id);
@@ -995,7 +995,7 @@ void PanelServiceMenu::updateRecentlyUsedApps(KService::Ptr &service)
     TQString strItem(service->desktopEntryPath());
 
     // don't add an item from root kmenu level
-    if (!strItem.contains('/'))
+    if (!strItem.tqcontains('/'))
     {
         return;
     }