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

---
 libtdepim/kabcresourcecached.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'libtdepim/kabcresourcecached.cpp')

diff --git a/libtdepim/kabcresourcecached.cpp b/libtdepim/kabcresourcecached.cpp
index df8ecbcad..935fc942c 100644
--- a/libtdepim/kabcresourcecached.cpp
+++ b/libtdepim/kabcresourcecached.cpp
@@ -20,9 +20,9 @@
 
 #include <tqfile.h>
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kabcresourcecached.h"
@@ -30,7 +30,7 @@
 using namespace KABC;
 
 ResourceCached::ResourceCached( const TDEConfig *config )
-  : KABC::Resource( config ), mIdMapper( "kabc/uidmaps/" ),
+  : KABC::Resource( config ), mIdMapper( "tdeabc/uidmaps/" ),
     mReloadPolicy( ReloadInterval ),  mReloadInterval( 10 ),
     mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ),
     mSavePolicy( SaveDelayed ), mSaveInterval( 10 ),
@@ -342,12 +342,12 @@ KABC::Addressee::List ResourceCached::deletedAddressees() const
 
 TQString ResourceCached::cacheFile() const
 {
-  return locateLocal( "cache", "kabc/tderesources/" + identifier() );
+  return locateLocal( "cache", "tdeabc/tderesources/" + identifier() );
 }
 
 TQString ResourceCached::changesCacheFile( const TQString &type ) const
 {
-  return locateLocal( "cache", "kabc/changescache/" + identifier() + "_" + type );
+  return locateLocal( "cache", "tdeabc/changescache/" + identifier() + "_" + type );
 }
 
 void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &map, const TQString &type )
-- 
cgit v1.2.1