diff options
Diffstat (limited to 'kspread')
44 files changed, 692 insertions, 692 deletions
diff --git a/kspread/dialogs/kspread_dlg_angle.cpp b/kspread/dialogs/kspread_dlg_angle.cpp index 763e47a5..defb59bf 100644 --- a/kspread/dialogs/kspread_dlg_angle.cpp +++ b/kspread/dialogs/kspread_dlg_angle.cpp @@ -60,7 +60,7 @@ AngleDialog::AngleDialog(View* parent, const char* name, const TQPoint &_marker) m_pAngle->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); Cell *cell = m_pView->activeSheet()->cellAt( marker.x(), marker.y() ); int angle=-(cell->format()->getAngle(marker.x(), marker.y())); diff --git a/kspread/dialogs/kspread_dlg_area.cpp b/kspread/dialogs/kspread_dlg_area.cpp index 108511ad..b160cb52 100644 --- a/kspread/dialogs/kspread_dlg_area.cpp +++ b/kspread/dialogs/kspread_dlg_area.cpp @@ -55,8 +55,8 @@ AreaDialog::AreaDialog( View * parent, const char * name, const TQPoint & _marke lay1->addWidget( m_areaName ); m_areaName->setFocus(); - connect ( m_areaName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotAreaNamechanged( const TQString &))); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect ( m_areaName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotAreaNamechanged( const TQString &))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); enableButtonOK(!m_areaName->text().isEmpty()); } diff --git a/kspread/dialogs/kspread_dlg_comment.cpp b/kspread/dialogs/kspread_dlg_comment.cpp index 2494959c..7c9bdb1c 100644 --- a/kspread/dialogs/kspread_dlg_comment.cpp +++ b/kspread/dialogs/kspread_dlg_comment.cpp @@ -57,8 +57,8 @@ CommentDialog::CommentDialog( View* parent, const char* name,const TQPoint &_mar if(!cell->format()->comment(marker.x(),marker.y()).isEmpty()) multiLine->setText(cell->format()->comment(marker.x(),marker.y())); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect(multiLine, TQT_SIGNAL(textChanged ()),this, TQT_SLOT(slotTextChanged())); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect(multiLine, TQ_SIGNAL(textChanged ()),this, TQ_SLOT(slotTextChanged())); slotTextChanged(); diff --git a/kspread/dialogs/kspread_dlg_conditional.cpp b/kspread/dialogs/kspread_dlg_conditional.cpp index 42e60b6a..cc35e45f 100644 --- a/kspread/dialogs/kspread_dlg_conditional.cpp +++ b/kspread/dialogs/kspread_dlg_conditional.cpp @@ -189,9 +189,9 @@ ConditionalWidget::ConditionalWidget( TQWidget* parent, const char* name, WFlags textLabel2_2->setText( i18n( "Cell style" ) ); textLabel2_3->setText( i18n( "Cell style" ) ); - connect( m_condition_1, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged1( const TQString & ) ) ); - connect( m_condition_2, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged2( const TQString & ) ) ); - connect( m_condition_3, TQT_SIGNAL( highlighted( const TQString & ) ), this, TQT_SLOT( slotTextChanged3( const TQString & ) ) ); + connect( m_condition_1, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged1( const TQString & ) ) ); + connect( m_condition_2, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged2( const TQString & ) ) ); + connect( m_condition_3, TQ_SIGNAL( highlighted( const TQString & ) ), this, TQ_SLOT( slotTextChanged3( const TQString & ) ) ); } ConditionalWidget::~ConditionalWidget() diff --git a/kspread/dialogs/kspread_dlg_cons.cpp b/kspread/dialogs/kspread_dlg_cons.cpp index 139113c7..0852deb9 100644 --- a/kspread/dialogs/kspread_dlg_cons.cpp +++ b/kspread/dialogs/kspread_dlg_cons.cpp @@ -111,12 +111,12 @@ ConsolidateDialog::ConsolidateDialog( View* parent, const char* name ) grid1->addWidget(m_pRemove,3,1); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pRef, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotReturnPressed() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pRef, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotReturnPressed() ) ); - connect(m_pView->selectionInfo(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect(m_pView->selectionInfo(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); } ConsolidateDialog::~ConsolidateDialog() diff --git a/kspread/dialogs/kspread_dlg_csv.cpp b/kspread/dialogs/kspread_dlg_csv.cpp index c40074b9..a93db228 100644 --- a/kspread/dialogs/kspread_dlg_csv.cpp +++ b/kspread/dialogs/kspread_dlg_csv.cpp @@ -253,22 +253,22 @@ CSVDialog::CSVDialog( View * parent, const char * name, TQRect const & rect, Mod m_sheet->setSelectionMode(TQTable::NoSelection); - connect(m_formatBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(formatClicked(int))); - connect(m_delimiterBox, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(delimiterClicked(int))); - connect(m_delimiterEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPressed())); - connect(m_delimiterEdit, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(textChanged ( const TQString & ) )); - connect(m_comboLine, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(lineSelected(const TQString&))); - connect(m_comboQuote, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(textquoteSelected(const TQString&))); - connect(m_sheet, TQT_SIGNAL(currentChanged(int, int)), - this, TQT_SLOT(currentCellChanged(int, int))); - connect(m_ignoreDuplicates, TQT_SIGNAL(stateChanged(int)), - this, TQT_SLOT(ignoreDuplicatesChanged(int))); + connect(m_formatBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(formatClicked(int))); + connect(m_delimiterBox, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(delimiterClicked(int))); + connect(m_delimiterEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPressed())); + connect(m_delimiterEdit, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(textChanged ( const TQString & ) )); + connect(m_comboLine, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(lineSelected(const TQString&))); + connect(m_comboQuote, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(textquoteSelected(const TQString&))); + connect(m_sheet, TQ_SIGNAL(currentChanged(int, int)), + this, TQ_SLOT(currentCellChanged(int, int))); + connect(m_ignoreDuplicates, TQ_SIGNAL(stateChanged(int)), + this, TQ_SLOT(ignoreDuplicatesChanged(int))); } CSVDialog::~CSVDialog() diff --git a/kspread/dialogs/kspread_dlg_database.cpp b/kspread/dialogs/kspread_dlg_database.cpp index 34e680cd..a8c88249 100644 --- a/kspread/dialogs/kspread_dlg_database.cpp +++ b/kspread/dialogs/kspread_dlg_database.cpp @@ -413,16 +413,16 @@ DatabaseDialog::DatabaseDialog( View * parent, TQRect const & rect, const char * finishButton()->setEnabled(false); // signals and slots connections - connect( m_orBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( orBox_clicked() ) ); - connect( m_andBox, TQT_SIGNAL( clicked() ), this, TQT_SLOT( andBox_clicked() ) ); - connect( m_startingCell, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingCell_clicked() ) ); - connect( m_startingRegion, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startingRegion_clicked() ) ); - connect( m_driver, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( databaseDriverChanged(int) ) ); - connect( m_host, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseHostChanged(const TQString &) ) ); - connect( m_databaseName, TQT_SIGNAL( textChanged(const TQString &) ), this, TQT_SLOT( databaseNameChanged(const TQString &) ) ); - connect( m_sheetView, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), - this, TQT_SLOT( popupSheetViewMenu(TQListViewItem *, const TQPoint &, int ) ) ); - connect( m_sheetView, TQT_SIGNAL( clicked( TQListViewItem * ) ), this, TQT_SLOT( sheetViewClicked( TQListViewItem * ) ) ); + connect( m_orBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( orBox_clicked() ) ); + connect( m_andBox, TQ_SIGNAL( clicked() ), this, TQ_SLOT( andBox_clicked() ) ); + connect( m_startingCell, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startingCell_clicked() ) ); + connect( m_startingRegion, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startingRegion_clicked() ) ); + connect( m_driver, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( databaseDriverChanged(int) ) ); + connect( m_host, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( databaseHostChanged(const TQString &) ) ); + connect( m_databaseName, TQ_SIGNAL( textChanged(const TQString &) ), this, TQ_SLOT( databaseNameChanged(const TQString &) ) ); + connect( m_sheetView, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint &, int ) ), + this, TQ_SLOT( popupSheetViewMenu(TQListViewItem *, const TQPoint &, int ) ) ); + connect( m_sheetView, TQ_SIGNAL( clicked( TQListViewItem * ) ), this, TQ_SLOT( sheetViewClicked( TQListViewItem * ) ) ); TQStringList str = TQSqlDatabase::drivers(); m_driver->insertItem(""); diff --git a/kspread/dialogs/kspread_dlg_find.cpp b/kspread/dialogs/kspread_dlg_find.cpp index aa1c7f71..a63ff276 100644 --- a/kspread/dialogs/kspread_dlg_find.cpp +++ b/kspread/dialogs/kspread_dlg_find.cpp @@ -34,7 +34,7 @@ FindOption::FindOption( TQWidget *parent) m_moreOptions = new TQPushButton( i18n( "More Options" ), parent ); layout->addWidget( m_moreOptions ); - connect( m_moreOptions, TQT_SIGNAL( clicked () ), this, TQT_SLOT( slotMoreOptions() ) ); + connect( m_moreOptions, TQ_SIGNAL( clicked () ), this, TQ_SLOT( slotMoreOptions() ) ); m_findExtension = new TQWidget( parent ); layout->addWidget( m_findExtension ); @@ -119,7 +119,7 @@ FindDlg::FindDlg(TQWidget *parent, const char *name, long options, const TQStrin : KFindDialog(parent,name,options,findStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + connect( m_findOptions, TQ_SIGNAL( adjustSize() ), TQ_SLOT( slotAjustSize() ) ); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } @@ -143,7 +143,7 @@ SearchDlg::SearchDlg(TQWidget *parent, const char *name, long options, const TQS : KReplaceDialog(parent,name,options,findStrings,replaceStrings,hasSelection ) { m_findOptions = new FindOption( findExtension() ); - connect( m_findOptions, TQT_SIGNAL( adjustSize() ), TQT_SLOT( slotAjustSize() ) ); + connect( m_findOptions, TQ_SIGNAL( adjustSize() ), TQ_SLOT( slotAjustSize() ) ); setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum)); } diff --git a/kspread/dialogs/kspread_dlg_format.cpp b/kspread/dialogs/kspread_dlg_format.cpp index 501d8bf3..3b304f1d 100644 --- a/kspread/dialogs/kspread_dlg_format.cpp +++ b/kspread/dialogs/kspread_dlg_format.cpp @@ -88,8 +88,8 @@ FormatDialog::FormatDialog( View* view, const char* name ) slotActivated( 0 ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_combo, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_combo, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } FormatDialog::~FormatDialog() diff --git a/kspread/dialogs/kspread_dlg_formula.cpp b/kspread/dialogs/kspread_dlg_formula.cpp index 23d9f057..324df02d 100644 --- a/kspread/dialogs/kspread_dlg_formula.cpp +++ b/kspread/dialogs/kspread_dlg_formula.cpp @@ -165,38 +165,38 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for refresh_result = true; - connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotClose() ) ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( typeFunction, TQT_SIGNAL( activated(const TQString &) ), - this, TQT_SLOT( slotActivated(const TQString &) ) ); - connect( functions, TQT_SIGNAL( highlighted(const TQString &) ), - this, TQT_SLOT( slotSelected(const TQString &) ) ); - connect( functions, TQT_SIGNAL( selected(const TQString &) ), - this, TQT_SLOT( slotSelected(const TQString &) ) ); - connect( functions, TQT_SIGNAL( doubleClicked(TQListBoxItem * ) ), - this ,TQT_SLOT( slotDoubleClicked(TQListBoxItem *) ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotClose() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( typeFunction, TQ_SIGNAL( activated(const TQString &) ), + this, TQ_SLOT( slotActivated(const TQString &) ) ); + connect( functions, TQ_SIGNAL( highlighted(const TQString &) ), + this, TQ_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQ_SIGNAL( selected(const TQString &) ), + this, TQ_SLOT( slotSelected(const TQString &) ) ); + connect( functions, TQ_SIGNAL( doubleClicked(TQListBoxItem * ) ), + this ,TQ_SLOT( slotDoubleClicked(TQListBoxItem *) ) ); slotActivated(i18n("All")); - connect( selectFunction, TQT_SIGNAL(clicked()), - this,TQT_SLOT(slotSelectButton())); + connect( selectFunction, TQ_SIGNAL(clicked()), + this,TQ_SLOT(slotSelectButton())); - connect( firstElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( secondElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( thirdElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( fourElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); - connect( fiveElement,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(slotChangeText(const TQString &))); + connect( firstElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( secondElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( thirdElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( fourElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); + connect( fiveElement,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(slotChangeText(const TQString &))); - connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); - connect( m_browser, TQT_SIGNAL( linkClicked( const TQString& ) ), - this, TQT_SLOT( slotShowFunction( const TQString& ) ) ); + connect( m_browser, TQ_SIGNAL( linkClicked( const TQString& ) ), + this, TQ_SLOT( slotShowFunction( const TQString& ) ) ); // Save the name of the active sheet. m_sheetName = m_pView->activeSheet()->sheetName(); @@ -240,10 +240,10 @@ FormulaDialog::FormulaDialog( View* parent, const char* name,const TQString& for if( functions->currentItem() == -1 ) selectFunction->setEnabled( false ); - connect( searchFunct, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotSearchText(const TQString &) ) ); - connect( searchFunct, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotPressReturn() ) ); + connect( searchFunct, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotSearchText(const TQString &) ) ); + connect( searchFunct, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotPressReturn() ) ); } FormulaDialog::~FormulaDialog() diff --git a/kspread/dialogs/kspread_dlg_goalseek.cpp b/kspread/dialogs/kspread_dlg_goalseek.cpp index 1a2e5d59..1a2dbb37 100644 --- a/kspread/dialogs/kspread_dlg_goalseek.cpp +++ b/kspread/dialogs/kspread_dlg_goalseek.cpp @@ -168,11 +168,11 @@ GoalSeekDialog::GoalSeekDialog( View * parent, TQPoint const & marker, tqApp->installEventFilter( this ); // signals and slots connections - connect( m_buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonOkClicked() ) ); - connect( m_buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonCancelClicked() ) ); + connect( m_buttonOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonOkClicked() ) ); + connect( m_buttonCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonCancelClicked() ) ); - connect( m_pView->choice(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect( m_pView->choice(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); // tab order setTabOrder( m_targetEdit, m_targetValueEdit ); diff --git a/kspread/dialogs/kspread_dlg_goto.cpp b/kspread/dialogs/kspread_dlg_goto.cpp index 2d9935ac..4c74c9b9 100644 --- a/kspread/dialogs/kspread_dlg_goto.cpp +++ b/kspread/dialogs/kspread_dlg_goto.cpp @@ -55,9 +55,9 @@ GotoDialog::GotoDialog( View* parent, const char* name ) m_nameCell->setFocus(); enableButtonOK( false ); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_nameCell, TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT(textChanged ( const TQString & ))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_nameCell, TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT(textChanged ( const TQString & ))); } void GotoDialog::textChanged ( const TQString &_text ) diff --git a/kspread/dialogs/kspread_dlg_insert.cpp b/kspread/dialogs/kspread_dlg_insert.cpp index 23f7f841..8e4e3ae3 100644 --- a/kspread/dialogs/kspread_dlg_insert.cpp +++ b/kspread/dialogs/kspread_dlg_insert.cpp @@ -80,7 +80,7 @@ InsertDialog::InsertDialog( View* parent, const char* name,const TQRect &_rect,M rb1->setChecked(true); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } void InsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_layout.cpp b/kspread/dialogs/kspread_dlg_layout.cpp index ff4719c6..4b317e42 100644 --- a/kspread/dialogs/kspread_dlg_layout.cpp +++ b/kspread/dialogs/kspread_dlg_layout.cpp @@ -191,8 +191,8 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - connect( m_parentBox, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( slotNewParent( const TQString & ) ) ); - connect( m_nameEdit, TQT_SIGNAL( lostFocus() ), this, TQT_SLOT( slotNameChanged() ) ); + connect( m_parentBox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotNewParent( const TQString & ) ) ); + connect( m_nameEdit, TQ_SIGNAL( lostFocus() ), this, TQ_SLOT( slotNameChanged() ) ); groupBoxLayout->addWidget( m_parentBox, 1, 1 ); @@ -936,7 +936,7 @@ void CellFormatDialog::init() tab->adjustSize(); - connect( tab, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotApply() ) ); + connect( tab, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotApply() ) ); tab->exec(); } @@ -1293,24 +1293,24 @@ CellFormatPageFloat::CellFormatPageFloat( TQWidget* parent, CellFormatDialog *_d customFormat->setChecked(true); } - connect(generic,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(fraction,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(money,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(date,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(scientific,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(number,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(percent,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(time,TQT_SIGNAL(clicked ()),this,TQT_SLOT(slotChangeState())); - connect(textFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); - connect(customFormat,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotChangeState())); - - connect(listFormat,TQT_SIGNAL(selectionChanged ()),this,TQT_SLOT(makeformat())); - connect(precision,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotChangeValue(int))); - connect(prefix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); - connect(postfix,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(makeformat())); - connect(currency,TQT_SIGNAL(activated ( const TQString & ) ),this, TQT_SLOT(currencyChanged(const TQString &))); - connect(format,TQT_SIGNAL(activated ( int ) ),this,TQT_SLOT(formatChanged(int))); - connect(format, TQT_SIGNAL(activated(int)), this, TQT_SLOT(makeformat())); + connect(generic,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(fraction,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(money,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(date,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(scientific,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(number,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(percent,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(time,TQ_SIGNAL(clicked ()),this,TQ_SLOT(slotChangeState())); + connect(textFormat,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeState())); + connect(customFormat,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotChangeState())); + + connect(listFormat,TQ_SIGNAL(selectionChanged ()),this,TQ_SLOT(makeformat())); + connect(precision,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(slotChangeValue(int))); + connect(prefix,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(makeformat())); + connect(postfix,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(makeformat())); + connect(currency,TQ_SIGNAL(activated ( const TQString & ) ),this, TQ_SLOT(currencyChanged(const TQString &))); + connect(format,TQ_SIGNAL(activated ( int ) ),this,TQ_SLOT(formatChanged(int))); + connect(format, TQ_SIGNAL(activated(int)), this, TQ_SLOT(makeformat())); slotChangeState(); m_bFormatColorChanged=false; m_bFormatTypeChanged=false; @@ -1959,8 +1959,8 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg bTextColorUndefined = !dlg->bTextColor; - connect( textColorButton, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetTextColor( const TQColor & ) ) ); + connect( textColorButton, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetTextColor( const TQColor & ) ) ); TQStringList tmpListFont; @@ -1990,8 +1990,8 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg family_combo->setCurrentItem(0); } - connect( family_combo, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(family_chosen_slot(const TQString &)) ); + connect( family_combo, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(family_chosen_slot(const TQString &)) ); TQStringList lst; lst.append(""); @@ -2003,29 +2003,29 @@ CellFormatPageFont::CellFormatPageFont( TQWidget* parent, CellFormatDialog *_dlg size_combo->setInsertionPolicy(TQComboBox::NoInsertion); - connect( size_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(size_chosen_slot(const TQString &)) ); - connect( size_combo ,TQT_SIGNAL( textChanged(const TQString &)), - this,TQT_SLOT(size_chosen_slot(const TQString &))); + connect( size_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(size_chosen_slot(const TQString &)) ); + connect( size_combo ,TQ_SIGNAL( textChanged(const TQString &)), + this,TQ_SLOT(size_chosen_slot(const TQString &))); - connect( weight_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(weight_chosen_slot(const TQString &)) ); + connect( weight_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(weight_chosen_slot(const TQString &)) ); - connect( style_combo, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(style_chosen_slot(const TQString &)) ); + connect( style_combo, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(style_chosen_slot(const TQString &)) ); strike->setChecked(dlg->strike); - connect( strike, TQT_SIGNAL( clicked()), - TQT_SLOT(strike_chosen_slot()) ); + connect( strike, TQ_SIGNAL( clicked()), + TQ_SLOT(strike_chosen_slot()) ); underline->setChecked(dlg->underline); - connect( underline, TQT_SIGNAL( clicked()), - TQT_SLOT(underline_chosen_slot()) ); + connect( underline, TQ_SIGNAL( clicked()), + TQ_SLOT(underline_chosen_slot()) ); example_label->setText(i18n("Dolor Ipse")); - connect(this,TQT_SIGNAL(fontSelected( const TQFont& )), - this,TQT_SLOT(display_example( const TQFont&))); + connect(this,TQ_SIGNAL(fontSelected( const TQFont& )), + this,TQ_SLOT(display_example( const TQFont&))); setCombos(); display_example( selFont ); @@ -2241,7 +2241,7 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial else if ( dlg->alignX == Format::Undefined ) standard->setChecked( true ); - connect(horizontalGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotStateChanged(int))); + connect(horizontalGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotStateChanged(int))); if ( dlg->alignY ==Format::Top ) top->setChecked( true ); @@ -2307,11 +2307,11 @@ CellFormatPagePosition::CellFormatPagePosition( TQWidget* parent, CellFormatDial defaultWidth->setEnabled(false); } - connect(defaultWidth , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeWidthState())); - connect(defaultHeight , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeHeightState())); - connect(vertical , TQT_SIGNAL(clicked() ),this, TQT_SLOT(slotChangeVerticalState())); - connect(multi , TQT_SIGNAL(clicked() ), this, TQT_SLOT(slotChangeMultiState())); - connect(angleRotation, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChangeAngle(int))); + connect(defaultWidth , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeWidthState())); + connect(defaultHeight , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeHeightState())); + connect(vertical , TQ_SIGNAL(clicked() ),this, TQ_SLOT(slotChangeVerticalState())); + connect(multi , TQ_SIGNAL(clicked() ), this, TQ_SLOT(slotChangeMultiState())); + connect(angleRotation, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChangeAngle(int))); slotStateChanged( 0 ); m_bOptionText = false; @@ -2784,7 +2784,7 @@ void CellFormatPageBorder::InitializeGrids() TQGridLayout *grid3 = new TQGridLayout( this, 2, 2, KDialog::marginHint(), KDialog::spacingHint() ); customize = new TQCheckBox(i18n("Customize"),tmpTQGroupBox); grid3->addWidget(customize,0,0); - connect( customize, TQT_SIGNAL( clicked()), TQT_SLOT(cutomize_chosen_slot()) ); + connect( customize, TQ_SIGNAL( clicked()), TQ_SLOT(cutomize_chosen_slot()) ); size=new TQComboBox(true,tmpTQGroupBox); grid3->addWidget(size,1,1); @@ -2875,35 +2875,35 @@ void CellFormatPageBorder::InitializePatterns() void CellFormatPageBorder::SetConnections() { - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetColorButton( const TQColor & ) ) ); for (int i=0; i < NUM_BORDER_PATTERNS; i++) { - connect( pattern[i], TQT_SIGNAL( clicked( PatternSelect* ) ), - this, TQT_SLOT( slotUnselect2( PatternSelect* ) ) ); + connect( pattern[i], TQ_SIGNAL( clicked( PatternSelect* ) ), + this, TQ_SLOT( slotUnselect2( PatternSelect* ) ) ); } for (int i = BorderType_Top; i < BorderType_END; i++) { - connect( borderButtons[i], TQT_SIGNAL( clicked (BorderButton *) ), - this, TQT_SLOT( changeState( BorderButton *) ) ); + connect( borderButtons[i], TQ_SIGNAL( clicked (BorderButton *) ), + this, TQ_SLOT( changeState( BorderButton *) ) ); } for (int i = BorderShortcutType_Remove; i < BorderShortcutType_END; i++) { - connect( shortcutButtons[i], TQT_SIGNAL( clicked(BorderButton *) ), - this, TQT_SLOT( preselect(BorderButton *) ) ); + connect( shortcutButtons[i], TQ_SIGNAL( clicked(BorderButton *) ), + this, TQ_SLOT( preselect(BorderButton *) ) ); } - connect( area ,TQT_SIGNAL( redraw()),this,TQT_SLOT(draw())); - connect( area ,TQT_SIGNAL( choosearea(TQMouseEvent * )), - this,TQT_SLOT( slotPressEvent(TQMouseEvent *))); + connect( area ,TQ_SIGNAL( redraw()),this,TQ_SLOT(draw())); + connect( area ,TQ_SIGNAL( choosearea(TQMouseEvent * )), + this,TQ_SLOT( slotPressEvent(TQMouseEvent *))); - connect( style, TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); - connect( size, TQT_SIGNAL( textChanged(const TQString &)), - this, TQT_SLOT(slotChangeStyle(const TQString &))); - connect( size ,TQT_SIGNAL( activated(int)), this, TQT_SLOT(slotChangeStyle(int))); + connect( style, TQ_SIGNAL( activated(int)), this, TQ_SLOT(slotChangeStyle(int))); + connect( size, TQ_SIGNAL( textChanged(const TQString &)), + this, TQ_SLOT(slotChangeStyle(const TQString &))); + connect( size ,TQ_SIGNAL( activated(int)), this, TQ_SLOT(slotChangeStyle(int))); } void CellFormatPageBorder::cutomize_chosen_slot() @@ -3662,13 +3662,13 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); - connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetBackgroundColor( const TQColor & ) ) ); + connect( bgColorButton, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetBackgroundColor( const TQColor & ) ) ); notAnyColor=new TQPushButton(i18n("No Color"),tmpTQGroupBox); grid3->addWidget(notAnyColor,0,2); - connect( notAnyColor, TQT_SIGNAL( clicked( ) ), - this, TQT_SLOT( slotNotAnyColor( ) ) ); + connect( notAnyColor, TQ_SIGNAL( clicked( ) ), + this, TQ_SLOT( slotNotAnyColor( ) ) ); b_notAnyColor=false; grid2->addMultiCell(grid3,7,7,0,2); @@ -3689,36 +3689,36 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog grid2->addWidget(current,1,0); grid->addWidget( tmpTQGroupBox,4,0); - connect( brush1, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush2, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush3, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush4, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush5, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush6, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush7, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush8, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush9, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush10, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush11, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush12, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush13, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush14, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); - connect( brush15, TQT_SIGNAL( clicked( BrushSelect* ) ), - this, TQT_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush1, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush2, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush3, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush4, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush5, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush6, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush7, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush8, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush9, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush10, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush11, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush12, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush13, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush14, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); + connect( brush15, TQ_SIGNAL( clicked( BrushSelect* ) ), + this, TQ_SLOT( slotUnselect2( BrushSelect* ) ) ); brush1->setPattern( TQt::red,TQt::VerPattern ); brush2->setPattern( TQt::red,TQt::HorPattern ); @@ -3742,8 +3742,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog color->setColor(dlg->brushColor); current->setBackgroundColor( bgColor ); - connect( color, TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( slotSetColorButton( const TQColor & ) ) ); + connect( color, TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( slotSetColorButton( const TQColor & ) ) ); slotSetColorButton( dlg->brushColor ); init(); diff --git a/kspread/dialogs/kspread_dlg_list.cpp b/kspread/dialogs/kspread_dlg_list.cpp index 254470e1..76581a6c 100644 --- a/kspread/dialogs/kspread_dlg_list.cpp +++ b/kspread/dialogs/kspread_dlg_list.cpp @@ -79,13 +79,13 @@ ListDialog::ListDialog( TQWidget* parent, const char* name ) m_pAdd->setEnabled(false); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNew() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); - connect( m_pCopy, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCopy() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( list, TQT_SIGNAL(clicked ( TQListBoxItem * )),this,TQT_SLOT(slotTextClicked(TQListBoxItem * ))); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNew() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); + connect( m_pCopy, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCopy() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( list, TQ_SIGNAL(clicked ( TQListBoxItem * )),this,TQ_SLOT(slotTextClicked(TQListBoxItem * ))); init(); entryList->setEnabled(false); m_pModify->setEnabled(false); diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cpp b/kspread/dialogs/kspread_dlg_paperlayout.cpp index 060f65ba..9414bae3 100644 --- a/kspread/dialogs/kspread_dlg_paperlayout.cpp +++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp @@ -57,8 +57,8 @@ PaperLayout::PaperLayout( TQWidget * parent, const char * name, m_pView( view ) { initTab(); - connect(view->selectionInfo(), TQT_SIGNAL(changed(const Region&)), - this, TQT_SLOT(slotSelectionChanged())); + connect(view->selectionInfo(), TQ_SIGNAL(changed(const Region&)), + this, TQ_SLOT(slotSelectionChanged())); tqApp->installEventFilter( this ); m_focus= 0L; } @@ -272,9 +272,9 @@ void PaperLayout::initScaleOptions( TQWidget * tab, TQVBoxLayout * vbox ) m_rScalingZoom->setChecked( true ); } - connect( m_cZoom, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChooseZoom( int ) ) ); - connect( m_cLimitPagesX, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); - connect( m_cLimitPagesY, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cZoom, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChooseZoom( int ) ) ); + connect( m_cLimitPagesX, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChoosePageLimit( int ) ) ); + connect( m_cLimitPagesY, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChoosePageLimit( int ) ) ); } void PaperLayout::slotChooseZoom( int /*index*/ ) diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cpp b/kspread/dialogs/kspread_dlg_pasteinsert.cpp index 2ffffc20..b966f6eb 100644 --- a/kspread/dialogs/kspread_dlg_pasteinsert.cpp +++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp @@ -55,7 +55,7 @@ PasteInsertDialog::PasteInsertDialog( View* parent, const char* name,const TQRec rb2 = new TQRadioButton( i18n("Move towards bottom"), grp ); rb1->setChecked(true); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } void PasteInsertDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_preference.cpp b/kspread/dialogs/kspread_dlg_preference.cpp index 9202bb3a..66776e34 100644 --- a/kspread/dialogs/kspread_dlg_preference.cpp +++ b/kspread/dialogs/kspread_dlg_preference.cpp @@ -63,7 +63,7 @@ PreferenceDialog::PreferenceDialog( View* parent, const char* /*name*/) { m_pView=parent; - connect(this, TQT_SIGNAL(okClicked()),this,TQT_SLOT(slotApply())); + connect(this, TQ_SIGNAL(okClicked()),this,TQ_SLOT(slotApply())); TQVBox *page2=addVBoxPage(i18n("Locale Settings"), TQString(),BarIcon("go-home",TDEIcon::SizeMedium)); _localePage=new parameterLocale(parent,page2 ); @@ -169,7 +169,7 @@ parameterLocale::parameterLocale( View* _view, TQVBox *box , char *name ) updateToMatchLocale(locale); m_updateButton=new TQPushButton ( i18n("&Update Locale Settings"), tmpTQGroupBox); - connect(m_updateButton, TQT_SIGNAL(clicked()),this,TQT_SLOT(updateDefaultSystemConfig())); + connect(m_updateButton, TQ_SIGNAL(clicked()),this,TQ_SLOT(updateDefaultSystemConfig())); } void parameterLocale::apply() @@ -449,7 +449,7 @@ miscParameters::miscParameters( View* _view,TQVBox *box, char *name ) typeCompletion->insertStringList(listType); typeCompletion->setCurrentItem(0); comboChanged=false; - connect(typeCompletion,TQT_SIGNAL(activated( const TQString & )),this,TQT_SLOT(slotTextComboChanged(const TQString &))); + connect(typeCompletion,TQ_SIGNAL(activated( const TQString & )),this,TQ_SLOT(slotTextComboChanged(const TQString &))); label=new TQLabel(i18n("&Pressing enter moves cell cursor:"), tmpTQGroupBox); typeOfMove=new TQComboBox( tmpTQGroupBox); @@ -1000,9 +1000,9 @@ configureTTSPage::configureTTSPage( View *_view, TQVBox *box, char *name ) m_iniPollingInterval->setValue(config->readNumEntry("PollingInterval", 600)); screenReaderOptionChanged(); - connect(m_cbSpeakPointerWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakFocusWidget, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); - connect(m_cbSpeakAccelerators, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakPointerWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakFocusWidget, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); + connect(m_cbSpeakAccelerators, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(screenReaderOptionChanged())); } void configureTTSPage::slotDefault() diff --git a/kspread/dialogs/kspread_dlg_reference.cpp b/kspread/dialogs/kspread_dlg_reference.cpp index 9e747dfb..96d0d5b5 100644 --- a/kspread/dialogs/kspread_dlg_reference.cpp +++ b/kspread/dialogs/kspread_dlg_reference.cpp @@ -102,14 +102,14 @@ reference::reference( View* parent, const char* name ) m_pEdit->setEnabled( false ); } - connect( m_pOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOk() ) ); - connect( m_pCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotCancel() ) ); - connect( m_pEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEdit() ) ); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), this, - TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); - connect( m_list, TQT_SIGNAL(highlighted ( TQListBoxItem * ) ), this, - TQT_SLOT(slotHighlighted(TQListBoxItem * ))); + connect( m_pOk, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOk() ) ); + connect( m_pCancel, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotCancel() ) ); + connect( m_pEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), this, + TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( m_list, TQ_SIGNAL(highlighted ( TQListBoxItem * ) ), this, + TQ_SLOT(slotHighlighted(TQListBoxItem * ))); m_rangeName->setText(i18n("Area: %1").arg("")); resize( 250, 200 ); diff --git a/kspread/dialogs/kspread_dlg_series.cpp b/kspread/dialogs/kspread_dlg_series.cpp index 6bc31ca1..d424f825 100644 --- a/kspread/dialogs/kspread_dlg_series.cpp +++ b/kspread/dialogs/kspread_dlg_series.cpp @@ -103,7 +103,7 @@ SeriesDlg::SeriesDlg( View* parent, const char* name,const TQPoint &_marker) start->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); } diff --git a/kspread/dialogs/kspread_dlg_show.cpp b/kspread/dialogs/kspread_dlg_show.cpp index 11f55e6d..4cea9f11 100644 --- a/kspread/dialogs/kspread_dlg_show.cpp +++ b/kspread/dialogs/kspread_dlg_show.cpp @@ -63,8 +63,8 @@ ShowDialog::ShowDialog( View* parent, const char* name ) } if(!list->count()) enableButtonOK(false); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } diff --git a/kspread/dialogs/kspread_dlg_showColRow.cpp b/kspread/dialogs/kspread_dlg_showColRow.cpp index 32c4c631..0828667f 100644 --- a/kspread/dialogs/kspread_dlg_showColRow.cpp +++ b/kspread/dialogs/kspread_dlg_showColRow.cpp @@ -108,8 +108,8 @@ ShowColRow::ShowColRow( View* parent, const char* name, Type _type ) //selection multiple list->setSelectionMode(TQListBox::Multi); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( list, TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(slotDoubleClicked(TQListBoxItem *))); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( list, TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(slotDoubleClicked(TQListBoxItem *))); resize( 200, 150 ); setFocus(); } diff --git a/kspread/dialogs/kspread_dlg_sort.cpp b/kspread/dialogs/kspread_dlg_sort.cpp index 5e5167f8..a9985db5 100644 --- a/kspread/dialogs/kspread_dlg_sort.cpp +++ b/kspread/dialogs/kspread_dlg_sort.cpp @@ -247,14 +247,14 @@ SortDialog::SortDialog( View * parent, const char * name, page2Layout->addWidget( m_respectCase, 2,0 ); - connect( m_sortKey2, TQT_SIGNAL( activated( int ) ), this, - TQT_SLOT( sortKey2textChanged( int ) ) ); - connect( m_useCustomLists, TQT_SIGNAL( stateChanged(int) ), this, - TQT_SLOT( useCustomListsStateChanged(int) ) ); - connect( m_firstRowOrColHeader, TQT_SIGNAL( stateChanged(int) ), this, - TQT_SLOT( firstRowHeaderChanged(int) ) ); - connect( orientationGroup, TQT_SIGNAL( pressed(int) ), this, - TQT_SLOT( slotOrientationChanged(int) ) ); + connect( m_sortKey2, TQ_SIGNAL( activated( int ) ), this, + TQ_SLOT( sortKey2textChanged( int ) ) ); + connect( m_useCustomLists, TQ_SIGNAL( stateChanged(int) ), this, + TQ_SLOT( useCustomListsStateChanged(int) ) ); + connect( m_firstRowOrColHeader, TQ_SIGNAL( stateChanged(int) ), this, + TQ_SLOT( firstRowHeaderChanged(int) ) ); + connect( orientationGroup, TQ_SIGNAL( pressed(int) ), this, + TQ_SLOT( slotOrientationChanged(int) ) ); init(); } diff --git a/kspread/dialogs/kspread_dlg_special.cpp b/kspread/dialogs/kspread_dlg_special.cpp index 5e835c1f..2b854f21 100644 --- a/kspread/dialogs/kspread_dlg_special.cpp +++ b/kspread/dialogs/kspread_dlg_special.cpp @@ -74,9 +74,9 @@ SpecialDialog::SpecialDialog( View* parent, const char* name ) // cb->layout(); // lay1->addWidget(cb); - connect( this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOk() ) ); - connect( rb3, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( rb10, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOk() ) ); + connect( rb3, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( rb10, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); } void SpecialDialog::slotOk() diff --git a/kspread/dialogs/kspread_dlg_styles.cpp b/kspread/dialogs/kspread_dlg_styles.cpp index 461b28cc..1aae0814 100644 --- a/kspread/dialogs/kspread_dlg_styles.cpp +++ b/kspread/dialogs/kspread_dlg_styles.cpp @@ -58,7 +58,7 @@ StyleWidget::StyleWidget( TQWidget * parent, const char * name, WFlags fl ) m_displayBox->insertItem( i18n( "Applied Styles" ) ); m_displayBox->insertItem( i18n( "Custom Styles" ) ); m_displayBox->insertItem( i18n( "Hierarchical" ) ); - connect( m_styleList, TQT_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQT_SIGNAL( modifyStyle())); + connect( m_styleList, TQ_SIGNAL(doubleClicked ( TQListViewItem *)),this, TQ_SIGNAL( modifyStyle())); resize( TQSize(446, 384).expandedTo(minimumSizeHint()) ); } @@ -86,11 +86,11 @@ StyleDlg::StyleDlg( View * parent, StyleManager * manager, enableButton( KDialogBase::User2, true ); enableButton( KDialogBase::User3, false ); - connect( m_dlg->m_styleList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); - connect( m_dlg->m_displayBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotDisplayMode( int ) ) ); - connect( this, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotUser3() ) ); - connect( m_dlg, TQT_SIGNAL( modifyStyle() ), this, TQT_SLOT( slotUser2())); + connect( m_dlg->m_styleList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_dlg->m_displayBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotDisplayMode( int ) ) ); + connect( this, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotUser3() ) ); + connect( m_dlg, TQ_SIGNAL( modifyStyle() ), this, TQ_SLOT( slotUser2())); } StyleDlg::~StyleDlg() diff --git a/kspread/dialogs/kspread_dlg_validity.cpp b/kspread/dialogs/kspread_dlg_validity.cpp index b7aca93e..a90b74db 100644 --- a/kspread/dialogs/kspread_dlg_validity.cpp +++ b/kspread/dialogs/kspread_dlg_validity.cpp @@ -214,10 +214,10 @@ DlgValidity::DlgValidity(View* parent,const char* name , const TQRect &_marker ) messageHelp->setTextFormat( TQt::PlainText ); - connect(choose,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexCond(int))); - connect(chooseType,TQT_SIGNAL(activated(int )),this,TQT_SLOT(changeIndexType(int))); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(OkPressed()) ); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(clearAllPressed()) ); + connect(choose,TQ_SIGNAL(activated(int )),this,TQ_SLOT(changeIndexCond(int))); + connect(chooseType,TQ_SIGNAL(activated(int )),this,TQ_SLOT(changeIndexType(int))); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(OkPressed()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(clearAllPressed()) ); init(); } diff --git a/kspread/dialogs/link.cpp b/kspread/dialogs/link.cpp index e0c1be21..afc64096 100644 --- a/kspread/dialogs/link.cpp +++ b/kspread/dialogs/link.cpp @@ -76,8 +76,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->internetLink = new KLineEdit( d->internetPage ); iLayout->add( d->internetLink ); iLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->internetText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->internetText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); // link for e-mail d->mailPage = addPage( i18n( "Mail" ), TQString(), @@ -90,8 +90,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->mailLink = new KLineEdit( d->mailPage ); mLayout->add( d->mailLink ); mLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->mailText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->mailText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); // link for external file d->filePage = addPage( i18n( "File" ), TQString(), @@ -108,10 +108,10 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) 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, - TQT_SLOT( setText( const TQString& ) ) ); - TQObject::connect( recentFile, TQT_SIGNAL( highlighted ( const TQString &) ), - d->fileLink->lineEdit(), TQT_SLOT( setText( const TQString & ) ) ); + connect( d->fileText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); + TQObject::connect( recentFile, TQ_SIGNAL( highlighted ( const TQString &) ), + d->fileLink->lineEdit(), TQ_SLOT( setText( const TQString & ) ) ); // populate recent files @@ -139,8 +139,8 @@ LinkDialog::LinkDialog( TQWidget*, const char* ) d->cellLink = new KLineEdit( d->cellPage ); cLayout->add( d->cellLink ); cLayout->addItem( new TQSpacerItem( 0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) ); - connect( d->cellText, TQT_SIGNAL( textChanged( const TQString& ) ), this, - TQT_SLOT( setText( const TQString& ) ) ); + connect( d->cellText, TQ_SIGNAL( textChanged( const TQString& ) ), this, + TQ_SLOT( setText( const TQString& ) ) ); enableButtonSeparator( true ); d->internetText->setFocus(); diff --git a/kspread/kspread_canvas.cpp b/kspread/kspread_canvas.cpp index 1f52a955..c78cfea8 100644 --- a/kspread/kspread_canvas.cpp +++ b/kspread/kspread_canvas.cpp @@ -257,16 +257,16 @@ Canvas::Canvas (View *_view) d->prevSpokenCol = -1; d->scrollTimer = new TQTimer( this ); - connect (d->scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect (d->scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); if( d->view) { - connect( d->view, TQT_SIGNAL( autoScroll( const TQPoint & )), this, TQT_SLOT( slotAutoScroll( const TQPoint &))); + connect( d->view, TQ_SIGNAL( autoScroll( const TQPoint & )), this, TQ_SLOT( slotAutoScroll( const TQPoint &))); } if (kospeaker) { - connect (kospeaker, TQT_SIGNAL(customSpeakWidget(TQWidget*, const TQPoint&, uint)), - this, TQT_SLOT(speakCell(TQWidget*, const TQPoint&, uint))); + connect (kospeaker, TQ_SIGNAL(customSpeakWidget(TQWidget*, const TQPoint&, uint)), + this, TQ_SLOT(speakCell(TQWidget*, const TQPoint&, uint))); } setFocus(); @@ -4647,7 +4647,7 @@ VBorder::VBorder( TQWidget *_parent, Canvas *_canvas, View *_view) m_bMousePressed = false; m_scrollTimer = new TQTimer( this ); - connect (m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect (m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); } @@ -5203,7 +5203,7 @@ HBorder::HBorder( TQWidget *_parent, Canvas *_canvas,View *_view ) m_bMousePressed = false; m_scrollTimer = new TQTimer( this ); - connect( m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( doAutoScroll() ) ); + connect( m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( doAutoScroll() ) ); } diff --git a/kspread/kspread_doc.cpp b/kspread/kspread_doc.cpp index 99feebe5..17f02d48 100644 --- a/kspread/kspread_doc.cpp +++ b/kspread/kspread_doc.cpp @@ -209,8 +209,8 @@ Doc::Doc( TQWidget *parentWidget, const char *widgetName, TQObject* parent, cons d->undoLocked = 0; d->commandHistory = new KoCommandHistory( actionCollection() ); - connect( d->commandHistory, TQT_SIGNAL( commandExecuted() ), TQT_SLOT( commandExecuted() ) ); - connect( d->commandHistory, TQT_SIGNAL( documentRestored() ), TQT_SLOT( documentRestored() ) ); + connect( d->commandHistory, TQ_SIGNAL( commandExecuted() ), TQ_SLOT( commandExecuted() ) ); + connect( d->commandHistory, TQ_SIGNAL( documentRestored() ), TQ_SLOT( documentRestored() ) ); // Make us scripsheet if the document has a name @@ -2331,7 +2331,7 @@ void Doc::addDamage( Damage* damage ) d->damages.append( damage ); if( d->damages.count() == 1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( flushDamages() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( flushDamages() ) ); } void Doc::flushDamages() @@ -2421,7 +2421,7 @@ void Doc::repaint( const KoRect& rect ) void Doc::addShell( KoMainWindow *shell ) { - connect( shell, TQT_SIGNAL( documentSaved() ), d->commandHistory, TQT_SLOT( documentSaved() ) ); + connect( shell, TQ_SIGNAL( documentSaved() ), d->commandHistory, TQ_SLOT( documentSaved() ) ); KoDocument::addShell( shell ); } diff --git a/kspread/kspread_editors.cpp b/kspread/kspread_editors.cpp index add8d217..a4baad77 100644 --- a/kspread/kspread_editors.cpp +++ b/kspread/kspread_editors.cpp @@ -326,10 +326,10 @@ TQObject( editor ) d->completionListBox->setFrameStyle( TQFrame::NoFrame ); d->completionListBox->setVariableWidth( true ); d->completionListBox->installEventFilter( this ); - connect( d->completionListBox, TQT_SIGNAL(selected(const TQString&)), this, - TQT_SLOT(itemSelected(const TQString&)) ); - connect( d->completionListBox, TQT_SIGNAL(highlighted(const TQString&)), this, - TQT_SLOT(itemSelected(const TQString&)) ); + connect( d->completionListBox, TQ_SIGNAL(selected(const TQString&)), this, + TQ_SLOT(itemSelected(const TQString&)) ); + connect( d->completionListBox, TQ_SIGNAL(highlighted(const TQString&)), this, + TQ_SLOT(itemSelected(const TQString&)) ); d->hintLabel = new TQLabel( 0, "autocalc", TQt::WStyle_StaysOnTop | TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_Tool | TQt::WX11BypassWM ); @@ -373,7 +373,7 @@ void FunctionCompletion::itemSelected( const TQString& item ) d->hintLabel->raise(); // do not show it forever - //TQTimer::singleShot( 5000, d->hintLabel, TQT_SLOT( hide()) ); + //TQTimer::singleShot( 5000, d->hintLabel, TQ_SLOT( hide()) ); } bool FunctionCompletion::eventFilter( TQObject *obj, TQEvent *ev ) @@ -517,11 +517,11 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents, d->functionCompletion = new FunctionCompletion( this ); d->functionCompletionTimer = new TQTimer( this ); - connect( d->functionCompletion, TQT_SIGNAL( selectedCompletion( const TQString& ) ), - TQT_SLOT( functionAutoComplete( const TQString& ) ) ); - connect( d->textEdit, TQT_SIGNAL( textChanged() ), TQT_SLOT( checkFunctionAutoComplete() ) ); - connect( d->functionCompletionTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( triggerFunctionAutoComplete() ) ); + connect( d->functionCompletion, TQ_SIGNAL( selectedCompletion( const TQString& ) ), + TQ_SLOT( functionAutoComplete( const TQString& ) ) ); + connect( d->textEdit, TQ_SIGNAL( textChanged() ), TQ_SLOT( checkFunctionAutoComplete() ) ); + connect( d->functionCompletionTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( triggerFunctionAutoComplete() ) ); if (!cell()->format()->multiRow(cell()->column(),cell()->row())) d->textEdit->setWordWrap(TQTextEdit::NoWrap); @@ -536,11 +536,11 @@ CellEditor::CellEditor( Cell* _cell, Canvas* _parent, bool captureAllKeyEvents, */ setFocusProxy( d->textEdit ); - connect( d->textEdit, TQT_SIGNAL( cursorPositionChanged(int,int) ), this, TQT_SLOT (slotCursorPositionChanged(int,int))); - connect( d->textEdit, TQT_SIGNAL( cursorPositionChanged(TQTextCursor*) ), this, TQT_SLOT (slotTextCursorChanged(TQTextCursor*))); - connect( d->textEdit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( slotTextChanged() ) ); + connect( d->textEdit, TQ_SIGNAL( cursorPositionChanged(int,int) ), this, TQ_SLOT (slotCursorPositionChanged(int,int))); + connect( d->textEdit, TQ_SIGNAL( cursorPositionChanged(TQTextCursor*) ), this, TQ_SLOT (slotTextCursorChanged(TQTextCursor*))); + connect( d->textEdit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( slotTextChanged() ) ); -// connect( d->textEdit, TQT_SIGNAL(completionModeChanged( TDEGlobalSettings::Completion )),this,TQT_SLOT (slotCompletionModeChanged(TDEGlobalSettings::Completion))); +// connect( d->textEdit, TQ_SIGNAL(completionModeChanged( TDEGlobalSettings::Completion )),this,TQ_SLOT (slotCompletionModeChanged(TDEGlobalSettings::Completion))); // A choose should always start at the edited cell // canvas()->setChooseMarkerRow( canvas()->markerRow() ); @@ -743,8 +743,8 @@ void CellEditor::slotCursorPositionChanged(int /* para */, int pos) { d->highlighter->resetRangeChanged(); - disconnect( d->canvas->choice(), TQT_SIGNAL(changed(const Region&)), - d->canvas->view(), TQT_SLOT(slotScrollChoice(const Region&)) ); + disconnect( d->canvas->choice(), TQ_SIGNAL(changed(const Region&)), + d->canvas->view(), TQ_SLOT(slotScrollChoice(const Region&)) ); d->canvas->doc()->emitBeginOperation(); setUpdateChoice(false); @@ -783,8 +783,8 @@ void CellEditor::slotCursorPositionChanged(int /* para */, int pos) } setUpdateChoice(true); d->canvas->doc()->emitEndOperation(*d->canvas->choice()); - connect( d->canvas->choice(), TQT_SIGNAL(changed(const Region&)), - d->canvas->view(), TQT_SLOT(slotScrollChoice(const Region&)) ); + connect( d->canvas->choice(), TQ_SIGNAL(changed(const Region&)), + d->canvas->view(), TQ_SLOT(slotScrollChoice(const Region&)) ); } } } @@ -1267,7 +1267,7 @@ ComboboxLocationEditWidget::ComboboxLocationEditWidget( TQWidget * _parent, TQValueList<Reference> area = _view->doc()->listArea(); for ( it = area.begin(); it != area.end(); ++it ) slotAddAreaName( (*it).ref_name); - connect( this, TQT_SIGNAL( activated ( const TQString & ) ), m_locationWidget, TQT_SLOT( slotActivateItem() ) ); + connect( this, TQ_SIGNAL( activated ( const TQString & ) ), m_locationWidget, TQ_SLOT( slotActivateItem() ) ); } @@ -1465,10 +1465,10 @@ EditWidget::EditWidget( TQWidget *_parent, Canvas *_canvas, if ( !m_pCanvas->doc()->isReadWrite() || !m_pCanvas->activeSheet() ) setEnabled( false ); - TQObject::connect( m_pCancelButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotAbortEdit() ) ); - TQObject::connect( m_pOkButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotDoneEdit() ) ); + TQObject::connect( m_pCancelButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotAbortEdit() ) ); + TQObject::connect( m_pOkButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotDoneEdit() ) ); setEditMode( false ); // disable buttons } diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp index ae8a2bbc..347448c3 100644 --- a/kspread/kspread_generalProperty.cpp +++ b/kspread/kspread_generalProperty.cpp @@ -55,8 +55,8 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal m_ui->positionGroup->setTitle( i18n( "Position" ) ); - connect( m_ui->protect, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotProtectToggled( bool ) ) ); - connect( m_ui->keepRatio, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotKeepRatioToggled( bool ) ) ); + connect( m_ui->protect, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotProtectToggled( bool ) ) ); + connect( m_ui->keepRatio, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotKeepRatioToggled( bool ) ) ); double dStep = KoUnit::fromUserValue( 0.5, m_unit ); double dMax = KoUnit::fromUserValue( 9999, m_unit ); @@ -68,11 +68,11 @@ GeneralProperty::GeneralProperty( TQWidget *parent, const char *name, GeneralVal m_ui->widthInput->setUnit( m_unit ); m_ui->widthInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->widthInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotWidthChanged( double ) ) ); + connect( m_ui->widthInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotWidthChanged( double ) ) ); m_ui->heightInput->setUnit( m_unit ); m_ui->heightInput->setMinMaxStep( 0, dMax, dStep ); - connect( m_ui->heightInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotHeightChanged( double ) ) ); + connect( m_ui->heightInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotHeightChanged( double ) ) ); slotReset(); } diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp index d8240c3e..152001d1 100644 --- a/kspread/kspread_propertyEditor.cpp +++ b/kspread/kspread_propertyEditor.cpp @@ -56,7 +56,7 @@ PropertyEditor::PropertyEditor( TQWidget *parent, const char *name, Sheet *page, setOkButton( KStdGuiItem::ok().text() ); setApplyButton( KStdGuiItem::apply().text() ); - connect( this, TQT_SIGNAL( applyButtonPressed() ), this, TQT_SLOT( slotDone() ) ); + connect( this, TQ_SIGNAL( applyButtonPressed() ), this, TQ_SLOT( slotDone() ) ); //m_objectProperties = new KPrObjectProperties( m_objects ); diff --git a/kspread/kspread_sheet.cpp b/kspread/kspread_sheet.cpp index 8a4cf50a..2240c67d 100644 --- a/kspread/kspread_sheet.cpp +++ b/kspread/kspread_sheet.cpp @@ -423,11 +423,11 @@ Sheet::Sheet (Map* map, d->dependencies = new KSpread::DependencyManager (this); // connect to named area slots - TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), - this, TQT_SLOT( slotAreaModified( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_addAreaName( const TQString & ) ), + this, TQ_SLOT( slotAreaModified( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), - this, TQT_SLOT( slotAreaModified( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_removeAreaName( const TQString & ) ), + this, TQ_SLOT( slotAreaModified( const TQString & ) ) ); } @@ -2989,11 +2989,11 @@ void Sheet::replace( const TQString &_find, const TQString &_replace, long optio // local slots. KReplace dialog( _find, _replace, options ); TQObject::connect( - &dialog, TQT_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ), - canvas, TQT_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) ); + &dialog, TQ_SIGNAL( highlight( const TQString &, int, int, const TQRect & ) ), + canvas, TQ_SLOT( highlight( const TQString &, int, int, const TQRect & ) ) ); TQObject::connect( - &dialog, TQT_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ), - canvas, TQT_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) ); + &dialog, TQ_SIGNAL( replace( const TQString &, int, int,int, const TQRect & ) ), + canvas, TQ_SLOT( replace( const TQString &, int, int,int, const TQRect & ) ) ); // Now do the replacing... if ( !doc()->undoLocked() ) diff --git a/kspread/kspread_toolbox.cpp b/kspread/kspread_toolbox.cpp index b868d913..82373f89 100644 --- a/kspread/kspread_toolbox.cpp +++ b/kspread/kspread_toolbox.cpp @@ -131,14 +131,14 @@ KoTransformToolBox::KoTransformToolBox( KoDocumentChild* ch, TQWidget* parent, c setDocumentChild( ch ); - connect( m_rotation, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotRotationChanged( int ) ) ); - connect( m_scale, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotScalingChanged( int ) ) ); - connect( m_shearX, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotXShearingChanged( int ) ) ); - connect( m_shearY, TQT_SIGNAL( valueChanged( int ) ), - this, TQT_SLOT( slotYShearingChanged( int ) ) ); + connect( m_rotation, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotRotationChanged( int ) ) ); + connect( m_scale, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotScalingChanged( int ) ) ); + connect( m_shearX, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotXShearingChanged( int ) ) ); + connect( m_shearY, TQ_SIGNAL( valueChanged( int ) ), + this, TQ_SLOT( slotYShearingChanged( int ) ) ); } void KoTransformToolBox::setDocumentChild( KoDocumentChild* ch ) diff --git a/kspread/kspread_view.cpp b/kspread/kspread_view.cpp index 91f5edce..f74dc420 100644 --- a/kspread/kspread_view.cpp +++ b/kspread/kspread_view.cpp @@ -468,534 +468,534 @@ void View::Private::initActions() // -- cell formatting actions -- actions->cellLayout = new TDEAction( i18n("Cell Format..."), "cell_layout", - TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQT_SLOT( layoutDlg() ), ac, "cellLayout" ); + TQt::CTRL+ TQt::ALT+ TQt::Key_F, view, TQ_SLOT( layoutDlg() ), ac, "cellLayout" ); actions->cellLayout->setToolTip( i18n("Set the cell formatting.") ); actions->actionExtraProperties = new TDEAction( i18n( "&Properties" ), "penbrush", 0, - view, TQT_SLOT( extraProperties() ), ac, "extra_properties" ); + view, TQ_SLOT( extraProperties() ), ac, "extra_properties" ); actions->defaultFormat = new TDEAction( i18n("Default"), - 0, view, TQT_SLOT( defaultSelection() ), ac, "default" ); + 0, view, TQ_SLOT( defaultSelection() ), ac, "default" ); actions->defaultFormat->setToolTip( i18n("Resets to the default format.") ); actions->bold = new TDEToggleAction( i18n("Bold"), "format-text-bold", TQt::CTRL+TQt::Key_B, ac, "bold"); - TQObject::connect( actions->bold, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( bold( bool ) ) ); + TQObject::connect( actions->bold, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( bold( bool ) ) ); actions->italic = new TDEToggleAction( i18n("Italic"), "format-text-italic", TQt::CTRL+TQt::Key_I, ac, "italic"); - TQObject::connect( actions->italic, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( italic( bool ) ) ); + TQObject::connect( actions->italic, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( italic( bool ) ) ); actions->underline = new TDEToggleAction( i18n("Underline"), "format-text-underline", TQt::CTRL+TQt::Key_U, ac, "underline"); - TQObject::connect( actions->underline, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( underline( bool ) ) ); + TQObject::connect( actions->underline, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( underline( bool ) ) ); actions->strikeOut = new TDEToggleAction( i18n("Strike Out"), "format-text-strikethrough", 0, ac, "strikeout"); - TQObject::connect( actions->strikeOut, TQT_SIGNAL( toggled( bool) ), - view, TQT_SLOT( strikeOut( bool ) ) ); + TQObject::connect( actions->strikeOut, TQ_SIGNAL( toggled( bool) ), + view, TQ_SLOT( strikeOut( bool ) ) ); actions->selectFont = new TDEFontAction( i18n("Select Font..."), 0, ac, "selectFont" ); - TQObject::connect( actions->selectFont, TQT_SIGNAL( activated( const TQString& ) ), - view, TQT_SLOT( fontSelected( const TQString& ) ) ); + TQObject::connect( actions->selectFont, TQ_SIGNAL( activated( const TQString& ) ), + view, TQ_SLOT( fontSelected( const TQString& ) ) ); actions->selectFontSize = new TDEFontSizeAction( i18n("Select Font Size"), 0, ac, "selectFontSize" ); - TQObject::connect( actions->selectFontSize, TQT_SIGNAL( fontSizeChanged( int ) ), - view, TQT_SLOT( fontSizeSelected( int ) ) ); + TQObject::connect( actions->selectFontSize, TQ_SIGNAL( fontSizeChanged( int ) ), + view, TQ_SLOT( fontSizeSelected( int ) ) ); actions->fontSizeUp = new TDEAction( i18n("Increase Font Size"), "fontsizeup", - 0, view, TQT_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); + 0, view, TQ_SLOT( increaseFontSize() ), ac, "increaseFontSize" ); actions->fontSizeDown = new TDEAction( i18n("Decrease Font Size"), "fontsizedown", - 0, view, TQT_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); + 0, view, TQ_SLOT( decreaseFontSize() ), ac, "decreaseFontSize" ); actions->textColor = new TTDESelectColorAction( i18n("Text Color"), - TTDESelectColorAction::TextColor, view, TQT_SLOT( changeTextColor() ), + TTDESelectColorAction::TextColor, view, TQ_SLOT( changeTextColor() ), ac, "textColor",true ); actions->textColor->setDefaultColor(TQColor()); actions->alignLeft = new TDEToggleAction( i18n("Align Left"), "format-text-direction-ltr", 0, ac, "left"); - TQObject::connect( actions->alignLeft, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignLeft( bool ) ) ); + TQObject::connect( actions->alignLeft, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignLeft( bool ) ) ); actions->alignLeft->setExclusiveGroup( "Align" ); actions->alignLeft->setToolTip(i18n("Left justify the cell contents.")); actions->alignCenter = new TDEToggleAction( i18n("Align Center"), "text_center", 0, ac, "center"); - TQObject::connect( actions->alignCenter, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignCenter( bool ) ) ); + TQObject::connect( actions->alignCenter, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignCenter( bool ) ) ); actions->alignCenter->setExclusiveGroup( "Align" ); actions->alignCenter->setToolTip(i18n("Center the cell contents.")); actions->alignRight = new TDEToggleAction( i18n("Align Right"), "format-text-direction-rtl", 0, ac, "right"); - TQObject::connect( actions->alignRight, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignRight( bool ) ) ); + TQObject::connect( actions->alignRight, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignRight( bool ) ) ); actions->alignRight->setExclusiveGroup( "Align" ); actions->alignRight->setToolTip(i18n("Right justify the cell contents.")); actions->alignTop = new TDEToggleAction( i18n("Align Top"), "text_top", 0, ac, "top"); - TQObject::connect( actions->alignTop, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignTop( bool ) ) ); + TQObject::connect( actions->alignTop, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignTop( bool ) ) ); actions->alignTop->setExclusiveGroup( "Pos" ); actions->alignTop->setToolTip(i18n("Align cell contents along the top of the cell.")); actions->alignMiddle = new TDEToggleAction( i18n("Align Middle"), "middle", 0, ac, "middle"); - TQObject::connect( actions->alignMiddle, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignMiddle( bool ) ) ); + TQObject::connect( actions->alignMiddle, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignMiddle( bool ) ) ); actions->alignMiddle->setExclusiveGroup( "Pos" ); actions->alignMiddle->setToolTip(i18n("Align cell contents centered in the cell.")); actions->alignBottom = new TDEToggleAction( i18n("Align Bottom"), "text_bottom", 0, ac, "bottom"); - TQObject::connect( actions->alignBottom, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( alignBottom( bool ) ) ); + TQObject::connect( actions->alignBottom, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( alignBottom( bool ) ) ); actions->alignBottom->setExclusiveGroup( "Pos" ); actions->alignBottom->setToolTip(i18n("Align cell contents along the bottom of the cell.")); actions->wrapText = new TDEToggleAction( i18n("Wrap Text"), "multirow", 0, ac, "multiRow" ); - TQObject::connect( actions->wrapText, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( wrapText( bool ) ) ); + TQObject::connect( actions->wrapText, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( wrapText( bool ) ) ); actions->wrapText->setToolTip(i18n("Make the cell text wrap onto multiple lines.")); actions->verticalText = new TDEToggleAction( i18n("Vertical Text"),"vertical_text" , 0 ,ac, "verticaltext" ); - TQObject::connect( actions->verticalText, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( verticalText( bool ) ) ); + TQObject::connect( actions->verticalText, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( verticalText( bool ) ) ); actions->verticalText->setToolTip(i18n("Print cell contents vertically.")); actions->increaseIndent = new TDEAction( i18n("Increase Indent"), TQApplication::reverseLayout() ? "format_decreaseindent":"format_increaseindent", - 0, view, TQT_SLOT( increaseIndent() ), ac, "increaseindent" ); + 0, view, TQ_SLOT( increaseIndent() ), ac, "increaseindent" ); actions->increaseIndent->setToolTip(i18n("Increase the indentation.")); actions->decreaseIndent = new TDEAction( i18n("Decrease Indent"), TQApplication::reverseLayout() ? "format_increaseindent" : "format_decreaseindent", - 0, view, TQT_SLOT( decreaseIndent() ), ac, "decreaseindent"); + 0, view, TQ_SLOT( decreaseIndent() ), ac, "decreaseindent"); actions->decreaseIndent->setToolTip(i18n("Decrease the indentation.")); actions->changeAngle = new TDEAction( i18n("Change Angle..."), - 0, view, TQT_SLOT( changeAngle() ), ac, "changeangle" ); + 0, view, TQ_SLOT( changeAngle() ), ac, "changeangle" ); actions->changeAngle->setToolTip(i18n("Change the angle that cell contents are printed.")); actions->percent = new TDEToggleAction( i18n("Percent Format"), "percent", 0, ac, "percent"); - TQObject::connect( actions->percent, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( percent( bool ) ) ); + TQObject::connect( actions->percent, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( percent( bool ) ) ); actions->percent->setToolTip(i18n("Set the cell formatting to look like a percentage.")); actions->precplus = new TDEAction( i18n("Increase Precision"), "prec_plus", - 0, view, TQT_SLOT( precisionPlus() ), ac, "precplus"); + 0, view, TQ_SLOT( precisionPlus() ), ac, "precplus"); actions->precplus->setToolTip(i18n("Increase the decimal precision shown onscreen.")); actions->precminus = new TDEAction( i18n("Decrease Precision"), "prec_minus", - 0, view, TQT_SLOT( precisionMinus() ), ac, "precminus"); + 0, view, TQ_SLOT( precisionMinus() ), ac, "precminus"); actions->precminus->setToolTip(i18n("Decrease the decimal precision shown onscreen.")); actions->money = new TDEToggleAction( i18n("Money Format"), "money", 0, ac, "money"); - TQObject::connect( actions->money, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( moneyFormat( bool ) ) ); + TQObject::connect( actions->money, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( moneyFormat( bool ) ) ); actions->money->setToolTip(i18n("Set the cell formatting to look like your local currency.")); actions->upper = new TDEAction( i18n("Upper Case"), "fontsizeup", - 0, view, TQT_SLOT( upper() ), ac, "upper" ); + 0, view, TQ_SLOT( upper() ), ac, "upper" ); actions->upper->setToolTip(i18n("Convert all letters to upper case.")); actions->lower = new TDEAction( i18n("Lower Case"), "fontsizedown", - 0, view, TQT_SLOT( lower() ), ac, "lower" ); + 0, view, TQ_SLOT( lower() ), ac, "lower" ); actions->lower->setToolTip(i18n("Convert all letters to lower case.")); actions->firstLetterUpper = new TDEAction( i18n("Convert First Letter to Upper Case"), "first_letter_upper", - 0, view, TQT_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); + 0, view, TQ_SLOT( firstLetterUpper() ),ac, "firstletterupper" ); actions->firstLetterUpper->setToolTip(i18n("Capitalize the first letter.")); actions->bgColor = new TTDESelectColorAction( i18n("Background Color"), TTDESelectColorAction::FillColor, ac, "backgroundColor", true ); - TQObject::connect(actions->bgColor, TQT_SIGNAL( activated() ), - view, TQT_SLOT( changeBackgroundColor() ) ); + TQObject::connect(actions->bgColor, TQ_SIGNAL( activated() ), + view, TQ_SLOT( changeBackgroundColor() ) ); actions->bgColor->setDefaultColor(TQColor()); actions->bgColor->setToolTip(i18n("Set the background color.")); actions->borderLeft = new TDEAction( i18n("Border Left"), "border_left", - 0, view, TQT_SLOT( borderLeft() ), ac, "borderLeft" ); + 0, view, TQ_SLOT( borderLeft() ), ac, "borderLeft" ); actions->borderLeft->setToolTip(i18n("Set a left border to the selected area.")); actions->borderRight = new TDEAction( i18n("Border Right"), "border_right", - 0, view, TQT_SLOT( borderRight() ), ac, "borderRight" ); + 0, view, TQ_SLOT( borderRight() ), ac, "borderRight" ); actions->borderRight->setToolTip(i18n("Set a right border to the selected area.")); actions->borderTop = new TDEAction( i18n("Border Top"), "border_top", - 0, view, TQT_SLOT( borderTop() ), ac, "borderTop" ); + 0, view, TQ_SLOT( borderTop() ), ac, "borderTop" ); actions->borderTop->setToolTip(i18n("Set a top border to the selected area.")); actions->borderBottom = new TDEAction( i18n("Border Bottom"), "border_bottom", - 0, view, TQT_SLOT( borderBottom() ), ac, "borderBottom" ); + 0, view, TQ_SLOT( borderBottom() ), ac, "borderBottom" ); actions->borderBottom->setToolTip(i18n("Set a bottom border to the selected area.")); actions->borderAll = new TDEAction( i18n("All Borders"), "border_all", - 0, view, TQT_SLOT( borderAll() ), ac, "borderAll" ); + 0, view, TQ_SLOT( borderAll() ), ac, "borderAll" ); actions->borderAll->setToolTip(i18n("Set a border around all cells in the selected area.")); actions->borderRemove = new TDEAction( i18n("Remove Borders"), "border_remove", - 0, view, TQT_SLOT( borderRemove() ), ac, "borderRemove" ); + 0, view, TQ_SLOT( borderRemove() ), ac, "borderRemove" ); actions->borderRemove->setToolTip(i18n("Remove all borders in the selected area.")); actions->borderOutline = new TDEAction( i18n("Border Outline"), ("border_outline"), - 0, view, TQT_SLOT( borderOutline() ), ac, "borderOutline" ); + 0, view, TQ_SLOT( borderOutline() ), ac, "borderOutline" ); actions->borderOutline->setToolTip(i18n("Set a border to the outline of the selected area.")); actions->borderColor = new TTDESelectColorAction( i18n("Border Color"), TTDESelectColorAction::LineColor, ac, "borderColor" ); - TQObject::connect( actions->borderColor, TQT_SIGNAL( activated() ), - view, TQT_SLOT( changeBorderColor() ) ); + TQObject::connect( actions->borderColor, TQ_SIGNAL( activated() ), + view, TQ_SLOT( changeBorderColor() ) ); actions->borderColor->setToolTip( i18n( "Select a new border color." ) ); actions->selectStyle = new TDESelectAction( i18n( "St&yle" ), 0, ac, "stylemenu" ); actions->selectStyle->setToolTip( i18n( "Apply a predefined style to the selected cells." ) ); - TQObject::connect( actions->selectStyle, TQT_SIGNAL( activated( const TQString & ) ), - view, TQT_SLOT( styleSelected( const TQString & ) ) ); + TQObject::connect( actions->selectStyle, TQ_SIGNAL( activated( const TQString & ) ), + view, TQ_SLOT( styleSelected( const TQString & ) ) ); actions->createStyle = new TDEAction( i18n( "Create Style From Cell..." ), - 0, view, TQT_SLOT( createStyleFromCell()), ac, "createStyle" ); + 0, view, TQ_SLOT( createStyleFromCell()), ac, "createStyle" ); actions->createStyle->setToolTip( i18n( "Create a new style based on the currently selected cell." ) ); // -- cell operation actions -- actions->editCell = new TDEAction( i18n("Modify Cell"),"cell_edit", - TQt::CTRL+TQt::Key_M, view, TQT_SLOT( editCell() ), ac, "editCell" ); + TQt::CTRL+TQt::Key_M, view, TQ_SLOT( editCell() ), ac, "editCell" ); actions->editCell->setToolTip(i18n("Edit the highlighted cell.")); actions->insertCell = new TDEAction( i18n("Insert Cells..."), "insertcell", - 0, view, TQT_SLOT( slotInsert() ), ac, "insertCell" ); + 0, view, TQ_SLOT( slotInsert() ), ac, "insertCell" ); actions->insertCell->setToolTip(i18n("Insert a blank cell into the spreadsheet.")); actions->removeCell = new TDEAction( i18n("Remove Cells..."), "removecell", - 0, view, TQT_SLOT( slotRemove() ), ac, "removeCell" ); + 0, view, TQ_SLOT( slotRemove() ), ac, "removeCell" ); actions->removeCell->setToolTip(i18n("Removes the current cell from the spreadsheet.")); actions->deleteCell = new TDEAction( i18n("Delete"), "deletecell", - 0, view, TQT_SLOT( deleteSelection() ), ac, "delete" ); + 0, view, TQ_SLOT( deleteSelection() ), ac, "delete" ); actions->deleteCell->setToolTip(i18n("Delete all contents and formatting of the current cell.")); actions->mergeCell = new TDEToolBarPopupAction( i18n("Merge Cells"),"mergecell", - 0, view, TQT_SLOT( mergeCell() ), ac, "mergecell" ); + 0, view, TQ_SLOT( mergeCell() ), ac, "mergecell" ); actions->mergeCell->setToolTip(i18n("Merge the selected region.")); actions->mergeCell->plug( actions->mergeCell->popupMenu() ); actions->mergeCellHorizontal = new TDEAction( i18n("Merge Cells Horizontally"),"mergecell-horizontal", - 0, view, TQT_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); + 0, view, TQ_SLOT( mergeCellHorizontal() ), ac, "mergecellHorizontal" ); actions->mergeCellHorizontal->setToolTip(i18n("Merge the selected region horizontally.")); actions->mergeCellHorizontal->plug( actions->mergeCell->popupMenu() ); actions->mergeCellVertical = new TDEAction( i18n("Merge Cells Vertically"),"mergecell-vertical", - 0, view, TQT_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); + 0, view, TQ_SLOT( mergeCellVertical() ), ac, "mergecellVertical" ); actions->mergeCellVertical->setToolTip(i18n("Merge the selected region vertically.")); actions->mergeCellVertical->plug( actions->mergeCell->popupMenu() ); actions->dissociateCell = new TDEAction( i18n("Dissociate Cells"),"dissociatecell", - 0, view, TQT_SLOT( dissociateCell() ), ac, "dissociatecell" ); + 0, view, TQ_SLOT( dissociateCell() ), ac, "dissociatecell" ); actions->dissociateCell->setToolTip(i18n("Unmerge the selected region.")); actions->clearText = new TDEAction( i18n("Text"), - 0, view, TQT_SLOT( clearTextSelection() ), ac, "cleartext" ); + 0, view, TQ_SLOT( clearTextSelection() ), ac, "cleartext" ); actions->clearText->setToolTip(i18n("Remove the contents of the current cell.")); actions->conditional = new TDEAction( i18n("Conditional Cell Attributes..."), - 0, view, TQT_SLOT( conditional() ), ac, "conditional" ); + 0, view, TQ_SLOT( conditional() ), ac, "conditional" ); actions->conditional->setToolTip(i18n("Set cell format based on certain conditions.")); actions->clearConditional = new TDEAction( i18n("Conditional Cell Attributes"), - 0, view, TQT_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); + 0, view, TQ_SLOT( clearConditionalSelection() ), ac, "clearconditional" ); actions->clearConditional->setToolTip(i18n("Remove the conditional cell formatting.")); actions->validity = new TDEAction( i18n("Validity..."), - 0, view, TQT_SLOT( validity() ), ac, "validity" ); + 0, view, TQ_SLOT( validity() ), ac, "validity" ); actions->validity->setToolTip(i18n("Set tests to confirm cell data is valid.")); actions->clearValidity = new TDEAction( i18n("Validity"), - 0, view, TQT_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); + 0, view, TQ_SLOT( clearValiditySelection() ), ac, "clearvalidity" ); actions->clearValidity->setToolTip(i18n("Remove the validity tests on this cell.")); actions->addModifyComment = new TDEAction( i18n("&Add/Modify Comment..."),"comment", - 0, view, TQT_SLOT( addModifyComment() ), ac, "addmodifycomment" ); + 0, view, TQ_SLOT( addModifyComment() ), ac, "addmodifycomment" ); actions->addModifyComment->setToolTip(i18n("Edit a comment for this cell.")); actions->removeComment = new TDEAction( i18n("&Remove Comment"),"removecomment", - 0, view, TQT_SLOT( removeComment() ), ac, "removecomment" ); + 0, view, TQ_SLOT( removeComment() ), ac, "removecomment" ); actions->removeComment->setToolTip(i18n("Remove this cell's comment.")); actions->clearComment = new TDEAction( i18n("Comment"), - 0, view, TQT_SLOT( clearCommentSelection() ), ac, "clearcomment" ); + 0, view, TQ_SLOT( clearCommentSelection() ), ac, "clearcomment" ); actions->clearComment->setToolTip(i18n("Remove this cell's comment.")); // -- column & row actions -- actions->resizeColumn = new TDEAction( i18n("Resize Column..."), "resizecol", - 0, view, TQT_SLOT( resizeColumn() ), ac, "resizeCol" ); + 0, view, TQ_SLOT( resizeColumn() ), ac, "resizeCol" ); actions->resizeColumn->setToolTip(i18n("Change the width of a column.")); actions->insertColumn = new TDEAction( i18n("Insert Columns"), "insert_table_col", - 0, view, TQT_SLOT( insertColumn() ), ac, "insertColumn" ); + 0, view, TQ_SLOT( insertColumn() ), ac, "insertColumn" ); actions->insertColumn->setToolTip(i18n("Inserts a new column into the spreadsheet.")); actions->deleteColumn = new TDEAction( i18n("Delete Columns"), "delete_table_col", - 0, view, TQT_SLOT( deleteColumn() ), ac, "deleteColumn" ); + 0, view, TQ_SLOT( deleteColumn() ), ac, "deleteColumn" ); actions->deleteColumn->setToolTip(i18n("Removes a column from the spreadsheet.")); actions->hideColumn = new TDEAction( i18n("Hide Columns"), "hide_table_column", - 0, view, TQT_SLOT( hideColumn() ), ac, "hideColumn" ); + 0, view, TQ_SLOT( hideColumn() ), ac, "hideColumn" ); actions->hideColumn->setToolTip(i18n("Hide the column from view.")); actions->showColumn = new TDEAction( i18n("Show Columns..."), "show_table_column", - 0, view, TQT_SLOT( showColumn() ), ac, "showColumn" ); + 0, view, TQ_SLOT( showColumn() ), ac, "showColumn" ); actions->showColumn->setToolTip(i18n("Show hidden columns.")); actions->equalizeColumn = new TDEAction( i18n("Equalize Column"), "adjustcol", - 0, view, TQT_SLOT( equalizeColumn() ), ac, "equalizeCol" ); + 0, view, TQ_SLOT( equalizeColumn() ), ac, "equalizeCol" ); actions->equalizeColumn->setToolTip(i18n("Resizes selected columns to be the same size.")); actions->showSelColumns = new TDEAction( i18n("Show Columns"), "show_sheet_column", - 0, view, TQT_SLOT( showSelColumns() ), ac, "showSelColumns" ); + 0, view, TQ_SLOT( showSelColumns() ), ac, "showSelColumns" ); actions->showSelColumns->setToolTip(i18n("Show hidden columns in the selection.")); actions->showSelColumns->setEnabled(false); actions->resizeRow = new TDEAction( i18n("Resize Row..."), "resizerow", - 0, view, TQT_SLOT( resizeRow() ), ac, "resizeRow" ); + 0, view, TQ_SLOT( resizeRow() ), ac, "resizeRow" ); actions->resizeRow->setToolTip(i18n("Change the height of a row.")); actions->insertRow = new TDEAction( i18n("Insert Rows"), "insert_table_row", - 0, view, TQT_SLOT( insertRow() ), ac, "insertRow" ); + 0, view, TQ_SLOT( insertRow() ), ac, "insertRow" ); actions->insertRow->setToolTip(i18n("Inserts a new row into the spreadsheet.")); actions->deleteRow = new TDEAction( i18n("Delete Rows"), "delete_table_row", - 0, view, TQT_SLOT( deleteRow() ), ac, "deleteRow" ); + 0, view, TQ_SLOT( deleteRow() ), ac, "deleteRow" ); actions->deleteRow->setToolTip(i18n("Removes a row from the spreadsheet.")); actions->hideRow = new TDEAction( i18n("Hide Rows"), "hide_table_row", - 0, view, TQT_SLOT( hideRow() ), ac, "hideRow" ); + 0, view, TQ_SLOT( hideRow() ), ac, "hideRow" ); actions->hideRow->setToolTip(i18n("Hide a row from view.")); actions->showRow = new TDEAction( i18n("Show Rows..."), "show_table_row", - 0, view, TQT_SLOT( showRow() ), ac, "showRow" ); + 0, view, TQ_SLOT( showRow() ), ac, "showRow" ); actions->showRow->setToolTip(i18n("Show hidden rows.")); actions->equalizeRow = new TDEAction( i18n("Equalize Row"), "adjustrow", - 0, view, TQT_SLOT( equalizeRow() ), ac, "equalizeRow" ); + 0, view, TQ_SLOT( equalizeRow() ), ac, "equalizeRow" ); actions->equalizeRow->setToolTip(i18n("Resizes selected rows to be the same size.")); actions->showSelRows = new TDEAction( i18n("Show Rows"), "show_table_row", - 0, view, TQT_SLOT( showSelRows() ), ac, "showSelRows" ); + 0, view, TQ_SLOT( showSelRows() ), ac, "showSelRows" ); actions->showSelRows->setEnabled(false); actions->showSelRows->setToolTip(i18n("Show hidden rows in the selection.")); actions->adjust = new TDEAction( i18n("Adjust Row && Column"), - 0, view, TQT_SLOT( adjust() ), ac, "adjust" ); + 0, view, TQ_SLOT( adjust() ), ac, "adjust" ); actions->adjust->setToolTip(i18n("Adjusts row/column size so that the contents will fit.")); // -- sheet/workbook actions -- actions->sheetProperties = new TDEAction( i18n("Sheet Properties"), - 0, view, TQT_SLOT( sheetProperties() ), ac, "sheetProperties" ); + 0, view, TQ_SLOT( sheetProperties() ), ac, "sheetProperties" ); actions->sheetProperties->setToolTip(i18n("Modify current sheet's properties.")); actions->insertSheet = new TDEAction( i18n("Insert Sheet"),"inserttable", - 0, view, TQT_SLOT( insertSheet() ), ac, "insertSheet" ); + 0, view, TQ_SLOT( insertSheet() ), ac, "insertSheet" ); actions->insertSheet->setToolTip(i18n("Insert a new sheet.")); // same action as insertSheet, but without 'insert' in the caption actions->menuInsertSheet = new TDEAction( i18n("&Sheet"),"inserttable", - 0, view, TQT_SLOT( insertSheet() ), ac, "menuInsertSheet" ); + 0, view, TQ_SLOT( insertSheet() ), ac, "menuInsertSheet" ); actions->menuInsertSheet->setToolTip(i18n("Insert a new sheet.")); actions->removeSheet = new TDEAction( i18n("Remove Sheet"), "delete_table", - 0, view, TQT_SLOT( removeSheet() ), ac, "removeSheet" ); + 0, view, TQ_SLOT( removeSheet() ), ac, "removeSheet" ); actions->removeSheet->setToolTip(i18n("Remove the active sheet.")); actions->renameSheet=new TDEAction( i18n("Rename Sheet..."), - 0, view, TQT_SLOT( slotRename() ), ac, "renameSheet" ); + 0, view, TQ_SLOT( slotRename() ), ac, "renameSheet" ); actions->renameSheet->setToolTip(i18n("Rename the active sheet.")); actions->showSheet = new TDEAction(i18n("Show Sheet..."), - 0, view, TQT_SLOT( showSheet()), ac, "showSheet" ); + 0, view, TQ_SLOT( showSheet()), ac, "showSheet" ); actions->showSheet->setToolTip(i18n("Show a hidden sheet.")); actions->hideSheet = new TDEAction(i18n("Hide Sheet"), - 0, view, TQT_SLOT( hideSheet() ), ac, "hideSheet" ); + 0, view, TQ_SLOT( hideSheet() ), ac, "hideSheet" ); actions->hideSheet->setToolTip(i18n("Hide the active sheet.")); actions->autoFormat = new TDEAction( i18n("AutoFormat..."), - 0, view, TQT_SLOT( sheetFormat() ), ac, "sheetFormat" ); + 0, view, TQ_SLOT( sheetFormat() ), ac, "sheetFormat" ); actions->autoFormat->setToolTip(i18n("Set the worksheet formatting.")); actions->areaName = new TDEAction( i18n("Area Name..."), - 0, view, TQT_SLOT( setAreaName() ), ac, "areaname" ); + 0, view, TQ_SLOT( setAreaName() ), ac, "areaname" ); actions->areaName->setToolTip(i18n("Set a name for a region of the spreadsheet.")); actions->showArea = new TDEAction( i18n("Show Area..."), - 0, view, TQT_SLOT( showAreaName() ), ac, "showArea" ); + 0, view, TQ_SLOT( showAreaName() ), ac, "showArea" ); actions->showArea->setToolTip(i18n("Display a named area.")); actions->insertFunction = new TDEAction( i18n("&Function..."), "funct", - 0, view, TQT_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); + 0, view, TQ_SLOT( insertMathExpr() ), ac, "insertMathExpr" ); actions->insertFunction->setToolTip(i18n("Insert math expression.")); actions->insertSeries = new TDEAction( i18n("&Series..."),"series", - 0, view, TQT_SLOT( insertSeries() ), ac, "series"); + 0, view, TQ_SLOT( insertSeries() ), ac, "series"); actions->insertSeries ->setToolTip(i18n("Insert a series.")); actions->insertLink = new TDEAction( i18n("&Link..."), "insert_link", - 0, view, TQT_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); + 0, view, TQ_SLOT( insertHyperlink() ), ac, "insertHyperlink" ); actions->insertLink->setToolTip(i18n("Insert an Internet hyperlink.")); actions->removeLink = new TDEAction( i18n("&Remove Link"), - 0, view, TQT_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); + 0, view, TQ_SLOT( removeHyperlink() ), ac, "removeHyperlink" ); actions->removeLink->setToolTip(i18n("Remove a link.")); actions->insertSpecialChar = new TDEAction( i18n( "S&pecial Character..." ), "char", - view, TQT_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); + view, TQ_SLOT( insertSpecialChar() ), ac, "insertSpecialChar" ); actions->insertSpecialChar->setToolTip( i18n( "Insert one or more symbols or letters not found on the keyboard." ) ); actions->insertPart = new KoPartSelectAction( i18n("&Object"), "frame_query", - view, TQT_SLOT( insertObject() ), ac, "insertPart"); + view, TQ_SLOT( insertObject() ), ac, "insertPart"); actions->insertPart->setToolTip(i18n("Insert an object from another program.")); actions->insertChartFrame = new TDEToggleAction( i18n("&Chart"), "insert_chart", - 0, view, TQT_SLOT( insertChart() ), ac, "insertChart" ); + 0, view, TQ_SLOT( insertChart() ), ac, "insertChart" ); actions->insertChartFrame->setToolTip(i18n("Insert a chart.")); actions->insertPicture = new TDEAction( i18n("&Picture"), - 0, view, TQT_SLOT( insertPicture() ), ac, "insertPicture" ); + 0, view, TQ_SLOT( insertPicture() ), ac, "insertPicture" ); actions->insertPicture->setToolTip(i18n("Insert a picture.")); #ifndef TQT_NO_SQL actions->insertFromDatabase = new TDEAction( i18n("From &Database..."), - 0, view, TQT_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); + 0, view, TQ_SLOT( insertFromDatabase() ), ac, "insertFromDatabase"); actions->insertFromDatabase->setToolTip(i18n("Insert data from a SQL database.")); #endif actions->insertFromTextfile = new TDEAction( i18n("From &Text File..."), - 0, view, TQT_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); + 0, view, TQ_SLOT( insertFromTextfile() ), ac, "insertFromTextfile"); actions->insertFromTextfile->setToolTip(i18n("Insert data from a text file to the current cursor position/selection.")); actions->insertFromClipboard = new TDEAction( i18n("From &Clipboard..."), - 0, view, TQT_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); + 0, view, TQ_SLOT( insertFromClipboard() ), ac, "insertFromClipboard"); actions->insertFromClipboard->setToolTip(i18n("Insert CSV data from the clipboard to the current cursor position/selection.")); // actions->transform = new TDEAction( i18n("Transform Object..."), "rotate", -// 0, view, TQT_SLOT( transformPart() ), ac, "transform" ); +// 0, view, TQ_SLOT( transformPart() ), ac, "transform" ); // actions->transform->setToolTip(i18n("Rotate the contents of the cell.")); // actions->transform->setEnabled( false ); actions->sort = new TDEAction( i18n("&Sort..."), - 0, view, TQT_SLOT( sort() ), ac, "sort" ); + 0, view, TQ_SLOT( sort() ), ac, "sort" ); actions->sort->setToolTip(i18n("Sort a group of cells.")); actions->sortDec = new TDEAction( i18n("Sort &Decreasing"), "sort_decrease", - 0, view, TQT_SLOT( sortDec() ), ac, "sortDec" ); + 0, view, TQ_SLOT( sortDec() ), ac, "sortDec" ); actions->sortDec->setToolTip(i18n("Sort a group of cells in decreasing (last to first) order.")); actions->sortInc = new TDEAction( i18n("Sort &Increasing"), "sort_incr", - 0, view, TQT_SLOT( sortInc() ), ac, "sortInc" ); + 0, view, TQ_SLOT( sortInc() ), ac, "sortInc" ); actions->sortInc->setToolTip(i18n("Sort a group of cells in ascending (first to last) order.")); actions->paperLayout = new TDEAction( i18n("Page Layout..."), - 0, view, TQT_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); + 0, view, TQ_SLOT( paperLayoutDlg() ), ac, "paperLayout" ); actions->paperLayout->setToolTip(i18n("Specify the layout of the spreadsheet for a printout.")); actions->definePrintRange = new TDEAction( i18n("Define Print Range"), - 0, view, TQT_SLOT( definePrintRange() ), ac, "definePrintRange" ); + 0, view, TQ_SLOT( definePrintRange() ), ac, "definePrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->resetPrintRange = new TDEAction( i18n("Reset Print Range"), - 0, view, TQT_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); + 0, view, TQ_SLOT( resetPrintRange() ), ac, "resetPrintRange" ); actions->definePrintRange->setToolTip(i18n("Define the print range in the current sheet.")); actions->showPageBorders = new TDEToggleAction( i18n("Show Page Borders"), 0, ac, "showPageBorders"); actions->showPageBorders->setCheckedState(i18n("Hide Page Borders")); - TQObject::connect( actions->showPageBorders, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( togglePageBorders( bool ) ) ); + TQObject::connect( actions->showPageBorders, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( togglePageBorders( bool ) ) ); actions->showPageBorders->setToolTip( i18n( "Show on the spreadsheet where the page borders will be." ) ); actions->recalcWorksheet = new TDEAction( i18n("Recalculate Sheet"), - TQt::SHIFT + TQt::Key_F9, view, TQT_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); + TQt::SHIFT + TQt::Key_F9, view, TQ_SLOT( recalcWorkSheet() ), ac, "RecalcWorkSheet" ); actions->recalcWorksheet->setToolTip(i18n("Recalculate the value of every cell in the current worksheet.")); actions->recalcWorkbook = new TDEAction( i18n("Recalculate Document"), - TQt::Key_F9, view, TQT_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); + TQt::Key_F9, view, TQ_SLOT( recalcWorkBook() ), ac, "RecalcWorkBook" ); actions->recalcWorkbook->setToolTip(i18n("Recalculate the value of every cell in all worksheets.")); actions->protectSheet = new TDEToggleAction( i18n( "Protect &Sheet..." ), 0, ac, "protectSheet" ); actions->protectSheet->setToolTip( i18n( "Protect the sheet from being modified." ) ); - TQObject::connect( actions->protectSheet, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( toggleProtectSheet( bool ) ) ); + TQObject::connect( actions->protectSheet, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( toggleProtectSheet( bool ) ) ); actions->protectDoc = new TDEToggleAction( i18n( "Protect &Document..." ), 0, ac, "protectDoc" ); actions->protectDoc->setToolTip( i18n( "Protect the document from being modified." ) ); - TQObject::connect( actions->protectDoc, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( toggleProtectDoc( bool ) ) ); + TQObject::connect( actions->protectDoc, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( toggleProtectDoc( bool ) ) ); // -- editing actions -- - actions->copy = KStdAction::copy( view, TQT_SLOT( copySelection() ), ac, "copy" ); + actions->copy = KStdAction::copy( view, TQ_SLOT( copySelection() ), ac, "copy" ); actions->copy->setToolTip(i18n("Copy the cell object to the clipboard.")); - actions->paste = KStdAction::paste( view, TQT_SLOT( paste() ), ac, "paste" ); + actions->paste = KStdAction::paste( view, TQ_SLOT( paste() ), ac, "paste" ); actions->paste->setToolTip(i18n("Paste the contents of the clipboard at the cursor.")); - actions->cut = KStdAction::cut( view, TQT_SLOT( cutSelection() ), ac, "cut" ); + actions->cut = KStdAction::cut( view, TQ_SLOT( cutSelection() ), ac, "cut" ); actions->cut->setToolTip(i18n("Move the cell object to the clipboard.")); actions->specialPaste = new TDEAction( i18n("Special Paste..."), "special_paste", - 0, view, TQT_SLOT( specialPaste() ), ac, "specialPaste" ); + 0, view, TQ_SLOT( specialPaste() ), ac, "specialPaste" ); actions->specialPaste->setToolTip(i18n("Paste the contents of the clipboard with special options.")); actions->insertCellCopy = new TDEAction( i18n("Paste with Insertion"), "insertcellcopy", - 0, view, TQT_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); + 0, view, TQ_SLOT( slotInsertCellCopy() ), ac, "insertCellCopy" ); actions->insertCellCopy->setToolTip(i18n("Inserts a cell from the clipboard into the spreadsheet.")); - actions->find = KStdAction::find( view, TQT_SLOT(find()), ac ); - /*actions->findNext =*/ KStdAction::findNext( view, TQT_SLOT( findNext() ), ac ); - /*actions->findPrevious =*/ KStdAction::findPrev( view, TQT_SLOT( findPrevious() ), ac ); + actions->find = KStdAction::find( view, TQ_SLOT(find()), ac ); + /*actions->findNext =*/ KStdAction::findNext( view, TQ_SLOT( findNext() ), ac ); + /*actions->findPrevious =*/ KStdAction::findPrev( view, TQ_SLOT( findPrevious() ), ac ); - actions->replace = KStdAction::replace( view, TQT_SLOT(replace()), ac ); + actions->replace = KStdAction::replace( view, TQ_SLOT(replace()), ac ); actions->fillRight = new TDEAction( i18n( "&Right" ), 0, - 0, view, TQT_SLOT( fillRight() ), ac, "fillRight" ); + 0, view, TQ_SLOT( fillRight() ), ac, "fillRight" ); actions->fillLeft = new TDEAction( i18n( "&Left" ), 0, - 0, view, TQT_SLOT( fillLeft() ), ac, "fillLeft" ); + 0, view, TQ_SLOT( fillLeft() ), ac, "fillLeft" ); actions->fillDown = new TDEAction( i18n( "&Down" ), 0, - 0, view, TQT_SLOT( fillDown() ), ac, "fillDown" ); + 0, view, TQ_SLOT( fillDown() ), ac, "fillDown" ); actions->fillUp = new TDEAction( i18n( "&Up" ), 0, - 0, view, TQT_SLOT( fillUp() ), ac, "fillUp" ); + 0, view, TQ_SLOT( fillUp() ), ac, "fillUp" ); // -- misc actions -- actions->styleDialog = new TDEAction( i18n( "Style Manager" ), - 0, view, TQT_SLOT( styleDialog() ), ac, "styles" ); + 0, view, TQ_SLOT( styleDialog() ), ac, "styles" ); actions->styleDialog->setToolTip( i18n( "Edit and organize cell styles." ) ); actions->autoSum = new TDEAction( i18n("Autosum"), "black_sum", - 0, view, TQT_SLOT( autoSum() ), ac, "autoSum" ); + 0, view, TQ_SLOT( autoSum() ), ac, "autoSum" ); actions->autoSum->setToolTip(i18n("Insert the 'sum' function")); - actions->spellChecking = KStdAction::spelling( view, TQT_SLOT( extraSpelling() ), + actions->spellChecking = KStdAction::spelling( view, TQ_SLOT( extraSpelling() ), ac, "spelling" ); actions->spellChecking->setToolTip(i18n("Check the spelling.")); @@ -1013,60 +1013,60 @@ void View::Private::initActions() ((TDESelectAction*) actions->formulaSelection)->setItems( lst ); actions->formulaSelection->setComboWidth( 80 ); actions->formulaSelection->setCurrentItem(0); - TQObject::connect( actions->formulaSelection, TQT_SIGNAL( activated( const TQString& ) ), - view, TQT_SLOT( formulaSelection( const TQString& ) ) ); + TQObject::connect( actions->formulaSelection, TQ_SIGNAL( activated( const TQString& ) ), + view, TQ_SLOT( formulaSelection( const TQString& ) ) ); actions->viewZoom = new KoZoomAction( i18n( "Zoom" ), "viewmag", 0, ac, "view_zoom" ); - TQObject::connect( actions->viewZoom, TQT_SIGNAL( zoomChanged( const TQString & ) ), - view, TQT_SLOT( viewZoom( const TQString & ) ) ); + TQObject::connect( actions->viewZoom, TQ_SIGNAL( zoomChanged( const TQString & ) ), + view, TQ_SLOT( viewZoom( const TQString & ) ) ); actions->consolidate = new TDEAction( i18n("&Consolidate..."), - 0, view, TQT_SLOT( consolidate() ), ac, "consolidate" ); + 0, view, TQ_SLOT( consolidate() ), ac, "consolidate" ); actions->consolidate->setToolTip(i18n("Create a region of summary data from a group of similar regions.")); actions->goalSeek = new TDEAction( i18n("&Goal Seek..."), - 0, view, TQT_SLOT( goalSeek() ), ac, "goalSeek" ); + 0, view, TQ_SLOT( goalSeek() ), ac, "goalSeek" ); actions->goalSeek->setToolTip( i18n("Repeating calculation to find a specific value.") ); actions->subTotals = new TDEAction( i18n("&Subtotals..."), - 0, view, TQT_SLOT( subtotals() ), ac, "subtotals" ); + 0, view, TQ_SLOT( subtotals() ), ac, "subtotals" ); actions->subTotals->setToolTip( i18n("Create different kind of subtotals to a list or database.") ); actions->textToColumns = new TDEAction( i18n("&Text to Columns..."), - 0, view, TQT_SLOT( textToColumns() ), ac, "textToColumns" ); + 0, view, TQ_SLOT( textToColumns() ), ac, "textToColumns" ); actions->textToColumns->setToolTip( i18n("Expand the content of cells to multiple columns.") ); actions->multipleOperations = new TDEAction( i18n("&Multiple Operations..."), - 0, view, TQT_SLOT( multipleOperations() ), ac, "multipleOperations" ); + 0, view, TQ_SLOT( multipleOperations() ), ac, "multipleOperations" ); actions->multipleOperations->setToolTip( i18n("Apply the same formula to various cells using different values for the parameter.") ); actions->createTemplate = new TDEAction( i18n( "&Create Template From Document..." ), - 0, view, TQT_SLOT( createTemplate() ), ac, "createTemplate" ); + 0, view, TQ_SLOT( createTemplate() ), ac, "createTemplate" ); actions->customList = new TDEAction( i18n("Custom Lists..."), - 0, view, TQT_SLOT( sortList() ), ac, "sortlist" ); + 0, view, TQ_SLOT( sortList() ), ac, "sortlist" ); actions->customList->setToolTip(i18n("Create custom lists for sorting or autofill.")); // -- navigation actions -- actions->gotoCell = new TDEAction( i18n("Goto Cell..."),"goto", - 0, view, TQT_SLOT( gotoCell() ), ac, "gotoCell" ); + 0, view, TQ_SLOT( gotoCell() ), ac, "gotoCell" ); actions->gotoCell->setToolTip(i18n("Move to a particular cell.")); actions->nextSheet = new TDEAction( i18n("Next Sheet"), "forward", - TQt::CTRL+TQt::Key_PageDown, view, TQT_SLOT( nextSheet() ), ac, "nextSheet"); + TQt::CTRL+TQt::Key_PageDown, view, TQ_SLOT( nextSheet() ), ac, "nextSheet"); actions->nextSheet->setToolTip(i18n("Move to the next sheet.")); actions->prevSheet = new TDEAction( i18n("Previous Sheet"), "back", - TQt::CTRL+TQt::Key_PageUp, view, TQT_SLOT( previousSheet() ), ac, "previousSheet"); + TQt::CTRL+TQt::Key_PageUp, view, TQ_SLOT( previousSheet() ), ac, "previousSheet"); actions->prevSheet->setToolTip(i18n("Move to the previous sheet.")); actions->firstSheet = new TDEAction( i18n("First Sheet"), "go-first", - 0, view, TQT_SLOT( firstSheet() ), ac, "firstSheet"); + 0, view, TQ_SLOT( firstSheet() ), ac, "firstSheet"); actions->firstSheet->setToolTip(i18n("Move to the first sheet.")); actions->lastSheet = new TDEAction( i18n("Last Sheet"), "go-last", - 0, view, TQT_SLOT( lastSheet() ), ac, "lastSheet"); + 0, view, TQ_SLOT( lastSheet() ), ac, "lastSheet"); actions->lastSheet->setToolTip(i18n("Move to the last sheet.")); // -- settings actions -- @@ -1074,78 +1074,78 @@ void View::Private::initActions() actions->showStatusBar = new TDEToggleAction( i18n("Show Status Bar"), 0, ac, "showStatusBar" ); actions->showStatusBar->setCheckedState(i18n("Hide Status Bar")); - TQObject::connect( actions->showStatusBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showStatusBar( bool ) ) ); + TQObject::connect( actions->showStatusBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showStatusBar( bool ) ) ); actions->showStatusBar->setToolTip(i18n("Show the status bar.")); actions->showTabBar = new TDEToggleAction( i18n("Show Tab Bar"), 0, ac, "showTabBar" ); actions->showTabBar->setCheckedState(i18n("Hide Tab Bar")); - TQObject::connect( actions->showTabBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showTabBar( bool ) ) ); + TQObject::connect( actions->showTabBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showTabBar( bool ) ) ); actions->showTabBar->setToolTip(i18n("Show the tab bar.")); actions->showFormulaBar = new TDEToggleAction( i18n("Show Formula Bar"), 0, ac, "showFormulaBar" ); actions->showFormulaBar->setCheckedState(i18n("Hide Formula Bar")); - TQObject::connect( actions->showFormulaBar, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( showFormulaBar( bool ) ) ); + TQObject::connect( actions->showFormulaBar, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( showFormulaBar( bool ) ) ); actions->showFormulaBar->setToolTip(i18n("Show the formula bar.")); actions->preference = new TDEAction( i18n("Configure KSpread..."),"configure", - 0, view, TQT_SLOT( preference() ), ac, "preference" ); + 0, view, TQ_SLOT( preference() ), ac, "preference" ); actions->preference->setToolTip(i18n("Set various KSpread options.")); // -- running calculation actions -- actions->calcNone = new TDEToggleAction( i18n("None"), 0, ac, "menu_none"); - TQObject::connect( actions->calcNone, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcNone, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcNone->setExclusiveGroup( "Calc" ); actions->calcNone->setToolTip(i18n("No calculation")); actions->calcSum = new TDEToggleAction( i18n("Sum"), 0, ac, "menu_sum"); - TQObject::connect( actions->calcSum, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcSum, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcSum->setExclusiveGroup( "Calc" ); actions->calcSum->setToolTip(i18n("Calculate using sum.")); actions->calcMin = new TDEToggleAction( i18n("Min"), 0, ac, "menu_min"); - TQObject::connect( actions->calcMin, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcMin, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcMin->setExclusiveGroup( "Calc" ); actions->calcMin->setToolTip(i18n("Calculate using minimum.")); actions->calcMax = new TDEToggleAction( i18n("Max"), 0, ac, "menu_max"); - TQObject::connect( actions->calcMax, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcMax, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcMax->setExclusiveGroup( "Calc" ); actions->calcMax->setToolTip(i18n("Calculate using maximum.")); actions->calcAverage = new TDEToggleAction( i18n("Average"), 0, ac, "menu_average"); - TQObject::connect( actions->calcAverage, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcAverage, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcAverage->setExclusiveGroup( "Calc" ); actions->calcAverage->setToolTip(i18n("Calculate using average.")); actions->calcCount = new TDEToggleAction( i18n("Count"), 0, ac, "menu_count"); - TQObject::connect( actions->calcCount, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcCount, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcCount->setExclusiveGroup( "Calc" ); actions->calcCount->setToolTip(i18n("Calculate using the count.")); actions->calcCountA = new TDEToggleAction( i18n("CountA"), 0, ac, "menu_counta"); - TQObject::connect( actions->calcCountA, TQT_SIGNAL( toggled( bool ) ), - view, TQT_SLOT( menuCalc( bool ) ) ); + TQObject::connect( actions->calcCountA, TQ_SIGNAL( toggled( bool ) ), + view, TQ_SLOT( menuCalc( bool ) ) ); actions->calcCountA->setExclusiveGroup( "Calc" ); actions->calcCountA->setToolTip(i18n("Calculate using the countA.")); // -- special action, only for developers -- actions->internalTests = new TDEAction( i18n("Run Internal Tests..."), "internalTests", - TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQT_SLOT( runInternalTests() ), ac, "internalTests" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_T, view, TQ_SLOT( runInternalTests() ), ac, "internalTests" ); actions->inspector = new TDEAction( i18n("Run Inspector..."), "inspector", - TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQT_SLOT( runInspector() ), ac, "inspector" ); + TQt::CTRL+ TQt::SHIFT + TQt::Key_I, view, TQ_SLOT( runInspector() ), ac, "inspector" ); m_propertyEditor = 0; } @@ -1414,15 +1414,15 @@ KPSheetSelectPage::KPSheetSelectPage( TQWidget *parent ) gui->ListViewSelected->setSorting(-1); //connect buttons - connect(gui->ButtonSelectAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(selectAll())); - connect(gui->ButtonSelect,TQT_SIGNAL(clicked()),this,TQT_SLOT(select())); - connect(gui->ButtonRemove,TQT_SIGNAL(clicked()),this,TQT_SLOT(remove())); - connect(gui->ButtonRemoveAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeAll())); + connect(gui->ButtonSelectAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(selectAll())); + connect(gui->ButtonSelect,TQ_SIGNAL(clicked()),this,TQ_SLOT(select())); + connect(gui->ButtonRemove,TQ_SIGNAL(clicked()),this,TQ_SLOT(remove())); + connect(gui->ButtonRemoveAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeAll())); - connect(gui->ButtonMoveTop,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveTop())); - connect(gui->ButtonMoveUp,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveUp())); - connect(gui->ButtonMoveDown,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveDown())); - connect(gui->ButtonMoveBottom,TQT_SIGNAL(clicked()),this,TQT_SLOT(moveBottom())); + connect(gui->ButtonMoveTop,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveTop())); + connect(gui->ButtonMoveUp,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveUp())); + connect(gui->ButtonMoveDown,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveDown())); + connect(gui->ButtonMoveBottom,TQ_SIGNAL(clicked()),this,TQ_SLOT(moveBottom())); } // KPSheetSelectPage::~KPSheetSelectPage() @@ -1750,9 +1750,9 @@ View::View( TQWidget *_parent, const char *_name, d->selection = new Selection( this ); d->choice = new Selection( this ); d->choice->setMultipleSelection(true); - connect(d->selection, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotChangeSelection(const Region&))); - connect(d->choice, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotChangeChoice(const Region&))); - connect(d->choice, TQT_SIGNAL(changed(const Region&)), this, TQT_SLOT(slotScrollChoice(const Region&))); + connect(d->selection, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotChangeSelection(const Region&))); + connect(d->choice, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotChangeChoice(const Region&))); + connect(d->choice, TQ_SIGNAL(changed(const Region&)), this, TQ_SLOT(slotScrollChoice(const Region&))); d->findOptions = 0; d->findLeftColumn = 0; @@ -1797,8 +1797,8 @@ View::View( TQWidget *_parent, const char *_name, // build the DCOP object dcopObject(); - connect( doc()->commandHistory(), TQT_SIGNAL( commandExecuted() ), - this, TQT_SLOT( commandExecuted() ) ); + connect( doc()->commandHistory(), TQ_SIGNAL( commandExecuted() ), + this, TQ_SLOT( commandExecuted() ) ); // GUI Initializations initView(); @@ -1808,33 +1808,33 @@ View::View( TQWidget *_parent, const char *_name, // Handler for moving and resizing embedded parts KoContainerHandler* h = new KoContainerHandler( this, d->canvas ); - connect( h, TQT_SIGNAL( popupMenu( KoChild*, const TQPoint& ) ), this, TQT_SLOT( popupChildMenu( KoChild*, const TQPoint& ) ) ); + connect( h, TQ_SIGNAL( popupMenu( KoChild*, const TQPoint& ) ), this, TQ_SLOT( popupChildMenu( KoChild*, const TQPoint& ) ) ); - connect( this, TQT_SIGNAL( childSelected( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildSelected( KoDocumentChild* ) ) ); - connect( this, TQT_SIGNAL( childUnselected( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childSelected( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildSelected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childUnselected( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); // If a selected part becomes active this is like it is deselected // just before. - connect( this, TQT_SIGNAL( childActivated( KoDocumentChild* ) ), - this, TQT_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); + connect( this, TQ_SIGNAL( childActivated( KoDocumentChild* ) ), + this, TQ_SLOT( slotChildUnselected( KoDocumentChild* ) ) ); - connect( d->canvas, TQT_SIGNAL( objectSelectedChanged() ), - this, TQT_SLOT( objectSelectedChanged() ) ); + connect( d->canvas, TQ_SIGNAL( objectSelectedChanged() ), + this, TQ_SLOT( objectSelectedChanged() ) ); - TQObject::connect( doc()->map(), TQT_SIGNAL( sig_addSheet( Sheet* ) ), TQT_SLOT( slotAddSheet( Sheet* ) ) ); + TQObject::connect( doc()->map(), TQ_SIGNAL( sig_addSheet( Sheet* ) ), TQ_SLOT( slotAddSheet( Sheet* ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_refreshView( ) ), this, TQT_SLOT( slotRefreshView() ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_refreshView( ) ), this, TQ_SLOT( slotRefreshView() ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_refreshLocale() ), this, TQT_SLOT( refreshLocale())); + TQObject::connect( doc(), TQ_SIGNAL( sig_refreshLocale() ), this, TQ_SLOT( refreshLocale())); - TQObject::connect( doc(), TQT_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotAddAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_addAreaName( const TQString & ) ), d->posWidget, TQ_SLOT( slotAddAreaName( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQT_SLOT( slotRemoveAreaName( const TQString & ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( sig_removeAreaName( const TQString & ) ), d->posWidget, TQ_SLOT( slotRemoveAreaName( const TQString & ) ) ); - TQObject::connect( doc(), TQT_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), - this, TQT_SLOT( handleDamages( const TQValueList<Damage*>& ) ) ); + TQObject::connect( doc(), TQ_SIGNAL( damagesFlushed( const TQValueList<Damage*>& ) ), + this, TQ_SLOT( handleDamages( const TQValueList<Damage*>& ) ) ); //KoView::setZoom( doc()->zoomedResolutionY() /* KoView only supports one zoom */ ); // initial value //when kspread is embedded into konqueror apply a zoom=100 @@ -1855,9 +1855,9 @@ View::View( TQWidget *_parent, const char *_name, // This is the last operation for the "View loading" process. // The loading flag will be unset at its end. if ( !doc()->map()->sheetList().isEmpty() ) - TQTimer::singleShot(50, this, TQT_SLOT(initialPosition())); + TQTimer::singleShot(50, this, TQ_SLOT(initialPosition())); - connect (&d->statusBarOpTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(calcStatusBarOp())); + connect (&d->statusBarOpTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(calcStatusBarOp())); } View::~View() @@ -1869,7 +1869,7 @@ View::~View() delete (&*d->transformToolBox); /*if (d->calcLabel) { - disconnect(d->calcLabel,TQT_SIGNAL(pressed( int )),this,TQT_SLOT(statusBarClicked(int))); + disconnect(d->calcLabel,TQ_SIGNAL(pressed( int )),this,TQ_SLOT(statusBarClicked(int))); }*/ @@ -1946,7 +1946,7 @@ void View::initView() d->formulaButton = d->newIconButton( "funct", true, d->toolWidget ); d->formulaBarLayout->addWidget( d->formulaButton ); d->formulaBarLayout->addSpacing( 2 ); - connect( d->formulaButton, TQT_SIGNAL( clicked() ), TQT_SLOT( insertMathExpr() ) ); + connect( d->formulaButton, TQ_SIGNAL( clicked() ), TQ_SLOT( insertMathExpr() ) ); d->cancelButton = d->newIconButton( "cancel", true, d->toolWidget ); d->formulaBarLayout->addWidget( d->cancelButton ); @@ -1975,7 +1975,7 @@ void View::initView() TQWidget::setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( d->canvas ); - connect( this, TQT_SIGNAL( invalidated() ), d->canvas, TQT_SLOT( update() ) ); + connect( this, TQ_SIGNAL( invalidated() ), d->canvas, TQ_SLOT( update() ) ); TQWidget* bottomPart = new TQWidget( this ); d->tabScrollBarLayout = new TQHBoxLayout( bottomPart ); @@ -1989,13 +1989,13 @@ void View::initView() d->horzScrollBar->setLineStep(60); //just random guess based on what feels okay d->horzScrollBar->setPageStep(60); - TQObject::connect( d->tabBar, TQT_SIGNAL( tabChanged( const TQString& ) ), this, TQT_SLOT( changeSheet( const TQString& ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( tabMoved( unsigned, unsigned ) ), - this, TQT_SLOT( moveSheet( unsigned, unsigned ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( contextMenu( const TQPoint& ) ), - this, TQT_SLOT( popupTabBarMenu( const TQPoint& ) ) ); - TQObject::connect( d->tabBar, TQT_SIGNAL( doubleClicked() ), - this, TQT_SLOT( slotRename() ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( tabChanged( const TQString& ) ), this, TQ_SLOT( changeSheet( const TQString& ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( tabMoved( unsigned, unsigned ) ), + this, TQ_SLOT( moveSheet( unsigned, unsigned ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( contextMenu( const TQPoint& ) ), + this, TQ_SLOT( popupTabBarMenu( const TQPoint& ) ) ); + TQObject::connect( d->tabBar, TQ_SIGNAL( doubleClicked() ), + this, TQ_SLOT( slotRename() ) ); d->viewLayout->setColStretch( 1, 10 ); d->viewLayout->setRowStretch( 2, 10 ); @@ -2011,11 +2011,11 @@ void View::initView() d->calcLabel = sb ? new KStatusBarLabel( TQString(), 0, sb ) : 0; addStatusBarItem( d->calcLabel, 0 ); if (d->calcLabel) - connect(d->calcLabel ,TQT_SIGNAL(itemPressed( int )),this,TQT_SLOT(statusBarClicked(int))); + connect(d->calcLabel ,TQ_SIGNAL(itemPressed( int )),this,TQ_SLOT(statusBarClicked(int))); // signal slot - TQObject::connect( d->vertScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollVert(int) ) ); - TQObject::connect( d->horzScrollBar, TQT_SIGNAL( valueChanged(int) ), d->canvas, TQT_SLOT( slotScrollHorz(int) ) ); + TQObject::connect( d->vertScrollBar, TQ_SIGNAL( valueChanged(int) ), d->canvas, TQ_SLOT( slotScrollVert(int) ) ); + TQObject::connect( d->horzScrollBar, TQ_SIGNAL( valueChanged(int) ), d->canvas, TQ_SLOT( slotScrollHorz(int) ) ); } @@ -2297,32 +2297,32 @@ void View::startKSpell() } d->spell.tdespell = new KSpell( this, i18n( "Spell Checking" ), this, - TQT_SLOT( spellCheckerReady() ), + TQ_SLOT( spellCheckerReady() ), doc()->getKSpellConfig() ); d->spell.tdespell->setIgnoreUpperWords( doc()->dontCheckUpperWord() ); d->spell.tdespell->setIgnoreTitleCase( doc()->dontCheckTitleCase() ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellCheckerFinished() ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( misspelling( const TQString &, + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellCheckerFinished() ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int) ), - this, TQT_SLOT( spellCheckerMisspelling( const TQString &, + this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( corrected( const TQString &, + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int) ), - this, TQT_SLOT( spellCheckerCorrected( const TQString &, + this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( done( const TQString & ) ), - this, TQT_SLOT( spellCheckerDone( const TQString & ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( ignoreall (const TQString & ) ), - this, TQT_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( done( const TQString & ) ), + this, TQ_SLOT( spellCheckerDone( const TQString & ) ) ); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( ignoreall (const TQString & ) ), + this, TQ_SLOT( spellCheckerIgnoreAll( const TQString & ) ) ); - TQObject::connect( d->spell.tdespell, TQT_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQT_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); + TQObject::connect( d->spell.tdespell, TQ_SIGNAL( replaceall( const TQString & , const TQString & )), this, TQ_SLOT( spellCheckerReplaceAll( const TQString & , const TQString & ))); } @@ -3319,10 +3319,10 @@ void View::insertSpecialChar() if ( d->specialCharDlg == 0 ) { d->specialCharDlg = new KoCharSelectDia( this, "insert special char", f, c, false ); - connect( d->specialCharDlg, TQT_SIGNAL( insertChar( TQChar, const TQString & ) ), - this, TQT_SLOT( slotSpecialChar( TQChar, const TQString & ) ) ); - connect( d->specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + connect( d->specialCharDlg, TQ_SIGNAL( insertChar( TQChar, const TQString & ) ), + this, TQ_SLOT( slotSpecialChar( TQChar, const TQString & ) ) ); + connect( d->specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); } d->specialCharDlg->show(); } @@ -3331,10 +3331,10 @@ void View::slotSpecialCharDlgClosed() { if ( d->specialCharDlg ) { - disconnect( d->specialCharDlg, TQT_SIGNAL(insertChar(TQChar,const TQString &)), - this, TQT_SLOT(slotSpecialChar(TQChar,const TQString &))); - disconnect( d->specialCharDlg, TQT_SIGNAL( finished() ), - this, TQT_SLOT( slotSpecialCharDlgClosed() ) ); + disconnect( d->specialCharDlg, TQ_SIGNAL(insertChar(TQChar,const TQString &)), + this, TQ_SLOT(slotSpecialChar(TQChar,const TQString &))); + disconnect( d->specialCharDlg, TQ_SIGNAL( finished() ), + this, TQ_SLOT( slotSpecialCharDlgClosed() ) ); d->specialCharDlg->deleteLater(); d->specialCharDlg = 0L; } @@ -3726,31 +3726,31 @@ void View::addSheet( Sheet * _t ) insertSheet( _t ); // Connect some signals - TQObject::connect( _t, TQT_SIGNAL( sig_refreshView() ), TQT_SLOT( slotRefreshView() ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQObject::connect( _t->print(), TQT_SIGNAL( sig_updateView( Sheet* ) ), TQT_SLOT( slotUpdateView( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( Sheet *, const Region& ) ), - TQT_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateView( EmbeddedObject* )), TQT_SLOT( slotUpdateView( EmbeddedObject* ) ) ); - - TQObject::connect( _t, TQT_SIGNAL( sig_updateHBorder( Sheet * ) ), - TQT_SLOT( slotUpdateHBorder( Sheet * ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_updateVBorder( Sheet * ) ), - TQT_SLOT( slotUpdateVBorder( Sheet * ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), - this, TQT_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetHidden( Sheet* ) ), - this, TQT_SLOT( slotSheetHidden( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetShown( Sheet* ) ), - this, TQT_SLOT( slotSheetShown( Sheet* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_SheetRemoved( Sheet* ) ), - this, TQT_SLOT( slotSheetRemoved( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_refreshView() ), TQ_SLOT( slotRefreshView() ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( Sheet* ) ), TQ_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t->print(), TQ_SIGNAL( sig_updateView( Sheet* ) ), TQ_SLOT( slotUpdateView( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( Sheet *, const Region& ) ), + TQ_SLOT( slotUpdateView( Sheet*, const Region& ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateView( EmbeddedObject* )), TQ_SLOT( slotUpdateView( EmbeddedObject* ) ) ); + + TQObject::connect( _t, TQ_SIGNAL( sig_updateHBorder( Sheet * ) ), + TQ_SLOT( slotUpdateHBorder( Sheet * ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateVBorder( Sheet * ) ), + TQ_SLOT( slotUpdateVBorder( Sheet * ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_nameChanged( Sheet*, const TQString& ) ), + this, TQ_SLOT( slotSheetRenamed( Sheet*, const TQString& ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetHidden( Sheet* ) ), + this, TQ_SLOT( slotSheetHidden( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetShown( Sheet* ) ), + this, TQ_SLOT( slotSheetShown( Sheet* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_SheetRemoved( Sheet* ) ), + this, TQ_SLOT( slotSheetRemoved( Sheet* ) ) ); // ########### Why do these signals not send a pointer to the sheet? // This will lead to bugs. - TQObject::connect( _t, TQT_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), - TQT_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQT_SLOT( slotMaxColumn( int ) ) ); - TQObject::connect( _t, TQT_SIGNAL( sig_maxRow( int ) ), d->canvas, TQT_SLOT( slotMaxRow( int ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_updateChildGeometry( EmbeddedKOfficeObject* ) ), + TQ_SLOT( slotUpdateChildGeometry( EmbeddedKOfficeObject* ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_maxColumn( int ) ), d->canvas, TQ_SLOT( slotMaxColumn( int ) ) ); + TQObject::connect( _t, TQ_SIGNAL( sig_maxRow( int ) ), d->canvas, TQ_SLOT( slotMaxRow( int ) ) ); if ( !d->loading ) updateBorderButton(); @@ -4487,10 +4487,10 @@ void View::initFindReplace() { KFind* findObj = d->find ? d->find : d->replace; Q_ASSERT( findObj ); - connect(findObj, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - connect(findObj, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( findNext() ) ); + connect(findObj, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); + connect(findObj, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( findNext() ) ); bool bck = d->findOptions & KFindDialog::FindBackwards; Sheet* currentSheet = d->searchInSheets.currentSheet; @@ -4708,8 +4708,8 @@ void View::replace() d->searchInSheets.currentSheet = activeSheet(); d->searchInSheets.firstSheet = d->searchInSheets.currentSheet; initFindReplace(); - connect( d->replace, TQT_SIGNAL( replace( const TQString &, int, int, int ) ), - this, TQT_SLOT( slotReplace( const TQString &, int, int, int ) ) ); + connect( d->replace, TQ_SIGNAL( replace( const TQString &, int, int, int ) ), + this, TQ_SLOT( slotReplace( const TQString &, int, int, int ) ) ); if ( !doc()->undoLocked() ) { @@ -5600,7 +5600,7 @@ void View::popupChildMenu( KoChild* child, const TQPoint& /*global_pos*/ ) // // d->popupChild = new TQPopupMenu( this ); // -// d->popupChild->insertItem( i18n("Delete Embedded Document"), this, TQT_SLOT( slotPopupDeleteChild() ) ); +// d->popupChild->insertItem( i18n("Delete Embedded Document"), this, TQ_SLOT( slotPopupDeleteChild() ) ); // // d->popupChild->popup( global_pos ); @@ -5660,7 +5660,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } d->actions->resizeColumn->plug( d->popupColumn ); - d->popupColumn->insertItem( i18n("Adjust Column"), this, TQT_SLOT(slotPopupAdjustColumn() ) ); + d->popupColumn->insertItem( i18n("Adjust Column"), this, TQ_SLOT(slotPopupAdjustColumn() ) ); d->popupColumn->insertSeparator(); d->actions->insertColumn->plug( d->popupColumn ); d->actions->deleteColumn->plug( d->popupColumn ); @@ -5709,7 +5709,7 @@ void View::popupColumnMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupColumn, TQT_SIGNAL(activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupColumn, TQ_SIGNAL(activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); d->popupColumn->popup( _point ); } @@ -5756,7 +5756,7 @@ void View::popupRowMenu( const TQPoint & _point ) } d->actions->resizeRow->plug( d->popupRow ); - d->popupRow->insertItem( i18n("Adjust Row"), this, TQT_SLOT( slotPopupAdjustRow() ) ); + d->popupRow->insertItem( i18n("Adjust Row"), this, TQ_SLOT( slotPopupAdjustRow() ) ); d->popupRow->insertSeparator(); d->actions->insertRow->plug( d->popupRow ); d->actions->deleteRow->plug( d->popupRow ); @@ -5804,7 +5804,7 @@ void View::popupRowMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupRow, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupRow, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); d->popupRow->popup( _point ); } @@ -5896,8 +5896,8 @@ void View::slotListChoosePopupMenu( ) } d->popupListChoose->popup( p2 ); - TQObject::connect( d->popupListChoose, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotItemSelected( int ) ) ); + TQObject::connect( d->popupListChoose, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotItemSelected( int ) ) ); } @@ -5995,7 +5995,7 @@ void View::openPopupMenu( const TQPoint & _point ) if (activeSheet()->testListChoose(selectionInfo())) { d->popupMenu->insertSeparator(); - d->popupMenu->insertItem( i18n("Selection List..."), this, TQT_SLOT( slotListChoosePopupMenu() ) ); + d->popupMenu->insertItem( i18n("Selection List..."), this, TQ_SLOT( slotListChoosePopupMenu() ) ); } } @@ -6032,7 +6032,7 @@ void View::openPopupMenu( const TQPoint & _point ) } } - TQObject::connect( d->popupMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivateTool( int ) ) ); + TQObject::connect( d->popupMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivateTool( int ) ) ); } } @@ -6366,9 +6366,9 @@ void View::extraProperties() d->m_propertyEditor = new PropertyEditor( this, "KPrPropertyEditor", d->activeSheet, doc() ); d->m_propertyEditor->setCaption( i18n( "Properties" ) ); - connect( d->m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + connect( d->m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); d->m_propertyEditor->exec(); - disconnect( d->m_propertyEditor, TQT_SIGNAL( propertiesOk() ), this, TQT_SLOT( propertiesOk() ) ); + disconnect( d->m_propertyEditor, TQ_SIGNAL( propertiesOk() ), this, TQ_SLOT( propertiesOk() ) ); delete d->m_propertyEditor; d->m_propertyEditor = 0; @@ -7315,7 +7315,7 @@ void View::guiActivateEvent( KParts::GUIActivateEvent *ev ) { /*if (d->calcLabel) { - disconnect(d->calcLabel,TQT_SIGNAL(pressed( int )),this,TQT_SLOT(statusBarClicked(int))); + disconnect(d->calcLabel,TQ_SIGNAL(pressed( int )),this,TQ_SLOT(statusBarClicked(int))); }*/ } } diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp index 202da13e..d7f4432f 100644 --- a/kspread/plugins/calculator/configdlg.cpp +++ b/kspread/plugins/calculator/configdlg.cpp @@ -60,8 +60,8 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid1->addWidget(button1,0,1); button1->setColor( defst->forecolor ); - connect(button1 , TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( set_fore_color( const TQColor & ) ) ); + connect(button1 , TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( set_fore_color( const TQColor & ) ) ); label2 = new TQLabel(box); grid1->addWidget(label2,1,0); @@ -71,11 +71,11 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid1->addWidget(button2,1,1); button2->setColor( defst->backcolor ); - connect(button2 , TQT_SIGNAL( changed( const TQColor & ) ), - this, TQT_SLOT( set_background_color( const TQColor & ) ) ); + connect(button2 , TQ_SIGNAL( changed( const TQColor & ) ), + this, TQ_SLOT( set_background_color( const TQColor & ) ) ); - // connect(button2,TQT_SIGNAL(clicked()),this,TQT_SLOT(set_background_color())); + // connect(button2,TQ_SIGNAL(clicked()),this,TQ_SLOT(set_background_color())); label5 = new TQLabel(box); @@ -155,10 +155,10 @@ ConfigDlg::ConfigDlg(TQWidget *parent, const char *name, DefStruct *defstruct) grid2->addWidget(button3,0,1); button3->setText(i18n("Help")); - connect(button3,TQT_SIGNAL(clicked()),this,TQT_SLOT(help())); + connect(button3,TQ_SIGNAL(clicked()),this,TQ_SLOT(help())); lay1->addWidget(box); - connect(parent,TQT_SIGNAL(applyButtonPressed()),TQT_SLOT(okButton())); + connect(parent,TQ_SIGNAL(applyButtonPressed()),TQ_SLOT(okButton())); } void ConfigDlg::help() diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp index 55c16bf6..92f665e7 100644 --- a/kspread/plugins/calculator/kcalc.cpp +++ b/kspread/plugins/calculator/kcalc.cpp @@ -53,8 +53,8 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char selection_timer = new TQTimer; status_timer = new TQTimer; - connect(status_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(clear_status_label())); - connect(selection_timer,TQT_SIGNAL(timeout()),this,TQT_SLOT(selection_timed_out())); + connect(status_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(clear_status_label())); + connect(selection_timer,TQ_SIGNAL(timeout()),this,TQ_SLOT(selection_timed_out())); readSettings(); @@ -63,7 +63,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char // Set the window caption/title - // connect(kapp,TQT_SIGNAL(tdedisplayPaletteChanged()),this,TQT_SLOT(set_colors())); + // connect(kapp,TQ_SIGNAL(tdedisplayPaletteChanged()),this,TQ_SLOT(set_colors())); // setCaption( kapp->caption() ); // create help button @@ -75,7 +75,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char pb->setFont( TQFont("times",12,TQFont::Bold,FALSE) ); TQToolTip::add( pb, i18n("KCalc Setup/Help") ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(configclicked()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(configclicked()) ); // Create the display calc_display = new DLabel( this, "display" ); @@ -84,7 +84,7 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char calc_display->setFocus(); calc_display->setFocusPolicy( TQWidget::StrongFocus ); - connect(calc_display,TQT_SIGNAL(clicked()),this,TQT_SLOT(display_selected())); + connect(calc_display,TQ_SIGNAL(clicked()),this,TQ_SLOT(display_selected())); statusINVLabel = new TQLabel( this, "INV" ); TQ_CHECK_PTR( statusINVLabel ); @@ -113,19 +113,19 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char anglebutton[0]->setText( "&Deg" ) ; anglebutton[0]->setChecked( TRUE); accel->connectItem( accel->insertItem(Key_D + ALT), this , - TQT_SLOT(Deg_Selected()) ); + TQ_SLOT(Deg_Selected()) ); anglebutton[1] = new TQRadioButton( angle_group ); anglebutton[1]->setText( "&Rad" ); accel->connectItem( accel->insertItem(Key_R + ALT), this , - TQT_SLOT(Rad_Selected()) ); + TQ_SLOT(Rad_Selected()) ); anglebutton[2] = new TQRadioButton( angle_group ); anglebutton[2]->setText( "&Gra" ); accel->connectItem( accel->insertItem(Key_G + ALT), this , - TQT_SLOT(Gra_Selected()) ); + TQ_SLOT(Gra_Selected()) ); - connect( angle_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(angle_selected(int)) ); + connect( angle_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(angle_selected(int)) ); ////////////////////////////////////////////////////////////////////// @@ -141,25 +141,25 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char basebutton[0] = new TQRadioButton( base_group ); basebutton[0]->setText( "&Hex" ); accel->connectItem( accel->insertItem(Key_H + ALT), this , - TQT_SLOT(Hex_Selected()) ); + TQ_SLOT(Hex_Selected()) ); basebutton[1] = new TQRadioButton( base_group ); basebutton[1]->setText( "D&ec" ); basebutton[1]->setChecked(TRUE); accel->connectItem( accel->insertItem(Key_E + ALT), this , - TQT_SLOT(Dec_Selected()) ); + TQ_SLOT(Dec_Selected()) ); basebutton[2] = new TQRadioButton( base_group ); basebutton[2]->setText( "&Oct" ); accel->connectItem( accel->insertItem(Key_O + ALT), this , - TQT_SLOT(Oct_Selected()) ); + TQ_SLOT(Oct_Selected()) ); basebutton[3] = new TQRadioButton( base_group); basebutton[3]->setText( "&Bin" ); accel->connectItem( accel->insertItem(Key_B + ALT), this , - TQT_SLOT(Bin_Selected()) ); + TQ_SLOT(Bin_Selected()) ); - connect( base_group, TQT_SIGNAL(clicked(int)), TQT_SLOT(base_selected(int)) ); + connect( base_group, TQ_SIGNAL(clicked(int)), TQ_SLOT(base_selected(int)) ); //////////////////////////////////////////////////////////////////////// // @@ -172,203 +172,203 @@ TQtCalculator :: TQtCalculator( Calculator *_corba, TQWidget *parent, const char mLargePage = new TQWidget(this); pbhyp = new TQPushButton("Hyp", mSmallPage, "hypbutton" ); - connect( pbhyp, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbhyptoggled(bool))); + connect( pbhyp, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbhyptoggled(bool))); pbhyp->setToggleButton(TRUE); pbinv = new TQPushButton( "Inv", mSmallPage, "InverseButton" ); - connect( pbinv, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbinvtoggled(bool))); + connect( pbinv, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbinvtoggled(bool))); pbinv->setToggleButton(TRUE); pbA = new TQPushButton("A",mSmallPage, "Abutton" ); - connect( pbA, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbAtoggled(bool))); + connect( pbA, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbAtoggled(bool))); pbA->setToggleButton(TRUE); pbSin = new TQPushButton("Sin",mSmallPage, "Sinbutton" ); - connect( pbSin, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbSintoggled(bool))); + connect( pbSin, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbSintoggled(bool))); pbSin->setToggleButton(TRUE); pbplusminus = new TQPushButton( "+/-", mSmallPage, "plusminusbutton" ); - connect( pbplusminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbplusminustoggled(bool))); + connect( pbplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplusminustoggled(bool))); pbplusminus->setToggleButton(TRUE); pbplusminus->setFont(buttonfont); pbB = new TQPushButton("B", mSmallPage, "Bbutton" ); - connect( pbB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbBtoggled(bool))); + connect( pbB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbBtoggled(bool))); pbB->setToggleButton(TRUE); pbCos = new TQPushButton("Cos",mSmallPage, "Cosbutton" ); pbCos->setText( "Cos" ); - connect( pbCos, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCostoggled(bool))); + connect( pbCos, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCostoggled(bool))); pbCos->setToggleButton(TRUE); pbreci = new TQPushButton("1/x",mSmallPage, "recibutton" ); - connect( pbreci, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbrecitoggled(bool))); + connect( pbreci, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbrecitoggled(bool))); pbreci->setToggleButton(TRUE); pbC = new TQPushButton( "C", mSmallPage, "Cbutton" ); - connect( pbC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCtoggled(bool))); + connect( pbC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCtoggled(bool))); pbC->setToggleButton(TRUE); pbTan = new TQPushButton("Tan" ,mSmallPage, "Tanbutton" ); - connect( pbTan, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbTantoggled(bool))); + connect( pbTan, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbTantoggled(bool))); pbTan->setToggleButton(TRUE); pbfactorial = new TQPushButton("x!",mSmallPage, "factorialbutton" ); - connect( pbfactorial, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbfactorialtoggled(bool))); + connect( pbfactorial, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbfactorialtoggled(bool))); pbfactorial->setToggleButton(TRUE); pbD = new TQPushButton("D",mSmallPage, "Dbutton" ); - connect( pbD, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbDtoggled(bool))); + connect( pbD, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbDtoggled(bool))); pbD->setToggleButton(TRUE); pblog = new TQPushButton("Log",mSmallPage, "logbutton" ); - connect( pblog, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pblogtoggled(bool))); + connect( pblog, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblogtoggled(bool))); pblog->setToggleButton(TRUE); pbsquare = new TQPushButton( "x^2", mSmallPage, "squarebutton" ); - connect( pbsquare, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbsquaretoggled(bool))); + connect( pbsquare, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbsquaretoggled(bool))); pbsquare->setToggleButton(TRUE); pbE = new TQPushButton("E",mSmallPage, "Ebutton" ); - connect( pbE, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbEtoggled(bool))); + connect( pbE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbEtoggled(bool))); pbE->setToggleButton(TRUE); pbln = new TQPushButton( "Ln", mSmallPage, "lnbutton" ); - connect( pbln, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pblntoggled(bool))); + connect( pbln, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pblntoggled(bool))); pbln->setToggleButton(TRUE); pbpower = new TQPushButton("x^y",mSmallPage, "powerbutton" ); - connect( pbpower, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbpowertoggled(bool))); + connect( pbpower, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpowertoggled(bool))); pbpower->setToggleButton(TRUE); pbF = new TQPushButton("F",mSmallPage, "Fbutton" ); - connect( pbF, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbFtoggled(bool))); + connect( pbF, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbFtoggled(bool))); pbF->setToggleButton(TRUE); pbEE = new TQPushButton("EE",mLargePage, "EEbutton" ); pbEE->setToggleButton(TRUE); - connect( pbEE, TQT_SIGNAL(toggled(bool)), TQT_SLOT(EEtoggled(bool))); + connect( pbEE, TQ_SIGNAL(toggled(bool)), TQ_SLOT(EEtoggled(bool))); pbMR = new TQPushButton("MR",mLargePage, "MRbutton" ); - connect( pbMR, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMRtoggled(bool))); + connect( pbMR, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMRtoggled(bool))); pbMR->setToggleButton(TRUE); pbMR->setFont(buttonfont); pbMplusminus = new TQPushButton("M+-",mLargePage, "Mplusminusbutton" ); - connect( pbMplusminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMplusminustoggled(bool))); + connect( pbMplusminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMplusminustoggled(bool))); pbMplusminus->setToggleButton(TRUE); pbMC = new TQPushButton("MC",mLargePage, "MCbutton" ); - connect( pbMC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbMCtoggled(bool))); + connect( pbMC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbMCtoggled(bool))); pbMC->setToggleButton(TRUE); pbClear = new TQPushButton("C",mLargePage, "Clearbutton" ); - connect( pbClear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbCleartoggled(bool))); + connect( pbClear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbCleartoggled(bool))); pbClear->setToggleButton(TRUE); pbAC = new TQPushButton("AC", mLargePage, "ACbutton" ); - connect( pbAC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbACtoggled(bool))); + connect( pbAC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbACtoggled(bool))); pbAC->setToggleButton(TRUE); pb7 = new TQPushButton("7",mLargePage, "7button" ); - connect( pb7, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb7toggled(bool))); + connect( pb7, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb7toggled(bool))); pb7->setToggleButton(TRUE); pb8 = new TQPushButton("8",mLargePage, "8button" ); - connect( pb8, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb8toggled(bool))); + connect( pb8, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb8toggled(bool))); pb8->setToggleButton(TRUE); pb9 = new TQPushButton("9",mLargePage,"9button" ); - connect( pb9, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb9toggled(bool))); + connect( pb9, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb9toggled(bool))); pb9->setToggleButton(TRUE); pbparenopen = new TQPushButton("(",mLargePage, "parenopenbutton" ); - connect( pbparenopen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbparenopentoggled(bool))); + connect( pbparenopen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenopentoggled(bool))); pbparenopen->setToggleButton(TRUE); pbparenclose = new TQPushButton(")",mLargePage, "parenclosebutton" ); - connect( pbparenclose, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbparenclosetoggled(bool))); + connect( pbparenclose, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbparenclosetoggled(bool))); pbparenclose->setToggleButton(TRUE); pband = new TQPushButton("And",mLargePage, "andbutton" ); - connect( pband, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbandtoggled(bool))); + connect( pband, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbandtoggled(bool))); pband->setToggleButton(TRUE); pband->setFont(buttonfont); pb4 = new TQPushButton("4",mLargePage, "4button" ); - connect( pb4, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb4toggled(bool))); + connect( pb4, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb4toggled(bool))); pb4->setToggleButton(TRUE); pb5 = new TQPushButton("5",mLargePage, "5button" ); - connect( pb5, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb5toggled(bool))); + connect( pb5, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb5toggled(bool))); pb5->setToggleButton(TRUE); pb6 = new TQPushButton("6",mLargePage, "6button" ); - connect( pb6, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb6toggled(bool))); + connect( pb6, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb6toggled(bool))); pb6->setToggleButton(TRUE); pbX = new TQPushButton("X",mLargePage, "Multiplybutton" ); - connect( pbX, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbXtoggled(bool))); + connect( pbX, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbXtoggled(bool))); pbX->setToggleButton(TRUE); pbdivision = new TQPushButton("/",mLargePage, "divisionbutton" ); - connect( pbdivision, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbdivisiontoggled(bool))); + connect( pbdivision, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbdivisiontoggled(bool))); pbdivision->setToggleButton(TRUE); pbor = new TQPushButton("Or",mLargePage, "orbutton" ); - connect( pbor, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbortoggled(bool))); + connect( pbor, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbortoggled(bool))); pbor->setToggleButton(TRUE); pb1 = new TQPushButton("1",mLargePage, "1button" ); - connect( pb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb1toggled(bool))); + connect( pb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb1toggled(bool))); pb1->setToggleButton(TRUE); pb2 = new TQPushButton("2",mLargePage, "2button" ); - connect( pb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb2toggled(bool))); + connect( pb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb2toggled(bool))); pb2->setToggleButton(TRUE); pb3 = new TQPushButton("3",mLargePage, "3button" ); - connect( pb3, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb3toggled(bool))); + connect( pb3, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb3toggled(bool))); pb3->setToggleButton(TRUE); pbplus = new TQPushButton("+",mLargePage, "plusbutton" ); - connect( pbplus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbplustoggled(bool))); + connect( pbplus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbplustoggled(bool))); pbplus->setToggleButton(TRUE); pbminus = new TQPushButton("-",mLargePage, "minusbutton" ); - connect( pbminus, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbminustoggled(bool))); + connect( pbminus, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbminustoggled(bool))); pbminus->setToggleButton(TRUE); pbshift = new TQPushButton("Lsh",mLargePage, "shiftbutton" ); - connect( pbshift, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbshifttoggled(bool))); + connect( pbshift, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbshifttoggled(bool))); pbshift->setToggleButton(TRUE); pbperiod = new TQPushButton(".",mLargePage, "periodbutton" ); - connect( pbperiod, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbperiodtoggled(bool))); + connect( pbperiod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbperiodtoggled(bool))); pbperiod->setToggleButton(TRUE); pb0 = new TQPushButton("0",mLargePage, "0button" ); - connect( pb0, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pb0toggled(bool))); + connect( pb0, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pb0toggled(bool))); pb0->setToggleButton(TRUE); pbequal = new TQPushButton("=",mLargePage, "equalbutton" ); - connect( pbequal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbequaltoggled(bool))); + connect( pbequal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbequaltoggled(bool))); pbequal->setToggleButton(TRUE); pbpercent = new TQPushButton("%",mLargePage, "percentbutton" ); - connect( pbpercent, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbpercenttoggled(bool))); + connect( pbpercent, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbpercenttoggled(bool))); pbpercent->setToggleButton(TRUE); pbnegate = new TQPushButton("Cmp",mLargePage, "OneComplementbutton" ); - connect( pbnegate, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbnegatetoggled(bool))); + connect( pbnegate, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbnegatetoggled(bool))); pbnegate->setToggleButton(TRUE); pbmod = new TQPushButton("Mod",mLargePage, "modbutton" ); - connect( pbmod, TQT_SIGNAL(toggled(bool)), TQT_SLOT(pbmodtoggled(bool))); + connect( pbmod, TQ_SIGNAL(toggled(bool)), TQ_SLOT(pbmodtoggled(bool))); pbmod->setToggleButton(TRUE); TQGridLayout *smallBtnLayout = new TQGridLayout(mSmallPage, 6, 3, 0, diff --git a/kspread/plugins/calculator/main.cpp b/kspread/plugins/calculator/main.cpp index 31e8ea78..b791f36a 100644 --- a/kspread/plugins/calculator/main.cpp +++ b/kspread/plugins/calculator/main.cpp @@ -87,7 +87,7 @@ Calculator::Calculator( View* parent, const char* name ) parent->installEventFilter( this ); (void)new TDEAction( i18n("Calculator"), SmallIcon("kcalc", CalcFactory::global()), - 0, this, TQT_SLOT( showCalculator() ), actionCollection(), "kspreadcalc"); + 0, this, TQ_SLOT( showCalculator() ), actionCollection(), "kspreadcalc"); } void Calculator::showCalculator() diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp index 0311c913..5b8607d9 100644 --- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp +++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp @@ -48,11 +48,11 @@ InsertCalendarDialog::InsertCalendarDialog(TQWidget* parent, const char* name) this->m_startDateWidget->setDate(first_day_in_month); this->m_endDateWidget->setDate(last_day_in_month); - connect(this->m_selectStartDateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showStartDatePicker())); - connect(this->m_selectEndDateButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showEndDatePicker())); + connect(this->m_selectStartDateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showStartDatePicker())); + connect(this->m_selectEndDateButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showEndDatePicker())); - connect(this->m_insertButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); - connect(this->m_cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(this->m_insertButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); + connect(this->m_cancelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); } InsertCalendarDialog::~InsertCalendarDialog() @@ -73,7 +73,7 @@ bool InsertCalendarDialog::buildDatePickerFrame() if (!m_datePicker) return false; - connect(m_datePicker,TQT_SIGNAL(destroyed()),this,TQT_SLOT(datePickerDeleted())); + connect(m_datePicker,TQ_SIGNAL(destroyed()),this,TQ_SLOT(datePickerDeleted())); m_datePicker->setCloseButton(true); m_datePicker->move(this->x()+this->width(),this->y()); @@ -109,8 +109,8 @@ void InsertCalendarDialog::showStartDatePicker() { if (buildDatePickerFrame()) { - connect(m_datePicker,TQT_SIGNAL(dateSelected(TQDate)),this,TQT_SLOT(setStartDate(TQDate))); - connect(m_datePicker,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(setStartDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateSelected(TQDate)),this,TQ_SLOT(setStartDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(setStartDate(TQDate))); m_datePicker->setDate(startDate()); } } @@ -119,8 +119,8 @@ void InsertCalendarDialog::showEndDatePicker() { if (buildDatePickerFrame()) { - connect(m_datePicker,TQT_SIGNAL(dateSelected(TQDate)),this,TQT_SLOT(setEndDate(TQDate))); - connect(m_datePicker,TQT_SIGNAL(dateEntered(TQDate)),this,TQT_SLOT(setEndDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateSelected(TQDate)),this,TQ_SLOT(setEndDate(TQDate))); + connect(m_datePicker,TQ_SIGNAL(dateEntered(TQDate)),this,TQ_SLOT(setEndDate(TQDate))); m_datePicker->setDate(endDate()); } } diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp index e2f9d954..a38bd135 100644 --- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp +++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp @@ -74,7 +74,7 @@ PluginInsertCalendar::PluginInsertCalendar( TQObject *parent, const char *name, this->m_dialog = NULL; (void)new TDEAction( i18n("Insert Calendar..."), TDEShortcut::null(), - this, TQT_SLOT( slotShowDialog() ), actionCollection(), "kspreadinsertcalendar"); + this, TQ_SLOT( slotShowDialog() ), actionCollection(), "kspreadinsertcalendar"); } PluginInsertCalendar::~PluginInsertCalendar() @@ -106,8 +106,8 @@ void PluginInsertCalendar::slotShowDialog() Q_ASSERT(m_dialog); - connect(m_dialog,TQT_SIGNAL(insertCalendar(const TQDate&, const TQDate&)), - this,TQT_SLOT(slotInsertCalendar(const TQDate&, const TQDate&))); + connect(m_dialog,TQ_SIGNAL(insertCalendar(const TQDate&, const TQDate&)), + this,TQ_SLOT(slotInsertCalendar(const TQDate&, const TQDate&))); } //@todo if anyone knows a better way to get a background window to foreground, please change this... diff --git a/kspread/plugins/scripting/scripting.cpp b/kspread/plugins/scripting/scripting.cpp index 4bc3f1a6..2286ebdf 100644 --- a/kspread/plugins/scripting/scripting.cpp +++ b/kspread/plugins/scripting/scripting.cpp @@ -58,13 +58,13 @@ Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &) setXMLFile(locate("data","kspread/kpartplugins/scripting.rc"), true); - new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); - new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Execute Script File..."), 0, 0, m_scriptguiclient, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Script Manager..."), 0, 0, m_scriptguiclient, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); TDEAction* scriptmenuaction = m_scriptguiclient->action("installedscripts"); actionCollection()->insert(scriptmenuaction); - connect(m_scriptguiclient, TQT_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQT_SLOT(executionFinished(const Kross::Api::ScriptAction*))); + connect(m_scriptguiclient, TQ_SIGNAL(executionFinished( const Kross::Api::ScriptAction* )), this, TQ_SLOT(executionFinished(const Kross::Api::ScriptAction*))); Kross::Api::Manager::scriptManager()->addTQObject(m_view->doc(), "KSpreadDocument"); Kross::Api::Manager::scriptManager()->addTQObject(m_view, "KSpreadView"); diff --git a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py index a72c5f6c..70f0918f 100755 --- a/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py +++ b/kspread/plugins/scripting/scripts/exporthtml/ExportHtml.py @@ -81,7 +81,7 @@ class Dialog(tqt.TQDialog): filelabel = tqt.TQLabel("File:",filebox) self.fileedit = tqt.TQLineEdit(self.getDefaultFile(),filebox) btn = tqt.TQPushButton("...",filebox) - tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"),self.browseClicked) + tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"),self.browseClicked) filelabel.setBuddy(self.fileedit) filebox.setStretchFactor(self.fileedit,1) @@ -90,10 +90,10 @@ class Dialog(tqt.TQDialog): okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Export") okbtn.setDefault(True) - tqt.TQObject.connect(okbtn,tqt.SIGNAL("clicked()"),self.startExport) + tqt.TQObject.connect(okbtn,tqt.TQ_SIGNAL("clicked()"),self.startExport) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn,tqt.SIGNAL("clicked()"),self.close) + tqt.TQObject.connect(cancelbtn,tqt.TQ_SIGNAL("clicked()"),self.close) box.setMinimumWidth(480) diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index 22959809..795c35ea 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -63,7 +63,7 @@ class FileWidget(Widget): self.edit = tqt.TQLineEdit(self) self.setStretchFactor(self.edit,1) btn = tqt.TQPushButton("...",self) - tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"), self.btnClicked) + tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"), self.btnClicked) def btnClicked(self): from TQt import tqt text = str( self.edit.text() ) @@ -607,7 +607,7 @@ class Samples: ' tqt.TQDialog.__init__(self, parent, "MyDialog", 1, tqt.TQt.WDestructiveClose)', ' self.setCaption("My Dialog")', ' btn = tqt.TQPushButton("Click me",self)', - ' tqt.TQObject.connect(btn, tqt.SIGNAL("clicked()"), self.buttonClicked)', + ' tqt.TQObject.connect(btn, tqt.TQ_SIGNAL("clicked()"), self.buttonClicked)', ' def buttonClicked(self):', ' from TQt import tqt', ' tqt.TQMessageBox.information(self, "The Caption", "This is the message string.")', @@ -800,10 +800,10 @@ class SampleDialog(tqt.TQDialog): btnbox.setSpacing(6) okbtn = tqt.TQPushButton(btnbox) okbtn.setText("Ok") - tqt.TQObject.connect(okbtn, tqt.SIGNAL("clicked()"), self.okClicked) + tqt.TQObject.connect(okbtn, tqt.TQ_SIGNAL("clicked()"), self.okClicked) cancelbtn = tqt.TQPushButton(btnbox) cancelbtn.setText("Cancel") - tqt.TQObject.connect(cancelbtn, tqt.SIGNAL("clicked()"), self.close) + tqt.TQObject.connect(cancelbtn, tqt.TQ_SIGNAL("clicked()"), self.close) self.setCaption(self.samplechild.name) box.setMinimumSize(tqt.TQSize(500,340)) @@ -851,7 +851,7 @@ class MainDialog(tqt.TQDialog): self.scripttext = tqt.TQMultiLineEdit(splitter) self.scripttext.setWordWrap( tqt.TQTextEdit.NoWrap ) self.scripttext.setTextFormat( tqt.TQt.PlainText ) - tqt.TQObject.connect(self.scripttext, tqt.SIGNAL("cursorPositionChanged(int,int)"),self.cursorPositionChanged) + tqt.TQObject.connect(self.scripttext, tqt.TQ_SIGNAL("cursorPositionChanged(int,int)"),self.cursorPositionChanged) self.console = tqt.TQTextBrowser(splitter) splitter.setResizeMode(self.console, tqt.TQSplitter.KeepSize) @@ -869,71 +869,71 @@ class MainDialog(tqt.TQDialog): menu.insertItem("&File", filemenu) newaction = tqt.TQAction("New", tqt.TQKeySequence("CTRL+N"), self) - tqt.TQObject.connect(newaction, tqt.SIGNAL("activated()"), self.newFile) + tqt.TQObject.connect(newaction, tqt.TQ_SIGNAL("activated()"), self.newFile) newaction.addTo(filemenu) openaction = tqt.TQAction("Open...", tqt.TQKeySequence("CTRL+O"), self) - tqt.TQObject.connect(openaction, tqt.SIGNAL("activated()"), self.openFileAs) + tqt.TQObject.connect(openaction, tqt.TQ_SIGNAL("activated()"), self.openFileAs) openaction.addTo(filemenu) saveaction = tqt.TQAction("Save", tqt.TQKeySequence("CTRL+S"), self) - tqt.TQObject.connect(saveaction, tqt.SIGNAL("activated()"), self.saveFile) + tqt.TQObject.connect(saveaction, tqt.TQ_SIGNAL("activated()"), self.saveFile) saveaction.addTo(filemenu) saveasaction = tqt.TQAction("Save as...", tqt.TQKeySequence("CTRL+A"), self) - tqt.TQObject.connect(saveasaction, tqt.SIGNAL("activated()"), self.saveFileAs) + tqt.TQObject.connect(saveasaction, tqt.TQ_SIGNAL("activated()"), self.saveFileAs) saveasaction.addTo(filemenu) filemenu.insertSeparator() quitaction = tqt.TQAction("Quit", tqt.TQKeySequence("CTRL+Q"), self) - tqt.TQObject.connect(quitaction, tqt.SIGNAL("activated()"), self.close) + tqt.TQObject.connect(quitaction, tqt.TQ_SIGNAL("activated()"), self.close) quitaction.addTo(filemenu) editmenu = tqt.TQPopupMenu(menu) menu.insertItem("&Edit", editmenu) undoaction = tqt.TQAction("Undo", tqt.TQKeySequence("CTRL+Z"), self) - tqt.TQObject.connect(undoaction, tqt.SIGNAL("activated()"), self.scripttext.undo) + tqt.TQObject.connect(undoaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.undo) undoaction.addTo(editmenu) redoaction = tqt.TQAction("Redo", tqt.TQKeySequence("CTRL+Shift+Z"), self) - tqt.TQObject.connect(redoaction, tqt.SIGNAL("activated()"), self.scripttext.redo) + tqt.TQObject.connect(redoaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.redo) redoaction.addTo(editmenu) editmenu.insertSeparator() cutaction = tqt.TQAction("Cut", tqt.TQKeySequence("CTRL+X"), self) - tqt.TQObject.connect(cutaction, tqt.SIGNAL("activated()"), self.scripttext.cut) + tqt.TQObject.connect(cutaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.cut) cutaction.addTo(editmenu) copyaction = tqt.TQAction("Copy", tqt.TQKeySequence("CTRL+C"), self) - tqt.TQObject.connect(copyaction, tqt.SIGNAL("activated()"), self.scripttext.copy) + tqt.TQObject.connect(copyaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.copy) copyaction.addTo(editmenu) pasteaction = tqt.TQAction("Paste", tqt.TQKeySequence("CTRL+V"), self) - tqt.TQObject.connect(pasteaction, tqt.SIGNAL("activated()"), self.scripttext.paste) + tqt.TQObject.connect(pasteaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.paste) pasteaction.addTo(editmenu) clearaction = tqt.TQAction("Clear", tqt.TQKeySequence("CTRL+Shift+X"), self) - tqt.TQObject.connect(clearaction, tqt.SIGNAL("activated()"), self.scripttext.clear) + tqt.TQObject.connect(clearaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.clear) clearaction.addTo(editmenu) editmenu.insertSeparator() selallaction = tqt.TQAction("Select All", 0, self) - tqt.TQObject.connect(selallaction, tqt.SIGNAL("activated()"), self.scripttext.selectAll) + tqt.TQObject.connect(selallaction, tqt.TQ_SIGNAL("activated()"), self.scripttext.selectAll) selallaction.addTo(editmenu) scriptmenu = tqt.TQPopupMenu(menu) menu.insertItem("&Script", scriptmenu) compileaction = tqt.TQAction("Compile", tqt.TQKeySequence("F9"), self) - tqt.TQObject.connect(compileaction, tqt.SIGNAL("activated()"), self.compileScript) + tqt.TQObject.connect(compileaction, tqt.TQ_SIGNAL("activated()"), self.compileScript) compileaction.addTo(scriptmenu) executeaction = tqt.TQAction("Execute", tqt.TQKeySequence("F10"), self) - tqt.TQObject.connect(executeaction, tqt.SIGNAL("activated()"), self.executeScript) + tqt.TQObject.connect(executeaction, tqt.TQ_SIGNAL("activated()"), self.executeScript) executeaction.addTo(scriptmenu) self.samplemenu = tqt.TQPopupMenu(menu) @@ -944,7 +944,7 @@ class MainDialog(tqt.TQDialog): if samplename.startswith("_"): continue itemid += 1 menu = tqt.TQPopupMenu(self.samplemenu) - tqt.TQObject.connect(menu, tqt.SIGNAL("activated(int)"), self.sampleActivated) + tqt.TQObject.connect(menu, tqt.TQ_SIGNAL("activated(int)"), self.sampleActivated) self.samplemenu.insertItem(samplename, menu, -1, self.samplemenu.count() - 1) attr = getattr(Samples,samplename) for a in dir(attr): diff --git a/kspread/tests/testrunner.cpp b/kspread/tests/testrunner.cpp index d16dc166..98435304 100644 --- a/kspread/tests/testrunner.cpp +++ b/kspread/tests/testrunner.cpp @@ -77,7 +77,7 @@ TestRunner::TestRunner(): layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 ); d->logView->setTextFormat( TQt::LogText ); - TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) ); + TQObject::connect( d->runButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( runTest() ) ); // add all tests here !! addTester( new ValueTester() ); |