summaryrefslogtreecommitdiffstats
path: root/kontact/plugins/kaddressbook
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /kontact/plugins/kaddressbook
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/kaddressbook')
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.cpp6
-rw-r--r--kontact/plugins/kaddressbook/kaddressbook_plugin.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 86a75ed06..cb20a3ca7 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -30,12 +30,12 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/componentfactory.h>
#include <kaddrbook.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include <dcopclient.h>
#include "kmailIface_stub.h"
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index f9a7fff3b..b3a8fee86 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -25,7 +25,7 @@
#ifndef KADDRESSBOOK_PLUGIN_H
#define KADDRESSBOOK_PLUGIN_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#include "kaddressbookiface_stub.h"