1 files changed, 10 insertions, 10 deletions

diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 88f25d18..0cf3cbdc 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -68,7 +68,7 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
             break;
     }
 
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("UI");
     int mode = config->readNumEntry("MDIStyle", 3);
     Ideal::ButtonMode buttonMode = Ideal::Text;
@@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position)
     m_widgetStack = new TQWidgetStack(this);
     m_internalLayout->addWidget(m_widgetStack);
 
-    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) );
-    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) );
-    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) );
+    m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, this, TQ_SLOT(moveToDockLeft()), this );
+    m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, this, TQ_SLOT(moveToDockRight()), this );
+    m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, this, TQ_SLOT(moveToDockBottom()), this );
 
     setVisible(m_visible);
 
@@ -103,7 +103,7 @@ DDockWindow::~DDockWindow()
 void DDockWindow::setVisible(bool v)
 {
     //write dock width to the config file
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     TQString group = TQString("%1").arg(m_name);
     config->setGroup(group);
 
@@ -147,7 +147,7 @@ void DDockWindow::loadSettings()
 
 void DDockWindow::saveSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     TQString group = TQString("%1").arg(m_name);
     int invisibleWidth = 0;
     config->setGroup(group);
@@ -192,14 +192,14 @@ void DDockWindow::addWidget(const TQString &title, TQWidget *widget, bool skipAc
     m_bar->addButton(button);
 
     m_widgetStack->addWidget(widget);
-    connect(button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectWidget()));
-    connect(button, TQT_SIGNAL(contextMenu(TQPopupMenu*)), this, TQT_SLOT(contextMenu(TQPopupMenu*)) );
+    connect(button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectWidget()));
+    connect(button, TQ_SIGNAL(contextMenu(TQPopupMenu*)), this, TQ_SLOT(contextMenu(TQPopupMenu*)) );
 
     if (!skipActivation)
     {
         //if the widget was selected last time the dock is deleted
         //we need to show it
-        TDEConfig *config = kapp->config();
+        TDEConfig *config = tdeApp->config();
         TQString group = TQString("%1").arg(m_name);
         config->setGroup(group);
         if (config->readEntry("ViewLastWidget") == title)
@@ -375,7 +375,7 @@ void DDockWindow::selectPrevWidget()
 
 void DDockWindow::contextMenu(TQPopupMenu * menu)
 {
-    m_lastContextMenuButton = static_cast<Ideal::Button*>( TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>( sender() )) );
+    m_lastContextMenuButton = static_cast<Ideal::Button*>( const_cast<TQObject*>( sender() ) );
 
     menu->insertSeparator();