diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /kexi | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi')
152 files changed, 223 insertions, 223 deletions
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp index 269607014..90adff174 100644 --- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp +++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp @@ -22,9 +22,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc index 24aa75ed9..a375327fd 100644 --- a/kexi/3rdparty/kolibs/koGlobal.cc +++ b/kexi/3rdparty/kolibs/koGlobal.cc @@ -23,9 +23,9 @@ #include <kdebug.h> #include <tqfont.h> #include <tqfontinfo.h> -#include <kglobalsettings.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kstaticdeleter.h> diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp index b4640a302..6aa0ea66d 100644 --- a/kexi/3rdparty/kolibs/koPageLayout.cpp +++ b/kexi/3rdparty/kolibs/koPageLayout.cpp @@ -20,10 +20,10 @@ */ #include "KoPageLayout.h" #include <KoUnit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprinter.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #ifndef SIMPLE_KOLIBS # include <kodom.h> # include <koxmlns.h> diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc index 99d5e01d1..2f0db91a3 100644 --- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc +++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc @@ -29,9 +29,9 @@ #include <KoUnit.h> #include <KoUnitWidgets.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc index 38c8b1113..a2eb289a1 100644 --- a/kexi/3rdparty/kolibs/koUnit.cc +++ b/kexi/3rdparty/kolibs/koUnit.cc @@ -24,8 +24,8 @@ # include <KoXmlWriter.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdebug.h> #include <tqregexp.h> diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc index 3f6fb09e6..097dfc250 100644 --- a/kexi/3rdparty/kolibs/koUnitWidgets.cc +++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc @@ -20,8 +20,8 @@ #include "koUnitWidgets.moc" #include <kdebug.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tqpushbutton.h> #include <tqlayout.h> diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp index 5ce1bc849..cf17da061 100644 --- a/kexi/core/kexi.cpp +++ b/kexi/core/kexi.cpp @@ -39,7 +39,7 @@ #include <ksharedptr.h> #include <kmimetype.h> #include <kstaticdeleter.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> using namespace Kexi; diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h index 921db42be..f90ec7674 100644 --- a/kexi/core/kexi.h +++ b/kexi/core/kexi.h @@ -31,8 +31,8 @@ #include <kexidb/drivermanager.h> #include <kexidb/driver.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> namespace Kexi { diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp index e41cf0ff2..f35738878 100644 --- a/kexi/core/kexiaboutdata.cpp +++ b/kexi/core/kexiaboutdata.cpp @@ -23,7 +23,7 @@ #include <kexi_version.h> #include <tdeversion.h> #include <kofficeversion.h> //only for KOFFICE_VERSION_STRING -#include <klocale.h> +#include <tdelocale.h> static const char *description = I18N_NOOP("Database creation for everyone") diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h index 5c31f63f9..62cbbe7fb 100644 --- a/kexi/core/kexicmdlineargs.h +++ b/kexi/core/kexicmdlineargs.h @@ -23,7 +23,7 @@ #define KEXICMDLINEARGS_H #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static TDECmdLineOptions options[] = { diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index ac2ed1014..627bd7611 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -21,7 +21,7 @@ #include <KoContextCelp.h> #include <kxmlguiclient.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tqlayout.h> #include <kdebug.h> diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp index 5b2b2791b..eb5bdc241 100644 --- a/kexi/core/kexiguimsghandler.cpp +++ b/kexi/core/kexiguimsghandler.cpp @@ -23,7 +23,7 @@ #include <kexidb/utils.h> #include <kexiutils/utils.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdialogbase.h> KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent) diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp index 0cfce53be..8635fa491 100644 --- a/kexi/core/kexiinternalpart.cpp +++ b/kexi/core/kexiinternalpart.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klibloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <ktrader.h> #include <tdeparts/componentfactory.h> #include <kexidb/msghandler.h> diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp index e1ed78fee..e907110a5 100644 --- a/kexi/core/kexipart.cpp +++ b/kexi/core/kexipart.cpp @@ -38,7 +38,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> namespace KexiPart { //! @internal diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp index 1dbe4eefa..e5b1c2a4e 100644 --- a/kexi/core/kexiproject.cpp +++ b/kexi/core/kexiproject.cpp @@ -24,7 +24,7 @@ #include <kmimetype.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kexiutils/identifier.h> diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp index 17ce3d890..525672882 100644 --- a/kexi/core/kexiprojectconnectiondata.cpp +++ b/kexi/core/kexiprojectconnectiondata.cpp @@ -25,13 +25,13 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeio/netaccess.h> #include <kurl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/connectiondata.h> #include <kexidb/drivermanager.h> diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp index dd8778734..53daea99d 100644 --- a/kexi/core/kexiprojectdata.cpp +++ b/kexi/core/kexiprojectdata.cpp @@ -26,13 +26,13 @@ #include <tqfile.h> #include <tqregexp.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kdebug.h> #include <tdeio/netaccess.h> #include <kurl.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/drivermanager.h> #include "kexiprojectdata.h" diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp index 7ced2d6f4..c68bd124d 100644 --- a/kexi/core/kexitemplateloader.cpp +++ b/kexi/core/kexitemplateloader.cpp @@ -20,8 +20,8 @@ #include "kexitemplateloader.h" #include <kstandarddirs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index 3bc22a7a5..ad97123ed 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -1,4 +1,4 @@ -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include <tdeshortcut.h> diff --git a/kexi/core/kexiuseractionmethod.cpp b/kexi/core/kexiuseractionmethod.cpp index 41b35782d..bef945e37 100644 --- a/kexi/core/kexiuseractionmethod.cpp +++ b/kexi/core/kexiuseractionmethod.cpp @@ -1,4 +1,4 @@ -#include <klocale.h> +#include <tdelocale.h> #include "kexiuseraction.h" #include "kexiuseractionmethod.h" diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index 29cbfcaa7..338cb08ca 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -25,9 +25,9 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccelmanager.h> #include "formIO.h" diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp index 0e59a08f1..8376beb7e 100644 --- a/kexi/formeditor/connectiondialog.cpp +++ b/kexi/formeditor/connectiondialog.cpp @@ -27,9 +27,9 @@ #include <kpushbutton.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kexitableview.h" #include "kexitableviewdata.h" diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 3f7d201b9..a785893fa 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -27,7 +27,7 @@ #include <tqcursor.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <cstdlib> // for abs() diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index eca070320..44bc80966 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -24,7 +24,7 @@ #include <tdelistbox.h> #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <koproperty/editor.h> #include <koproperty/set.h> diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp index 813609278..18ce167c8 100644 --- a/kexi/formeditor/factories/containerfactory.cpp +++ b/kexi/formeditor/factories/containerfactory.cpp @@ -42,7 +42,7 @@ #include <kgenericfactory.h> #include <ktextedit.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index ebc9606fe..c5a4a5cb5 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -31,7 +31,7 @@ #include <kprogress.h> #include <kiconloader.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeversion.h> diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 1e185d6d9..b52c2087d 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -25,10 +25,10 @@ #include <tqptrdict.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tdeaction.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "container.h" #include "objecttree.h" diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 264b3bad7..3d6fc8cab 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -34,7 +34,7 @@ #include <tqpainter.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kcommand.h> #include <tdeaccelmanager.h> diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 9ab98f4a4..25f13b97b 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -31,20 +31,20 @@ #include <tqvaluevector.h> #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kstdaction.h> #include <tdeaction.h> #include <kxmlguiclient.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdestyle.h> #include <tdeactionclasses.h> #include <tdeapplication.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kdialogbase.h> #include <ktextedit.h> #include <ktabwidget.h> diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp index e668aa482..22434c87d 100644 --- a/kexi/formeditor/objecttreeview.cpp +++ b/kexi/formeditor/objecttreeview.cpp @@ -22,7 +22,7 @@ #include <tqpainter.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include "objecttree.h" #include "form.h" diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp index bdd0e3b07..1c3ad69d6 100644 --- a/kexi/formeditor/resizehandle.cpp +++ b/kexi/formeditor/resizehandle.cpp @@ -18,7 +18,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqpainter.h> #include <tqcursor.h> diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 291b96dc3..9fde7052b 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -23,7 +23,7 @@ #include <kcolorcombo.h> #include <tdetoolbarradiogroup.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "richtextdialog.h" diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp index f28c8e2a9..bbc340988 100644 --- a/kexi/formeditor/tabstopdialog.cpp +++ b/kexi/formeditor/tabstopdialog.cpp @@ -23,7 +23,7 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "form.h" diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index 4445e9ec7..15bb1a2fe 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -28,7 +28,7 @@ #include <tdeversion.h> #include <tdeaction.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> #include <kstdaction.h> @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "form.h" #include "formIO.h" diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp index d1a3edfd2..455fd311d 100644 --- a/kexi/formeditor/test/kfd_mainwindow.cpp +++ b/kexi/formeditor/test/kfd_mainwindow.cpp @@ -21,8 +21,8 @@ #include <kurl.h> #include <kdebug.h> #include <klibloader.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include "kfd_mainwindow.h" diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 649c2fe97..401bfd20a 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -28,7 +28,7 @@ #include <tdeversion.h> #include <tdeaction.h> #include <kinstance.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kdebug.h> #include <kstdaction.h> @@ -36,7 +36,7 @@ #include <kiconloader.h> #include <tdefiledialog.h> #include <klibloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "form.h" #include "formIO.h" diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp index 3f0727b7f..53aa57208 100644 --- a/kexi/formeditor/test/main.cpp +++ b/kexi/formeditor/test/main.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> static const char *description = I18N_NOOP("KFormDesigner"); diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 9537085ed..b90193bca 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -27,7 +27,7 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> //#ifdef KEXI_KTEXTEDIT #include <ktextedit.h> //#else diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index fcb0ffe64..239917744 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -23,7 +23,7 @@ #include <tqstrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klibloader.h> #include <tdeparts/componentfactory.h> #include <ktrader.h> diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp index 73c79c30f..74b1a4f62 100644 --- a/kexi/formeditor/widgetpropertyset.cpp +++ b/kexi/formeditor/widgetpropertyset.cpp @@ -28,9 +28,9 @@ #include <tqapplication.h> #include <tqeventloop.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "objecttree.h" #include "form.h" diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp index 9037b0414..dd2eb76b4 100644 --- a/kexi/kexidb/connection.cpp +++ b/kexi/kexidb/connection.cpp @@ -44,7 +44,7 @@ #include <tqguardedptr.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #define KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION 1 diff --git a/kexi/kexidb/connectiondata.cpp b/kexi/kexidb/connectiondata.cpp index 4f45b0f48..14c23dfec 100644 --- a/kexi/kexidb/connectiondata.cpp +++ b/kexi/kexidb/connectiondata.cpp @@ -24,7 +24,7 @@ #include <tqfileinfo.h> #include <tqdir.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp index b5f095e23..41bf47351 100644 --- a/kexi/kexidb/cursor.cpp +++ b/kexi/kexidb/cursor.cpp @@ -26,7 +26,7 @@ #include <kexiutils/utils.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <assert.h> #include <stdlib.h> diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp index 490a7390f..ba9b1be0e 100644 --- a/kexi/kexidb/dbproperties.cpp +++ b/kexi/kexidb/dbproperties.cpp @@ -18,7 +18,7 @@ */ #include "dbproperties.h" -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp index 8e08b83f6..953243e4f 100644 --- a/kexi/kexidb/driver.cpp +++ b/kexi/kexidb/driver.cpp @@ -29,7 +29,7 @@ #include <tqfileinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <assert.h> diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp index 498c4610b..0ce563a91 100644 --- a/kexi/kexidb/drivermanager.cpp +++ b/kexi/kexidb/drivermanager.cpp @@ -30,7 +30,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <assert.h> diff --git a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp index abfdb44f2..590e7ceca 100644 --- a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp +++ b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp @@ -23,7 +23,7 @@ #include "mysqlconnection_p.h" #include <kexidb/error.h> #include <kexidb/utils.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <limits.h> diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp index d6262befc..76684483a 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kexidb/error.h> #include <kexidb/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <string> #include "pqxxpreparedstatement.h" #include "pqxxconnection_p.h" diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp index b7219e71d..746a383ae 100644 --- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp +++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp @@ -24,7 +24,7 @@ #include <kexidb/error.h> #include <kexidb/global.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <cstdlib> diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp index fe6a78ea2..c8282963d 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp @@ -31,7 +31,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrvector.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp index 71ba23216..afc861439 100644 --- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp +++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp @@ -23,9 +23,9 @@ #include <kstandarddirs.h> #include <kprogress.h> #include <kdebug.h> -#include <klocale.h> -#include <ktempfile.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdetempfile.h> +#include <tdemessagebox.h> #include <tdeio/global.h> #include <tqfileinfo.h> diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp index fabdf6034..f4e5ccfe8 100644 --- a/kexi/kexidb/expression.cpp +++ b/kexi/kexidb/expression.cpp @@ -28,7 +28,7 @@ #include <ctype.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp index 79b38aca7..41cce80be 100644 --- a/kexi/kexidb/field.cpp +++ b/kexi/kexidb/field.cpp @@ -27,7 +27,7 @@ // we use here i18n() but this depends on kde libs: TODO: add #ifdefs #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqdatetime.h> diff --git a/kexi/kexidb/object.cpp b/kexi/kexidb/object.cpp index 2e32274d8..bc3249fc6 100644 --- a/kexi/kexidb/object.cpp +++ b/kexi/kexidb/object.cpp @@ -21,7 +21,7 @@ #include <kexidb/error.h> #include <kexidb/msghandler.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KexiDB; diff --git a/kexi/kexidb/object.h b/kexi/kexidb/object.h index 232535d19..6fb183bac 100644 --- a/kexi/kexidb/object.h +++ b/kexi/kexidb/object.h @@ -21,7 +21,7 @@ #define KEXIDB_OBJECT_H #include <kexidb/error.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstdguiitem.h> #include <tqstring.h> diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp index 1d2e52952..df4f3323d 100644 --- a/kexi/kexidb/parser/parser_p.cpp +++ b/kexi/kexidb/parser/parser_p.cpp @@ -21,7 +21,7 @@ #include "sqlparser.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp index 097deb3bb..b7ddccd84 100644 --- a/kexi/kexidb/parser/sqlparser.cpp +++ b/kexi/kexidb/parser/sqlparser.cpp @@ -800,7 +800,7 @@ #include <tqobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqcstring.h> #include <tqvariant.h> diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y index c2d8e8870..a33978065 100644 --- a/kexi/kexidb/parser/sqlparser.y +++ b/kexi/kexidb/parser/sqlparser.y @@ -466,7 +466,7 @@ #include <tqobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include <tqcstring.h> #include <tqvariant.h> diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp index 75ee2535e..3cd6bdf3a 100644 --- a/kexi/kexidb/parser/sqlscanner.cpp +++ b/kexi/kexidb/parser/sqlscanner.cpp @@ -507,7 +507,7 @@ char *yytext; #include "sqltypes.h" #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l index 5f74a0caf..b16a615da 100644 --- a/kexi/kexidb/parser/sqlscanner.l +++ b/kexi/kexidb/parser/sqlscanner.l @@ -26,7 +26,7 @@ #include "sqltypes.h" #include <iostream> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #define YY_NO_UNPUT #define ECOUNT current += yyleng; ctoken = yytext diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 31727bd55..1ee0d52df 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -34,7 +34,7 @@ #include <tqbitarray.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiDB; diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp index d6652f6d0..edb472a07 100644 --- a/kexi/kexidb/utils.cpp +++ b/kexi/kexidb/utils.cpp @@ -29,10 +29,10 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kiconloader.h> #include "utils_p.h" diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h index 684a30fcd..88d76b066 100644 --- a/kexi/kexiutils/validator.h +++ b/kexi/kexiutils/validator.h @@ -26,7 +26,7 @@ #include <tqvariant.h> #include <tqstring.h> -#include <klocale.h> +#include <tdelocale.h> namespace KexiUtils { diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 255e18829..3365268a2 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -23,7 +23,7 @@ #include <kstdaction.h> #include <kpushbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kdialog.h> #include <tdeaction.h> diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index dd629780d..d6b2cc167 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -39,15 +39,15 @@ #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdestdaccel.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include <kkeydialog.h> #include <kedittoolbar.h> #include <tdeversion.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeparts/componentfactory.h> #include <ktip.h> #include <kstandarddirs.h> diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h index 8df772cee..e2493320e 100644 --- a/kexi/main/keximainwindowimpl.h +++ b/kexi/main/keximainwindowimpl.h @@ -21,7 +21,7 @@ #ifndef KEXIMAINWINDOWIMPL_H #define KEXIMAINWINDOWIMPL_H -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "core/keximainwindow.h" #include "core/kexiguimsghandler.h" diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp index 8f5ee38a8..7176aa6d8 100644 --- a/kexi/main/kexinamewidget.cpp +++ b/kexi/main/kexinamewidget.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <klineedit.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kexiutils/validator.h> #include <kexiutils/identifier.h> diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 1d81f9f8c..725c1047d 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -25,7 +25,7 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include "kexinewstuff.h" diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp index 85468e1d8..6aaa6acee 100644 --- a/kexi/main/kexistatusbar.cpp +++ b/kexi/main/kexistatusbar.cpp @@ -29,8 +29,8 @@ #include <tqfontmetrics.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <tdeparts/part.h> #if KexitStatusBar_KTEXTEDITOR_USED diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 05c5f3ab5..8aed1c0aa 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.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 4b15b16d8..35f8aa31b 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefontdialog.h> #include <kurllabel.h> #include <kdebug.h> diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index acd0d709b..c19108bed 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -29,7 +29,7 @@ #include <kdialogbase.h> #include <tdetoolbarbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <kpushbutton.h> diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index f09f911f6..1c46a0463 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -31,7 +31,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <kurlcombobox.h> diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 2ce058707..e479d1bbf 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -35,12 +35,12 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> #include <tdelistview.h> #include <kurlcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <tqobjectlist.h> diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp index cdc770d96..76299637b 100644 --- a/kexi/main/startup/KexiProjectSelector.cpp +++ b/kexi/main/startup/KexiProjectSelector.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlabel.h> diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp index 9bbe7a13d..6e2ecc800 100644 --- a/kexi/main/startup/KexiStartup.cpp +++ b/kexi/main/startup/KexiStartup.cpp @@ -40,9 +40,9 @@ #include <kexidbshortcutfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdecmdlineargs.h> #include <tdeversion.h> #include <kprogress.h> diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp index 4288ef781..f0b9a0e97 100644 --- a/kexi/main/startup/KexiStartupDialog.cpp +++ b/kexi/main/startup/KexiStartupDialog.cpp @@ -36,17 +36,17 @@ #include <tqtooltip.h> #include <tqwidgetstack.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #include <kinstance.h> #include <kdebug.h> #include <kpushbutton.h> #include <kjanuswidget.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <ktextedit.h> #include <tdefileiconview.h> #include <tdefileitem.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <kmimetype.h> #include <ktextbrowser.h> diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp index 1bccbf1e4..defa2e06e 100644 --- a/kexi/main/startup/KexiStartupFileDialog.cpp +++ b/kexi/main/startup/KexiStartupFileDialog.cpp @@ -28,8 +28,8 @@ #include <tqpushbutton.h> #include <tqapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <kmimetype.h> #include <tdefile.h> diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp index 136ea3c66..f9b535c8b 100644 --- a/kexi/main/startup/KexiStartup_p.cpp +++ b/kexi/main/startup/KexiStartup_p.cpp @@ -23,7 +23,7 @@ #include <kprogress.h> #include <kprocess.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfileinfo.h> #include <tqdir.h> diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp index 474dc98ad..9f8bbce39 100644 --- a/kexi/migration/importoptionsdlg.cpp +++ b/kexi/migration/importoptionsdlg.cpp @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <kiconloader.h> diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp index a62f90aa0..12b207a9c 100644 --- a/kexi/migration/importwizard.cpp +++ b/kexi/migration/importwizard.cpp @@ -30,7 +30,7 @@ #include <tqcheckbox.h> #include <kcombobox.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kpushbutton.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp index 07245ba9e..1bc8945f5 100644 --- a/kexi/migration/migratemanager.cpp +++ b/kexi/migration/migratemanager.cpp @@ -27,7 +27,7 @@ #include <tdeparts/componentfactory.h> #include <ktrader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kservice.h> #include <assert.h> diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp index 35e51dc16..637c94346 100644 --- a/kexi/plugins/forms/kexidataprovider.cpp +++ b/kexi/plugins/forms/kexidataprovider.cpp @@ -23,7 +23,7 @@ #include <tqobjectlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <widget/tableview/kexitableitem.h> #include <widget/tableview/kexitableviewdata.h> diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index 6910bda95..54ecbb1d5 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbarbutton.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 9f63c09ca..1154e1107 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -25,7 +25,7 @@ #include <tqstyle.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <tdeactioncollection.h> diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 4d1f0ec76..aae999061 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -23,7 +23,7 @@ #include <tqobjectlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tableview/kexitableitem.h> #include <tableview/kexitableviewdata.h> diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp index 9437facae..f4056728c 100644 --- a/kexi/plugins/forms/widgets/kexidbautofield.cpp +++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp @@ -28,7 +28,7 @@ #include <tqapplication.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kexidbcheckbox.h" #include "kexidbimagebox.h" diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index ed441d4fd..fb9636003 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -32,7 +32,7 @@ #include <kdebug.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> #include <kimageio.h> @@ -40,7 +40,7 @@ #include <kstaticdeleter.h> #include <kimageeffect.h> #include <tdestdaccel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kguiitem.h> #include <widget/utils/kexidropdownbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp index 2e49660d9..7b369c60e 100644 --- a/kexi/plugins/importexport/csv/kexicsvexport.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp @@ -34,7 +34,7 @@ #include <tqgroupbox.h> #include <tqclipboard.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kactivelabel.h> #include <kpushbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp index 070ea2349..104e43b39 100644 --- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp +++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp @@ -34,7 +34,7 @@ #include <tqgroupbox.h> #include <tqclipboard.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kactivelabel.h> #include <kpushbutton.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 2bbe979ca..941a7bd06 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -46,9 +46,9 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> -#include <kglobalsettings.h> +#include <tdelocale.h> +#include <tdemessagebox.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <kcharsets.h> #include <knuminput.h> diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp index 642c2b3a1..dce13f384 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp @@ -28,8 +28,8 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> KexiCSVImportOptions::KexiCSVImportOptions() diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp index c0608072d..b1ee43668 100644 --- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp +++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp @@ -23,7 +23,7 @@ #include <tqlabel.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <kdialogbase.h> #include <kactivelabel.h> diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp index 4e211a53d..6fa700c4d 100644 --- a/kexi/plugins/macros/kexiactions/datatableaction.cpp +++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp @@ -27,7 +27,7 @@ #include <core/keximainwindow.h> #include <core/kexiinternalpart.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp index 7383b9a80..f34ca89cd 100644 --- a/kexi/plugins/macros/kexiactions/executeaction.cpp +++ b/kexi/plugins/macros/kexiactions/executeaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp index f421abb58..bb588dee6 100644 --- a/kexi/plugins/macros/kexiactions/messageaction.cpp +++ b/kexi/plugins/macros/kexiactions/messageaction.cpp @@ -22,8 +22,8 @@ #include <core/keximainwindow.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp index 336039aea..5f10bd1ad 100644 --- a/kexi/plugins/macros/kexiactions/navigateaction.cpp +++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp @@ -31,7 +31,7 @@ #include <widget/kexidataawareview.h> #include <widget/tableview/kexidataawareobjectiface.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h index 03545f695..da94c8c51 100644 --- a/kexi/plugins/macros/kexiactions/objectnamevariable.h +++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h @@ -30,7 +30,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h index 65def3aa3..0fb2dd4d1 100644 --- a/kexi/plugins/macros/kexiactions/objectvariable.h +++ b/kexi/plugins/macros/kexiactions/objectvariable.h @@ -31,7 +31,7 @@ #include <core/kexipartmanager.h> #include <core/kexipartinfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> namespace KexiMacro { diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp index f5206ff5d..0a41b6444 100644 --- a/kexi/plugins/macros/kexiactions/openaction.cpp +++ b/kexi/plugins/macros/kexiactions/openaction.cpp @@ -27,7 +27,7 @@ #include <core/kexipart.h> #include <core/keximainwindow.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KexiMacro; diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index 6a9d2964b..a953f0d9e 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -27,9 +27,9 @@ #include <tqpushbutton.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kdebug.h> #include "../lib/context.h" diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp index 07c8f8e15..c87cb5b4d 100644 --- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp +++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp index c1754ef34..f05f8290d 100644 --- a/kexi/plugins/macros/tests/komacrotest.cpp +++ b/kexi/plugins/macros/tests/komacrotest.cpp @@ -19,7 +19,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeunittest/runner.h> static const char description[] = diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp index f0bc50c18..ea4bbb9c7 100644 --- a/kexi/plugins/macros/tests/komacrotestgui.cpp +++ b/kexi/plugins/macros/tests/komacrotestgui.cpp @@ -19,7 +19,7 @@ #include <tdeaboutdata.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> -#include <klocale.h> +#include <tdelocale.h> #include "tdeunittest/runnergui.h" diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp index 4e7bb67b0..3e4d28162 100644 --- a/kexi/plugins/macros/tests/testaction.cpp +++ b/kexi/plugins/macros/tests/testaction.cpp @@ -25,7 +25,7 @@ #include "../lib/macroitem.h" #include "../lib/variable.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> using namespace KoMacroTest; diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp index 9b7f5db94..0b117d845 100644 --- a/kexi/plugins/queries/kexiaddparamdialog.cpp +++ b/kexi/plugins/queries/kexiaddparamdialog.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include <kcombobox.h> #include <klineedit.h> #include <tqvbox.h> diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp index 555a84cff..82bd2fe25 100644 --- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp +++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp @@ -22,7 +22,7 @@ #include "kexidynamicqueryparameterdialog.moc" #include <tqvbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqlineedit.h> #include <tqobjectlist.h> diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp index 9a6f32057..45ea8e1d4 100644 --- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp +++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp @@ -26,8 +26,8 @@ #include <tqregexp.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kexidb/field.h> #include <kexidb/queryschema.h> diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp index 0f39cb59e..39e36bbb7 100644 --- a/kexi/plugins/queries/kexiquerydesignersql.cpp +++ b/kexi/plugins/queries/kexiquerydesignersql.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <kexiutils/utils.h> diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index 3328e42fc..c528540a7 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -23,10 +23,10 @@ #include <tqregexp.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeapplication.h> #include "kexiquerydesignersqlhistory.h" diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp index affc1214a..4c77b6dde 100644 --- a/kexi/plugins/relations/kexirelationmaindlg.cpp +++ b/kexi/plugins/relations/kexirelationmaindlg.cpp @@ -19,7 +19,7 @@ #include "kexirelationmaindlg.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp index cf54b2545..35036222e 100644 --- a/kexi/plugins/reports/kexireportfactory.cpp +++ b/kexi/plugins/reports/kexireportfactory.cpp @@ -20,7 +20,7 @@ #include <tqvaluevector.h> #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 143a03921..f718efd0c 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -25,7 +25,7 @@ #include <tqheader.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdetoolbarbutton.h> #include <kdebug.h> #include <tdepopupmenu.h> diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp index 4f6c9ff9b..843a9a133 100644 --- a/kexi/plugins/tables/kexitabledesignercommands.cpp +++ b/kexi/plugins/tables/kexitabledesignercommands.cpp @@ -24,9 +24,9 @@ #include <tqmetaobject.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeaccelmanager.h> #include <koproperty/property.h> diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 514be26a6..df715cbe1 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -28,10 +28,10 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconeffect.h> #include <koproperty/set.h> diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index 761107c24..7e5521e32 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -26,10 +26,10 @@ #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <koproperty/set.h> diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp index 07541f4d9..5b8538a7e 100644 --- a/kexi/plugins/tables/kexitablepart.cpp +++ b/kexi/plugins/tables/kexitablepart.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ktabwidget.h> #include <kiconloader.h> diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp index 72266fb29..5215a28f8 100644 --- a/kexi/tests/gui/finddialog/kexifinddialog.cpp +++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp @@ -22,7 +22,7 @@ #include <kstdguiitem.h> #include <kpushbutton.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqcheckbox.h> #include <tqlabel.h> diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp index 8c86cfb52..936b3c774 100644 --- a/kexi/tests/gui/finddialog/main.cpp +++ b/kexi/tests/gui/finddialog/main.cpp @@ -18,7 +18,7 @@ */ #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp index 799294f6f..4f929f8c4 100644 --- a/kexi/tests/tableview/main.cpp +++ b/kexi/tests/tableview/main.cpp @@ -19,7 +19,7 @@ #include <kdebug.h> #include <tdeapplication.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tableview/kexitableview.h> diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp index 4aa82bec2..2c86d4f75 100644 --- a/kexi/widget/kexibrowser.cpp +++ b/kexi/widget/kexibrowser.cpp @@ -32,10 +32,10 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <tdelistview.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kimageeffect.h> #include <tdeconfig.h> diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp index ad368e698..76f19ba6e 100644 --- a/kexi/widget/kexicharencodingcombobox.cpp +++ b/kexi/widget/kexicharencodingcombobox.cpp @@ -22,8 +22,8 @@ #include <tqtextcodec.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcharsets.h> KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox( diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index 797fa4406..18319585f 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -24,7 +24,7 @@ #include <tqlabel.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp index e11845535..6f722f0e0 100644 --- a/kexi/widget/kexidswelcome.cpp +++ b/kexi/widget/kexidswelcome.cpp @@ -21,9 +21,9 @@ #include <tqcheckbox.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstdguiitem.h> #include <tdeversion.h> diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp index 05115b699..5df84c96c 100644 --- a/kexi/widget/kexieditor.cpp +++ b/kexi/widget/kexieditor.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqframe.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> //uncomment this to enable KTextEdit-based editor diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp index 1c1f929b9..ceb2aa41b 100644 --- a/kexi/widget/kexifieldcombobox.cpp +++ b/kexi/widget/kexifieldcombobox.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kexidb/tableschema.h> #include <kexidb/queryschema.h> diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp index f688fa648..348e9ee04 100644 --- a/kexi/widget/kexifieldlistview.cpp +++ b/kexi/widget/kexifieldlistview.cpp @@ -33,8 +33,8 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> -#include <klocale.h> +#include <tdeglobalsettings.h> +#include <tdelocale.h> #include <kexidb/tableschema.h> #include <kexidb/queryschema.h> diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp index bf5c64912..1612871b1 100644 --- a/kexi/widget/kexipropertyeditorview.cpp +++ b/kexi/widget/kexipropertyeditorview.cpp @@ -24,7 +24,7 @@ #include <koproperty/editor.h> #include <koproperty/property.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tqlayout.h> diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp index 04257ec28..171df484c 100644 --- a/kexi/widget/kexiqueryparameters.cpp +++ b/kexi/widget/kexiqueryparameters.cpp @@ -20,7 +20,7 @@ #include "kexiqueryparameters.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kinputdialog.h> #include <knumvalidator.h> diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp index ba4c8f9e5..59fddb063 100644 --- a/kexi/widget/kexiscrollview.cpp +++ b/kexi/widget/kexiscrollview.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <kstaticdeleter.h> -#include <klocale.h> +#include <tdelocale.h> #include <utils/kexirecordnavigator.h> #include <core/kexi.h> diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp index 27f893959..bb3b0ec8f 100644 --- a/kexi/widget/kexismalltoolbutton.cpp +++ b/kexi/widget/kexismalltoolbutton.cpp @@ -24,7 +24,7 @@ #include <tqstyle.h> #include <kiconloader.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <core/kexi.h> diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index 1917e8f3f..8c4d95518 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -34,8 +34,8 @@ #include <kpixmapio.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "pixmapcollection.h" diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index 5340691f3..7dcec4159 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -30,11 +30,11 @@ #include <tqlineedit.h> #include <tqpopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kglobalsettings.h> -#include <kmessagebox.h> +#include <tdeglobalsettings.h> +#include <tdemessagebox.h> #include <kexidb/tableschema.h> #include <kexidb/indexschema.h> diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp index b9420f67e..4bab34e40 100644 --- a/kexi/widget/relations/kexirelationviewtable.cpp +++ b/kexi/widget/relations/kexirelationviewtable.cpp @@ -34,7 +34,7 @@ #include <kiconloader.h> #include <tdeversion.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kexidb/tableschema.h> #include <kexidb/utils.h> diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp index 47075bbb6..eef477a5a 100644 --- a/kexi/widget/relations/kexirelationwidget.cpp +++ b/kexi/widget/relations/kexirelationwidget.cpp @@ -27,7 +27,7 @@ #include <tqtimer.h> #include <kcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kiconloader.h> #include <kpushbutton.h> diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 4982fffae..df2816fef 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -38,7 +38,7 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kmimetype.h> #include <kmimemagic.h> #include <kuserprofile.h> @@ -47,10 +47,10 @@ #include <kopenwith.h> #include <kurl.h> #include <karrowbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <tdeio/job.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <tdestdaccel.h> diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp index c4067dfde..2bc14f4ac 100644 --- a/kexi/widget/tableview/kexibooltableedit.cpp +++ b/kexi/widget/tableview/kexibooltableedit.cpp @@ -25,10 +25,10 @@ #include <tqapplication.h> #include <tqclipboard.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent) diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp index ce0b76958..68690ef95 100644 --- a/kexi/widget/tableview/kexidataawareobjectiface.cpp +++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> #include <tqtooltip.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kexi.h> #include <kexiutils/validator.h> diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index 8bfc1c480..800c76e79 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -22,8 +22,8 @@ #include <tqtimer.h> #include <tqapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeaction.h> diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 6e538fd17..36a44566f 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -37,8 +37,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index aff64f582..b52aa2e65 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -37,8 +37,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp index 69c5c4efa..b68530379 100644 --- a/kexi/widget/tableview/kexiinputtableedit.cpp +++ b/kexi/widget/tableview/kexiinputtableedit.cpp @@ -29,10 +29,10 @@ #include <tqclipboard.h> #include <tqtooltip.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdecompletionbox.h> #include <knumvalidator.h> #include <kexiutils/longlongvalidator.h> diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp index b082bd95e..3305fff18 100644 --- a/kexi/widget/tableview/kexitableedit.cpp +++ b/kexi/widget/tableview/kexitableedit.cpp @@ -26,8 +26,8 @@ #include <tqpalette.h> #include <tqpainter.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent) diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp index 9a36dfada..f054f0848 100644 --- a/kexi/widget/tableview/kexitableview.cpp +++ b/kexi/widget/tableview/kexitableview.cpp @@ -37,12 +37,12 @@ #include <tqlabel.h> #include <tqwhatsthis.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeapplication.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #ifndef KEXI_NO_PRINT # include <kprinter.h> diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp index 983378cb2..5ac720647 100644 --- a/kexi/widget/tableview/kexitableview_p.cpp +++ b/kexi/widget/tableview/kexitableview_p.cpp @@ -29,7 +29,7 @@ #include <tqlabel.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t) diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp index a4e45daf8..c28ad5701 100644 --- a/kexi/widget/tableview/kexitableviewdata.cpp +++ b/kexi/widget/tableview/kexitableviewdata.cpp @@ -34,7 +34,7 @@ #include <kexi.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqapplication.h> diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp index 9829f3476..5ff289206 100644 --- a/kexi/widget/tableview/kexitextformatter.cpp +++ b/kexi/widget/tableview/kexitextformatter.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <klocale.h> +#include <tdelocale.h> #include "kexitextformatter.h" #include <widget/utils/kexidatetimeformatter.h> diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index b6dc69d43..e6bec4b6d 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -35,8 +35,8 @@ #include <tqclipboard.h> #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index caae10b6e..6e5b5c9e6 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -20,12 +20,12 @@ #include "kexicontextmenuutils.h" #include <tdeactioncollection.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <tdefiledialog.h> #include <kimageio.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqfiledialog.h> #include <tqapplication.h> diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 21bb24ded..371425643 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -20,8 +20,8 @@ #include "kexidatetimeformatter.h" #include <kdebug.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kdatepicker.h> #include <kdatetbl.h> #include <klineedit.h> diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp index 11b1d7428..8d626187b 100644 --- a/kexi/widget/utils/kexidisplayutils.cpp +++ b/kexi/widget/utils/kexidisplayutils.cpp @@ -24,7 +24,7 @@ #include <tqimage.h> #include <tqwidget.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> // a color for displaying default values or autonumbers diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp index 9dd8cccce..18d1b09c0 100644 --- a/kexi/widget/utils/kexirecordnavigator.cpp +++ b/kexi/widget/utils/kexirecordnavigator.cpp @@ -25,7 +25,7 @@ #include <tqtooltip.h> #include <tqscrollview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <klineedit.h> #include <kguiitem.h> |