From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kview/modules/scale/kview_scale.cpp | 42 ++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'kview/modules/scale/kview_scale.cpp') diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 29e71b13..39cf9e37 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -35,12 +35,12 @@ typedef KGenericFactory KViewScaleFactory; K_EXPORT_COMPONENT_FACTORY( kview_scale, KViewScaleFactory( "kview_scale" ) ) -KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( parent, name ) +KViewScale::KViewScale( TQObject* tqparent, const char* name, const TQStringList & ) + : Plugin( tqparent, name ) , m_pViewer( 0 ) , m_pCanvas( 0 ) { - m_pViewer = static_cast( parent ); + m_pViewer = static_cast( tqparent ); if( m_pViewer ) { kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl; @@ -64,9 +64,9 @@ void KViewScale::slotScaleDlg() KDialogBase dlg( m_pViewer->widget(), "KView scale dialog", true, i18n( "Scale Image" ), KDialogBase::Ok|KDialogBase::Cancel ); ScaleDlg widget( m_pCanvas->imageSize(), dlg.makeVBoxMainWidget() ); #if 0 - TQVBox * layout = dlg.makeVBoxMainWidget(); + TQVBox * tqlayout = dlg.makeVBoxMainWidget(); - TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), layout ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqlayout ); TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, 0, KDialog::spacingHint() ); pixelgroupgrid->setSpacing( KDialog::spacingHint() ); pixelgroupgrid->setMargin( KDialog::marginHint() ); @@ -75,21 +75,21 @@ void KViewScale::slotScaleDlg() // show original width label = new TQLabel( i18n( "Original width:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 0, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.width() ), pixelgroup ), 0, 1 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 1, 0 ); pixelgroupgrid->addWidget( new TQLabel( TQString::number( imagesize.height() ), pixelgroup ), 1, 1 ); pixelgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "New width:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Height:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * newwidth = new TQSpinBox( 1, 100000, 1, pixelgroup ); pixelgroupgrid->addWidget( newwidth, 3, 1 ); @@ -98,15 +98,15 @@ void KViewScale::slotScaleDlg() KComboBox * newsizeunit = new KComboBox( pixelgroup ); newsizeunit->insertItem( i18n( "px" ) ); newsizeunit->insertItem( i18n( "%" ) ); - pixelgroupgrid->addMultiCellWidget( newsizeunit, 3, 4, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( newsizeunit, 3, 4, 2, 2, TQt::AlignVCenter ); pixelgroupgrid->addRowSpacing( 5, KDialog::spacingHint() ); label = new TQLabel( i18n( "Ratio X:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 6, 0 ); label = new TQLabel( i18n( "Y:" ), pixelgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); pixelgroupgrid->addWidget( label, 7, 0 ); TQSpinBox * ratiox = new TQSpinBox( pixelgroup ); ratiox->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratiox ) ); @@ -114,18 +114,18 @@ void KViewScale::slotScaleDlg() TQSpinBox * ratioy = new TQSpinBox( pixelgroup ); ratioy->setValidator( new TQDoubleValidator( 0.0001, 10000, 4, ratioy ) ); pixelgroupgrid->addWidget( ratioy, 7, 1 ); - pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, Qt::AlignVCenter ); + pixelgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), pixelgroup ), 6, 7, 2, 2, TQt::AlignVCenter ); - TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), layout ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqlayout ); TQGridLayout * printgroupgrid = new TQGridLayout( printgroup, 1, 1, 0, KDialog::spacingHint() ); printgroupgrid->setSpacing( KDialog::spacingHint() ); printgroupgrid->setMargin( KDialog::marginHint() ); label = new TQLabel( i18n( "New width:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 0, 0 ); label = new TQLabel( i18n( "Height:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 1, 0 ); TQSpinBox * newwidth2 = new TQSpinBox( printgroup ); printgroupgrid->addWidget( newwidth2, 0, 1 ); @@ -134,25 +134,25 @@ void KViewScale::slotScaleDlg() KComboBox * newsizeunit2 = new KComboBox( printgroup ); newsizeunit2->insertItem( i18n( "in" ) ); newsizeunit2->insertItem( i18n( "mm" ) ); - printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, TQt::AlignVCenter ); printgroupgrid->addRowSpacing( 2, KDialog::spacingHint() ); label = new TQLabel( i18n( "Resolution X:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 3, 0 ); label = new TQLabel( i18n( "Y:" ), printgroup ); - label->setAlignment( TQLabel::AlignRight ); + label->tqsetAlignment( TQLabel::AlignRight ); printgroupgrid->addWidget( label, 4, 0 ); TQSpinBox * resx = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resx, 3, 1 ); TQSpinBox * resy = new TQSpinBox( printgroup ); printgroupgrid->addWidget( resy, 4, 1 ); - printgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, Qt::AlignVCenter ); + printgroupgrid->addMultiCellWidget( new TQCheckBox( i18n( "Link" ), printgroup ), 3, 4, 2, 2, TQt::AlignVCenter ); //KComboBox * newsizeunit2 = new KComboBox( printgroup ); //newsizeunit2->insertItem( i18n( "in" ) ); //newsizeunit2->insertItem( i18n( "mm" ) ); - //printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, Qt::AlignVCenter ); + //printgroupgrid->addMultiCellWidget( newsizeunit2, 0, 1, 2, 2, TQt::AlignVCenter ); #endif dlg.exec(); -- cgit v1.2.1