1 files changed, 15 insertions, 15 deletions
diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp
index d23e75a..873a7d1 100644
--- a/src/k3bstatusbarmanager.cpp
+++ b/src/k3bstatusbarmanager.cpp
@@ -31,7 +31,7 @@
 #include <kiconloader.h>
 #include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 #include <tdeio/global.h>
 #include <kstatusbar.h>
 #include <tdeaboutdata.h>
@@ -66,7 +66,7 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
   m_labelInfoMessage = new TQLabel( " ", m_mainWindow->statusBar() );
 
   // setup version info
-  m_versionBox = new TQLabel( TQString("K3b %1").arg(kapp->aboutData()->version()), m_mainWindow->statusBar() );
+  m_versionBox = new TQLabel( TQString("K3b %1").arg(tdeApp->aboutData()->version()), m_mainWindow->statusBar() );
   m_versionBox->installEventFilter( this );
 
   // setup the statusbar
@@ -79,16 +79,16 @@ K3bStatusBarManager::K3bStatusBarManager( K3bMainWindow* parent )
   m_mainWindow->statusBar()->addWidget( new TQLabel( "  ", m_mainWindow->statusBar() ), 0, true );
   m_mainWindow->statusBar()->addWidget( m_versionBox, 0, true );
 
-  connect( m_mainWindow, TQT_SIGNAL(configChanged(TDEConfig*)), this, TQT_SLOT(update()) );
-  connect( m_mainWindow->actionCollection(), TQT_SIGNAL(actionStatusText(const TQString&)),
-	   this, TQT_SLOT(showActionStatusText(const TQString&)) );
-  connect( m_mainWindow->actionCollection(), TQT_SIGNAL(clearStatusText()),
-	   this, TQT_SLOT(clearActionStatusText()) );
-  connect( k3bappcore->projectManager(), TQT_SIGNAL(activeProjectChanged(K3bDoc*)),
-	   this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) );
-  connect( k3bappcore->projectManager(), TQT_SIGNAL(projectChanged(K3bDoc*)),
-	   this, TQT_SLOT(slotActiveProjectChanged(K3bDoc*)) );
-  connect( (m_updateTimer = new TQTimer( this )), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateProjectStats()) );
+  connect( m_mainWindow, TQ_SIGNAL(configChanged(TDEConfig*)), this, TQ_SLOT(update()) );
+  connect( m_mainWindow->actionCollection(), TQ_SIGNAL(actionStatusText(const TQString&)),
+	   this, TQ_SLOT(showActionStatusText(const TQString&)) );
+  connect( m_mainWindow->actionCollection(), TQ_SIGNAL(clearStatusText()),
+	   this, TQ_SLOT(clearActionStatusText()) );
+  connect( k3bappcore->projectManager(), TQ_SIGNAL(activeProjectChanged(K3bDoc*)),
+	   this, TQ_SLOT(slotActiveProjectChanged(K3bDoc*)) );
+  connect( k3bappcore->projectManager(), TQ_SIGNAL(projectChanged(K3bDoc*)),
+	   this, TQ_SLOT(slotActiveProjectChanged(K3bDoc*)) );
+  connect( (m_updateTimer = new TQTimer( this )), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateProjectStats()) );
 
   update();
 }
@@ -134,7 +134,7 @@ void K3bStatusBarManager::slotFreeTempSpace(const TQString&,
     m_pixFreeTemp->setPixmap( SmallIcon("folder_green") );
 
   // update the display every second
-  TQTimer::singleShot( 2000, this, TQT_SLOT(update()) );
+  TQTimer::singleShot( 2000, this, TQ_SLOT(update()) );
 }
 
 
@@ -153,9 +153,9 @@ void K3bStatusBarManager::clearActionStatusText()
 bool K3bStatusBarManager::eventFilter( TQObject* o, TQEvent* e )
 {
   if( e->type() == TQEvent::MouseButtonDblClick ) {
-    if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_labelFreeTemp->parentWidget()) )
+    if( o == m_labelFreeTemp->parentWidget() )
       m_mainWindow->showOptionDialog( 0 );  // FIXME: use an enumeration for the option pages
-    else if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_versionBox) )
+    else if( o == m_versionBox )
       if( TDEAction* a = m_mainWindow->action( "help_about_app" ) )
 	a->activate();
   }