From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 14 Apr 2011 20:16:30 +0000 Subject: 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 --- kontact/plugins/kpilot/kpilot_plugin.cpp | 2 +- kontact/plugins/kpilot/summarywidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kontact/plugins/kpilot') diff --git a/kontact/plugins/kpilot/kpilot_plugin.cpp b/kontact/plugins/kpilot/kpilot_plugin.cpp index 88e9d7886..402d1e21a 100644 --- a/kontact/plugins/kpilot/kpilot_plugin.cpp +++ b/kontact/plugins/kpilot/kpilot_plugin.cpp @@ -35,7 +35,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_kpilotplugin, KPilotPluginFactory( "kontact_kpilotplugin" ) ) KPilotPlugin::KPilotPlugin( Kontact::Core *core, const char *name, const TQStringList& ) - : Kontact::Plugin( core, core, "kpilot" ), mAboutData( 0 ) + : Kontact::Plugin( core, TQT_TQOBJECT(core), "kpilot" ), mAboutData( 0 ) { setInstance( KPilotPluginFactory::instance() ); // TODO: Make sure kpilotDaemon is running! diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp index 3e7577132..a0dafaa29 100644 --- a/kontact/plugins/kpilot/summarywidget.cpp +++ b/kontact/plugins/kpilot/summarywidget.cpp @@ -202,7 +202,7 @@ void SummaryWidget::showSyncLog( const TQString &filename ) TQFile f(filename); if ( !f.open( IO_ReadOnly ) ) { - KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).arg( filename ) ); + KMessageBox::error( this, i18n( "Unable to open Hotsync log %1." ).tqarg( filename ) ); return; } -- cgit v1.2.1