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

---
 kjots/KJotsMain.cpp | 4 ++--
 kjots/kjots.kcfg    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kjots')

diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 9333b81..f0a1c70 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -67,7 +67,7 @@ KJotsMain::KJotsMain(const char* name)
     setCentralWidget(f_main);
 
     splitter = new TQSplitter(f_main);
-    splitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
+    splitter->setOpaqueResize( TDEGlobalSettings::opaqueResize() );
 
     // the subject list
     subjectList = new KListView(splitter, "subjectList");
@@ -573,7 +573,7 @@ void KJotsMain::slotQuit()
 
 void KJotsMain::insertDate()
 {
-  me_text->insert(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
+  me_text->insert(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime(), true) + " ");
 }
 
 void KJotsMain::updateMenu()
diff --git a/kjots/kjots.kcfg b/kjots/kjots.kcfg
index 4350210..68e5fc3 100644
--- a/kjots/kjots.kcfg
+++ b/kjots/kjots.kcfg
@@ -13,7 +13,7 @@
     </entry>
     <entry name="Font" type="Font">
       <label>The font used to display the contents of books.</label>
-      <default code="true">KGlobalSettings::generalFont()</default>
+      <default code="true">TDEGlobalSettings::generalFont()</default>
     </entry>
     <entry name="AutoSave" type="Bool">
       <label>Whether books should be saved automatically.</label>
-- 
cgit v1.2.1