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/koprefsdialog.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'korganizer/koprefsdialog.cpp')

diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index 15003755f..54ca4dfc8 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -343,7 +343,7 @@ class KOPrefsDialogTime : public KPrefsModule
       cb->setText( TQString() );
 
       if ( KOPrefs::instance()->audioFilePathItem()->value().isEmpty() ) {
-        TQString defAudioFile = KGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg");
+        TQString defAudioFile = TDEGlobal::dirs()->findResourceDir( "sound", "KDE-Sys-Warning.ogg");
         KOPrefs::instance()->audioFilePathItem()->setValue( defAudioFile + "KDE-Sys-Warning.ogg"  );
       }
       TQString filter = i18n( "*.ogg *.wav *.mp3 *.wma *.flac *.aiff *.raw *.au *.ra|"
@@ -374,7 +374,7 @@ class KOPrefsDialogTime : public KPrefsModule
 
       TQHBox *workDaysBox = new TQHBox( workingHoursGroup );
       // Respect start of week setting
-      int weekStart=KGlobal::locale()->weekStartDay();
+      int weekStart=TDEGlobal::locale()->weekStartDay();
       for ( int i = 0; i < 7; ++i ) {
         const KCalendarSystem *calSys = KOGlobals::self()->calendarSystem();
         TQString weekDayName = calSys->weekDayName( (i + weekStart + 6)%7 + 1, true );
@@ -481,7 +481,7 @@ extern "C"
 {
   KCModule *create_korganizerconfigtime( TQWidget *parent, const char * )
   {
-    KGlobal::locale()->insertCatalogue( "timezones" );
+    TDEGlobal::locale()->insertCatalogue( "timezones" );
     return new KOPrefsDialogTime( parent, "kcmkorganizertime" );
   }
 }
@@ -602,14 +602,14 @@ class KOPrefsDialogFonts : public KPrefsModule
 
       KPrefsWidFont *timeBarFont =
           addWidFont( KOPrefs::instance()->timeBarFontItem(), topFrame,
-                      KGlobal::locale()->formatTime( TQTime( 12, 34 ) ) );
+                      TDEGlobal::locale()->formatTime( TQTime( 12, 34 ) ) );
       topLayout->addWidget(timeBarFont->label(),0,0);
       topLayout->addWidget(timeBarFont->preview(),0,1);
       topLayout->addWidget(timeBarFont->button(),0,2);
 
       KPrefsWidFont *monthViewFont =
           addWidFont( KOPrefs::instance()->monthViewFontItem(), topFrame,
-                      KGlobal::locale()->formatTime(TQTime(12,34)) + " " +
+                      TDEGlobal::locale()->formatTime(TQTime(12,34)) + " " +
                       i18n("Event text") );
 
       topLayout->addWidget(monthViewFont->label(),1,0);
@@ -625,7 +625,7 @@ class KOPrefsDialogFonts : public KPrefsModule
 
       KPrefsWidFont *marcusBainsFont =
           addWidFont( KOPrefs::instance()->marcusBainsFontItem(), topFrame,
-                      KGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) );
+                      TDEGlobal::locale()->formatTime( TQTime( 12, 34, 23 ) ) );
       topLayout->addWidget(marcusBainsFont->label(),3,0);
       topLayout->addWidget(marcusBainsFont->preview(),3,1);
       topLayout->addWidget(marcusBainsFont->button(),3,2);
-- 
cgit v1.2.1