Remove various '#define' strings - part 6

Signed-off-by: Michele Calgaro <[email protected]>

6 files changed, 89 insertions, 89 deletions

diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index 0920928b..7a82eb1e 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -260,14 +260,14 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 
 	//get informed
 	connect(&Kexi::partManager(),TQT_SIGNAL(partLoaded(KexiPart::Part*)),this,TQT_SLOT(slotPartLoaded(KexiPart::Part*)));
-	connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), TQT_TQOBJECT(this), TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) );
-	connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), TQT_TQOBJECT(this), TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*)));
-//	connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildFrmClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildFrmClosed()));
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(lastChildViewClosed()), TQT_TQOBJECT(this), TQT_SLOT(slotLastChildViewClosed()));
+	connect( m_pMdi, TQT_SIGNAL(nowMaximized(bool)), this, TQT_SLOT(slotCaptionForCurrentMDIChild(bool)) );
+	connect( m_pMdi, TQT_SIGNAL(noMaximizedChildFrmLeft(KMdiChildFrm*)), this, TQT_SLOT(slotNoMaximizedChildFrmLeft(KMdiChildFrm*)));
+//	connect( this, TQT_SIGNAL(lastChildFrmClosed()), this, TQT_SLOT(slotLastChildFrmClosed()));
+	connect( this, TQT_SIGNAL(lastChildViewClosed()), this, TQT_SLOT(slotLastChildViewClosed()));
 
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*)));
-	connect( TQT_TQOBJECT(this), TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode)));
+	connect( this, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(slotChildViewIsDetachedNow(TQWidget*)));
+	connect( this, TQT_SIGNAL(mdiModeHasBeenChangedTo(KMdi::MdiMode)),
+		this, TQT_SLOT(slotMdiModeHasBeenChangedTo(KMdi::MdiMode)));
 
 
 	//if (!userMode()) {
@@ -295,7 +295,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 			//kdDebug() << "name=" <<it.current()->name() << " cname="<<it.current()->className()<<endl;
 			//KexiMainWindowImpl::eventFilter() will filter our popups:
 			it.current()->installEventFilter(this);
-			d->popups.insert(it.current()->name(), static_cast<TQPopupMenu*>(TQT_TQWIDGET(it.current())));
+			d->popups.insert(it.current()->name(), static_cast<TQPopupMenu*>(it.current()));
 		}
 		delete l;
 		d->createMenu = d->popups["create"];
@@ -367,7 +367,7 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 		                     // when initially the main window is empty
 		TQToolTip::add(closeButton, 
 			i18n("Close the current tab page in Kexi tab interface", "Close the current tab"));
-		TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), TQT_TQOBJECT(this), TQT_SLOT( closeActiveView() ) );
+		TQObject::connect( closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeActiveView() ) );
 	}
 
 #ifdef KEXI_ADD_CUSTOM_KEXIMAINWINDOWIMPL
@@ -406,7 +406,7 @@ void KexiMainWindowImpl::setWindowMenu(TQPopupMenu *menu)
 		menuBar()->insertItem(txt, m_pWindowMenu, id, count-3);
 	}
 	m_pWindowMenu->setCheckable(true);
-	TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(fillWindowMenu()) );
+	TQObject::connect( m_pWindowMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(fillWindowMenu()) );
 }
 
 void KexiMainWindowImpl::fillWindowMenu()
@@ -521,26 +521,26 @@ void KexiMainWindowImpl::initActions()
 //	setupGUI(TDEMainWindow::Keys|TDEMainWindow::StatusBar|TDEMainWindow::Save|TDEMainWindow::Create);
 
 //	d->actionMapper = new TQSignalMapper(this, "act_map");
-//	connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotAction(const TQString &)));
+//	connect(d->actionMapper, TQT_SIGNAL(mapped(const TQString &)), this, TQT_SLOT(slotAction(const TQString &)));
 
 	// PROJECT MENU
 	TDEAction *action = new TDEAction(i18n("&New..."), "document-new", TDEStdAccel::shortcut(TDEStdAccel::New),
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectNew()), actionCollection(), "project_new");
+		this, TQT_SLOT(slotProjectNew()), actionCollection(), "project_new");
 	action->setToolTip(i18n("Create a new project"));
 	action->setWhatsThis(i18n("Creates a new project. Currently opened project is not affected."));
 
-	action = KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" );
+	action = KStdAction::open( this, TQT_SLOT( slotProjectOpen() ), actionCollection(), "project_open" );
 	action->setToolTip(i18n("Open an existing project"));
 	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));
 
 #ifdef HAVE_TDENEWSTUFF
 	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
-		TQT_TQOBJECT(this), TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
+		this, TQT_SLOT(slotGetNewStuff()), actionCollection(), "project_download_examples");
 	action->setToolTip(i18n("Download example databases from the Internet"));
 	action->setWhatsThis(i18n("Downloads example databases from the Internet."));
 #endif
 
-//	d->action_open_recent = KStdAction::openRecent( TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" );
+//	d->action_open_recent = KStdAction::openRecent( this, TQT_SLOT(slotProjectOpenRecent(const KURL&)), actionCollection(), "project_open_recent" );
 
 //#ifdef KEXI_SHOW_UNIMPLEMENTED
 #ifndef KEXI_NO_UNFINISHED
@@ -556,42 +556,42 @@ void KexiMainWindowImpl::initActions()
 //		d->action_open_recent->popupMenu()->insertTitle(i18n("Recently Connected Database Servers"));
 //	d->action_open_recent->popupMenu()->insertSeparator();
 //	d->action_open_recent_more_id = d->action_open_recent->popupMenu()
-//		->insertItem(i18n("&More Projects..."), TQT_TQOBJECT(this), TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000);
+//		->insertItem(i18n("&More Projects..."), this, TQT_SLOT(slotProjectOpenRecentMore()), 0, 1000);
 #else
 	d->action_open_recent = d->dummy_action;
 #endif
 
 	d->action_save = KStdAction::save( 
-		TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" );
+		this, TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" );
 //	d->action_save = new TDEAction(i18n("&Save"), "document-save", TDEStdAccel::shortcut(TDEStdAccel::Save),
-//		TQT_TQOBJECT(this), TQT_SLOT(slotProjectSave()), actionCollection(), "project_save");
+//		this, TQT_SLOT(slotProjectSave()), actionCollection(), "project_save");
 	d->action_save->setToolTip(i18n("Save object changes"));
 	d->action_save->setWhatsThis(i18n("Saves object changes from currently selected window."));
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
 	d->action_save_as = new TDEAction(i18n("Save &As..."), "document-save-as", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas");
+		this, TQT_SLOT(slotProjectSaveAs()), actionCollection(), "project_saveas");
 	d->action_save_as->setToolTip(i18n("Save object as"));
 	d->action_save_as->setWhatsThis(
 		i18n("Saves object changes from currently selected window under a new name (within the same project)."));
 
 	d->action_project_properties = new TDEAction(i18n("Project Properties"), "application-vnd.tde.info", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties");
+		this, TQT_SLOT(slotProjectProperties()), actionCollection(), "project_properties");
 #else
 	d->action_save_as = d->dummy_action;
 	d->action_project_properties = d->dummy_action;
 #endif
 
 	d->action_close = new TDEAction(i18n("&Close Project"), "window-close", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" );
+		this, TQT_SLOT(slotProjectClose()), actionCollection(), "project_close" );
 	d->action_close->setToolTip(i18n("Close the current project"));
 	d->action_close->setWhatsThis(i18n("Closes the current project."));
 
-	KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit");
+	KStdAction::quit( this, TQT_SLOT(slotProjectQuit()), actionCollection(), "quit");
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
 	d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R,
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations");
+		this, TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations");
 	d->action_project_relations->setToolTip(i18n("Project relationships"));
 	d->action_project_relations->setWhatsThis(i18n("Shows project relationships."));
 
@@ -600,13 +600,13 @@ void KexiMainWindowImpl::initActions()
 #endif
 	d->action_tools_data_migration = new TDEAction(
 		i18n("&Import Database..."), "database_import", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project");
+		this, TQT_SLOT(slotToolsProjectMigration()), actionCollection(), "tools_import_project");
 	d->action_tools_data_migration->setToolTip(i18n("Import entire database as a Kexi project"));
 	d->action_tools_data_migration->setWhatsThis(i18n("Imports entire database as a Kexi project."));
 
 	d->action_tools_compact_database = new TDEAction(
 		i18n("&Compact Database..."), "", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database");
+		this, TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database");
 	d->action_tools_compact_database->setToolTip(i18n("Compact the current database project"));
 	d->action_tools_compact_database->setWhatsThis(
 		i18n("Compacts the current database project, so it will take less space and work faster."));
@@ -617,7 +617,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_project_import_data_table = new TDEAction(
 			i18n("Import->Table Data From File...", "Table Data From &File..."),
 			"table"/*! @todo: change to "file_import" or so*/,
-			0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectImportDataTable()), actionCollection(), 
+			0, this, TQT_SLOT(slotProjectImportDataTable()), actionCollection(), 
 			"project_import_data_table");
 		d->action_project_import_data_table->setToolTip(i18n("Import table data from a file"));
 		d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file."));
@@ -626,7 +626,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_project_export_data_table = new TDEAction(i18n("Export->Table or Query Data to File...", 
 		"Table or Query Data to &File..."),
 		"table"/*! @todo: change to "file_export" or so*/,
-		0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectExportDataTable()), actionCollection(), 
+		0, this, TQT_SLOT(slotProjectExportDataTable()), actionCollection(), 
 		"project_export_data_table");
 	d->action_project_export_data_table->setToolTip(
 		i18n("Export data from the active table or query data to a file"));
@@ -634,17 +634,17 @@ void KexiMainWindowImpl::initActions()
 		i18n("Exports data from the active table or query data to a file."));
 
 //TODO	new TDEAction(i18n("From File..."), "document-open", 0,
-//TODO		TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file");
+//TODO		this, TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file");
 //TODO	new TDEAction(i18n("From Server..."), "server", 0,
-//TODO		TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server");
+//TODO		this, TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server");
 
-	d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()),
+	d->action_project_print = KStdAction::print(this, TQT_SLOT(slotProjectPrint()),
 		actionCollection(), "project_print" ); 
 	d->action_project_print->setToolTip(i18n("Print data from the active table or query"));
 	d->action_project_print->setWhatsThis(i18n("Prints data from the active table or query."));
 
 	d->action_project_print_preview = KStdAction::printPreview(
-		TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrintPreview()),
+		this, TQT_SLOT(slotProjectPrintPreview()),
 		actionCollection(), "project_print_preview" ); 
 	d->action_project_print_preview->setToolTip(
 		i18n("Show print preview for the active table or query"));
@@ -652,7 +652,7 @@ void KexiMainWindowImpl::initActions()
 		i18n("Shows print preview for the active table or query."));
 
 	d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."),
-		"", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), 
+		"", 0, this, TQT_SLOT(slotProjectPageSetup()), actionCollection(), 
 		"project_print_setup");
 	d->action_project_print_setup->setToolTip(
 		i18n("Show page setup for printing the active table or query"));
@@ -669,7 +669,7 @@ void KexiMainWindowImpl::initActions()
 	else {
 		d->action_edit_paste_special_data_table = 
 			new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."),
-			"table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()),
+			"table", 0, this, TQT_SLOT(slotEditPasteSpecialDataTable()),
 			actionCollection(), "edit_paste_special_data_table");
 		d->action_edit_paste_special_data_table->setToolTip(
 			i18n("Paste clipboard data as a table"));
@@ -680,7 +680,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_edit_copy_special_data_table =
 		new TDEAction(i18n("Copy Special->Table or Query Data...", 
 			"Table or Query as Data Table..."),
-		"table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()),
+		"table", 0, this, TQT_SLOT(slotEditCopySpecialDataTable()),
 		actionCollection(), "edit_copy_special_data_table");
 	d->action_edit_copy_special_data_table->setToolTip(
 		i18n("Copy selected table or query data to clipboard"));
@@ -700,18 +700,18 @@ void KexiMainWindowImpl::initActions()
 #endif
 
 	d->action_edit_find = KStdAction::find(
-		TQT_TQOBJECT(this), TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" );
+		this, TQT_SLOT(slotEditFind()), actionCollection(), "edit_find" );
 //	d->action_edit_find = createSharedAction( KStdAction::Find, "edit_find");
 	d->action_edit_findnext = KStdAction::findNext(
-		TQT_TQOBJECT(this), TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext");
+		this, TQT_SLOT(slotEditFindNext()), actionCollection(), "edit_findnext");
 	d->action_edit_findprev = KStdAction::findPrev(
-		TQT_TQOBJECT(this), TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious");
+		this, TQT_SLOT(slotEditFindPrevious()), actionCollection(), "edit_findprevious");
 	d->action_edit_replace = 0;
 //! @todo	d->action_edit_replace = KStdAction::replace(
-//!		TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); 
+//!		this, TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); 
 	d->action_edit_replace_all = 0;
 //! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, 
-//!   TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
+//!   this, TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
 
 	d->action_edit_select_all =  createSharedAction( KStdAction::SelectAll, "edit_select_all");
 
@@ -745,7 +745,7 @@ void KexiMainWindowImpl::initActions()
 	//VIEW MENU
 	if (!userMode()) {
 		d->action_view_data_mode = new TDERadioAction(i18n("&Data View"), "state_data", TQt::Key_F6,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode");
+			this, TQT_SLOT(slotViewDataMode()), actionCollection(), "view_data_mode");
 		d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode );
 		d->action_view_data_mode->setExclusiveGroup("view_mode");
 		d->action_view_data_mode->setToolTip(i18n("Switch to data view"));
@@ -756,7 +756,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (!userMode()) {
 		d->action_view_design_mode = new TDERadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode");
+			this, TQT_SLOT(slotViewDesignMode()), actionCollection(), "view_design_mode");
 		d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode );
 		d->action_view_design_mode->setExclusiveGroup("view_mode");
 		d->action_view_design_mode->setToolTip(i18n("Switch to design view"));
@@ -767,7 +767,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (!userMode()) {
 		d->action_view_text_mode = new TDERadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode");
+			this, TQT_SLOT(slotViewTextMode()), actionCollection(), "view_text_mode");
 		d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode );
 		d->action_view_text_mode->setExclusiveGroup("view_mode");
 		d->action_view_text_mode->setToolTip(i18n("Switch to text view"));
@@ -778,7 +778,7 @@ void KexiMainWindowImpl::initActions()
 
 	if (d->isProjectNavigatorVisible) {
 		d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator");
+			this, TQT_SLOT(slotViewNavigator()), actionCollection(), "view_navigator");
 		d->action_view_nav->setToolTip(i18n("Go to project navigator panel"));
 		d->action_view_nav->setWhatsThis(i18n("Goes to project navigator panel."));
 	}
@@ -786,13 +786,13 @@ void KexiMainWindowImpl::initActions()
 		d->action_view_nav = 0;
 
 	d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2,
-		TQT_TQOBJECT(this), TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea");
+		this, TQT_SLOT(slotViewMainArea()), actionCollection(), "view_mainarea");
 	d->action_view_mainarea->setToolTip(i18n("Go to main area"));
 	d->action_view_mainarea->setWhatsThis(i18n("Goes to main area."));
 
 	if (!userMode()) {
 		d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3,
-			TQT_TQOBJECT(this), TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor");
+			this, TQT_SLOT(slotViewPropertyEditor()), actionCollection(), "view_propeditor");
 		d->action_view_propeditor->setToolTip(i18n("Go to property editor panel"));
 		d->action_view_propeditor->setWhatsThis(i18n("Goes to property editor panel."));
 	}
@@ -863,7 +863,7 @@ void KexiMainWindowImpl::initActions()
 #else
 		TQt::ALT+TQt::Key_Right,
 #endif
-		TQT_TQOBJECT(this), TQT_SLOT(activateNextWin()), actionCollection(), "window_next");
+		this, TQT_SLOT(activateNextWin()), actionCollection(), "window_next");
 	d->action_window_next->setToolTip( i18n("Next window") );
 	d->action_window_next->setWhatsThis(i18n("Switches to the next window."));
 
@@ -873,17 +873,17 @@ void KexiMainWindowImpl::initActions()
 #else
 		TQt::ALT+TQt::Key_Left,
 #endif
-		TQT_TQOBJECT(this), TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous");
+		this, TQT_SLOT(activatePrevWin()), actionCollection(), "window_previous");
 	d->action_window_previous->setToolTip( i18n("Previous window") );
 	d->action_window_previous->setWhatsThis(i18n("Switches to the previous window."));
 
 	//SETTINGS MENU
 	setStandardToolBarMenuEnabled( true );
-	action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeys() ), actionCollection() );
+	action = KStdAction::keyBindings(this, TQT_SLOT( slotConfigureKeys() ), actionCollection() );
 	action->setWhatsThis(i18n("Lets you configure shortcut keys."));
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-	action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
+	action = KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
 	action->setWhatsThis(i18n("Lets you configure toolbars."));
 
 	d->action_show_other = new TDEActionMenu(i18n("Other"),
@@ -923,31 +923,31 @@ void KexiMainWindowImpl::initActions()
 #endif
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-	d->action_configure = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings()), actionCollection());
+	d->action_configure = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection());
 	action->setWhatsThis(i18n("Lets you configure Kexi."));
 #endif
 
 	//HELP MENU
 #if 0//js: todo reenable later
-	KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() )
+	KStdAction::tipOfDay( this, TQT_SLOT( slotTipOfTheDayAction() ), actionCollection() )
 		->setWhatsThis(i18n("This shows useful tips on the use of this application."));
 #endif
 #if 0 //we don't have a time for updating info text for each new version
 	new TDEAction(i18n("Important Information"), "messagebox_info", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info");
+		this, TQT_SLOT(slotImportantInfo()), actionCollection(), "help_show_important_info");
 #endif
 //TODO: UNCOMMENT TO REMOVE MDI MODES SETTING	m_pMdiModeMenu->hide();
 
 #ifndef KEXI_NO_FEEDBACK_AGENT
 #ifdef FEEDBACK_CLASS
 	new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0,
-		TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent");
+		this, TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent");
 #endif
 #endif
 //	TDEAction *actionSettings = new TDEAction(i18n("Configure Kexi..."), "configure", 0,
 //	 actionCollection(), "kexi_settings");
 //	actionSettings->setWhatsThis(i18n("Lets you configure Kexi."));
-//	connect(actionSettings, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(slotShowSettings()));
+//	connect(actionSettings, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowSettings()));
 
 	// -- add a few missing tooltips (usable especially in Form's "Assign action" dialog)
 	if ((action = actionCollection()->action("window_close")))
@@ -1126,7 +1126,7 @@ void KexiMainWindowImpl::invalidateSharedActions(TQObject *o)
 	d->action_edit_paste->setEnabled(true);*/
 
 	if (!o)
-		o = TQT_TQOBJECT(focusWindow());
+		o = focusWindow();
 	KexiSharedActionHost::invalidateSharedActions(o);
 }
 
@@ -1138,7 +1138,7 @@ void KexiMainWindowImpl::invalidateSharedActions()
 // unused, I think
 void KexiMainWindowImpl::invalidateSharedActionsLater()
 {
-	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(invalidateSharedActions()));
+	TQTimer::singleShot(1, this, TQT_SLOT(invalidateSharedActions()));
 }
 
 void KexiMainWindowImpl::invalidateProjectWideActions()
@@ -1345,7 +1345,7 @@ tristate KexiMainWindowImpl::openProject(const KexiProjectData& projectData)
 //	d->disableErrorMessages = true;
 	enableMessages( false );
 
-	TQTimer::singleShot(1, TQT_TQOBJECT(this), TQT_SLOT(slotAutoOpenObjectsLater()));
+	TQTimer::singleShot(1, this, TQT_SLOT(slotAutoOpenObjectsLater()));
 	return true;
 }
 
@@ -1721,7 +1721,7 @@ void KexiMainWindowImpl::initNavigator()
 	if(!d->nav)
 	{
 		d->nav = new KexiBrowser(this, this);
-		d->nav->installEventFilter(TQT_TQOBJECT(this));
+		d->nav->installEventFilter(this);
 		d->navToolWindow = addToolWindow(d->nav, KDockWidget::DockLeft, getMainDockWidget(), 20/*, lv, 35, "2"*/);
 //		d->navToolWindow->hide();
 
@@ -1859,7 +1859,7 @@ void KexiMainWindowImpl::slotPartLoaded(KexiPart::Part* p)
 	if (!p)
 		return;
 	connect(p, TQT_SIGNAL(newObjectRequest(KexiPart::Info*)),
-		TQT_TQOBJECT(this), TQT_SLOT(newObject(KexiPart::Info*)));
+		this, TQT_SLOT(newObject(KexiPart::Info*)));
 	p->createGUIClients(this);
 }
 
@@ -2225,11 +2225,11 @@ KexiMainWindowImpl::registerChild(KexiDialogBase *dlg)
 {
 	kdDebug() << "KexiMainWindowImpl::registerChild()" << endl;
 	connect(dlg, TQT_SIGNAL(activated(KMdiChildView *)),
-		TQT_TQOBJECT(this), TQT_SLOT(activeWindowChanged(KMdiChildView *)));
+		this, TQT_SLOT(activeWindowChanged(KMdiChildView *)));
 	connect(dlg, TQT_SIGNAL(dirtyChanged(KexiDialogBase*)),
-		TQT_TQOBJECT(this), TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*)));
+		this, TQT_SLOT(slotDirtyFlagChanged(KexiDialogBase*)));
 
-//	connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), TQT_TQOBJECT(this), TQT_SLOT(childClosed(KMdiChildView *)));
+//	connect(dlg, TQT_SIGNAL(childWindowCloseRequest(KMdiChildView *)), this, TQT_SLOT(childClosed(KMdiChildView *)));
 	if(dlg->id() != -1) {
 		d->insertDialog(dlg);
 	}
@@ -2564,7 +2564,7 @@ KexiMainWindowImpl::slotProjectNew()
 //todo:			pass new_data->caption()
 	//start new instance
 //! @todo use TDEProcess?
-	TQProcess proc(args, TQT_TQOBJECT(this), "process");
+	TQProcess proc(args, this, "process");
 	proc.setCommunication((TQProcess::Communication)0);
 //		proc.setWorkingDirectory( TQFileInfo(new_data->connectionData()->fileName()).dir(true) );
 	proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) );
@@ -2579,9 +2579,9 @@ KexiMainWindowImpl::createKexiProject(KexiProjectData* new_data)
 {
 	d->prj = new KexiProject( new_data, this );
 //	d->prj = ::createKexiProject(new_data);
-//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*)));
-//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(showErrorMessage(const TQString&,const TQString&)));
-	connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), TQT_TQOBJECT(this), TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&)));
+//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,KexiDB::Object*)), this, TQT_SLOT(showErrorMessage(const TQString&,KexiDB::Object*)));
+//provided by KexiMessageHandler	connect(d->prj, TQT_SIGNAL(error(const TQString&,const TQString&)), this, TQT_SLOT(showErrorMessage(const TQString&,const TQString&)));
+	connect(d->prj, TQT_SIGNAL(itemRenamed(const KexiPart::Item&, const TQCString&)), this, TQT_SLOT(slotObjectRenamed(const KexiPart::Item&, const TQCString&)));
 
 	if (d->nav)
 		connect(d->prj, TQT_SIGNAL(itemRemoved(const KexiPart::Item&)), d->nav, TQT_SLOT(slotRemoveItem(const KexiPart::Item&)));
@@ -2783,7 +2783,7 @@ tristate KexiMainWindowImpl::openProjectInExternalKexiInstance(const TQString& a
 	}
 //! @todo use KRun
 	args << fileName;
-	TQProcess proc(args, TQT_TQOBJECT(this), "process");
+	TQProcess proc(args, this, "process");
 	proc.setWorkingDirectory( TQFileInfo(fileName).dir(true) );
 	const bool ok = proc.start();
 	if (!ok) {
@@ -3394,7 +3394,7 @@ void KexiMainWindowImpl::attachWindow(KMdiChildView *pWnd, bool /*bShow*/, bool
 
 TQWidget* KexiMainWindowImpl::findWindow(TQWidget *w)
 {
-	while (w && !acceptsSharedActions(TQT_TQOBJECT(w)))
+	while (w && !acceptsSharedActions(w))
 		w = w->parentWidget();
 	return w;
 }
@@ -3465,14 +3465,14 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 
 	/*! On mouse click on the findow, make sure it's focused and actions are invalidated */
 	if (e->type()==TQEvent::MouseButtonPress) {
-		TQWidget *w = findWindow(TQT_TQWIDGET(obj));
+		TQWidget *w = findWindow(static_cast<TQWidget*>(obj));
 		KexiVDebug << "MouseButtonPress EVENT " <<  (w ? w->name() : 0) << endl;
 		if (w) {
 			w->setFocus();
-			invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+			invalidateSharedActions(d->curDialog);
 		}
 	}
-	TQWidget *w = findWindow(TQT_TQWIDGET(obj));
+	TQWidget *w = findWindow(static_cast<TQWidget*>(obj));
 	if (e->type()==TQEvent::FocusIn) {
 		focus_w = focusWindow();
 		KexiVDebug << "Focus EVENT" << endl;
@@ -3530,15 +3530,15 @@ bool KexiMainWindowImpl::eventFilter( TQObject *obj, TQEvent * e )
 		//d->nav->setFocus();
 		d->focus_before_popup->setFocus();
 		d->focus_before_popup=0;
-		invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+		invalidateSharedActions(d->curDialog);
 		return true;
 	}
 
 	//remember currently focued window invalidate act.
 	if (e->type()==TQEvent::FocusOut) {
 		if (static_cast<TQFocusEvent*>(e)->reason()==TQFocusEvent::Popup) {
-			if (KexiUtils::hasParent(TQT_TQOBJECT(d->curDialog), TQT_TQOBJECT(focus_w))) {
-				invalidateSharedActions(TQT_TQOBJECT(d->curDialog));
+			if (KexiUtils::hasParent(d->curDialog, focus_w)) {
+				invalidateSharedActions(d->curDialog);
 				d->focus_before_popup=d->curDialog;
 			}
 			else {
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index 8b1a66ab..d1eac9f5 100644
--- a/kexi/main/keximainwindowimpl_p.h
+++ b/kexi/main/keximainwindowimpl_p.h
@@ -73,7 +73,7 @@ public:
 		wasAutoOpen = false;
 		dialogExistedBeforeCloseProject = false;
 #ifndef KEXI_SHOW_UNIMPLEMENTED
-		dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd));
+		dummy_action = new TDEActionMenu(TQString(""), wnd);
 #endif
 		maximizeFirstOpenedChildFrm = false;
 #ifdef HAVE_TDENEWSTUFF
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index 51c1e045..bf38c28a 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -85,7 +85,7 @@ void KexiNameWidget::init(
 	le_name = new KLineEdit( nameText, this, "le_name" );
 	le_name->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed,1,0));
 	Validator *idValidator = new IdentifierValidator(0, "id_val");
-	le_name->setValidator( m_validator = new MultiValidator(idValidator, TQT_TQOBJECT(this), "val") );
+	le_name->setValidator( m_validator = new MultiValidator(idValidator, this, "val") );
 	lyr->addWidget( le_name, 2, 1 );
 
 	setFocusProxy(le_caption);
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 404237bb..11cf1114 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -169,28 +169,28 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	lyr->addWidget(m_toolbar);
 
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) );
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPrintClicked()));
+	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrintClicked()));
 	static_cast<KPushButton*>(m_toolbar->getWidget(id))->setAccel(TQt::CTRL|TQt::Key_P);
 	m_toolbar->insertSeparator();
 
 	id = m_toolbar->insertWidget(-1, 0, new KPushButton(i18n("Page Set&up..."), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPageSetup()));
+	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPageSetup()));
 	m_toolbar->insertSeparator();
 
 
 #ifndef KEXI_NO_UNFINISHED 
 //! @todo unfinished
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-in"), i18n("Zoom In"), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomInClicked()));
+	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomInClicked()));
 	m_toolbar->insertSeparator();
 
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("zoom-out"), i18n("Zoom Out"), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotZoomOutClicked()));
+	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotZoomOutClicked()));
 	m_toolbar->insertSeparator();
 #endif
 
 	id = m_toolbar->insertWidget(-1, 0, new KPushButton(KStdGuiItem::close(), m_toolbar));
-	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(close()));
+	m_toolbar->addConnection(id, TQT_SIGNAL(clicked()), this, TQT_SLOT(close()));
 	m_toolbar->alignItemRight(id);
 
 	m_scrollView = new KexiSimplePrintPreviewScrollView(this);
@@ -214,29 +214,29 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	m_navToolbar->setIconText(TDEToolBar::IconTextRight);
 
 	m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-first"), i18n("First Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked()));
+	m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFirstClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idPrevious = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-previous"), i18n("Previous Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotPreviousClicked()));
+	m_navToolbar->addConnection(m_idPrevious, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPreviousClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idPageNumberLabel = m_navToolbar->insertWidget( -1, 0, new TQLabel(m_navToolbar));
 	m_navToolbar->insertSeparator();
 
 	m_idNext = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-next"), i18n("Next Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotNextClicked()));
+	m_navToolbar->addConnection(m_idNext, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked()));
 	m_navToolbar->insertSeparator();
 
 	m_idLast = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("go-last"), i18n("Last Page"), m_navToolbar));
-	m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotLastClicked()));
+	m_navToolbar->addConnection(m_idLast, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLastClicked()));
 	m_navToolbar->insertSeparator();
 
 	resize(width(), kapp->desktop()->height()*4/5);
 
 //! @todo progress bar...
 
-	TQTimer::singleShot(50, TQT_TQOBJECT(this), TQT_SLOT(initLater()));
+	TQTimer::singleShot(50, this, TQT_SLOT(initLater()));
 }
 
 void KexiSimplePrintPreviewWindow::initLater()
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 26d9cc64..2b1f4026 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -188,7 +188,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	connect(m_server_db_name->le_dbname, TQT_SIGNAL(returnPressed()),
 		this,TQT_SLOT(accept()));
 	m_server_db_name->le_caption->setText(i18n("New database"));
-	m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this), "id_val"));
+	m_server_db_name->le_dbname->setValidator(new KexiUtils::IdentifierValidator(this, "id_val"));
 	m_project_selector = new KexiProjectSelectorWidget(
 		m_server_db_name->frm_dblist, "KexiProjectSelectorWidget", 0, false, false );
 	GLUE_WIDGET(m_project_selector, m_server_db_name->frm_dblist);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 61aa0735..a5c6f958 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -60,7 +60,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 		TQObject *obj;
 		while ( (obj = it.current()) != 0 ) {
 			++it;
-			static_cast<TQPushButton*>(TQT_TQWIDGET(obj))->hide();
+			static_cast<TQPushButton*>(obj)->hide();
 		}
 		delete l;
 	}
@@ -70,7 +70,7 @@ KexiStartupFileDialog::KexiStartupFileDialog(
 		TQObject *obj;
 		while ( (obj = it.current()) != 0 ) {
 			++it;
-			TQT_TQWIDGET(obj)->installEventFilter(this);
+			static_cast<TQWidget*>(obj)->installEventFilter(this);
 		}
 		delete l;
 	}