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/plugins/forms/widgets | |
| 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/plugins/forms/widgets')
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbdateedit.cpp | 2 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp | 2 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbimagebox.cpp | 6 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbtextedit.cpp | 2 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbtimeedit.cpp | 2 | ||||
| -rw-r--r-- | kexi/plugins/forms/widgets/kexidbutils.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
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> |