From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
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/summary/kcmkontactsummary.cpp  |  2 +-
 kontact/plugins/summary/summaryview_part.cpp   | 24 ++++++++++++------------
 kontact/plugins/summary/summaryview_plugin.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kontact/plugins/summary')

diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index ba78c226a..1f7164f80 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -120,7 +120,7 @@ void KCMKontactSummary::load()
 {
   KTrader::OfferList offers = KTrader::self()->query(
       TQString::tqfromLatin1( "Kontact/Plugin" ),
-      TQString( "[X-KDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
+      TQString( "[X-KDE-KontactPluginVersion] == %1" ).tqarg( KONTACT_PLUGIN_VERSION ) );
 
   TQStringList activeSummaries;
 
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index f28ce79ec..5b53b8b6b 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -136,8 +136,8 @@ void SummaryViewPart::updateWidgets()
   KPIM::IdentityManager idm( true, this );
   const KPIM::Identity &id = idm.defaultIdentity();
 
-  TQString currentUser = i18n( "Summary for %1" ).arg( id.fullName() );
-  mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).arg( currentUser ) );
+  TQString currentUser = i18n( "Summary for %1" ).tqarg( id.fullName() );
+  mUsernameLabel->setText( TQString::tqfromLatin1( "<b>%1</b>" ).tqarg( currentUser ) );
 
   mSummaries.clear();
 
@@ -247,18 +247,18 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     return;
 
   if ( target == mFrame ) {
-    if ( mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
+    if ( mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
       return;
   } else {
-    if ( mLeftColumn->findWidget( target ) == -1 && mRightColumn->findWidget( target ) == -1 ||
-         mLeftColumn->findWidget( widget ) == -1 && mRightColumn->findWidget( widget ) == -1 )
+    if ( mLeftColumn->tqfindWidget( target ) == -1 && mRightColumn->tqfindWidget( target ) == -1 ||
+         mLeftColumn->tqfindWidget( widget ) == -1 && mRightColumn->tqfindWidget( widget ) == -1 )
       return;
   }
 
-  if ( mLeftColumn->findWidget( widget ) != -1 ) {
+  if ( mLeftColumn->tqfindWidget( widget ) != -1 ) {
     mLeftColumn->remove( widget );
     mLeftColumnSummaries.remove( widgetName( widget ) );
-  } else if ( mRightColumn->findWidget( widget ) != -1 ) {
+  } else if ( mRightColumn->tqfindWidget( widget ) != -1 ) {
     mRightColumn->remove( widget );
     mRightColumnSummaries.remove( widgetName( widget ) );
   }
@@ -286,7 +286,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     return;
   }
 
-  int targetPos = mLeftColumn->findWidget( target );
+  int targetPos = mLeftColumn->tqfindWidget( target );
   if ( targetPos != -1 ) {
     if ( tqalignment == TQt::AlignBottom )
       targetPos++;
@@ -294,7 +294,7 @@ void SummaryViewPart::summaryWidgetMoved( TQWidget *target, TQWidget *widget, in
     mLeftColumn->insertWidget( targetPos, widget );
     mLeftColumnSummaries.insert( mLeftColumnSummaries.at( targetPos ), widgetName( widget ) );
   } else {
-    targetPos = mRightColumn->findWidget( target );
+    targetPos = mRightColumn->tqfindWidget( target );
 
     if ( tqalignment == TQt::AlignBottom )
       targetPos++;
@@ -311,13 +311,13 @@ void SummaryViewPart::slotTextChanged()
 
 void SummaryViewPart::slotAdjustPalette()
 {
-  mMainWidget->setPaletteBackgroundColor( kapp->palette().active().base() );
+  mMainWidget->setPaletteBackgroundColor( kapp->tqpalette().active().base() );
 }
 
 void SummaryViewPart::setDate( const TQDate& newDate )
 {
   TQString date( "<b>%1</b>" );
-  date = date.arg( KGlobal::locale()->formatDate( newDate ) );
+  date = date.tqarg( KGlobal::locale()->formatDate( newDate ) );
   mDateLabel->setText( date );
 }
 
@@ -364,7 +364,7 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mMainWidget = new TQFrame( sv->viewport() );
   sv->addChild( mMainWidget );
   mMainWidget->setFrameStyle( TQFrame::Panel | TQFrame::Sunken );
-  sv->setFocusPolicy( TQWidget::StrongFocus );
+  sv->setFocusPolicy( Qt::StrongFocus );
   setWidget( sv );
 
   mMainLayout = new TQVBoxLayout( mMainWidget,KDialog::marginHint(),
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 555d79544..74b8e3d76 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -34,7 +34,7 @@ K_EXPORT_COMPONENT_FACTORY( libkontact_summaryplugin,
                             SummaryViewFactory( "kontact_summaryplugin" ) )
 
 SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringList& )
-  : Kontact::Plugin( core, core, name),
+  : Kontact::Plugin( core, TQT_TQOBJECT(core), name),
     mAboutData( 0 ), mPart( 0 )
 {
   setInstance( SummaryViewFactory::instance() );
-- 
cgit v1.2.1