diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /korganizer/koprefs.cpp | |
parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/koprefs.cpp')
-rw-r--r-- | korganizer/koprefs.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index a8f6acc3e..f5f76e26f 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -33,12 +33,12 @@ #include <tqmap.h> #include <tqstringlist.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kemailsettings.h> +#include <tdeemailsettings.h> #include <kstaticdeleter.h> #include <kstringhandler.h> @@ -48,7 +48,7 @@ #include <libkpimidentities/identitymanager.h> #include <libkpimidentities/identity.h> #include <libemailfunctions/email.h> -#include <kabc/stdaddressbook.h> +#include <tdeabc/stdaddressbook.h> #include <ktimezones.h> #include "kocore.h" |