diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:53 -0600 |
| commit | 508a49f9ef02a7b03411c8e9953ba79c99b91c0c (patch) | |
| tree | 1df40da8f05d010a3e175c3d48e3529cccf2e067 /kbugbuster/tderesources | |
| parent | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (diff) | |
| download | tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.tar.gz tdesdk-508a49f9ef02a7b03411c8e9953ba79c99b91c0c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kbugbuster/tderesources')
| -rw-r--r-- | kbugbuster/tderesources/kcalresource.cpp | 4 | ||||
| -rw-r--r-- | kbugbuster/tderesources/kcalresource_plugin.cpp | 4 | ||||
| -rw-r--r-- | kbugbuster/tderesources/kcalresourceconfig.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index 1eb04c9c..0e59e55e 100644 --- a/kbugbuster/tderesources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <kurl.h> #include <tdeio/job.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <vcaldrag.h> @@ -42,7 +42,7 @@ #include <journal.h> #include <filestorage.h> -#include <kabc/locknull.h> +#include <tdeabc/locknull.h> #include <tderesources/configwidget.h> diff --git a/kbugbuster/tderesources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp index 7cf81289..d9f33ec9 100644 --- a/kbugbuster/tderesources/kcalresource_plugin.cpp +++ b/kbugbuster/tderesources/kcalresource_plugin.cpp @@ -22,8 +22,8 @@ #include "kcalresourceconfig.h" #include "kcalresource.h" -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> using namespace KCal; diff --git a/kbugbuster/tderesources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp index 58466642..d3f37a55 100644 --- a/kbugbuster/tderesources/kcalresourceconfig.cpp +++ b/kbugbuster/tderesources/kcalresourceconfig.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kdialog.h> |