summaryrefslogtreecommitdiffstats
path: root/kexi
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 00:54:22 -0600
commit038b18b2df1da40baab30d62171766048a948095 (patch)
treeba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /kexi
parentd0baf2961c379b31587c6542625018c6177474d0 (diff)
downloadkoffice-038b18b2df1da40baab30d62171766048a948095.tar.gz
koffice-038b18b2df1da40baab30d62171766048a948095.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kexi')
-rw-r--r--kexi/core/kexidbshortcutfile.cpp2
-rw-r--r--kexi/core/kexipartmanager.cpp2
-rw-r--r--kexi/core/kexiprojectconnectiondata.cpp2
-rw-r--r--kexi/core/kexiprojectdata.cpp2
-rw-r--r--kexi/core/kexitemplateloader.cpp2
-rw-r--r--kexi/doc/dev/TODO-Kexi-js2
-rw-r--r--kexi/formeditor/formIO.cpp2
-rw-r--r--kexi/formeditor/formmanager.cpp2
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp2
-rw-r--r--kexi/formeditor/test/kfd_part.cpp2
-rw-r--r--kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp2
-rw-r--r--kexi/main/keximainwindowimpl.cpp4
-rw-r--r--kexi/main/kexinewstuff.cpp4
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp2
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp6
-rw-r--r--kexi/main/startup/KexiStartupDialog.h4
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp2
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.h2
-rw-r--r--kexi/migration/importoptionsdlg.cpp2
-rw-r--r--kexi/plugins/forms/kexiformpart.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp2
-rw-r--r--kexi/plugins/macros/kexipart/keximacropart.cpp2
-rw-r--r--kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp2
-rw-r--r--kexi/widget/kexibrowser.cpp2
-rw-r--r--kexi/widget/kexifieldcombobox.cpp2
-rw-r--r--kexi/widget/kexifieldlistview.cpp2
-rw-r--r--kexi/widget/pixmapcollection.cpp2
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp4
-rw-r--r--kexi/widget/utils/kexicontextmenuutils.cpp2
33 files changed, 39 insertions, 39 deletions
diff --git a/kexi/core/kexidbshortcutfile.cpp b/kexi/core/kexidbshortcutfile.cpp
index dbea9737..a5f7da07 100644
--- a/kexi/core/kexidbshortcutfile.cpp
+++ b/kexi/core/kexidbshortcutfile.cpp
@@ -22,7 +22,7 @@
#include <kexidb/connectiondata.h>
#include <kexiutils/utils.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <tqstringlist.h>
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index ce9dcbe1..1c9e17c3 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -21,7 +21,7 @@
#include <klibloader.h>
#include <ktrader.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <tdeparts/componentfactory.h>
#include "kexipartmanager.h"
diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp
index 7a3cc0cc..17ce3d89 100644
--- a/kexi/core/kexiprojectconnectiondata.cpp
+++ b/kexi/core/kexiprojectconnectiondata.cpp
@@ -28,7 +28,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kurl.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index 9b9203c8..dd877873 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -29,7 +29,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kurl.h>
#include <klocale.h>
#include <kmessagebox.h>
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index f8708b33..a4cdf54e 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -22,7 +22,7 @@
#include <kstandarddirs.h>
#include <kglobal.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kapplication.h>
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 90cdebc7..98582bfc 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -450,7 +450,7 @@ HINT: removing Qt::WStaticContents from KexiTableView ctor fixed repaint problem
- not convenient as user is forced to enlarge the window by hand (settings are stored though)
- add "File->Save All" action
- add settings dialog, TDEConfigXT based simple version
- + about:config-like using kconfigeditor http://extragear.kde.org/apps/kconfigeditor/
+ + about:config-like using tdeconfigeditor http://extragear.kde.org/apps/tdeconfigeditor/
(possible reuse of koproperty)
TODO: add SharedAction::setVisible() and use QMenuData::setItemVisible() where needed
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 5fafc6ec..f90efddd 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -33,7 +33,7 @@
#include <tqlabel.h>
#include <tqpainter.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <kcommand.h>
#include <kaccelmanager.h>
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 501d2769..f9849c35 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -39,7 +39,7 @@
#include <kxmlguiclient.h>
#include <kmainwindow.h>
#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstyle.h>
#include <kactionclasses.h>
#include <kapplication.h>
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 64f9e800..e6c09927 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -34,7 +34,7 @@
#include <kstdaction.h>
#include <kapplication.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klibloader.h>
#include <kmessagebox.h>
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index eeeec6dc..a6b24574 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -34,7 +34,7 @@
#include <kstdaction.h>
#include <kapplication.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klibloader.h>
#include <kmessagebox.h>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index ce6a3923..af82b583 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -26,7 +26,7 @@
#include <klocale.h>
#include <ktempfile.h>
#include <kmessagebox.h>
-#include <kio/global.h>
+#include <tdeio/global.h>
#include <tqfileinfo.h>
#include <tqdir.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index b3d36240..ce29b32e 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -41,7 +41,7 @@
#include <kaction.h>
#include <klocale.h>
#include <kstdaccel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobal.h>
#include <kdebug.h>
#include <kkeydialog.h>
@@ -57,7 +57,7 @@
#include <ktabwidget.h>
#include <kimageio.h>
#include <khelpmenu.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <krecentdocument.h>
#include <kexidb/connection.h>
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 99ec8a31..7ca0ceb4 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -24,7 +24,7 @@
#include <tqdir.h>
#include <kaction.h>
#include <kapplication.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <tdeversion.h>
@@ -33,7 +33,7 @@
KexiNewStuff::KexiNewStuff(TQWidget *parent)
: KNewStuff( "kexi/template"
#if KDE_IS_VERSION(3,3,0)
- , "http://download.kde.org/khotnewstuff/kexi-providers.xml"
+ , "http://download.kde.org/tdehotnewstuff/kexi-providers.xml"
#endif
, parent)
{
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index abbfac21..22b09eef 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -33,7 +33,7 @@
#include <kmimetype.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kurlcombobox.h>
#include <ktoolbar.h>
#include <kpopupmenu.h>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 414fcfcd..3e59d937 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -37,7 +37,7 @@
#include <kmimetype.h>
#include <klocale.h>
#include <kdebug.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klistview.h>
#include <kurlcombobox.h>
#include <kmessagebox.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index f6ded39a..5c281256 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -44,13 +44,13 @@
#include <kjanuswidget.h>
#include <kglobalsettings.h>
#include <ktextedit.h>
-#include <kfileiconview.h>
-#include <kfileitem.h>
+#include <tdefileiconview.h>
+#include <tdefileitem.h>
#include <kmessagebox.h>
#include <kapplication.h>
#include <kmimetype.h>
#include <ktextbrowser.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#ifdef KEXI_SHOW_UNIMPLEMENTED
#define KEXI_STARTUP_SHOW_TEMPLATES
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 9ae922c6..4d1d342f 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -23,8 +23,8 @@
#include <kdialogbase.h>
#include <kicondialog.h>
#include <kiconview.h>
-#include <kfileiconview.h>
-#include <kfiledialog.h>
+#include <tdefileiconview.h>
+#include <tdefiledialog.h>
#include <tqlabel.h>
#include <tqsplitter.h>
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 71e4a317..1bccbf1e 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -32,7 +32,7 @@
#include <klocale.h>
#include <kdebug.h>
#include <kmimetype.h>
-#include <kfile.h>
+#include <tdefile.h>
#include <kurlcombobox.h>
KexiStartupFileDialog::KexiStartupFileDialog(
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 1b99391d..e27f200d 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -20,7 +20,7 @@
#ifndef _KexiStartupFileDialog_h_
#define _KexiStartupFileDialog_h_
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#ifdef TQ_WS_WIN
# include "KexiStartupFileDialogBase_win.h"
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 24e9707e..ef8df97b 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -27,7 +27,7 @@
#include <tqcheckbox.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcombobox.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp
index 9d8017d8..911c3374 100644
--- a/kexi/plugins/forms/kexiformpart.cpp
+++ b/kexi/plugins/forms/kexiformpart.cpp
@@ -27,7 +27,7 @@
#include <kiconloader.h>
#include <kcombobox.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kexiviewbase.h>
#include <keximainwindow.h>
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index dd52f9f5..97d36055 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -34,7 +34,7 @@
#include <kpopupmenu.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kimageio.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index eb1f1897..941f8eda 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -45,7 +45,7 @@
#include <kapplication.h>
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <klocale.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 21c8891f..08ec0b18 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -26,7 +26,7 @@
#include <tqcheckbox.h>
#include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcombobox.h>
#include <klocale.h>
#include <kglobal.h>
diff --git a/kexi/plugins/macros/kexipart/keximacropart.cpp b/kexi/plugins/macros/kexipart/keximacropart.cpp
index ad9babd3..1459fffc 100644
--- a/kexi/plugins/macros/kexipart/keximacropart.cpp
+++ b/kexi/plugins/macros/kexipart/keximacropart.cpp
@@ -31,7 +31,7 @@
#include <kexipartitem.h>
//#include <kxmlguiclient.h>
//#include <kexidialogbase.h>
-//#include <kconfig.h>
+//#include <tdeconfig.h>
//#include <kdebug.h>
#include "../lib/manager.h"
diff --git a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
index 3dd90a68..0b096b82 100644
--- a/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
+++ b/kexi/plugins/scripting/kexiscripting/kexiscriptpart.cpp
@@ -34,7 +34,7 @@
#include <kexipartitem.h>
#include <kxmlguiclient.h>
#include <kexidialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
/// \internal
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 96a50350..472dd25c 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -38,7 +38,7 @@
#include <kmessagebox.h>
#include <klineedit.h>
#include <kimageeffect.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kexi.h>
#include <kexipart.h>
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index c490111e..404bc746 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobalsettings.h>
#include <klocale.h>
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index 7316caeb..07a3f4ab 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobalsettings.h>
#include <klocale.h>
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index c03d16e2..f3224c7e 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -26,7 +26,7 @@
#include <kapplication.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kcombobox.h>
#include <kicondialog.h>
#include <klineedit.h>
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index 426edf71..a3ad0d5d 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -33,7 +33,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeversion.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kglobalsettings.h>
#include <kexidb/tableschema.h>
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 3502e15d..43ff7331 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -48,8 +48,8 @@
#include <kurl.h>
#include <karrowbutton.h>
#include <klocale.h>
-#include <kfiledialog.h>
-#include <kio/job.h>
+#include <tdefiledialog.h>
+#include <tdeio/job.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index aeeec86d..30ecab17 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -22,7 +22,7 @@
#include <kactioncollection.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kimageio.h>
#include <kdebug.h>
#include <kmessagebox.h>