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

---
 korganizer/printing/calprintdefaultplugins.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'korganizer/printing/calprintdefaultplugins.cpp')

diff --git a/korganizer/printing/calprintdefaultplugins.cpp b/korganizer/printing/calprintdefaultplugins.cpp
index caa2e69ef..e67015545 100644
--- a/korganizer/printing/calprintdefaultplugins.cpp
+++ b/korganizer/printing/calprintdefaultplugins.cpp
@@ -298,7 +298,7 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
         exceptString = i18n("except for listed dates", " except");
         for ( uint i = 0; i < recurs->exDates().size(); i++ ) {
           exceptString.append(" ");
-          exceptString.append( KGlobal::locale()->formatDate(recurs->exDates()[i],
+          exceptString.append( TDEGlobal::locale()->formatDate(recurs->exDates()[i],
                                true) );
         }
       }
@@ -482,24 +482,24 @@ void CalPrintIncidence::print( TQPainter &p, int width, int height )
           if ( (*rit)->dtStart().isValid() ) {
                 datesString += i18n(
                 "Start Date: %1\n").arg(
-                KGlobal::locale()->formatDate( (*rit)->dtStart().date(),
+                TDEGlobal::locale()->formatDate( (*rit)->dtStart().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
                 datesString += i18n(
                 "Start Time: %1\n").arg(
-                KGlobal::locale()->formatTime((*rit)->dtStart().time(),
+                TDEGlobal::locale()->formatTime((*rit)->dtStart().time(),
                      false, false) );
             }
           }
           if ( (*rit)->dtEnd().isValid() ) {
             subitemString += i18n(
                 "Due Date: %1\n").arg(
-                KGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
+                TDEGlobal::locale()->formatDate( (*rit)->dtEnd().date(),
                                 true ) );
             if ( !(*rit)->doesFloat() ) {
               subitemString += i18n(
                   "subitem due time", "Due Time: %1\n").arg(
-                  KGlobal::locale()->formatTime((*rit)->dtEnd().time(),
+                  TDEGlobal::locale()->formatTime((*rit)->dtEnd().time(),
                       false, false) );
             }
           }
@@ -705,7 +705,7 @@ void CalPrintDay::print( TQPainter &p, int width, int height )
   TQRect footerBox( 0, height - footerHeight(), width, footerHeight() );
   height -= footerHeight();
 
-  KLocale *local = KGlobal::locale();
+  KLocale *local = TDEGlobal::locale();
 
   do {
     TQTime curStartTime( mStartTime );
@@ -915,7 +915,7 @@ void CalPrintWeek::print( TQPainter &p, int width, int height )
   toWeek = mToDate.addDays( 6 - weekdayCol );
 
   curWeek = fromWeek.addDays( 6 );
-  KLocale *local = KGlobal::locale();
+  KLocale *local = TDEGlobal::locale();
 
   TQString line1, line2, title;
   TQRect headerBox( 0, 0, width, headerHeight() );
-- 
cgit v1.2.1