From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeabc/vcardparser/testutils.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 tdeabc/vcardparser/testutils.h

(limited to 'tdeabc/vcardparser/testutils.h')

diff --git a/tdeabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
new file mode 100644
index 000000000..c8218b7ba
--- /dev/null
+++ b/tdeabc/vcardparser/testutils.h
@@ -0,0 +1,14 @@
+#ifndef TESTUTILS_H
+#define TESTUTILS_H
+
+#include <tdeabc/addressee.h>
+#include <tqstring.h>
+
+KABC::Addressee vcard1();
+KABC::Addressee vcard2();
+KABC::Addressee vcard3();
+KABC::Addressee::List vCardsAsAddresseeList();
+TQString   vCardAsText( const TQString& location );
+TQString   vCardsAsText();
+
+#endif
-- 
cgit v1.2.1


From 45f3927b0ffec2599bc0e1ce361c5386474a85f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 20 Feb 2013 16:26:45 -0600
Subject: Rename KABC namespace

---
 tdeabc/vcardparser/testutils.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdeabc/vcardparser/testutils.h')

diff --git a/tdeabc/vcardparser/testutils.h b/tdeabc/vcardparser/testutils.h
index c8218b7ba..830f94332 100644
--- a/tdeabc/vcardparser/testutils.h
+++ b/tdeabc/vcardparser/testutils.h
@@ -4,10 +4,10 @@
 #include <tdeabc/addressee.h>
 #include <tqstring.h>
 
-KABC::Addressee vcard1();
-KABC::Addressee vcard2();
-KABC::Addressee vcard3();
-KABC::Addressee::List vCardsAsAddresseeList();
+TDEABC::Addressee vcard1();
+TDEABC::Addressee vcard2();
+TDEABC::Addressee vcard3();
+TDEABC::Addressee::List vCardsAsAddresseeList();
 TQString   vCardAsText( const TQString& location );
 TQString   vCardsAsText();
 
-- 
cgit v1.2.1