From a9bde819f2b421dcc44741156e75eca4bb5fb4f4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:49:30 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kaddressbook/thumbnailcreator/ldifvcardcreator.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kaddressbook/thumbnailcreator/ldifvcardcreator.cpp')

diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
index 3216ea733..7460ad806 100644
--- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
+++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp
@@ -48,7 +48,7 @@ extern "C"
 {
   ThumbCreator *new_creator()
   {
-    KGlobal::locale()->insertCatalogue( "kaddressbook" );
+    TDEGlobal::locale()->insertCatalogue( "kaddressbook" );
     return new VCard_LDIFCreator;
   }
 }
@@ -238,7 +238,7 @@ bool VCard_LDIFCreator::createImageSmall()
 
 bool VCard_LDIFCreator::createImageBig()
 {
-  TQFont normalFont( KGlobalSettings::generalFont() );
+  TQFont normalFont( TDEGlobalSettings::generalFont() );
   TQFont titleFont( normalFont );
   titleFont.setBold(true);
   // titleFont.setUnderline(true);
-- 
cgit v1.2.1