diff options
Diffstat (limited to 'kexi/widget/utils')
-rw-r--r-- | kexi/widget/utils/kexicontextmenuutils.cpp | 22 | ||||
-rw-r--r-- | kexi/widget/utils/kexicontextmenuutils.h | 6 | ||||
-rw-r--r-- | kexi/widget/utils/kexisharedactionclient.cpp | 2 | ||||
-rw-r--r-- | kexi/widget/utils/kexisharedactionclient.h | 6 | ||||
-rw-r--r-- | kexi/widget/utils/klistviewitemtemplate.h | 34 |
5 files changed, 35 insertions, 35 deletions
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; }; |