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

---
 kontact/plugins/weather/summarywidget.cpp | 10 +++++-----
 kontact/plugins/weather/summarywidget.h   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kontact/plugins/weather')

diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 63c7c8977..2b114ca24 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -45,7 +45,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mLayout = new TQVBoxLayout( this, 3, 3 );
   mLayout->setAlignment( TQt::AlignTop );
 
-  TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
+  TQPixmap icon = TDEGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium );
   TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) );
   mLayout->addWidget( header );
 
@@ -209,9 +209,9 @@ void SummaryWidget::updateSummary( bool )
 
 void SummaryWidget::showReport( const TQString &stationID )
 {
-  mProc = new KProcess;
-  TQApplication::connect( mProc, TQT_SIGNAL( processExited( KProcess* ) ),
-                         this, TQT_SLOT( reportFinished( KProcess* ) ) );
+  mProc = new TDEProcess;
+  TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ),
+                         this, TQT_SLOT( reportFinished( TDEProcess* ) ) );
   *mProc << "kweatherreport";
   *mProc << stationID;
 
@@ -221,7 +221,7 @@ void SummaryWidget::showReport( const TQString &stationID )
   }
 }
 
-void SummaryWidget::reportFinished( KProcess* )
+void SummaryWidget::reportFinished( TDEProcess* )
 {
   mProc->deleteLater();
   mProc = 0;
diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h
index 8bb36ce87..963615267 100644
--- a/kontact/plugins/weather/summarywidget.h
+++ b/kontact/plugins/weather/summarywidget.h
@@ -35,7 +35,7 @@
 #include <tqtimer.h>
 #include <tqwidget.h>
 
-class KProcess;
+class TDEProcess;
 
 class TQGridLayout;
 class TQLabel;
@@ -107,7 +107,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     void updateView();
     void timeout();
     void showReport( const TQString& );
-    void reportFinished( KProcess* );
+    void reportFinished( TDEProcess* );
 
   private:
     TQStringList mStations;
@@ -118,7 +118,7 @@ class SummaryWidget : public Kontact::Summary, public DCOPObject
     TQPtrList<TQGridLayout> mLayouts;
     TQVBoxLayout *mLayout;
 
-    KProcess* mProc;
+    TDEProcess* mProc;
 };
 
 #endif
-- 
cgit v1.2.1