diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:01 -0600 |
| commit | 41589ff912ef92cc28f3168a3e962deb677334fe (patch) | |
| tree | afb226721e64926da2c25b30836d082eba32546a /kontact_plugin | |
| parent | 06ab7fb3b7ec008a5fe3364a0430159900ff6553 (diff) | |
| download | basket-41589ff912ef92cc28f3168a3e962deb677334fe.tar.gz basket-41589ff912ef92cc28f3168a3e962deb677334fe.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact_plugin')
| -rw-r--r-- | kontact_plugin/basket_plugin.cpp | 2 | ||||
| -rw-r--r-- | kontact_plugin/basket_plugin.h | 2 | ||||
| -rw-r--r-- | kontact_plugin/uniqueapphandler.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kontact_plugin/basket_plugin.cpp b/kontact_plugin/basket_plugin.cpp index 8260062..95a6601 100644 --- a/kontact_plugin/basket_plugin.cpp +++ b/kontact_plugin/basket_plugin.cpp @@ -21,7 +21,7 @@ #include <kgenericfactory.h> #include <tdeparts/componentfactory.h> #include <kontact/core.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdecmdlineargs.h> #include <dcopref.h> #include "basketdcopiface_stub.h" diff --git a/kontact_plugin/basket_plugin.h b/kontact_plugin/basket_plugin.h index 4980318..b45d389 100644 --- a/kontact_plugin/basket_plugin.h +++ b/kontact_plugin/basket_plugin.h @@ -21,7 +21,7 @@ #ifndef BASKET_PLUGIN_H #define BASKET_PLUGIN_H -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/part.h> #include <kontact/plugin.h> #include "uniqueapphandler.h" diff --git a/kontact_plugin/uniqueapphandler.cpp b/kontact_plugin/uniqueapphandler.cpp index 7f92d18..77d5bdf 100644 --- a/kontact_plugin/uniqueapphandler.cpp +++ b/kontact_plugin/uniqueapphandler.cpp @@ -20,7 +20,7 @@ */ #include "uniqueapphandler.h" -#include <kstartupinfo.h> +#include <tdestartupinfo.h> #include <tdeapplication.h> #include <tdecmdlineargs.h> #include <kontact/core.h> |