diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:54:22 -0600 |
| commit | 038b18b2df1da40baab30d62171766048a948095 (patch) | |
| tree | ba99d50e3e7b3f2eccb63ba71aea4f6163ede37a /kexi/main/startup | |
| parent | d0baf2961c379b31587c6542625018c6177474d0 (diff) | |
| download | koffice-038b18b2df1da40baab30d62171766048a948095.tar.gz koffice-038b18b2df1da40baab30d62171766048a948095.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main/startup')
| -rw-r--r-- | kexi/main/startup/KexiConnSelector.cpp | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialog.cpp | 6 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialog.h | 4 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupFileDialog.cpp | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupFileDialog.h | 2 |
6 files changed, 9 insertions, 9 deletions
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" |