diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /kontact/interfaces | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/interfaces')
| -rw-r--r-- | kontact/interfaces/core.cpp | 2 | ||||
| -rw-r--r-- | kontact/interfaces/plugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/interfaces/uniqueapphandler.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp index 772ecc81..edaf86da 100644 --- a/kontact/interfaces/core.cpp +++ b/kontact/interfaces/core.cpp @@ -27,7 +27,7 @@ #include <tdeparts/componentfactory.h> #include <kdebug.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> using namespace Kontact; diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp index a14a50db..ed81dcb6 100644 --- a/kontact/interfaces/plugin.cpp +++ b/kontact/interfaces/plugin.cpp @@ -24,7 +24,7 @@ #include <dcopclient.h> #include <tdeaboutdata.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tdeparts/componentfactory.h> #include <kdebug.h> #include <kinstance.h> diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp index 11b7bc5f..98a5d45b 100644 --- a/kontact/interfaces/uniqueapphandler.cpp +++ b/kontact/interfaces/uniqueapphandler.cpp @@ -20,14 +20,14 @@ */ #include "uniqueapphandler.h" -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include "core.h" #include <twin.h> #include <dcopclient.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kuniqueapplication.h> /* |