Rename a number of classes to enhance compatibility with KDE4

6 files changed, 25 insertions, 25 deletions

diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index a3ce7632..d901d373 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -62,22 +62,22 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 	setResizePolicy(Manual);
 /*MOVED TO KexiRelationDialog
 	//actions
-	m_tableQueryPopup = new KPopupMenu(this, "m_popup");
+	m_tableQueryPopup = new TDEPopupMenu(this, "m_popup");
 	m_tableQueryPopup->insertTitle(i18n("Table"));
-	m_connectionPopup = new KPopupMenu(this, "m_connectionPopup");
+	m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup");
 	m_connectionPopup->insertTitle(i18n("Relation"));
-	m_areaPopup = new KPopupMenu(this, "m_areaPopup");
+	m_areaPopup = new TDEPopupMenu(this, "m_areaPopup");
 	
 	plugSharedAction("edit_delete", i18n("Hide Table"), m_tableQueryPopup);
 	plugSharedAction("edit_delete",m_connectionPopup);
 	plugSharedAction("edit_delete",this, TQT_SLOT(removeSelectedObject()));
 */	
 #if 0
-	m_removeSelectedTableQueryAction = new KAction(i18n("&Hide Selected Table/Query"), "editdelete", "",
+	m_removeSelectedTableQueryAction = new TDEAction(i18n("&Hide Selected Table/Query"), "editdelete", "",
 		this, TQT_SLOT(removeSelectedTableQuery()), parent->actionCollection(), "relationsview_removeSelectedTableQuery");
-	m_removeSelectedConnectionAction = new KAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
+	m_removeSelectedConnectionAction = new TDEAction(i18n("&Remove Selected Relationship"), "button_cancel", "",
 		this, TQT_SLOT(removeSelectedConnection()), parent->actionCollection(), "relationsview_removeSelectedConnection");
-	m_openSelectedTableQueryAction = new KAction(i18n("&Open Selected Table/Query"), "", "",
+	m_openSelectedTableQueryAction = new TDEAction(i18n("&Open Selected Table/Query"), "", "",
 		this, TQT_SLOT(openSelectedTableQuery()), 0/*parent->actionCollection()*/, "relationsview_openSelectedTableQuery");
 #endif
 
@@ -86,7 +86,7 @@ KexiRelationView::KexiRelationView(TQWidget *parent, const char *name)
 #if 0
 
 
-	m_popup = new KPopupMenu(this, "m_popup");
+	m_popup = new TDEPopupMenu(this, "m_popup");
 	m_openSelectedTableQueryAction->plug( m_popup );
 	m_removeSelectedTableQueryAction->plug( m_popup );
 	m_removeSelectedConnectionAction->plug( m_popup );
diff --git a/kexi/widget/relations/kexirelationview.h b/kexi/widget/relations/kexirelationview.h
index 9fa741f6..e801b801 100644
--- a/kexi/widget/relations/kexirelationview.h
+++ b/kexi/widget/relations/kexirelationview.h
@@ -34,8 +34,8 @@ class TQFrame;
 
 class KexiRelationViewTable;
 class KexiRelationViewTableContainer;
-class KAction;
-class KPopupMenu;
+class TDEAction;
+class TDEPopupMenu;
 
 namespace KexiDB
 {
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index a3ad0d5d..cba19483 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -75,8 +75,8 @@ KexiRelationViewTableContainer::KexiRelationViewTableContainer(
 //	m_tableView->resize( m_tableView->sizeHint() );
 	lyr->addWidget(m_tableView, 0);
 	connect(m_tableView, TQT_SIGNAL(tableScrolling()), this, TQT_SLOT(moved()));
-	connect(m_tableView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)),
-		this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)));
+	connect(m_tableView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)),
+		this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)));
 }
 
 KexiRelationViewTableContainer::~KexiRelationViewTableContainer()
@@ -88,7 +88,7 @@ KexiDB::TableOrQuerySchema* KexiRelationViewTableContainer::schema() const
 	return m_tableView->schema();
 }
 
-void KexiRelationViewTableContainer::slotContextMenu(KListView *, TQListViewItem *, const TQPoint &p)
+void KexiRelationViewTableContainer::slotContextMenu(TDEListView *, TQListViewItem *, const TQPoint &p)
 {
 //	m_parent->executePopup(p);
 	emit contextMenuRequest( p );
@@ -412,7 +412,7 @@ void KexiRelationViewTable::contentsMousePressEvent(TQMouseEvent *ev)
 {
 	parentWidget()->setFocus();
 	setFocus();
-	KListView::contentsMousePressEvent(ev);
+	TDEListView::contentsMousePressEvent(ev);
 //	if (ev->button()==Qt::RightButton)
 //		static_cast<KexiRelationView*>(parentWidget())->executePopup(ev->pos());
 }
diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h
index 176cc2b8..5e3ff332 100644
--- a/kexi/widget/relations/kexirelationviewtable.h
+++ b/kexi/widget/relations/kexirelationviewtable.h
@@ -70,7 +70,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
 
 	protected slots:
 		void moved();
-		void slotContextMenu(KListView *lv, TQListViewItem *i, const TQPoint& p);
+		void slotContextMenu(TDEListView *lv, TQListViewItem *i, const TQPoint& p);
 
 	protected:
 //		KexiDB::TableSchema *m_table;
@@ -82,7 +82,7 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableContainer : public TQFrame
 };
 
 /*
-class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public KListViewItem
+class KEXIRELATIONSVIEW_EXPORT KexiRelationViewTableItem : public TDEListViewItem
 {
 	public:
 		KexiRelationViewTableItem(TQListView *parent, TQListViewItem *after,
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 4c5754b5..47075bbb 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -73,25 +73,25 @@ KexiRelationWidget::KexiRelationWidget(KexiMainWindow *win, TQWidget *parent,
 	//m_relationView->setFocus();
 
 	//actions
-	m_tableQueryPopup = new KPopupMenu(this, "m_popup");
+	m_tableQueryPopup = new TDEPopupMenu(this, "m_popup");
 	m_tableQueryPopupTitleID = m_tableQueryPopup->insertTitle(SmallIcon("table"), "");
 	connect(m_tableQueryPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu()));
 
-	m_connectionPopup = new KPopupMenu(this, "m_connectionPopup");
+	m_connectionPopup = new TDEPopupMenu(this, "m_connectionPopup");
 	m_connectionPopupTitleID = m_connectionPopup->insertTitle("");
 	connect(m_connectionPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(aboutToShowPopupMenu()));
 
-	m_areaPopup = new KPopupMenu(this, "m_areaPopup");
+	m_areaPopup = new TDEPopupMenu(this, "m_areaPopup");
 	
-	m_openSelectedTableAction = new KAction(i18n("&Open Table"), SmallIcon("fileopen"), KShortcut(),
+	m_openSelectedTableAction = new TDEAction(i18n("&Open Table"), SmallIcon("fileopen"), TDEShortcut(),
 		TQT_TQOBJECT(this), TQT_SLOT(openSelectedTable()), TQT_TQOBJECT(this), "relationsview_openTable");
 	m_openSelectedTableAction->plug( m_tableQueryPopup );
-	m_designSelectedTableAction = new KAction(i18n("&Design Table"), SmallIcon("edit"), KShortcut(),
+	m_designSelectedTableAction = new TDEAction(i18n("&Design Table"), SmallIcon("edit"), TDEShortcut(),
 		TQT_TQOBJECT(this), TQT_SLOT(designSelectedTable()), TQT_TQOBJECT(this), "relationsview_designTable");
 	m_designSelectedTableAction->plug( m_tableQueryPopup );
 	m_tableQueryPopup->insertSeparator();
 
-	KAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup);
+	TDEAction* hide_action = plugSharedAction("edit_delete", i18n("&Hide Table"), m_tableQueryPopup);
 	hide_action->setIconSet(TQIconSet());
 
 	plugSharedAction("edit_delete",m_connectionPopup);
diff --git a/kexi/widget/relations/kexirelationwidget.h b/kexi/widget/relations/kexirelationwidget.h
index 2d6d2064..c71b6e18 100644
--- a/kexi/widget/relations/kexirelationwidget.h
+++ b/kexi/widget/relations/kexirelationwidget.h
@@ -28,8 +28,8 @@
 
 class KComboBox;
 class KPushButton;
-class KPopupMenu;
-class KAction;
+class TDEPopupMenu;
+class TDEAction;
 class TQListViewItem;
 
 class KexiMainWindow;
@@ -127,10 +127,10 @@ class KEXIRELATIONSVIEW_EXPORT KexiRelationWidget : public KexiViewBase
 		KexiRelationView *m_relationView;
 		KexiDB::Connection *m_conn;
 
-		KPopupMenu *m_tableQueryPopup //over table/query
+		TDEPopupMenu *m_tableQueryPopup //over table/query
 			, *m_connectionPopup //over connection
 			, *m_areaPopup; //over outer area
-		KAction *m_openSelectedTableAction, *m_designSelectedTableAction;
+		TDEAction *m_openSelectedTableAction, *m_designSelectedTableAction;
 
 		int m_tableQueryPopupTitleID, m_connectionPopupTitleID;
 };