1 files changed, 8 insertions, 10 deletions
diff --git a/src/newui/dmainwindow.cpp b/src/newui/dmainwindow.cpp
index 3517ab6c..b2488901 100644
--- a/src/newui/dmainwindow.cpp
+++ b/src/newui/dmainwindow.cpp
@@ -34,7 +34,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
 {
     loadSettings();
     createToolWindows();
-    m_central = new Ideal::DockSplitter(Qt::Horizontal, this);
+    m_central = new Ideal::DockSplitter(TQt::Horizontal, this);
     m_activeTabWidget = createTab();
     m_central->addDock(0, 0, m_activeTabWidget);
     setCentralWidget(m_central);
@@ -42,7 +42,7 @@ DMainWindow::DMainWindow(TQWidget *parent, const char *name)
 
 void DMainWindow::loadSettings()
 {
-    TDEConfig *config = kapp->config();
+    TDEConfig *config = tdeApp->config();
     config->setGroup("UI");
     m_openTabAfterCurrent = config->readBoolEntry("OpenNewTabAfterCurrent", true);
     m_showIconsOnTabs = config->readBoolEntry("ShowTabIcons", false);
@@ -208,10 +208,10 @@ DTabWidget *DMainWindow::createTab()
     DTabWidget *tab = new DTabWidget(m_central);
     m_tabs.append(tab);
     if (tab->closeButton())
-        connect(tab->closeButton(), TQT_SIGNAL(clicked()), this, TQT_SLOT(closeTab()));
-    connect(tab, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*)));
-    connect(tab, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
-        this, TQT_SLOT(tabContext(TQWidget*,const TQPoint &)));
+        connect(tab->closeButton(), TQ_SIGNAL(clicked()), this, TQ_SLOT(closeTab()));
+    connect(tab, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*)));
+    connect(tab, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint &)),
+        this, TQ_SLOT(tabContext(TQWidget*,const TQPoint &)));
     return tab;
 }
 
@@ -274,7 +274,7 @@ void DMainWindow::addDockWidget(DDockWindow::Position position, TQWidget *view,
 {
     toolWindow(position)->addWidget(title, view);
     m_docks[view] = position;
-    connect(view, TQT_SIGNAL(destroyed()), this, TQT_SLOT(widgetDestroyed()));
+    connect(view, TQ_SIGNAL(destroyed()), this, TQ_SLOT(widgetDestroyed()));
 }
 
 void DMainWindow::removeDockWidget(TQWidget *view)
@@ -295,7 +295,7 @@ DDockWindow::Position DMainWindow::dockWidgetPosition(TQWidget *view)
 
 void DMainWindow::widgetDestroyed()
 {
-    TQWidget *w = TQT_TQWIDGET(const_cast<TQT_BASE_OBJECT_NAME*>(sender()));
+    TQWidget *w = static_cast<TQWidget*>(const_cast<TQObject*>(sender()));
 
     if (m_docks.contains(w))
     {
@@ -305,5 +305,3 @@ void DMainWindow::widgetDestroyed()
 }
 
 #include "dmainwindow.moc"
-
-// kate: space-indent on; indent-width 4; tab-width 4; replace-tabs on