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

---
 kontact/plugins/summary/kcmkontactsummary.cpp | 2 +-
 kontact/plugins/summary/summaryview_part.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kontact/plugins/summary')

diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 360da023d..f3eae0121 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -55,7 +55,7 @@ class PluginItem : public TQCheckListItem
       : TQCheckListItem( parent, TQString(), TQCheckListItem::CheckBox ),
         mInfo( info )
     {
-      TQPixmap pm = KGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
+      TQPixmap pm = TDEGlobal::iconLoader()->loadIcon( mInfo->icon(), KIcon::Small );
       setPixmap( 0, pm );
     }
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index da0c160dd..ba85836b2 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -317,7 +317,7 @@ void SummaryViewPart::slotAdjustPalette()
 void SummaryViewPart::setDate( const TQDate& newDate )
 {
   TQString date( "<b>%1</b>" );
-  date = date.arg( KGlobal::locale()->formatDate( newDate ) );
+  date = date.arg( TDEGlobal::locale()->formatDate( newDate ) );
   mDateLabel->setText( date );
 }
 
-- 
cgit v1.2.1