Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1

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

23 files changed, 366 insertions, 366 deletions

diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp
index f5f398136..5d4bb57f2 100644
--- a/kicker/kicker/core/applethandle.cpp
+++ b/kicker/kicker/core/applethandle.cpp
@@ -52,17 +52,17 @@ AppletHandle::AppletHandle(AppletContainer* parent)
 {
     setBackgroundOrigin(AncestorOrigin);
     setMinimumSize(widthForHeight(0), heightForWidth(0));
-    m_layout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0);
+    m_tqlayout = new TQBoxLayout(this, TQBoxLayout::BottomToTop, 0, 0);
 
     m_dragBar = new AppletHandleDrag(this);
     m_dragBar->installEventFilter(this);
-    m_layout->addWidget(m_dragBar);
+    m_tqlayout->addWidget(m_dragBar);
 
     if (kapp->authorizeKAction("kicker_rmb"))
     {
         m_menuButton = new AppletHandleButton( this );
         m_menuButton->installEventFilter(this);
-        m_layout->addWidget(m_menuButton);
+        m_tqlayout->addWidget(m_menuButton);
 
         connect(m_menuButton, TQT_SIGNAL(pressed()),
                 this, TQT_SLOT(menuButtonPressed()));
@@ -75,14 +75,14 @@ AppletHandle::AppletHandle(AppletContainer* parent)
 
 int AppletHandle::heightForWidth( int /* w */ ) const
 {
-    int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     return size;
 }
 
 int AppletHandle::widthForHeight( int /* h */ ) const
 {
-    int size = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int size = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     return size;
 }
@@ -101,25 +101,25 @@ void AppletHandle::setPopupDirection(KPanelApplet::Direction d)
     switch (m_popupDirection)
     {
         case KPanelApplet::Up:
-            m_layout->setDirection(TQBoxLayout::BottomToTop);
+            m_tqlayout->setDirection(TQBoxLayout::BottomToTop);
             a = Qt::UpArrow;
             break;
         case KPanelApplet::Down:
-            m_layout->setDirection(TQBoxLayout::TopToBottom);
+            m_tqlayout->setDirection(TQBoxLayout::TopToBottom);
             a = Qt::DownArrow;
             break;
         case KPanelApplet::Left:
-            m_layout->setDirection(TQBoxLayout::RightToLeft);
+            m_tqlayout->setDirection(TQBoxLayout::RightToLeft);
             a = Qt::LeftArrow;
             break;
         case KPanelApplet::Right:
-            m_layout->setDirection(TQBoxLayout::LeftToRight);
+            m_tqlayout->setDirection(TQBoxLayout::LeftToRight);
             a = Qt::RightArrow;
             break;
     }
 
     m_menuButton->setArrowType(a);
-    m_layout->activate();
+    m_tqlayout->activate();
 }
 
 void AppletHandle::resetLayout()
@@ -200,7 +200,7 @@ bool AppletHandle::eventFilter(TQObject *o, TQEvent *e)
                     // a hack for applets that have out-of-process
                     // elements (e.g the systray) so that the handle
                     // doesn't flicker when moving over those elements
-                    if (w->rect().contains(w->mapFromGlobal(TQCursor::pos())))
+                    if (w->rect().tqcontains(w->mapFromGlobal(TQCursor::pos())))
                     {
                         nowDrawIt = true;
                     }
@@ -269,7 +269,7 @@ void AppletHandle::checkHandleHover()
 {
     if (!m_handleHoverTimer ||
         (m_menuButton && m_menuButton->isOn()) ||
-        m_applet->geometry().contains(m_applet->mapToParent(
+        m_applet->tqgeometry().tqcontains(m_applet->mapToParent(
                                       m_applet->mapFromGlobal(TQCursor::pos()))))
     {
         return;
@@ -282,7 +282,7 @@ void AppletHandle::checkHandleHover()
 
 bool AppletHandle::onMenuButton(const TQPoint& point) const
 {
-    return m_menuButton && (childAt(mapFromGlobal(point)) == m_menuButton);
+    return m_menuButton && (tqchildAt(mapFromGlobal(point)) == m_menuButton);
 }
 
 void AppletHandle::toggleMenuButtonOff()
@@ -308,9 +308,9 @@ AppletHandleDrag::AppletHandleDrag(AppletHandle* parent)
    setBackgroundOrigin( AncestorOrigin );
 }
 
-TQSize AppletHandleDrag::minimumSizeHint() const
+TQSize AppletHandleDrag::tqminimumSizeHint() const
 {
-    int wh = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int wh = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
 
     if (m_parent->orientation() == Horizontal)
     {
@@ -368,7 +368,7 @@ void AppletHandleDrag::paintEvent(TQPaintEvent *)
         TQRect r = rect();
     
         style().drawPrimitive(TQStyle::PE_DockWindowHandle, &p, r,
-                            colorGroup(), flags);
+                            tqcolorGroup(), flags);
     }
     else
     {
@@ -382,9 +382,9 @@ AppletHandleButton::AppletHandleButton(AppletHandle *parent)
 {
 }
 
-TQSize AppletHandleButton::minimumSizeHint() const
+TQSize AppletHandleButton::tqminimumSizeHint() const
 {
-    int height = style().pixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
+    int height = style().tqpixelMetric(TQStyle::PM_DockWindowHandleExtent, this);
     int width = height;
 
     if (m_parent->orientation() == Horizontal)
diff --git a/kicker/kicker/core/applethandle.h b/kicker/kicker/core/applethandle.h
index 5eff46717..ad80e2ee6 100644
--- a/kicker/kicker/core/applethandle.h
+++ b/kicker/kicker/core/applethandle.h
@@ -76,7 +76,7 @@ class AppletHandle : public QWidget
 
     private:
         AppletContainer* m_applet;
-        TQBoxLayout* m_layout;
+        TQBoxLayout* m_tqlayout;
         AppletHandleDrag* m_dragBar;
         AppletHandleButton* m_menuButton;
         bool m_drawHandle;
@@ -92,9 +92,9 @@ class AppletHandleDrag : public QWidget
     public:
         AppletHandleDrag(AppletHandle* parent);
 
-        TQSize minimumSizeHint() const;
-        TQSize minimumSize() const { return minimumSizeHint(); }
-        TQSize sizeHint() const { return minimumSize(); }
+        TQSize tqminimumSizeHint() const;
+        TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+        TQSize tqsizeHint() const { return tqminimumSize(); }
         TQSizePolicy sizePolicy() const;
 
     protected:
@@ -113,9 +113,9 @@ class AppletHandleButton : public SimpleArrowButton
     
     public:
         AppletHandleButton(AppletHandle *parent);
-        TQSize minimumSizeHint() const;
-        TQSize minimumSize() const { return minimumSizeHint(); }
-        TQSize sizeHint() const { return minimumSize(); }
+        TQSize tqminimumSizeHint() const;
+        TQSize tqminimumSize() const { return tqminimumSizeHint(); }
+        TQSize tqsizeHint() const { return tqminimumSize(); }
         TQSizePolicy sizePolicy() const;
 
     private:
diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 77c6d1912..764c66846 100644
--- a/kicker/kicker/core/container_applet.cpp
+++ b/kicker/kicker/core/container_applet.cpp
@@ -65,7 +65,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
                   TQString(info.library() + "container").latin1()),
     _info(info),
     _handle(0),
-    _layout(0),
+    _tqlayout(0),
     _type(KPanelApplet::Normal),
     _widthForHeightHint(0),
     _heightForWidthHint(0),
@@ -81,24 +81,24 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     if (orientation() == Horizontal)
     {
-        _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
+        _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
     }
     else
     {
-        _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0);
+        _tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0);
     }
 
-    _layout->setResizeMode( TQLayout::FreeResize );
+    _tqlayout->setResizeMode( TQLayout::FreeResize );
 
-    _layout->addSpacing(APPLET_MARGIN);
+    _tqlayout->addSpacing(APPLET_MARGIN);
     _handle = new AppletHandle(this);
-    _layout->addWidget(_handle, 0);
+    _tqlayout->addWidget(_handle, 0);
     connect(_handle, TQT_SIGNAL(moveApplet(const TQPoint&)),
             this, TQT_SLOT(moveApplet(const TQPoint&)));
     connect(_handle, TQT_SIGNAL(showAppletMenu()), this, TQT_SLOT(showAppletMenu()));
 
-    _layout->addWidget(_appletframe, 1);
-    _layout->activate();
+    _tqlayout->addWidget(_appletframe, 1);
+    _tqlayout->activate();
 
     _deskFile = info.desktopFile();
     _configFile = info.configFile();
@@ -117,7 +117,7 @@ AppletContainer::AppletContainer(const AppletInfo& info,
     _valid = true;
 
     _applet->setPosition((KPanelApplet::Position)KickerLib::directionToPosition(popupDirection()));
-    _applet->setAlignment((KPanelApplet::Alignment)alignment());
+    _applet->tqsetAlignment((KPanelApplet::Alignment)tqalignment());
 
     _actions = _applet->actions();
     _type = _applet->type();
@@ -193,14 +193,14 @@ void AppletContainer::resetLayout()
 
     if (orientation() == Horizontal)
     {
-        _layout->setDirection( TQBoxLayout::LeftToRight );
+        _tqlayout->setDirection( TQBoxLayout::LeftToRight );
     }
     else
     {
-        _layout->setDirection( TQBoxLayout::TopToBottom );
+        _tqlayout->setDirection( TQBoxLayout::TopToBottom );
     }
 
-    _layout->activate();
+    _tqlayout->activate();
 }
 
 void AppletContainer::moveApplet( const TQPoint& moveOffset )
@@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config)
 
 void AppletContainer::activateWindow()
 {
-    KWin::forceActiveWindow(topLevelWidget()->winId());
+    KWin::forceActiveWindow(tqtopLevelWidget()->winId());
 }
 
 void AppletContainer::focusRequested(bool focus)
 {
     if (focus)
     {
-        KWin::forceActiveWindow(topLevelWidget()->winId());
+        KWin::forceActiveWindow(tqtopLevelWidget()->winId());
     }
 
     emit maintainFocus(focus);
@@ -295,7 +295,7 @@ void AppletContainer::doLoadConfiguration( KConfigGroup& config )
 }
 
 void AppletContainer::doSaveConfiguration( KConfigGroup& config,
-                                           bool layoutOnly ) const
+                                           bool tqlayoutOnly ) const
 {
     // immutability is checked by ContainerBase
     if (orientation() == Horizontal)
@@ -307,7 +307,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config,
         config.writeEntry( "HeightForWidthHint", heightForWidth(width()) );
     }
 
-    if (!layoutOnly)
+    if (!tqlayoutOnly)
     {
         config.writePathEntry( "ConfigFile", _configFile );
         config.writePathEntry( "DesktopFile", _deskFile );
@@ -354,14 +354,14 @@ void AppletContainer::slotDelayedDestruct()
     delete this;
 }
 
-void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
+void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a)
 {
     if (!_applet)
     {
         return;
     }
 
-    _applet->setAlignment( (KPanelApplet::Alignment)a );
+    _applet->tqsetAlignment( (KPanelApplet::Alignment)a );
 }
 
 int AppletContainer::widthForHeight(int h) const
diff --git a/kicker/kicker/core/container_applet.h b/kicker/kicker/core/container_applet.h
index 019e52c96..12f5c2c7d 100644
--- a/kicker/kicker/core/container_applet.h
+++ b/kicker/kicker/core/container_applet.h
@@ -83,15 +83,15 @@ public slots:
 
 protected:
     virtual void doLoadConfiguration( KConfigGroup& );
-    virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
-    virtual void alignmentChange(KPanelExtension::Alignment a);
+    virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const;
+    virtual void tqalignmentChange(KPanelExtension::Alignment a);
 
     virtual TQPopupMenu* createOpMenu();
 
     AppletInfo         _info;
     AppletHandle      *_handle;
     TQHBox             *_appletframe;
-    TQBoxLayout        *_layout;
+    TQBoxLayout        *_tqlayout;
     KPanelApplet::Type _type;
     int                _widthForHeightHint;
     int                _heightForWidthHint;
diff --git a/kicker/kicker/core/container_base.cpp b/kicker/kicker/core/container_base.cpp
index bb3d7d984..957262b34 100644
--- a/kicker/kicker/core/container_base.cpp
+++ b/kicker/kicker/core/container_base.cpp
@@ -38,7 +38,7 @@ BaseContainer::BaseContainer( TQPopupMenu* appletOpMenu, TQWidget* parent, const
   : TQWidget( parent, name )
   , _dir(KPanelApplet::Up)
   , _orient(Horizontal)
-  , _alignment(KPanelExtension::LeftTop)
+  , _tqalignment(KPanelExtension::LeftTop)
   , _fspace(0)
   , _moveOffset(TQPoint(0,0))
   , _aid(TQString::null)
@@ -77,7 +77,7 @@ void BaseContainer::loadConfiguration( KConfigGroup& group )
 }
 
 void BaseContainer::saveConfiguration(KConfigGroup& group,
-                                      bool layoutOnly) const
+                                      bool tqlayoutOnly) const
 {
     if (isImmutable())
     {
@@ -87,7 +87,7 @@ void BaseContainer::saveConfiguration(KConfigGroup& group,
     // write positioning info
     group.writeEntry( "FreeSpace2", freeSpace() );
     // write type specific info
-    doSaveConfiguration( group, layoutOnly );
+    doSaveConfiguration( group, tqlayoutOnly );
 }
 
 void BaseContainer::configure(KPanelExtension::Orientation o,
@@ -110,15 +110,15 @@ void BaseContainer::slotRemoved(KConfig* config)
     config->sync();
 }
 
-void BaseContainer::setAlignment(KPanelExtension::Alignment a)
+void BaseContainer::tqsetAlignment(KPanelExtension::Alignment a)
 {
-    if (_alignment == a)
+    if (_tqalignment == a)
     {
         return;
     }
 
-    _alignment = a;
-    alignmentChange(a);
+    _tqalignment = a;
+    tqalignmentChange(a);
 }
 
 TQPopupMenu* BaseContainer::opMenu()
diff --git a/kicker/kicker/core/container_base.h b/kicker/kicker/core/container_base.h
index 1c218b103..bdf965f8d 100644
--- a/kicker/kicker/core/container_base.h
+++ b/kicker/kicker/core/container_base.h
@@ -73,7 +73,7 @@ public:
 
     KPanelApplet::Direction popupDirection() const { return _dir; }
     KPanelExtension::Orientation orientation() const { return _orient; }
-    KPanelExtension::Alignment alignment() const { return _alignment; }
+    KPanelExtension::Alignment tqalignment() const { return _tqalignment; }
 
     virtual void setBackground() {}
 
@@ -81,7 +81,7 @@ public:
     void clearOpMenu();
 
     void loadConfiguration( KConfigGroup& );
-    void saveConfiguration( KConfigGroup&, bool layoutOnly = false ) const;
+    void saveConfiguration( KConfigGroup&, bool tqlayoutOnly = false ) const;
 
     void configure(KPanelExtension::Orientation, KPanelApplet::Direction);
     virtual void configure() {}
@@ -97,7 +97,7 @@ public slots:
     virtual void setPopupDirection(KPanelApplet::Direction d) { _dir = d; }
     virtual void setOrientation(KPanelExtension::Orientation o) { _orient = o; }
 
-    void setAlignment(KPanelExtension::Alignment a);
+    void tqsetAlignment(KPanelExtension::Alignment a);
 
 signals:
     void removeme(BaseContainer*);
@@ -110,15 +110,15 @@ signals:
 protected:
     virtual void doLoadConfiguration( KConfigGroup& ) {}
     virtual void doSaveConfiguration( KConfigGroup&,
-                                      bool /* layoutOnly */ ) const {}
-    virtual void alignmentChange(KPanelExtension::Alignment) {}
+                                      bool /* tqlayoutOnly */ ) const {}
+    virtual void tqalignmentChange(KPanelExtension::Alignment) {}
 
     virtual TQPopupMenu* createOpMenu() = 0;
     TQPopupMenu *appletOpMenu() const { return _appletOpMnu; }
 
     KPanelApplet::Direction _dir;
     KPanelExtension::Orientation _orient;
-    KPanelExtension::Alignment _alignment;
+    KPanelExtension::Alignment _tqalignment;
     double             _fspace;
     TQPoint             _moveOffset;
     TQString            _aid;
diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp
index bb0249843..bd1045d84 100644
--- a/kicker/kicker/core/container_button.cpp
+++ b/kicker/kicker/core/container_button.cpp
@@ -60,7 +60,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ButtonContainer::ButtonContainer(TQPopupMenu* opMenu, TQWidget* parent)
   : BaseContainer(opMenu, parent)
   , _button(0)
-  , _layout(0)
+  , _tqlayout(0)
   , _oldpos(0,0)
 {
      setBackgroundOrigin(AncestorOrigin);
@@ -114,10 +114,10 @@ void ButtonContainer::configure()
     }
 }
 
-void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool layoutOnly) const
+void ButtonContainer::doSaveConfiguration(KConfigGroup& config, bool tqlayoutOnly) const
 {
     // immutability is checked by ContainerBase
-    if (_button && !layoutOnly)
+    if (_button && !tqlayoutOnly)
     {
         _button->saveConfig(config);
     }
@@ -145,12 +145,12 @@ void ButtonContainer::embedButton(PanelButton* b)
 {
     if (!b) return;
 
-    delete _layout;
-    _layout = new TQVBoxLayout(this);
+    delete _tqlayout;
+    _tqlayout = new TQVBoxLayout(this);
     _button = b;
 
     _button->installEventFilter(this);
-    _layout->add(_button);
+    _tqlayout->add(_button);
     connect(_button, TQT_SIGNAL(requestSave()), TQT_SIGNAL(requestSave()));
     connect(_button, TQT_SIGNAL(hideme(bool)), TQT_SLOT(hideRequested(bool)));
     connect(_button, TQT_SIGNAL(removeme()), TQT_SLOT(removeRequested()));
diff --git a/kicker/kicker/core/container_button.h b/kicker/kicker/core/container_button.h
index 78b4d4ab1..7050f9cb6 100644
--- a/kicker/kicker/core/container_button.h
+++ b/kicker/kicker/core/container_button.h
@@ -68,14 +68,14 @@ protected slots:
     void dragButton(const TQPixmap icon);
 
 protected:
-    virtual void doSaveConfiguration( KConfigGroup&, bool layoutOnly ) const;
+    virtual void doSaveConfiguration( KConfigGroup&, bool tqlayoutOnly ) const;
     void embedButton(PanelButton* p);
     TQPopupMenu* createOpMenu();
     void checkImmutability(const KConfigGroup&);
 
 protected:
     PanelButton  *_button;
-    TQLayout      *_layout;
+    TQLayout      *_tqlayout;
     TQPoint        _oldpos;
 };
 
diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp
index 52e85bd7e..6a1455f3e 100644
--- a/kicker/kicker/core/container_extension.cpp
+++ b/kicker/kicker/core/container_extension.cpp
@@ -139,11 +139,11 @@ void ExtensionContainer::init()
     _popupWidgetFilter = new PopupWidgetFilter( this );
     connect(_popupWidgetFilter, TQT_SIGNAL(popupWidgetHiding()), TQT_SLOT(maybeStartAutoHideTimer()));
 
-    // layout
-    _layout = new TQGridLayout(this, 3, 3, 0, 0);
-    _layout->setResizeMode(TQLayout::FreeResize);
-    _layout->setRowStretch(1,10);
-    _layout->setColStretch(1,10);
+    // tqlayout
+    _tqlayout = new TQGridLayout(this, 3, 3, 0, 0);
+    _tqlayout->setResizeMode(TQLayout::FreeResize);
+    _tqlayout->setRowStretch(1,10);
+    _tqlayout->setColStretch(1,10);
 
     // instantiate the autohide timer
     _autohideTimer = new TQTimer(this, "_autohideTimer");
@@ -198,7 +198,7 @@ void ExtensionContainer::init()
         connect(m_extension, TQT_SIGNAL(maintainFocus(bool)),
                 TQT_SLOT(maintainFocus(bool)));
 
-        _layout->addWidget(m_extension, 1, 1);
+        _tqlayout->addWidget(m_extension, 1, 1);
     }
 
     if (!m_settings.iExist())
@@ -212,7 +212,7 @@ ExtensionContainer::~ExtensionContainer()
 {
 }
 
-TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &maxSize) const
+TQSize ExtensionContainer::tqsizeHint(KPanelExtension::Position p, const TQSize &maxSize) const
 {
     int width = 0;
     int height = 0;
@@ -234,7 +234,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m
         }
 
         // don't forget we might have a border!
-        width += _layout->colSpacing(0) + _layout->colSpacing(2);
+        width += _tqlayout->colSpacing(0) + _tqlayout->colSpacing(2);
     }
     else
     {
@@ -254,7 +254,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m
         }
 
         // don't forget we might have a border!
-        height += _layout->rowSpacing(0) + _layout->rowSpacing(2);
+        height += _tqlayout->rowSpacing(0) + _tqlayout->rowSpacing(2);
     }
 
     TQSize size(width, height);
@@ -262,7 +262,7 @@ TQSize ExtensionContainer::sizeHint(KPanelExtension::Position p, const TQSize &m
 
     if (m_extension)
     {
-        size = m_extension->sizeHint(p, maxSize - size) + size;
+        size = m_extension->tqsizeHint(p, maxSize - size) + size;
     }
 
     return size.boundedTo(maxSize);
@@ -293,7 +293,7 @@ void ExtensionContainer::readConfig()
     }
 
     positionChange(position());
-    alignmentChange(alignment());
+    tqalignmentChange(tqalignment());
     setSize(static_cast<KPanelExtension::Size>(m_settings.size()),
             m_settings.customSize());
 
@@ -471,7 +471,7 @@ void ExtensionContainer::moveMe()
                                                 KPanelExtension::Right,
                                                 KPanelExtension::Top,
                                                 KPanelExtension::Bottom };
-    KPanelExtension::Alignment alignments[] = { KPanelExtension::LeftTop,
+    KPanelExtension::Alignment tqalignments[] = { KPanelExtension::LeftTop,
                                                 KPanelExtension::Center,
                                                 KPanelExtension::RightBottom };
 
@@ -482,26 +482,26 @@ void ExtensionContainer::moveMe()
             for (int j = 0; j < 3; j++)
             {
                 // FIXME:
-                // asking for initial geometry here passes bogus heightForWidth
+                // asking for initial tqgeometry here passes bogus heightForWidth
                 // and widthForHeight requests to applets and buttons. if they
-                // need to make layout adjustments or need to calculate based
+                // need to make tqlayout adjustments or need to calculate based
                 // on other parameters this can lead to Bad Things(tm)
                 //
                 // we need to find a way to do this that doesn't result in
-                // sizeHint's getting called on the extension =/
+                // tqsizeHint's getting called on the extension =/
                 //
                 // or else we need to change the semantics for applets so that
                 // they don't get their "you're changing position" signals through
                 // heightForWidth/widthForHeight
                 rects.append(UserRectSel::PanelStrut(initialGeometry(positions[i],
-                                                                     alignments[j], s),
-                                                     s, positions[i], alignments[j]));
+                                                                     tqalignments[j], s),
+                                                     s, positions[i], tqalignments[j]));
             }
         }
     }
 
     UserRectSel::PanelStrut newStrut = UserRectSel::select(rects, rect().center(), m_highlightColor);
-    arrange(newStrut.m_pos, newStrut.m_alignment, newStrut.m_screen);
+    arrange(newStrut.m_pos, newStrut.m_tqalignment, newStrut.m_screen);
 
     _is_lmb_down = false;
 
@@ -532,7 +532,7 @@ void ExtensionContainer::updateLayout()
         return;
     }
 
-    // don't update our layout more than once every half a second...
+    // don't update our tqlayout more than once every half a second...
     if (_in_autohide)
     {
         // ... unless we are autohiding
@@ -556,12 +556,12 @@ void ExtensionContainer::enableMouseOverEffects()
     KickerTip::enableTipping(true);
     TQPoint globalPos = TQCursor::pos();
     TQPoint localPos = mapFromGlobal(globalPos);
-    TQWidget* child = childAt(localPos);
+    TQWidget* child = tqchildAt(localPos);
 
     if (child)
     {
         TQMouseEvent* e = new TQMouseEvent(TQEvent::Enter, localPos, globalPos, 0, 0);
-        qApp->sendEvent(child, e);
+        tqApp->sendEvent(child, e);
     }
 }
 
@@ -657,16 +657,16 @@ void ExtensionContainer::unhideTriggered(UnhideTrigger::Trigger tr, int Xinerama
 
     // Otherwise hide mode is automatic. The code below is slightly
     // complex so as to keep the same behavior as it has always had:
-    // only unhide when the cursor position is within the widget geometry.
-    // We can't just do geometry().contains(TQCursor::pos()) because
+    // only unhide when the cursor position is within the widget tqgeometry.
+    // We can't just do tqgeometry().tqcontains(TQCursor::pos()) because
     // now we hide the panel completely off screen.
 
     int x = TQCursor::pos().x();
     int y = TQCursor::pos().y();
-    int t = geometry().top();
-    int b = geometry().bottom();
-    int r = geometry().right();
-    int l = geometry().left();
+    int t = tqgeometry().top();
+    int b = tqgeometry().bottom();
+    int r = tqgeometry().right();
+    int l = tqgeometry().left();
     if (((tr == UnhideTrigger::Top ||
           tr == UnhideTrigger::TopLeft ||
           tr == UnhideTrigger::TopRight) &&
@@ -730,9 +730,9 @@ void ExtensionContainer::autoHideTimeout()
         return;
     }
 
-    TQRect r = geometry();
+    TQRect r = tqgeometry();
     TQPoint p = TQCursor::pos();
-    if (!r.contains(p) &&
+    if (!r.tqcontains(p) &&
         (m_settings.unhideLocation() == UnhideTrigger::None ||
          !shouldUnhideForTrigger(m_unhideTriggeredAt)))
     {
@@ -766,7 +766,7 @@ void ExtensionContainer::autoHide(bool hide)
     blockUserInput(true);
 
     TQPoint oldpos = pos();
-    TQRect newextent = initialGeometry( position(), alignment(), xineramaScreen(), hide, Unhidden );
+    TQRect newextent = initialGeometry( position(), tqalignment(), xineramaScreen(), hide, Unhidden );
     TQPoint newpos = newextent.topLeft();
 
     if (hide)
@@ -781,7 +781,7 @@ void ExtensionContainer::autoHide(bool hide)
              * letting them show reveal buttons onscreen */
             TQRect desktopGeom = TQApplication::desktop()->screenGeometry(s);
             if (desktopGeom.intersects(newextent) &&
-                !desktopGeom.intersects(geometry()))
+                !desktopGeom.intersects(tqgeometry()))
             {
                 blockUserInput( false );
                 return;
@@ -821,8 +821,8 @@ void ExtensionContainer::autoHide(bool hide)
                     move(oldpos.x() - i, newpos.y());
                 }
 
-                qApp->syncX();
-                qApp->processEvents();
+                tqApp->syncX();
+                tqApp->processEvents();
             }
         }
         else
@@ -839,8 +839,8 @@ void ExtensionContainer::autoHide(bool hide)
                     move(newpos.x(), oldpos.y() - i);
                 }
 
-                qApp->syncX();
-                qApp->processEvents();
+                tqApp->syncX();
+                tqApp->processEvents();
             }
         }
     }
@@ -878,7 +878,7 @@ void ExtensionContainer::animatedHide(bool left)
     }
 
     TQPoint oldpos = pos();
-    TQRect newextent = initialGeometry(position(), alignment(), xineramaScreen(), false, newState);
+    TQRect newextent = initialGeometry(position(), tqalignment(), xineramaScreen(), false, newState);
     TQPoint newpos(newextent.topLeft());
 
     if (newState != Unhidden)
@@ -891,7 +891,7 @@ void ExtensionContainer::animatedHide(bool left)
              * panels from hiding by sliding onto other screens, while still
             * letting them show reveal buttons onscreen */
             if (TQApplication::desktop()->screenGeometry(s).intersects(newextent) &&
-                !TQApplication::desktop()->screenGeometry(s).intersects(geometry()))
+                !TQApplication::desktop()->screenGeometry(s).intersects(tqgeometry()))
             {
                 blockUserInput(false);
                 TQTimer::singleShot(100, this, TQT_SLOT(enableMouseOverEffects()));
@@ -920,8 +920,8 @@ void ExtensionContainer::animatedHide(bool left)
                 {
                     move(newpos.x(), oldpos.y() - i);
                 }
-                qApp->syncX();
-                qApp->processEvents();
+                tqApp->syncX();
+                tqApp->processEvents();
             }
         }
         else
@@ -937,8 +937,8 @@ void ExtensionContainer::animatedHide(bool left)
                 {
                     move(oldpos.x() - i, newpos.y());
                 }
-                qApp->syncX();
-                qApp->processEvents();
+                tqApp->syncX();
+                tqApp->processEvents();
             }
         }
     }
@@ -948,8 +948,8 @@ void ExtensionContainer::animatedHide(bool left)
     _userHidden = newState;
 
     actuallyUpdateLayout();
-    qApp->syncX();
-    qApp->processEvents();
+    tqApp->syncX();
+    tqApp->processEvents();
 
     // save our hidden status so that when kicker starts up again
     // we'll come back in the same state
@@ -965,11 +965,11 @@ bool ExtensionContainer::reserveStrut() const
     return !m_extension || m_extension->reserveStrut();
 }
 
-KPanelExtension::Alignment ExtensionContainer::alignment() const
+KPanelExtension::Alignment ExtensionContainer::tqalignment() const
 {
     // KConfigXT really needs to get support for vars that are enums that
     // are defined in other classes
-    return static_cast<KPanelExtension::Alignment>(m_settings.alignment());
+    return static_cast<KPanelExtension::Alignment>(m_settings.tqalignment());
 }
 
 void ExtensionContainer::updateWindowManager()
@@ -983,8 +983,8 @@ void ExtensionContainer::updateWindowManager()
         int w = 0;
         int h = 0;
 
-        TQRect geom = initialGeometry(position(), alignment(), xineramaScreen());
-        TQRect virtRect(TQApplication::desktop()->geometry());
+        TQRect geom = initialGeometry(position(), tqalignment(), xineramaScreen());
+        TQRect virtRect(TQApplication::desktop()->tqgeometry());
         TQRect screenRect(TQApplication::desktop()->screenGeometry(xineramaScreen()));
 
         if (m_hideMode == ManualHide && !userHidden())
@@ -1087,7 +1087,7 @@ void ExtensionContainer::strutChanged()
     //kdDebug(1210) << "PanelContainer::strutChanged()" << endl;
     TQRect ig = currentGeometry();
 
-    if (ig != geometry())
+    if (ig != tqgeometry())
     {
         setGeometry(ig);
         updateLayout();
@@ -1106,11 +1106,11 @@ void ExtensionContainer::blockUserInput( bool block )
     // eventfilter discard those events.
     if ( block )
     {
-        qApp->installEventFilter( this );
+        tqApp->installEventFilter( this );
     }
     else
     {
-        qApp->removeEventFilter( this );
+        tqApp->removeEventFilter( this );
     }
 
     _block_user_input = block;
@@ -1170,11 +1170,11 @@ void ExtensionContainer::maintainFocus(bool maintain)
 
 int ExtensionContainer::arrangeHideButtons()
 {
-    bool layoutEnabled = _layout->isEnabled();
+    bool tqlayoutEnabled = _tqlayout->isEnabled();
 
-    if (layoutEnabled)
+    if (tqlayoutEnabled)
     {
-        _layout->setEnabled(false);
+        _tqlayout->setEnabled(false);
     }
 
     if (orientation() == Vertical)
@@ -1190,16 +1190,16 @@ int ExtensionContainer::arrangeHideButtons()
         {
             _ltHB->setMaximumWidth(maxWidth);
             _ltHB->setMaximumHeight(14);
-            _layout->remove(_ltHB);
-            _layout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
+            _tqlayout->remove(_ltHB);
+            _tqlayout->addWidget(_ltHB, 0, 1, Qt::AlignBottom | Qt::AlignLeft);
         }
 
         if (_rbHB)
         {
             _rbHB->setMaximumWidth(maxWidth);
             _rbHB->setMaximumHeight(14);
-            _layout->remove(_rbHB);
-            _layout->addWidget(_rbHB, 2, 1);
+            _tqlayout->remove(_rbHB);
+            _tqlayout->addWidget(_rbHB, 2, 1);
         }
     }
     else
@@ -1218,14 +1218,14 @@ int ExtensionContainer::arrangeHideButtons()
         {
             _ltHB->setMaximumHeight(maxHeight);
             _ltHB->setMaximumWidth(14);
-            _layout->remove(_ltHB);
+            _tqlayout->remove(_ltHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_ltHB, 1, 2, vertAlignment);
+                _tqlayout->addWidget(_ltHB, 1, 2, vertAlignment);
             }
             else
             {
-                _layout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment);
+                _tqlayout->addWidget(_ltHB, 1, 0, leftAlignment | vertAlignment);
             }
         }
 
@@ -1233,57 +1233,57 @@ int ExtensionContainer::arrangeHideButtons()
         {
             _rbHB->setMaximumHeight(maxHeight);
             _rbHB->setMaximumWidth(14);
-            _layout->remove(_rbHB);
+            _tqlayout->remove(_rbHB);
             if (kapp->reverseLayout())
             {
-                _layout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment);
+                _tqlayout->addWidget(_rbHB, 1, 0, leftAlignment | vertAlignment);
             }
             else
             {
-                _layout->addWidget(_rbHB, 1, 2, vertAlignment);
+                _tqlayout->addWidget(_rbHB, 1, 2, vertAlignment);
             }
         }
     }
 
-    int layoutOffset = setupBorderSpace();
-    if (layoutEnabled)
+    int tqlayoutOffset = setupBorderSpace();
+    if (tqlayoutEnabled)
     {
-        _layout->setEnabled(true);
+        _tqlayout->setEnabled(true);
     }
 
-    return layoutOffset;
+    return tqlayoutOffset;
 }
 
 int ExtensionContainer::setupBorderSpace()
 {
-    _layout->setRowSpacing(0, 0);
-    _layout->setRowSpacing(2, 0);
-    _layout->setColSpacing(0, 0);
-    _layout->setColSpacing(2, 0);
+    _tqlayout->setRowSpacing(0, 0);
+    _tqlayout->setRowSpacing(2, 0);
+    _tqlayout->setColSpacing(0, 0);
+    _tqlayout->setColSpacing(2, 0);
 
     if (!needsBorder())
     {
         return 0;
     }
 
-    int layoutOffset = 0;
+    int tqlayoutOffset = 0;
     TQRect r = TQApplication::desktop()->screenGeometry(xineramaScreen());
-    TQRect h = geometry();
+    TQRect h = tqgeometry();
 
     if (orientation() == Vertical)
     {
         if (h.top() > 0)
         {
             int topHeight = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->height() + 1 : 1;
-            _layout->setRowSpacing(0, topHeight);
-            ++layoutOffset;
+            _tqlayout->setRowSpacing(0, topHeight);
+            ++tqlayoutOffset;
         }
 
         if (h.bottom() < r.bottom())
         {
             int bottomHeight = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->height() + 1 : 1;
-            _layout->setRowSpacing(1, bottomHeight);
-            ++layoutOffset;
+            _tqlayout->setRowSpacing(1, bottomHeight);
+            ++tqlayoutOffset;
         }
     }
     else
@@ -1291,39 +1291,39 @@ int ExtensionContainer::setupBorderSpace()
         if (h.left() > 0)
         {
             int leftWidth = (_ltHB && _ltHB->isVisibleTo(this)) ? _ltHB->width() + 1 : 1;
-            _layout->setColSpacing(0, leftWidth);
-            ++layoutOffset;
+            _tqlayout->setColSpacing(0, leftWidth);
+            ++tqlayoutOffset;
         }
 
         if (h.right() < r.right())
         {
             int rightWidth = (_rbHB && _rbHB->isVisibleTo(this)) ? _rbHB->width() + 1 : 1;
-            _layout->setColSpacing(1, rightWidth);
-            ++layoutOffset;
+            _tqlayout->setColSpacing(1, rightWidth);
+            ++tqlayoutOffset;
         }
     }
 
     switch (position())
     {
         case KPanelExtension::Left:
-            _layout->setColSpacing(2, 1);
+            _tqlayout->setColSpacing(2, 1);
         break;
 
         case KPanelExtension::Right:
-            _layout->setColSpacing(0, 1);
+            _tqlayout->setColSpacing(0, 1);
         break;
 
         case KPanelExtension::Top:
-            _layout->setRowSpacing(2, 1);
+            _tqlayout->setRowSpacing(2, 1);
         break;
 
         case KPanelExtension::Bottom:
         default:
-            _layout->setRowSpacing(0, 1);
+            _tqlayout->setRowSpacing(0, 1);
         break;
     }
 
-    return layoutOffset;
+    return tqlayoutOffset;
 }
 
 void ExtensionContainer::positionChange(KPanelExtension::Position p)
@@ -1368,14 +1368,14 @@ void ExtensionContainer::leaveEvent(TQEvent*)
     maybeStartAutoHideTimer();
 }
 
-void ExtensionContainer::alignmentChange(KPanelExtension::Alignment a)
+void ExtensionContainer::tqalignmentChange(KPanelExtension::Alignment a)
 {
     if (!m_extension)
     {
         return;
     }
 
-    m_extension->setAlignment(a);
+    m_extension->tqsetAlignment(a);
 }
 
 void ExtensionContainer::setSize(KPanelExtension::Size size, int custom)
@@ -1437,8 +1437,8 @@ void ExtensionContainer::setHideButtons(bool showLeft, bool showRight)
 
 bool ExtensionContainer::event(TQEvent* e)
 {
-    // Update the layout when we receive a LayoutHint. This way we can adjust
-    // to changes of the layout of the main widget.
+    // Update the tqlayout when we receive a LayoutHint. This way we can adjust
+    // to changes of the tqlayout of the main widget.
     if (e->type() == TQEvent::LayoutHint)
     {
         updateLayout();
@@ -1458,7 +1458,7 @@ void ExtensionContainer::arrange(KPanelExtension::Position p,
                                  int XineramaScreen)
 {
     if (p == m_settings.position() &&
-        a == m_settings.alignment() &&
+        a == m_settings.tqalignment() &&
         XineramaScreen == xineramaScreen())
     {
         return;
@@ -1471,18 +1471,18 @@ void ExtensionContainer::arrange(KPanelExtension::Position p,
     }
     else if (!needsBorder())
     {
-        // this ensures that the layout gets rejigged
+        // this ensures that the tqlayout gets rejigged
         // even if position doesn't change
-        _layout->setRowSpacing(0, 0);
-        _layout->setRowSpacing(2, 0);
-        _layout->setColSpacing(0, 0);
-        _layout->setColSpacing(2, 0);
+        _tqlayout->setRowSpacing(0, 0);
+        _tqlayout->setRowSpacing(2, 0);
+        _tqlayout->setColSpacing(0, 0);
+        _tqlayout->setColSpacing(2, 0);
     }
 
-    if (a != m_settings.alignment())
+    if (a != m_settings.tqalignment())
     {
-        m_settings.setAlignment(a);
-        setAlignment(a);
+        m_settings.tqsetAlignment(a);
+        tqsetAlignment(a);
     }
 
     if (XineramaScreen != xineramaScreen())
@@ -1521,22 +1521,22 @@ KPanelExtension::Position ExtensionContainer::position() const
 
 void ExtensionContainer::resetLayout()
 {
-    TQRect g = initialGeometry(position(), alignment(), xineramaScreen(),
+    TQRect g = initialGeometry(position(), tqalignment(), xineramaScreen(),
                               autoHidden(), userHidden());
 
-    // Disable the layout while we rearrange the panel.
+    // Disable the tqlayout while we rearrange the panel.
     // Necessary because the children may be
-    // relayouted with the wrong size.
+    // retqlayouted with the wrong size.
 
-    _layout->setEnabled(false);
+    _tqlayout->setEnabled(false);
 
-    if (geometry() != g)
+    if (tqgeometry() != g)
     {
         setGeometry(g);
         ExtensionManager::the()->extensionSizeChanged(this);
     }
 
-    // layout
+    // tqlayout
     bool haveToArrangeButtons = false;
     bool showLeftHideButton = m_settings.showLeftHideButton() || userHidden() == RightBottom;
     bool showRightHideButton = m_settings.showRightHideButton() || userHidden() == LeftTop;
@@ -1685,7 +1685,7 @@ void ExtensionContainer::resetLayout()
         }
     }
 
-    _layout->setEnabled(true);
+    _tqlayout->setEnabled(true);
 }
 
 bool ExtensionContainer::needsBorder() const
@@ -1700,7 +1700,7 @@ TQSize ExtensionContainer::initialSize(KPanelExtension::Position p, TQRect workA
         ", " << workArea.topLeft().y() << ") to (" << workArea.bottomRight().x() <<
         ", " << workArea.bottomRight().y() << ")" << endl;*/
 
-    TQSize hint = sizeHint(p, workArea.size()).boundedTo(workArea.size());
+    TQSize hint = tqsizeHint(p, workArea.size()).boundedTo(workArea.size());
     int width = 0;
     int height = 0;
 
@@ -1739,7 +1739,7 @@ TQPoint ExtensionContainer::initialLocation(KPanelExtension::Position p,
     TQRect wholeScreen;
     if (XineramaScreen == XineramaAllScreens)
     {
-        wholeScreen = TQApplication::desktop()->geometry();
+        wholeScreen = TQApplication::desktop()->tqgeometry();
     }
     else
     {
@@ -1920,12 +1920,12 @@ void ExtensionContainer::setXineramaScreen(int screen)
         return;
     }
 
-    arrange(position(),alignment(), screen);
+    arrange(position(),tqalignment(), screen);
 }
 
 TQRect ExtensionContainer::currentGeometry() const
 {
-    return initialGeometry(position(), alignment(), xineramaScreen(),
+    return initialGeometry(position(), tqalignment(), xineramaScreen(),
                            autoHidden(), userHidden());
 }
 
@@ -1937,7 +1937,7 @@ TQRect ExtensionContainer::initialGeometry(KPanelExtension::Position p,
 {
     //RESEARCH: is there someway to cache the results of the repeated calls to this method?
 
-    /*kdDebug(1210) << "initialGeometry() Computing geometry for " << name() <<
+    /*kdDebug(1210) << "initialGeometry() Computing tqgeometry for " << name() <<
         " on screen " << XineramaScreen << endl;*/
     TQRect workArea = ExtensionManager::the()->workArea(XineramaScreen, this);
     TQSize size = initialSize(p, workArea);
diff --git a/kicker/kicker/core/container_extension.h b/kicker/kicker/core/container_extension.h
index 8eedd4e6f..2da239d7b 100644
--- a/kicker/kicker/core/container_extension.h
+++ b/kicker/kicker/core/container_extension.h
@@ -66,7 +66,7 @@ public:
                        TQWidget *parent = 0);
     virtual ~ExtensionContainer();
 
-    virtual TQSize sizeHint(KPanelExtension::Position, const TQSize &maxSize) const;
+    virtual TQSize tqsizeHint(KPanelExtension::Position, const TQSize &maxSize) const;
 
     const AppletInfo& info() const { return _info; }
 
@@ -86,7 +86,7 @@ public:
 
     KPanelExtension::Orientation orientation() const;
     KPanelExtension::Position position() const;
-    void setPosition(KPanelExtension::Position p) { arrange( p, alignment(), xineramaScreen() ); }
+    void setPosition(KPanelExtension::Position p) { arrange( p, tqalignment(), xineramaScreen() ); }
 
     int xineramaScreen() const;
     void setXineramaScreen(int screen);
@@ -100,8 +100,8 @@ public:
     void unhideIfHidden(int showForHowManyMS = 0);
     bool reserveStrut() const;
 
-    KPanelExtension::Alignment alignment() const;
-    void setAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
+    KPanelExtension::Alignment tqalignment() const;
+    void tqsetAlignment(KPanelExtension::Alignment a) { arrange( position(), a, xineramaScreen() ); }
 
     TQRect currentGeometry() const;
     TQRect initialGeometry(KPanelExtension::Position p, KPanelExtension::Alignment a,
@@ -159,7 +159,7 @@ private:
                            int XineramaScreen, const TQSize &s, TQRect workArea,
                            bool autohidden = false, UserHidden userHidden = Unhidden) const;
     void positionChange(KPanelExtension::Position p);
-    void alignmentChange(KPanelExtension::Alignment a);
+    void tqalignmentChange(KPanelExtension::Alignment a);
     void xineramaScreenChange(int /*XineramaScreen*/) {}
     int arrangeHideButtons();
     int setupBorderSpace();
@@ -190,7 +190,7 @@ private:
     // Widgets
     HideButton     *_ltHB; // Left Hide Button
     HideButton     *_rbHB; // Right Hide Button
-    TQGridLayout    *_layout;
+    TQGridLayout    *_tqlayout;
 
     KPanelExtension *m_extension;
     int m_maintainFocus;
diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp
index 8fd839a20..bd596f214 100644
--- a/kicker/kicker/core/containerarea.cpp
+++ b/kicker/kicker/core/containerarea.cpp
@@ -88,7 +88,7 @@ ContainerArea::ContainerArea(KConfig* _c,
       m_canAddContainers(true),
       m_immutable(_c->isImmutable()),
       m_updateBackgroundsCalled(false),
-      m_layout(0),
+      m_tqlayout(0),
       m_addAppletDialog(0),
       _autoScrollTimer(0, "ContainerArea::autoScrollTimer")
 {
@@ -96,9 +96,9 @@ ContainerArea::ContainerArea(KConfig* _c,
 
     m_contents = viewport();
 
-    m_layout = new ContainerAreaLayout(m_contents);
+    m_tqlayout = new ContainerAreaLayout(m_contents);
 
-    // Install an event filter to propagate layout hints coming from m_contents.
+    // Install an event filter to propagate tqlayout hints coming from m_contents.
     m_contents->installEventFilter(this);
 
     setBackground();
@@ -123,7 +123,7 @@ void ContainerArea::initialize(bool useDefaultConfig)
     // do we really need to do this?
     removeAllContainers();
 
-    // restore applet layout or load a default panel layout
+    // restore applet tqlayout or load a default panel tqlayout
     _config->setGroup("General");
     if (_config->hasKey("Applets2"))
     {
@@ -380,7 +380,7 @@ void ContainerArea::loadContainers(const TQStringList& containers)
     TQTimer::singleShot(0, this, TQT_SLOT(updateContainersBackground()));
 }
 
-void ContainerArea::saveContainerConfig(bool layoutOnly)
+void ContainerArea::saveContainerConfig(bool tqlayoutOnly)
 {
     if (!canAddContainers())
     {
@@ -389,14 +389,14 @@ void ContainerArea::saveContainerConfig(bool layoutOnly)
 
     // Save the applet list
     TQStringList alist;
-    TQLayoutIterator it2 = m_layout->iterator();
+    TQLayoutIterator it2 = m_tqlayout->iterator();
     for (; it2.current(); ++it2)
     {
         BaseContainer* a = dynamic_cast<BaseContainer*>(it2.current()->widget());
         if (a)
         {
             KConfigGroup group(_config, a->appletId().latin1());
-            a->saveConfiguration(group, layoutOnly);
+            a->saveConfiguration(group, tqlayoutOnly);
             alist.append(a->appletId());
         }
     }
@@ -700,22 +700,22 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
 
     if (arrange)
     {
-        TQWidget* w = m_layout->widgetAt(index);
+        TQWidget* w = m_tqlayout->widgetAt(index);
         TQPoint oldInsertionPoint = Kicker::the()->insertionPoint();
         if (w)
         {
             // let's set the insertion point to where the widget asked to be
             // put in front of is
-            Kicker::the()->setInsertionPoint(w->geometry().topLeft());
+            Kicker::the()->setInsertionPoint(w->tqgeometry().topLeft());
         }
 
         if (Kicker::the()->insertionPoint().isNull())
         {
-            m_layout->insertIntoFreeSpace(a, TQPoint());
+            m_tqlayout->insertIntoFreeSpace(a, TQPoint());
         }
         else
         {
-            m_layout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint()));
+            m_tqlayout->insertIntoFreeSpace(a, mapFromGlobal(Kicker::the()->insertionPoint()));
         }
 
         if (w)
@@ -725,7 +725,7 @@ void ContainerArea::addContainer(BaseContainer* a, bool arrange, int index)
     }
     else
     {
-        m_layout->add(a);
+        m_tqlayout->add(a);
     }
 
     connect(a, TQT_SIGNAL(moveme(BaseContainer*)),
@@ -758,7 +758,7 @@ bool ContainerArea::removeContainer(BaseContainer *a)
 
     a->slotRemoved(_config);
     m_containers.remove(a);
-    m_layout->remove(a);
+    m_tqlayout->remove(a);
     a->deleteLater();
     saveContainerConfig(true);
     resizeContents();
@@ -772,7 +772,7 @@ bool ContainerArea::removeContainer(int index)
         return false;
     }
 
-    BaseContainer* a = dynamic_cast<BaseContainer*>(m_layout->widgetAt(index));
+    BaseContainer* a = dynamic_cast<BaseContainer*>(m_tqlayout->widgetAt(index));
     if (!a || a->isImmutable())
     {
         return false;
@@ -780,7 +780,7 @@ bool ContainerArea::removeContainer(int index)
 
     a->slotRemoved(_config);
     m_containers.remove(a);
-    m_layout->remove(a);
+    m_tqlayout->remove(a);
     a->deleteLater();
     saveContainerConfig(true);
     resizeContents();
@@ -794,7 +794,7 @@ void ContainerArea::removeContainers(BaseContainer::List containers)
         return;
     }
 
-    m_layout->setEnabled(false);
+    m_tqlayout->setEnabled(false);
 
     for (BaseContainer::List::const_iterator it = containers.constBegin();
          it != containers.constEnd();
@@ -808,11 +808,11 @@ void ContainerArea::removeContainers(BaseContainer::List containers)
 
         a->slotRemoved(_config);
         m_containers.remove(a);
-        m_layout->remove(a);
+        m_tqlayout->remove(a);
         a->deleteLater();
     }
 
-    m_layout->setEnabled(true);
+    m_tqlayout->setEnabled(true);
     saveContainerConfig(true);
     resizeContents();
 }
@@ -840,7 +840,7 @@ void ContainerArea::takeContainer(BaseContainer* a)
     _config->deleteGroup(a->appletId().latin1());
     _config->sync();
     m_containers.remove(a);
-    m_layout->remove(a);
+    m_tqlayout->remove(a);
     saveContainerConfig(true);
     resizeContents();
 }
@@ -852,7 +852,7 @@ void ContainerArea::resizeContents()
 
     if (orientation() == Qt::Horizontal)
     {
-        int newWidth = m_layout->widthForHeight(h);
+        int newWidth = m_tqlayout->widthForHeight(h);
         if (newWidth > w)
         {
             resizeContents(newWidth, h);
@@ -864,7 +864,7 @@ void ContainerArea::resizeContents()
     }
     else
     {
-        int newHeight = m_layout->heightForWidth(w);
+        int newHeight = m_tqlayout->heightForWidth(w);
 
         if (newHeight > h)
         {
@@ -925,7 +925,7 @@ void ContainerArea::startContainerMove(BaseContainer *a)
     setMouseTracking(true);
     grabMouse(sizeAllCursor);
 
-    m_layout->setStretchEnabled(false);
+    m_tqlayout->setStretchEnabled(false);
     a->raise();
 }
 
@@ -949,7 +949,7 @@ void ContainerArea::mouseReleaseEvent(TQMouseEvent *)
     _moveAC = 0;
 
     emit maintainFocus(false);
-    m_layout->setStretchEnabled(true);
+    m_tqlayout->setStretchEnabled(true);
     updateContainersBackground();
     saveContainerConfig(true);
 }
@@ -962,7 +962,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         return;
     }
 
-    if (ev->state() == LeftButton && !rect().contains(ev->pos()))
+    if (ev->state() == LeftButton && !rect().tqcontains(ev->pos()))
     {
         // leaveEvent() doesn't work, while grabbing the mouse
         _autoScrollTimer.stop();
@@ -974,7 +974,7 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         KickerTip::enableTipping(true);
 
         emit maintainFocus(false);
-        m_layout->setStretchEnabled(true);
+        m_tqlayout->setStretchEnabled(true);
         updateContainersBackground();
         saveContainerConfig(true);
 
@@ -992,19 +992,19 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         int x = ev->pos().x() + contentsX();
         if (ev->state() & ShiftButton)
         {
-            m_layout->moveContainerPush(_moveAC, x - oldX);
+            m_tqlayout->moveContainerPush(_moveAC, x - oldX);
         }
         else
         {
-            m_layout->moveContainerSwitch(_moveAC, x - oldX);
+            m_tqlayout->moveContainerSwitch(_moveAC, x - oldX);
             /* FIXME: Scrolling when the container moves out of the viewport
             bool scroll = false;
             if (rtl)
                 if (newPos - 80 <= 0)
                     scroll = true;
             else
-                if (newPos + 80 >= (horizontal ? geometry().width()  - moving->geometry().width()
-                                               : geometry().height() - moving->geometry().height()))
+                if (newPos + 80 >= (horizontal ? tqgeometry().width()  - moving->tqgeometry().width()
+                                               : tqgeometry().height() - moving->tqgeometry().height()))
                     scroll = true;
             [...]
             if (scroll) {
@@ -1025,11 +1025,11 @@ void ContainerArea::mouseMoveEvent(TQMouseEvent *ev)
         int y = ev->pos().y() + contentsY();
         if (ev->state() & ShiftButton)
         {
-            m_layout->moveContainerPush(_moveAC, y - oldY);
+            m_tqlayout->moveContainerPush(_moveAC, y - oldY);
         }
         else
         {
-            m_layout->moveContainerSwitch(_moveAC, y - oldY);
+            m_tqlayout->moveContainerSwitch(_moveAC, y - oldY);
             // TODO: Scrolling
         }
     }
@@ -1066,7 +1066,7 @@ void ContainerArea::dragEnterEvent(TQDragEnterEvent *ev)
         return;
     }
 
-    m_layout->setStretchEnabled(false);
+    m_tqlayout->setStretchEnabled(false);
 
     if (!_dragIndicator)
     {
@@ -1139,17 +1139,17 @@ void ContainerArea::dragMoveEvent(TQDragMoveEvent* ev)
         TQKeyEvent fakedKeyRelease(TQEvent::KeyRelease, Key_Escape, 0, 0);
         TQApplication::sendEvent(this, &fakedKeyPress);
         TQApplication::sendEvent(this, &fakedKeyRelease);
-        qApp->processEvents();
+        tqApp->processEvents();
         startContainerMove(_moveAC);
 
         // Align the container to the mouse position.
         if (orientation() == Horizontal)
         {
-            m_layout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
+            m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().x() + contentsX() - _moveAC->x());
         }
         else
         {
-            m_layout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y());
+            m_tqlayout->moveContainerSwitch(_moveAC, ev->pos().y() + contentsY() - _moveAC->y());
         }
         return;
     }
@@ -1175,7 +1175,7 @@ void ContainerArea::dragLeaveEvent(TQDragLeaveEvent*)
     {
         _dragIndicator->hide();
     }
-    m_layout->setStretchEnabled(true);
+    m_tqlayout->setStretchEnabled(true);
     _dragMoveAC = 0;
 }
 
@@ -1196,7 +1196,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         {
             _dragMoveAC = 0;
             _dragIndicator->hide();
-            m_layout->setStretchEnabled(true);
+            m_tqlayout->setStretchEnabled(true);
             return;
         }
 
@@ -1213,19 +1213,19 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
             {
                 int oldX = a->x();
                 int x = _dragIndicator->x();
-                m_layout->moveContainerSwitch(a, x - oldX);
+                m_tqlayout->moveContainerSwitch(a, x - oldX);
             }
             else if (orientation() == Vertical)
             {
                 int oldY = a->y();
                 int y = _dragIndicator->y();
-                m_layout->moveContainerSwitch(a, y - oldY);
+                m_tqlayout->moveContainerSwitch(a, y - oldY);
             }
 
             _dragMoveAC = 0;
             _dragIndicator->hide();
-            m_layout->setEnabled(true);
-            m_layout->setStretchEnabled(true);
+            m_tqlayout->setEnabled(true);
+            m_tqlayout->setStretchEnabled(true);
             saveContainerConfig(true);
             return;
         }
@@ -1236,10 +1236,10 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         a->setAppletId(createUniqueId(a->appletType()));
         addContainer(a, true);
         Kicker::the()->setInsertionPoint(TQPoint());
-        m_layout->updateFreeSpaceValues();
+        m_tqlayout->updateFreeSpaceValues();
         _dragMoveAC = 0;
         _dragIndicator->hide();
-        m_layout->setStretchEnabled(true);
+        m_tqlayout->setStretchEnabled(true);
         saveContainerConfig();
         return;
     }
@@ -1250,7 +1250,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
     {
         Kicker::the()->setInsertionPoint(_dragIndicator->pos());
         _dragIndicator->hide();
-        m_layout->setStretchEnabled(true);
+        m_tqlayout->setStretchEnabled(true);
 
         if (info.type() & AppletInfo::Button)
         {
@@ -1271,7 +1271,7 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
     {
         _dragMoveAC = 0;
         _dragIndicator->hide();
-        m_layout->setStretchEnabled(true);
+        m_tqlayout->setStretchEnabled(true);
         return;
     }
 
@@ -1366,32 +1366,32 @@ void ContainerArea::dropEvent(TQDropEvent *ev)
         {
             _dragIndicator->hide();
             Kicker::the()->setInsertionPoint(TQPoint());
-            m_layout->setStretchEnabled(true);
+            m_tqlayout->setStretchEnabled(true);
             return;
         }
 
         addContainer(a, true);
-        m_layout->updateFreeSpaceValues();
+        m_tqlayout->updateFreeSpaceValues();
     }
 
     saveContainerConfig();
     _dragMoveAC = 0;
     _dragIndicator->hide();
     Kicker::the()->setInsertionPoint(TQPoint());
-    m_layout->setStretchEnabled(true);
+    m_tqlayout->setStretchEnabled(true);
 }
 
 bool ContainerArea::eventFilter(TQObject* o, TQEvent* e)
 {
-    // Propagate the layout hints which m_contents receives. This way widgets
-    // which contain a ContainerArea can react to layout changes of its
+    // Propagate the tqlayout hints which m_contents receives. This way widgets
+    // which contain a ContainerArea can react to tqlayout changes of its
     // contents. For example: If an applets grows, the top level widget may
     // want to grow as well.
     if (o == m_contents)
     {
         if (e->type() == TQEvent::LayoutHint)
         {
-            updateGeometry(); // Posts a new layout hint to our parent.
+            updateGeometry(); // Posts a new tqlayout hint to our parent.
         }
         return false;
     }
@@ -1430,7 +1430,7 @@ void ContainerArea::setBackground()
 
     if (KickerSettings::transparent() &&
         (KickerSettings::menubarPanelTransparent() ||
-        !ExtensionManager::the()->isMenuBar(topLevelWidget())))
+        !ExtensionManager::the()->isMenuBar(tqtopLevelWidget())))
     {
         if (!_rootPixmap)
         {
@@ -1441,7 +1441,7 @@ void ContainerArea::setBackground()
         }
         else
         {
-            _rootPixmap->repaint(true);
+            _rootPixmap->tqrepaint(true);
         }
 
         double tint = double(KickerSettings::tintValue()) / 100;
@@ -1633,7 +1633,7 @@ void ContainerArea::moveDragIndicator(int pos)
 
 void ContainerArea::updateBackground( const TQPixmap& pm )
 {
-    TQBrush bgBrush(colorGroup().background(), pm);
+    TQBrush bgBrush(tqcolorGroup().background(), pm);
     TQPalette pal = kapp->palette();
     pal.setBrush(TQColorGroup::Background, bgBrush);
     setPalette(pal);
@@ -1678,12 +1678,12 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
                          p == KPanelExtension::Bottom) ?
                         Qt::Horizontal : Qt::Vertical;
     bool orientationChanged = (orientation() != o);
-    m_layout->setEnabled(false);
+    m_tqlayout->setEnabled(false);
 
     if (orientationChanged)
     {
         setOrientation(o);
-        m_layout->setOrientation(o);
+        m_tqlayout->setOrientation(o);
 
         // when we change orientation, we will resize the "width"
         // component down to 0, forcing a resize in resizeContents()
@@ -1712,23 +1712,23 @@ void ContainerArea::setPosition(KPanelExtension::Position p)
         (*it)->setPopupDirection( popupDirection() );
     }
 
-    m_layout->setEnabled(true);
+    m_tqlayout->setEnabled(true);
 
     setContentsPos(0, 0);
     m_contents->move(0, 0);
     setBackground();
 
-    // container extension repaints for us!
-    //repaint();
+    // container extension tqrepaints for us!
+    //tqrepaint();
 }
 
-void ContainerArea::setAlignment(KPanelExtension::Alignment a)
+void ContainerArea::tqsetAlignment(KPanelExtension::Alignment a)
 {
     for (BaseContainer::ConstIterator it = m_containers.begin();
          it != m_containers.end();
          ++it)
     {
-        (*it)->setAlignment(a);
+        (*it)->tqsetAlignment(a);
     }
 }
 
@@ -1778,21 +1778,21 @@ void ContainerArea::updateContainersBackground()
     // A rather ugly hack. The code calls updateContainersBackground() all over
     // the place even when nothing in fact has changed. Updating the background
     // on every single unrelated change however means that e.g. the systray
-    // flickers when a new window is opened/closed (because the taskbar is relayouted,
-    // which triggers updateContainersBackground() even though the geometry
+    // flickers when a new window is opened/closed (because the taskbar is retqlayouted,
+    // which triggers updateContainersBackground() even though the tqgeometry
     // of the taskbar does not change in fact. I'm apparently unable to fix this
-    // properly, so just cache the geometry and update background only when
-    // the geometry changes or when the background really changes (in which
+    // properly, so just cache the tqgeometry and update background only when
+    // the tqgeometry changes or when the background really changes (in which
     // case the cached is cleared).
-        if( !m_cachedGeometry.contains( *it ))
+        if( !m_cachedGeometry.tqcontains( *it ))
         {
             m_cachedGeometry[ *it ] = TQRect();
             connect( *it, TQT_SIGNAL( destroyed()), TQT_SLOT( destroyCachedGeometry()));
         }
-        if( m_cachedGeometry[ *it ] != (*it)->geometry())
+        if( m_cachedGeometry[ *it ] != (*it)->tqgeometry())
         {
             (*it)->setBackground();
-            m_cachedGeometry[ *it ] = (*it)->geometry();
+            m_cachedGeometry[ *it ] = (*it)->tqgeometry();
         }
     }
 }
@@ -1891,12 +1891,12 @@ int ContainerArea::containerCount(const TQString& type) const
 
 TQStringList ContainerArea::listContainers() const
 {
-    return m_layout->listItems();
+    return m_tqlayout->listItems();
 }
 
-void ContainerArea::repaint()
+void ContainerArea::tqrepaint()
 {
-    Panner::repaint();
+    Panner::tqrepaint();
 }
 
 void ContainerArea::showAddAppletDialog()
@@ -1932,12 +1932,12 @@ const TQPixmap* ContainerArea::completeBackgroundPixmap() const
 
 int ContainerArea::widthForHeight(int h) const
 {
-    return m_layout->widthForHeight(h);
+    return m_tqlayout->widthForHeight(h);
 }
 
 int ContainerArea::heightForWidth(int w) const
 {
-    return m_layout->heightForWidth(w);
+    return m_tqlayout->heightForWidth(w);
 }
 
 
@@ -1952,8 +1952,8 @@ void DragIndicator::paintEvent(TQPaintEvent*)
 {
     TQPainter painter(this);
     TQRect rect(0, 0, width(), height());
-    style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, colorGroup(),
-                           TQStyle::Style_Default, colorGroup().base() );
+    style().drawPrimitive( TQStyle::PE_FocusRect, &painter, rect, tqcolorGroup(),
+                           TQStyle::Style_Default, tqcolorGroup().base() );
 }
 
 void DragIndicator::mousePressEvent(TQMouseEvent*)
diff --git a/kicker/kicker/core/containerarea.h b/kicker/kicker/core/containerarea.h
index a43cd8c9c..fc8d1a402 100644
--- a/kicker/kicker/core/containerarea.h
+++ b/kicker/kicker/core/containerarea.h
@@ -101,9 +101,9 @@ public slots:
     void removeContainers(BaseContainer::List containers);
     void takeContainer(BaseContainer* a);
     void setPosition(KPanelExtension::Position p);
-    void setAlignment(KPanelExtension::Alignment a);
+    void tqsetAlignment(KPanelExtension::Alignment a);
     void slotSaveContainerConfig();
-    void repaint();
+    void tqrepaint();
     void showAddAppletDialog();
     void addAppletDialogDone();
 
@@ -124,7 +124,7 @@ protected:
 
     void defaultContainerConfig();
     void loadContainers(const TQStringList& containers);
-    void saveContainerConfig(bool layoutOnly = false);
+    void saveContainerConfig(bool tqlayoutOnly = false);
 
     TQRect availableSpaceFollowing(BaseContainer*);
     void moveDragIndicator(int pos);
@@ -166,7 +166,7 @@ private:
     bool            m_updateBackgroundsCalled;
 
     TQWidget*             m_contents;
-    ContainerAreaLayout* m_layout;
+    ContainerAreaLayout* m_tqlayout;
     AddAppletDialog*     m_addAppletDialog;
     TQMap< TQWidget*, TQRect > m_cachedGeometry;
 };
diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp
index 4ae63077e..feed4b59f 100644
--- a/kicker/kicker/core/containerarealayout.cpp
+++ b/kicker/kicker/core/containerarealayout.cpp
@@ -58,11 +58,11 @@ class ContainerAreaLayoutIterator : public QGLayoutIterator
             ContainerAreaLayout::ItemList::iterator b = m_list->at(m_idx);
             if (b != m_list->end())
             {
-                ContainerAreaLayoutItem* layoutItem = *b;
-                item = layoutItem->item;
-                layoutItem->item = 0;
+                ContainerAreaLayoutItem* tqlayoutItem = *b;
+                item = tqlayoutItem->item;
+                tqlayoutItem->item = 0;
                 m_list->erase(b);
-                delete layoutItem;
+                delete tqlayoutItem;
             }
             return item;
         }
@@ -82,7 +82,7 @@ int ContainerAreaLayoutItem::heightForWidth(int w) const
     }
     else
     {
-        return item->sizeHint().height();
+        return item->tqsizeHint().height();
     }
 }
 
@@ -95,7 +95,7 @@ int ContainerAreaLayoutItem::widthForHeight(int h) const
     }
     else
     {
-        return item->sizeHint().width();
+        return item->tqsizeHint().width();
     }
 }
 
@@ -125,17 +125,17 @@ void ContainerAreaLayoutItem::setFreeSpaceRatio(double ratio)
 
 Qt::Orientation ContainerAreaLayoutItem::orientation() const
 {
-    return m_layout->orientation();
+    return m_tqlayout->orientation();
 }
 
-TQRect ContainerAreaLayoutItem::geometryR() const
+TQRect ContainerAreaLayoutItem::tqgeometryR() const
 {
-    return m_layout->transform(geometry());
+    return m_tqlayout->transform(tqgeometry());
 }
 
 void ContainerAreaLayoutItem::setGeometryR(const TQRect& r)
 {
-    setGeometry(m_layout->transform(r));
+    setGeometry(m_tqlayout->transform(r));
 }
 
 int ContainerAreaLayoutItem::widthForHeightR(int h) const
@@ -154,11 +154,11 @@ int ContainerAreaLayoutItem::widthR() const
 {
     if (orientation() == Horizontal)
     {
-        return geometry().width();
+        return tqgeometry().width();
     }
     else
     {
-        return geometry().height();
+        return tqgeometry().height();
     }
 }
 
@@ -166,11 +166,11 @@ int ContainerAreaLayoutItem::heightR() const
 {
     if (orientation() == Horizontal)
     {
-        return geometry().height();
+        return tqgeometry().height();
     }
     else
     {
-        return geometry().width();
+        return tqgeometry().width();
     }
 }
 
@@ -179,13 +179,13 @@ int ContainerAreaLayoutItem::leftR() const
     if (orientation() == Horizontal)
     {
         if (TQApplication::reverseLayout())
-            return m_layout->geometry().right() - geometry().right();
+            return m_tqlayout->tqgeometry().right() - tqgeometry().right();
         else
-            return geometry().left();
+            return tqgeometry().left();
     }
     else
     {
-        return geometry().top();
+        return tqgeometry().top();
     }
 }
 
@@ -194,13 +194,13 @@ int ContainerAreaLayoutItem::rightR() const
     if (orientation() == Horizontal)
     {
         if (TQApplication::reverseLayout())
-            return m_layout->geometry().right() - geometry().left();
+            return m_tqlayout->tqgeometry().right() - tqgeometry().left();
         else
-            return geometry().right();
+            return tqgeometry().right();
     }
     else
     {
-        return geometry().bottom();
+        return tqgeometry().bottom();
     }
 }
 
@@ -311,10 +311,10 @@ void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertio
         }
     }
 
-    TQRect geom = item->geometryR();
+    TQRect geom = item->tqgeometryR();
     geom.moveLeft(insPos);
     item->setGeometryR(geom);
-    widget->setGeometry(transform(geom)); // widget isn't shown, layout not active yet
+    widget->setGeometry(transform(geom)); // widget isn't shown, tqlayout not active yet
 
     if (current)
     {
@@ -384,7 +384,7 @@ TQWidget* ContainerAreaLayout::widgetAt(int index) const
     return m_items[index]->item->widget();
 }
 
-TQSize ContainerAreaLayout::sizeHint() const
+TQSize ContainerAreaLayout::tqsizeHint() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeSmall);
 
@@ -398,7 +398,7 @@ TQSize ContainerAreaLayout::sizeHint() const
     }
 }
 
-TQSize ContainerAreaLayout::minimumSize() const
+TQSize ContainerAreaLayout::tqminimumSize() const
 {
     const int size = KickerLib::sizeValue(KPanelExtension::SizeTiny);
 
@@ -566,7 +566,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
             break;
 
         // Move 'next' to the other side of 'moving'.
-        TQRect geom = next->geometryR();
+        TQRect geom = next->tqgeometryR();
         if (forward)
             geom.moveLeft(geom.left() - moving->widthR());
         else
@@ -630,7 +630,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
     }
 
     // Move the container to its new position and prevent it from moving outside the panel.
-    TQRect geom = moving->geometryR();
+    TQRect geom = moving->tqgeometryR();
     distance = kClamp(newPos, 0, widthR() - moving->widthR());
     geom.moveLeft(distance);
     moving->setGeometryR(geom);
@@ -645,7 +645,7 @@ void ContainerAreaLayout::moveContainerSwitch(TQWidget* container, int distance)
             if(AppletContainer* applet = dynamic_cast<AppletContainer*>(container))
                 if( applet->info().desktopFile() == "menuapplet.desktop" )
                 {
-                    TQRect geom = (*it)->geometryR();
+                    TQRect geom = (*it)->tqgeometryR();
                     if( prev != m_items.constEnd())
                         geom.moveLeft( (*prev)->rightR() + 1 );
                     else
@@ -662,7 +662,7 @@ int ContainerAreaLayout::moveContainerPush(TQWidget* a, int distance)
     const bool horizontal    = orientation() == Horizontal;
     const bool reverseLayout = TQApplication::reverseLayout();
 
-    // Get the iterator 'it' pointing to the layoutitem representing 'a'.
+    // Get the iterator 'it' pointing to the tqlayoutitem representing 'a'.
     ItemList::const_iterator it = m_items.constBegin();
     while (it != m_items.constEnd() && (*it)->item->widget() != a)
     {
@@ -721,7 +721,7 @@ int ContainerAreaLayout::moveContainerPushRecursive(ItemList::const_iterator it,
     moved = forward ? kMin(distance, available)
                     : kMax(distance, available);
 
-    TQRect geom = cur->geometryR();
+    TQRect geom = cur->tqgeometryR();
     geom.moveLeft(geom.left() + moved);
     cur->setGeometryR(geom);
 
@@ -735,7 +735,7 @@ TQRect ContainerAreaLayout::transform(const TQRect& r) const
         if (TQApplication::reverseLayout())
         {
             TQRect t = r;
-            t.moveLeft(geometry().right() - r.right());
+            t.moveLeft(tqgeometry().right() - r.right());
             return t;
         }
         else
@@ -765,11 +765,11 @@ int ContainerAreaLayout::widthR() const
 {
     if (orientation() == Horizontal)
     {
-        return geometry().width();
+        return tqgeometry().width();
     }
     else
     {
-        return geometry().height();
+        return tqgeometry().height();
     }
 }
 
@@ -777,27 +777,27 @@ int ContainerAreaLayout::heightR() const
 {
     if (orientation() == Horizontal)
     {
-        return geometry().height();
+        return tqgeometry().height();
     }
     else
     {
-        return geometry().width();
+        return tqgeometry().width();
     }
 }
 
 int ContainerAreaLayout::leftR() const
 {
     if (orientation() == Horizontal)
-        return geometry().left();
+        return tqgeometry().left();
     else
-        return geometry().top();
+        return tqgeometry().top();
 }
 
 int ContainerAreaLayout::rightR() const
 {
     if (orientation() == Horizontal)
-        return geometry().right();
+        return tqgeometry().right();
     else
-        return geometry().bottom();
+        return tqgeometry().bottom();
 }
 
diff --git a/kicker/kicker/core/containerarealayout.h b/kicker/kicker/core/containerarealayout.h
index 995497268..01bbb40d5 100644
--- a/kicker/kicker/core/containerarealayout.h
+++ b/kicker/kicker/core/containerarealayout.h
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ******************************************************************/
 
-#ifndef __containerarealayout_h__
-#define __containerarealayout_h__
+#ifndef __containerareatqlayout_h__
+#define __containerareatqlayout_h__
 
 #include <tqlayout.h>
 
@@ -31,10 +31,10 @@ class ContainerAreaLayout;
 class ContainerAreaLayoutItem : public Qt
 {
     public:
-        ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* layout)
+        ContainerAreaLayoutItem(TQLayoutItem* i, ContainerAreaLayout* tqlayout)
             : item(i),
               m_freeSpaceRatio(0.0),
-              m_layout(layout)
+              m_tqlayout(tqlayout)
         {}
 
         ~ContainerAreaLayoutItem()
@@ -45,18 +45,18 @@ class ContainerAreaLayoutItem : public Qt
 
         bool isStretch() const;
 
-        TQRect geometry() const
-        { return item->geometry(); }
-        void setGeometry(const TQRect& geometry)
-        { item->setGeometry(geometry); }
+        TQRect tqgeometry() const
+        { return item->tqgeometry(); }
+        void setGeometry(const TQRect& tqgeometry)
+        { item->setGeometry(tqgeometry); }
 
         double freeSpaceRatio() const;
         void setFreeSpaceRatio(double ratio);
 
         Orientation orientation() const;
 
-        // Relative geometry
-        TQRect geometryR() const;
+        // Relative tqgeometry
+        TQRect tqgeometryR() const;
         void setGeometryR(const TQRect&);
         int widthForHeightR(int w) const;
         int widthR() const;
@@ -68,7 +68,7 @@ class ContainerAreaLayoutItem : public Qt
 
     private:
         double m_freeSpaceRatio;
-        ContainerAreaLayout* m_layout;
+        ContainerAreaLayout* m_tqlayout;
 };
 
 class ContainerAreaLayout : public QLayout
@@ -83,8 +83,8 @@ class ContainerAreaLayout : public QLayout
         void insertIntoFreeSpace(TQWidget* item, TQPoint insertionPoint);
         TQStringList listItems() const;
         TQWidget* widgetAt(int index) const;
-        TQSize sizeHint() const;
-        TQSize minimumSize() const;
+        TQSize tqsizeHint() const;
+        TQSize tqminimumSize() const;
         TQLayoutIterator iterator();
         void setGeometry(const TQRect& rect);
 
@@ -100,7 +100,7 @@ class ContainerAreaLayout : public QLayout
         void moveContainerSwitch(TQWidget* container, int distance);
         int moveContainerPush(TQWidget* container, int distance);
 
-        // Relative geometry
+        // Relative tqgeometry
         TQRect transform(const TQRect&) const;
         int widthForHeightR(int w) const;
         int widthR() const;
diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg
index 89d60b05a..19d282088 100644
--- a/kicker/kicker/core/extensionSettings.kcfg
+++ b/kicker/kicker/core/extensionSettings.kcfg
@@ -22,7 +22,7 @@
    </entry>
 
 <entry name="Alignment" type="Int" >
-      <label>The alignment of the panel</label>
+      <label>The tqalignment of the panel</label>
       <default code="true">KPanelExtension::Left</default>
       <min>0</min>
       <max>2</max>
diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp
index e0f68ce8a..bec297eb9 100644
--- a/kicker/kicker/core/extensionmanager.cpp
+++ b/kicker/kicker/core/extensionmanager.cpp
@@ -371,7 +371,7 @@ void ExtensionManager::updateMenubar()
     KMenuBar tmpmenu;
     tmpmenu.insertItem("KDE Rocks!");
     m_menubarPanel->setSize(KPanelExtension::SizeCustom,
-                            tmpmenu.sizeHint().height());
+                            tmpmenu.tqsizeHint().height());
     m_menubarPanel->writeConfig();
 
     emit desktopIconsAreaChanged(desktopIconsArea(m_menubarPanel->xineramaScreen()),
@@ -403,7 +403,7 @@ void ExtensionManager::addExtension( const TQString& desktopFile )
     {
         e->readConfig();
         // as a new panel, the position will be set to the preferred position
-        // we just need to make sure this works with the rest of the panel layout
+        // we just need to make sure this works with the rest of the panel tqlayout
         e->setPosition(initialPanelPosition(e->position()));
         kdDebug(1210)<<"after e->readConfig(): pos="<<e->position()<<endl;
         addContainer(e);
@@ -527,7 +527,7 @@ bool ExtensionManager::shouldExclude(int XineramaScreen,
     // 1. Exclude panels not on our Xinerama screen
     // 2. Exclude panels on the same side of the screen as ourselves that are above us
     // 3. Exclude panels on the opposite side of the screen. Breaks down if the user
-    //    dabbles in insane layouts where a top/bottom or left/right pair overlap?
+    //    dabbles in insane tqlayouts where a top/bottom or left/right pair overlap?
     // 4. Exclude panels on adjacent sides of the screen that do not overlap with us
 
     if (exclude->winId() == extension->winId())
@@ -554,26 +554,26 @@ bool ExtensionManager::shouldExclude(int XineramaScreen,
     {
         // Rule 2 Exclusion
         if (extension->position() == KPanelExtension::Bottom &&
-            exclude->geometry().bottom() == extension->geometry().bottom() &&
-            !exclude->geometry().intersects(extension->geometry()))
+            exclude->tqgeometry().bottom() == extension->tqgeometry().bottom() &&
+            !exclude->tqgeometry().intersects(extension->tqgeometry()))
         {
             return false;
         }
         else if (extension->position() == KPanelExtension::Top &&
-                 exclude->geometry().top() == extension->geometry().top() &&
-                 !exclude->geometry().intersects(extension->geometry()))
+                 exclude->tqgeometry().top() == extension->tqgeometry().top() &&
+                 !exclude->tqgeometry().intersects(extension->tqgeometry()))
         {
             return false;
         }
         else if (extension->position() == KPanelExtension::Left &&
-                 exclude->geometry().left() == extension->geometry().left() &&
-                 !exclude->geometry().intersects(extension->geometry()))
+                 exclude->tqgeometry().left() == extension->tqgeometry().left() &&
+                 !exclude->tqgeometry().intersects(extension->tqgeometry()))
         {
             return false;
         }
         else if (extension->position() == KPanelExtension::Right &&
-                 exclude->geometry().right() == extension->geometry().right() &&
-                 !exclude->geometry().intersects(extension->geometry()))
+                 exclude->tqgeometry().right() == extension->tqgeometry().right() &&
+                 !exclude->tqgeometry().intersects(extension->tqgeometry()))
         {
             return false;
         }
@@ -591,28 +591,28 @@ bool ExtensionManager::shouldExclude(int XineramaScreen,
     // Rule 4 exclusion
     if (extension->position() == KPanelExtension::Bottom)
     {
-        if (exclude->geometry().bottom() > extension->geometry().top())
+        if (exclude->tqgeometry().bottom() > extension->tqgeometry().top())
         {
             return lowerInStack;
         }
     }
     else if (extension->position() == KPanelExtension::Top)
     {
-        if (exclude->geometry().top() < extension->geometry().bottom())
+        if (exclude->tqgeometry().top() < extension->tqgeometry().bottom())
         {
             return lowerInStack;
         }
     }
     else if (extension->position() == KPanelExtension::Left)
     {
-        if (exclude->geometry().left() < extension->geometry().right())
+        if (exclude->tqgeometry().left() < extension->tqgeometry().right())
         {
             return lowerInStack;
         }
     }
     else /* if (extension->position() == KPanelExtension::Right) */
     {
-        if (exclude->geometry().right() > extension->geometry().left())
+        if (exclude->tqgeometry().right() > extension->tqgeometry().left())
         {
             return lowerInStack;
         }
@@ -702,7 +702,7 @@ void ExtensionManager::reduceArea(TQRect &area, const ExtensionContainer *extens
         return;
     }
 
-    TQRect geom = extension->initialGeometry(extension->position(), extension->alignment(),
+    TQRect geom = extension->initialGeometry(extension->position(), extension->tqalignment(),
                                             extension->xineramaScreen());
 
     // reduce given area (TQRect) to the space not covered by the given extension
@@ -741,7 +741,7 @@ TQRect ExtensionManager::desktopIconsArea(int screen) const
     // This is pretty broken, mixes Xinerama and non-Xinerama multihead
     // and generally doesn't seem to be required anyway => ignore screen.
 //    TQRect area = TQApplication::desktop()->screenGeometry(screen);
-    TQRect area = TQApplication::desktop()->geometry();
+    TQRect area = TQApplication::desktop()->tqgeometry();
 
     reduceArea(area, m_mainPanel);
     reduceArea(area, m_menubarPanel);
diff --git a/kicker/kicker/core/extensionmanager.h b/kicker/kicker/core/extensionmanager.h
index 6de7b35e1..346a3a2f2 100644
--- a/kicker/kicker/core/extensionmanager.h
+++ b/kicker/kicker/core/extensionmanager.h
@@ -51,7 +51,7 @@ public:
     int nextPanelOrder();
 
     // return the space available for all icons on the desktop
-    // subtracts all panels from XineramaScreen's geometry
+    // subtracts all panels from XineramaScreen's tqgeometry
     TQRect desktopIconsArea(int xineramaScreen) const;
 
 public slots:
diff --git a/kicker/kicker/core/kmenubase.ui b/kicker/kicker/core/kmenubase.ui
index 1adb59b38..133ae1467 100644
--- a/kicker/kicker/core/kmenubase.ui
+++ b/kicker/kicker/core/kmenubase.ui
@@ -4,7 +4,7 @@
     <property name="name">
         <cstring>KMenu</cstring>
     </property>
-    <property name="geometry">
+    <property name="tqgeometry">
         <rect>
             <x>0</x>
             <y>0</y>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>m_search</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>20</x>
                 <y>40</y>
@@ -55,13 +55,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>0</width>
                         <height>52</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>32767</width>
                         <height>52</height>
@@ -82,7 +82,7 @@
                     </property>
                     <widget class="QLayoutWidget">
                         <property name="name">
-                            <cstring>layout18</cstring>
+                            <cstring>tqlayout18</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -129,13 +129,13 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
                                     </size>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>32</width>
                                         <height>32</height>
@@ -165,7 +165,7 @@
                 <property name="sizeType">
                     <enum>Preferred</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>16</width>
                         <height>20</height>
@@ -178,7 +178,7 @@
         <property name="name">
             <cstring>m_footer</cstring>
         </property>
-        <property name="geometry">
+        <property name="tqgeometry">
             <rect>
                 <x>20</x>
                 <y>110</y>
@@ -222,7 +222,7 @@
                 <property name="sizeType">
                     <enum>MinimumExpanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>10</width>
                         <height>20</height>
@@ -241,7 +241,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>90</width>
                         <height>24</height>
@@ -270,7 +270,7 @@
                 <property name="sizeType">
                     <enum>Fixed</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>14</width>
                         <height>20</height>
@@ -293,7 +293,7 @@
 <functions>
     <function access="private" specifier="non virtual">init()</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp
index 61110de14..fad16ac42 100644
--- a/kicker/kicker/core/menumanager.cpp
+++ b/kicker/kicker/core/menumanager.cpp
@@ -153,11 +153,11 @@ void MenuManager::kmenuAccelActivated()
         TQDesktopWidget* desktop = KApplication::desktop();
         TQRect r;
         if (desktop->numScreens() < 2)
-            r = desktop->geometry();
+            r = desktop->tqgeometry();
         else
             r = desktop->screenGeometry(desktop->screenNumber(TQCursor::pos()));
-        // kMenu->rect() is not valid before showing, use sizeHint()
-        p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->sizeHint()).center();
+        // kMenu->rect() is not valid before showing, use tqsizeHint()
+        p = r.center() - TQRect( TQPoint( 0, 0 ), m_kmenu->tqsizeHint()).center();
         m_kmenu->popup(p);
 
         // when the cursor is in the area where the menu pops up,
@@ -170,8 +170,8 @@ void MenuManager::kmenuAccelActivated()
     {
         // We need the kmenu's size to place it at the right position.
         // We cannot rely on the popup menu's current size(), if it wasn't
-        // shown before, so we resize it here according to its sizeHint().
-        const TQSize size = m_kmenu->sizeHint();
+        // shown before, so we resize it here according to its tqsizeHint().
+        const TQSize size = m_kmenu->tqsizeHint();
         m_kmenu->resize(size.width(),size.height());
 
         PanelPopupButton* button = findKButtonFor(m_kmenu->widget());
@@ -188,7 +188,7 @@ void MenuManager::kmenuAccelActivated()
                 ext->unhideIfHidden();
                 // make sure it's unhidden before we use it to figure out
                 // where to popup
-                qApp->processEvents();
+                tqApp->processEvents();
                 break;
             }
 
diff --git a/kicker/kicker/core/panelextension.cpp b/kicker/kicker/core/panelextension.cpp
index 2bd70c82b..0b96d4b1f 100644
--- a/kicker/kicker/core/panelextension.cpp
+++ b/kicker/kicker/core/panelextension.cpp
@@ -67,12 +67,12 @@ PanelExtension::PanelExtension(const TQString& configFile, TQWidget *parent, con
     setAcceptDrops(!Kicker::the()->isImmutable());
     setCustomMenu(opMenu());
 
-    TQVBoxLayout* _layout = new TQVBoxLayout(this);
+    TQVBoxLayout* _tqlayout = new TQVBoxLayout(this);
 
     // container area
     _containerArea = new ContainerArea( config(), this, opMenu() );
     connect(_containerArea, TQT_SIGNAL(maintainFocus(bool)), this, TQT_SIGNAL(maintainFocus(bool)));
-    _layout->addWidget(_containerArea);
+    _tqlayout->addWidget(_containerArea);
 
     _containerArea->viewport()->installEventFilter(this);
     _containerArea->configure();
@@ -100,7 +100,7 @@ void PanelExtension::populateContainerArea()
 {
     _containerArea->show();
 
-    if (ExtensionManager::the()->isMainPanel(topLevelWidget()))
+    if (ExtensionManager::the()->isMainPanel(tqtopLevelWidget()))
     {
         setObjId("Panel");
         _containerArea->initialize(true);
@@ -139,7 +139,7 @@ void PanelExtension::positionChange(Position p)
     _containerArea->setPosition(p);
 }
 
-TQSize PanelExtension::sizeHint(Position p, TQSize maxSize) const
+TQSize PanelExtension::tqsizeHint(Position p, TQSize maxSize) const
 {
     TQSize size;
 
diff --git a/kicker/kicker/core/panelextension.h b/kicker/kicker/core/panelextension.h
index c7882291f..61e6c229c 100644
--- a/kicker/kicker/core/panelextension.h
+++ b/kicker/kicker/core/panelextension.h
@@ -80,7 +80,7 @@ k_dcop:
     void configure(); // KDE4: remove, moved to Kikcker
 
 public:
-    TQSize sizeHint(Position, TQSize maxSize) const;
+    TQSize tqsizeHint(Position, TQSize maxSize) const;
     Position preferedPosition() const { return Bottom; }
     bool eventFilter( TQObject *, TQEvent * );
 
diff --git a/kicker/kicker/core/userrectsel.cpp b/kicker/kicker/core/userrectsel.cpp
index d4b54f04a..553f5ad09 100644
--- a/kicker/kicker/core/userrectsel.cpp
+++ b/kicker/kicker/core/userrectsel.cpp
@@ -48,7 +48,7 @@ void UserRectSel::mouseReleaseEvent(TQMouseEvent * e)
 {
     if (e->button() == LeftButton)
     {
-        qApp->exit_loop();
+        tqApp->exit_loop();
     }
 }
 
@@ -138,10 +138,10 @@ UserRectSel::PanelStrut UserRectSel::select(const RectList& rects, const TQPoint
     sel.show();
     sel.grabMouse();
     sel.paintCurrent();
-    qApp->enter_loop();
+    tqApp->enter_loop();
     sel.paintCurrent();
     sel.releaseMouse();
-    qApp->syncX();
+    tqApp->syncX();
     return sel.current;
 }
 
diff --git a/kicker/kicker/core/userrectsel.h b/kicker/kicker/core/userrectsel.h
index 63ba47fd5..b770f7409 100644
--- a/kicker/kicker/core/userrectsel.h
+++ b/kicker/kicker/core/userrectsel.h
@@ -43,17 +43,17 @@ class UserRectSel : public QWidget
                 PanelStrut()
                     : m_screen(-1),
                       m_pos(KPanelExtension::Bottom),
-                      m_alignment(KPanelExtension::LeftTop)
+                      m_tqalignment(KPanelExtension::LeftTop)
                 {
                 }
 
                 PanelStrut(const TQRect& rect, int XineramaScreen,
                            KPanelExtension::Position pos,
-                           KPanelExtension::Alignment alignment)
+                           KPanelExtension::Alignment tqalignment)
                     : m_rect(rect),
                       m_screen(XineramaScreen),
                       m_pos(pos),
-                      m_alignment(alignment)
+                      m_tqalignment(tqalignment)
                 {
                 }
 
@@ -61,7 +61,7 @@ class UserRectSel : public QWidget
                 {
                     return m_screen == rhs.m_screen &&
                            m_pos == rhs.m_pos &&
-                           m_alignment == rhs.m_alignment;
+                           m_tqalignment == rhs.m_tqalignment;
                 }
 
                 bool operator!=(const PanelStrut& rhs)
@@ -72,7 +72,7 @@ class UserRectSel : public QWidget
                 TQRect m_rect;
                 int m_screen;
                 KPanelExtension::Position m_pos;
-                KPanelExtension::Alignment m_alignment;
+                KPanelExtension::Alignment m_tqalignment;
         };
 
         typedef TQValueVector<PanelStrut> RectList;