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

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

(limited to 'kmail/headerstyle.cpp')

diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp
index 019c20b28..c3a5b8b26 100644
--- a/kmail/headerstyle.cpp
+++ b/kmail/headerstyle.cpp
@@ -144,7 +144,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale * locale = KGlobal::locale();
+      KLocale * locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     } else {
@@ -243,7 +243,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale* locale = KGlobal::locale();
+      KLocale* locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     }
@@ -448,7 +448,7 @@ namespace KMail {
     TQString dateString;
     if( printing ) {
       TQDateTime dateTime;
-      KLocale* locale = KGlobal::locale();
+      KLocale* locale = TDEGlobal::locale();
       dateTime.setTime_t( message->date() );
       dateString = locale->formatDateTime( dateTime );
     }
@@ -695,7 +695,7 @@ namespace KMail {
 				}
 				
 				TQString tformat;
-				if ( KGlobal::locale()->use12Clock() ) {
+				if ( TDEGlobal::locale()->use12Clock() ) {
 				  tformat = "h:mm AP";
 				}
 				else {
@@ -914,7 +914,7 @@ namespace KMail {
 	TQString dateString;
 	if( printing ) {
 	    TQDateTime dateTime;
-	    KLocale * locale = KGlobal::locale();
+	    KLocale * locale = TDEGlobal::locale();
 	    dateTime.setTime_t( message->date() );
 	    dateString = locale->formatDateTime( dateTime );
 	} else {
-- 
cgit v1.2.1