diff options
Diffstat (limited to 'kspread/dialogs')
22 files changed, 100 insertions, 100 deletions
diff --git a/kspread/dialogs/font_cell_format.ui b/kspread/dialogs/font_cell_format.ui index 6e7f7403c..b7ae7fb9a 100644 --- a/kspread/dialogs/font_cell_format.ui +++ b/kspread/dialogs/font_cell_format.ui @@ -168,7 +168,7 @@ The default font is set for all cells in the Format -> Style Manager menu wit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc index 7c97f6c22..e326dd53c 100644 --- a/kspread/dialogs/kspread_dlg_angle.cc +++ b/kspread/dialogs/kspread_dlg_angle.cc @@ -55,7 +55,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) lay->addWidget( m_pAngle ); TQWidget* spacer = new TQWidget( page ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding ) ); lay->addWidget( spacer ); m_pAngle->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc index 9a78074ba..e4e130e80 100644 --- a/kspread/dialogs/kspread_dlg_area.cc +++ b/kspread/dialogs/kspread_dlg_area.cc @@ -51,7 +51,7 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke lay1->addWidget( label ); m_areaName = new TQLineEdit(page); - m_areaName->setMinimumWidth( m_areaName->tqsizeHint().width() * 3 ); + m_areaName->setMinimumWidth( m_areaName->sizeHint().width() * 3 ); lay1->addWidget( m_areaName ); m_areaName->setFocus(); diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc index 531f2ee3d..d03b72d77 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cc +++ b/kspread/dialogs/kspread_dlg_conditional.cc @@ -57,7 +57,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_3->tqlayout()->setSpacing( KDialog::spacingHint() ); groupBox1_3->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_3Layout = new TQGridLayout( groupBox1_3->tqlayout() ); - groupBox1_3Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_3Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_3 = new TQLabel( groupBox1_3, "textLabel1_3" ); groupBox1_3Layout->addWidget( textLabel1_3, 0, 0 ); @@ -93,7 +93,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_2->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_2Layout = new TQGridLayout( groupBox1_2->tqlayout() ); - groupBox1_2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_2Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_2 = new TQLabel( groupBox1_2, "textLabel1_2" ); groupBox1_2Layout->addWidget( textLabel1_2, 0, 0 ); @@ -129,7 +129,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_1->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBox1_1Layout = new TQGridLayout( groupBox1_1->tqlayout() ); - groupBox1_1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1_1Layout->setAlignment( TQt::AlignTop ); TQLabel * textLabel1_1 = new TQLabel( groupBox1_1, "textLabel1_2_2" ); groupBox1_1Layout->addWidget( textLabel1_1, 0, 0 ); @@ -158,7 +158,7 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags groupBox1_1Layout->addItem( spacer_6, 1, 3 ); Form1Layout->addWidget( groupBox1_1, 0, 0 ); - resize( TQSize(702, 380).expandedTo( tqminimumSizeHint() ) ); + resize( TQSize(702, 380).expandedTo( minimumSizeHint() ) ); clearWState( WState_Polished ); TQStringList list; diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc index c8ce26715..dcc53a776 100644 --- a/kspread/dialogs/kspread_dlg_csv.cc +++ b/kspread/dialogs/kspread_dlg_csv.cc @@ -78,7 +78,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_targetRect.setBottom( lastCell->row() ); m_sheet = new TQTable( page, "m_table" ); - //m_sheet->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); + //m_sheet->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, m_sheet->sizePolicy().hasHeightForWidth() ) ); m_sheet->setNumRows( 0 ); m_sheet->setNumCols( 0 ); @@ -86,13 +86,13 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod // Delimiter: comma, semicolon, tab, space, other m_delimiterBox = new TQButtonGroup( page, "m_delimiterBox" ); - m_delimiterBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_delimiterBox->sizePolicy().hasHeightForWidth() ) ); + 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->tqlayout()->setSpacing( KDialog::spacingHint() ); m_delimiterBox->tqlayout()->setMargin( KDialog::marginHint() ); m_delimiterBoxLayout = new TQGridLayout( m_delimiterBox->tqlayout() ); - m_delimiterBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_delimiterBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_delimiterBox, 0, 2, 0, 0 ); m_ignoreDuplicates = new TQCheckBox( page, "m_ignoreDuplicates" ); @@ -122,20 +122,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_delimiterBoxLayout->addWidget( m_radioOther, 0, 2 ); m_delimiterEdit = new TQLineEdit( m_delimiterBox, "m_delimiterEdit" ); - m_delimiterEdit->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); + m_delimiterEdit->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)0, 0, 0, m_delimiterEdit->sizePolicy().hasHeightForWidth() ) ); m_delimiterEdit->setMaximumSize( TQSize( 30, 32767 ) ); m_delimiterBoxLayout->addWidget( m_delimiterEdit, 1, 2 ); // Format: number, text, currency, m_formatBox = new TQButtonGroup( page, "m_formatBox" ); - m_formatBox->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, m_formatBox->sizePolicy().hasHeightForWidth() ) ); + 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->tqlayout()->setSpacing( KDialog::spacingHint() ); m_formatBox->tqlayout()->setMargin( KDialog::marginHint() ); m_formatBoxLayout = new TQGridLayout( m_formatBox->tqlayout() ); - m_formatBoxLayout->tqsetAlignment( TQt::AlignTop ); + m_formatBoxLayout->setAlignment( TQt::AlignTop ); MyDialogLayout->addMultiCellWidget( m_formatBox, 0, 2, 1, 1 ); m_radioNumber = new TQRadioButton( m_formatBox, "m_radioNumber" ); @@ -157,7 +157,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboLine = new TQComboBox( FALSE, page, "m_comboLine" ); m_comboLine->insertItem( i18n( "1" ) ); - m_comboLine->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); + m_comboLine->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboLine->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboLine, 1, 3 ); @@ -165,20 +165,20 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_comboQuote->insertItem( i18n( "\"" ) ); m_comboQuote->insertItem( i18n( "'" ) ); m_comboQuote->insertItem( i18n( "None" ) ); - m_comboQuote->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); + m_comboQuote->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_comboQuote->sizePolicy().hasHeightForWidth() ) ); MyDialogLayout->addWidget( m_comboQuote, 1, 2 ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Preferred ); MyDialogLayout->addItem( spacer_2, 2, 3 ); TextLabel3 = new TQLabel( page, "TextLabel3" ); - TextLabel3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); + TextLabel3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel3->sizePolicy().hasHeightForWidth() ) ); TextLabel3->setText( i18n( "Start at line:" ) ); MyDialogLayout->addWidget( TextLabel3, 0, 3 ); TextLabel2 = new TQLabel( page, "TextLabel2" ); - TextLabel2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); + TextLabel2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, TextLabel2->sizePolicy().hasHeightForWidth() ) ); TextLabel2->setText( i18n( "Textquote:" ) ); MyDialogLayout->addWidget( TextLabel2, 0, 2 ); @@ -200,7 +200,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_cancelled = true; return; } - m_fileArray = TQByteArray(mime->tqencodedData( "text/plain" ) ); + m_fileArray = TQByteArray(mime->encodedData( "text/plain" ) ); } else if ( mode == File ) { @@ -249,7 +249,7 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod fillSheet(); fillComboBox(); - resize(tqsizeHint()); + resize(sizeHint()); m_sheet->setSelectionMode(TQTable::NoSelection); diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 7cf242a91..ca1ed59c4 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -139,16 +139,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame16Layout->addWidget( TextLabel5, 5, 0 ); Frame5Layout->addWidget( Frame16 ); - m_databasetqStatus = new TQLabel( Frame5, "m_databaseStatus" ); - m_databasetqStatus->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databasetqStatus->sizePolicy().hasHeightForWidth() ) ); - m_databasetqStatus->setMaximumSize( TQSize( 32767, 30 ) ); - m_databasetqStatus->setText( " " ); - Frame5Layout->addWidget( m_databasetqStatus ); + m_databaseStatus = new TQLabel( Frame5, "m_databaseStatus" ); + m_databaseStatus->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)5, 0, 0, m_databaseStatus->sizePolicy().hasHeightForWidth() ) ); + m_databaseStatus->setMaximumSize( TQSize( 32767, 30 ) ); + m_databaseStatus->setText( " " ); + Frame5Layout->addWidget( m_databaseStatus ); m_databaseLayout->addWidget( Frame5, 0, 1 ); TQFrame * Frame17 = new TQFrame( m_database, "Frame17" ); - Frame17->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); + Frame17->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17->sizePolicy().hasHeightForWidth() ) ); Frame17->setMinimumSize( TQSize( 111, 0 ) ); Frame17->setFrameShape( TQFrame::NoFrame ); Frame17->setFrameShadow( TQFrame::Plain ); @@ -181,9 +181,9 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2Layout->addLayout( Layout21, 0, 0 ); - m_sheettqStatus = new TQLabel( Frame5_2, "m_tableStatus" ); - m_sheettqStatus->setText( " " ); - Frame5_2Layout->addWidget( m_sheettqStatus, 3, 0 ); + m_sheetStatus = new TQLabel( Frame5_2, "m_tableStatus" ); + m_sheetStatus->setText( " " ); + Frame5_2Layout->addWidget( m_sheetStatus, 3, 0 ); m_SelectSheetLabel = new TQLabel( Frame5_2, "m_SelectSheetLabel" ); m_SelectSheetLabel->setText( i18n( "Select tables:" ) ); @@ -198,7 +198,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_sheetLayout->addWidget( Frame5_2, 0, 1 ); TQFrame * Frame17_2 = new TQFrame( m_sheet, "Frame17_2" ); - Frame17_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); + Frame17_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_2->sizePolicy().hasHeightForWidth() ) ); Frame17_2->setMinimumSize( TQSize( 111, 0 ) ); Frame17_2->setFrameShape( TQFrame::NoFrame ); Frame17_2->setFrameShadow( TQFrame::Plain ); @@ -227,14 +227,14 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * Frame5_2_2Layout->addWidget( m_columnView, 1, 0 ); - m_columnstqStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); - m_columnstqStatus->setText( " " ); - Frame5_2_2Layout->addWidget( m_columnstqStatus, 2, 0 ); + m_columnsStatus = new TQLabel( Frame5_2_2, "m_columnsStatus" ); + m_columnsStatus->setText( " " ); + Frame5_2_2Layout->addWidget( m_columnsStatus, 2, 0 ); m_columnsLayout->addWidget( Frame5_2_2, 0, 1 ); TQFrame * Frame17_3 = new TQFrame( m_columns, "Frame17_3" ); - Frame17_3->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); + Frame17_3->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_3->sizePolicy().hasHeightForWidth() ) ); Frame17_3->setMinimumSize( TQSize( 111, 0 ) ); Frame17_3->setFrameShape( TQFrame::NoFrame ); Frame17_3->setFrameShadow( TQFrame::Plain ); @@ -353,7 +353,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_optionsLayout->addWidget( optionsFrame, 0, 1 ); TQFrame * Frame17_4 = new TQFrame( m_options, "Frame17_4" ); - Frame17_4->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); + Frame17_4->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_4->sizePolicy().hasHeightForWidth() ) ); Frame17_4->setMinimumSize( TQSize( 111, 0 ) ); Frame17_4->setFrameShape( TQFrame::NoFrame ); Frame17_4->setFrameShadow( TQFrame::Plain ); @@ -402,7 +402,7 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * m_resultLayout->addWidget( Frame5_2_2_3, 0, 1 ); TQFrame * Frame17_5 = new TQFrame( m_result, "Frame17_5" ); - Frame17_5->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); + Frame17_5->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)0, (TQSizePolicy::SizeType)7, 0, 0, Frame17_5->sizePolicy().hasHeightForWidth() ) ); Frame17_5->setMinimumSize( TQSize( 111, 0 ) ); Frame17_5->setFrameShape( TQFrame::NoFrame ); Frame17_5->setFrameShadow( TQFrame::Plain ); @@ -717,10 +717,10 @@ bool DatabaseDialog::databaseDoNext() m_dbConnection->setPort( port ); } - m_databasetqStatus->setText( i18n("Connecting to database...") ); + m_databaseStatus->setText( i18n("Connecting to database...") ); if ( m_dbConnection->open() ) { - m_databasetqStatus->setText( i18n("Connected. Retrieving table information...") ); + m_databaseStatus->setText( i18n("Connected. Retrieving table information...") ); TQStringList sheetList( m_dbConnection->tables() ); if ( sheetList.isEmpty() ) @@ -741,7 +741,7 @@ bool DatabaseDialog::databaseDoNext() } m_sheetView->setEnabled( true ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); } else { @@ -759,7 +759,7 @@ bool DatabaseDialog::databaseDoNext() errorMsg.append( error.databaseText() ); errorMsg.append( "\n" ); } - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); KMessageBox::error( this, errorMsg ); return false; @@ -768,7 +768,7 @@ bool DatabaseDialog::databaseDoNext() else { KMessageBox::error( this, i18n("Driver could not be loaded") ); - m_databasetqStatus->setText( " " ); + m_databaseStatus->setText( " " ); return false; } setNextEnabled(m_sheet, true); @@ -778,7 +778,7 @@ bool DatabaseDialog::databaseDoNext() bool DatabaseDialog::sheetsDoNext() { - m_databasetqStatus->setText( i18n("Retrieving meta data of tables...") ); + m_databaseStatus->setText( i18n("Retrieving meta data of tables...") ); TQStringList sheets; for (TQListViewItem * item = (TQCheckListItem *) m_sheetView->firstChild(); item; item = item->nextSibling()) diff --git a/kspread/dialogs/kspread_dlg_database.h b/kspread/dialogs/kspread_dlg_database.h index 6e82adc30..9334935c9 100644 --- a/kspread/dialogs/kspread_dlg_database.h +++ b/kspread/dialogs/kspread_dlg_database.h @@ -88,7 +88,7 @@ class DatabaseDialog : public KWizard TQSqlDatabase * m_dbConnection; TQWidget * m_database; - TQLabel * m_databasetqStatus; + TQLabel * m_databaseStatus; TQLineEdit * m_username; TQLineEdit * m_port; TQLineEdit * m_databaseName; @@ -99,12 +99,12 @@ class DatabaseDialog : public KWizard TQWidget * m_sheet; TQComboBox * m_databaseList; KPushButton * m_connectButton; - TQLabel * m_sheettqStatus; + TQLabel * m_sheetStatus; TQLabel * m_SelectSheetLabel; KListView * m_sheetView; TQWidget * m_columns; KListView * m_columnView; - TQLabel * m_columnstqStatus; + TQLabel * m_columnsStatus; TQWidget * m_options; TQComboBox * m_columns_1; TQComboBox * m_columns_2; diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc index d63bfd690..0a2226541 100644 --- a/kspread/dialogs/kspread_dlg_find.cc +++ b/kspread/dialogs/kspread_dlg_find.cc @@ -120,7 +120,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } FindDlg::~FindDlg() @@ -144,7 +144,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS { m_findOptions = new FindOption( findExtension() ); connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); - tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); + setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } SearchDlg::~SearchDlg() diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cc index 62e637f51..0f0a356c0 100644 --- a/kspread/dialogs/kspread_dlg_formula.cc +++ b/kspread/dialogs/kspread_dlg_formula.cc @@ -87,7 +87,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for searchFunct = new KLineEdit(page); TQSizePolicy sp3( TQSizePolicy::Preferred, TQSizePolicy::Fixed ); - searchFunct->tqsetSizePolicy( sp3 ); + searchFunct->setSizePolicy( sp3 ); grid1->addWidget( searchFunct, 0, 0 ); @@ -99,7 +99,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for functions = new TQListBox(page); TQSizePolicy sp1( TQSizePolicy::Preferred, TQSizePolicy::Expanding ); - functions->tqsetSizePolicy( sp1 ); + functions->setSizePolicy( sp1 ); grid1->addWidget( functions, 2, 0 ); selectFunction = new TQPushButton( page ); @@ -112,7 +112,7 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for m_tabwidget = new TQTabWidget( page ); TQSizePolicy sp2( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); - m_tabwidget->tqsetSizePolicy( sp2 ); + m_tabwidget->setSizePolicy( sp2 ); grid1->addMultiCellWidget( m_tabwidget, 0, 2, 1, 1 ); m_browser = new TQTextBrowser( m_tabwidget ); diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc index 8902cf6cb..a52d4df94 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cc +++ b/kspread/dialogs/kspread_dlg_goalseek.cc @@ -152,7 +152,7 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, m_resultText = new TQLabel( m_resultFrame, "m_resultText" ); m_resultText->setText( "Goal seeking with cell <cell> found <a | no> solution:" ); - m_resultText->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); + m_resultText->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) ); m_resultFrameLayout->addMultiCellWidget( m_resultText, 0, 0, 0, 1 ); diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 53942457b..27e278681 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * ) { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); selected = false; undefined = false; } @@ -160,7 +160,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) groupBox->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * label1 = new TQLabel( groupBox, "label1" ); label1->setText( i18n( "Name:" ) ); @@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) ); + resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) ); } GeneralTab::~GeneralTab() @@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - TQColorGroup tqcolorGroup = TQApplication::tqpalette().active(); + TQColorGroup colorGroup = TQApplication::tqpalette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) { - TQColor black = tqcolorGroup.text(); // not necessarily black :) + TQColor black = colorGroup.text(); // not necessarily black :) formatOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", black ); formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red ); formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", TQt::red ); @@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init() TQString tmp; TQString tmp2; TQDate tmpDate( 2000,2,18); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos() if ( dlg->bTextColor ) textColor = dlg->textColor; else - textColor = tqcolorGroup().text(); + textColor = colorGroup().text(); if ( !textColor.isValid() ) - textColor =tqcolorGroup().text(); + textColor =colorGroup().text(); textColorButton->setColor( textColor ); @@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); setToggleButton( true ); setOn( false); setChanged(false); @@ -2549,7 +2549,7 @@ void BorderButton::setUndefined() { setPenStyle(Qt::SolidLine ); setPenWidth(1); - setColor(tqcolorGroup().midlight()); + setColor(colorGroup().midlight()); } @@ -2558,7 +2558,7 @@ void BorderButton::unselect() setOn(false); setPenWidth(1); setPenStyle(Qt::NoPen); - setColor( tqcolorGroup().text() ); + setColor( colorGroup().text() ); setChanged(true); } @@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev ) TQPen pen; TQPainter painter; painter.begin( this ); - pen=TQPen( tqcolorGroup().midlight(),2,SolidLine); + pen=TQPen( colorGroup().midlight(),2,SolidLine); painter.setPen( pen ); painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY ); @@ -2682,14 +2682,14 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Border") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow); grid2->addMultiCellWidget(area,2,4,1,3); - area->setBackgroundColor( tqcolorGroup().base() ); + area->setBackgroundColor( colorGroup().base() ); /* initailize the buttons that are in this box */ for (int i=BorderType_Top; i < BorderType_END; i++) @@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preselect") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); @@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids() style->insertItem(paintFormatPixmap(DashDotLine),2 ); style->insertItem(paintFormatPixmap(DashDotDotLine),3 ); style->insertItem(paintFormatPixmap(SolidLine),4); - style->setBackgroundColor( tqcolorGroup().background() ); + style->setBackgroundColor( colorGroup().background() ); grid2->addMultiCell(grid3,6,6,0,1); grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1); @@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preview") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) TQPixmap pixmap( style->width(), 14 ); TQPainter painter; TQPen pen; - pen=TQPen( tqcolorGroup().text(),1,_style); + pen=TQPen( colorGroup().text(),1,_style); painter.begin( &pixmap ); - painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() ); + painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() ); painter.setPen( pen ); painter.drawLine( 0, 7, style->width(), 7 ); painter.end(); @@ -3240,7 +3240,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) { _p->setPenWidth(1); _p->setPenStyle(Qt::NoPen); - _p->setColor( tqcolorGroup().text() ); + _p->setColor( colorGroup().text() ); } area->tqrepaint(); @@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog if ( dlg->bBgColor ) bgColor = dlg->bgColor; else - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); if (!bgColor.isValid()) - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), @@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" ); tmpTQGroupBox->setTitle( i18n("Preview") ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog void CellFormatPagePattern::slotNotAnyColor() { b_notAnyColor = true; - bgColorButton->setColor( tqcolorGroup().base() ); - current->setBackgroundColor( tqcolorGroup().base() ); + bgColorButton->setColor( colorGroup().base() ); + current->setBackgroundColor( colorGroup().base() ); } void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color ) diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc index 51ca3cdc9..9d223e195 100644 --- a/kspread/dialogs/kspread_dlg_preference.cc +++ b/kspread/dialogs/kspread_dlg_preference.cc @@ -194,8 +194,8 @@ void parameterLocale::updateToMatchLocale(KLocale* locale) { m_language->setText( i18n("Language: %1").tqarg( locale->language() )); m_number->setText( i18n("Default number format: %1").tqarg( locale->formatNumber(12.55) )); - m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ))); - m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::tqcurrentDate() ,true) )); + m_date->setText( i18n("Long date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ))); + m_shortDate->setText( i18n("Short date format: %1").tqarg( locale->formatDate( TQDate::currentDate() ,true) )); m_time->setText( i18n("Time format: %1").tqarg( locale->formatTime( TQTime::currentTime() ) )); m_money->setText( i18n("Currency format: %1").tqarg( locale->formatMoney(12.55) )); } @@ -905,7 +905,7 @@ configureSpellPage::configureSpellPage( View* _view,TQVBox *box , char *name ) TQWhatsThis::add(dontCheckTitleCase, i18n( "Check this box if you want the spellchecker to ignore the title case, for example My Own Spreadsheet or My own spreadsheet. If this is unchecked, the spell checker will ask for a uppercase letter in the title nouns." ) ); TQWidget* spacer = new TQWidget( box ); - spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); + spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); if( config->hasGroup("KSpell kspread") ) { diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc index c456efb3f..1587e866a 100644 --- a/kspread/dialogs/kspread_dlg_reference.cc +++ b/kspread/dialogs/kspread_dlg_reference.cc @@ -254,7 +254,7 @@ EditAreaName::EditAreaName( View * parent, m_pView = parent; resize( 350, 142 ); - tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, + setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)4, 0, 0, sizePolicy().hasHeightForWidth() ) ); diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc index 1e58ccf5d..e903fcd55 100644 --- a/kspread/dialogs/kspread_dlg_sort.cc +++ b/kspread/dialogs/kspread_dlg_sort.cc @@ -111,7 +111,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort1Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort1Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort1BoxLayout = new TQHBoxLayout( sort1Box->tqlayout() ); - sort1BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort1BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey1 = new TQComboBox( false, sort1Box, "m_sortKey1" ); sort1BoxLayout->addWidget( m_sortKey1 ); @@ -130,7 +130,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort2Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort2Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort2BoxLayout = new TQHBoxLayout( sort2Box->tqlayout() ); - sort2BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort2BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey2 = new TQComboBox( false, sort2Box, "m_sortKey2" ); m_sortKey2->insertItem( i18n( "None" ) ); @@ -150,7 +150,7 @@ SortDialog::SortDialog( View * parent, const char * name, sort3Box->tqlayout()->setSpacing( KDialog::spacingHint() ); sort3Box->tqlayout()->setMargin( KDialog::marginHint() ); TQHBoxLayout * sort3BoxLayout = new TQHBoxLayout( sort3Box->tqlayout() ); - sort3BoxLayout->tqsetAlignment( TQt::AlignTop ); + sort3BoxLayout->setAlignment( TQt::AlignTop ); m_sortKey3 = new TQComboBox( false, sort3Box, "m_sortKey3" ); m_sortKey3->insertItem( i18n( "None" ) ); @@ -171,7 +171,7 @@ SortDialog::SortDialog( View * parent, const char * name, m_page2 = new TQWidget( m_tabWidget, "m_page2" ); TQGridLayout * page2Layout = new TQGridLayout( m_page2, 1, 1, 11, 6, "page2Layout"); - page2Layout->tqsetAlignment(TQt::AlignTop); + page2Layout->setAlignment(TQt::AlignTop); TQGroupBox * firstKeyBox = new TQGroupBox( m_page2, "firstKeyBox" ); firstKeyBox->setTitle( i18n( "First Key" ) ); @@ -179,7 +179,7 @@ SortDialog::SortDialog( View * parent, const char * name, firstKeyBox->tqlayout()->setSpacing( KDialog::spacingHint() ); firstKeyBox->tqlayout()->setMargin( KDialog::marginHint() ); TQVBoxLayout * firstKeyBoxLayout = new TQVBoxLayout( firstKeyBox->tqlayout() ); - firstKeyBoxLayout->tqsetAlignment( TQt::AlignTop ); + firstKeyBoxLayout->setAlignment( TQt::AlignTop ); m_useCustomLists = new TQCheckBox( firstKeyBox, "m_useCustomLists_2" ); m_useCustomLists->setText( i18n( "&Use custom list" ) ); @@ -206,7 +206,7 @@ SortDialog::SortDialog( View * parent, const char * name, TQHBoxLayout * resultToBoxLayout = new TQHBoxLayout( resultToBox->tqlayout() ); - resultToBoxLayout->tqsetAlignment( TQt::AlignTop ); + resultToBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * destinationSheet=new TQLabel(resultToBox,"destinationSheet"); destinationSheet->setText("Destination Sheet:"); diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 32a5474a6..787aac7cc 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -59,7 +59,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); - resize( TQSize(446, 384).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(446, 384).expandedTo(minimumSizeHint()) ); } StyleWidget::~StyleWidget() diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc index 8f61c5d8b..79445e549 100644 --- a/kspread/dialogs/kspread_dlg_validity.cc +++ b/kspread/dialogs/kspread_dlg_validity.cc @@ -367,8 +367,8 @@ void DlgValidity::changeIndexType(int _index) } break; } - if ( width() < tqsizeHint().width() ) - resize( tqsizeHint() ); + if ( width() < sizeHint().width() ) + resize( sizeHint() ); } void DlgValidity::changeIndexCond(int _index) diff --git a/kspread/dialogs/kspreadsubtotal.ui b/kspread/dialogs/kspreadsubtotal.ui index cb73b12dc..341d72a96 100644 --- a/kspread/dialogs/kspreadsubtotal.ui +++ b/kspread/dialogs/kspreadsubtotal.ui @@ -195,7 +195,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>152</height> diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index aba1a170c..23cf3317a 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -105,7 +105,7 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) fLayout->add( d->fileLink ); fLayout->add( new TQLabel( i18n("Recent file:" ), d->filePage ) ); TQComboBox* recentFile = new TQComboBox( d->filePage ); - recentFile->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); + recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); fLayout->add( recentFile ); fLayout->addItem( new TQSpacerItem( 0, 40, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding ) ); connect( d->fileText, TQT_SIGNAL( textChanged( const TQString& ) ), this, diff --git a/kspread/dialogs/position_cell_format.ui b/kspread/dialogs/position_cell_format.ui index df2ff2113..ced662513 100644 --- a/kspread/dialogs/position_cell_format.ui +++ b/kspread/dialogs/position_cell_format.ui @@ -298,7 +298,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>10</width> <height>20</height> @@ -358,7 +358,7 @@ When a merged cell is selected and when you uncheck this, then all cells come ba <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> diff --git a/kspread/dialogs/protection_cell_format.ui b/kspread/dialogs/protection_cell_format.ui index 0768d4f72..cb66f102f 100644 --- a/kspread/dialogs/protection_cell_format.ui +++ b/kspread/dialogs/protection_cell_format.ui @@ -95,7 +95,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>21</height> @@ -136,7 +136,7 @@ Note that you can print it even if the cell is protected</string> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc index 69397687c..7cdd64493 100644 --- a/kspread/dialogs/sheet_properties.cc +++ b/kspread/dialogs/sheet_properties.cc @@ -39,7 +39,7 @@ SheetPropertiesDialog::SheetPropertiesDialog( TQWidget* parent ): TQVBox* mainWidget = makeVBoxMainWidget(); d = new SheetPropertiesBase( mainWidget ); TQWidget* spacer = new TQWidget( mainWidget ); - spacer->tqsetSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); + spacer->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ); enableButtonSeparator( true ); } diff --git a/kspread/dialogs/sheet_properties_base.ui b/kspread/dialogs/sheet_properties_base.ui index 0750b8a9a..89f314a78 100644 --- a/kspread/dialogs/sheet_properties_base.ui +++ b/kspread/dialogs/sheet_properties_base.ui @@ -99,7 +99,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -118,7 +118,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.</comment> <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> |