diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:12:56 -0600 |
| commit | ece35c015c54312eb13f583cc247cdd9a4051b4d (patch) | |
| tree | 2c0599b8705e881f2b53678f48e97ffe4f616d22 /kexi/main/startup | |
| parent | c260bb1b22af487f2410c2c7f6c35db3fe1d57b9 (diff) | |
| download | koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.tar.gz koffice-ece35c015c54312eb13f583cc247cdd9a4051b4d.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kexi/main/startup')
| -rw-r--r-- | kexi/main/startup/KexiConnSelector.cpp | 8 | ||||
| -rw-r--r-- | kexi/main/startup/KexiConnSelector.h | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiNewPrjTypeSelector.ui | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiNewProjectWizard.cpp | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupDialogTemplatesPage.h | 2 | ||||
| -rw-r--r-- | kexi/main/startup/KexiStartupFileDialog_win.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
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> |