summaryrefslogtreecommitdiffstats
path: root/kexi/widget
diff options
context:
space:
mode:
Diffstat (limited to 'kexi/widget')
-rw-r--r--kexi/widget/kexibrowser.cpp46
-rw-r--r--kexi/widget/kexibrowser.h26
-rw-r--r--kexi/widget/kexibrowser_p.h2
-rw-r--r--kexi/widget/kexibrowseritem.cpp16
-rw-r--r--kexi/widget/kexibrowseritem.h8
-rw-r--r--kexi/widget/kexidataawareview.cpp2
-rw-r--r--kexi/widget/kexidatatable.h2
-rw-r--r--kexi/widget/kexifieldlistview.cpp8
-rw-r--r--kexi/widget/kexifieldlistview.h6
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp2
-rw-r--r--kexi/widget/kexismalltoolbutton.h4
-rw-r--r--kexi/widget/pixmapcollection.cpp2
-rw-r--r--kexi/widget/relations/kexirelationview.cpp14
-rw-r--r--kexi/widget/relations/kexirelationview.h4
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp8
-rw-r--r--kexi/widget/relations/kexirelationviewtable.h4
-rw-r--r--kexi/widget/relations/kexirelationwidget.cpp12
-rw-r--r--kexi/widget/relations/kexirelationwidget.h8
-rw-r--r--kexi/widget/tableview/kexidataawareobjectiface.h6
-rw-r--r--kexi/widget/tableview/kexidatatableview.cpp4
-rw-r--r--kexi/widget/tableview/kexidatatableview.h2
-rw-r--r--kexi/widget/tableview/kexitableview.cpp8
-rw-r--r--kexi/widget/tableview/kexitableview.h6
-rw-r--r--kexi/widget/utils/kexicontextmenuutils.cpp22
-rw-r--r--kexi/widget/utils/kexicontextmenuutils.h6
-rw-r--r--kexi/widget/utils/kexisharedactionclient.cpp2
-rw-r--r--kexi/widget/utils/kexisharedactionclient.h6
-rw-r--r--kexi/widget/utils/klistviewitemtemplate.h34
28 files changed, 135 insertions, 135 deletions
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 472dd25c..00586a53 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -72,7 +72,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
: TQWidget(parent, "KexiBrowser")
, m_mainWin(mainWin)
, m_features(features)
- , m_actions( new KActionCollection(this) )
+ , m_actions( new TDEActionCollection(this) )
, m_baseItems(199, false)
, m_normalItems(199)
, m_prevSelectedPart(0)
@@ -103,8 +103,8 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
m_list->setTooltipColumn(0);
m_list->renameLineEdit()->setValidator( new KexiUtils::IdentifierValidator(TQT_TQOBJECT(this)) );
m_list->setResizeMode(TQListView::LastColumn);
- connect(m_list, TQT_SIGNAL(contextMenu(KListView *, TQListViewItem *, const TQPoint &)),
- TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(KListView*, TQListViewItem *, const TQPoint&)));
+ connect(m_list, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)),
+ TQT_TQOBJECT(this), TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint&)));
connect(m_list, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this,
TQT_SLOT(slotSelectionChanged(TQListViewItem*)));
@@ -123,7 +123,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
}
// actions
- m_openAction = new KAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this),
+ m_openAction = new TDEAction(i18n("&Open"), "fileopen", 0/*TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this),
TQT_SLOT(slotOpenObject()), TQT_TQOBJECT(this), "open_object");
m_openAction->setToolTip(i18n("Open object"));
m_openAction->setWhatsThis(i18n("Opens object selected in the list"));
@@ -145,12 +145,12 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
m_newObjectPopup = 0;
}
else {
- m_deleteAction = new KAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/,
+ m_deleteAction = new TDEAction(i18n("&Delete"), "editdelete", 0/*TQt::Key_Delete*/,
TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), m_actions, "edit_delete");
//! @todo 1.1: just add "Delete" tooltip and what's this
m_deleteAction->setToolTip(i18n("&Delete").replace("&",""));
- m_renameAction = new KAction(i18n("&Rename"), "", 0,
+ m_renameAction = new TDEAction(i18n("&Rename"), "", 0,
TQT_TQOBJECT(this), TQT_SLOT(slotRename()), m_actions, "edit_rename");
#ifdef KEXI_SHOW_UNIMPLEMENTED
//todo plugSharedAction("edit_cut",TQT_SLOT(slotCut()));
@@ -158,7 +158,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
//todo plugSharedAction("edit_paste",TQT_SLOT(slotPaste()));
#endif
- m_designAction = new KAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this),
+ m_designAction = new TDEAction(i18n("&Design"), "edit", 0/*TQt::CTRL + TQt::Key_Enter conflict!*/, TQT_TQOBJECT(this),
TQT_SLOT(slotDesignObject()), TQT_TQOBJECT(this), "design_object");
m_designAction->setToolTip(i18n("Design object"));
m_designAction->setWhatsThis(i18n("Starts designing of the object selected in the list"));
@@ -167,15 +167,15 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
buttons_flyr->add(btn);
}
- m_editTextAction = new KAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this),
+ m_editTextAction = new TDEAction(i18n("Open in &Text View"), "", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotEditTextObject()), TQT_TQOBJECT(this), "editText_object");
m_editTextAction->setToolTip(i18n("Open object in text view"));
m_editTextAction->setWhatsThis(i18n("Opens selected object in the list in text view"));
- m_newObjectAction = new KAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object");
+ m_newObjectAction = new TDEAction("", "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewObject()), TQT_TQOBJECT(this), "new_object");
if (m_features & Toolbar) {
m_newObjectToolButton = new KexiSmallToolButton(this, "", TQIconSet(), "new_object");
- m_newObjectPopup = new KPopupMenu(this, "newObjectPopup");
+ m_newObjectPopup = new TDEPopupMenu(this, "newObjectPopup");
connect(m_newObjectPopup, TQT_SIGNAL(aboutToShow()), TQT_TQOBJECT(this), TQT_SLOT(slotNewObjectPopupAboutToShow()));
// KexiPart::Part* part = Kexi::partManager().part("kexi/table");
// m_newObjectPopup->insertItem( SmallIconSet(part->info()->createItemIcon()), part->instanceName() );
@@ -190,21 +190,21 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
}
}
- m_executeAction = new KAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this),
+ m_executeAction = new TDEAction(i18n("Execute"), "player_play", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotExecuteObject()), TQT_TQOBJECT(this), "data_execute");
- m_exportActionMenu = new KActionMenu(i18n("Export"));
- m_dataExportAction = new KAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."),
+ m_exportActionMenu = new TDEActionMenu(i18n("Export"));
+ m_dataExportAction = new TDEAction(i18n("Export->To File as Data &Table... ", "To &File as Data Table..."),
"table", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportAsDataTable()), TQT_TQOBJECT(this), "exportAsDataTable");
m_dataExportAction->setWhatsThis(
i18n("Exports data from the currently selected table or query data to a file."));
m_exportActionMenu->insert( m_dataExportAction );
- m_printAction = new KAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this),
+ m_printAction = new TDEAction(i18n("&Print..."), "fileprint", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPrintItem()), TQT_TQOBJECT(this), "printItem");
m_printAction->setWhatsThis(
i18n("Prints data from the currently selected table or query."));
- m_pageSetupAction = new KAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this),
+ m_pageSetupAction = new TDEAction(i18n("Page Setup..."), "", 0, TQT_TQOBJECT(this),
TQT_SLOT(slotPageSetupForItem()), TQT_TQOBJECT(this), "pageSetupForItem");
m_pageSetupAction->setWhatsThis(
i18n("Shows page setup for printing the active table or query."));
@@ -214,7 +214,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
m_partPopup = 0;
}
else {
- m_partPopup = new KPopupMenu(this, "partPopup");
+ m_partPopup = new TDEPopupMenu(this, "partPopup");
m_partPopupTitle_id = m_partPopup->insertTitle("");
m_newObjectAction->plug(m_partPopup);
#ifdef KEXI_SHOW_UNIMPLEMENTED
@@ -225,7 +225,7 @@ KexiBrowser::KexiBrowser(TQWidget* parent, KexiMainWindow *mainWin, int features
if (m_features & ContextMenus) {
//init popups
- m_itemPopup = new KPopupMenu(this, "itemPopup");
+ m_itemPopup = new TDEPopupMenu(this, "itemPopup");
m_itemPopupTitle_id = m_itemPopup->insertTitle("");
m_openAction->plug(m_itemPopup);
m_openAction_id = m_itemPopup->idAt(m_itemPopup->count()-1);
@@ -411,12 +411,12 @@ KexiBrowser::slotRemoveItem(const KexiPart::Item &item)
}
void
-KexiBrowser::slotContextMenu(KListView* /*list*/, TQListViewItem *item, const TQPoint &pos)
+KexiBrowser::slotContextMenu(TDEListView* /*list*/, TQListViewItem *item, const TQPoint &pos)
{
if(!item || !(m_features & ContextMenus))
return;
KexiBrowserItem *bit = static_cast<KexiBrowserItem*>(item);
- KPopupMenu *pm = 0;
+ TDEPopupMenu *pm = 0;
if (bit->item()) {
pm = m_itemPopup;
//update popup title
@@ -762,7 +762,7 @@ void KexiBrowser::slotNewObjectPopupAboutToShow()
KexiPart::PartInfoList *list = Kexi::partManager().partInfoList(); //this list is properly sorted
for (KexiPart::PartInfoListIterator it(*list); it.current(); ++it) {
//add an item to "New object" toolbar popup
- KAction *action = m_mainWin->actionCollection()->action(
+ TDEAction *action = m_mainWin->actionCollection()->action(
TQString(KexiPart::nameForCreateAction(*it.current())).ascii() );
if (action) {
action->plug(m_newObjectPopup);
@@ -853,7 +853,7 @@ void KexiBrowser::clear()
//--------------------------------------------
KexiBrowserListView::KexiBrowserListView(TQWidget *parent)
- : KListView(parent, "KexiBrowserListView")
+ : TDEListView(parent, "KexiBrowserListView")
, nameEndsWithAsterisk(false)
, enableExecuteArea(true)
{
@@ -876,14 +876,14 @@ void KexiBrowserListView::rename(TQListViewItem *item, int c)
nameEndsWithAsterisk = item->text(0).endsWith("*");
if (nameEndsWithAsterisk)
item->setText(0, item->text(0).left(item->text(0).length()-1));
- KListView::rename(item, c);
+ TDEListView::rename(item, c);
adjustColumn(0);
}
}
bool KexiBrowserListView::isExecuteArea( const TQPoint& point )
{
- return enableExecuteArea && KListView::isExecuteArea(point);
+ return enableExecuteArea && TDEListView::isExecuteArea(point);
}
#include "kexibrowser.moc"
diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h
index 602fffe1..d4c8033f 100644
--- a/kexi/widget/kexibrowser.h
+++ b/kexi/widget/kexibrowser.h
@@ -27,12 +27,12 @@
class TQListViewItem;
class KIconLoader;
-class KPopupMenu;
-class KAction;
-class KActionMenu;
-class KActionCollection;
-class KListView;
-class KToolBar;
+class TDEPopupMenu;
+class TDEAction;
+class TDEActionMenu;
+class TDEActionCollection;
+class TDEListView;
+class TDEToolBar;
class KexiBrowserItem;
class KexiView;
class KexiMainWindow;
@@ -129,7 +129,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
void pageSetupForItem( KexiPart::Item* );
protected slots:
- void slotContextMenu(KListView*, TQListViewItem *i, const TQPoint &point);
+ void slotContextMenu(TDEListView*, TQListViewItem *i, const TQPoint &point);
void slotExecuteItem(TQListViewItem *item);
void slotSelectionChanged(TQListViewItem* i);
void slotSettingsChanged(int);
@@ -156,17 +156,17 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
KexiMainWindow *m_mainWin;
int m_features;
KexiBrowserListView *m_list;
- KActionCollection *m_actions;
+ TDEActionCollection *m_actions;
TQAsciiDict<KexiBrowserItem> m_baseItems;
TQIntDict<KexiBrowserItem> m_normalItems;
- KPopupMenu *m_itemPopup, *m_partPopup;
- KAction *m_deleteAction, *m_renameAction,
+ TDEPopupMenu *m_itemPopup, *m_partPopup;
+ TDEAction *m_deleteAction, *m_renameAction,
*m_newObjectAction, // *m_newObjectToolbarAction,
*m_openAction, *m_designAction, *m_editTextAction,
*m_executeAction,
*m_dataExportAction, *m_printAction, *m_pageSetupAction;
- KActionMenu* m_exportActionMenu;
- KPopupMenu* m_newObjectPopup;
+ TDEActionMenu* m_exportActionMenu;
+ TDEPopupMenu* m_newObjectPopup;
int m_itemPopupTitle_id, m_partPopupTitle_id,
m_openAction_id, m_designAction_id, m_editTextAction_id,
m_executeAction_id,
@@ -174,7 +174,7 @@ class KEXIEXTWIDGETS_EXPORT KexiBrowser : public TQWidget
m_printAction_id, m_pageSetupAction_id, m_pageSetupAction_id_sep;
KexiPart::Part *m_prevSelectedPart;
- KToolBar *m_toolbar;
+ TDEToolBar *m_toolbar;
KexiSmallToolButton *m_newObjectToolButton, *m_deleteObjectToolButton;
TQString m_itemsMimeType;
bool m_singleClick : 1;
diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h
index bcfc9479..bd9eb8f5 100644
--- a/kexi/widget/kexibrowser_p.h
+++ b/kexi/widget/kexibrowser_p.h
@@ -24,7 +24,7 @@
#include <klistview.h>
/*! @internal */
-class KexiBrowserListView : public KListView
+class KexiBrowserListView : public TDEListView
{
Q_OBJECT
diff --git a/kexi/widget/kexibrowseritem.cpp b/kexi/widget/kexibrowseritem.cpp
index 99b80095..3c61e77a 100644
--- a/kexi/widget/kexibrowseritem.cpp
+++ b/kexi/widget/kexibrowseritem.cpp
@@ -24,8 +24,8 @@
#include <kiconloader.h>
#include <core/kexipartinfo.h>
-KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i)
- : KListViewItem(parent, i->groupName())
+KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i)
+ : TDEListViewItem(parent, i->groupName())
, m_info(i)
, m_item(0)
{
@@ -36,8 +36,8 @@ KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i)
m_fifoSorting = 1; //because this is top level item
}
-KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(parent, item->name())
+KexiBrowserItem::KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : TDEListViewItem(parent, item->name())
, m_info(i)
, m_item(item)
{
@@ -45,8 +45,8 @@ KexiBrowserItem::KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiP
initItem();
}
-KexiBrowserItem::KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item)
- : KListViewItem(parent, item->name())
+KexiBrowserItem::KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item)
+ : TDEListViewItem(parent, item->name())
, m_info(i)
, m_item(item)
{
@@ -85,7 +85,7 @@ KexiBrowserItem::clearChildren()
TQString KexiBrowserItem::key( int column, bool ascending ) const
{
-// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending)) << endl;
- return m_fifoSorting ? m_sortKey : KListViewItem::key(column,ascending);
+// kdDebug() << "KexiBrowserItem::key() : " << (m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending)) << endl;
+ return m_fifoSorting ? m_sortKey : TDEListViewItem::key(column,ascending);
}
diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h
index 9138dafd..4dfa1232 100644
--- a/kexi/widget/kexibrowseritem.h
+++ b/kexi/widget/kexibrowseritem.h
@@ -33,18 +33,18 @@ namespace KexiPart
//! @short List view item for the navigator widget (KexiBrowser)
//! Used for creating group items as well as object items
-class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public KListViewItem
+class KEXIEXTWIDGETS_EXPORT KexiBrowserItem : public TDEListViewItem
{
public:
//! Creates group item for part \a i
- KexiBrowserItem(KListView *parent, KexiPart::Info *i);
+ KexiBrowserItem(TDEListView *parent, KexiPart::Info *i);
//! Creates item for object \a item defined by part \a i for \a parent
- KexiBrowserItem(KListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item);
+ KexiBrowserItem(TDEListViewItem *parent, KexiPart::Info *i, KexiPart::Item *item);
//! Creates item for object \a item defined by part \a i, without parent
//! (used in a case when KexiBrowser::itemsMimeType() is not empty)
- KexiBrowserItem(KListView *parent, KexiPart::Info *i, KexiPart::Item *item);
+ KexiBrowserItem(TDEListView *parent, KexiPart::Info *i, KexiPart::Item *item);
virtual ~KexiBrowserItem();
diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp
index 29bd06d0..6dc75abb 100644
--- a/kexi/widget/kexidataawareview.cpp
+++ b/kexi/widget/kexidataawareview.cpp
@@ -188,7 +188,7 @@ void KexiDataAwareView::reloadActions()
//warning FIXME Move this to the table part
/*
kdDebug()<<"INIT ACTIONS***********************************************************************"<<endl;
- new KAction(i18n("Filter"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter");
+ new TDEAction(i18n("Filter"), "filter", 0, TQT_TQOBJECT(this), TQT_SLOT(filter()), actionCollection(), "tablepart_filter");
setXMLFile("kexidatatableui.rc");
*/
m_dataAwareObject->contextMenu()->clear();
diff --git a/kexi/widget/kexidatatable.h b/kexi/widget/kexidatatable.h
index b82e4f62..68f9caf0 100644
--- a/kexi/widget/kexidatatable.h
+++ b/kexi/widget/kexidatatable.h
@@ -28,7 +28,7 @@ class KexiMainWindow;
class KexiDataTableView;
class KexiTableView;
class KexiTableViewData;
-class KPopupMenu;
+class TDEPopupMenu;
namespace KexiDB
{
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 07a3f4ab..fe81b9eb 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -43,7 +43,7 @@
#include <kexiutils/utils.h>
KexiFieldListView::KexiFieldListView(TQWidget *parent, const char *name, int options)
- : KListView(parent, name)
+ : TDEListView(parent, name)
, m_schema(0)
, m_keyIcon(SmallIcon("key"))
, m_noIcon(KexiUtils::emptyIcon(KIcon::Small))
@@ -87,7 +87,7 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema)
int order=0;
bool hasPKeys = true; //t->hasPrimaryKeys();
- KListViewItem *item = 0;
+ TDEListViewItem *item = 0;
KexiDB::QueryColumnInfo::Vector columns = m_schema->columns(true /*unique*/);
const int count = columns.count();
for(int i=-1; i < count; i++)
@@ -96,12 +96,12 @@ void KexiFieldListView::setSchema(KexiDB::TableOrQuerySchema* schema)
if (i==-1) {
if (! (m_options & ShowAsterisk))
continue;
- item = new KListViewItem(this, item, i18n("* (All Columns)"));
+ item = new TDEListViewItem(this, item, i18n("* (All Columns)"));
m_allColumnsItem = item;
}
else {
colinfo = columns[i];
- item = new KListViewItem(this, item, colinfo->aliasOrName());
+ item = new TDEListViewItem(this, item, colinfo->aliasOrName());
if (m_options & ShowDataTypes)
item->setText(1, colinfo->field->typeName());
}
diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h
index a5630a30..e936cc89 100644
--- a/kexi/widget/kexifieldlistview.h
+++ b/kexi/widget/kexifieldlistview.h
@@ -24,7 +24,7 @@
#include <tqpixmap.h>
#include <klistview.h>
-class KListViewItem;
+class TDEListViewItem;
namespace KexiDB {
class TableOrQuerySchema;
@@ -32,7 +32,7 @@ namespace KexiDB {
/*! This widget provides a list of fields from a table or query.
*/
-class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
+class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public TDEListView
{
Q_OBJECT
@@ -77,7 +77,7 @@ class KEXIEXTWIDGETS_EXPORT KexiFieldListView : public KListView
TQPixmap m_keyIcon; //!< a small "primary key" icon for 0-th column
TQPixmap m_noIcon; //!< blank icon of the same size as m_keyIcon
int m_options;
- KListViewItem *m_allColumnsItem;
+ TDEListViewItem *m_allColumnsItem;
};
#endif
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 82b6489e..8852f81c 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -44,7 +44,7 @@ KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, const TQString& text,
update(text, iconSet);
}
-KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, KAction* action)
+KexiSmallToolButton::KexiSmallToolButton(TQWidget* parent, TDEAction* action)
: TQToolButton(parent, action->name())
, m_action(action)
{
diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h
index 3f8dd615..13aad9e8 100644
--- a/kexi/widget/kexismalltoolbutton.h
+++ b/kexi/widget/kexismalltoolbutton.h
@@ -38,7 +38,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton
KexiSmallToolButton(TQWidget* parent, const TQString& text,
const TQIconSet& iconSet, const char* name = 0);
- KexiSmallToolButton(TQWidget* parent, KAction *action);
+ KexiSmallToolButton(TQWidget* parent, TDEAction *action);
virtual ~KexiSmallToolButton();
@@ -54,7 +54,7 @@ class KEXIEXTWIDGETS_EXPORT KexiSmallToolButton : public TQToolButton
void init();
virtual void drawButton( TQPainter *_painter );
- TQGuardedPtr<KAction> m_action;
+ TQGuardedPtr<TDEAction> m_action;
};
#endif
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index f3224c7e..d7e2dae1 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -365,7 +365,7 @@ void
PixmapCollectionEditor::displayMenu(TQIconViewItem *it, const TQPoint &p)
{
if(!it) return;
- KPopupMenu *menu = new KPopupMenu();
+ TDEPopupMenu *menu = new TDEPopupMenu();
menu->insertItem(SmallIconSet("edit"), i18n("Rename Item"), this, TQT_SLOT(renameItem()));
menu->insertItem(SmallIconSet("remove"), i18n("Remove Item"), this, TQT_SLOT(removeItem()));
menu->exec(p);
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;
};
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.h b/kexi/widget/tableview/kexidataawareobjectiface.h
index 0fed82b6..5d87ad88 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.h
+++ b/kexi/widget/tableview/kexidataawareobjectiface.h
@@ -36,7 +36,7 @@
class TQObject;
class TQScrollBar;
-class KPopupMenu;
+class TDEPopupMenu;
class KexiTableItem;
class KexiTableViewData;
class KexiRecordMarker;
@@ -419,7 +419,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
virtual void dataSet( KexiTableViewData *data ) = 0;
/*! \return a pointer to context menu. This can be used to plug some actions there. */
- KPopupMenu* contextMenu() const { return m_popupMenu; }
+ TDEPopupMenu* contextMenu() const { return m_popupMenu; }
/*! \return true if the context menu is enabled (visible) for the view.
True by default. */
@@ -818,7 +818,7 @@ class KEXIDATATABLE_EXPORT KexiDataAwareObjectInterface
int m_dragIndicatorLine;
/*! Context menu widget. */
- KPopupMenu *m_popupMenu;
+ TDEPopupMenu *m_popupMenu;
bool m_contextMenuEnabled : 1;
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index a132e829..e4a6288e 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -63,10 +63,10 @@ KexiDataTableView::init()
// connect(verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), this, TQT_SLOT(slotMoving(int)));
}
-/*void KexiDataTableView::initActions(KActionCollection *col)
+/*void KexiDataTableView::initActions(TDEActionCollection *col)
{
KexiTableView::initActions(col);
- new KAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
+ new TDEAction(i18n("Filter"), "filter", 0, this, TQT_SLOT(filter()), col, "tablepart_filter");
}*/
bool KexiDataTableView::setData(KexiDB::Cursor *cursor)
diff --git a/kexi/widget/tableview/kexidatatableview.h b/kexi/widget/tableview/kexidatatableview.h
index 8592e1b8..120c9817 100644
--- a/kexi/widget/tableview/kexidatatableview.h
+++ b/kexi/widget/tableview/kexidatatableview.h
@@ -56,7 +56,7 @@ class KEXIDATATABLE_EXPORT KexiDataTableView : public KexiTableView
~KexiDataTableView();
-// virtual void initActions(KActionCollection *col);
+// virtual void initActions(TDEActionCollection *col);
/*! Fills table view with data using \a cursor. \return true on success.
Cursor \a cursor will not be owned by this object. */
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 4303e551..b975fcdf 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -217,7 +217,7 @@ KexiTableView::KexiTableView(KexiTableViewData* data, TQWidget* parent, const ch
verticalScrollBar()->raise();
//context menu
- m_popupMenu = new KPopupMenu(this, "contextMenu");
+ m_popupMenu = new TDEPopupMenu(this, "contextMenu");
#if 0 //moved to mainwindow's actions
d->menu_id_addRecord = m_popupMenu->insertItem(i18n("Add Record"), this, TQT_SLOT(addRecord()), TQt::CTRL+TQt::Key_Insert);
d->menu_id_removeRecord = m_popupMenu->insertItem(
@@ -322,7 +322,7 @@ void KexiTableView::clearVariables()
d->clearVariables();
}
-/*void KexiTableView::initActions(KActionCollection *ac)
+/*void KexiTableView::initActions(TDEActionCollection *ac)
{
emit reloadActions(ac);
}*/
@@ -1224,11 +1224,11 @@ static bool overrideEditorShortcutNeeded(TQKeyEvent *e)
bool KexiTableView::shortCutPressed( TQKeyEvent *e, const TQCString &action_name )
{
const int k = e->key();
- KAction *action = m_sharedActions[action_name];
+ TDEAction *action = m_sharedActions[action_name];
if (action) {
if (!action->isEnabled())//this action is disabled - don't process it!
return false;
- if (action->shortcut() == KShortcut( KKey(e) )) {
+ if (action->shortcut() == TDEShortcut( KKey(e) )) {
//special cases when we need to override editor's shortcut
if (overrideEditorShortcutNeeded(e)) {
return true;
diff --git a/kexi/widget/tableview/kexitableview.h b/kexi/widget/tableview/kexitableview.h
index f4364eb8..2e1d83fd 100644
--- a/kexi/widget/tableview/kexitableview.h
+++ b/kexi/widget/tableview/kexitableview.h
@@ -42,16 +42,16 @@
#include <widget/utils/kexisharedactionclient.h>
#include "kexidataawareobjectiface.h"
-class KPopupMenu;
+class TDEPopupMenu;
class KPrinter;
-class KAction;
+class TDEAction;
class KexiTableHeader;
class KexiTableItem;
class KexiTableView;
class KexiTableEdit;
class KexiTableViewPrivate;
-class KActionCollection;
+class TDEActionCollection;
namespace KexiDB {
class RowEditBuffer;
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index 30ecab17..eb735a49 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -44,8 +44,8 @@ public:
{
}
- KActionCollection actionCollection;
- KAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction,
+ TDEActionCollection actionCollection;
+ TDEAction *insertFromFileAction, *saveAsAction, *cutAction, *copyAction, *pasteAction,
*deleteAction
#ifdef KEXI_NO_UNFINISHED
, *propertiesAction
@@ -56,13 +56,13 @@ public:
//------------
KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
- : KPopupMenu(parent)
+ : TDEPopupMenu(parent)
, d( new Private(this) )
{
setName("KexiImageContextMenu");
insertTitle(TQString());
- d->insertFromFileAction = new KAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0,
+ d->insertFromFileAction = new TDEAction(i18n("Insert From &File..."), SmallIconSet("fileopen"), 0,
TQT_TQOBJECT(this), TQT_SLOT(insertFromFile()), &d->actionCollection, "insert");
d->insertFromFileAction->plug(this);
d->saveAsAction = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(saveAs()), &d->actionCollection);
@@ -75,14 +75,14 @@ KexiImageContextMenu::KexiImageContextMenu(TQWidget* parent)
d->copyAction->plug(this);
d->pasteAction = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(paste()), &d->actionCollection);
d->pasteAction->plug(this);
- d->deleteAction = new KAction(i18n("&Clear"), SmallIconSet("editdelete"), 0,
+ d->deleteAction = new TDEAction(i18n("&Clear"), SmallIconSet("editdelete"), 0,
TQT_TQOBJECT(this), TQT_SLOT(clear()), &d->actionCollection, "delete");
d->deleteAction->plug(this);
#ifdef KEXI_NO_UNFINISHED
d->propertiesAction = 0;
#else
insertSeparator();
- d->propertiesAction = new KAction(i18n("Properties"), 0, 0,
+ d->propertiesAction = new TDEAction(i18n("Properties"), 0, 0,
this, TQT_SLOT(showProperties()), &d->actionCollection, "properties");
d->propertiesAction->plug(this);
#endif
@@ -128,7 +128,7 @@ void KexiImageContextMenu::insertFromFile()
//save last visited path
// KURL url(fileName);
if (url.isLocalFile())
- KRecentDirs::add(":LastVisitedImagePath", url.directory());
+ TDERecentDirs::add(":LastVisitedImagePath", url.directory());
#endif
emit insertFromFileRequested(url);
@@ -164,7 +164,7 @@ void KexiImageContextMenu::saveAs()
convertKFileDialogFilterToTQFileDialogFilter(KImageIO::pattern(KImageIO::Writing)),
this, 0, i18n("Save Image to File"));
#else
- //! @todo add originalFileName! (requires access to KRecentDirs)
+ //! @todo add originalFileName! (requires access to TDERecentDirs)
TQString fileName = KFileDialog::getSaveFileName(
":LastVisitedImagePath", KImageIO::pattern(KImageIO::Writing), this, i18n("Save Image to File"));
#endif
@@ -180,7 +180,7 @@ void KexiImageContextMenu::saveAs()
#ifdef TQ_WS_WIN
//save last visited path
if (url.isLocalFile())
- KRecentDirs::add(":LastVisitedImagePath", url.directory());
+ TDERecentDirs::add(":LastVisitedImagePath", url.directory());
#endif
TQFile f(fileName);
@@ -238,7 +238,7 @@ void KexiImageContextMenu::updateActionsAvailability()
d->propertiesAction->setEnabled( !valueIsNull );
}
-KActionCollection* KexiImageContextMenu::actionCollection() const
+TDEActionCollection* KexiImageContextMenu::actionCollection() const
{
return &d->actionCollection;
}
@@ -261,7 +261,7 @@ bool KexiContextMenuUtils::updateTitle(TQPopupMenu *menu, const TQString& object
TQMenuItem *item = menu->findItem(id);
if (!item)
return false;
- KPopupTitle *title = dynamic_cast<KPopupTitle *>(item->widget());
+ TDEPopupTitle *title = dynamic_cast<TDEPopupTitle *>(item->widget());
if (!title)
return false;
diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h
index b9f950bf..826b1ebb 100644
--- a/kexi/widget/utils/kexicontextmenuutils.h
+++ b/kexi/widget/utils/kexicontextmenuutils.h
@@ -24,7 +24,7 @@
#include <kpopupmenu.h>
#include <kurl.h>
-class KActionCollection;
+class TDEActionCollection;
class KexiDataItemInterface;
//! @short A set of helpers for updating popup menu titles
@@ -47,7 +47,7 @@ class KEXIGUIUTILS_EXPORT KexiContextMenuUtils
handlers in KexiDBImageBox and KexiBlobTableEdit so these objects can
respond on requests for data handling.
*/
-class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
+class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public TDEPopupMenu
{
Q_OBJECT
@@ -56,7 +56,7 @@ class KEXIGUIUTILS_EXPORT KexiImageContextMenu : public KPopupMenu
KexiImageContextMenu(TQWidget *parent);
virtual ~KexiImageContextMenu();
- KActionCollection* actionCollection() const;
+ TDEActionCollection* actionCollection() const;
/*! Updates title for context menu.
Used in KexiDBWidgetContextMenuExtender::createTitle(TQPopupMenu *menu) and KexiDBImageBox.
diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp
index 7436b9f5..ec7d0630 100644
--- a/kexi/widget/utils/kexisharedactionclient.cpp
+++ b/kexi/widget/utils/kexisharedactionclient.cpp
@@ -30,7 +30,7 @@ KexiSharedActionClient::~KexiSharedActionClient()
{
}
-void KexiSharedActionClient::plugSharedAction(KAction* a)
+void KexiSharedActionClient::plugSharedAction(TDEAction* a)
{
if (!a)
return;
diff --git a/kexi/widget/utils/kexisharedactionclient.h b/kexi/widget/utils/kexisharedactionclient.h
index 58b3bd6a..18b4af11 100644
--- a/kexi/widget/utils/kexisharedactionclient.h
+++ b/kexi/widget/utils/kexisharedactionclient.h
@@ -22,7 +22,7 @@
#include <tqasciidict.h>
-class KAction;
+class TDEAction;
#include <kexi_export.h>
//! The KexiSharedActionClient is an interface using application-wide (shared) actions.
@@ -39,11 +39,11 @@ class KEXIGUIUTILS_EXPORT KexiSharedActionClient
performed at main window's level, so we should give up. Otherwise - default shortcut
will be used (example: Shift+Enter key for "data_save_row" action). \sa KexiTableView::shortCutPressed()
*/
- void plugSharedAction(KAction* a);
+ void plugSharedAction(TDEAction* a);
protected:
//! Actions pluged for this widget using plugSharedAction(), available by name.
- TQAsciiDict<KAction> m_sharedActions;
+ TQAsciiDict<TDEAction> m_sharedActions;
};
#endif
diff --git a/kexi/widget/utils/klistviewitemtemplate.h b/kexi/widget/utils/klistviewitemtemplate.h
index 45a5b889..9a4a3be4 100644
--- a/kexi/widget/utils/klistviewitemtemplate.h
+++ b/kexi/widget/utils/klistviewitemtemplate.h
@@ -24,25 +24,25 @@
//! TQListViewItem class with ability for storing additional data member
template<class type>
-class KListViewItemTemplate : public KListViewItem
+class TDEListViewItemTemplate : public TDEListViewItem
{
public:
- KListViewItemTemplate(type _data, TQListView *parent)
- : KListViewItem(parent), data(_data) {}
- KListViewItemTemplate(type _data, TQListViewItem *parent)
- : KListViewItem(parent), data(_data) {}
- KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after)
- : KListViewItem(parent, after), data(_data) {}
- KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after)
- : KListViewItem(parent, after), data(_data) {}
- KListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
- : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
- KListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
- : KListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
- KListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
- : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
- KListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
- : KListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListView *parent)
+ : TDEListViewItem(parent), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListViewItem *parent)
+ : TDEListViewItem(parent), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after)
+ : TDEListViewItem(parent, after), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after)
+ : TDEListViewItem(parent, after), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListView *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+ : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+ : TDEListViewItem(parent, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListView *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+ : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
+ TDEListViewItemTemplate(type _data, TQListViewItem *parent, TQListViewItem *after, TQString label1, TQString label2=TQString(), TQString label3=TQString(), TQString label4=TQString(), TQString label5=TQString(), TQString label6=TQString(), TQString label7=TQString(), TQString label8=TQString())
+ : TDEListViewItem(parent, after, label1, label2, label3, label4, label5, label6, label7, label8), data(_data) {}
type data;
};