diff options
Diffstat (limited to 'kexi')
87 files changed, 159 insertions, 159 deletions
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 72004434..fd3e2b2c 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -21,9 +21,9 @@ #include "kexiactionproxy_p.h" #include <kdebug.h> -#include <kaction.h> -#include <kmainwindow.h> -#include <kshortcut.h> +#include <tdeaction.h> +#include <tdemainwindow.h> +#include <tdeshortcut.h> #include <tqwidget.h> #include <tqsignal.h> diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h index d9868976..aa6498e0 100644 --- a/kexi/core/kexiactionproxy.h +++ b/kexi/core/kexiactionproxy.h @@ -26,7 +26,7 @@ #include <tqpair.h> #include <tqptrlist.h> -#include <kaction.h> +#include <tdeaction.h> #include "kexiproject.h" #include "kexisharedactionhost.h" diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index e806aaaf..63f72d87 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -22,7 +22,7 @@ #include <kxmlguiclient.h> #include <kapplication.h> #include <klocale.h> -#include <kaction.h> +#include <tdeaction.h> #include <tqlayout.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index 5b2046d6..9a7ada11 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -26,7 +26,7 @@ #include <tqpair.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> class TDEShortcut; class KGuiItem; diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h index eef28a19..9c93a548 100644 --- a/kexi/core/kexisharedactionhost_p.h +++ b/kexi/core/kexisharedactionhost_p.h @@ -24,7 +24,7 @@ #include <tqptrdict.h> #include <tqsignalmapper.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include "kexiactionproxy.h" @@ -34,7 +34,7 @@ class KexiVolatileActionData { public: KexiVolatileActionData() { plugged=false; } -// TDEAction *kaction; +// TDEAction *tdeaction; bool plugged : 1; }; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index 5a79929e..3bc22a7a 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -1,6 +1,6 @@ #include <kmessagebox.h> #include <kdebug.h> -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kexidb/cursor.h> diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h index 602d5751..c64e08cd 100644 --- a/kexi/core/kexiuseraction.h +++ b/kexi/core/kexiuseraction.h @@ -1,7 +1,7 @@ #ifndef KEXIUSERACTION_H #define KEXIUSERACTION_H -#include <kaction.h> +#include <tdeaction.h> #include "kexiuseractionmethod.h" diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index d7274acb..12636f71 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -815,7 +815,7 @@ Key on the main menu, OR use Property Editor. - In the Property Editor, is not obvious how to change a boolean property. Alt+DownArrow does not work. - It is not possible to change the value of a -property in the property editor that has a picklist of possible values, for example, +property in the property editor that has a pictdelist of possible values, for example, SubType. Alt+DownArrow does not work. - When creating a query, it is not possible to add a table to the query. - Not possible to select a column, table, diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index fece5065..29cbfcaa 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -26,9 +26,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include "formIO.h" #include "container.h" diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 246940c7..3f7d201b 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <cstdlib> // for abs() diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 0287135e..eca07032 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -19,9 +19,9 @@ #include <tqheader.h> #include <tqlayout.h> -#include <klistview.h> +#include <tdelistview.h> #include <ktabwidget.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kiconloader.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 1669b329..ebc9606f 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -25,9 +25,9 @@ #include <kpushbutton.h> #include <knuminput.h> #include <kcombobox.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <ktextedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <kprogress.h> #include <kiconloader.h> #include <kgenericfactory.h> @@ -219,7 +219,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wListBox->setPixmap("listbox"); wListBox->setClassName("TDEListBox"); wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING); - wListBox->setIncludeFileName("klistbox.h"); + wListBox->setIncludeFileName("tdelistbox.h"); wListBox->setName(i18n("List Box")); wListBox->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "listBox")); @@ -241,7 +241,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wListView->setPixmap("listview"); wListView->setClassName("TDEListView"); wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING); - wListView->setIncludeFileName("klistview.h"); + wListView->setIncludeFileName("tdelistview.h"); wListView->setName(i18n("List View")); wListView->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "listView")); diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 31344419..1e185d6d 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <klocale.h> #include <kcommand.h> -#include <kaction.h> +#include <tdeaction.h> #include <kmessagebox.h> #include "container.h" diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 993b2451..264b3bad 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -36,7 +36,7 @@ #include <tdefiledialog.h> #include <klocale.h> #include <kcommand.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include "form.h" #include "container.h" diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 284ce405..b3875169 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -33,26 +33,26 @@ #include <klocale.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kstdaction.h> -#include <kaction.h> +#include <tdeaction.h> #include <kxmlguiclient.h> -#include <kmainwindow.h> +#include <tdemainwindow.h> #include <kmessagebox.h> #include <tdeconfig.h> #include <kstyle.h> -#include <kactionclasses.h> +#include <tdeactionclasses.h> #include <kapplication.h> #include <kglobal.h> #include <kglobalsettings.h> #include <kdialogbase.h> #include <ktextedit.h> #include <ktabwidget.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <tdeversion.h> #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) -# include <kactioncollection.h> +# include <tdeactioncollection.h> #endif #include "widgetpropertyset.h" diff --git a/kexi/formeditor/libactionwidget.h b/kexi/formeditor/libactionwidget.h index c546ac9d..e396a6e7 100644 --- a/kexi/formeditor/libactionwidget.h +++ b/kexi/formeditor/libactionwidget.h @@ -22,7 +22,7 @@ #define LIBACTIONWIDGET_H -#include <kactionclasses.h> +#include <tdeactionclasses.h> namespace KFormDesigner { diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index e1b6932b..8236f877 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -20,7 +20,7 @@ #ifndef OBJECTTREEVIEW_H #define OBJECTTREEVIEW_H -#include <klistview.h> +#include <tdelistview.h> namespace KFormDesigner { diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 1461536d..291b96dc 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -18,10 +18,10 @@ */ #include <tqlayout.h> -#include <ktoolbar.h> -#include <kfontcombo.h> +#include <tdetoolbar.h> +#include <tdefontcombo.h> #include <kcolorcombo.h> -#include <ktoolbarradiogroup.h> +#include <tdetoolbarradiogroup.h> #include <kdebug.h> #include <klocale.h> diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index c897f243..83b63cc8 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -26,7 +26,7 @@ #include <tqobjectlist.h> #include <tdeversion.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinstance.h> #include <klocale.h> #include <kaboutdata.h> diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp index ab1592e1..87f78c4c 100644 --- a/kexi/formeditor/test/kfd_mainwindow.cpp +++ b/kexi/formeditor/test/kfd_mainwindow.cpp @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include <kaction.h> +#include <tdeaction.h> #include <kstdaction.h> #include <kurl.h> #include <kdebug.h> diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 38d99e5a..176db016 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -26,7 +26,7 @@ #include <tqobjectlist.h> #include <tdeversion.h> -#include <kaction.h> +#include <tdeaction.h> #include <kinstance.h> #include <klocale.h> #include <kaboutdata.h> diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 9bec64ba..9537085e 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -36,7 +36,7 @@ #include <kdialogbase.h> #include <keditlistbox.h> #include <kxmlguiclient.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include "richtextdialog.h" #include "editlistviewdialog.h" diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index a21c4f3f..fcb0ffe6 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -28,7 +28,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kiconloader.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include "widgetfactory.h" #include "widgetlibrary.h" diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index 4119af75..08884ff0 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <ktabwidget.h> -#include <klistview.h> +#include <tdelistview.h> #include <kiconloader.h> #include <kdialogbase.h> #include <kpushbutton.h> diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 8ca17429..255e1882 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kdebug.h> #include <kdialog.h> -#include <kaction.h> +#include <tdeaction.h> #include <kiconloader.h> #include <tqcheckbox.h> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4bfaef61..2dd9ebe1 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -38,9 +38,9 @@ #include <kapplication.h> #include <kcmdlineargs.h> -#include <kaction.h> +#include <tdeaction.h> #include <klocale.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <tdeconfig.h> #include <kglobal.h> #include <kdebug.h> @@ -58,7 +58,7 @@ #include <kimageio.h> #include <khelpmenu.h> #include <tdefiledialog.h> -#include <krecentdocument.h> +#include <tderecentdocument.h> #include <kexidb/connection.h> #include <kexidb/utils.h> @@ -102,7 +102,7 @@ //Extreme verbose debug #if defined(TQ_WS_WIN) -# include <krecentdirs.h> +# include <tderecentdirs.h> # include <win32_utils.h> //# define KexiVDebug kdDebug() #endif diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 7ca0ceb4..49ebd9fd 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <ktar.h> #include <tqdir.h> -#include <kaction.h> +#include <tdeaction.h> #include <kapplication.h> #include <tdefiledialog.h> #include <klocale.h> diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 66fe0028..36560959 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -25,7 +25,7 @@ #include <kapplication.h> #include <kiconloader.h> #include <klocale.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kurllabel.h> #include <kdebug.h> diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index de3f64e2..0388eebe 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kiconloader.h> #include <klocale.h> -#include <kfontdialog.h> +#include <tdefontdialog.h> #include <kurllabel.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index e587556b..0d6634ab 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -28,7 +28,7 @@ #include <tqlabel.h> #include <kdialogbase.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <klocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h index c966553f..5e42bf55 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <tqscrollview.h> -#include <ktoolbar.h> +#include <tdetoolbar.h> #include <KoPageLayoutDia.h> class KexiSimplePrintPreviewScrollView; diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 22b09eef..2558b4e7 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -35,10 +35,10 @@ #include <kdebug.h> #include <tdeconfig.h> #include <kurlcombobox.h> -#include <ktoolbar.h> -#include <kpopupmenu.h> -#include <ktoolbarbutton.h> -#include <kactionclasses.h> +#include <tdetoolbar.h> +#include <tdepopupmenu.h> +#include <tdetoolbarbutton.h> +#include <tdeactionclasses.h> #include <tqlabel.h> #include <tqpushbutton.h> diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h index ab4ed10a..7bd3c8fb 100644 --- a/kexi/main/startup/KexiConnSelector.h +++ b/kexi/main/startup/KexiConnSelector.h @@ -25,7 +25,7 @@ #include "KexiStartupFileDialog.h" #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <tqguardedptr.h> diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 9ea3a0db..5e4e0283 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -89,6 +89,6 @@ </functions> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 44fb7026..e7f613e6 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -38,7 +38,7 @@ #include <klocale.h> #include <kdebug.h> #include <tdeconfig.h> -#include <klistview.h> +#include <tdelistview.h> #include <kurlcombobox.h> #include <kmessagebox.h> #include <klineedit.h> diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h index 07b8b663..74591986 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h @@ -20,7 +20,7 @@ #ifndef KexiStartupDialogTemplatesPage_h #define KexiStartupDialogTemplatesPage_h -#include <klistview.h> +#include <tdelistview.h> #include <core/kexiprojectdata.h> /*! Helper class for displaying templates set with description. */ diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 29567ce0..ff2981f7 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -27,7 +27,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <krecentdirs.h> +#include <tderecentdirs.h> #include <tqobjectlist.h> #include <tqlineedit.h> diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 59cfefa5..4ba3b859 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -27,8 +27,8 @@ #include <kexipart.h> #include <kexiactioncategories.h> -#include <klistview.h> -#include <kaction.h> +#include <tdelistview.h> +#include <tdeaction.h> #include <kiconloader.h> #include <kdebug.h> #include <kstdguiitem.h> @@ -41,7 +41,7 @@ #include <tqtooltip.h> #include <tqwidgetstack.h> -#include <widget/utils/klistviewitemtemplate.h> +#include <widget/utils/tdelistviewitemtemplate.h> #include <widget/kexibrowser.h> #include <widget/kexibrowseritem.h> #include <kexiutils/utils.h> @@ -194,7 +194,7 @@ public: TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") ); const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); item->setPixmap(0, noIcon); - item = new ActionSelectorDialogListItem("kaction", this, i18n("Application actions") ); + item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") ); item->setPixmap(0, SmallIcon("form_action")); KexiPart::PartInfoList *pl = Kexi::partManager().partInfoList(); @@ -331,7 +331,7 @@ class KexiActionSelectionDialog::KexiActionSelectionDialogPrivate { public: KexiActionSelectionDialogPrivate() - : kactionPageWidget(0), kactionListView(0), objectsListView(0) + : tdeactionPageWidget(0), tdeactionListView(0), objectsListView(0) , currentFormActionsPageWidget(0) , currentFormActionsListView(0) , secondAnd3rdColumnMainWidget(0) @@ -376,8 +376,8 @@ public: KexiMainWindow* mainWin; TQString actionWidgetName; ActionCategoriesListView* actionCategoriesListView; //!< for column #1 - TQWidget *kactionPageWidget; - TDEActionsListView* kactionListView; //!< for column #2 + TQWidget *tdeactionPageWidget; + TDEActionsListView* tdeactionListView; //!< for column #2 KexiBrowser* objectsListView; //!< for column #2 TQWidget *currentFormActionsPageWidget; //!< for column #2 CurrentFormActionsListView* currentFormActionsListView; //!< for column #2 @@ -419,9 +419,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ \______________________________________________/ glyr [a]- TQWidgetStack *secondAnd3rdColumnStack, - - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget + - for displaying TDEActions, the stack contains d->tdeactionPageWidget TQWidget - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr - - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView + - tdeactionPageWidget contains only a TQVBoxLayout and label+tdeactionListView */ d->glyr = new TQGridLayout(mainWidget, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); d->glyr->setRowStretch(1, 1); @@ -495,9 +495,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ KexiPart::Info* partInfo = action.decodeString(actionType, actionArg, ok); if (ok) { d->actionCategoriesListView->selectAction(actionType); - if (actionType=="kaction") { - d->kactionListView->selectAction(actionArg); - d->kactionListView->setFocus(); + if (actionType=="tdeaction") { + d->tdeactionListView->selectAction(actionArg); + d->tdeactionListView->setFocus(); } else if (actionType=="currentForm") { d->currentFormActionsListView->selectAction(actionArg); @@ -574,34 +574,34 @@ void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*) void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) { ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>(item); - // simple case: part-less item, e.g. kaction: + // simple case: part-less item, e.g. tdeaction: if (simpleItem) { d->updateSelectActionToBeExecutedMessage(simpleItem->data); TQString selectActionToBeExecutedMsg( i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label - if (simpleItem->data == "kaction") { - if (!d->kactionPageWidget) { + if (simpleItem->data == "tdeaction") { + if (!d->tdeactionPageWidget) { //create lbl+list view with a vlayout - d->kactionPageWidget = new TQWidget(); - d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); - d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin); - d->kactionListView->init(); - TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), - d->kactionPageWidget); + d->tdeactionPageWidget = new TQWidget(); + d->tdeactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + TQVBoxLayout *vlyr = new TQVBoxLayout(d->tdeactionPageWidget, 0, KDialog::spacingHint()); + d->tdeactionListView = new TDEActionsListView(d->tdeactionPageWidget, d->mainWin); + d->tdeactionListView->init(); + TQLabel *lbl = new TQLabel(d->tdeactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), + d->tdeactionPageWidget); lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); - vlyr->addWidget(d->kactionListView); - d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget); - connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)), + vlyr->addWidget(d->tdeactionListView); + d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget); + connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); - connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); - d->raiseWidget(d->kactionPageWidget); - slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 + d->raiseWidget(d->tdeactionPageWidget); + slotTDEActionItemSelected(d->tdeactionListView->selectedItem()); //to refresh column #3 } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { @@ -669,12 +669,12 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const KexiFormEventAction::ActionData data; ActionSelectorDialogListItem *simpleItem = dynamic_cast<ActionSelectorDialogListItem*>( d->actionCategoriesListView->selectedItem()); - // simple case: part-less item, e.g. kaction: + // simple case: part-less item, e.g. tdeaction: if (simpleItem) { - if (simpleItem->data == "kaction") { - if (d->kactionListView->selectedItem()) { - data.string = TQString("kaction:") - + dynamic_cast<ActionSelectorDialogListItem*>( d->kactionListView->selectedItem() )->data; + if (simpleItem->data == "tdeaction") { + if (d->tdeactionListView->selectedItem()) { + data.string = TQString("tdeaction:") + + dynamic_cast<ActionSelectorDialogListItem*>( d->tdeactionListView->selectedItem() )->data; return data; } } diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h index f0527132..670ede5a 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog_p.h +++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h @@ -20,7 +20,7 @@ #ifndef KEXIACTIONSELECTIONDIALOG_P_H #define KEXIACTIONSELECTIONDIALOG_P_H -#include <klistview.h> +#include <tdelistview.h> //! @internal class ActionsListViewBase : public TDEListView diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index b89031a7..c98ca67a 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -26,9 +26,9 @@ #include <kiconloader.h> #include <klocale.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <widget/kexipropertyeditorview.h> #include <widget/kexidatasourcecombobox.h> diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 8bb55bce..9f63c09c 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <kdebug.h> #include <kiconloader.h> -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <kstdaction.h> #include <formeditor/container.h> diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 365f5cb4..4d1f0ec7 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -55,7 +55,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( if (_actionType.isEmpty() || _actionArg.isEmpty()) return 0; KexiPart::Info *info = 0; - if (_actionType!="kaction" && _actionType!="currentForm") { + if (_actionType!="tdeaction" && _actionType!="currentForm") { info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) ); if (!info) return 0; @@ -170,7 +170,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin KexiPart::Info* partInfo = data.decodeString(actionType, actionArg, ok); if (!ok) continue; - if (actionType=="kaction" || actionType=="currentForm") { + if (actionType=="tdeaction" || actionType=="currentForm") { TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h index 69b9a20c..d7063b19 100644 --- a/kexi/plugins/forms/kexiformeventhandler.h +++ b/kexi/plugins/forms/kexiformeventhandler.h @@ -21,7 +21,7 @@ #define KEXIFORMEVENTHANDLER_H #include <tqwidget.h> -#include <kaction.h> +#include <tdeaction.h> class KexiMainWindow; namespace KexiPart { @@ -65,19 +65,19 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction /*! Decodes action string into action type/action argument parts. Action string has to be in a form of "actiontype:actionarg" - - Action type is passed to \a actionType on success. Action type can be "kaction" + - Action type is passed to \a actionType on success. Action type can be "tdeaction" or any of the part names (see KexiPart::Info::objectName()), e.g. "table", "query", etc. - - Action argument can be an action name in case of "kaction" type or object name + - Action argument can be an action name in case of "tdeaction" type or object name in case of action of type "table", "query", etc. \a ok is set to true on success and to false on failure. On failure no other values are passed. - \return part info if action type is "table", "query", etc., or 0 for "kaction" type. */ + \return part info if action type is "table", "query", etc., or 0 for "tdeaction" type. */ KexiPart::Info* decodeString(TQString& actionType, TQString& actionArg, bool& ok) const; //! \return true if the action is empty bool isEmpty() const; - TQString string; //!< action string with prefix, like "kaction:edit_copy" or "table:<tableName>" + TQString string; //!< action string with prefix, like "tdeaction:edit_copy" or "table:<tableName>" TQString option; //!< option used when name is "table/query/etc.:\<objectName\>" is set; //!< can be set to "open", "design", "editText", etc. diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index b96e4814..d0db5f94 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <kdialogbase.h> -#include <klistview.h> +#include <tdelistview.h> #include <ktabwidget.h> #include <kiconloader.h> #include <kcombobox.h> diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index b73cf8ea..4e0677f8 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -27,7 +27,7 @@ #include <formeditor/commands.h> #include <widget/utils/kexirecordmarker.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index cf8c1d70..2b72fc53 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -21,7 +21,7 @@ #include "kexidbdateedit.h" #include <tqlayout.h> #include <tqtoolbutton.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatepicker.h> #include <kdatetbl.h> diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 763bdf02..65edd28a 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -22,7 +22,7 @@ #include <tqtoolbutton.h> #include <tqlayout.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <kexiutils/utils.h> diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index eaf91044..ed441d4f 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -31,7 +31,7 @@ #include <tqpainter.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kiconloader.h> #include <tdefiledialog.h> @@ -39,7 +39,7 @@ #include <kstandarddirs.h> #include <kstaticdeleter.h> #include <kimageeffect.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kmessagebox.h> #include <kguiitem.h> @@ -53,7 +53,7 @@ #ifdef TQ_WS_WIN #include <win32_utils.h> -#include <krecentdirs.h> +#include <tderecentdirs.h> #endif #include "kexidbutils.h" diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index de928e37..8967258b 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -23,7 +23,7 @@ #include <kexidb/queryschema.h> #include <kapplication.h> -#include <kstdaccel.h> +#include <tdestdaccel.h> #include <kdebug.h> #include <tqpainter.h> diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index b136fa0d..5473a9cb 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqpainter.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <kexiutils/utils.h> diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp index 863b5d80..0f6f993a 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.cpp +++ b/kexi/plugins/forms/widgets/kexidbutils.cpp @@ -19,7 +19,7 @@ #include "kexidbutils.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kiconloader.h> #include <kexidb/queryschema.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 20fba8fe..3c96cd09 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -72,7 +72,7 @@ #include "kexicsvwidgets.h" #ifdef TQ_WS_WIN -#include <krecentdirs.h> +#include <tderecentdirs.h> #include <windows.h> #endif diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index b3bfcad8..6a9d2964 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -26,7 +26,7 @@ #include <tqlabel.h> #include <tqpushbutton.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kiconloader.h> #include <kglobal.h> diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 707b2cb3..f03c6aca 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -208,6 +208,6 @@ </connections> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index 7741073f..d0077120 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -81,7 +81,7 @@ </widget> <layoutdefaults spacing="6" margin="11"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> <includehint>kpushbutton.h</includehint> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index da27f890..85ee5ce6 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -22,7 +22,7 @@ #include <tqclipboard.h> #include <tqregexp.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <klocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 110000aa..8e4db059 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -28,8 +28,8 @@ //#include <tdeparts/factory.h> //#include <klibloader.h> //#include <tdemdimainfrm.h> -//#include <kmainwindow.h> -#include <kpopupmenu.h> +//#include <tdemainwindow.h> +#include <tdepopupmenu.h> #include <kexidialogbase.h> diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 4bd08e5b..1ed65ddc 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -26,9 +26,9 @@ #include <kiconloader.h> #include <klocale.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <kdebug.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <widget/kexipropertyeditorview.h> #include <widget/kexidatasourcecombobox.h> diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp index c5368b26..4f6c9ff9 100644 --- a/kexi/plugins/tables/kexitabledesignercommands.cpp +++ b/kexi/plugins/tables/kexitabledesignercommands.cpp @@ -25,9 +25,9 @@ #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> -#include <kaccelmanager.h> +#include <tdeaccelmanager.h> #include <koproperty/property.h> diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 62ab4cbf..7fa1c3b3 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <kdebug.h> #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <kiconeffect.h> diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index a9254ba4..761107c2 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -27,8 +27,8 @@ #include <kiconloader.h> #include <kdebug.h> #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <koproperty/set.h> diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi Binary files differindex ee61c8b1..d3fccc0d 100644 --- a/kexi/tests/altertable/1.kexi +++ b/kexi/tests/altertable/1.kexi diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 00586a53..5ec6ed06 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -33,8 +33,8 @@ #include <kiconloader.h> #include <kdebug.h> #include <klocale.h> -#include <kpopupmenu.h> -#include <klistview.h> +#include <tdepopupmenu.h> +#include <tdelistview.h> #include <kmessagebox.h> #include <klineedit.h> #include <kimageeffect.h> diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h index d4c8033f..3da16500 100644 --- a/kexi/widget/kexibrowser.h +++ b/kexi/widget/kexibrowser.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSER_H #define KEXIBROWSER_H -#include <klistview.h> +#include <tdelistview.h> #include <tqasciidict.h> #include <tqintdict.h> diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h index bd9eb8f5..880e7237 100644 --- a/kexi/widget/kexibrowser_p.h +++ b/kexi/widget/kexibrowser_p.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSER_P_H #define KEXIBROWSER_P_H -#include <klistview.h> +#include <tdelistview.h> /*! @internal */ class KexiBrowserListView : public TDEListView diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h index 4dfa1232..e4a35baa 100644 --- a/kexi/widget/kexibrowseritem.h +++ b/kexi/widget/kexibrowseritem.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSERITEM_H #define KEXIBROWSERITEM_H -#include <klistview.h> +#include <tdelistview.h> #include <tqstring.h> #include <core/kexipartitem.h> diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 6dc75abb..034b3f70 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name) : KexiViewBase(mainWin, parent, name) diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 725a560b..effafb38 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klistbox.h> +#include <tdelistbox.h> #include <kexi.h> #include <kexiproject.h> diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index 0be99a4a..797fa440 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -25,8 +25,8 @@ #include <kiconloader.h> #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kexidb/cursor.h> diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index e936cc89..056ffc9b 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -22,7 +22,7 @@ #include <tqframe.h> #include <tqpixmap.h> -#include <klistview.h> +#include <tdelistview.h> class TDEListViewItem; diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h index 13aad9e8..d948f586 100644 --- a/kexi/widget/kexismalltoolbutton.h +++ b/kexi/widget/kexismalltoolbutton.h @@ -21,7 +21,7 @@ #define KEXISMALLTOOLBUTTON_H #include <tqtoolbutton.h> -#include <kaction.h> +#include <tdeaction.h> class TQIconSet; diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index d7e2dae1..ef94b5d2 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -32,7 +32,7 @@ #include <klineedit.h> #include <kicontheme.h> #include <kpixmapio.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index d901d373..5340691f 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -31,8 +31,8 @@ #include <tqpopupmenu.h> #include <klocale.h> -#include <kaction.h> -#include <kpopupmenu.h> +#include <tdeaction.h> +#include <tdepopupmenu.h> #include <kglobalsettings.h> #include <kmessagebox.h> diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 5e3ff332..25faf896 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -24,7 +24,7 @@ #include <tqframe.h> #include <tqstringlist.h> #include <tqlabel.h> -#include <klistview.h> +#include <tdelistview.h> #include <widget/kexifieldlistview.h> diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 43ff7331..91523cb7 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -52,8 +52,8 @@ #include <tdeio/job.h> #include <kglobal.h> #include <kiconloader.h> -#include <kpopupmenu.h> -#include <kstdaccel.h> +#include <tdepopupmenu.h> +#include <tdestdaccel.h> #include <kexiutils/utils.h> #include <widget/utils/kexidropdownbutton.h> diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index e4a6288e..8bfc1c48 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -25,7 +25,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kdebug.h> -#include <kaction.h> +#include <tdeaction.h> #include <kexidb/connection.h> #include <kexidb/cursor.h> diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 49bb8a0d..6e538fd1 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -42,7 +42,7 @@ #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatewidget.h> #include <kexiutils/utils.h> diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index 35c599cc..aff64f58 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -42,7 +42,7 @@ #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatewidget.h> #include <kexiutils/utils.h> diff --git a/kexi/widget/tableview/kexitableview_p.h b/kexi/widget/tableview/kexitableview_p.h index b0679dfa..1ba7f791 100644 --- a/kexi/widget/tableview/kexitableview_p.h +++ b/kexi/widget/tableview/kexitableview_p.h @@ -38,10 +38,10 @@ #include <tqasciidict.h> #include <kpushbutton.h> -#include <ktoolbarbutton.h> +#include <tdetoolbarbutton.h> #include <klineedit.h> -#include <kpopupmenu.h> -#include <kaction.h> +#include <tdepopupmenu.h> +#include <tdeaction.h> class KexiTableItem; class KexiTableRM; diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index 8110716b..b6dc69d4 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -40,7 +40,7 @@ #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatewidget.h> #include <kexiutils/utils.h> diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 4931eb19..858ea914 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -19,7 +19,7 @@ #include "kexicomboboxdropdownbutton.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <kcombobox.h> diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index eb735a49..caae10b6 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -19,7 +19,7 @@ #include "kexicontextmenuutils.h" -#include <kactioncollection.h> +#include <tdeactioncollection.h> #include <klocale.h> #include <kiconloader.h> #include <tdefiledialog.h> @@ -32,7 +32,7 @@ #ifdef TQ_WS_WIN #include <win32_utils.h> -#include <krecentdirs.h> +#include <tderecentdirs.h> #endif //! @internal diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h index 826b1ebb..03e0881c 100644 --- a/kexi/widget/utils/kexicontextmenuutils.h +++ b/kexi/widget/utils/kexicontextmenuutils.h @@ -21,7 +21,7 @@ #define KexiContextMenuUtils_H #include <kexidb/queryschema.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kurl.h> class TDEActionCollection; diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 6582b321..21bb24de 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -25,7 +25,7 @@ #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdatewidget.h> KexiDateFormatter::KexiDateFormatter() diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index fa9b2497..c3a14dca 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -19,7 +19,7 @@ #include "kexidropdownbutton.h" -#include <kpopupmenu.h> +#include <tdepopupmenu.h> #include <kdebug.h> #include <tqstyle.h> diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp index ec7d0630..6e38f95b 100644 --- a/kexi/widget/utils/kexisharedactionclient.cpp +++ b/kexi/widget/utils/kexisharedactionclient.cpp @@ -19,7 +19,7 @@ #include "kexisharedactionclient.h" -#include <kaction.h> +#include <tdeaction.h> KexiSharedActionClient::KexiSharedActionClient() : m_sharedActions(1009, false) diff --git a/kexi/widget/utils/tdelistviewitemtemplate.h b/kexi/widget/utils/tdelistviewitemtemplate.h index 9a4a3be4..21430b24 100644 --- a/kexi/widget/utils/tdelistviewitemtemplate.h +++ b/kexi/widget/utils/tdelistviewitemtemplate.h @@ -20,7 +20,7 @@ #ifndef KLISTVIEWITEMTEMPLATE_H #define KLISTVIEWITEMTEMPLATE_H -#include <klistview.h> +#include <tdelistview.h> //! TQListViewItem class with ability for storing additional data member template<class type> |