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

---
 chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc | 4 ++--
 chalk/plugins/viewplugins/screenshot/ksnapshot.cpp     | 6 +++---
 chalk/plugins/viewplugins/screenshot/ksnapshot.h       | 2 +-
 chalk/plugins/viewplugins/screenshot/regiongrabber.cpp | 2 +-
 chalk/plugins/viewplugins/screenshot/screenshot.cpp    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'chalk/plugins')

diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index 023a606a..962a2ac6 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
@@ -48,7 +48,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
     setMainWidget(m_page);
     resize(m_page->sizeHint());
 
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );
     m_page->yOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_y", 8) );
     m_page->blurRadiusSpinBox->setValue( cfg->readNumEntry("dropshadow_blurRadius", 5) );
@@ -103,7 +103,7 @@ bool DlgDropshadow::allowResizingChecked()
 
 void DlgDropshadow::okClicked()
 {
-    KConfig * cfg = KGlobal::config();
+    KConfig * cfg = TDEGlobal::config();
     cfg->writeEntry("dropshadow_x", m_page->xOffsetSpinBox->value());
     cfg->writeEntry("dropshadow_y", m_page->yOffsetSpinBox->value());
     cfg->writeEntry("dropshadow_blurRadius", m_page->blurRadiusSpinBox->value());
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index 1f150e8f..d4e4bf77 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -91,7 +91,7 @@ KSnapshot::KSnapshot(TQWidget *parent, const char *name)
     grabber->releaseMouse();
     grabber->hide();
 
-    KConfig *conf=KGlobal::config();
+    KConfig *conf=TDEGlobal::config();
     conf->setGroup("GENERAL");
     mainWidget->setDelay(conf->readNumEntry("delay",0));
     mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
@@ -467,7 +467,7 @@ void KSnapshot::slotMovePointer(int x, int y)
 void KSnapshot::exit()
 {
 
-    KConfig *conf=KGlobal::config();
+    KConfig *conf=TDEGlobal::config();
     conf->setGroup("GENERAL");
     conf->writeEntry("delay",mainWidget->delay());
     conf->writeEntry("mode",mainWidget->mode());
@@ -482,7 +482,7 @@ void KSnapshot::exit()
 void KSnapshot::slotOk()
 {
 
-    KConfig *conf=KGlobal::config();
+    KConfig *conf=TDEGlobal::config();
     conf->setGroup("GENERAL");
     conf->writeEntry("delay",mainWidget->delay());
     conf->writeEntry("mode",mainWidget->mode());
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
index 2267b1a8..ffa101d1 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
@@ -60,7 +60,7 @@ protected:
     void mouseMoveEvent(TQMouseEvent * e)
         {
             if (mClickPt != TQPoint(0, 0) &&
-                (e->pos() - mClickPt).manhattanLength() > KGlobalSettings::dndEventDelay())
+                (e->pos() - mClickPt).manhattanLength() > TDEGlobalSettings::dndEventDelay())
             {
                 mClickPt = TQPoint(0, 0);
                 emit startDrag();
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index a192df11..06a4d544 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -57,7 +57,7 @@ void SizeTip::positionTip( const TQRect &rect )
 
   if ( rect.intersects( tipRect ) )
   {
-    TQRect deskR = KGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
+    TQRect deskR = TDEGlobalSettings::desktopGeometry( TQPoint( 0, 0 ) );
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
     if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index 57b28cd4..e6f3b9e9 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( chalkscreenshot, KGenericFactory<Screenshot>( "chalk
 Screenshot::Screenshot(TQObject *parent, const char *name, const TQStringList &)
         : KParts::Plugin(parent, name)
 {
-    KGlobal::locale()->insertCatalogue("kscreenshot_plugin");
+    TDEGlobal::locale()->insertCatalogue("kscreenshot_plugin");
     setInstance(KGenericFactory<Screenshot>::instance());
     setXMLFile(locate("data","chalkplugins/screenshot-chalk.rc"), true);
     KImageIO::registerFormats();
-- 
cgit v1.2.1