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/plugins/newsticker | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/newsticker')
| -rw-r--r-- | kontact/plugins/newsticker/kcmkontactknt.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/newsticker/newsticker_plugin.cpp | 2 | ||||
| -rw-r--r-- | kontact/plugins/newsticker/summarywidget.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp index 5c388f2a..577bc992 100644 --- a/kontact/plugins/newsticker/kcmkontactknt.cpp +++ b/kontact/plugins/newsticker/kcmkontactknt.cpp @@ -38,7 +38,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> #include "kcmkontactknt.h" diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp index 79e03770..b00cc0ac 100644 --- a/kontact/plugins/newsticker/newsticker_plugin.cpp +++ b/kontact/plugins/newsticker/newsticker_plugin.cpp @@ -19,7 +19,7 @@ */ #include <kgenericfactory.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeparts/componentfactory.h> #include "core.h" diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp index 8fff2180..f385b269 100644 --- a/kontact/plugins/newsticker/summarywidget.cpp +++ b/kontact/plugins/newsticker/summarywidget.cpp @@ -34,9 +34,9 @@ #include <kcharsets.h> #include <tdeconfig.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> #include "summarywidget.h" |