Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 9 insertions, 9 deletions

diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index bc468e844..926f70a73 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -101,7 +101,7 @@ void SummaryWidget::updateView()
   for ( it = dataList.begin(); it != dataList.end(); ++it ) {
     TQString cover;
     for ( uint i = 0; i < (*it).cover().count(); ++i )
-      cover += TQString( "- %1\n" ).arg( (*it).cover()[ i ] );
+      cover += TQString( "- %1\n" ).tqarg( (*it).cover()[ i ] );
 
     TQImage img;
     img = (*it).icon();
@@ -121,7 +121,7 @@ void SummaryWidget::updateView()
               this, TQT_SLOT( showReport( const TQString& ) ) );
 
     TQLabel* label = new TQLabel( this );
-    label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
+    label->setText( TQString( "%1 (%2)" ).tqarg( (*it).name() ).tqarg( (*it).temperature() ) );
     TQFont font = label->font();
     font.setBold( true );
     label->setFont( font );
@@ -133,12 +133,12 @@ void SummaryWidget::updateView()
     labelText = TQString( "<b>%1:</b> %2<br>"
                          "<b>%3:</b> %4<br>"
                          "<b>%5:</b> %6" )
-                         .arg( i18n( "Last updated on" ) )
-                         .arg( (*it).date() )
-                         .arg( i18n( "Wind Speed" ) )
-                         .arg( (*it).windSpeed() )
-                         .arg( i18n( "Rel. Humidity" ) )
-                         .arg( (*it).relativeHumidity() );
+                         .tqarg( i18n( "Last updated on" ) )
+                         .tqarg( (*it).date() )
+                         .tqarg( i18n( "Wind Speed" ) )
+                         .tqarg( (*it).windSpeed() )
+                         .tqarg( i18n( "Rel. Humidity" ) )
+                         .tqarg( (*it).relativeHumidity() );
 
     TQToolTip::add( label, labelText.tqreplace( " ", "&nbsp;" ) );
 
diff --git a/kontact/plugins/weather/weather_plugin.cpp b/kontact/plugins/weather/weather_plugin.cpp
index d42a24f61..9d9f5dfde 100644
--- a/kontact/plugins/weather/weather_plugin.cpp
+++ b/kontact/plugins/weather/weather_plugin.cpp
@@ -32,7 +32,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_weatherplugin,
                             WeatherPluginFactory( "kontact_weatherplugin" ) )
 
 WeatherPlugin::WeatherPlugin( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name ), mAboutData( 0 )
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name ), mAboutData( 0 )
 {
   setInstance( WeatherPluginFactory::instance() );
 }