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 --- kdgantt/KDGanttSemiSizingControl.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'kdgantt/KDGanttSemiSizingControl.cpp') diff --git a/kdgantt/KDGanttSemiSizingControl.cpp b/kdgantt/KDGanttSemiSizingControl.cpp index e6258e907..08c1a004c 100644 --- a/kdgantt/KDGanttSemiSizingControl.cpp +++ b/kdgantt/KDGanttSemiSizingControl.cpp @@ -3,7 +3,7 @@ */ /**************************************************************************** - ** Copyright (C) 2002-2004 Klarälvdalens Datakonsult AB. All rights reserved. + ** Copyright (C) 2002-2004 Klar�lvdalens Datakonsult AB. All rights reserved. ** ** This file is part of the KDGantt library. ** @@ -65,7 +65,7 @@ KDGanttSemiSizingControl::KDGanttSemiSizingControl( TQWidget* tqparent, const char* name ) : - KDGanttSizingControl( tqparent, name ), _orient( Horizontal ), + KDGanttSizingControl( tqparent, name ), _orient( Qt::Horizontal ), _arrowPos( Before ), _minimizedWidget(0), _maximizedWidget(0) { init(); @@ -262,12 +262,12 @@ void KDGanttSemiSizingControl::setup() delete _tqlayout; TQBoxLayout* butLayout; // _tqlayout will delete me - if ( _orient == Horizontal || isMinimized() ) + if ( _orient == Qt::Horizontal || isMinimized() ) _tqlayout = new TQHBoxLayout( this ); else _tqlayout = new TQVBoxLayout( this ); - if ( _orient == Vertical && !isMinimized() ) + if ( _orient == Qt::Vertical && !isMinimized() ) butLayout = new TQHBoxLayout( _tqlayout ); else butLayout = new TQVBoxLayout( _tqlayout ); @@ -288,7 +288,7 @@ void KDGanttSemiSizingControl::setup() } //------------------------------ Setup the button at the correct possition - if ( _arrowPos == After && _orient == Vertical && !isMinimized() ) { + if ( _arrowPos == After && _orient == Qt::Vertical && !isMinimized() ) { butLayout->addStretch( 1 ); butLayout->addWidget( _but, 0, TQt::AlignLeft ); } @@ -305,7 +305,7 @@ void KDGanttSemiSizingControl::setup() else widget = _maximizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient == Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) _tqlayout->addWidget( widget, 1 ); else _tqlayout->insertWidget( 0, widget, 1 ); @@ -318,20 +318,20 @@ void KDGanttSemiSizingControl::setup() if ( isMinimized() ) { widget = _minimizedWidget; if( widget ) { - if ( _arrowPos == Before || _orient == Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) _tqlayout->addWidget( widget, 1 ); else _tqlayout->insertWidget( 0, widget, 1 ); } } else { - if ( _arrowPos == Before || _orient == Vertical && !isMinimized() ) + if ( _arrowPos == Before || _orient == Qt::Vertical && !isMinimized() ) _tqlayout->addStretch( 1 ); else _tqlayout->insertStretch( 0, 1 ); widget = _maximizedWidget; // the following is only the special case - // arrowPos == Before and _orient == Vertical + // arrowPos == Before and _orient == Qt::Vertical //widget->move( 0+x(), _but->height()+y()); } } -- cgit v1.2.1