Rename a number of classes to enhance compatibility with KDE4

15 files changed, 102 insertions, 102 deletions

diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 80f3c83e..8ca17429 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -49,7 +49,7 @@ class KexiFindDialog::Private
 		//! Connects action \a action with appropriate signal \a member
 		//! and optionally adds accel that will receive shortcut for \a action 
 		//! at global scope of the dialog \a parent.
-		void setActionAndAccel(KAction *action, TQWidget* parent, const char* member)
+		void setActionAndAccel(TDEAction *action, TQWidget* parent, const char* member)
 		{
 			if (!action)
 				return;
@@ -65,10 +65,10 @@ class KexiFindDialog::Private
 		TQStringList lookInColumnNames;
 		TQStringList lookInColumnCaptions;
 		TQString objectName; //!< for caption
-		TQGuardedPtr<KAction> findnextAction;
-		TQGuardedPtr<KAction> findprevAction;
-		TQGuardedPtr<KAction> replaceAction;
-		TQGuardedPtr<KAction> replaceallAction;
+		TQGuardedPtr<TDEAction> findnextAction;
+		TQGuardedPtr<TDEAction> findprevAction;
+		TQGuardedPtr<TDEAction> replaceAction;
+		TQGuardedPtr<TDEAction> replaceallAction;
 		TQPtrList<TQAccel> accels;
 		bool replaceMode : 1;
 };
@@ -84,7 +84,7 @@ KexiFindDialog::KexiFindDialog( TQWidget* parent )
 	m_search->setCurrentItem((int)KexiSearchAndReplaceViewInterface::Options::SearchDown);
 	layout()->setMargin( KDialog::marginHint() );
 	layout()->setSpacing( KDialog::spacingHint() );
-	KAction *a = KStdAction::findNext(0, 0, 0);
+	TDEAction *a = KStdAction::findNext(0, 0, 0);
 	m_btnFind->setText(a->text());
 	m_btnFind->setIconSet(a->iconSet());
 	delete a;
@@ -109,8 +109,8 @@ KexiFindDialog::~KexiFindDialog()
 	delete d;
 }
 
-void KexiFindDialog::setActions( KAction *findnext, KAction *findprev,
-	KAction *replace, KAction *replaceall )
+void KexiFindDialog::setActions( TDEAction *findnext, TDEAction *findprev,
+	TDEAction *replace, TDEAction *replaceall )
 {
 	d->findnextAction = findnext;
 	d->findprevAction = findprev;
diff --git a/kexi/main/kexifinddialog.h b/kexi/main/kexifinddialog.h
index d93ac703..b0a5cac1 100644
--- a/kexi/main/kexifinddialog.h
+++ b/kexi/main/kexifinddialog.h
@@ -23,7 +23,7 @@
 #include "kexifinddialogbase.h"
 #include <core/kexisearchandreplaceiface.h>
 
-class KAction;
+class TDEAction;
 
 //! @short A Kexi-specific "Find text" dialog.
 /*! Also used for as replace dialog. 
@@ -41,8 +41,8 @@ class KexiFindDialog : public KexiFindDialogBase
 		virtual ~KexiFindDialog();
 
 		//! Sets actions that receive button clicks and shortcuts within the dialog. Should be called once.
-		void setActions( KAction *findnext, KAction *findprev,
-			KAction *replace, KAction *replaceall );
+		void setActions( TDEAction *findnext, TDEAction *findprev,
+			TDEAction *replace, TDEAction *replaceall );
 
 		//! Shows the dialog as a modal dialog. 
 		virtual void show();
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index ce29b32e..4bfaef61 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -316,13 +316,13 @@ KexiMainWindowImpl::KexiMainWindowImpl()
 //disabled (possible crash)	d->hideMenuItem("file", i18n("&Import"), true);
 //disabled (possible crash)	d->hideMenuItem("help", i18n( "&Report Bug..." ), true);
 #endif
-	KAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0;
+	TDEAction *tdemdi_tooldock_menu_action = childClients()->getFirst() ? childClients()->getFirst()->actionCollection()->action("tdemdi_tooldock_menu") : 0;
 	if (tdemdi_tooldock_menu_action) {
 		tdemdi_tooldock_menu_action->setEnabled(false);
 	}
 
 	if (!isFakingSDIApplication()/* && !userMode()*/) {
-//		TQPopupMenu *menu = (TQPopupMenu*) child( "window", "KPopupMenu" );
+//		TQPopupMenu *menu = (TQPopupMenu*) child( "window", "TDEPopupMenu" );
 		TQPopupMenu *menu = d->popups["window"];
 		unsigned int count = menuBar()->count();
 		if (menu)
@@ -506,7 +506,7 @@ TQPopupMenu* KexiMainWindowImpl::findPopupMenu(const char *popupName)
 	return d->popups[popupName];
 }
 
-KActionPtrList KexiMainWindowImpl::allActions() const
+TDEActionPtrList KexiMainWindowImpl::allActions() const
 {
 	return actionCollection()->actions();
 }
@@ -518,13 +518,13 @@ KexiDialogBase* KexiMainWindowImpl::currentDialog() const
 
 void KexiMainWindowImpl::initActions()
 {
-//	setupGUI(KMainWindow::Keys|KMainWindow::StatusBar|KMainWindow::Save|KMainWindow::Create);
+//	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 &)));
 
 	// PROJECT MENU
-	KAction *action = new KAction(i18n("&New..."), "filenew", KStdAccel::shortcut(KStdAccel::New),
+	TDEAction *action = new TDEAction(i18n("&New..."), "filenew", TDEStdAccel::shortcut(TDEStdAccel::New),
 		TQT_TQOBJECT(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."));
@@ -534,7 +534,7 @@ void KexiMainWindowImpl::initActions()
 	action->setWhatsThis(i18n("Opens an existing project. Currently opened project is not affected."));
 
 #ifdef HAVE_KNEWSTUFF
-	action = new KAction(i18n("&Download Example Databases..."), "kget", KShortcut(0),
+	action = new TDEAction(i18n("&Download Example Databases..."), "kget", TDEShortcut(0),
 		TQT_TQOBJECT(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."));
@@ -544,7 +544,7 @@ void KexiMainWindowImpl::initActions()
 
 //#ifdef KEXI_SHOW_UNIMPLEMENTED
 #ifndef KEXI_NO_UNFINISHED
-	d->action_open_recent = new KActionMenu(i18n("Open Recent"),
+	d->action_open_recent = new TDEActionMenu(i18n("Open Recent"),
 		actionCollection(), "project_open_recent");
 	connect(d->action_open_recent->popupMenu(),TQT_SIGNAL(activated(int)),
 		this,TQT_SLOT(slotProjectOpenRecent(int)));
@@ -563,26 +563,26 @@ void KexiMainWindowImpl::initActions()
 
 	d->action_save = KStdAction::save( 
 		TQT_TQOBJECT(this), TQT_SLOT( slotProjectSave() ), actionCollection(), "project_save" );
-//	d->action_save = new KAction(i18n("&Save"), "filesave", KStdAccel::shortcut(KStdAccel::Save),
+//	d->action_save = new TDEAction(i18n("&Save"), "filesave", TDEStdAccel::shortcut(TDEStdAccel::Save),
 //		TQT_TQOBJECT(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 KAction(i18n("Save &As..."), "filesaveas", 0,
+	d->action_save_as = new TDEAction(i18n("Save &As..."), "filesaveas", 0,
 		TQT_TQOBJECT(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 KAction(i18n("Project Properties"), "info", 0,
+	d->action_project_properties = new TDEAction(i18n("Project Properties"), "info", 0,
 		TQT_TQOBJECT(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 KAction(i18n("&Close Project"), "fileclose", 0,
+	d->action_close = new TDEAction(i18n("&Close Project"), "fileclose", 0,
 		TQT_TQOBJECT(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."));
@@ -590,7 +590,7 @@ void KexiMainWindowImpl::initActions()
 	KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT(slotProjectQuit()), actionCollection(), "quit");
 
 #ifdef KEXI_SHOW_UNIMPLEMENTED
-	d->action_project_relations = new KAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R,
+	d->action_project_relations = new TDEAction(i18n("&Relationships..."), "relation", TQt::CTRL + TQt::Key_R,
 		TQT_TQOBJECT(this), TQT_SLOT(slotProjectRelations()), actionCollection(), "project_relations");
 	d->action_project_relations->setToolTip(i18n("Project relationships"));
 	d->action_project_relations->setWhatsThis(i18n("Shows project relationships."));
@@ -598,13 +598,13 @@ void KexiMainWindowImpl::initActions()
 #else
 	d->action_project_relations = d->dummy_action;
 #endif
-	d->action_tools_data_migration = new KAction(
+	d->action_tools_data_migration = new TDEAction(
 		i18n("&Import Database..."), "database_import", 0,
 		TQT_TQOBJECT(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 KAction(
+	d->action_tools_compact_database = new TDEAction(
 		i18n("&Compact Database..."), "", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(slotToolsCompactDatabase()), actionCollection(), "tools_compact_database");
 	d->action_tools_compact_database->setToolTip(i18n("Compact the current database project"));
@@ -614,7 +614,7 @@ void KexiMainWindowImpl::initActions()
 	if (userMode())
 		d->action_project_import_data_table = 0;
 	else {
-		d->action_project_import_data_table = new KAction(
+		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(), 
@@ -623,7 +623,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_project_import_data_table->setWhatsThis(i18n("Imports table data from a file."));
 	}
 
-	d->action_project_export_data_table = new KAction(i18n("Export->Table or Query Data to File...", 
+	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(), 
@@ -633,9 +633,9 @@ void KexiMainWindowImpl::initActions()
 	d->action_project_export_data_table->setWhatsThis(
 		i18n("Exports data from the active table or query data to a file."));
 
-//TODO	new KAction(i18n("From File..."), "fileopen", 0,
+//TODO	new TDEAction(i18n("From File..."), "fileopen", 0,
 //TODO		TQT_TQOBJECT(this), TQT_SLOT(slotImportFile()), actionCollection(), "project_import_file");
-//TODO	new KAction(i18n("From Server..."), "server", 0,
+//TODO	new TDEAction(i18n("From Server..."), "server", 0,
 //TODO		TQT_TQOBJECT(this), TQT_SLOT(slotImportServer()), actionCollection(), "project_import_server");
 
 	d->action_project_print = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotProjectPrint()),
@@ -651,7 +651,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_project_print_preview->setWhatsThis(
 		i18n("Shows print preview for the active table or query."));
 
-	d->action_project_print_setup = new KAction(i18n("Page Set&up..."),
+	d->action_project_print_setup = new TDEAction(i18n("Page Set&up..."),
 		"", 0, TQT_TQOBJECT(this), TQT_SLOT(slotProjectPageSetup()), actionCollection(), 
 		"project_print_setup");
 	d->action_project_print_setup->setToolTip(
@@ -668,7 +668,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_edit_paste_special_data_table = 0;
 	else {
 		d->action_edit_paste_special_data_table = 
-			new KAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."),
+			new TDEAction(i18n("Paste Special->As Data &Table...", "As Data &Table..."),
 			"table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPasteSpecialDataTable()),
 			actionCollection(), "edit_paste_special_data_table");
 		d->action_edit_paste_special_data_table->setToolTip(
@@ -678,7 +678,7 @@ void KexiMainWindowImpl::initActions()
 	}
 
 	d->action_edit_copy_special_data_table =
-		new KAction(i18n("Copy Special->Table or Query Data...", 
+		new TDEAction(i18n("Copy Special->Table or Query Data...", 
 			"Table or Query as Data Table..."),
 		"table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditCopySpecialDataTable()),
 		actionCollection(), "edit_copy_special_data_table");
@@ -710,7 +710,7 @@ void KexiMainWindowImpl::initActions()
 //! @todo	d->action_edit_replace = KStdAction::replace(
 //!		TQT_TQOBJECT(this), TQT_SLOT(slotEditReplace()), actionCollection(), "project_print_preview" ); 
 	d->action_edit_replace_all = 0;
-//! @todo d->action_edit_replace_all = new KAction( i18n("Replace All"), "", 0, 
+//! @todo d->action_edit_replace_all = new TDEAction( i18n("Replace All"), "", 0, 
 //!   TQT_TQOBJECT(this), TQT_SLOT(slotEditReplaceAll()), actionCollection(), "edit_replaceall");
 
 	d->action_edit_select_all =  createSharedAction( KStdAction::SelectAll, "edit_select_all");
@@ -744,7 +744,7 @@ void KexiMainWindowImpl::initActions()
 
 	//VIEW MENU
 	if (!userMode()) {
-		d->action_view_data_mode = new KRadioAction(i18n("&Data View"), "state_data", TQt::Key_F6,
+		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");
 		d->actions_for_view_modes.insert( Kexi::DataViewMode, d->action_view_data_mode );
 		d->action_view_data_mode->setExclusiveGroup("view_mode");
@@ -755,7 +755,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_view_data_mode = 0;
 
 	if (!userMode()) {
-		d->action_view_design_mode = new KRadioAction(i18n("D&esign View"), "state_edit", TQt::Key_F7,
+		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");
 		d->actions_for_view_modes.insert( Kexi::DesignViewMode, d->action_view_design_mode );
 		d->action_view_design_mode->setExclusiveGroup("view_mode");
@@ -766,7 +766,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_view_design_mode = 0;
 
 	if (!userMode()) {
-		d->action_view_text_mode = new KRadioAction(i18n("&Text View"), "state_sql", TQt::Key_F8,
+		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");
 		d->actions_for_view_modes.insert( Kexi::TextViewMode, d->action_view_text_mode );
 		d->action_view_text_mode->setExclusiveGroup("view_mode");
@@ -777,7 +777,7 @@ void KexiMainWindowImpl::initActions()
 		d->action_view_text_mode = 0;
 
 	if (d->isProjectNavigatorVisible) {
-		d->action_view_nav = new KAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1,
+		d->action_view_nav = new TDEAction(i18n("Project Navigator"), "", TQt::ALT + TQt::Key_1,
 			TQT_TQOBJECT(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."));
@@ -785,13 +785,13 @@ void KexiMainWindowImpl::initActions()
 	else
 		d->action_view_nav = 0;
 
-	d->action_view_mainarea = new KAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2,
+	d->action_view_mainarea = new TDEAction(i18n("Main Area"), "", TQt::ALT + TQt::Key_2,
 		TQT_TQOBJECT(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 KAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3,
+		d->action_view_propeditor = new TDEAction(i18n("Property Editor"), "", TQt::ALT + TQt::Key_3,
 			TQT_TQOBJECT(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."));
@@ -851,13 +851,13 @@ void KexiMainWindowImpl::initActions()
 	//WINDOW MENU
 #ifndef TQ_WS_WIN
 	//KMDI <= 3.5.1 has no shortcut here:
-	KAction *closeWindowAction = actionCollection()->action("window_close");
+	TDEAction *closeWindowAction = actionCollection()->action("window_close");
 	if (closeWindowAction)
-		closeWindowAction->setShortcut(KStdAccel::close());
+		closeWindowAction->setShortcut(TDEStdAccel::close());
 #endif
 
 	//additional 'Window' menu items
-	d->action_window_next = new KAction( i18n("&Next Window"), "",
+	d->action_window_next = new TDEAction( i18n("&Next Window"), "",
 #ifdef TQ_WS_WIN
 		TQt::CTRL+TQt::Key_Tab,
 #else
@@ -867,7 +867,7 @@ void KexiMainWindowImpl::initActions()
 	d->action_window_next->setToolTip( i18n("Next window") );
 	d->action_window_next->setWhatsThis(i18n("Switches to the next window."));
 
-	d->action_window_previous = new KAction( i18n("&Previous Window"), "",
+	d->action_window_previous = new TDEAction( i18n("&Previous Window"), "",
 #ifdef TQ_WS_WIN
 		TQt::CTRL+TQt::SHIFT+TQt::Key_Tab,
 #else
@@ -886,12 +886,12 @@ void KexiMainWindowImpl::initActions()
 	action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotConfigureToolbars() ), actionCollection() );
 	action->setWhatsThis(i18n("Lets you configure toolbars."));
 
-	d->action_show_other = new KActionMenu(i18n("Other"),
+	d->action_show_other = new TDEActionMenu(i18n("Other"),
 		actionCollection(), "options_show_other");
 #endif
 
 #ifndef KEXI_NO_CTXT_HELP
-	d->action_show_helper = new KToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H,
+	d->action_show_helper = new TDEToggleAction(i18n("Show Context Help"), "", TQt::CTRL + TQt::Key_H,
 	 actionCollection(), "options_show_contexthelp");
 #if KDE_IS_VERSION(3,2,90)
 	d->action_show_helper->setCheckedState(i18n("Hide Context Help"));
@@ -933,18 +933,18 @@ void KexiMainWindowImpl::initActions()
 		->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 KAction(i18n("Important Information"), "messagebox_info", 0,
+	new TDEAction(i18n("Important Information"), "messagebox_info", 0,
 		TQT_TQOBJECT(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 KAction(i18n("Give Feedback..."), "messagebox_info", 0,
+	new TDEAction(i18n("Give Feedback..."), "messagebox_info", 0,
 		TQT_TQOBJECT(this), TQT_SLOT(slotStartFeedbackAgent()), actionCollection(), "help_start_feedback_agent");
 #endif
 #endif
-//	KAction *actionSettings = new KAction(i18n("Configure Kexi..."), "configure", 0,
+//	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()));
@@ -1373,7 +1373,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr
 			KURL url;
 			url.setPath( fname );
 			if (url.isLocalFile())
-				KRecentDirs::add(startDir, url.directory());
+				TDERecentDirs::add(startDir, url.directory());
 		}
 #else
 		Q_UNUSED(projectData);
@@ -1394,7 +1394,7 @@ tristate KexiMainWindowImpl::createProjectFromTemplate(const KexiProjectData& pr
 		dlg.exec();
 		fname = dlg.selectedFile();
 		if (!fname.isEmpty())
-			KRecentDocument::add(fname);
+			TDERecentDocument::add(fname);
 //		fname = KFileDialog::getSaveFileName(fname.isEmpty() ? startDir : fname, 
 	//		mimetypes.join(" "), this, caption);
 #endif
@@ -1420,9 +1420,9 @@ void KexiMainWindowImpl::updateReadOnlyState()
 	if (d->nav)
 		d->nav->setReadOnly(readOnly);
 	// update "insert ....." actions for every part
-	KActionCollection *ac = actionCollection();
+	TDEActionCollection *ac = actionCollection();
 	for (KexiPart::PartInfoListIterator it(*Kexi::partManager().partInfoList()); it.current(); ++it) {
-		KAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() );
+		TDEAction *a = ac->action( TQString(KexiPart::nameForCreateAction( *it.current() )).ascii() );
 		if (a)
 			a->setEnabled(!readOnly);
 	}
@@ -2797,7 +2797,7 @@ KexiMainWindowImpl::slotProjectOpenRecentAboutToShow()
 {
 	/*
 	//setup
-	KPopupMenu *popup = d->action_open_recent->popupMenu();
+	TDEPopupMenu *popup = d->action_open_recent->popupMenu();
 	const int cnt = popup->count();
 	//remove older
 	for (int i = 0; i<cnt; i++) {
@@ -2817,7 +2817,7 @@ KexiMainWindowImpl::slotProjectOpenRecentAboutToShow()
 	*/
 
 	//show recent databases
-	KPopupMenu *popup = d->action_open_recent->popupMenu();
+	TDEPopupMenu *popup = d->action_open_recent->popupMenu();
 	popup->clear();
 #if 0
 	d->action_open_recent_projects_title_id = popup->insertTitle(i18n("Recently Opened Databases"));
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 9721a558..8df772ce 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -91,7 +91,7 @@ class KEXIMAIN_EXPORT KexiMainWindowImpl : public KexiMainWindow, public KexiGUI
 		virtual TQPopupMenu* findPopupMenu(const char *popupName);
 
 		/*! Implemented for KexiMainWindow. */
-		virtual KActionPtrList allActions() const;
+		virtual TDEActionPtrList allActions() const;
 
 		/*! \return currently active dialog (window) od 0 if there is no active dialog. 
 		 Implemented for KexiMainWindow. */
diff --git a/kexi/main/keximainwindowimpl_p.h b/kexi/main/keximainwindowimpl_p.h
index c775b087..83814f4e 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 KActionMenu(TQString(""), TQT_TQOBJECT(wnd));
+		dummy_action = new TDEActionMenu(TQString(""), TQT_TQOBJECT(wnd));
 #endif
 		maximizeFirstOpenedChildFrm = false;
 #ifdef HAVE_KNEWSTUFF
@@ -191,7 +191,7 @@ public:
 	{
 		if (curDialog.isNull())
 			return;
-		KRadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ];
+		TDERadioAction *ra = actions_for_view_modes[ curDialog->currentViewMode() ];
 		if (ra)
 			ra->setChecked(true);
 //		if (!last_checked_mode)
@@ -393,7 +393,7 @@ void updatePropEditorDockWidthInfo() {
 		KexiViewBase *view = curDialog->selectedView();
 		if (!view)
 			return 0;
-		KAction *action = view->sharedAction(actionName);
+		TDEAction *action = view->sharedAction(actionName);
 		if (!action || !action->isEnabled())
 			return 0;
 		return view;
@@ -442,24 +442,24 @@ void updatePropEditorDockWidthInfo() {
 		TQString appCaptionPrefix; //<! application's caption prefix - prj name (if opened), else: null
 
 #ifndef KEXI_SHOW_UNIMPLEMENTED
-		KActionMenu *dummy_action;
+		TDEActionMenu *dummy_action;
 #endif
 
 		//! project menu
-		KAction *action_save, *action_save_as, *action_close,
+		TDEAction *action_save, *action_save_as, *action_close,
 			*action_project_properties, *action_open_recent_more,
 			*action_project_relations, *action_project_import_data_table,
  			*action_project_export_data_table,
 			*action_project_print, *action_project_print_preview, 
 			*action_project_print_setup;
-//		KRecentFilesAction *action_open_recent;
-		KActionMenu *action_open_recent, *action_show_other;
+//		TDERecentFilesAction *action_open_recent;
+		TDEActionMenu *action_open_recent, *action_show_other;
 //		int action_open_recent_more_id;
 		int action_open_recent_projects_title_id,
 			action_open_recent_connections_title_id;
 
 		//! edit menu
-		KAction *action_edit_delete, *action_edit_delete_row,
+		TDEAction *action_edit_delete, *action_edit_delete_row,
 			*action_edit_cut, *action_edit_copy, *action_edit_paste,
 			*action_edit_find, *action_edit_findnext, *action_edit_findprev,
 			*action_edit_replace, *action_edit_replace_all,
@@ -471,30 +471,30 @@ void updatePropEditorDockWidthInfo() {
 			*action_edit_copy_special_data_table;
 
 		//! view menu
-		KAction *action_view_nav, *action_view_propeditor, *action_view_mainarea;
-		KRadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode;
-		TQIntDict<KRadioAction> actions_for_view_modes;
-//		KRadioAction *last_checked_mode;
+		TDEAction *action_view_nav, *action_view_propeditor, *action_view_mainarea;
+		TDERadioAction *action_view_data_mode, *action_view_design_mode, *action_view_text_mode;
+		TQIntDict<TDERadioAction> actions_for_view_modes;
+//		TDERadioAction *last_checked_mode;
 #ifndef KEXI_NO_CTXT_HELP
-		KToggleAction *action_show_helper;
+		TDEToggleAction *action_show_helper;
 #endif
 		//! data menu
-		KAction *action_data_save_row;
-		KAction *action_data_cancel_row_changes;
-		KAction *action_data_execute;
+		TDEAction *action_data_save_row;
+		TDEAction *action_data_cancel_row_changes;
+		TDEAction *action_data_execute;
 
 		//! format menu
-		KAction *action_format_font;
+		TDEAction *action_format_font;
 
 		//! tools menu
-		KAction *action_tools_data_migration, *action_tools_compact_database;
-		KActionMenu *action_tools_scripts;
+		TDEAction *action_tools_data_migration, *action_tools_compact_database;
+		TDEActionMenu *action_tools_scripts;
 
 		//! window menu
-		KAction *action_window_next, *action_window_previous;
+		TDEAction *action_window_next, *action_window_previous;
 
 		//! settings menu
-		KAction *action_configure;
+		TDEAction *action_configure;
 
 		//! for dock windows
 		KMdiToolViewAccessor* navToolWindow;
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 5d823a13..de3f64e2 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -501,7 +501,7 @@ void KexiSimplePrintingPageSetup::slotTitleTextChanged(const TQString&)
 
 void KexiSimplePrintingPageSetup::slotChangeTitleFont()
 {
-	if (TQDialog::Accepted != KFontDialog::getFont(m_settings.pageTitleFont, false, this))
+	if (TQDialog::Accepted != TDEFontDialog::getFont(m_settings.pageTitleFont, false, this))
 		return;
 	m_contents->headerTitleLineEdit->setFont( m_settings.pageTitleFont );
 	setDirty(true);
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index 83d9cb06..e587556b 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -162,10 +162,10 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	TQVBoxLayout *lyr = new TQVBoxLayout(this, 6);
 
 	int id;
-	m_toolbar = new KToolBar(0, this);
+	m_toolbar = new TDEToolBar(0, this);
 	m_toolbar->setLineWidth(0);
 	m_toolbar->setFrameStyle(TQFrame::NoFrame);
-	m_toolbar->setIconText(KToolBar::IconTextRight);
+	m_toolbar->setIconText(TDEToolBar::IconTextRight);
 	lyr->addWidget(m_toolbar);
 
 	id = m_toolbar->insertWidget( -1, 0, new KPushButton(KStdGuiItem::print(), m_toolbar) );
@@ -204,14 +204,14 @@ KexiSimplePrintPreviewWindow::KexiSimplePrintPreviewWindow(
 	TQHBoxLayout *navToolbarLyr = new TQHBoxLayout(navToolbarWidget);
 	lyr->addWidget(navToolbarWidget);
 
-	m_navToolbar = new KToolBar(0, navToolbarWidget);
+	m_navToolbar = new TDEToolBar(0, navToolbarWidget);
 	navToolbarLyr->addStretch(1);
 	navToolbarLyr->addWidget(m_navToolbar);
 	navToolbarLyr->addStretch(1);
 //	m_navToolbar->setFullWidth(true);
 	m_navToolbar->setLineWidth(0);
 	m_navToolbar->setFrameStyle(TQFrame::NoFrame);
-	m_navToolbar->setIconText(KToolBar::IconTextRight);
+	m_navToolbar->setIconText(TDEToolBar::IconTextRight);
 
 	m_idFirst = m_navToolbar->insertWidget( -1, 0, new KPushButton(BarIconSet("start"), i18n("First Page"), m_navToolbar));
 	m_navToolbar->addConnection(m_idFirst, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotFirstClicked()));
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h
index 8f76e803..c966553f 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.h
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h
@@ -71,7 +71,7 @@ class KexiSimplePrintPreviewWindow : public TQWidget
 
 		KexiSimplePrintingEngine &m_engine;
 		const KexiSimplePrintingSettings& m_settings;
-		KToolBar *m_toolbar, *m_navToolbar;
+		TDEToolBar *m_toolbar, *m_navToolbar;
 		int m_pageNumber;
 		int m_pagesCount; //!< needed to know that pages could has been changed
 		int m_idFirst, m_idLast, m_idPrevious, m_idNext, m_idPageNumberLabel;
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index 00ace8dc..ab4ed10a 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -64,7 +64,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
 		 \a conn_set can be altered, because Add/Edit/Remove buttons are available 
 		 to users. \a startDirOrVariable can be provided to specify a start dir for file browser
 		 (it can also contain a configuration variable name with ":" prefix as described 
-		 in KRecentDirs documentation). */
+		 in TDERecentDirs documentation). */
 		KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
 			const TQString& startDirOrVariable, 
 			TQWidget* parent = 0, const char* name = 0 );
diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui
index 122137e1..9ea3a0db 100644
--- a/kexi/main/startup/KexiNewPrjTypeSelector.ui
+++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui
@@ -36,7 +36,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="1" column="0">
+        <widget class="TDEListView" row="1" column="0">
             <column>
                 <property name="text">
                     <string></string>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 3e59d937..44fb7026 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -67,8 +67,8 @@ class KexiNewProjectWizardPrivate
 //		delete project_set_to_show;
 		delete msgHandler;
 	}
-//	KListView *lv_types;
-	KListViewItem *lvi_file, *lvi_server;
+//	TDEListView *lv_types;
+	TDEListViewItem *lvi_file, *lvi_server;
 	TQString chk_file_txt, chk_server_txt; //!< helper
 
 	TQString server_db_name_dblist_lbl_txt; //!< helper
@@ -95,7 +95,7 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 
 	//page: type selector
 	m_prjtype_sel = new KexiNewPrjTypeSelector(this, "KexiNewPrjTypeSelector");
-//	lv_types = new KListView(m_prjtype_sel, "types listview");
+//	lv_types = new TDEListView(m_prjtype_sel, "types listview");
 //	m_prjtype_sel->lv_types->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Minimum, 0, 2));
 #if KDE_IS_VERSION(3,3,9)
 	m_prjtype_sel->lv_types->setShadeSortColumn(false);
@@ -105,14 +105,14 @@ KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
 	m_prjtype_sel->lv_types->setAlternateBackground(TQColor()); //disable altering
 	m_prjtype_sel->lv_types->setItemMargin( KDialogBase::marginHint() );
 	TQString none;
-	d->lvi_file = new KListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
+	d->lvi_file = new TDEListViewItem( m_prjtype_sel->lv_types, i18n("New Project Stored in File") );
 	d->lvi_file->setPixmap(0, 
 		TDEGlobal::iconLoader()->loadIcon( KMimeType::mimeType( 
 			KexiDB::Driver::defaultFileBasedDriverMimeType() )->icon(none,0), KIcon::Desktop 
 		)
 	);
 	d->lvi_file->setMultiLinesEnabled( true );
-	d->lvi_server = new KListViewItem( m_prjtype_sel->lv_types, d->lvi_file, 
+	d->lvi_server = new TDEListViewItem( m_prjtype_sel->lv_types, d->lvi_file, 
 		i18n("New Project Stored on Database Server") );
 	d->lvi_server->setPixmap(0, DesktopIcon("network") );
 	d->lvi_server->setMultiLinesEnabled( true );
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 5c281256..21eb3edf 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -299,7 +299,7 @@ void KexiStartupDialog::setupPageTemplates()
 	d->templatesWidget = new KJanusWidget(
 		d->pageTemplates, "templatesWidget", KJanusWidget::IconList);
 	{//aaa! dirty hack
-		d->templatesWidget_IconListBox = d->templatesWidget->child(0,"KListBox");
+		d->templatesWidget_IconListBox = d->templatesWidget->child(0,"TDEListBox");
 		if (d->templatesWidget_IconListBox)
 			d->templatesWidget_IconListBox->installEventFilter(this);
 	}
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index d919463d..5db58c82 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -49,13 +49,13 @@
 }*/
 
 //! @internal
-class TemplateItem : public KListViewItem
+class TemplateItem : public TDEListViewItem
 {
 	public:
 		TemplateItem(TQListView* parent, const TQString& aFilename, 
 			const TQString& name, const TQString& description, const TQPixmap& icon, 
 			const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
-		: KListViewItem(parent, name + "\n" + description)
+		: TDEListViewItem(parent, name + "\n" + description)
 		, autoopenObjects(aAutoopenObjects)
 		, filename(aFilename)
 		{
@@ -70,7 +70,7 @@ class TemplateItem : public KListViewItem
 //-----------------------
 
 KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent )
-	: KListView(parent, "KexiStartupDialogTemplatesPage")
+	: TDEListView(parent, "KexiStartupDialogTemplatesPage")
 	, m_popuplated(false)
 {
 	addColumn(TQString());
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 82ba7fe2..07b8b663 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -24,7 +24,7 @@
 #include <core/kexiprojectdata.h>
 
 /*! Helper class for displaying templates set with description. */
-class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
+class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public TDEListView
 {
 	Q_OBJECT
   
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index 6b8ab9d4..29567ce0 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -107,7 +107,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
 //TODO    TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar );
 //TODO    toolbar = 0; //(js)
-//(js)    toolbar = new KToolBar( d->mainWidget, "KFileDialog::toolbar", true);
+//(js)    toolbar = new TDEToolBar( d->mainWidget, "KFileDialog::toolbar", true);
 //(js)    toolbar->setFlat(true);
 //TODO    tqInstallMsgHandler( oldHandler );
 
@@ -179,7 +179,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     ops->setupMenu(KDirOperator::SortActions |
                    KDirOperator::FileActions |
                    KDirOperator::ViewActions);
-    KActionCollection *coll = ops->actionCollection();
+    TDEActionCollection *coll = ops->actionCollection();
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
@@ -211,12 +211,12 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
     connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )),
              TQT_SLOT( enterURL( const TQString& )));
 
-    KToggleAction *showSidebarAction =
-        new KToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
+    TDEToggleAction *showSidebarAction =
+        new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar");
     connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ),
              TQT_SLOT( toggleSpeedbar( bool )) );
 
-    KActionMenu *menu = new KActionMenu( i18n("Configure"), "configure", this, "extra menu" );
+    TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" );
     menu->setWhatsThis(i18n("<qt>This is the configuration menu for the file dialog. "
                             "Various options can be accessed from this menu including: <ul>"
                             "<li>how files are sorted in the list</li>"
@@ -257,8 +257,8 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
 
     toolbar->setItemAutoSized (PATH_COMBO);
-    toolbar->setIconText(KToolBar::IconOnly);
-    toolbar->setBarPos(KToolBar::Top);
+    toolbar->setIconText(TDEToolBar::IconOnly);
+    toolbar->setBarPos(TDEToolBar::Top);
     toolbar->setMovingEnabled(false);
     toolbar->adjustSize();
 
@@ -471,6 +471,6 @@ void KexiStartupFileDialogBase::saveLastVisitedPath(const TQString& path)
 		TQFileInfo fi(path);
 		TQString dir( fi.isDir() ? fi.absFilePath() : fi.dir(true).absPath() );
 		if (!dir.isEmpty())
-			KRecentDirs::add(m_lastVisitedPathsVariable, dir);
+			TDERecentDirs::add(m_lastVisitedPathsVariable, dir);
 	}
 }