diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /kontact/plugins/weather | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kontact/plugins/weather')
| -rw-r--r-- | kontact/plugins/weather/summarywidget.cpp | 10 | ||||
| -rw-r--r-- | kontact/plugins/weather/summarywidget.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index 63c7c897..2b114ca2 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 8bb36ce8..96361526 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 |