1 files changed, 75 insertions, 75 deletions
diff --git a/src/k3b.cpp b/src/k3b.cpp
index abebb66..07c312f 100644
--- a/src/k3b.cpp
+++ b/src/k3b.cpp
@@ -16,7 +16,7 @@
 #include <config.h>
 
 
-// include files for QT
+// include files for TQt
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
@@ -44,8 +44,8 @@
 #include <tdeconfig.h>
 #include <kstdaction.h>
 #include <klineeditdlg.h>
-#include <kstandarddirs.h>
-#include <kprocess.h>
+#include <tdestandarddirs.h>
+#include <tdeprocess.h>
 #include <kurl.h>
 #include <kurllabel.h>
 #include <tdetoolbar.h>
@@ -154,7 +154,7 @@ K3bMainWindow::K3bMainWindow()
 
   setPlainCaption( i18n("K3b - The CD and DVD Kreator") );
 
-  m_config = kapp->config();
+  m_config = tdeApp->config();
 
   ///////////////////////////////////////////////////////////////////
   // call inits to invoke all other construction parts
@@ -175,9 +175,9 @@ K3bMainWindow::K3bMainWindow()
   // disable actions at startup
   slotStateChanged( "state_project_active", KXMLGUIClient::StateReverse );
 
-  connect( k3bappcore->projectManager(), TQT_SIGNAL(newProject(K3bDoc*)), TQT_TQOBJECT(this), TQT_SLOT(createClient(K3bDoc*)) );
-  connect( k3bcore->deviceManager(), TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystemTimed()) );
-  connect( K3bAudioServer::instance(), TQT_SIGNAL(error(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotAudioServerError(const TQString&)) );
+  connect( k3bappcore->projectManager(), TQ_SIGNAL(newProject(K3bDoc*)), this, TQ_SLOT(createClient(K3bDoc*)) );
+  connect( k3bcore->deviceManager(), TQ_SIGNAL(changed()), this, TQ_SLOT(slotCheckSystemTimed()) );
+  connect( K3bAudioServer::instance(), TQ_SIGNAL(error(const TQString&)), this, TQ_SLOT(slotAudioServerError(const TQString&)) );
 
   // FIXME: now make sure the welcome screen is displayed completely
   resize( 780, 550 );
@@ -211,59 +211,59 @@ void K3bMainWindow::initActions()
   // see the correct solution?)
   *actionCollection() += *k3bappcore->appDeviceManager()->actionCollection();
 
-  actionFileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection());
-  actionFileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
-  actionFileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection());
-  actionFileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection());
-  actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAll()), 
+  actionFileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection());
+  actionFileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection());
+  actionFileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection());
+  actionFileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection());
+  actionFileSaveAll = new TDEAction( i18n("Save All"), "save_all", 0, this, TQ_SLOT(slotFileSaveAll()), 
 				   actionCollection(), "file_save_all" );
-  actionFileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection());
-  actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileCloseAll()), 
+  actionFileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection());
+  actionFileCloseAll = new TDEAction( i18n("Close All"), 0, 0, this, TQ_SLOT(slotFileCloseAll()), 
 				    actionCollection(), "file_close_all" );
-  actionFileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection());
-  actionViewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection());
-  actionSettingsConfigure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotSettingsConfigure()), actionCollection() );
+  actionFileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection());
+  actionViewStatusBar = KStdAction::showStatusbar(this, TQ_SLOT(slotViewStatusBar()), actionCollection());
+  actionSettingsConfigure = KStdAction::preferences(this, TQ_SLOT(slotSettingsConfigure()), actionCollection() );
 
   // the tip action
-  (void)KStdAction::tipOfDay(TQT_TQOBJECT(this), TQT_SLOT(slotShowTips()), actionCollection() );
-  (void)KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+  (void)KStdAction::tipOfDay(this, TQ_SLOT(slotShowTips()), actionCollection() );
+  (void)KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() );
 
-  KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotEditToolbars()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
   setStandardToolBarMenuEnabled(true);
-  KStdAction::showMenubar( TQT_TQOBJECT(this), TQT_SLOT(slotShowMenuBar()), actionCollection() );
+  KStdAction::showMenubar( this, TQ_SLOT(slotShowMenuBar()), actionCollection() );
 
   actionFileNewMenu = new TDEActionMenu( i18n("&New Project"), "document-new", actionCollection(), "file_new" );
-  actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewAudioDoc()),
+  actionFileNewAudio = new TDEAction(i18n("New &Audio CD Project"), "audiocd", 0, this, TQ_SLOT(slotNewAudioDoc()),
 			     actionCollection(), "file_new_audio");
-  actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDataDoc()),
+  actionFileNewData = new TDEAction(i18n("New Data &CD Project"), "datacd", 0, this, TQ_SLOT(slotNewDataDoc()),
 			    actionCollection(), "file_new_data");
-  actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMixedDoc()),
+  actionFileNewMixed = new TDEAction(i18n("New &Mixed Mode CD Project"), "mixedcd", 0, this, TQ_SLOT(slotNewMixedDoc()),
 				   actionCollection(), "file_new_mixed");
-  actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVcdDoc()),
+  actionFileNewVcd = new TDEAction(i18n("New &Video CD Project"), "videocd", 0, this, TQ_SLOT(slotNewVcdDoc()),
 				   actionCollection(), "file_new_vcd");
-  actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDoc()),
+  actionFileNewMovix = new TDEAction(i18n("New &eMovix CD Project"), "emovix", 0, this, TQ_SLOT(slotNewMovixDoc()),
 				   actionCollection(), "file_new_movix");
-  actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewMovixDvdDoc()),
+  actionFileNewMovixDvd = new TDEAction(i18n("New &eMovix DVD Project"), "emovix", 0, this, TQ_SLOT(slotNewMovixDvdDoc()),
 				      actionCollection(), "file_new_movix_dvd");
-  actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewDvdDoc()),
+  actionFileNewDvd = new TDEAction(i18n("New Data &DVD Project"), "datadvd", 0, this, TQ_SLOT(slotNewDvdDoc()),
 				 actionCollection(), "file_new_dvd");
-  actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVideoDvdDoc()),
+  actionFileNewVideoDvd = new TDEAction(i18n("New V&ideo DVD Project"), "videodvd", 0, this, TQ_SLOT(slotNewVideoDvdDoc()),
 				      actionCollection(), "file_new_video_dvd");
-  actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotContinueMultisession()),
+  actionFileContinueMultisession = new TDEAction( i18n("Continue Multisession Project"), "datacd", 0, this, TQ_SLOT(slotContinueMultisession()),
 						actionCollection(), "file_continue_multisession" );
 
   actionFileNewMenu->setDelayed( false );
   actionFileNewMenu->insert( actionFileNewData );
   actionFileNewMenu->insert( actionFileNewDvd );
   actionFileNewMenu->insert( actionFileContinueMultisession );
-  actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+  actionFileNewMenu->insert( new TDEActionSeparator( this ) );
   actionFileNewMenu->insert( actionFileNewAudio );
-  actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+  actionFileNewMenu->insert( new TDEActionSeparator( this ) );
   actionFileNewMenu->insert( actionFileNewMixed );
-  actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+  actionFileNewMenu->insert( new TDEActionSeparator( this ) );
   actionFileNewMenu->insert( actionFileNewVcd );
   actionFileNewMenu->insert( actionFileNewVideoDvd );
-  actionFileNewMenu->insert( new TDEActionSeparator( TQT_TQOBJECT(this) ) );
+  actionFileNewMenu->insert( new TDEActionSeparator( this ) );
   actionFileNewMenu->insert( actionFileNewMovix );
   actionFileNewMenu->insert( actionFileNewMovixDvd );
 
@@ -271,54 +271,54 @@ void K3bMainWindow::initActions()
 
 
 
-  actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectAddFiles()),
+  actionProjectAddFiles = new TDEAction( i18n("&Add Files..."), "document-new", 0, this, TQ_SLOT(slotProjectAddFiles()),
 				       actionCollection(), "project_add_files");
 
   TDEAction* actionClearProject = new TDEAction( i18n("&Clear Project"), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, 
-					     TQT_TQOBJECT(this), TQT_SLOT(slotClearProject()), actionCollection(), "project_clear_project" );
+					     this, TQ_SLOT(slotClearProject()), actionCollection(), "project_clear_project" );
 
-  actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowDirTreeView()),
+  actionViewDirTreeView = new TDEToggleAction(i18n("Show Directories"), 0, this, TQ_SLOT(slotShowDirTreeView()),
 					    actionCollection(), "view_dir_tree");
 
-  actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowContentsView()),
+  actionViewContentsView = new TDEToggleAction(i18n("Show Contents"), 0, this, TQ_SLOT(slotShowContentsView()),
 					     actionCollection(), "view_contents");
 
-  actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewDocumentHeader()),
+  actionViewDocumentHeader = new TDEToggleAction(i18n("Show Document Header"), 0, this, TQ_SLOT(slotViewDocumentHeader()),
 					       actionCollection(), "view_document_header");
 
-  actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotBlankCdrw()),
+  actionToolsBlankCdrw = new TDEAction( i18n("&Erase CD-RW..."), "erasecd", 0, this, TQ_SLOT(slotBlankCdrw()),
 				      actionCollection(), "tools_blank_cdrw" );
-  TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, TQT_TQOBJECT(this), 
-					       TQT_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
-  actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteCdImage()),
+  TDEAction* actionToolsFormatDVD = new TDEAction( i18n("&Format DVD%1RW...").arg("�"), "formatdvd", 0, this, 
+					       TQ_SLOT(slotFormatDvd()), actionCollection(), "tools_format_dvd" );
+  actionToolsWriteCdImage = new TDEAction(i18n("&Burn CD Image..."), "burn_cdimage", 0, this, TQ_SLOT(slotWriteCdImage()),
 					 actionCollection(), "tools_write_cd_image" );
-  TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, TQT_TQOBJECT(this), TQT_SLOT(slotWriteDvdIsoImage()),
+  TDEAction* actionToolsWriteDvdImage = new TDEAction(i18n("&Burn DVD ISO Image..."), "burn_dvdimage", 0, this, TQ_SLOT(slotWriteDvdIsoImage()),
 						 actionCollection(), "tools_write_dvd_iso" );
 
-  actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCdCopy()),
+  actionCdCopy = new TDEAction(i18n("&Copy CD..."), "cdcopy", 0, this, TQ_SLOT(slotCdCopy()),
 			     actionCollection(), "tools_copy_cd" );
 
-  TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, TQT_TQOBJECT(this), TQT_SLOT(slotDvdCopy()),
+  TDEAction* actionToolsDvdCopy = new TDEAction(i18n("Copy &DVD..."), "dvdcopy", 0, this, TQ_SLOT(slotDvdCopy()),
 					    actionCollection(), "tools_copy_dvd" );
 
-  actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCddaRip()),
+  actionToolsCddaRip = new TDEAction( i18n("Rip Audio CD..."), "cddarip", 0, this, TQ_SLOT(slotCddaRip()),
 				    actionCollection(), "tools_cdda_rip" );
-  actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoDvdRip()),
+  actionToolsVideoDvdRip = new TDEAction( i18n("Rip Video DVD..."), "videodvd", 0, this, TQ_SLOT(slotVideoDvdRip()),
 				    actionCollection(), "tools_videodvd_rip" );
-  actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, TQT_TQOBJECT(this), TQT_SLOT(slotVideoCdRip()),
+  actionToolsVideoCdRip = new TDEAction( i18n("Rip Video CD..."), "videocd", 0, this, TQ_SLOT(slotVideoCdRip()),
 				       actionCollection(), "tools_videocd_rip" );
 
-  (void)new TDEAction( i18n("System Check"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()),
+  (void)new TDEAction( i18n("System Check"), 0, 0, this, TQ_SLOT(slotCheckSystem()),
 		     actionCollection(), "help_check_system" );
 
 #ifdef HAVE_K3BSETUP
-  actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotK3bSetup()),
+  actionSettingsK3bSetup = new TDEAction(i18n("&Setup System Permissions..."), "configure", 0, this, TQ_SLOT(slotK3bSetup()),
 				       actionCollection(), "settings_k3bsetup" );
 #endif
 
 #ifdef K3B_DEBUG
-  (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, TQT_TQOBJECT(this), 
-		     TQT_SLOT(slotMediaSelectionTester()), actionCollection(),
+  (void)new TDEAction( "Test Media Selection ComboBox", 0, 0, this, 
+		     TQ_SLOT(slotMediaSelectionTester()), actionCollection(),
 		     "test_media_selection" );
 #endif
 
@@ -380,7 +380,7 @@ void K3bMainWindow::initView()
 {
   // setup main docking things
   mainDock = createDockWidget( "project_view", SmallIcon("idea"), 0,
-			       kapp->makeStdCaption( i18n("Project View") ), i18n("Project View") );
+			       tdeApp->makeStdCaption( i18n("Project View") ), i18n("Project View") );
   mainDock->setDockSite( KDockWidget::DockCorner );
   mainDock->setEnableDocking( KDockWidget::DockNone );
   setView( mainDock );
@@ -408,7 +408,7 @@ void K3bMainWindow::initView()
   documentHullLayout->addWidget( m_documentHeader, 0, 0 );
   documentHullLayout->addWidget( m_documentTab, 1, 0 );
 
-  connect( m_documentTab, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotCurrentDocChanged()) );
+  connect( m_documentTab, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentDocChanged()) );
 
   d->welcomeWidget = new K3bWelcomeWidget( this, m_documentTab );
   m_documentTab->addTab( d->welcomeWidget, i18n("Quickstart") );
@@ -419,7 +419,7 @@ void K3bMainWindow::initView()
 
   // --- Directory Dock --------------------------------------------------------------------------
   m_dirTreeDock = createDockWidget( "directory_tree", SmallIcon("folder"), 0,
-				    kapp->makeStdCaption( i18n("Sidepanel") ), i18n("Sidepanel") );
+				    tdeApp->makeStdCaption( i18n("Sidepanel") ), i18n("Sidepanel") );
   m_dirTreeDock->setEnableDocking( KDockWidget::DockCorner );
 
   K3bFileTreeView* sidePanel = new K3bFileTreeView( m_dirTreeDock );
@@ -427,36 +427,36 @@ void K3bMainWindow::initView()
 
   m_dirTreeDock->setWidget( sidePanel );
   m_dirTreeDock->manualDock( mainDock, KDockWidget::DockTop, 4000 );
-  connect( m_dirTreeDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) );
-  connect( m_dirTreeDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotDirTreeDockHidden()) );
+  connect( m_dirTreeDock, TQ_SIGNAL(iMBeingClosed()), this, TQ_SLOT(slotDirTreeDockHidden()) );
+  connect( m_dirTreeDock, TQ_SIGNAL(hasUndocked()), this, TQ_SLOT(slotDirTreeDockHidden()) );
   // ---------------------------------------------------------------------------------------------
 
   // --- Contents Dock ---------------------------------------------------------------------------
   m_contentsDock = createDockWidget( "contents_view", SmallIcon("idea"), 0,
-			      kapp->makeStdCaption( i18n("Contents View") ), i18n("Contents View") );
+			      tdeApp->makeStdCaption( i18n("Contents View") ), i18n("Contents View") );
   m_contentsDock->setEnableDocking( KDockWidget::DockCorner );
   m_dirView = new K3bDirView( sidePanel/*->fileTreeView()*/, m_contentsDock );
   m_contentsDock->setWidget( m_dirView );
   m_contentsDock->manualDock( m_dirTreeDock, KDockWidget::DockRight, 2000 );
 
-  connect( m_contentsDock, TQT_SIGNAL(iMBeingClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) );
-  connect( m_contentsDock, TQT_SIGNAL(hasUndocked()), TQT_TQOBJECT(this), TQT_SLOT(slotContentsDockHidden()) );
+  connect( m_contentsDock, TQ_SIGNAL(iMBeingClosed()), this, TQ_SLOT(slotContentsDockHidden()) );
+  connect( m_contentsDock, TQ_SIGNAL(hasUndocked()), this, TQ_SLOT(slotContentsDockHidden()) );
   // ---------------------------------------------------------------------------------------------
 
   // --- filetreecombobox-toolbar ----------------------------------------------------------------
   K3bFileTreeComboBox* m_fileTreeComboBox = new K3bFileTreeComboBox( 0 );
-  connect( m_fileTreeComboBox, TQT_SIGNAL(urlExecuted(const KURL&)), m_dirView, TQT_SLOT(showUrl(const KURL& )) );
-  connect( m_fileTreeComboBox, TQT_SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView,
-	   TQT_SLOT(showDevice(K3bDevice::Device* )) );
-  connect( m_dirView, TQT_SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, TQT_SLOT(setUrl(const KURL&)) );
-  connect( m_dirView, TQT_SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, TQT_SLOT(setDevice(K3bDevice::Device*)) );
+  connect( m_fileTreeComboBox, TQ_SIGNAL(urlExecuted(const KURL&)), m_dirView, TQ_SLOT(showUrl(const KURL& )) );
+  connect( m_fileTreeComboBox, TQ_SIGNAL(deviceExecuted(K3bDevice::Device*)), m_dirView,
+	   TQ_SLOT(showDevice(K3bDevice::Device* )) );
+  connect( m_dirView, TQ_SIGNAL(urlEntered(const KURL&)), m_fileTreeComboBox, TQ_SLOT(setUrl(const KURL&)) );
+  connect( m_dirView, TQ_SIGNAL(deviceSelected(K3bDevice::Device*)), m_fileTreeComboBox, TQ_SLOT(setDevice(K3bDevice::Device*)) );
 
   KWidgetAction* fileTreeComboAction = new KWidgetAction( m_fileTreeComboBox,
 							  i18n("&Quick Dir Selector"),
 							  0, 0, 0,
 							  actionCollection(), "quick_dir_selector" );
   fileTreeComboAction->setAutoSized(true);
-  (void)new TDEAction( i18n("Go"), "key_enter", 0, TQT_TQOBJECT(m_fileTreeComboBox), TQT_SLOT(slotGoUrl()), actionCollection(), "go_url" );
+  (void)new TDEAction( i18n("Go"), "key_enter", 0, m_fileTreeComboBox, TQ_SLOT(slotGoUrl()), actionCollection(), "go_url" );
   // ---------------------------------------------------------------------------------------------
 }
 
@@ -616,7 +616,7 @@ void K3bMainWindow::readOptions()
 void K3bMainWindow::saveProperties( TDEConfig* c )
 {
   // 1. put saved projects in the config
-  // 2. save every modified project in  "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId()
+  // 2. save every modified project in  "~/.trinity/share/apps/k3b/sessions/" + TDEApp->sessionId()
   // 3. save the url of the project (might be something like "AudioCD1") in the config
   // 4. save the status of every project (modified/saved)
 
@@ -625,7 +625,7 @@ void K3bMainWindow::saveProperties( TDEConfig* c )
   // FIXME: for some reason the config entries are not properly stored when using the default
   //        TDEMainWindow session config. Since I was not able to find the bug I use another config object
   // ----------------------------------------------------------
-  c = new KSimpleConfig( saveDir + "list", false );
+  c = new TDESimpleConfig( saveDir + "list", false );
   c->setGroup( "Saved Session" );
   // ----------------------------------------------------------
 
@@ -673,14 +673,14 @@ void K3bMainWindow::readProperties( TDEConfig* c )
   // 1. read all projects from the config
   // 2. simply open all of themg
   // 3. reset the saved urls and the modified state
-  // 4. delete "~/.trinity/share/apps/k3b/sessions/" + KApp->sessionId()
+  // 4. delete "~/.trinity/share/apps/k3b/sessions/" + TDEApp->sessionId()
 
   TQString saveDir = TDEGlobal::dirs()->saveLocation( "appdata", "sessions/" + tqApp->sessionId() + "/", true );
 
   // FIXME: for some reason the config entries are not properly stored when using the default
   //        TDEMainWindow session config. Since I was not able to find the bug I use another config object
   // ----------------------------------------------------------
-  c = new KSimpleConfig( saveDir + "list", true );
+  c = new TDESimpleConfig( saveDir + "list", true );
   c->setGroup( "Saved Session" );
   // ----------------------------------------------------------
 
@@ -795,7 +795,7 @@ bool K3bMainWindow::queryClose()
   // if we are closed by the session manager everything is fine since we store the
   // current state in saveProperties
   //
-  if( kapp->sessionSaving() ) 
+  if( tdeApp->sessionSaving() ) 
     return true;
 
   // FIXME: do not close the docs here. Just ask for them to be saved and return false
@@ -851,7 +851,7 @@ bool K3bMainWindow::queryExit()
 
 
 /////////////////////////////////////////////////////////////////////
-// TQT_SLOT IMPLEMENTATION
+// TQ_SLOT IMPLEMENTATION
 /////////////////////////////////////////////////////////////////////
 
 
@@ -1202,7 +1202,7 @@ void K3bMainWindow::slotEditToolbars()
 {
   saveMainWindowSettings( m_config, "main_window_settings" );
   KEditToolbar dlg( factory() );
-  connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(slotNewToolBarConfig()));
+  connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(slotNewToolBarConfig()));
   dlg.exec();
 }
 
@@ -1468,7 +1468,7 @@ void K3bMainWindow::slotCheckSystemTimed()
   // run the system check from the event queue so we do not
   // mess with the device state resetting throughout the app
   // when called from K3bDeviceManager::changed
-  TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(slotCheckSystem()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(slotCheckSystem()) );
 }