From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kontact/plugins/weather/summarywidget.cpp | 14 +++++++------- kontact/plugins/weather/summarywidget.h | 7 ++++--- 2 files changed, 11 insertions(+), 10 deletions(-) (limited to 'kontact/plugins/weather') diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp index abe11764..bc468e84 100644 --- a/kontact/plugins/weather/summarywidget.cpp +++ b/kontact/plugins/weather/summarywidget.cpp @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #include #include @@ -38,12 +38,12 @@ #include "summarywidget.h" -SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) - : Kontact::Summary( parent, name ), +SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) + : Kontact::Summary( tqparent, name ), DCOPObject( "WeatherSummaryWidget" ), mProc( 0 ) { mLayout = new TQVBoxLayout( this, 3, 3 ); - mLayout->tqsetAlignment( Qt::AlignTop ); + mLayout->tqsetAlignment( TQt::AlignTop ); TQPixmap icon = KGlobal::iconLoader()->loadIcon( "kweather", KIcon::Desktop, KIcon::SizeMedium ); TQWidget *header = createHeader( this, icon, i18n( "Weather Service" ) ); @@ -55,7 +55,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) if ( !kapp->dcopClient()->isApplicationRegistered( "KWeatherService" ) ) { if ( KApplication::startServiceByDesktopName( "kweatherservice", TQStringList(), &error, &appID ) ) { TQLabel *label = new TQLabel( i18n( "No weather dcop service available;\nyou need KWeather to use this plugin." ), this ); - mLayout->addWidget( label, Qt::AlignHCenter | AlignVCenter ); + mLayout->addWidget( label, TQt::AlignHCenter | AlignVCenter ); serviceAvailable = false; } } @@ -191,7 +191,7 @@ bool SummaryWidget::eventFilter( TQObject *obj, TQEvent* e ) emit message( i18n( "View Weather Report for Station" ) ); if ( e->type() == TQEvent::Leave ) - emit message( TQString::null ); + emit message( TQString() ); } return Kontact::Summary::eventFilter( obj, e ); diff --git a/kontact/plugins/weather/summarywidget.h b/kontact/plugins/weather/summarywidget.h index 0baeefc0..be1c5b9c 100644 --- a/kontact/plugins/weather/summarywidget.h +++ b/kontact/plugins/weather/summarywidget.h @@ -17,8 +17,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. As a special exception, permission is given to link this program - with any edition of Qt, and distribute the resulting executable, - without including the source code for Qt in the source distribution. + with any edition of TQt, and distribute the resulting executable, + without including the source code for TQt in the source distribution. */ #ifndef SUMMARYWIDGET_H @@ -87,9 +87,10 @@ class WeatherData class SummaryWidget : public Kontact::Summary, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: - SummaryWidget( TQWidget *parent, const char *name = 0 ); + SummaryWidget( TQWidget *tqparent, const char *name = 0 ); TQStringList configModules() const; -- cgit v1.2.3