From ef06f14f2475bd08d3ea2ceec54a7b2238f3554e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 5 Nov 2023 11:54:26 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- kspread/KSpreadCellIface.cpp | 84 ++++++++++++++--------------- kspread/KSpreadLayoutIface.cpp | 72 ++++++++++++------------- kspread/dialogs/kspread_dlg_conditional.cpp | 8 +-- kspread/dialogs/kspread_dlg_csv.cpp | 4 +- kspread/dialogs/kspread_dlg_insert.cpp | 2 +- kspread/dialogs/kspread_dlg_layout.cpp | 84 ++++++++++++++--------------- kspread/dialogs/kspread_dlg_layout.h | 26 ++++----- kspread/dialogs/kspread_dlg_paperlayout.cpp | 4 +- kspread/dialogs/kspread_dlg_pasteinsert.cpp | 2 +- kspread/dialogs/kspread_dlg_preference.cpp | 2 +- kspread/dialogs/kspread_dlg_series.cpp | 10 ++-- kspread/dialogs/kspread_dlg_sort.cpp | 12 ++--- kspread/dialogs/kspread_dlg_special.cpp | 4 +- kspread/dialogs/kspread_dlg_styles.cpp | 2 +- kspread/dialogs/kspread_dlg_subtotal.cpp | 2 +- kspread/dialogs/kspread_dlg_validity.cpp | 6 +-- kspread/kspread_canvas.cpp | 32 +++++------ kspread/kspread_cell.cpp | 2 +- kspread/kspread_format.cpp | 30 +++++------ kspread/kspread_format.h | 28 +++++----- kspread/kspread_handler.cpp | 4 +- kspread/kspread_object.cpp | 18 +++---- kspread/kspread_pen.cpp | 2 +- kspread/kspread_pen.h | 2 +- kspread/kspread_sheet.cpp | 10 ++-- kspread/kspread_sheetprint.cpp | 2 +- kspread/kspread_style.cpp | 2 +- kspread/kspread_util.cpp | 16 +++--- kspread/kspread_view.cpp | 4 +- kspread/plugins/calculator/configdlg.cpp | 2 +- kspread/plugins/calculator/kcalc.cpp | 6 +-- kspread/valueparser.cpp | 2 +- 32 files changed, 243 insertions(+), 243 deletions(-) (limited to 'kspread') diff --git a/kspread/KSpreadCellIface.cpp b/kspread/KSpreadCellIface.cpp index 4188a1e4..7d413b84 100644 --- a/kspread/KSpreadCellIface.cpp +++ b/kspread/KSpreadCellIface.cpp @@ -600,17 +600,17 @@ void CellIface::setLeftBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setLeftBorderStyle(Qt::DotLine); + cell->format()->setLeftBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setLeftBorderStyle(Qt::DashLine); + cell->format()->setLeftBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setLeftBorderStyle(Qt::DashDotLine); + cell->format()->setLeftBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setLeftBorderStyle(Qt::DashDotDotLine); + cell->format()->setLeftBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setLeftBorderStyle(Qt::SolidLine); + cell->format()->setLeftBorderStyle(TQt::SolidLine); else - cell->format()->setLeftBorderStyle(Qt::SolidLine); + cell->format()->setLeftBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -661,7 +661,7 @@ TQString CellIface::leftBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->leftBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->leftBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -684,17 +684,17 @@ void CellIface::setRightBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setRightBorderStyle(Qt::DotLine); + cell->format()->setRightBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setRightBorderStyle(Qt::DashLine); + cell->format()->setRightBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setRightBorderStyle(Qt::DashDotLine); + cell->format()->setRightBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setRightBorderStyle(Qt::DashDotDotLine); + cell->format()->setRightBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setRightBorderStyle(Qt::SolidLine); + cell->format()->setRightBorderStyle(TQt::SolidLine); else - cell->format()->setRightBorderStyle(Qt::SolidLine); + cell->format()->setRightBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -744,7 +744,7 @@ TQString CellIface::rightBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->rightBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->rightBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -767,17 +767,17 @@ void CellIface::setTopBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setTopBorderStyle(Qt::DotLine); + cell->format()->setTopBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setTopBorderStyle(Qt::DashLine); + cell->format()->setTopBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setTopBorderStyle(Qt::DashDotLine); + cell->format()->setTopBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setTopBorderStyle(Qt::DashDotDotLine); + cell->format()->setTopBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setTopBorderStyle(Qt::SolidLine); + cell->format()->setTopBorderStyle(TQt::SolidLine); else - cell->format()->setTopBorderStyle(Qt::SolidLine); + cell->format()->setTopBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -826,7 +826,7 @@ TQString CellIface::topBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->topBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->topBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -849,17 +849,17 @@ void CellIface::setBottomBorderStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setBottomBorderStyle(Qt::DotLine); + cell->format()->setBottomBorderStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setBottomBorderStyle(Qt::DashLine); + cell->format()->setBottomBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setBottomBorderStyle(Qt::DashDotLine); + cell->format()->setBottomBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setBottomBorderStyle(Qt::DashDotDotLine); + cell->format()->setBottomBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setBottomBorderStyle(Qt::SolidLine); + cell->format()->setBottomBorderStyle(TQt::SolidLine); else - cell->format()->setBottomBorderStyle(Qt::SolidLine); + cell->format()->setBottomBorderStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -908,7 +908,7 @@ TQString CellIface::bottomBorderStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->bottomBorderStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->bottomBorderStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -931,17 +931,17 @@ void CellIface::setFallDiagonalStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setFallDiagonalStyle(Qt::DotLine); + cell->format()->setFallDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setFallDiagonalStyle(Qt::DashLine); + cell->format()->setFallDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setFallDiagonalStyle(Qt::DashDotLine); + cell->format()->setFallDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setFallDiagonalStyle(Qt::DashDotDotLine); + cell->format()->setFallDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setFallDiagonalStyle(Qt::SolidLine); + cell->format()->setFallDiagonalStyle(TQt::SolidLine); else - cell->format()->setFallDiagonalStyle(Qt::SolidLine); + cell->format()->setFallDiagonalStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -990,7 +990,7 @@ TQString CellIface::fallDiagonalStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->fallDiagonalStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->fallDiagonalStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; @@ -1014,17 +1014,17 @@ void CellIface::setGoUpDiagonalStyle( const TQString& _style ) if( !m_sheet ) return; Cell* cell = m_sheet->nonDefaultCell( m_point.x(), m_point.y() ); if(_style=="DotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashDotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - cell->format()->setGoUpDiagonalStyle(Qt::DashDotDotLine); + cell->format()->setGoUpDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - cell->format()->setGoUpDiagonalStyle(Qt::SolidLine); + cell->format()->setGoUpDiagonalStyle(TQt::SolidLine); else - cell->format()->setGoUpDiagonalStyle(Qt::SolidLine); + cell->format()->setGoUpDiagonalStyle(TQt::SolidLine); m_sheet->setRegionPaintDirty(cell->cellRect()); } @@ -1073,7 +1073,7 @@ TQString CellIface::goUpDiagonalStyle() const { if( !m_sheet ) return TQString(); Cell* cell = m_sheet->cellAt( m_point ); - Qt::PenStyle penStyle=cell->format()->goUpDiagonalStyle( m_point.x(), m_point.y() ); + TQt::PenStyle penStyle=cell->format()->goUpDiagonalStyle( m_point.x(), m_point.y() ); TQString tmp; if( penStyle==TQt::DotLine) tmp="DotLine"; diff --git a/kspread/KSpreadLayoutIface.cpp b/kspread/KSpreadLayoutIface.cpp index d3c5e1b7..efc28fca 100644 --- a/kspread/KSpreadLayoutIface.cpp +++ b/kspread/KSpreadLayoutIface.cpp @@ -195,17 +195,17 @@ void LayoutIface::setTextFontFamily( const TQString& _font ) void LayoutIface::setLeftBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setLeftBorderStyle(Qt::DotLine); + layout->setLeftBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setLeftBorderStyle(Qt::DashLine); + layout->setLeftBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setLeftBorderStyle(Qt::DashDotLine); + layout->setLeftBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setLeftBorderStyle(Qt::DashDotDotLine); + layout->setLeftBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(TQt::SolidLine); else - layout->setLeftBorderStyle(Qt::SolidLine); + layout->setLeftBorderStyle(TQt::SolidLine); } void LayoutIface::setLeftBorderColor(const TQString& _c) @@ -230,17 +230,17 @@ void LayoutIface::setLeftBorderWidth( int _size ) void LayoutIface::setRightBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setRightBorderStyle(Qt::DotLine); + layout->setRightBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setRightBorderStyle(Qt::DashLine); + layout->setRightBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setRightBorderStyle(Qt::DashDotLine); + layout->setRightBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setRightBorderStyle(Qt::DashDotDotLine); + layout->setRightBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(TQt::SolidLine); else - layout->setRightBorderStyle(Qt::SolidLine); + layout->setRightBorderStyle(TQt::SolidLine); } void LayoutIface::setRightBorderColor(const TQString& _c) @@ -265,17 +265,17 @@ void LayoutIface::setRightBorderWidth( int _size ) void LayoutIface::setTopBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setTopBorderStyle(Qt::DotLine); + layout->setTopBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setTopBorderStyle(Qt::DashLine); + layout->setTopBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setTopBorderStyle(Qt::DashDotLine); + layout->setTopBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setTopBorderStyle(Qt::DashDotDotLine); + layout->setTopBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(TQt::SolidLine); else - layout->setTopBorderStyle(Qt::SolidLine); + layout->setTopBorderStyle(TQt::SolidLine); } void LayoutIface::setTopBorderColor(const TQString& _c) @@ -300,17 +300,17 @@ void LayoutIface::setTopBorderWidth( int _size ) void LayoutIface::setBottomBorderStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setBottomBorderStyle(Qt::DotLine); + layout->setBottomBorderStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setBottomBorderStyle(Qt::DashLine); + layout->setBottomBorderStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setBottomBorderStyle(Qt::DashDotLine); + layout->setBottomBorderStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setBottomBorderStyle(Qt::DashDotDotLine); + layout->setBottomBorderStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(TQt::SolidLine); else - layout->setBottomBorderStyle(Qt::SolidLine); + layout->setBottomBorderStyle(TQt::SolidLine); } void LayoutIface::setBottomBorderColor(const TQString& _c) @@ -334,17 +334,17 @@ void LayoutIface::setBottomBorderWidth( int _size ) void LayoutIface::setFallDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setFallDiagonalStyle(Qt::DotLine); + layout->setFallDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setFallDiagonalStyle(Qt::DashLine); + layout->setFallDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setFallDiagonalStyle(Qt::DashDotLine); + layout->setFallDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setFallDiagonalStyle(Qt::DashDotDotLine); + layout->setFallDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(TQt::SolidLine); else - layout->setFallDiagonalStyle(Qt::SolidLine); + layout->setFallDiagonalStyle(TQt::SolidLine); } void LayoutIface::setFallDiagonalColor(const TQString& _c) @@ -369,17 +369,17 @@ void LayoutIface::setFallDiagonalWidth( int _size ) void LayoutIface::setGoUpDiagonalStyle( const TQString& _style ) { if(_style=="DotLine") - layout->setGoUpDiagonalStyle(Qt::DotLine); + layout->setGoUpDiagonalStyle(TQt::DotLine); else if(_style=="DashLine") - layout->setGoUpDiagonalStyle(Qt::DashLine); + layout->setGoUpDiagonalStyle(TQt::DashLine); else if(_style=="DashDotLine") - layout->setGoUpDiagonalStyle(Qt::DashDotLine); + layout->setGoUpDiagonalStyle(TQt::DashDotLine); else if(_style=="DashDotDotLine") - layout->setGoUpDiagonalStyle(Qt::DashDotDotLine); + layout->setGoUpDiagonalStyle(TQt::DashDotDotLine); else if(_style=="SolidLine") - layout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(TQt::SolidLine); else - layout->setGoUpDiagonalStyle(Qt::SolidLine); + layout->setGoUpDiagonalStyle(TQt::SolidLine); } void LayoutIface::setGoUpDiagonalColor(const TQString& _c) diff --git a/kspread/dialogs/kspread_dlg_conditional.cpp b/kspread/dialogs/kspread_dlg_conditional.cpp index a75bd5bd..42e60b6a 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cpp +++ b/kspread/dialogs/kspread_dlg_conditional.cpp @@ -53,7 +53,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags TQGridLayout * Form1Layout = new TQGridLayout( this, 1, 1, 11, 6, "Form1Layout"); TQGroupBox * groupBox1_3 = new TQGroupBox( this, "groupBox1_3" ); - groupBox1_3->setColumnLayout(0, Qt::Vertical ); + groupBox1_3->setColumnLayout(0, TQt::Vertical ); groupBox1_3->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_3->layout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->layout() ); @@ -88,7 +88,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags Form1Layout->addWidget( groupBox1_3, 2, 0 ); TQGroupBox * groupBox1_2 = new TQGroupBox( this, "groupBox1_2" ); - groupBox1_2->setColumnLayout(0, Qt::Vertical ); + groupBox1_2->setColumnLayout(0, TQt::Vertical ); groupBox1_2->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_2->layout()->setMargin( KDialog::marginHint() ); @@ -124,7 +124,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags Form1Layout->addWidget( groupBox1_2, 1, 0 ); TQGroupBox * groupBox1_1 = new TQGroupBox( this, "groupBox1_1" ); - groupBox1_1->setColumnLayout(0, Qt::Vertical ); + groupBox1_1->setColumnLayout(0, TQt::Vertical ); groupBox1_1->layout()->setSpacing( KDialog::spacingHint() ); groupBox1_1->layout()->setMargin( KDialog::marginHint() ); @@ -291,7 +291,7 @@ ConditionalDialog::ConditionalDialog( View * parent, const char * name, m_dlg->m_style_3->insertStringList( list ); setCaption( i18n( "Conditional Cell Attributes" ) ); - setButtonBoxOrientation(Qt::Vertical ); + setButtonBoxOrientation(TQt::Vertical ); setMainWidget( m_dlg ); init(); diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index c068810b..c40074b9 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -88,7 +88,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); m_delimiterBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); m_delimiterBox->setTitle( i18n( "Delimiter" ) ); - m_delimiterBox->setColumnLayout(0, Qt::Vertical ); + m_delimiterBox->setColumnLayout(0, TQt::Vertical ); m_delimiterBox->layout()->setSpacing( KDialog::spacingHint() ); m_delimiterBox->layout()->setMargin( KDialog::marginHint() ); m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->layout() ); @@ -131,7 +131,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_formatBox = new TQButtonGroup( page, "m_formatBox" ); m_formatBox->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); m_formatBox->setTitle( i18n( "Format" ) ); - m_formatBox->setColumnLayout(0, Qt::Vertical ); + m_formatBox->setColumnLayout(0, TQt::Vertical ); m_formatBox->layout()->setSpacing( KDialog::spacingHint() ); m_formatBox->layout()->setMargin( KDialog::marginHint() ); m_formatBoxLayout = new TQGridLayout( m_formatBox->layout() ); diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 454a43ba..23f7f841 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -53,7 +53,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_layout.cpp b/kspread/dialogs/kspread_dlg_layout.cpp index ad876b3b..ff4719c6 100644 --- a/kspread/dialogs/kspread_dlg_layout.cpp +++ b/kspread/dialogs/kspread_dlg_layout.cpp @@ -76,14 +76,14 @@ using namespace KSpread; PatternSelect::PatternSelect( TQWidget *parent, const char * ) : TQFrame( parent ) { - penStyle = Qt::NoPen; + penStyle = TQt::NoPen; penWidth = 1; penColor = colorGroup().text(); selected = false; undefined = false; } -void PatternSelect::setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ) +void PatternSelect::setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ) { penStyle = _style; penColor = _color; @@ -154,7 +154,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) TQGridLayout * layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint(), "layout"); TQGroupBox * groupBox = new TQGroupBox( this, "groupBox1" ); - groupBox->setColumnLayout(0, Qt::Vertical ); + groupBox->setColumnLayout(0, TQt::Vertical ); groupBox->setTitle( i18n( "Style" ) ); groupBox->layout()->setSpacing( KDialog::spacingHint() ); groupBox->layout()->setMargin( KDialog::marginHint() ); @@ -2531,7 +2531,7 @@ double CellFormatPagePosition::getSizeWidth() const BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton(parent,_name) { - penStyle = Qt::NoPen; + penStyle = TQt::NoPen; penWidth = 1; penColor = colorGroup().text(); setToggleButton( true ); @@ -2547,7 +2547,7 @@ void BorderButton::mousePressEvent( TQMouseEvent * ) void BorderButton::setUndefined() { - setPenStyle(Qt::SolidLine ); + setPenStyle(TQt::SolidLine ); setPenWidth(1); setColor(colorGroup().midlight()); } @@ -2557,7 +2557,7 @@ void BorderButton::unselect() { setOn(false); setPenWidth(1); - setPenStyle(Qt::NoPen); + setPenStyle(TQt::NoPen); setColor( colorGroup().text() ); setChanged(true); } @@ -2646,7 +2646,7 @@ CellFormatPageBorder::CellFormatPageBorder( TQWidget* parent, CellFormatDialog * style->setEnabled(false); size->setEnabled(false); - preview->setPattern( black , 1, Qt::SolidLine ); + preview->setPattern( black , 1, TQt::SolidLine ); this->resize( 400, 400 ); } @@ -2859,16 +2859,16 @@ void CellFormatPageBorder::InitializeBorderButtons() void CellFormatPageBorder::InitializePatterns() { - pattern[0]->setPattern( black, 1, Qt::DotLine ); - pattern[1]->setPattern( black, 1, Qt::DashLine ); - pattern[2]->setPattern( black, 1, Qt::SolidLine ); - pattern[3]->setPattern( black, 1, Qt::DashDotLine ); - pattern[4]->setPattern( black, 1, Qt::DashDotDotLine ); - pattern[5]->setPattern( black, 2, Qt::SolidLine ); - pattern[6]->setPattern( black, 3, Qt::SolidLine ); - pattern[7]->setPattern( black, 4, Qt::SolidLine ); - pattern[8]->setPattern( black, 5, Qt::SolidLine ); - pattern[9]->setPattern( black, 1, Qt::NoPen ); + pattern[0]->setPattern( black, 1, TQt::DotLine ); + pattern[1]->setPattern( black, 1, TQt::DashLine ); + pattern[2]->setPattern( black, 1, TQt::SolidLine ); + pattern[3]->setPattern( black, 1, TQt::DashDotLine ); + pattern[4]->setPattern( black, 1, TQt::DashDotDotLine ); + pattern[5]->setPattern( black, 2, TQt::SolidLine ); + pattern[6]->setPattern( black, 3, TQt::SolidLine ); + pattern[7]->setPattern( black, 4, TQt::SolidLine ); + pattern[8]->setPattern( black, 5, TQt::SolidLine ); + pattern[9]->setPattern( black, 1, TQt::NoPen ); slotSetColorButton( black ); } @@ -2919,7 +2919,7 @@ void CellFormatPageBorder::cutomize_chosen_slot() style->setEnabled( false ); size->setEnabled( false ); pattern[2]->slotSelect(); - preview->setPattern( black , 1, Qt::SolidLine ); + preview->setPattern( black , 1, TQt::SolidLine ); } } @@ -2936,26 +2936,26 @@ void CellFormatPageBorder::slotChangeStyle(int) int penSize = size->currentText().toInt(); if ( !penSize) { - preview->setPattern( preview->getColor(), penSize, Qt::NoPen ); + preview->setPattern( preview->getColor(), penSize, TQt::NoPen ); } else { switch(index) { case 0: - preview->setPattern( preview->getColor(), penSize, Qt::DotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DotLine ); break; case 1: - preview->setPattern( preview->getColor(), penSize, Qt::DashLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashLine ); break; case 2: - preview->setPattern( preview->getColor(), penSize, Qt::DashDotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashDotLine ); break; case 3: - preview->setPattern( preview->getColor(), penSize, Qt::DashDotDotLine ); + preview->setPattern( preview->getColor(), penSize, TQt::DashDotDotLine ); break; case 4: - preview->setPattern( preview->getColor(), penSize, Qt::SolidLine ); + preview->setPattern( preview->getColor(), penSize, TQt::SolidLine ); break; default: kdDebug(36001)<<"Error in combobox\n"; @@ -3239,7 +3239,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) else { _p->setPenWidth(1); - _p->setPenStyle(Qt::NoPen); + _p->setPenStyle(TQt::NoPen); _p->setColor( colorGroup().text() ); } @@ -3496,12 +3496,12 @@ if (rect.contains(TQPoint(_ev->x(),_ev->y()))) BrushSelect::BrushSelect( TQWidget *parent, const char * ) : TQFrame( parent ) { - brushStyle = Qt::NoBrush; + brushStyle = TQt::NoBrush; brushColor = TQt::red; selected = false; } -void BrushSelect::setPattern( const TQColor &_color,Qt::BrushStyle _style ) +void BrushSelect::setPattern( const TQColor &_color,TQt::BrushStyle _style ) { brushStyle = _style; brushColor = _color; @@ -3720,21 +3720,21 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog connect( brush15, TQT_SIGNAL( clicked( BrushSelect* ) ), this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - brush1->setPattern( TQt::red,Qt::VerPattern ); - brush2->setPattern( TQt::red,Qt::HorPattern ); - brush3->setPattern( TQt::red,Qt::Dense1Pattern ); - brush4->setPattern( TQt::red,Qt::Dense2Pattern ); - brush5->setPattern( TQt::red,Qt::Dense3Pattern ); - brush6->setPattern( TQt::red,Qt::Dense4Pattern ); - brush7->setPattern( TQt::red,Qt::Dense5Pattern ); - brush8->setPattern( TQt::red,Qt::Dense6Pattern ); - brush9->setPattern( TQt::red,Qt::Dense7Pattern ); - brush10->setPattern( TQt::red,Qt::CrossPattern ); - brush11->setPattern( TQt::red,Qt::BDiagPattern ); - brush12->setPattern( TQt::red,Qt::FDiagPattern ); - brush13->setPattern( TQt::red,Qt::VerPattern ); - brush14->setPattern( TQt::red,Qt::DiagCrossPattern ); - brush15->setPattern( TQt::red,Qt::NoBrush ); + brush1->setPattern( TQt::red,TQt::VerPattern ); + brush2->setPattern( TQt::red,TQt::HorPattern ); + brush3->setPattern( TQt::red,TQt::Dense1Pattern ); + brush4->setPattern( TQt::red,TQt::Dense2Pattern ); + brush5->setPattern( TQt::red,TQt::Dense3Pattern ); + brush6->setPattern( TQt::red,TQt::Dense4Pattern ); + brush7->setPattern( TQt::red,TQt::Dense5Pattern ); + brush8->setPattern( TQt::red,TQt::Dense6Pattern ); + brush9->setPattern( TQt::red,TQt::Dense7Pattern ); + brush10->setPattern( TQt::red,TQt::CrossPattern ); + brush11->setPattern( TQt::red,TQt::BDiagPattern ); + brush12->setPattern( TQt::red,TQt::FDiagPattern ); + brush13->setPattern( TQt::red,TQt::VerPattern ); + brush14->setPattern( TQt::red,TQt::DiagCrossPattern ); + brush15->setPattern( TQt::red,TQt::NoBrush ); current->setPattern(dlg->brushColor,dlg->brushStyle); current->slotSelect(); diff --git a/kspread/dialogs/kspread_dlg_layout.h b/kspread/dialogs/kspread_dlg_layout.h index 84b6d241..1360f1c8 100644 --- a/kspread/dialogs/kspread_dlg_layout.h +++ b/kspread/dialogs/kspread_dlg_layout.h @@ -101,14 +101,14 @@ class PatternSelect : public TQFrame public: PatternSelect( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat; repaint(); } - Qt::PenStyle getPenStyle() { return penStyle; } + void setPenStyle( TQt::PenStyle _pat ) { penStyle = _pat; repaint(); } + TQt::PenStyle getPenStyle() { return penStyle; } void setColor( const TQColor &_col ) { penColor = _col; repaint(); } const TQColor& getColor() { return penColor; } void setPenWidth( int _w ) { penWidth = _w; repaint(); } int getPenWidth() { return penWidth; } - void setPattern( const TQColor &_color, int _width, Qt::PenStyle _style ); + void setPattern( const TQColor &_color, int _width, TQt::PenStyle _style ); void setUndefined(); void setDefined() { undefined = FALSE; repaint(); } @@ -125,7 +125,7 @@ protected: virtual void paintEvent( TQPaintEvent *_ev ); virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQColor penColor; int penWidth; @@ -303,8 +303,8 @@ class BorderButton : public TQPushButton public: BorderButton( TQWidget *parent, const char *_name ); - void setPenStyle( Qt::PenStyle _pat ) { penStyle = _pat;} - Qt::PenStyle getPenStyle() { return penStyle; } + void setPenStyle( TQt::PenStyle _pat ) { penStyle = _pat;} + TQt::PenStyle getPenStyle() { return penStyle; } void setColor( const TQColor &_col ) { penColor = _col; } const TQColor& getColor() { return penColor; } void setPenWidth( int _w ) { penWidth = _w; } @@ -317,7 +317,7 @@ public: void clicked(BorderButton *); protected: virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::PenStyle penStyle; + TQt::PenStyle penStyle; TQColor penColor; int penWidth; bool changed; @@ -389,11 +389,11 @@ class BrushSelect : public TQFrame public: BrushSelect( TQWidget *parent, const char *_name ); - void setBrushStyle( Qt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } - Qt::BrushStyle getBrushStyle() const { return brushStyle; } + void setBrushStyle( TQt::BrushStyle _pat ) { brushStyle = _pat; repaint(); } + TQt::BrushStyle getBrushStyle() const { return brushStyle; } TQColor getBrushColor() const { return brushColor; } void setBrushColor(const TQColor &_c) { brushColor=_c;} - void setPattern( const TQColor &_color, Qt::BrushStyle _style ); + void setPattern( const TQColor &_color, TQt::BrushStyle _style ); signals: void clicked( BrushSelect *_this ); @@ -406,7 +406,7 @@ protected: virtual void paintEvent( TQPaintEvent *_ev ); virtual void mousePressEvent( TQMouseEvent *_ev ); - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; bool selected; }; @@ -527,13 +527,13 @@ public: bool bStyle; TQColor color; bool bColor; - Qt::PenStyle style; + TQt::PenStyle style; }; // The format of the selected area CellBorderFormat borders[BorderType_END]; - Qt::BrushStyle brushStyle; + TQt::BrushStyle brushStyle; TQColor brushColor; bool oneCol; diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index bdd65a26..8f18de6d 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -126,7 +126,7 @@ void PaperLayout::initRanges( TQWidget * tab, TQVBoxLayout * vbox ) SheetPrint* print = m_pSheet->print(); TQGroupBox *rangeGroup = new TQGroupBox( i18n("Ranges"), tab ); - rangeGroup->setColumnLayout( 0, Qt::Vertical ); + rangeGroup->setColumnLayout( 0, TQt::Vertical ); rangeGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( rangeGroup ); @@ -178,7 +178,7 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) SheetPrint* print = m_pSheet->print(); TQButtonGroup *zoomGroup = new TQButtonGroup( i18n("Scale Printout"), tab ); - zoomGroup->setColumnLayout( 0, Qt::Vertical ); + zoomGroup->setColumnLayout( 0, TQt::Vertical ); zoomGroup->setMargin( KDialog::marginHint() ); vbox->addWidget( zoomGroup ); diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index 93d67b06..2ffffc20 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -47,7 +47,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Insert"),page); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Insert"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_preference.cpp b/kspread/dialogs/kspread_dlg_preference.cpp index d82af591..9202bb3a 100644 --- a/kspread/dialogs/kspread_dlg_preference.cpp +++ b/kspread/dialogs/kspread_dlg_preference.cpp @@ -789,7 +789,7 @@ configureLayoutPage::configureLayoutPage( View* _view,TQVBox *box , char *name ) { m_pView = _view; - TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); + TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, TQt::Vertical, i18n("Default Parameters"), box, "GroupBox" ); tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint()); tmpTQGroupBox->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index ee241617..6bc31ca1 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -58,7 +58,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) TQBoxLayout *grid1 = new TQHBoxLayout(page); grid1->setSpacing( spacingHint() ); - TQButtonGroup* gb1 = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb1 = new TQButtonGroup( 2, TQt::Vertical, i18n("Insert Values"), page ); column = new TQRadioButton( i18n("Vertical"), gb1 ); TQWhatsThis::add(column, i18n("Insert the series vertically, one below the other") ); @@ -67,7 +67,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) column->setChecked(true); - TQButtonGroup* gb2 = new TQButtonGroup( 2, Qt::Vertical, + TQButtonGroup* gb2 = new TQButtonGroup( 2, TQt::Vertical, i18n("Type"), page ); linear = new TQRadioButton( i18n("Linear (2,4,6,...)"), gb2 ); TQWhatsThis::add(linear, i18n("Generate a series from 'start' to 'end' and for each step add " @@ -81,7 +81,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) linear->setChecked(true); - TQGroupBox* gb = new TQGroupBox( 1, Qt::Vertical, i18n("Parameters"), page ); + TQGroupBox* gb = new TQGroupBox( 1, TQt::Vertical, i18n("Parameters"), page ); TQWidget *params = new TQWidget( gb ); TQGridLayout *params_layout = new TQGridLayout( params, 3, 2 ); params_layout->setSpacing( spacingHint() ); @@ -110,8 +110,8 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) void SeriesDlg::slotOk() { - Series mode=Column; //same as Qt::Vertical - Series type=Linear; // same as Qt::Horizontal + Series mode=Column; //same as Vertical + Series type=Linear; // same as Horizontal TQString tmp; double dstep, dend, dstart; Sheet * m_pSheet; diff --git a/kspread/dialogs/kspread_dlg_sort.cpp b/kspread/dialogs/kspread_dlg_sort.cpp index 52cda9b6..5e5167f8 100644 --- a/kspread/dialogs/kspread_dlg_sort.cpp +++ b/kspread/dialogs/kspread_dlg_sort.cpp @@ -79,7 +79,7 @@ SortDialog::SortDialog( View * parent, const char * name, //---------------- Sort Layout & Header Row/Column Toggle //Sort orientation selector (for selecting Left-To-Right or Top-To-Bottom sorting of the selection) - TQGroupBox* layoutGroup = new TQGroupBox(2 , Qt::Vertical, m_page1, "layoutGroup"); + TQGroupBox* layoutGroup = new TQGroupBox(2 , TQt::Vertical, m_page1, "layoutGroup"); layoutGroup->setTitle( i18n("Layout") ); TQHButtonGroup * orientationGroup = new TQHButtonGroup( layoutGroup, "orientationGroup" ); @@ -107,7 +107,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort1Box = new TQGroupBox( m_page1, "sort1Box" ); sort1Box->setTitle( i18n( "Sort By" ) ); sort1Box->setFlat(true); - sort1Box->setColumnLayout(0, Qt::Vertical ); + sort1Box->setColumnLayout(0, TQt::Vertical ); sort1Box->layout()->setSpacing( KDialog::spacingHint() ); sort1Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->layout() ); @@ -126,7 +126,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort2Box = new TQGroupBox( m_page1, "sort2Box" ); sort2Box->setTitle( i18n( "Then By" ) ); sort2Box->setFlat(true); - sort2Box->setColumnLayout(0, Qt::Vertical ); + sort2Box->setColumnLayout(0, TQt::Vertical ); sort2Box->layout()->setSpacing( KDialog::spacingHint() ); sort2Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->layout() ); @@ -146,7 +146,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * sort3Box = new TQGroupBox( m_page1, "sort3Box" ); sort3Box->setTitle( i18n( "Then By" ) ); sort3Box->setFlat(true); - sort3Box->setColumnLayout(0, Qt::Vertical ); + sort3Box->setColumnLayout(0, TQt::Vertical ); sort3Box->layout()->setSpacing( KDialog::spacingHint() ); sort3Box->layout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->layout() ); @@ -175,7 +175,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); - firstKeyBox->setColumnLayout(0, Qt::Vertical ); + firstKeyBox->setColumnLayout(0, TQt::Vertical ); firstKeyBox->layout()->setSpacing( KDialog::spacingHint() ); firstKeyBox->layout()->setMargin( KDialog::marginHint() ); TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->layout() ); @@ -200,7 +200,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQGroupBox * resultToBox = new TQGroupBox( m_page2, "resultToBox" ); resultToBox->setTitle( i18n( "Location to Store Sort Results" ) ); - resultToBox->setColumnLayout(0, Qt::Vertical ); + resultToBox->setColumnLayout(0, TQt::Vertical ); resultToBox->layout()->setSpacing( KDialog::spacingHint() ); resultToBox->layout()->setMargin( KDialog::marginHint() ); diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 2fbeb7eb..5e835c1f 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -44,7 +44,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) setMainWidget(page); TQVBoxLayout *lay1 = new TQVBoxLayout( page, 0, spacingHint() ); - TQButtonGroup *grp = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Paste What" ),page ); + TQButtonGroup *grp = new TQButtonGroup( 1, TQt::Horizontal, i18n( "Paste What" ),page ); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); @@ -57,7 +57,7 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) rb4 = new TQRadioButton( i18n("Everything without border"), grp ); rb1->setChecked(true); - grp = new TQButtonGroup( 1, Qt::Horizontal, i18n("Operation"),page); + grp = new TQButtonGroup( 1, TQt::Horizontal, i18n("Operation"),page); grp->setRadioButtonExclusive( TRUE ); grp->layout(); lay1->addWidget(grp); diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index bf8f4de2..461b28cc 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -78,7 +78,7 @@ StyleDlg::StyleDlg( View * parent, StyleManager * manager, m_dlg( new StyleWidget( this ) ) { setCaption( i18n( "Style Manager" ) ); - setButtonBoxOrientation(Qt::Vertical ); + setButtonBoxOrientation(TQt::Vertical ); setMainWidget( m_dlg ); slotDisplayMode( 0 ); diff --git a/kspread/dialogs/kspread_dlg_subtotal.cpp b/kspread/dialogs/kspread_dlg_subtotal.cpp index 054cc1f7..37799645 100644 --- a/kspread/dialogs/kspread_dlg_subtotal.cpp +++ b/kspread/dialogs/kspread_dlg_subtotal.cpp @@ -45,7 +45,7 @@ SubtotalDialog::SubtotalDialog( View * parent, TQRect const & selection, const c m_selection( selection ), m_dialog( new Subtotal( this ) ) { - setButtonBoxOrientation( Qt::Vertical ); + setButtonBoxOrientation( TQt::Vertical ); setMainWidget( m_dialog ); fillColumnBoxes(); diff --git a/kspread/dialogs/kspread_dlg_validity.cpp b/kspread/dialogs/kspread_dlg_validity.cpp index ea462527..b7aca93e 100644 --- a/kspread/dialogs/kspread_dlg_validity.cpp +++ b/kspread/dialogs/kspread_dlg_validity.cpp @@ -53,7 +53,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQVBoxLayout *lay1 = new TQVBoxLayout( page1, KDialogBase::marginHint(), KDialogBase::spacingHint() ); TQGroupBox* tmpTQButtonGroup; - tmpTQButtonGroup = new TQGroupBox( 0, Qt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); + tmpTQButtonGroup = new TQGroupBox( 0, TQt::Vertical, i18n("Validity Criteria"), page1, "ButtonGroup_1" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid1 = new TQGridLayout(tmpTQButtonGroup->layout(),4,2); @@ -147,7 +147,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) lay1 = new TQVBoxLayout( page2, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); + tmpTQButtonGroup = new TQButtonGroup( 0, TQt::Vertical, i18n("Contents"), page2, "ButtonGroup_2" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid2 = new TQGridLayout(tmpTQButtonGroup->layout(),5,2); @@ -187,7 +187,7 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) TQFrame *page3 = addPage(i18n("Input Help")); lay1 = new TQVBoxLayout( page3, KDialogBase::marginHint(), KDialogBase::spacingHint() ); - tmpTQButtonGroup = new TQButtonGroup( 0, Qt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); + tmpTQButtonGroup = new TQButtonGroup( 0, TQt::Vertical, i18n("Contents"), page3, "ButtonGroup_2" ); tmpTQButtonGroup->layout()->setSpacing(KDialog::spacingHint()); tmpTQButtonGroup->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp index 511e5e0c..1154f650 100644 --- a/kspread/kspread_canvas.cpp +++ b/kspread/kspread_canvas.cpp @@ -221,7 +221,7 @@ Canvas::Canvas (View *_view) d->defaultGridPen.setColor( lightGray ); d->defaultGridPen.setWidth( 1 ); - d->defaultGridPen.setStyle( Qt::SolidLine ); + d->defaultGridPen.setStyle( TQt::SolidLine ); d->xOffset = 0.0; d->yOffset = 0.0; @@ -1228,14 +1228,14 @@ void Canvas::mouseReleaseEvent( TQMouseEvent* /*_ev*/) void Canvas::processClickSelectionHandle( TQMouseEvent *event ) { // Auto fill ? That is done using the left mouse button. - if ( event->button() == Qt::LeftButton ) + if ( event->button() == TQt::LeftButton ) { d->mouseAction = AutoFill; d->autoFillSource = selectionInfo()->lastRange(); } // Resize a cell (done with the right mouse button) ? // But for that to work there must not be a selection. - else if ( event->button() == Qt::MidButton && selectionInfo()->isSingular()) + else if ( event->button() == TQt::MidButton && selectionInfo()->isSingular()) { d->mouseAction = ResizeCell; } @@ -1307,13 +1307,13 @@ bool Canvas::highlightRangeSizeGripAt(double x, double y) void Canvas::mousePressEvent( TQMouseEvent * _ev ) { - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) { d->mousePressed = true; d->view->enableAutoScroll(); } - if ( activeSheet() && _ev->button() == Qt::LeftButton) + if ( activeSheet() && _ev->button() == TQt::LeftButton) { d->m_moveStartPosMouse = objectRect( false ).topLeft(); EmbeddedObject *obj = getObject( _ev->pos(), activeSheet() ); @@ -1495,7 +1495,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) switch (_ev->button()) { - case Qt::LeftButton: + case TQt::LeftButton: if (!d->anchor.isEmpty()) { // Hyperlink pressed @@ -1532,7 +1532,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) (d->chooseCell ? choice() : selectionInfo())->initialize(TQPoint(col,row), activeSheet()); } break; - case Qt::MidButton: + case TQt::MidButton: // Paste operation with the middle button? if ( d->view->koDocument()->isReadWrite() && !sheet->isProtected() ) { @@ -1542,7 +1542,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) sheet->setRegionPaintDirty(*selectionInfo()); } break; - case Qt::RightButton: + case TQt::RightButton: if (!selectionInfo()->contains( TQPoint( col, row ) )) { // No selection or the mouse press was outside of an existing selection? @@ -1561,7 +1561,7 @@ void Canvas::mousePressEvent( TQMouseEvent * _ev ) updatePosWidget(); // Context menu? - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { // TODO: Handle anchor // TODO Stefan: ??? TQPoint p = mapToGlobal( _ev->pos() ); @@ -1625,7 +1625,7 @@ void Canvas::mouseDoubleClickEvent( TQMouseEvent* _ev) void Canvas::wheelEvent( TQWheelEvent* _ev ) { - if ( _ev->orientation() == Qt::Vertical ) + if ( _ev->orientation() == TQt::Vertical ) { if ( vertScrollBar() ) TQApplication::sendEvent( vertScrollBar(), _ev ); @@ -4667,7 +4667,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) if ( !m_pView->koDocument()->isReadWrite() ) return; - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) m_bMousePressed = true; const Sheet *sheet = m_pCanvas->activeSheet(); @@ -4733,7 +4733,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_row; if ( !m_pView->selectionInfo()->contains( TQPoint(1, hit_row) ) || - !( _ev->button() == Qt::RightButton ) || + !( _ev->button() == TQt::RightButton ) || !m_pView->selectionInfo()->isRowSelected() ) { TQPoint newMarker( 1, hit_row ); @@ -4755,7 +4755,7 @@ void VBorder::mousePressEvent( TQMouseEvent * _ev ) } } - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { TQPoint p = mapToGlobal( _ev->pos() ); m_pView->popupRowMenu( p ); @@ -5222,7 +5222,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) if (!m_pView->koDocument()->isReadWrite()) return; - if ( _ev->button() == Qt::LeftButton ) + if ( _ev->button() == TQt::LeftButton ) m_bMousePressed = true; const Sheet *sheet = m_pCanvas->activeSheet(); @@ -5349,7 +5349,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) m_iSelectionAnchor = hit_col; if ( !m_pView->selectionInfo()->contains( TQPoint( hit_col, 1 ) ) || - !( _ev->button() == Qt::RightButton ) || + !( _ev->button() == TQt::RightButton ) || !m_pView->selectionInfo()->isColumnSelected() ) { TQPoint newMarker( hit_col, 1 ); @@ -5371,7 +5371,7 @@ void HBorder::mousePressEvent( TQMouseEvent * _ev ) } } - if ( _ev->button() == Qt::RightButton ) + if ( _ev->button() == TQt::RightButton ) { TQPoint p = mapToGlobal( _ev->pos() ); m_pView->popupColumnMenu( p ); diff --git a/kspread/kspread_cell.cpp b/kspread/kspread_cell.cpp index fca76bbe..1c99dea3 100644 --- a/kspread/kspread_cell.cpp +++ b/kspread/kspread_cell.cpp @@ -5554,7 +5554,7 @@ void Cell::saveOasisValue (KoXmlWriter &xmlWriter) { xmlWriter.addAttribute( "office:value-type", "date" ); xmlWriter.addAttribute( "office:date-value", - value().asDate().toString( Qt::ISODate ) ); + value().asDate().toString( TQt::ISODate ) ); break; } case Value::fmt_Time: diff --git a/kspread/kspread_format.cpp b/kspread/kspread_format.cpp index 430e2386..c354f849 100644 --- a/kspread/kspread_format.cpp +++ b/kspread/kspread_format.cpp @@ -636,7 +636,7 @@ bool Format::loadFormat( const TQDomElement & f, Paste::Mode pm, bool paste ) if ( f.hasAttribute( "brushstyle" ) ) { - setBackGroundBrushStyle( (Qt::BrushStyle) f.attribute( "brushstyle" ).toInt( &ok ) ); + setBackGroundBrushStyle( (TQt::BrushStyle) f.attribute( "brushstyle" ).toInt( &ok ) ); if ( !ok ) return false; } @@ -1221,7 +1221,7 @@ void Format::setLeftBorderPen( const TQPen & _p ) formatChanged(); } -void Format::setLeftBorderStyle( Qt::PenStyle s ) +void Format::setLeftBorderStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->leftBorderPen() ); p.setStyle( s ); @@ -1259,7 +1259,7 @@ void Format::setTopBorderPen( const TQPen & _p ) formatChanged(); } -void Format::setTopBorderStyle( Qt::PenStyle s ) +void Format::setTopBorderStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->topBorderPen() ); p.setStyle( s ); @@ -1297,7 +1297,7 @@ void Format::setRightBorderPen( const TQPen& p ) formatChanged(); } -void Format::setRightBorderStyle( Qt::PenStyle _s ) +void Format::setRightBorderStyle( TQt::PenStyle _s ) { TQPen p( m_pStyle->rightBorderPen() ); p.setStyle( _s ); @@ -1335,7 +1335,7 @@ void Format::setBottomBorderPen( const TQPen& p ) formatChanged(); } -void Format::setBottomBorderStyle( Qt::PenStyle _s ) +void Format::setBottomBorderStyle( TQt::PenStyle _s ) { TQPen p( m_pStyle->bottomBorderPen() ); p.setStyle( _s ); @@ -1373,7 +1373,7 @@ void Format::setFallDiagonalPen( const TQPen & _p ) formatChanged(); } -void Format::setFallDiagonalStyle( Qt::PenStyle s ) +void Format::setFallDiagonalStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->fallDiagonalPen() ); p.setStyle( s ); @@ -1411,7 +1411,7 @@ void Format::setGoUpDiagonalPen( const TQPen & _p ) formatChanged(); } -void Format::setGoUpDiagonalStyle( Qt::PenStyle s ) +void Format::setGoUpDiagonalStyle( TQt::PenStyle s ) { TQPen p( m_pStyle->goUpDiagonalPen() ); p.setStyle( s ); @@ -1449,7 +1449,7 @@ void Format::setBackGroundBrush( const TQBrush & _p) formatChanged(); } -void Format::setBackGroundBrushStyle( Qt::BrushStyle s ) +void Format::setBackGroundBrushStyle( TQt::BrushStyle s ) { TQBrush b( m_pStyle->backGroundBrush() ); b.setStyle( s ); @@ -1841,7 +1841,7 @@ int Format::fallDiagonalWidth( int col, int row ) const return fallDiagonalPen( col, row ).width(); } -Qt::PenStyle Format::fallDiagonalStyle( int col, int row ) const +TQt::PenStyle Format::fallDiagonalStyle( int col, int row ) const { return fallDiagonalPen( col, row ).style(); } @@ -1867,7 +1867,7 @@ int Format::goUpDiagonalWidth( int col, int row ) const return goUpDiagonalPen( col, row ).width(); } -Qt::PenStyle Format::goUpDiagonalStyle( int col, int row ) const +TQt::PenStyle Format::goUpDiagonalStyle( int col, int row ) const { return goUpDiagonalPen( col, row ).style(); } @@ -1946,7 +1946,7 @@ const TQPen& Format::leftBorderPen( int col, int row ) const return m_pStyle->leftBorderPen(); } -Qt::PenStyle Format::leftBorderStyle( int col, int row ) const +TQt::PenStyle Format::leftBorderStyle( int col, int row ) const { return leftBorderPen( col, row ).style(); } @@ -1979,7 +1979,7 @@ const TQColor& Format::topBorderColor( int col, int row ) const return topBorderPen( col, row ).color(); } -Qt::PenStyle Format::topBorderStyle( int col, int row ) const +TQt::PenStyle Format::topBorderStyle( int col, int row ) const { return topBorderPen( col, row ).style(); } @@ -2007,7 +2007,7 @@ int Format::rightBorderWidth( int col, int row ) const return rightBorderPen( col, row ).width(); } -Qt::PenStyle Format::rightBorderStyle( int col, int row ) const +TQt::PenStyle Format::rightBorderStyle( int col, int row ) const { return rightBorderPen( col, row ).style(); } @@ -2035,7 +2035,7 @@ int Format::bottomBorderWidth( int col, int row ) const return bottomBorderPen( col, row ).width(); } -Qt::PenStyle Format::bottomBorderStyle( int col, int row ) const +TQt::PenStyle Format::bottomBorderStyle( int col, int row ) const { return bottomBorderPen( col, row ).style(); } @@ -2056,7 +2056,7 @@ const TQBrush& Format::backGroundBrush( int col, int row ) const return m_pStyle->backGroundBrush(); } -Qt::BrushStyle Format::backGroundBrushStyle( int col, int row ) const +TQt::BrushStyle Format::backGroundBrushStyle( int col, int row ) const { return backGroundBrush( col, row ).style(); } diff --git a/kspread/kspread_format.h b/kspread/kspread_format.h index 5af772b8..fc01a82c 100644 --- a/kspread/kspread_format.h +++ b/kspread/kspread_format.h @@ -196,37 +196,37 @@ public: void setPrecision( int _p ); virtual void setLeftBorderPen( const TQPen& _p ); - void setLeftBorderStyle( Qt::PenStyle s ); + void setLeftBorderStyle( TQt::PenStyle s ); void setLeftBorderColor( const TQColor & _c ); void setLeftBorderWidth( int _w ); virtual void setTopBorderPen( const TQPen& _p ); - void setTopBorderStyle( Qt::PenStyle s ); + void setTopBorderStyle( TQt::PenStyle s ); void setTopBorderColor( const TQColor & _c ); void setTopBorderWidth( int _w ); virtual void setRightBorderPen( const TQPen& p ); - void setRightBorderStyle( Qt::PenStyle _s ); + void setRightBorderStyle( TQt::PenStyle _s ); void setRightBorderColor( const TQColor & _c ); void setRightBorderWidth( int _w ); virtual void setBottomBorderPen( const TQPen& p ); - void setBottomBorderStyle( Qt::PenStyle _s ); + void setBottomBorderStyle( TQt::PenStyle _s ); void setBottomBorderColor( const TQColor & _c ); void setBottomBorderWidth( int _w ); void setFallDiagonalPen( const TQPen& _p ); - void setFallDiagonalStyle( Qt::PenStyle s ); + void setFallDiagonalStyle( TQt::PenStyle s ); void setFallDiagonalColor( const TQColor & _c ); void setFallDiagonalWidth( int _w ); void setGoUpDiagonalPen( const TQPen& _p ); - void setGoUpDiagonalStyle( Qt::PenStyle s ); + void setGoUpDiagonalStyle( TQt::PenStyle s ); void setGoUpDiagonalColor( const TQColor & _c ); void setGoUpDiagonalWidth( int _w ); void setBackGroundBrush( const TQBrush& _p); - void setBackGroundBrushStyle( Qt::BrushStyle s); + void setBackGroundBrushStyle( TQt::BrushStyle s); void setBackGroundBrushColor( const TQColor & _c); void setTextFont( const TQFont& _f ); @@ -275,36 +275,36 @@ public: virtual const TQPen& leftBorderPen( int col, int row ) const; int leftBorderWidth( int col, int row ) const; - Qt::PenStyle leftBorderStyle( int col, int row ) const; + TQt::PenStyle leftBorderStyle( int col, int row ) const; const TQColor& leftBorderColor( int col, int row ) const; virtual const TQPen& topBorderPen( int col, int row ) const; int topBorderWidth( int col, int row ) const; - Qt::PenStyle topBorderStyle( int col, int row ) const; + TQt::PenStyle topBorderStyle( int col, int row ) const; const TQColor& topBorderColor( int col, int row ) const; virtual const TQPen& rightBorderPen( int col, int row ) const; int rightBorderWidth( int col, int row ) const; - Qt::PenStyle rightBorderStyle( int col, int row ) const; + TQt::PenStyle rightBorderStyle( int col, int row ) const; const TQColor& rightBorderColor( int col, int row ) const; virtual const TQPen& bottomBorderPen( int col, int row ) const; int bottomBorderWidth( int col, int row ) const; - Qt::PenStyle bottomBorderStyle( int col, int row ) const; + TQt::PenStyle bottomBorderStyle( int col, int row ) const; const TQColor& bottomBorderColor( int col, int row ) const; const TQPen& fallDiagonalPen( int col, int row ) const; int fallDiagonalWidth( int col, int row ) const; - Qt::PenStyle fallDiagonalStyle( int col, int row ) const; + TQt::PenStyle fallDiagonalStyle( int col, int row ) const; const TQColor& fallDiagonalColor( int col, int row ) const; const TQPen& goUpDiagonalPen( int col, int row ) const; int goUpDiagonalWidth( int col, int row ) const; - Qt::PenStyle goUpDiagonalStyle( int col, int row ) const; + TQt::PenStyle goUpDiagonalStyle( int col, int row ) const; const TQColor& goUpDiagonalColor( int col, int row ) const; const TQBrush& backGroundBrush( int col, int row ) const; - Qt::BrushStyle backGroundBrushStyle( int col, int row ) const; + TQt::BrushStyle backGroundBrushStyle( int col, int row ) const; const TQColor& backGroundBrushColor(int col, int row ) const; uint bottomBorderValue( int col, int row ) const; diff --git a/kspread/kspread_handler.cpp b/kspread/kspread_handler.cpp index 262774ff..3e9fe0e5 100644 --- a/kspread/kspread_handler.cpp +++ b/kspread/kspread_handler.cpp @@ -53,7 +53,7 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev ) painter.setRasterOp( NotROP ); TQPen pen; - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); painter.setPen( pen ); if ( m_started ) @@ -128,7 +128,7 @@ bool InsertHandler::eventFilter( TQObject*, TQEvent* ev ) painter.begin( (TQWidget*)target() ); TQPen pen; - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); painter.setPen( pen ); painter.setRasterOp( NotROP ); diff --git a/kspread/kspread_object.cpp b/kspread/kspread_object.cpp index 2fce2696..6f397b52 100644 --- a/kspread/kspread_object.cpp +++ b/kspread/kspread_object.cpp @@ -56,7 +56,7 @@ class View; * **********************************************************/ EmbeddedObject::EmbeddedObject( Sheet *_sheet, const KoRect& _geometry ) - : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, Qt::SolidLine ) + : m_geometry( _geometry), m_sheet(_sheet), m_objectName(""), m_selected(false), m_protect(false), m_keepRatio(false), pen( TQt::black, 1, TQt::SolidLine ) { angle = 0.0; inObjList = true; @@ -691,7 +691,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom : EmbeddedObject( _sheet, _geometry ) { imageCollection = _imageCollection; - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -712,7 +712,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, const KoRect& _geom imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -734,7 +734,7 @@ EmbeddedPictureObject::EmbeddedPictureObject( Sheet *_sheet, KoPictureCollection imageCollection = _imageCollection; //ext = KoSize(); // invalid size means unset - pen = KoPen( TQt::black, 1.0, Qt::NoPen ); + pen = KoPen( TQt::black, 1.0, TQt::NoPen ); mirrorType = PM_NORMAL; depth = 0; swapRGB = false; @@ -1015,7 +1015,7 @@ void EmbeddedPictureObject::loadOasis(const TQDomElement &element, KoOasisLoadin strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot. } TQString filename(href/*.mid(1)*/); - const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC)); + const KoPictureKey key(filename, TQDateTime::currentDateTime(TQt::UTC)); image.setKey(key); KoStore* store = context.store(); @@ -1206,7 +1206,7 @@ TQPixmap EmbeddedPictureObject::toPixmap( double xZoom , double yZoom ) TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) { - const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1 : pen.width() ) / 2.0 ); + const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1 : pen.width() ) / 2.0 ); TQSize size( _zoomHandler->zoomSize( m_geometry.size() /*ext*/ ) ); //kdDebug(33001) << "EmbeddedPictureObject::generatePixmap size= " << size << endl; @@ -1217,7 +1217,7 @@ TQPixmap EmbeddedPictureObject::generatePixmap(KoZoomHandler*_zoomHandler) pixmap.fill( TQt::white ); // Draw background - paint.setPen( Qt::NoPen ); + paint.setPen( TQt::NoPen ); paint.setBrush( getBrush() ); TQRect rect( (int)( penw ), (int)( penw ), @@ -1264,7 +1264,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand const double oy = /*orig*/m_geometry.y(); const double ow = /*ext*/m_geometry.width(); const double oh = /*ext*/m_geometry.height(); - //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == Qt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); + //const double penw = _zoomHandler->zoomItX( ( ( pen.style() == TQt::NoPen ) ? 1.0 : pen.width() ) / 2.0 ); _painter->save(); @@ -1355,7 +1355,7 @@ void EmbeddedPictureObject::draw( TQPainter *_painter/*, KoZoomHandler*_zoomHand // } // else { // pen2 = pen; -// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == Qt::NoPen ) ? 1.0 : (double)pen.width() ) ); +// pen2.setWidth( _zoomHandler->zoomItX( ( pen.style() == TQt::NoPen ) ? 1.0 : (double)pen.width() ) ); // } // _painter->setPen( pen2 ); // _painter->setBrush( TQt::NoBrush ); diff --git a/kspread/kspread_pen.cpp b/kspread/kspread_pen.cpp index 52a0ada6..4aac2761 100644 --- a/kspread/kspread_pen.cpp +++ b/kspread/kspread_pen.cpp @@ -27,7 +27,7 @@ KSpreadPen::KSpreadPen() m_pointWidth = 1.0; } -KSpreadPen::KSpreadPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style) +KSpreadPen::KSpreadPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style) : TQPen() { setColor(_color); diff --git a/kspread/kspread_pen.h b/kspread/kspread_pen.h index 23de5877..ec87dd29 100644 --- a/kspread/kspread_pen.h +++ b/kspread/kspread_pen.h @@ -31,7 +31,7 @@ class KSpreadPen : public TQPen { public: KSpreadPen(); - KSpreadPen(const TQColor& _color, double _pointWidth, Qt::PenStyle _style); + KSpreadPen(const TQColor& _color, double _pointWidth, TQt::PenStyle _style); KSpreadPen(const TQColor& _color); ~KSpreadPen(); diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp index a8965b9e..85e8f15f 100644 --- a/kspread/kspread_sheet.cpp +++ b/kspread/kspread_sheet.cpp @@ -368,7 +368,7 @@ Sheet::Sheet (Map* map, d->layoutDirection = LeftToRight; d->defaultFormat = new Format (this, d->workbook->doc()->styleManager()->defaultStyle()); - d->emptyPen.setStyle( Qt::NoPen ); + d->emptyPen.setStyle( TQt::NoPen ); d->dcop = 0; d->name = sheetName; @@ -8482,10 +8482,10 @@ void Sheet::convertObscuringBorders() rightPen = c->rightBorderPen(c->column(), c->row()); bottomPen = c->bottomBorderPen(c->column(), c->row()); - c->format()->setTopBorderStyle(Qt::NoPen); - c->format()->setLeftBorderStyle(Qt::NoPen); - c->format()->setRightBorderStyle(Qt::NoPen); - c->format()->setBottomBorderStyle(Qt::NoPen); + c->format()->setTopBorderStyle(TQt::NoPen); + c->format()->setLeftBorderStyle(TQt::NoPen); + c->format()->setRightBorderStyle(TQt::NoPen); + c->format()->setBottomBorderStyle(TQt::NoPen); for (int x = c->column(); x < c->column() + c->extraXCells(); x++) { diff --git a/kspread/kspread_sheetprint.cpp b/kspread/kspread_sheetprint.cpp index 974e8994..b8a3a919 100644 --- a/kspread/kspread_sheetprint.cpp +++ b/kspread/kspread_sheetprint.cpp @@ -227,7 +227,7 @@ bool SheetPrint::print( TQPainter &painter, KPrinter *_printer ) { gridPen = TQPen( m_pDoc->gridColor(), 1, TQt::SolidLine ); TQPen nopen; - nopen.setStyle( Qt::NoPen ); + nopen.setStyle( TQt::NoPen ); m_pDoc->setGridColor( TQt::white ); } diff --git a/kspread/kspread_style.cpp b/kspread/kspread_style.cpp index bd58ac88..4abcdb4b 100644 --- a/kspread/kspread_style.cpp +++ b/kspread/kspread_style.cpp @@ -1701,7 +1701,7 @@ bool Style::loadXML( TQDomElement & format ) if ( format.hasAttribute( "brushstyle" ) ) { - m_backGroundBrush.setStyle( (Qt::BrushStyle) format.attribute( "brushstyle" ).toInt( &ok ) ); + m_backGroundBrush.setStyle( (TQt::BrushStyle) format.attribute( "brushstyle" ).toInt( &ok ) ); if ( !ok ) return false; diff --git a/kspread/kspread_util.cpp b/kspread/kspread_util.cpp index c7b28af1..1db4b049 100644 --- a/kspread/kspread_util.cpp +++ b/kspread/kspread_util.cpp @@ -171,7 +171,7 @@ TQPen KSpread::util_toPen( TQDomElement & element ) bool ok; TQPen p; - p.setStyle( (Qt::PenStyle)element.attribute("style").toInt( &ok ) ); + p.setStyle( (TQt::PenStyle)element.attribute("style").toInt( &ok ) ); if ( !ok ) return TQPen(); @@ -970,7 +970,7 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) //string like "0.088cm solid #800000" if (border.isEmpty() || border=="none" || border=="hidden") // in fact no border { - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); return pen; } //code from koborder, for the moment kspread doesn't use koborder @@ -982,17 +982,17 @@ TQPen KSpread::convertOasisStringToPen( const TQString &border ) pen.setWidth( ( int )( KoUnit::parseValue( _width, 1.0 ) ) ); if ( _style =="none" ) - pen.setStyle( Qt::NoPen ); + pen.setStyle( TQt::NoPen ); else if ( _style =="solid" ) - pen.setStyle( Qt::SolidLine ); + pen.setStyle( TQt::SolidLine ); else if ( _style =="dashed" ) - pen.setStyle( Qt::DashLine ); + pen.setStyle( TQt::DashLine ); else if ( _style =="dotted" ) - pen.setStyle( Qt::DotLine ); + pen.setStyle( TQt::DotLine ); else if ( _style =="dot-dash" ) - pen.setStyle( Qt::DashDotLine ); + pen.setStyle( TQt::DashDotLine ); else if ( _style =="dot-dot-dash" ) - pen.setStyle( Qt::DashDotDotLine ); + pen.setStyle( TQt::DashDotDotLine ); else kdDebug()<<" style undefined : "<<_style<calcLabel = 0; d->vertScrollBar = new TQScrollBar( this, "ScrollBar_2" ); d->vertScrollBar->setRange( 0, 4096 ); - d->vertScrollBar->setOrientation( Qt::Vertical ); + d->vertScrollBar->setOrientation( TQt::Vertical ); d->vertScrollBar->setLineStep(60); //just random guess based on what feels okay d->vertScrollBar->setPageStep(60); //This should be controlled dynamically, depending on how many rows are shown @@ -1984,7 +1984,7 @@ void View::initView() d->horzScrollBar = new TQScrollBar( bottomPart, "ScrollBar_1" ); d->horzScrollBar->setRange( 0, 4096 ); - d->horzScrollBar->setOrientation( Qt::Horizontal ); + d->horzScrollBar->setOrientation( TQt::Horizontal ); d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 56af25b4..202da13e 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -47,7 +47,7 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - box = new TQGroupBox(0, Qt::Vertical, i18n("Defaults"), this, "box"); + box = new TQGroupBox(0, TQt::Vertical, i18n("Defaults"), this, "box"); box->layout()->setSpacing(KDialog::spacingHint()); box->layout()->setMargin(KDialog::marginHint()); diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index e0eb620a..55c16bf6 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -106,7 +106,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char TQAccel *accel = new TQAccel( this ); - TQButtonGroup *angle_group = new TQButtonGroup( 3,Qt::Horizontal,this, "AngleButtons" ); + TQButtonGroup *angle_group = new TQButtonGroup( 3,TQt::Horizontal,this, "AngleButtons" ); angle_group->setTitle(i18n( "Angle") ); anglebutton[0] = new TQRadioButton( angle_group ); @@ -135,7 +135,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char - TQButtonGroup *base_group = new TQButtonGroup( 4,Qt::Horizontal,this, "BaseButtons" ); + TQButtonGroup *base_group = new TQButtonGroup( 4,TQt::Horizontal,this, "BaseButtons" ); base_group->setTitle( i18n("Base") ); basebutton[0] = new TQRadioButton( base_group ); @@ -1464,7 +1464,7 @@ void TQtCalculator::configclicked(){ lay1->setMargin( KDialog::marginHint() ); lay1->setSpacing( KDialog::spacingHint() ); - TQGroupBox *box = new TQGroupBox(0,Qt::Vertical,about,"box"); + TQGroupBox *box = new TQGroupBox(0,TQt::Vertical,about,"box"); box->layout()->setSpacing(KDialog::spacingHint()); box->layout()->setMargin(KDialog::marginHint()); TQGridLayout *grid1 = new TQGridLayout(box->layout(),2,2); diff --git a/kspread/valueparser.cpp b/kspread/valueparser.cpp index 08ebe628..b098ec90 100644 --- a/kspread/valueparser.cpp +++ b/kspread/valueparser.cpp @@ -402,7 +402,7 @@ Value ValueParser::tryParseDate (const TQString& str, bool *ok) if (!valid) { //try to use the standard TQt date parsing, using ISO 8601 format - tmpDate = TQDate::fromString(str,Qt::ISODate); + tmpDate = TQDate::fromString(str,TQt::ISODate); if (tmpDate.isValid()) { valid = true; -- cgit v1.2.1