Replaced various '#define' with actual strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 15796910975130bce11a662cbe259913d791942f)

7 files changed, 71 insertions, 71 deletions

diff --git a/src/document.cpp b/src/document.cpp
index 7a59c46..ac18843 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -66,7 +66,7 @@ void Document::handleNewView( View *view )
 
 void Document::slotViewDestroyed( TQObject *obj )
 {
-	View *view = static_cast<View*>(TQT_TQWIDGET(obj));
+	View *view = static_cast<View*>(obj);
 	
 	m_viewList.remove(view);
 	
diff --git a/src/icnview.cpp b/src/icnview.cpp
index 43e5a9d..cd0e628 100644
--- a/src/icnview.cpp
+++ b/src/icnview.cpp
@@ -28,12 +28,12 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v
 	
 	//BEGIN Routing Actions
 	// These actions get inserted into the main menu
-	m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
+	m_pAutoRoutingAction = new TDERadioAction( i18n("Automatic"), "", 0, this, TQT_SLOT(slotSetRoutingAuto()), ac, "routing_mode_auto" );
 	m_pAutoRoutingAction->setExclusiveGroup("routing_mode");
 	if ( !manualRouting )
 		m_pAutoRoutingAction->setChecked( true );
 	
-	m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
+	m_pManualRoutingAction = new TDERadioAction( i18n("Manual"), "", 0, this, TQT_SLOT(slotSetRoutingManual()), ac, "routing_mode_manual" );
 	m_pManualRoutingAction->setExclusiveGroup("routing_mode");
 	if ( manualRouting )
 		m_pManualRoutingAction->setChecked( true );
diff --git a/src/itemview.cpp b/src/itemview.cpp
index 5361131..88d33d9 100644
--- a/src/itemview.cpp
+++ b/src/itemview.cpp
@@ -38,9 +38,9 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u
 	TDEActionCollection * ac = actionCollection();
 
 	KStdAction::selectAll(	itemDocument,		TQT_SLOT(selectAll()),		ac );
-	KStdAction::zoomIn(	TQT_TQOBJECT(this),	TQT_SLOT(zoomIn()),		ac );
-	KStdAction::zoomOut(	TQT_TQOBJECT(this),	TQT_SLOT(zoomOut()),		ac );
-	KStdAction::actualSize(	TQT_TQOBJECT(this),	TQT_SLOT(actualSize()),		ac )->setEnabled(false);
+	KStdAction::zoomIn(	this,	TQT_SLOT(zoomIn()),		ac );
+	KStdAction::zoomOut(	this,	TQT_SLOT(zoomOut()),		ac );
+	KStdAction::actualSize(	this,	TQT_SLOT(actualSize()),		ac )->setEnabled(false);
 
 
 	TDEAccel *pAccel = new TDEAccel(this);
diff --git a/src/katemdi.cpp b/src/katemdi.cpp
index b258723..be99f47 100644
--- a/src/katemdi.cpp
+++ b/src/katemdi.cpp
@@ -181,8 +181,8 @@ bool ToolView::visible () const
 void ToolView::childEvent ( TQChildEvent *ev )
 {
   // set the widget to be focus proxy if possible
-  if (ev->inserted() && ev->child() && TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget"))
-    setFocusProxy ((TQWidget *)(TQT_TQOBJECT(ev->child())->tqt_cast("TQWidget")));
+  if (ev->inserted() && ev->child() && ev->child()->tqt_cast("TQWidget"))
+    setFocusProxy ((TQWidget *)(ev->child()->tqt_cast("TQWidget")));
 
   TQVBox::childEvent (ev);
 }
diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp
index ff35a0e..46e5935 100644
--- a/src/ktechlab.cpp
+++ b/src/ktechlab.cpp
@@ -72,7 +72,7 @@ KTechlab::KTechlab()
 	m_pToolBarOverlayLabel = 0l;
 	
 	m_pUpdateCaptionsTimer = new TQTimer( this );
-	connect( m_pUpdateCaptionsTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateCaptions()) );
+	connect( m_pUpdateCaptionsTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateCaptions()) );
 	
 	setMinimumSize( 400, 400 );
 	
@@ -233,7 +233,7 @@ void KTechlab::addWindow( ViewContainer * vc )
 	if ( vc && !m_viewContainerList.contains(vc) )
 	{
 		m_viewContainerList << vc;
-		connect( vc, TQT_SIGNAL(destroyed(TQObject* )), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerDestroyed(TQObject* )) );
+		connect( vc, TQT_SIGNAL(destroyed(TQObject* )), this, TQT_SLOT(slotViewContainerDestroyed(TQObject* )) );
 	}
 	
 	m_viewContainerList.remove((ViewContainer*)0);
@@ -283,13 +283,13 @@ void KTechlab::overlayToolBarScreenshot()
 // 	TQWidget * toolsWidget = toolBar( "toolsToolBar" );
 // 	TQWidget * debugWidget = toolBar( "debugTB" );
 	
-	TDEToolBar * toolsWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "toolsToolBar", "TDEToolBar" )));
-	TDEToolBar * debugWidget = static_cast<TDEToolBar*>(TQT_TQWIDGET(child( "debugTB", "TDEToolBar" )));
+	TDEToolBar * toolsWidget = static_cast<TDEToolBar*>(child( "toolsToolBar", "TDEToolBar" ));
+	TDEToolBar * debugWidget = static_cast<TDEToolBar*>(child( "debugTB", "TDEToolBar" ));
 	
 	if ( !toolsWidget && !debugWidget )
 		return;
 	
-	TQWidget * parent = TQT_TQWIDGET(toolsWidget ? toolsWidget->parent() : debugWidget->parent());
+	TQWidget * parent = static_cast<TQWidget*>(toolsWidget ? toolsWidget->parent() : debugWidget->parent());
 	
 	TQRect grabRect;
 	
@@ -310,7 +310,7 @@ void KTechlab::overlayToolBarScreenshot()
 	m_pToolBarOverlayLabel->setPixmap( shot );
 	m_pToolBarOverlayLabel->show();
 	
-	TQTimer::singleShot( 100, TQT_TQOBJECT(this), TQT_SLOT( hideToolBarOverlay() ) );
+	TQTimer::singleShot( 100, this, TQT_SLOT( hideToolBarOverlay() ) );
 }
 
 
@@ -363,11 +363,11 @@ void KTechlab::removeGUIClients()
 void KTechlab::setupTabWidget()
 {	
 	m_pViewContainerTabWidget = new KTabWidget(centralWidget());
-	connect( tabWidget(), TQT_SIGNAL(currentChanged(TQWidget* )), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerActivated(TQWidget* )) );
-	connect( tabWidget(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), TQT_TQOBJECT(this), TQT_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) );
-	connect( tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabDragInitiate(TQWidget* )) );
-	connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQDropEvent* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) );
-	connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), TQT_TQOBJECT(this), TQT_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) );
+	connect( tabWidget(), TQT_SIGNAL(currentChanged(TQWidget* )), this, TQT_SLOT(slotViewContainerActivated(TQWidget* )) );
+	connect( tabWidget(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent*, bool& )), this, TQT_SLOT(slotTabDragEvent(const TQDragMoveEvent*, bool& )) );
+	connect( tabWidget(), TQT_SIGNAL(initiateDrag(TQWidget* )), this, TQT_SLOT(slotTabDragInitiate(TQWidget* )) );
+	connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQDropEvent* )) );
+	connect( tabWidget(), TQT_SIGNAL(receivedDropEvent(TQWidget*, TQDropEvent* )), this, TQT_SLOT(slotTabReceivedDropEvent(TQWidget*, TQDropEvent* )) );
 	
 	TDEConfig *config = kapp->config();
 	config->setGroup("UI");
@@ -387,12 +387,12 @@ void KTechlab::setupTabWidget()
 		but->setIconSet(SmallIcon("tab_remove"));
 		but->adjustSize();
 		but->hide();
-		connect( but, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotViewContainerClose()) );
+		connect( but, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotViewContainerClose()) );
 		tabWidget()->setCornerWidget(but, TopRight);
 	}
 // 	tabWidget()->setTabReorderingEnabled(true);
-// 	connect(tabWidget(), TQT_SIGNAL(movedTab(int, int)), TQT_TQOBJECT(this), TQT_SLOT(tabMoved(int, int)));
-	connect(tabWidget(), TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), TQT_TQOBJECT(this), TQT_SLOT(slotTabContext(TQWidget*,const TQPoint &)));
+// 	connect(tabWidget(), TQT_SIGNAL(movedTab(int, int)), this, TQT_SLOT(tabMoved(int, int)));
+	connect(tabWidget(), TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint &)), this, TQT_SLOT(slotTabContext(TQWidget*,const TQPoint &)));
 	//END Tab bar stuff
 }
 
@@ -415,63 +415,63 @@ void KTechlab::setupActions()
 {
 	TDEActionCollection *ac = actionCollection();
 	
-    KStdAction::openNew(			TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()),					ac );
-    KStdAction::open(				TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()),					ac );
-    KStdAction::save(				TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()),					ac );
-    KStdAction::saveAs(				TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()),				ac );
-	KStdAction::close(				TQT_TQOBJECT(this), TQT_SLOT(slotViewClose()),				ac );
-    KStdAction::print(				TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()),				ac );
-    KStdAction::quit(				TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()),					ac );
-	KStdAction::undo(				TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()),					ac );
-	KStdAction::redo(				TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()),					ac );
-	KStdAction::cut(				TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()),					ac );
-	KStdAction::copy(				TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()),					ac );
-	KStdAction::paste(				TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()),				ac );
-	KStdAction::keyBindings(		TQT_TQOBJECT(this), TQT_SLOT(slotOptionsConfigureKeys()),		ac );
-	KStdAction::configureToolbars(	TQT_TQOBJECT(this), TQT_SLOT(slotOptionsConfigureToolbars()),	ac );
-	KStdAction::preferences(		TQT_TQOBJECT(this), TQT_SLOT(slotOptionsPreferences()),		ac );
+    KStdAction::openNew(			this, TQT_SLOT(slotFileNew()),					ac );
+    KStdAction::open(				this, TQT_SLOT(slotFileOpen()),					ac );
+    KStdAction::save(				this, TQT_SLOT(slotFileSave()),					ac );
+    KStdAction::saveAs(				this, TQT_SLOT(slotFileSaveAs()),				ac );
+	KStdAction::close(				this, TQT_SLOT(slotViewClose()),				ac );
+    KStdAction::print(				this, TQT_SLOT(slotFilePrint()),				ac );
+    KStdAction::quit(				this, TQT_SLOT(slotFileQuit()),					ac );
+	KStdAction::undo(				this, TQT_SLOT(slotEditUndo()),					ac );
+	KStdAction::redo(				this, TQT_SLOT(slotEditRedo()),					ac );
+	KStdAction::cut(				this, TQT_SLOT(slotEditCut()),					ac );
+	KStdAction::copy(				this, TQT_SLOT(slotEditCopy()),					ac );
+	KStdAction::paste(				this, TQT_SLOT(slotEditPaste()),				ac );
+	KStdAction::keyBindings(		this, TQT_SLOT(slotOptionsConfigureKeys()),		ac );
+	KStdAction::configureToolbars(	this, TQT_SLOT(slotOptionsConfigureToolbars()),	ac );
+	KStdAction::preferences(		this, TQT_SLOT(slotOptionsPreferences()),		ac );
 	
 	//BEGIN New file popup
-	TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
+	TDEToolBarPopupAction *p = new TDEToolBarPopupAction( i18n("&New"), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT(slotFileNew()), ac, "newfile_popup" );
 	p->popupMenu()->insertTitle( i18n("New File") );
-	(new TDEAction( i18n("Assembly"), "text-x-src", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
-	(new TDEAction( i18n("C source"), "text-x-csrc", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
-	(new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
-	(new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Assembly"), "text-x-src", 0, this, TQT_SLOT(slotFileNewAssembly()), ac, "newfile_asm" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("C source"), "text-x-csrc", 0, this, TQT_SLOT(slotFileNewC()), ac, "newfile_c" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Circuit"), "ktechlab_circuit", 0, this, TQT_SLOT(slotFileNewCircuit()), ac, "newfile_circuit" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("FlowCode"), "ktechlab_flowcode", 0, this, TQT_SLOT(slotFileNewFlowCode()), ac, "newfile_flowcode" ))->plug( p->popupMenu() );
 #ifdef MECHANICS
-	(new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
+	(new TDEAction( i18n("Mechanics"), "ktechlab_mechanics", 0, this, TQT_SLOT(slotFileNewMechanics()), ac, "newfile_mechanics" ))->plug( p->popupMenu() );
 #endif
-	(new TDEAction( "Microbe", "ktechlab_microbe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
+	(new TDEAction( "Microbe", "ktechlab_microbe", 0, this, TQT_SLOT(slotFileNewMicrobe()), ac, "newfile_microbe" ))->plug( p->popupMenu() );
 	//END New File popup
 	
 
-// 	m_recentFiles = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT(load(const KURL&)), ac );
-	m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), TQT_TQOBJECT(this), TQT_SLOT(load(const KURL &)), ac, "file_open_recent" );
-    m_statusbarAction = KStdAction::showStatusbar( TQT_TQOBJECT(this), TQT_SLOT(slotOptionsShowStatusbar()), ac );
+// 	m_recentFiles = KStdAction::openRecent( this, TQT_SLOT(load(const KURL&)), ac );
+	m_recentFiles = new RecentFilesAction( "Recent Files", i18n("Open Recent"), this, TQT_SLOT(load(const KURL &)), ac, "file_open_recent" );
+    m_statusbarAction = KStdAction::showStatusbar( this, TQT_SLOT(slotOptionsShowStatusbar()), ac );
 	
 	//BEGIN Project Actions
 	ProjectManager *pm = ProjectManager::self(this);
-	new TDEAction( i18n("New Project.."), "window-new",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotNewProject()),			ac, 	"project_new" );
-	new TDEAction( i18n("Open Project..."), "project_open",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotOpenProject()),			ac, 	"project_open" );
+	new TDEAction( i18n("New Project.."), "window-new",			0, pm, TQT_SLOT(slotNewProject()),			ac, 	"project_new" );
+	new TDEAction( i18n("Open Project..."), "project_open",		0, pm, TQT_SLOT(slotOpenProject()),			ac, 	"project_open" );
 // 	m_recentProjects = new TDERecentFilesAction( i18n("Open &Recent Project..."), 0, ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
-	m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), TQT_TQOBJECT(ProjectManager::self()), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
-	new TDEAction( i18n("Export to Makefile..."), "fileexport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotExportToMakefile()),		ac, "project_export_makefile" );
-	new TDEAction( i18n("Create Subproject..."), 0,				0, TQT_TQOBJECT(pm), TQT_SLOT(slotCreateSubproject()),		ac, "project_create_subproject" );
-	new TDEAction( i18n("Add Existing File..."), "document-open",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddFile()),					ac, "project_add_existing_file" );
-	new TDEAction( i18n("Add Current File..."), "fileimport",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotAddCurrentFile()),			ac, "project_add_current_file" );
-// 	new TDEAction( i18n("Project Options"), "configure",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotProjectOptions()),			ac, "project_options" );
-	new TDEAction( i18n("Close Project"), "window-close",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotCloseProject()),			ac, "project_close" );
-	new TDEAction( i18n("Remove from Project"), "edit-delete",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotRemoveSelected()),			ac, "project_remove_selected" );
-	new TDEAction( i18n("Insert Existing File..."), "document-open",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddExistingFile()),	ac, "subproject_add_existing_file" );
-	new TDEAction( i18n("Insert Current File..."), "fileimport",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
-	new TDEAction( i18n("Linker Options..."), "configure",		0, TQT_TQOBJECT(pm), TQT_SLOT(slotSubprojectLinkerOptions()),	ac, "project_item_linker_options" );
-	new TDEAction( i18n("Build..."), "launch",					0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemBuild()),				ac, "project_item_build" );
-	new TDEAction( i18n("Upload..."), "convert_to_pic",			0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemUpload()),				ac, "project_item_upload" );
-	new TDEAction( i18n("Processing Options..."), "configure",	0, TQT_TQOBJECT(pm), TQT_SLOT(slotItemProcessingOptions()),	ac, "project_item_processing_options" );
+	m_recentProjects = new RecentFilesAction( "Recent Projects", i18n("Open &Recent Project..."), ProjectManager::self(), TQT_SLOT(slotOpenProject(const KURL&)), ac, "project_open_recent" );
+	new TDEAction( i18n("Export to Makefile..."), "fileexport",	0, pm, TQT_SLOT(slotExportToMakefile()),		ac, "project_export_makefile" );
+	new TDEAction( i18n("Create Subproject..."), 0,				0, pm, TQT_SLOT(slotCreateSubproject()),		ac, "project_create_subproject" );
+	new TDEAction( i18n("Add Existing File..."), "document-open",		0, pm, TQT_SLOT(slotAddFile()),					ac, "project_add_existing_file" );
+	new TDEAction( i18n("Add Current File..."), "fileimport",		0, pm, TQT_SLOT(slotAddCurrentFile()),			ac, "project_add_current_file" );
+// 	new TDEAction( i18n("Project Options"), "configure",			0, pm, TQT_SLOT(slotProjectOptions()),			ac, "project_options" );
+	new TDEAction( i18n("Close Project"), "window-close",			0, pm, TQT_SLOT(slotCloseProject()),			ac, "project_close" );
+	new TDEAction( i18n("Remove from Project"), "edit-delete",		0, pm, TQT_SLOT(slotRemoveSelected()),			ac, "project_remove_selected" );
+	new TDEAction( i18n("Insert Existing File..."), "document-open",	0, pm, TQT_SLOT(slotSubprojectAddExistingFile()),	ac, "subproject_add_existing_file" );
+	new TDEAction( i18n("Insert Current File..."), "fileimport",	0, pm, TQT_SLOT(slotSubprojectAddCurrentFile()),ac, "subproject_add_current_file" );
+	new TDEAction( i18n("Linker Options..."), "configure",		0, pm, TQT_SLOT(slotSubprojectLinkerOptions()),	ac, "project_item_linker_options" );
+	new TDEAction( i18n("Build..."), "launch",					0, pm, TQT_SLOT(slotItemBuild()),				ac, "project_item_build" );
+	new TDEAction( i18n("Upload..."), "convert_to_pic",			0, pm, TQT_SLOT(slotItemUpload()),				ac, "project_item_upload" );
+	new TDEAction( i18n("Processing Options..."), "configure",	0, pm, TQT_SLOT(slotItemProcessingOptions()),	ac, "project_item_processing_options" );
 	//END Project Actions
 	
-	new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
-	new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
+	new TDEAction( i18n("Split View Left/Right"), "view_right", TQt::CTRL|TQt::SHIFT|TQt::Key_L, this, TQT_SLOT(slotViewSplitLeftRight()), ac, "view_split_leftright" );
+	new TDEAction( i18n("Split View Top/Bottom"), "view_bottom", TQt::CTRL|TQt::SHIFT|TQt::Key_T, this, TQT_SLOT(slotViewSplitTopBottom()), ac, "view_split_topbottom" );
 	
 	TDEToggleAction * ta = new TDEToggleAction( i18n("Run Simulation"), "media-playback-start", TQt::Key_F10, 0, 0, ac, "simulation_run" );
 	ta->setChecked(true);
@@ -504,7 +504,7 @@ void KTechlab::slotViewContainerActivated( TQWidget * viewContainer )
 
 void KTechlab::slotViewContainerDestroyed( TQObject * object )
 {
-	m_viewContainerList.remove( static_cast<ViewContainer*>(TQT_TQWIDGET(object)) );
+	m_viewContainerList.remove( static_cast<ViewContainer*>(object) );
 	m_viewContainerList.remove( (ViewContainer*)0 );
 	slotUpdateTabWidget();
 }
@@ -563,7 +563,7 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e )
 	dropMenu.insertSeparator();
 	dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "process-stop", TDEIcon::Small ), i18n("C&ancel"), 2 );
 	
-	connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) );
+	connect( &dropMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDragContextActivated(int)) );
 // 	dropMenu.exec(e->pos() + widget->pos() );
 	dropMenu.exec( TQCursor::pos() );
 }
@@ -776,7 +776,7 @@ void KTechlab::slotOptionsPreferences()
 	
 	// User edited the configuration - update your local copies of the
 	// configuration data
-	connect( dialog, TQT_SIGNAL(settingsChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotUpdateConfiguration()) );
+	connect( dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotUpdateConfiguration()) );
 	dialog->show();
 }
 
@@ -834,7 +834,7 @@ void KTechlab::slotTabContext( TQWidget* widget,const TQPoint & pos )
 		}
 	}
 	
-	connect( tabMenu, TQT_SIGNAL( activated(int) ), TQT_TQOBJECT(this), TQT_SLOT(slotTabContextActivated(int)) );
+	connect( tabMenu, TQT_SIGNAL( activated(int) ), this, TQT_SLOT(slotTabContextActivated(int)) );
 
 	tabMenu->exec(pos);
 	delete tabMenu;
diff --git a/src/textview.cpp b/src/textview.cpp
index c06c3c3..19049c8 100644
--- a/src/textview.cpp
+++ b/src/textview.cpp
@@ -74,7 +74,7 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u
 	
 #ifndef NO_GPSIM
 	//BEGIN Debug Actions
-	new TDEAction( i18n("Set &Breakpoint"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
+	new TDEAction( i18n("Set &Breakpoint"), 0, 0, this, TQT_SLOT(toggleBreakpoint()), ac, "debug_toggle_breakpoint" );
 	new TDEAction( i18n("Run"), "dbgrun", 0, textDocument, TQT_SLOT(debugRun()), ac, "debug_run" );
 	new TDEAction( i18n("Interrupt"), "media-playback-pause", 0, textDocument, TQT_SLOT(debugInterrupt()), ac, "debug_interrupt" );
 	new TDEAction( i18n("Stop"), "process-stop", 0, textDocument, TQT_SLOT(debugStop()), ac, "debug_stop" );
diff --git a/src/viewcontainer.cpp b/src/viewcontainer.cpp
index 7191d74..2a7492f 100644
--- a/src/viewcontainer.cpp
+++ b/src/viewcontainer.cpp
@@ -436,7 +436,7 @@ ViewArea *ViewArea::createViewArea( Position position, uint id )
 
 void ViewArea::viewAreaDestroyed( TQObject *obj )
 {
-	ViewArea *viewArea = static_cast<ViewArea*>(TQT_TQWIDGET(obj));
+	ViewArea *viewArea = static_cast<ViewArea*>(obj);
 	
 	if ( viewArea == p_viewArea1 )
 		p_viewArea1 = 0l;