1 files changed, 18 insertions, 18 deletions

diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp
index 764c66846..77c6d1912 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),
-    _tqlayout(0),
+    _layout(0),
     _type(KPanelApplet::Normal),
     _widthForHeightHint(0),
     _heightForWidthHint(0),
@@ -81,24 +81,24 @@ AppletContainer::AppletContainer(const AppletInfo& info,
 
     if (orientation() == Horizontal)
     {
-        _tqlayout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
+        _layout = new TQBoxLayout(this, TQBoxLayout::LeftToRight, 0, 0);
     }
     else
     {
-        _tqlayout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0);
+        _layout = new TQBoxLayout(this, TQBoxLayout::TopToBottom, 0, 0);
     }
 
-    _tqlayout->setResizeMode( TQLayout::FreeResize );
+    _layout->setResizeMode( TQLayout::FreeResize );
 
-    _tqlayout->addSpacing(APPLET_MARGIN);
+    _layout->addSpacing(APPLET_MARGIN);
     _handle = new AppletHandle(this);
-    _tqlayout->addWidget(_handle, 0);
+    _layout->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()));
 
-    _tqlayout->addWidget(_appletframe, 1);
-    _tqlayout->activate();
+    _layout->addWidget(_appletframe, 1);
+    _layout->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->tqsetAlignment((KPanelApplet::Alignment)tqalignment());
+    _applet->setAlignment((KPanelApplet::Alignment)alignment());
 
     _actions = _applet->actions();
     _type = _applet->type();
@@ -193,14 +193,14 @@ void AppletContainer::resetLayout()
 
     if (orientation() == Horizontal)
     {
-        _tqlayout->setDirection( TQBoxLayout::LeftToRight );
+        _layout->setDirection( TQBoxLayout::LeftToRight );
     }
     else
     {
-        _tqlayout->setDirection( TQBoxLayout::TopToBottom );
+        _layout->setDirection( TQBoxLayout::TopToBottom );
     }
 
-    _tqlayout->activate();
+    _layout->activate();
 }
 
 void AppletContainer::moveApplet( const TQPoint& moveOffset )
@@ -275,14 +275,14 @@ void AppletContainer::slotRemoved(KConfig* config)
 
 void AppletContainer::activateWindow()
 {
-    KWin::forceActiveWindow(tqtopLevelWidget()->winId());
+    KWin::forceActiveWindow(topLevelWidget()->winId());
 }
 
 void AppletContainer::focusRequested(bool focus)
 {
     if (focus)
     {
-        KWin::forceActiveWindow(tqtopLevelWidget()->winId());
+        KWin::forceActiveWindow(topLevelWidget()->winId());
     }
 
     emit maintainFocus(focus);
@@ -295,7 +295,7 @@ void AppletContainer::doLoadConfiguration( KConfigGroup& config )
 }
 
 void AppletContainer::doSaveConfiguration( KConfigGroup& config,
-                                           bool tqlayoutOnly ) const
+                                           bool layoutOnly ) const
 {
     // immutability is checked by ContainerBase
     if (orientation() == Horizontal)
@@ -307,7 +307,7 @@ void AppletContainer::doSaveConfiguration( KConfigGroup& config,
         config.writeEntry( "HeightForWidthHint", heightForWidth(width()) );
     }
 
-    if (!tqlayoutOnly)
+    if (!layoutOnly)
     {
         config.writePathEntry( "ConfigFile", _configFile );
         config.writePathEntry( "DesktopFile", _deskFile );
@@ -354,14 +354,14 @@ void AppletContainer::slotDelayedDestruct()
     delete this;
 }
 
-void AppletContainer::tqalignmentChange(KPanelExtension::Alignment a)
+void AppletContainer::alignmentChange(KPanelExtension::Alignment a)
 {
     if (!_applet)
     {
         return;
     }
 
-    _applet->tqsetAlignment( (KPanelApplet::Alignment)a );
+    _applet->setAlignment( (KPanelApplet::Alignment)a );
 }
 
 int AppletContainer::widthForHeight(int h) const