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

---
 kmag/kmag.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kmag/kmag.cpp')

diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp
index 3feea65..af844a3 100644
--- a/kmag/kmag.cpp
+++ b/kmag/kmag.cpp
@@ -230,7 +230,7 @@ void KmagApp::initActions()
   m_pRotationBox->setWhatsThis(i18n("Select the rotation degree."));
   m_pRotationBox->setToolTip(i18n("Rotation degree"));
 
-  // KHelpMenu *newHelpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData());
+  // KHelpMenu *newHelpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData());
 
   m_keyConf = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf");
   m_toolConf = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotEditToolbars() ),
@@ -933,7 +933,7 @@ void KmagApp::slotConfKeys()
 
 void KmagApp::slotEditToolbars()
 {
-  saveMainWindowSettings( KGlobal::config(), "MainWindow" );
+  saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
   KEditToolbar dlg( actionCollection() );
   connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) );
   if ( dlg.exec() )
@@ -953,6 +953,6 @@ void KmagApp::contextMenu (TQPoint pos)
 
 void KmagApp::slotNewToolbarConfig()
 {
-  applyMainWindowSettings( KGlobal::config(), "MainWindow" );
+  applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
   createGUI();
 }
-- 
cgit v1.2.1