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
---
 korganizer/multiagendaview.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'korganizer/multiagendaview.cpp')

diff --git a/korganizer/multiagendaview.cpp b/korganizer/multiagendaview.cpp
index d613941c..4b7da9e2 100644
--- a/korganizer/multiagendaview.cpp
+++ b/korganizer/multiagendaview.cpp
@@ -57,7 +57,7 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   TQVBox *topSideBox = new TQVBox( this );
   mLeftTopSpacer = new TQWidget( topSideBox );
   mLeftTopSpacer->setFixedHeight( topLabelHeight );
-  mLeftSplitter = new TQSplitter( TQt::Vertical, topSideBox );
+  mLeftSplitter = new TQSplitter( Qt::Vertical, topSideBox );
   mLeftSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   TQLabel *label = new TQLabel( i18n("All Day"), mLeftSplitter );
   label->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter | TQt::WordBreak );
@@ -81,14 +81,14 @@ MultiAgendaView::MultiAgendaView( Calendar * cal, CalendarView *calendarView,
   topSideBox = new TQVBox( this );
   mRightTopSpacer = new TQWidget( topSideBox );
   mRightTopSpacer->setFixedHeight( topLabelHeight );
-  mRightSplitter = new TQSplitter( TQt::Vertical, topSideBox );
+  mRightSplitter = new TQSplitter( Qt::Vertical, topSideBox );
   mRightSplitter->setOpaqueResize( KGlobalSettings::opaqueResize() );
   new TQWidget( mRightSplitter );
   sideBox = new TQVBox( mRightSplitter );
   eiSpacer = new EventIndicator( EventIndicator::Top, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
-  mScrollBar = new TQScrollBar( TQt::Vertical, sideBox );
+  mScrollBar = new TQScrollBar( Qt::Vertical, sideBox );
   eiSpacer = new EventIndicator( EventIndicator::Bottom, sideBox );
   eiSpacer->setFixedHeight( eiSpacer->minimumHeight() );
   eiSpacer->changeColumns( 0 );
@@ -464,12 +464,12 @@ bool MultiAgendaView::eventFilter(TQObject * obj, TQEvent * event)
     if ( (event->type() == TQEvent::MouseMove && KGlobalSettings::opaqueResize())
            || event->type() == TQEvent::MouseButtonRelease ) {
       FOREACH_VIEW( agenda ) {
-        if ( agenda->splitter() == obj->tqparent() )
+        if ( TQT_BASE_OBJECT(agenda->splitter()) == TQT_BASE_OBJECT(obj->tqparent()) )
           mLastMovedSplitter = agenda->splitter();
       }
-      if ( mLeftSplitter == obj->tqparent() )
+      if ( TQT_BASE_OBJECT(mLeftSplitter )== TQT_BASE_OBJECT(obj->tqparent()) )
         mLastMovedSplitter = mLeftSplitter;
-      else if ( mRightSplitter == obj->tqparent() )
+      else if ( TQT_BASE_OBJECT(mRightSplitter) == TQT_BASE_OBJECT(obj->tqparent()) )
         mLastMovedSplitter = mRightSplitter;
       TQTimer::singleShot( 0, this, TQT_SLOT(resizeSplitters()) );
     }
@@ -522,7 +522,7 @@ void MultiAgendaView::resizeSpacers( int newY )
 
 void MultiAgendaView::zoomView( const int delta, const TQPoint & pos, const Qt::Orientation ori )
 {
-  if ( ori == TQt::Vertical ) {
+  if ( ori == Qt::Vertical ) {
     if ( delta > 0 ) {
       if ( KOPrefs::instance()->mHourSize > 4 )
         KOPrefs::instance()->mHourSize--;
-- 
cgit v1.2.3