6 files changed, 17 insertions, 17 deletions
diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui
index 26b7d0f2..7741073f 100644
--- a/kexi/plugins/queries/kexiparameterlisteditor.ui
+++ b/kexi/plugins/queries/kexiparameterlisteditor.ui
@@ -24,7 +24,7 @@
                 <string>Parameters:</string>
             </property>
         </widget>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Name</string>
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 5de13fe2..650e90a6 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -79,7 +79,7 @@ class KexiQueryDesignerSQLView::Private
 		KexiSectionHeader *head, *historyHead;
 		TQPixmap statusPixmapOk, statusPixmapErr, statusPixmapInfo;
 		TQSplitter *splitter;
-		KToggleAction *action_toggle_history;
+		TDEToggleAction *action_toggle_history;
 		//! For internal use, this pointer is usually copied to TempData structure, 
 		//! when switching out of this view (then it's cleared).
 		KexiDB::QuerySchema *parsedQuery;
@@ -138,7 +138,7 @@ KexiQueryDesignerSQLView::KexiQueryDesignerSQLView(KexiMainWindow *mainWin, TQWi
 
 	plugSharedAction("querypart_check_query", TQT_TQOBJECT(this), TQT_SLOT(slotCheckQuery())); 
 	plugSharedAction("querypart_view_toggle_history", TQT_TQOBJECT(this), TQT_SLOT(slotUpdateMode()));
-	d->action_toggle_history = static_cast<KToggleAction*>( sharedAction( "querypart_view_toggle_history" ) );
+	d->action_toggle_history = static_cast<TDEToggleAction*>( sharedAction( "querypart_view_toggle_history" ) );
 
 	d->historyHead = new KexiSectionHeader(i18n("SQL Query History"),Qt::Vertical, d->history_section);
 	d->historyHead->installEventFilter(this);
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 81bb22bc..da27f890 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -40,7 +40,7 @@ KexiQueryDesignerSQLHistory::KexiQueryDesignerSQLHistory(TQWidget *parent, const
 	m_history = new History();
 	m_history->setAutoDelete(true);
 
-	m_popup = new KPopupMenu(this);
+	m_popup = new TDEPopupMenu(this);
 	m_popup->insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 }
 
@@ -161,7 +161,7 @@ KexiQueryDesignerSQLHistory::addEntry(HistoryEntry *e)
 /*void
 KexiQueryDesignerSQLHistory::contextMenu(const TQPoint &pos, HistoryEntry *)
 {
-	KPopupMenu p(this);
+	TDEPopupMenu p(this);
 	p.insertItem(SmallIcon("editcopy"), i18n("Copy to Clipboard"), this, TQT_SLOT(slotToClipboard()));
 	
 
@@ -209,7 +209,7 @@ void KexiQueryDesignerSQLHistory::clear()
 	updateContents();
 }
 
-KPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const
+TDEPopupMenu* KexiQueryDesignerSQLHistory::popupMenu() const
 {
 	return m_popup;
 }
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.h b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
index 9183764f..516a6dbf 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.h
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.h
@@ -28,7 +28,7 @@
 #include <tqsimplerichtext.h>
 
 class TQSimpleRichText;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class HistoryEntry
 {
@@ -68,7 +68,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
 		KexiQueryDesignerSQLHistory(TQWidget *parent, const char *name=0);
 		virtual ~KexiQueryDesignerSQLHistory();
 
-		KPopupMenu* popupMenu() const;
+		TDEPopupMenu* popupMenu() const;
 
 //		void		contextMenu(const TQPoint &pos, HistoryEntry *e);
 
@@ -99,7 +99,7 @@ class KexiQueryDesignerSQLHistory : public TQScrollView
 	private:
 		History *m_history;
 		HistoryEntry *m_selected;
-		KPopupMenu *m_popup;
+		TDEPopupMenu *m_popup;
 };
 
 #endif
diff --git a/kexi/plugins/queries/kexiquerypart.cpp b/kexi/plugins/queries/kexiquerypart.cpp
index d0c71eae..02c4ab94 100644
--- a/kexi/plugins/queries/kexiquerypart.cpp
+++ b/kexi/plugins/queries/kexiquerypart.cpp
@@ -117,20 +117,20 @@ KexiQueryPart::dataSource()
 	return new KexiQueryDataSource(this);
 }
 
-void KexiQueryPart::initPartActions( KActionCollection *col )
+void KexiQueryPart::initPartActions( TDEActionCollection *col )
 {
 }
 
-void KexiQueryPart::initInstanceActions( int mode, KActionCollection *col )
+void KexiQueryPart::initInstanceActions( int mode, TDEActionCollection *col )
 {
 	if (mode==Kexi::DataViewMode) {
 	}
 	else if (mode==Kexi::DesignViewMode) {
 	}
 	else if (mode==Kexi::TextViewMode) {
-//		new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query");
+//		new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), col, "querypart_check_query");
 
-//TODO		new KAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query");
+//TODO		new TDEAction(i18n("Execute Query"), "?????", 0, this, TQT_SLOT(checkQuery()), col, "querypart_execute_query");
 	}
 }
 #endif
@@ -141,10 +141,10 @@ void KexiQueryPart::initPartActions()
 
 void KexiQueryPart::initInstanceActions()
 {
-//	new KAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), 
+//	new TDEAction(i18n("Check Query"), "test_it", 0, this, TQT_SLOT(slotCheckQuery()), 
 //		m_instanceGuiClients[Kexi::DesignViewMode]->actionCollection(), "querypart_check_query");
 
-	KAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", 
+	TDEAction *a = createSharedAction(Kexi::TextViewMode, i18n("Check Query"), "test_it", 
 		Key_F9, "querypart_check_query");
 	a->setToolTip(i18n("Check Query"));
 	a->setWhatsThis(i18n("Checks query for validity."));
diff --git a/kexi/plugins/queries/kexiquerypart.h b/kexi/plugins/queries/kexiquerypart.h
index 33399c56..3587388c 100644
--- a/kexi/plugins/queries/kexiquerypart.h
+++ b/kexi/plugins/queries/kexiquerypart.h
@@ -105,8 +105,8 @@ class KexiQueryPart : public KexiPart::Part
 		virtual KexiViewBase* createView(TQWidget *parent, KexiDialogBase* dialog, 
 			KexiPart::Item &item, int viewMode = Kexi::DataViewMode, TQMap<TQString,TQString>* staticObjectArgs = 0);
 
-//		virtual void initPartActions( KActionCollection *col );
-//		virtual void initInstanceActions( int mode, KActionCollection *col );
+//		virtual void initPartActions( TDEActionCollection *col );
+//		virtual void initInstanceActions( int mode, TDEActionCollection *col );
 
 		virtual void initPartActions();
 		virtual void initInstanceActions();