From kde-commits Fri Mar 31 21:39:07 2006 From: Peter Simonsson Date: Fri, 31 Mar 2006 21:39:07 +0000 To: kde-commits Subject: koffice/libs/kofficeui Message-Id: <1143841147.807551.26382.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=114384116017115 SVN commit 525129 by psn: compile... removing name parameter from some c'tors and use QPalette:: instead of Qt:: in KoPictureFilePreview M +2 -1 KoPictureFilePreview.cpp M +5 -5 KoUnitWidgets.cpp --- trunk/koffice/libs/kofficeui/KoPictureFilePreview.cpp #525128:525129 @@ -28,6 +28,7 @@ #include #include #include +#include //Added by qt3to4: #include @@ -45,7 +46,7 @@ public: KoPictureFilePreviewWidget( QWidget *parent ) : Q3ScrollView( parent ) { - viewport()->setBackgroundRole( Qt::Base ); + viewport()->setBackgroundRole( QPalette::Base ); } bool setPicture( const KUrl& url ) --- trunk/koffice/libs/kofficeui/KoUnitWidgets.cpp #525128:525129 @@ -35,7 +35,7 @@ KoUnitDoubleValidator::KoUnitDoubleValidator( KoUnitDoubleBase *base, QObject *parent, const char *name ) -: KDoubleValidator( parent, name ), m_base( base ) +: KDoubleValidator( parent ), m_base( base ) { } @@ -129,7 +129,7 @@ setObjectName(name); KDoubleSpinBox::setPrecision( 2 ); m_validator = new KoUnitDoubleValidator( this, this ); - QSpinBox::setValidator( m_validator ); + setValidator( m_validator ); setAcceptLocalizedNumbers( true ); setUnit( KoUnit::U_PT ); @@ -144,13 +144,13 @@ KoUnit::Unit unit, unsigned int precision, const char *name ) - : KDoubleSpinBox( lower, upper, step, value, precision, parent, name ), + : KDoubleSpinBox( lower, upper, step, value, parent, precision ), KoUnitDoubleBase( unit, precision ), m_lowerInPoints( lower ), m_upperInPoints( upper ), m_stepInPoints( step ) { m_unit = KoUnit::U_PT; m_validator = new KoUnitDoubleValidator( this, this ); - QSpinBox::setValidator( m_validator ); + setValidator( m_validator ); setAcceptLocalizedNumbers( true ); setUnit( unit ); changeValue( value ); @@ -224,7 +224,7 @@ KoUnitDoubleLineEdit::KoUnitDoubleLineEdit( QWidget *parent, const char *name ) - : KLineEdit( parent, name ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), + : KLineEdit( parent ), KoUnitDoubleBase( KoUnit::U_PT, 2 ), m_value( 0.0 ), m_lower( 0.0 ), m_upper( 9999.99 ), m_lowerInPoints( 0.0 ), m_upperInPoints( 9999.99 ) { setAlignment( Qt::AlignRight );