diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:30:32 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 12:36:03 +0900 |
| commit | c0332621bc998c9786f4841e86a62b7711fe4abf (patch) | |
| tree | 38b3ab6688de7a9396a1c5993a8ec265f5f33b64 /lib | |
| parent | 6c81ff8d61ec679e735d3fbd875583b12f0ef0a5 (diff) | |
| download | koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.tar.gz koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'lib')
114 files changed, 948 insertions, 948 deletions
diff --git a/lib/kformula/MatrixDialog.cpp b/lib/kformula/MatrixDialog.cpp index feac37ce..0f8e22b6 100644 --- a/lib/kformula/MatrixDialog.cpp +++ b/lib/kformula/MatrixDialog.cpp @@ -52,12 +52,12 @@ MatrixDialog::MatrixDialog( TQWidget *parent, int _width, int _height ) height = new TQSpinBox(1, MAX_SIZE, 1, page); grid->addWidget(height, 1, 0); height->setValue(h); - connect(height, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setHeight(int))); + connect(height, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setHeight(int))); width = new TQSpinBox(1, MAX_SIZE, 1, page); grid->addWidget(width, 1, 1); width->setValue(w); - connect(width, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(setWidth(int))); + connect(width, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(setWidth(int))); height->setFocus(); } diff --git a/lib/kformula/kformulaconfigpage.cpp b/lib/kformula/kformulaconfigpage.cpp index 380bfcd2..e1bfbc53 100644 --- a/lib/kformula/kformulaconfigpage.cpp +++ b/lib/kformula/kformulaconfigpage.cpp @@ -75,19 +75,19 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con connect( buildFontLine( gbox, grid, 0, defaultFont, i18n( "Default font:" ), defaultFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewDefaultFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewDefaultFont() ) ); connect( buildFontLine( gbox, grid, 1, nameFont, i18n( "Name font:" ), nameFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewNameFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewNameFont() ) ); connect( buildFontLine( gbox, grid, 2, numberFont, i18n( "Number font:" ), numberFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewNumberFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewNumberFont() ) ); connect( buildFontLine( gbox, grid, 3, operatorFont, i18n( "Operator font:" ), operatorFontName ), - TQT_SIGNAL( clicked() ), TQT_SLOT( selectNewOperatorFont() ) ); + TQ_SIGNAL( clicked() ), TQ_SLOT( selectNewOperatorFont() ) ); TQLabel* sizeTitle = new TQLabel( i18n( "Default base size:" ), gbox ); grid->addWidget( sizeTitle, 4, 0 ); @@ -97,8 +97,8 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con grid->addMultiCellWidget( sizeSpin, 4, 4, 1, 2 ); - connect( sizeSpin, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( baseSizeChanged( int ) ) ); + connect( sizeSpin, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( baseSizeChanged( int ) ) ); // syntax highlighting @@ -155,13 +155,13 @@ ConfigurePage::ConfigurePage( Document* document, TQWidget* view, TDEConfig* con // errorColorBtn->setColor( contextStyle.getErrorColorPlain() ); // grid->addWidget( errorColorBtn, 4, 1 ); - connect( syntaxHighlighting, TQT_SIGNAL( clicked() ), - TQT_SLOT( syntaxHighlightingClicked() ) ); + connect( syntaxHighlighting, TQ_SIGNAL( clicked() ), + TQ_SLOT( syntaxHighlightingClicked() ) ); syntaxHighlightingClicked(); - connect( syntaxHighlighting, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChanged() ) ); - connect( sizeSpin, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( syntaxHighlighting, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChanged() ) ); + connect( sizeSpin, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) ); Q_ASSERT( !m_changed ); } @@ -389,14 +389,14 @@ void ConfigurePage::slotChanged() // fontLayout->addLayout( hLayout, 0, 0 ); -// // connect( availableFonts, TQT_SIGNAL( executed( TQListViewItem* ) ), -// // this, TQT_SLOT( slotAddFont() ) ); -// // connect( requestedFonts, TQT_SIGNAL( executed( TQListViewItem* ) ), -// // this, TQT_SLOT( slotRemoveFont() ) ); -// connect( addFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFont() ) ); -// connect( removeFont, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveFont() ) ); -// connect( moveUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveUp() ) ); -// connect( moveDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveDown() ) ); +// // connect( availableFonts, TQ_SIGNAL( executed( TQListViewItem* ) ), +// // this, TQ_SLOT( slotAddFont() ) ); +// // connect( requestedFonts, TQ_SIGNAL( executed( TQListViewItem* ) ), +// // this, TQ_SLOT( slotRemoveFont() ) ); +// connect( addFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFont() ) ); +// connect( removeFont, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveFont() ) ); +// connect( moveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) ); +// connect( moveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) ); // const ContextStyle& contextStyle = document->getContextStyle( true ); // const SymbolTable& symbolTable = contextStyle.symbolTable(); diff --git a/lib/kformula/kformuladocument.cpp b/lib/kformula/kformuladocument.cpp index c041232f..3efd3780 100644 --- a/lib/kformula/kformuladocument.cpp +++ b/lib/kformula/kformuladocument.cpp @@ -442,187 +442,187 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) m_addNegThinSpaceAction = new TDEAction( i18n( "Add Negative Thin Space" ), 0, - this, TQT_SLOT( addNegThinSpace() ), + this, TQ_SLOT( addNegThinSpace() ), collection, "formula_addnegthinspace") ; m_addThinSpaceAction = new TDEAction( i18n( "Add Thin Space" ), 0, - this, TQT_SLOT( addThinSpace() ), + this, TQ_SLOT( addThinSpace() ), collection, "formula_addthinspace") ; m_addMediumSpaceAction = new TDEAction( i18n( "Add Medium Space" ), 0, - this, TQT_SLOT( addMediumSpace() ), + this, TQ_SLOT( addMediumSpace() ), collection, "formula_addmediumspace" ); m_addThickSpaceAction = new TDEAction( i18n( "Add Thick Space" ), 0, - this, TQT_SLOT( addThickSpace() ), + this, TQ_SLOT( addThickSpace() ), collection, "formula_addthickspace" ); m_addQuadSpaceAction = new TDEAction( i18n( "Add Quad Space" ), 0, - this, TQT_SLOT( addQuadSpace() ), + this, TQ_SLOT( addQuadSpace() ), collection, "formula_addquadspace" ); m_addIntegralAction = new TDEAction(i18n("Add Integral"), "int", 0, - this, TQT_SLOT(addIntegral()), + this, TQ_SLOT(addIntegral()), collection, "formula_addintegral"); m_addSumAction = new TDEAction(i18n("Add Sum"), "sum", 0, - this, TQT_SLOT(addSum()), + this, TQ_SLOT(addSum()), collection, "formula_addsum"); m_addProductAction = new TDEAction(i18n("Add Product"), "prod", 0, - this, TQT_SLOT(addProduct()), + this, TQ_SLOT(addProduct()), collection, "formula_addproduct"); m_addRootAction = new TDEAction(i18n("Add Root"), "sqrt", 0, - this, TQT_SLOT(addRoot()), + this, TQ_SLOT(addRoot()), collection, "formula_addroot"); m_addFractionAction = new TDEAction(i18n("Add Fraction"), "frac", 0, - this, TQT_SLOT(addFraction()), + this, TQ_SLOT(addFraction()), collection, "formula_addfrac"); m_addBracketAction = new TDEAction(i18n("Add Bracket"), "paren", 0, - this, TQT_SLOT(addDefaultBracket()), + this, TQ_SLOT(addDefaultBracket()), collection,"formula_addbra"); m_addSBracketAction = new TDEAction(i18n("Add Square Bracket"), "brackets", 0, - this, TQT_SLOT(addSquareBracket()), + this, TQ_SLOT(addSquareBracket()), collection,"formula_addsqrbra"); m_addCBracketAction = new TDEAction(i18n("Add Curly Bracket"), "math_brace", 0, - this, TQT_SLOT(addCurlyBracket()), + this, TQ_SLOT(addCurlyBracket()), collection,"formula_addcurbra"); m_addAbsAction = new TDEAction(i18n("Add Abs"), "abs", 0, - this, TQT_SLOT(addLineBracket()), + this, TQ_SLOT(addLineBracket()), collection,"formula_addabsbra"); m_addMatrixAction = new TDEAction(i18n("Add Matrix..."), "matrix", 0, - this, TQT_SLOT(addMatrix()), + this, TQ_SLOT(addMatrix()), collection, "formula_addmatrix"); m_addOneByTwoMatrixAction = new TDEAction(i18n("Add 1x2 Matrix"), "onetwomatrix", 0, - this, TQT_SLOT(addOneByTwoMatrix()), + this, TQ_SLOT(addOneByTwoMatrix()), collection, "formula_add_one_by_two_matrix"); m_addUpperLeftAction = new TDEAction(i18n("Add Upper Left Index"), "lsup", 0, - this, TQT_SLOT(addUpperLeftIndex()), + this, TQ_SLOT(addUpperLeftIndex()), collection, "formula_addupperleft"); m_addLowerLeftAction = new TDEAction(i18n("Add Lower Left Index"), "lsub", 0, - this, TQT_SLOT(addLowerLeftIndex()), + this, TQ_SLOT(addLowerLeftIndex()), collection, "formula_addlowerleft"); m_addUpperRightAction = new TDEAction(i18n("Add Upper Right Index"), "rsup", 0, - this, TQT_SLOT(addUpperRightIndex()), + this, TQ_SLOT(addUpperRightIndex()), collection, "formula_addupperright"); m_addLowerRightAction = new TDEAction(i18n("Add Lower Right Index"), "rsub", 0, - this, TQT_SLOT(addLowerRightIndex()), + this, TQ_SLOT(addLowerRightIndex()), collection, "formula_addlowerright"); m_addGenericUpperAction = new TDEAction(i18n("Add Upper Index"), "gsup", /*CTRL + Key_U*/0, - this, TQT_SLOT(addGenericUpperIndex()), + this, TQ_SLOT(addGenericUpperIndex()), collection, "formula_addupperindex"); m_addGenericLowerAction = new TDEAction(i18n("Add Lower Index"), "gsub", 0, - this, TQT_SLOT(addGenericLowerIndex()), + this, TQ_SLOT(addGenericLowerIndex()), collection, "formula_addlowerindex"); m_addOverlineAction = new TDEAction(i18n("Add Overline"), "over", 0, - this, TQT_SLOT(addOverline()), + this, TQ_SLOT(addOverline()), collection, "formula_addoverline"); m_addUnderlineAction = new TDEAction(i18n("Add Underline"), "under", 0, - this, TQT_SLOT(addUnderline()), + this, TQ_SLOT(addUnderline()), collection, "formula_addunderline"); m_addMultilineAction = new TDEAction(i18n("Add Multiline"), "multiline", 0, - this, TQT_SLOT(addMultiline()), + this, TQ_SLOT(addMultiline()), collection, "formula_addmultiline"); m_removeEnclosingAction = new TDEAction(i18n("Remove Enclosing Element"), 0, - this, TQT_SLOT(removeEnclosing()), + this, TQ_SLOT(removeEnclosing()), collection, "formula_removeenclosing"); m_makeGreekAction = new TDEAction(i18n("Convert to Greek"), 0, - this, TQT_SLOT(makeGreek()), + this, TQ_SLOT(makeGreek()), collection, "formula_makegreek"); m_appendColumnAction = new TDEAction( i18n( "Append Column" ), "inscol", 0, - this, TQT_SLOT( appendColumn() ), + this, TQ_SLOT( appendColumn() ), collection, "formula_appendcolumn" ); m_insertColumnAction = new TDEAction( i18n( "Insert Column" ), "inscol", 0, - this, TQT_SLOT( insertColumn() ), + this, TQ_SLOT( insertColumn() ), collection, "formula_insertcolumn" ); m_removeColumnAction = new TDEAction( i18n( "Remove Column" ), "remcol", 0, - this, TQT_SLOT( removeColumn() ), + this, TQ_SLOT( removeColumn() ), collection, "formula_removecolumn" ); m_appendRowAction = new TDEAction( i18n( "Append Row" ), "insrow", 0, - this, TQT_SLOT( appendRow() ), + this, TQ_SLOT( appendRow() ), collection, "formula_appendrow" ); m_insertRowAction = new TDEAction( i18n( "Insert Row" ), "insrow", 0, - this, TQT_SLOT( insertRow() ), + this, TQ_SLOT( insertRow() ), collection, "formula_insertrow" ); m_removeRowAction = new TDEAction( i18n( "Remove Row" ), "remrow", 0, - this, TQT_SLOT( removeRow() ), + this, TQ_SLOT( removeRow() ), collection, "formula_removerow" ); m_syntaxHighlightingAction = new TDEToggleAction(i18n("Syntax Highlighting"), 0, - this, TQT_SLOT(toggleSyntaxHighlighting()), + this, TQ_SLOT(toggleSyntaxHighlighting()), collection, "formula_syntaxhighlighting"); //m_syntaxHighlightingAction->setChecked( m_contextStyle->syntaxHighlighting() ); m_formatBoldAction = new TDEToggleAction( i18n( "&Bold" ), "format-text-bold", 0, //CTRL + Key_B, - this, TQT_SLOT( textBold() ), + this, TQ_SLOT( textBold() ), collection, "formula_format_bold" ); m_formatItalicAction = new TDEToggleAction( i18n( "&Italic" ), "format-text-italic", 0, //CTRL + Key_I, - this, TQT_SLOT( textItalic() ), + this, TQ_SLOT( textItalic() ), collection, "formula_format_italic" ); m_formatBoldAction->setEnabled( false ); m_formatItalicAction->setEnabled( false ); @@ -641,7 +641,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) delimiter.append(TQString("}")); delimiter.append(TQString(">")); m_leftBracket = new TDESelectAction(i18n("Left Delimiter"), - 0, this, TQT_SLOT(delimiterLeft()), + 0, this, TQ_SLOT(delimiterLeft()), collection, "formula_typeleft"); m_leftBracket->setItems(delimiter); //leftBracket->setCurrentItem(0); @@ -660,7 +660,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) delimiter.append(TQString("{")); delimiter.append(TQString("<")); m_rightBracket = new TDESelectAction(i18n("Right Delimiter"), - 0, this, TQT_SLOT(delimiterRight()), + 0, this, TQ_SLOT(delimiterRight()), collection, "formula_typeright"); m_rightBracket->setItems(delimiter); //rightBracket->setCurrentItem(0); @@ -668,10 +668,10 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) m_insertSymbolAction = new TDEAction(i18n("Insert Symbol"), "key_enter", /*CTRL + Key_I*/0, - this, TQT_SLOT(insertSymbol()), + this, TQ_SLOT(insertSymbol()), collection, "formula_insertsymbol"); m_symbolNamesAction = new SymbolAction(i18n("Symbol Names"), - 0, this, TQT_SLOT(symbolNames()), + 0, this, TQ_SLOT(symbolNames()), collection, "formula_symbolnames"); TQStringList ff; @@ -680,7 +680,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) ff.append( i18n( "Fraktur" ) ); ff.append( i18n( "Double Struck" ) ); m_fontFamily = new TDESelectAction(i18n("Font Family"), - 0, this, TQT_SLOT(fontFamily()), + 0, this, TQ_SLOT(fontFamily()), collection, "formula_fontfamily"); m_fontFamily->setItems( ff ); m_fontFamily->setEnabled( false ); @@ -691,7 +691,7 @@ void DocumentWrapper::createActions( TDEActionCollection* collection ) et.append( i18n( "Number" ) ); et.append( i18n( "Text" ) ); m_tokenElement = new TDESelectAction( i18n( "Token Type" ), - 0, this, TQT_SLOT( tokenElement() ), + 0, this, TQ_SLOT( tokenElement() ), collection, "formula_tokenelement" ); m_tokenElement->setItems( et ); // m_tokenElements->setEnabled( true ); diff --git a/lib/kformula/kformulaview.cpp b/lib/kformula/kformulaview.cpp index 1e50694d..92022e54 100644 --- a/lib/kformula/kformulaview.cpp +++ b/lib/kformula/kformulaview.cpp @@ -41,17 +41,17 @@ struct View::View_Impl { : smallCursor(false), activeCursor(true), cursorHasChanged(true), document(doc) { - connect(document, TQT_SIGNAL(elementWillVanish(BasicElement*)), - view, TQT_SLOT(slotElementWillVanish(BasicElement*))); - connect(document, TQT_SIGNAL(formulaLoaded(FormulaElement*)), - view, TQT_SLOT(slotFormulaLoaded(FormulaElement*))); - connect(document, TQT_SIGNAL(cursorMoved(FormulaCursor*)), - view, TQT_SLOT(slotCursorMoved(FormulaCursor*))); + connect(document, TQ_SIGNAL(elementWillVanish(BasicElement*)), + view, TQ_SLOT(slotElementWillVanish(BasicElement*))); + connect(document, TQ_SIGNAL(formulaLoaded(FormulaElement*)), + view, TQ_SLOT(slotFormulaLoaded(FormulaElement*))); + connect(document, TQ_SIGNAL(cursorMoved(FormulaCursor*)), + view, TQ_SLOT(slotCursorMoved(FormulaCursor*))); cursor = document->createCursor(); blinkTimer = new TQTimer( view ); - connect( blinkTimer, TQT_SIGNAL( timeout() ), - view, TQT_SLOT( slotBlinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + view, TQ_SLOT( slotBlinkCursor() ) ); if ( TQApplication::cursorFlashTime() > 0 ) blinkTimer->start( TQApplication::cursorFlashTime() / 2 ); } diff --git a/lib/kformula/kformulawidget.cpp b/lib/kformula/kformulawidget.cpp index e827537e..8877b628 100644 --- a/lib/kformula/kformulawidget.cpp +++ b/lib/kformula/kformulawidget.cpp @@ -39,10 +39,10 @@ KFormulaWidget::KFormulaWidget(Container* doc, TQWidget* parent, const char* nam : TQWidget(parent, name, f | WRepaintNoErase | WResizeNoErase), formulaView(doc) { - connect(doc, TQT_SIGNAL(formulaChanged(int, int)), - this, TQT_SLOT(slotFormulaChanged(int, int))); - connect(&formulaView, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(slotCursorChanged(bool, bool))); + connect(doc, TQ_SIGNAL(formulaChanged(int, int)), + this, TQ_SLOT(slotFormulaChanged(int, int))); + connect(&formulaView, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(slotCursorChanged(bool, bool))); setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(NoBackground/*TQWidget::PaletteBase*/); diff --git a/lib/kformula/main.cpp b/lib/kformula/main.cpp index c92adfd7..bf0f058f 100644 --- a/lib/kformula/main.cpp +++ b/lib/kformula/main.cpp @@ -209,8 +209,8 @@ void ScrollView::addChild(KFormulaWidget* c, int x, int y) { TQScrollView::addChild(c, x, y); child = c; - connect(child, TQT_SIGNAL(cursorChanged(bool, bool)), - this, TQT_SLOT(cursorChanged(bool, bool))); + connect(child, TQ_SIGNAL(cursorChanged(bool, bool)), + this, TQ_SLOT(cursorChanged(bool, bool))); } void ScrollView::focusInEvent(TQFocusEvent*) @@ -246,7 +246,7 @@ int main(int argc, char** argv) TDEApplication app; - app.connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); + app.connect(&app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit())); DocumentWrapper* wrapper = new DocumentWrapper( kapp->config(), 0 ); Document* document = new Document; diff --git a/lib/kformula/prototype/main.py b/lib/kformula/prototype/main.py index c5855340..5f9fc29b 100755 --- a/lib/kformula/prototype/main.py +++ b/lib/kformula/prototype/main.py @@ -9,5 +9,5 @@ a = TQApplication(sys.argv) mw = Widget() mw.setCaption('Prototype of the formula engine') mw.show() -a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()')) +a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()')) a.exec_loop() diff --git a/lib/kformula/prototype/unicode.py b/lib/kformula/prototype/unicode.py index 10e0f848..6b725b5d 100755 --- a/lib/kformula/prototype/unicode.py +++ b/lib/kformula/prototype/unicode.py @@ -81,8 +81,8 @@ class Widget(TQWidget): loadButton = TQPushButton("load", self) saveButton = TQPushButton("save", self) - TQObject.connect(loadButton, SIGNAL("pressed()"), self.load) - TQObject.connect(saveButton, SIGNAL("pressed()"), self.save) + TQObject.connect(loadButton, TQ_SIGNAL("pressed()"), self.load) + TQObject.connect(saveButton, TQ_SIGNAL("pressed()"), self.save) hbox.addWidget(loadButton) hbox.addWidget(saveButton) @@ -101,7 +101,7 @@ class Widget(TQWidget): vbox.addWidget(splitter) - self.connect(self.listbox, SIGNAL('highlighted( const TQString& )'), + self.connect(self.listbox, TQ_SIGNAL('highlighted( const TQString& )'), self.fontHighlighted) def fontHighlighted(self, fontStr): @@ -184,7 +184,7 @@ def main(): mw.setCaption('Unicode mapping util') mw.show() - a.connect(a, SIGNAL('lastWindowClosed()'), a, SLOT('quit()')) + a.connect(a, TQ_SIGNAL('lastWindowClosed()'), a, TQ_SLOT('quit()')) a.exec_loop() if __name__ == '__main__': diff --git a/lib/kformula/symbolaction.cpp b/lib/kformula/symbolaction.cpp index 08c5ac7b..71e60cee 100644 --- a/lib/kformula/symbolaction.cpp +++ b/lib/kformula/symbolaction.cpp @@ -124,15 +124,15 @@ int SymbolAction::plug( TQWidget* w, int index ) TDEToolBar* bar = static_cast<TDEToolBar*>( w ); int id_ = TDEAction::getToolButtonID(); KComboBox *cb = new KComboBox( bar ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotActivated( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateItems( containerCount() - 1 ); diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp index 75a0d5e1..6429d6eb 100644 --- a/lib/kofficecore/KoApplication.cpp +++ b/lib/kofficecore/KoApplication.cpp @@ -132,7 +132,7 @@ bool KoApplication::start() return false; KoMainWindow *shell = new KoMainWindow( doc->instance() ); shell->show(); - TQObject::connect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::connect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); // for initDoc to fill in the recent docs list // and for KoDocument::slotStarted doc->addShell( shell ); @@ -144,7 +144,7 @@ bool KoApplication::start() } // FIXME This needs to be moved someplace else - TQObject::disconnect(doc, TQT_SIGNAL(sigProgress(int)), shell, TQT_SLOT(slotProgress(int))); + TQObject::disconnect(doc, TQ_SIGNAL(sigProgress(int)), shell, TQ_SLOT(slotProgress(int))); } else { bool print = koargs->isSet("print"); bool doTemplate = koargs->isSet("template"); diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 35b518ac..acdc6361 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -100,11 +100,11 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, TDEConfigGroup cfgGrp(d->m_instance->config(), "TemplateChooserDialog"); TQString fullTemplateName = cfgGrp.readPathEntry("FullTemplateName"); d->m_alwaysUseTemplate = cfgGrp.readPathEntry("AlwaysUseTemplate"); - connect(m_alwaysUseCheckBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(alwaysUseClicked())); + connect(m_alwaysUseCheckBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(alwaysUseClicked())); changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TDEListViewItem* selectItem = 0; @@ -125,13 +125,13 @@ KoTemplatesPane::KoTemplatesPane(TQWidget* parent, TDEInstance* instance, } } - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openTemplate(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openTemplate())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openTemplate(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openTemplate())); if(selectItem) { m_documentList->setSelected(selectItem, true); @@ -284,7 +284,7 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst changePalette(); if(kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(changePalette())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(changePalette())); } TQString oldGroup = instance->config()->group(); @@ -334,23 +334,23 @@ KoRecentDocumentsPane::KoRecentDocumentsPane(TQWidget* parent, TDEInstance* inst instance->config()->setGroup( oldGroup ); - connect(m_documentList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_documentList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(openFile(TQListViewItem*))); - connect(m_openButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(openFile())); + connect(m_documentList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_documentList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(openFile(TQListViewItem*))); + connect(m_openButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(openFile())); m_documentList->setSelected(m_documentList->firstChild(), true); d->m_previewJob = TDEIO::filePreview(fileList, 200, 200); - connect(d->m_previewJob, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(previewResult(TDEIO::Job*))); - connect(d->m_previewJob, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), - this, TQT_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); + connect(d->m_previewJob, TQ_SIGNAL(result(TDEIO::Job*)), this, TQ_SLOT(previewResult(TDEIO::Job*))); + connect(d->m_previewJob, TQ_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)), + this, TQ_SLOT(updatePreview(const KFileItem*, const TQPixmap&))); } KoRecentDocumentsPane::~KoRecentDocumentsPane() diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp index 6a6331de..85397acc 100644 --- a/lib/kofficecore/KoDocument.cpp +++ b/lib/kofficecore/KoDocument.cpp @@ -231,7 +231,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec d = new Private; m_bEmpty = TRUE; - connect( &d->m_autoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + connect( &d->m_autoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); setAutoSave( s_defaultAutoSave ); d->m_bSingleViewMode = singleViewMode; @@ -264,7 +264,7 @@ KoDocument::KoDocument( TQWidget * parentWidget, const char *widgetName, TQObjec // A way to 'fix' the job's window, since we have no widget known to KParts if ( !singleViewMode ) - connect( this, TQT_SIGNAL( started( TDEIO::Job* ) ), TQT_SLOT( slotStarted( TDEIO::Job* ) ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job* ) ), TQ_SLOT( slotStarted( TDEIO::Job* ) ) ); } KoDocument::~KoDocument() @@ -277,8 +277,8 @@ KoDocument::~KoDocument() TQPtrListIterator<KoDocumentChild> childIt( d->m_children ); for (; childIt.current(); ++childIt ) - disconnect( childIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + disconnect( childIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // Tell our views that the document is already destroyed and // that they shouldn't try to access it. @@ -544,7 +544,7 @@ void KoDocument::slotAutoSave() { if ( isModified() && d->modifiedAfterAutosave && !d->m_bLoading ) { - connect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + connect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); emit sigStatusBarMessage( i18n("Autosaving...") ); d->m_autosaving = true; bool ret = saveNativeFormat( autoSaveFile( m_file ) ); @@ -555,7 +555,7 @@ void KoDocument::slotAutoSave() } d->m_autosaving = false; emit sigClearStatusBarMessage(); - disconnect( this, TQT_SIGNAL( sigProgress( int ) ), shells().current(), TQT_SLOT( slotProgress( int ) ) ); + disconnect( this, TQ_SIGNAL( sigProgress( int ) ), shells().current(), TQ_SLOT( slotProgress( int ) ) ); if ( !ret ) emit sigStatusBarMessage( i18n("Error during autosave! Partition full?") ); } @@ -657,10 +657,10 @@ void KoDocument::insertChild( KoDocumentChild *child ) d->m_children.append( child ); - connect( child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotChildChanged( KoChild * ) ) ); - connect( child, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotChildDestroyed() ) ); + connect( child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotChildChanged( KoChild * ) ) ); + connect( child, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotChildDestroyed() ) ); // It may be that insertChild is called without the KoDocumentChild // having a KoDocument attached, yet. This happens for example @@ -2576,7 +2576,7 @@ void KoDocument::openExistingFile( const TQString& file ) setModified( false ); if( ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( deleteOpenPane() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteOpenPane() ) ); } void KoDocument::openTemplate( const TQString& file ) @@ -2611,14 +2611,14 @@ KoOpenPane* KoDocument::createOpenPane( TQWidget* parent, TDEInstance* instance, TQWidget *customDoc = createCustomDocumentWidget(openPane); if(customDoc) { openPane->setCustomDocumentWidget( customDoc ); - connect( customDoc, TQT_SIGNAL( documentSelected() ), this, TQT_SLOT( startCustomDocument() ) ); + connect( customDoc, TQ_SIGNAL( documentSelected() ), this, TQ_SLOT( startCustomDocument() ) ); } openPane->show(); - connect( openPane, TQT_SIGNAL( openExistingFile( const TQString& ) ), - this, TQT_SLOT( openExistingFile( const TQString& ) ) ); - connect( openPane, TQT_SIGNAL( openTemplate( const TQString& ) ), - this, TQT_SLOT( openTemplate( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openExistingFile( const TQString& ) ), + this, TQ_SLOT( openExistingFile( const TQString& ) ) ); + connect( openPane, TQ_SIGNAL( openTemplate( const TQString& ) ), + this, TQ_SLOT( openTemplate( const TQString& ) ) ); return openPane; } @@ -2637,7 +2637,7 @@ void KoDocument::deleteOpenPane() { if( d->m_startUpWidget ) { d->m_startUpWidget->hide(); - TQTimer::singleShot(1000, this, TQT_SLOT(deleteOpenPaneDelayed())); + TQTimer::singleShot(1000, this, TQ_SLOT(deleteOpenPaneDelayed())); shells().getFirst()->factory()->container("mainToolBar", shells().getFirst())->show(); shells().getFirst()->setRootDocument( this ); @@ -2663,7 +2663,7 @@ bool KoDocument::showEmbedInitDialog(TQWidget* parent) pane->layout()->setMargin(0); dlg.setMainWidget(pane); dlg.setInitialSize(dlg.configDialogSize("EmbedInitDialog")); - connect(this, TQT_SIGNAL(closeEmbedInitDialog()), &dlg, TQT_SLOT(slotOk())); + connect(this, TQ_SIGNAL(closeEmbedInitDialog()), &dlg, TQ_SLOT(slotOk())); bool ok = dlg.exec() == TQDialog::Accepted; diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index b799eab3..c1cd4936 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -220,36 +220,36 @@ void KoDocumentInfoDlg::addAuthorPage( KoDocumentInfoAuthor *authorInfo ) d->m_authorWidget->leStreet->setText( authorInfo->street() ); d->m_authorWidget->leAuthorPosition->setText( authorInfo->position() ); - connect( d->m_authorWidget->leFullName, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leInitial, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCompany, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leEmail, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneWork, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leTelephoneHome, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leFax, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCountry, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->lePostalCode, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leCity, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leStreet, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->leAuthorPosition, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_authorWidget->pbLoadKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( loadFromKABC() ) ); - connect( d->m_authorWidget->pbDelete, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( deleteInfo() ) ); + connect( d->m_authorWidget->leFullName, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leInitial, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCompany, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leEmail, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneWork, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leTelephoneHome, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leFax, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCountry, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->lePostalCode, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leCity, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leStreet, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->leAuthorPosition, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_authorWidget->pbLoadKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( loadFromKABC() ) ); + connect( d->m_authorWidget->pbDelete, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( deleteInfo() ) ); } void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) @@ -274,18 +274,18 @@ void KoDocumentInfoDlg::addAboutPage( KoDocumentInfoAbout *aboutInfo ) d->m_aboutWidget->leDocKeywords->setText( aboutInfo->keywords() ); d->m_aboutWidget->meDocAbstract->setText( aboutInfo->abstract() ); - connect( d->m_aboutWidget->leDocTitle, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->meDocAbstract, TQT_SIGNAL( textChanged() ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocSubject, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->leDocKeywords, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - aboutInfo, TQT_SLOT( resetMetaData() ) ); - connect( d->m_aboutWidget->pbReset, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->leDocTitle, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->meDocAbstract, TQ_SIGNAL( textChanged() ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocSubject, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->leDocKeywords, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + aboutInfo, TQ_SLOT( resetMetaData() ) ); + connect( d->m_aboutWidget->pbReset, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( resetMetaData() ) ); } void KoDocumentInfoDlg::addUserMetadataPage( KoDocumentInfoUserMetadata *userMetadataInfo ) @@ -426,8 +426,8 @@ KoDocumentInfoPropsPage::KoDocumentInfoPropsPage( KPropertiesDialog *props, } d->m_dlg = new KoDocumentInfoDlg( d->m_info, 0, 0, props ); - connect( d->m_dlg, TQT_SIGNAL( changed() ), - this, TQT_SIGNAL( changed() ) ); + connect( d->m_dlg, TQ_SIGNAL( changed() ), + this, TQ_SIGNAL( changed() ) ); } KoDocumentInfoPropsPage::~KoDocumentInfoPropsPage() diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp index 84c5bde8..97a934b1 100644 --- a/lib/kofficecore/KoFileDialog.cpp +++ b/lib/kofficecore/KoFileDialog.cpp @@ -30,8 +30,8 @@ KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter, bool modal) : KFileDialog( startDir, filter, parent, name, modal ) { - connect( filterWidget, TQT_SIGNAL( activated( int) ), - this, TQT_SLOT( slotChangedfilter( int ) ) ); + connect( filterWidget, TQ_SIGNAL( activated( int) ), + this, TQ_SLOT( slotChangedfilter( int ) ) ); } void KoFileDialog::slotChangedfilter( int index ) diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp index 91123fd3..1f30ff47 100644 --- a/lib/kofficecore/KoFilterChain.cpp +++ b/lib/kofficecore/KoFilterChain.cpp @@ -84,8 +84,8 @@ int KoFilterChain::ChainLink::lruPartIndex() const void KoFilterChain::ChainLink::setupCommunication( const KoFilter* const parentFilter ) const { // progress information - TQObject::connect( m_filter, TQT_SIGNAL( sigProgress( int ) ), - m_chain->manager(), TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( m_filter, TQ_SIGNAL( sigProgress( int ) ), + m_chain->manager(), TQ_SIGNAL( sigProgress( int ) ) ); if ( !parentFilter ) return; @@ -110,10 +110,10 @@ void KoFilterChain::ChainLink::setupConnections( const KoFilter* sender, const T if ( strncmp( slotIt.current(), SLOT_PREFIX, SLOT_PREFIX_LEN ) == 0 ) { if ( strcmp( signalIt.current() + SIGNAL_PREFIX_LEN, slotIt.current() + SLOT_PREFIX_LEN ) == 0 ) { TQCString signalString; - signalString.setNum( TQSIGNAL_CODE ); + signalString.setNum( TQ_SIGNAL_CODE ); signalString += signalIt.current(); TQCString slotString; - slotString.setNum( TQSLOT_CODE ); + slotString.setNum( TQ_SLOT_CODE ); slotString += slotIt.current(); TQObject::connect( sender, signalString, receiver, slotString ); } diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index e22d5f3e..44b83712 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -89,7 +89,7 @@ KoFilterChooser::KoFilterChooser (TQWidget *parent, const TQStringList &mimeType m_filterList->centerCurrentItem (); m_filterList->setFocus (); - connect (m_filterList, TQT_SIGNAL (selected (int)), this, TQT_SLOT (slotOk ())); + connect (m_filterList, TQ_SIGNAL (selected (int)), this, TQ_SLOT (slotOk ())); } KoFilterChooser::~KoFilterChooser () @@ -119,8 +119,8 @@ KoFilterManager::KoFilterManager( KoDocument* document ) : d = new KoFilterManager::Private; d -> m_batch = false; if ( document ) - TQObject::connect( this, TQT_SIGNAL( sigProgress( int ) ), - document, TQT_SIGNAL( sigProgress( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( sigProgress( int ) ), + document, TQ_SIGNAL( sigProgress( int ) ) ); } diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index c2680b44..cce7fff2 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -192,8 +192,8 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) d->m_manager = new KoPartManager( this ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActivePartChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActivePartChanged( KParts::Part * ) ) ); if ( instance ) setInstance( instance, false ); // don't load plugins! we don't want @@ -205,41 +205,41 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) setXMLFile( findMostRecentXMLFile( allFiles, doc ) ); setLocalXMLFile( locateLocal( "data", "koffice/koffice_shell.rc" ) ); - KStdAction::openNew( this, TQT_SLOT( slotFileNew() ), actionCollection(), "file_new" ); - KStdAction::open( this, TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - m_recent = KStdAction::openRecent( this, TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); - d->m_paSave = KStdAction::save( this, TQT_SLOT( slotFileSave() ), actionCollection(), "file_save" ); - d->m_paSaveAs = KStdAction::saveAs( this, TQT_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); - d->m_paPrint = KStdAction::print( this, TQT_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); - d->m_paPrintPreview = KStdAction::printPreview( this, TQT_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); - d->m_sendfile = KStdAction::mail( this, TQT_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); + KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection(), "file_new" ); + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + m_recent = KStdAction::openRecent( this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection() ); + d->m_paSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ), actionCollection(), "file_save" ); + d->m_paSaveAs = KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection(), "file_save_as" ); + d->m_paPrint = KStdAction::print( this, TQ_SLOT( slotFilePrint() ), actionCollection(), "file_print" ); + d->m_paPrintPreview = KStdAction::printPreview( this, TQ_SLOT( slotFilePrintPreview() ), actionCollection(), "file_print_preview" ); + d->m_sendfile = KStdAction::mail( this, TQ_SLOT( slotEmailFile() ), actionCollection(), "file_send_file"); - d->m_paCloseFile = KStdAction::close( this, TQT_SLOT( slotFileClose() ), actionCollection(), "file_close" ); - KStdAction::quit( this, TQT_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); + d->m_paCloseFile = KStdAction::close( this, TQ_SLOT( slotFileClose() ), actionCollection(), "file_close" ); + KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection(), "file_quit" ); d->m_reloadfile = new TDEAction( i18n( "Reload"), 0, - this, TQT_SLOT( slotReloadFile() ), + this, TQ_SLOT( slotReloadFile() ), actionCollection(), "file_reload_file"); d->m_versionsfile = new TDEAction( i18n( "Versions..."), 0, - this, TQT_SLOT( slotVersionsFile() ), + this, TQ_SLOT( slotVersionsFile() ), actionCollection(), "file_versions_file"); d->m_importFile = new TDEAction( i18n( "I&mport..." ), 0, // clashing accel key :( - this, TQT_SLOT( slotImportFile() ), + this, TQ_SLOT( slotImportFile() ), actionCollection(), "file_import_file"); d->m_exportFile = new TDEAction( i18n( "E&xport..." ), 0, - this, TQT_SLOT( slotExportFile() ), + this, TQ_SLOT( slotExportFile() ), actionCollection(), "file_export_file"); /* The following entry opens the document information dialog. Since the action is named so it intends to show data this entry should not have a trailing ellipses (...). */ d->m_paDocInfo = new TDEAction( i18n( "&Document Information" ), "documentinfo", 0, - this, TQT_SLOT( slotDocumentInfo() ), + this, TQ_SLOT( slotDocumentInfo() ), actionCollection(), "file_documentinfo" ); - KStdAction::keyBindings( this, TQT_SLOT( slotConfigureKeys() ), actionCollection() ); - KStdAction::configureToolbars( this, TQT_SLOT( slotConfigureToolbars() ), actionCollection() ); + KStdAction::keyBindings( this, TQ_SLOT( slotConfigureKeys() ), actionCollection() ); + KStdAction::configureToolbars( this, TQ_SLOT( slotConfigureToolbars() ), actionCollection() ); d->m_paDocInfo->setEnabled( false ); d->m_paSaveAs->setEnabled( false ); @@ -260,20 +260,20 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name ) // set up the action "list" for "Close all Views" (hacky :) (Werner) d->m_veryHackyActionList.append( new TDEAction(i18n("&Close All Views"), "window-close", - "ctrl+shift+w", this, TQT_SLOT(slotCloseAllViews()), + "ctrl+shift+w", this, TQ_SLOT(slotCloseAllViews()), actionCollection(), "view_closeallviews") ); // set up the action list for the splitter stuff d->m_splitViewActionList.append(new TDEAction(i18n("&Split View"), "view_split", 0, - this, TQT_SLOT(slotSplitView()), + this, TQ_SLOT(slotSplitView()), actionCollection(), "view_split")); d->m_removeView=new TDEAction(i18n("&Remove View"), "view_remove", 0, - this, TQT_SLOT(slotRemoveView()), + this, TQ_SLOT(slotRemoveView()), actionCollection(), "view_rm_splitter"); d->m_splitViewActionList.append(d->m_removeView); d->m_removeView->setEnabled(false); d->m_orientation=new TDESelectAction(i18n("Splitter &Orientation"), "view_orientation", 0, - this, TQT_SLOT(slotSetOrientation()), + this, TQ_SLOT(slotSetOrientation()), actionCollection(), "view_splitter_orientation"); TQStringList items; items << i18n("&Vertical") @@ -596,9 +596,9 @@ bool KoMainWindow::openDocumentInternal( const KURL & url, KoDocument *newdoc ) return false; d->m_firstTime=true; - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + connect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->addShell( this ); // used by openURL bool openRet = (!isImporting ()) ? newdoc->openURL(url) : newdoc->import(url); if(!openRet) @@ -639,9 +639,9 @@ void KoMainWindow::slotLoadCompleted() // We had no document, set the new one setRootDocument( newdoc ); } - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); } void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) @@ -652,9 +652,9 @@ void KoMainWindow::slotLoadCanceled( const TQString & errMsg ) // ... can't delete the document, it's the one who emitted the signal... KoDocument* newdoc = (KoDocument *)(sender()); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotLoadCanceled( const TQString & ))); newdoc->removeShell(this); delete newdoc; @@ -672,10 +672,10 @@ void KoMainWindow::slotSaveCompleted() { kdDebug(30003) << "KoMainWindow::slotSaveCompleted" << endl; KoDocument* pDoc = (KoDocument *)(sender()); - disconnect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - disconnect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + disconnect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + disconnect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); } // returns true if we should save, false otherwise. @@ -739,10 +739,10 @@ bool KoMainWindow::saveDocument( bool saveas, bool silent ) else reset_url = false; - connect(pDoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(pDoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotSaveCompleted())); - connect(pDoc, TQT_SIGNAL(canceled( const TQString & )), - this, TQT_SLOT(slotSaveCanceled( const TQString & ))); + connect(pDoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(pDoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotSaveCompleted())); + connect(pDoc, TQ_SIGNAL(canceled( const TQString & )), + this, TQ_SLOT(slotSaveCanceled( const TQString & ))); KURL oldURL = pDoc->url(); TQString oldFile = pDoc->file(); @@ -1088,8 +1088,8 @@ void KoMainWindow::chooseNewDocument( int /*KoDocument::InitDocFlags*/ initDocFl return; //FIXME: This needs to be handled differently - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); if ( ( !doc && ( initDocFlags == KoDocument::InitDocFileNew ) ) || ( doc && !doc->isEmpty() ) ) { @@ -1286,7 +1286,7 @@ void KoMainWindow::slotConfigureToolbars() if (rootDocument()) saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() ); KEditToolbar edit(factory(), this); - connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&edit,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); (void) edit.exec(); } @@ -1541,7 +1541,7 @@ void KoMainWindow::slotActivePartChanged( KParts::Part *newPart ) TDEToggleAction * act = new TDEToggleAction( i18n("Show %1 Toolbar").arg( tb->text() ), 0, actionCollection(), tb->name() ); act->setCheckedState(i18n("Hide %1 Toolbar").arg( tb->text() )); - connect( act, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToolbarToggled( bool ) ) ); + connect( act, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToolbarToggled( bool ) ) ); act->setChecked ( !tb->isHidden() ); d->m_toolbarList.append( act ); } diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 3d7ff56e..0e38706a 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -105,18 +105,18 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& #if KDE_IS_VERSION(3,4,0) m_sectionList->setShadeSortColumn(false); #endif - connect(m_sectionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(selectionChanged(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(pressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(spacePressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); - connect(m_sectionList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(selectionChanged(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(pressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(spacePressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); + connect(m_sectionList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*))); KGuiItem openExistingGItem(i18n("Open Existing Document..."), "document-open"); m_openExistingButton->setGuiItem(openExistingGItem); - connect(m_openExistingButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showOpenFileDialog())); + connect(m_openExistingButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showOpenFileDialog())); initRecentDocs(); initTemplates(templateType); @@ -136,8 +136,8 @@ KoOpenPane::KoOpenPane(TQWidget *parent, TDEInstance* instance, const TQString& sizes = cfgGrp.readIntListEntry("DetailsPaneSplitterSizes"); emit splitterResized(0, sizes); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SLOT(saveSplitterSizes(KoDetailsPaneBase*, const TQValueList<int>&))); } KoOpenPane::~KoOpenPane() @@ -171,12 +171,12 @@ void KoOpenPane::showOpenFileDialog() void KoOpenPane::initRecentDocs() { KoRecentDocumentsPane* recentDocPane = new KoRecentDocumentsPane(this, d->m_instance); - connect(recentDocPane, TQT_SIGNAL(openFile(const TQString&)), this, TQT_SIGNAL(openExistingFile(const TQString&))); + connect(recentDocPane, TQ_SIGNAL(openFile(const TQString&)), this, TQ_SIGNAL(openExistingFile(const TQString&))); TQListViewItem* item = addPane(i18n("Recent Documents"), "document-open", recentDocPane, 0); - connect(recentDocPane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - recentDocPane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(recentDocPane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + recentDocPane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); KoSectionListItem* separator = new KoSectionListItem(m_sectionList, "", 1); separator->setEnabled(false); @@ -203,15 +203,15 @@ void KoOpenPane::initTemplates(const TQString& templateType) KoTemplatesPane* pane = new KoTemplatesPane(this, d->m_instance, group, templateTree.defaultTemplate()); - connect(pane, TQT_SIGNAL(openTemplate(const TQString&)), this, TQT_SIGNAL(openTemplate(const TQString&))); - connect(pane, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); - connect(this, TQT_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), - pane, TQT_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); - connect(pane, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); - connect(this, TQT_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), - pane, TQT_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(pane, TQ_SIGNAL(openTemplate(const TQString&)), this, TQ_SIGNAL(openTemplate(const TQString&))); + connect(pane, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&))); + connect(this, TQ_SIGNAL(alwaysUseChanged(KoTemplatesPane*, const TQString&)), + pane, TQ_SLOT(changeAlwaysUseTemplate(KoTemplatesPane*, const TQString&))); + connect(pane, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&))); + connect(this, TQ_SIGNAL(splitterResized(KoDetailsPaneBase*, const TQValueList<int>&)), + pane, TQ_SLOT(resizeSplitter(KoDetailsPaneBase*, const TQValueList<int>&))); TQListViewItem* item = addPane(group->name(), group->first()->loadPicture(d->m_instance), pane, group->sortingWeight() + templateOffset); diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp index d85a6995..2d1a62e2 100644 --- a/lib/kofficecore/KoSpeaker.cpp +++ b/lib/kofficecore/KoSpeaker.cpp @@ -210,7 +210,7 @@ void KoSpeaker::readConfig(TDEConfig* config) if (d->m_speakFlags & (SpeakPointerWidget | SpeakFocusWidget)) { if (startKttsd()) { d->m_timer = new TQTimer( this ); - connect( d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(probe()) ); + connect( d->m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(probe()) ); d->m_timer->start( d->m_timeout ); } } diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp index 6bebf91e..cca65063 100644 --- a/lib/kofficecore/KoView.cpp +++ b/lib/kofficecore/KoView.cpp @@ -120,14 +120,14 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) setMouseTracking( true ); - connect( d->m_doc, TQT_SIGNAL( childChanged( KoDocumentChild * ) ), - this, TQT_SLOT( slotChildChanged( KoDocumentChild * ) ) ); + connect( d->m_doc, TQ_SIGNAL( childChanged( KoDocumentChild * ) ), + this, TQ_SLOT( slotChildChanged( KoDocumentChild * ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigBeginOperation() ), - this, TQT_SLOT( beginOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigBeginOperation() ), + this, TQ_SLOT( beginOperation() ) ); - connect( d->m_doc, TQT_SIGNAL( sigEndOperation() ), - this, TQT_SLOT( endOperation() ) ); + connect( d->m_doc, TQ_SIGNAL( sigEndOperation() ), + this, TQ_SLOT( endOperation() ) ); actionCollection()->setWidget( this ); @@ -145,20 +145,20 @@ KoView::KoView( KoDocument *document, TQWidget *parent, const char *name ) if ( sb ) // No statusbar in e.g. konqueror { coll->setHighlightingEnabled( true ); - connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), - this, TQT_SLOT( slotActionStatusText( const TQString & ) ) ); - connect( coll, TQT_SIGNAL( clearStatusText() ), - this, TQT_SLOT( slotClearStatusText() ) ); - - connect( d->m_doc, TQT_SIGNAL( sigStatusBarMessage( const TQString& ) ), - this, TQT_SLOT( slotActionStatusText( const TQString& ) ) ); - connect( d->m_doc, TQT_SIGNAL( sigClearStatusBarMessage() ), - this, TQT_SLOT( slotClearStatusText() ) ); + connect( coll, TQ_SIGNAL( actionStatusText( const TQString & ) ), + this, TQ_SLOT( slotActionStatusText( const TQString & ) ) ); + connect( coll, TQ_SIGNAL( clearStatusText() ), + this, TQ_SLOT( slotClearStatusText() ) ); + + connect( d->m_doc, TQ_SIGNAL( sigStatusBarMessage( const TQString& ) ), + this, TQ_SLOT( slotActionStatusText( const TQString& ) ) ); + connect( d->m_doc, TQ_SIGNAL( sigClearStatusBarMessage() ), + this, TQ_SLOT( slotClearStatusText() ) ); } d->m_doc->setCurrent(); d->m_scrollTimer = new TQTimer( this ); - connect (d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() ) ); + connect (d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() ) ); } KoView::~KoView() @@ -627,7 +627,7 @@ void KoView::slotAutoScroll( ) void KoView::setupGlobalActions() { actionNewView = new TDEAction( i18n( "&New View" ), "window-new", 0, - this, TQT_SLOT( newView() ), + this, TQ_SLOT( newView() ), actionCollection(), "view_newview" ); } @@ -763,8 +763,8 @@ KoViewChild::KoViewChild( KoDocumentChild *child, KoView *_parentView ) // Setting the frameGeometry is done in setInitialFrameGeometry, which is // also called right after activation. - connect( view, TQT_SIGNAL( activated( bool ) ), - parentView(), TQT_SLOT( slotChildActivated( bool ) ) ); + connect( view, TQ_SIGNAL( activated( bool ) ), + parentView(), TQ_SLOT( slotChildActivated( bool ) ) ); } KoViewChild::~KoViewChild() @@ -852,10 +852,10 @@ void KoViewChild::setInitialFrameGeometry() kdDebug() << k_funcinfo << endl; // Connect only now, so that the GUI building doesn't move us around. - connect( m_frame, TQT_SIGNAL( geometryChanged() ), - this, TQT_SLOT( slotFrameGeometryChanged() ) ); - connect( m_child, TQT_SIGNAL( changed( KoChild * ) ), - this, TQT_SLOT( slotDocGeometryChanged() ) ); + connect( m_frame, TQ_SIGNAL( geometryChanged() ), + this, TQ_SLOT( slotFrameGeometryChanged() ) ); + connect( m_child, TQ_SIGNAL( changed( KoChild * ) ), + this, TQ_SLOT( slotDocGeometryChanged() ) ); // Set frameGeometry from childGeometry slotDocGeometryChanged(); diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index 8759ef66..a0929fec 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -66,10 +66,10 @@ KoVersionDialog::KoVersionDialog( TQWidget* parent, const char* name ) grid1->addWidget(m_pOpen,4,2); - connect( m_pRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemove() ) ); - connect( m_pAdd, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdd() ) ); - connect( m_pOpen, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpen() ) ); - connect( m_pModify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotModify() ) ); + connect( m_pRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) ); + connect( m_pAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) ); + connect( m_pOpen, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpen() ) ); + connect( m_pModify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotModify() ) ); updateButton(); diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp index 5a4a288d..f35eafc6 100644 --- a/lib/kofficeui/KoCharSelectDia.cpp +++ b/lib/kofficeui/KoCharSelectDia.cpp @@ -57,7 +57,7 @@ void KoCharSelectDia::initDialog(const TQChar &_chr, const TQString &_font, bool grid = new TQGridLayout( page, 1, 1, 0, KDialog::spacingHint() ); charSelect = new KCharSelect( page, "", _font, _chr ); - connect(charSelect, TQT_SIGNAL(doubleClicked()),this, TQT_SLOT(slotDoubleClicked())); + connect(charSelect, TQ_SIGNAL(doubleClicked()),this, TQ_SLOT(slotDoubleClicked())); charSelect->resize( charSelect->sizeHint() ); charSelect->enableFontCombo( true ); grid->addWidget( charSelect, 0, 0 ); diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index 4f81388c..f7da0119 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -91,10 +91,10 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool if (withMenus) { TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", - TDEStdAccel::undo(), this, TQT_SLOT( undo() ), + TDEStdAccel::undo(), this, TQ_SLOT( undo() ), actionCollection, /*KStdAction::stdName( KStdAction::Undo )*/"koffice_undo" ); - connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); - connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); + connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) ); + connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); m_undo = undo; m_undoPopup = undo->popupMenu(); d->m_undoListBox = new KoListBox( m_undoPopup ); @@ -104,17 +104,17 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool d->m_undoLabel = new TQLabel( m_undoPopup); m_undoPopup->insertItem(d->m_undoLabel); - connect( d->m_undoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); - connect( d->m_undoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotUndoActivated( TQListBoxItem * ) ) ); + connect( d->m_undoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); + connect( d->m_undoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotUndoActivated( TQListBoxItem * ) ) ); - connect( d->m_undoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); + connect( d->m_undoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeUndoNumberOfSelectedItem( int ))); TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", - TDEStdAccel::redo(), this, TQT_SLOT( redo() ), + TDEStdAccel::redo(), this, TQ_SLOT( redo() ), actionCollection, /*KStdAction::stdName( KStdAction::Redo )*/ "koffice_redo"); - connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); - connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); + connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) ); + connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); m_redo = redo; m_redoPopup = redo->popupMenu(); d->m_redoListBox = new KoListBox( m_redoPopup ); @@ -125,15 +125,15 @@ KoCommandHistory::KoCommandHistory(TDEActionCollection * actionCollection, bool m_redoPopup->insertItem(d->m_redoLabel); - connect( d->m_redoListBox, TQT_SIGNAL( selected( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); - connect( d->m_redoListBox, TQT_SIGNAL(clicked ( TQListBoxItem *)), this, TQT_SLOT( slotRedoActivated( TQListBoxItem * ) ) ); - connect( d->m_redoListBox, TQT_SIGNAL( changeNumberOfSelectedItem( int )), this, TQT_SLOT( slotChangeRedoNumberOfSelectedItem( int ))); + connect( d->m_redoListBox, TQ_SIGNAL( selected( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); + connect( d->m_redoListBox, TQ_SIGNAL(clicked ( TQListBoxItem *)), this, TQ_SLOT( slotRedoActivated( TQListBoxItem * ) ) ); + connect( d->m_redoListBox, TQ_SIGNAL( changeNumberOfSelectedItem( int )), this, TQ_SLOT( slotChangeRedoNumberOfSelectedItem( int ))); } else { - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection, "koffice_undo"); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection, "koffice_redo"); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection, "koffice_undo"); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection, "koffice_redo"); m_undoPopup = 0L; m_redoPopup = 0L; d->m_redoListBox = 0L; diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp index 2db2bd31..8d200c08 100644 --- a/lib/kofficeui/KoContextCelp.cpp +++ b/lib/kofficeui/KoContextCelp.cpp @@ -286,11 +286,11 @@ KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent ) setBackgroundMode( PaletteLight ); - connect( m_upButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingUp() ) ); - connect( m_downButton, TQT_SIGNAL( pressed() ), this, TQT_SLOT( startScrollingDown() ) ); - connect( m_upButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) ); - connect( m_downButton, TQT_SIGNAL( released() ), this, TQT_SLOT( stopScrolling() ) ); - connect( m_helpView, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_upButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingUp() ) ); + connect( m_downButton, TQ_SIGNAL( pressed() ), this, TQ_SLOT( startScrollingDown() ) ); + connect( m_upButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) ); + connect( m_downButton, TQ_SIGNAL( released() ), this, TQ_SLOT( stopScrolling() ) ); + connect( m_helpView, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoHelpWidget::KoHelpWidget void KoHelpWidget::updateButtons() @@ -390,9 +390,9 @@ KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent ) m_isSticky = false; setFocusPolicy( TQWidget::StrongFocus ); - connect( m_close, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( wantsToBeClosed() ) ); - connect( m_sticky, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( setSticky( bool ) ) ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_close, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( wantsToBeClosed() ) ); + connect( m_sticky, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( setSticky( bool ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpPopup::KoContextHelpPopup KoContextHelpPopup::~KoContextHelpPopup() @@ -511,9 +511,9 @@ KoContextHelpAction::KoContextHelpAction( TDEActionCollection* parent, TQWidget* : TDEToggleAction( i18n( "Context Help" ), BarIcon( "help" ), TDEShortcut( "CTRL+SHIFT+F1" ), 0, 0, parent, "help_context" ) { m_popup = new KoContextHelpPopup( 0L ); - connect( m_popup, TQT_SIGNAL( wantsToBeClosed() ), this, TQT_SLOT( closePopup() ) ); - connect( this, TQT_SIGNAL( toggled( bool ) ), m_popup, TQT_SLOT( setShown( bool ) ) ); - connect( m_popup, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_popup, TQ_SIGNAL( wantsToBeClosed() ), this, TQ_SLOT( closePopup() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), m_popup, TQ_SLOT( setShown( bool ) ) ); + connect( m_popup, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpAction::KoContextHelpAction KoContextHelpAction::~KoContextHelpAction() @@ -547,7 +547,7 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name ) this->setMinimumSize( 180, 120 ); this->show(); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpWidget::KoContextHelpWidget KoContextHelpWidget::~KoContextHelpWidget() @@ -578,7 +578,7 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name ) mainWidget->show(); setWidget( mainWidget ); setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 ); - connect( m_helpViewer, TQT_SIGNAL( linkClicked( const TQString& ) ), this, TQT_SIGNAL( linkClicked( const TQString& ) ) ); + connect( m_helpViewer, TQ_SIGNAL( linkClicked( const TQString& ) ), this, TQ_SIGNAL( linkClicked( const TQString& ) ) ); } // KoContextHelpDocker::KoContextHelpDocker KoContextHelpDocker::~KoContextHelpDocker() diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp index bb937a7f..0ae29083 100644 --- a/lib/kofficeui/KoEditPath.cpp +++ b/lib/kofficeui/KoEditPath.cpp @@ -80,7 +80,7 @@ KoChangePathDia::KoChangePathDia( const TQString & _path, TQWidget *parent, cons m_urlReq->lineEdit()->setText( _path ); m_urlReq->fileDialog()->setMode(KFile::Directory | KFile::LocalOnly); m_defaultPath = new TQCheckBox( i18n("Default path"), page ); - connect( m_defaultPath, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( slotChangeDefaultValue( bool ))); + connect( m_defaultPath, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( slotChangeDefaultValue( bool ))); slotChangeDefaultValue( _path.isEmpty() ); m_defaultPath->setChecked( _path.isEmpty() ); } diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp index 740a7191..fc5e3f96 100644 --- a/lib/kofficeui/KoGuideLineDia.cpp +++ b/lib/kofficeui/KoGuideLineDia.cpp @@ -63,7 +63,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, m_hButton = new TQRadioButton( i18n( "Horizontal" ), group ); m_vButton = new TQRadioButton( i18n( "Vertical" ), group ); - connect( group, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotOrientationChanged() ) ); + connect( group, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotOrientationChanged() ) ); m_vButton->setChecked( true );; @@ -73,7 +73,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect, m_position->setFocus(); label->setBuddy( m_position ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } @@ -104,9 +104,9 @@ void KoGuideLineDia::slotOrientationChanged() m_position->setMaxValue( TQMAX( 0.0, m_rect.bottom() ) ); if ( ! m_positionChanged ) { - disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); m_position->changeValue( m_pos.y() ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } } else if ( m_vButton->isChecked() ) @@ -115,9 +115,9 @@ void KoGuideLineDia::slotOrientationChanged() m_position->setMaxValue( TQMAX( 0.0, m_rect.right() ) ); if ( ! m_positionChanged ) { - disconnect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + disconnect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); m_position->changeValue( m_pos.x() ); - connect( m_position, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotPositionChanged() ) ); + connect( m_position, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotPositionChanged() ) ); } } } diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index cb25ace9..f0c1bb73 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -41,9 +41,9 @@ public: Popup( KoGuides * guides ) { m_title = insertTitle( i18n( "Guide Line" ) ); - m_delete = insertItem( i18n( "&Delete" ), guides, TQT_SLOT( slotRemove() ) ); + m_delete = insertItem( i18n( "&Delete" ), guides, TQ_SLOT( slotRemove() ) ); m_seperator = insertSeparator(); - m_pos = insertItem( i18n( "&Set Position..." ), guides, TQT_SLOT( slotChangePosition() ) ); + m_pos = insertItem( i18n( "&Set Position..." ), guides, TQ_SLOT( slotChangePosition() ) ); } void update( int count ) diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index c0866e3d..f0ff9ff1 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -44,24 +44,24 @@ KoInsertLinkDia::KoInsertLinkDia( TQWidget *parent, const char *name, bool displ bookmarkLink = 0L; TQVBox *page=addVBoxPage(i18n("Internet"), TQString(),BarIcon("text-html",TDEIcon::SizeMedium)); internetLink = new internetLinkPage(page ); - connect(internetLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ( ))); + connect(internetLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ( ))); page=addVBoxPage(i18n("Mail & News"), TQString(),BarIcon("mail_generic",TDEIcon::SizeMedium)); mailLink = new mailLinkPage(page ); - connect(mailLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(mailLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); page=addVBoxPage(i18n("File"), TQString(),BarIcon("document-new",TDEIcon::SizeMedium)); fileLink = new fileLinkPage(page ); - connect(fileLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(fileLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); if ( displayBookmarkLink) { page=addVBoxPage(i18n("Bookmark"), TQString(),BarIcon("bookmark",TDEIcon::SizeMedium)); bookmarkLink = new bookmarkLinkPage(page ); - connect(bookmarkLink,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged ())); + connect(bookmarkLink,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged ())); } - connect( this, TQT_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQT_SLOT( tabChanged(TQWidget *) ) ); + connect( this, TQ_SIGNAL( aboutToShowPage(TQWidget *) ), this, TQ_SLOT( tabChanged(TQWidget *) ) ); slotTextChanged ( ); resize(400,300); @@ -245,8 +245,8 @@ internetLinkPage::internetLinkPage( TQWidget *parent , char *name ) m_linkName->setFocus(); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -318,8 +318,8 @@ bookmarkLinkPage::bookmarkLinkPage( TQWidget *parent , char *name ) m_linkName->setFocus(); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -397,8 +397,8 @@ mailLinkPage::mailLinkPage( TQWidget *parent , char *name ) lay2->addWidget(m_hrefName); lay2->addStretch( 1 ); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); lay2->addWidget( bar1 ); @@ -486,7 +486,7 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) recentFile->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ); - connect( recentFile , TQT_SIGNAL(highlighted ( const TQString &)), this, TQT_SLOT( slotSelectRecentFile( const TQString & ))); + connect( recentFile , TQ_SIGNAL(highlighted ( const TQString &)), this, TQ_SLOT( slotSelectRecentFile( const TQString & ))); tmpTQLabel = new TQLabel( this); lay2->addWidget(tmpTQLabel); @@ -497,8 +497,8 @@ fileLinkPage::fileLinkPage( TQWidget *parent , char *name ) lay2->addWidget(m_hrefName); lay2->addStretch( 1 ); - connect(m_linkName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); - connect(m_hrefName,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(textChanged ( const TQString & ))); + connect(m_linkName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); + connect(m_hrefName,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(textChanged ( const TQString & ))); KSeparator* bar1 = new KSeparator( KSeparator::HLine, this); bar1->setFixedHeight( 10 ); diff --git a/lib/kofficeui/KoKoolBar.cpp b/lib/kofficeui/KoKoolBar.cpp index ce848874..997c6801 100644 --- a/lib/kofficeui/KoKoolBar.cpp +++ b/lib/kofficeui/KoKoolBar.cpp @@ -53,7 +53,7 @@ int KoKoolBar::insertItem( int _grp, const TQPixmap& _pix, const TQString& _text KoKoolBarItem *item = new KoKoolBarItem( g, _pix, _text ); if ( _obj != 0L && _slot != 0L ) - connect( item, TQT_SIGNAL( pressed( int, int ) ), _obj, _slot ); + connect( item, TQ_SIGNAL( pressed( int, int ) ), _obj, _slot ); g->append( item ); if ( g->id() == m_iActiveGroup ) @@ -245,13 +245,13 @@ void KoKoolBarBox::resizeEvent( TQResizeEvent * ) { m_pButtonUp = new TQPushButton( this ); m_pButtonUp->setPixmap( TQPixmap( UserIcon( "koKoolBarUp" ) ) ); - connect( m_pButtonUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollUp() ) ); + connect( m_pButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollUp() ) ); } if ( m_pButtonDown == 0L ) { m_pButtonDown = new TQPushButton( this ); m_pButtonDown->setPixmap( TQPixmap( UserIcon( "koKoolBarDown" ) ) ); - connect( m_pButtonDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( scrollDown() ) ); + connect( m_pButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( scrollDown() ) ); } m_pButtonUp->show(); m_pButtonUp->raise(); @@ -415,7 +415,7 @@ KoKoolBarGroup::KoKoolBarGroup( KoKoolBar *_bar, const TQString& _text ) : m_bEnabled = true; - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( pressed() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( pressed() ) ); m_id = g_koKoolBarId++; } diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp index 2d1e6b77..7cea44c1 100644 --- a/lib/kofficeui/KoPageLayoutColumns.cpp +++ b/lib/kofficeui/KoPageLayoutColumns.cpp @@ -42,8 +42,8 @@ KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& colu nColumns->setValue( m_columns.columns ); m_preview->setPageColumns( m_columns ); - connect( nColumns, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( nColChanged( int ) ) ); - connect( m_spacing, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( nSpaceChanged( double ) ) ); + connect( nColumns, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( nColChanged( int ) ) ); + connect( m_spacing, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( nSpaceChanged( double ) ) ); } void KoPageLayoutColumns::setEnableColumns(bool on) { diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp index 3c0678cc..ffb0bd25 100644 --- a/lib/kofficeui/KoPageLayoutDia.cpp +++ b/lib/kofficeui/KoPageLayoutDia.cpp @@ -257,8 +257,8 @@ void KoPageLayoutDia::setupTab1( bool enableBorders ) m_pageSizeTab = new KoPageLayoutSize(tab1, m_layout, m_unit, m_column, !(flags & DISABLE_UNIT), enableBorders ); lay->addWidget(m_pageSizeTab); m_pageSizeTab->show(); - connect (m_pageSizeTab, TQT_SIGNAL( propertyChange(KoPageLayout&)), - this, TQT_SLOT (sizeUpdated( KoPageLayout&))); + connect (m_pageSizeTab, TQ_SIGNAL( propertyChange(KoPageLayout&)), + this, TQ_SLOT (sizeUpdated( KoPageLayout&))); } void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) { @@ -365,8 +365,8 @@ void KoPageLayoutDia::setupTab3() m_columnsTab->layout()->setMargin(0); lay->addWidget(m_columnsTab); m_columnsTab->show(); - connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)), - this, TQT_SLOT (columnsUpdated( KoColumns&))); + connect (m_columnsTab, TQ_SIGNAL( propertyChange(KoColumns&)), + this, TQ_SLOT (columnsUpdated( KoColumns&))); } void KoPageLayoutDia::columnsUpdated(KoColumns &columns) { diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp index 7cc70ca5..aaeadaa9 100644 --- a/lib/kofficeui/KoPageLayoutSize.cpp +++ b/lib/kofficeui/KoPageLayoutSize.cpp @@ -56,7 +56,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgUnit->insertStringList( KoUnit::listOfUnitName() ); cpgUnit->setCurrentItem( unit ); unitLayout->addWidget( cpgUnit, 0, TQt::AlignLeft | TQt::AlignVCenter ); - connect( cpgUnit, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( setUnitInt( int ) ) ); + connect( cpgUnit, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( setUnitInt( int ) ) ); } else { TQString str=KoUnit::unitDescription(unit); @@ -79,7 +79,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, cpgFormat = new TQComboBox( false, formatPageSize, "cpgFormat" ); cpgFormat->insertStringList( KoPageFormat::allFormats() ); lpgFormat->setBuddy( cpgFormat ); - connect( cpgFormat, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( formatChanged( int ) ) ); + connect( cpgFormat, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( formatChanged( int ) ) ); // spacer formatPageSize->setStretchFactor( new TQWidget( formatPageSize ), 10 ); @@ -95,7 +95,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgWidth->setBuddy( epgWidth ); if ( m_layout.format != PG_CUSTOM ) epgWidth->setEnabled( false ); - connect( epgWidth, TQT_SIGNAL( valueChangedPt(double) ), this, TQT_SLOT( widthChanged(double) ) ); + connect( epgWidth, TQ_SIGNAL( valueChangedPt(double) ), this, TQ_SLOT( widthChanged(double) ) ); // label height TQLabel *lpgHeight = new TQLabel( i18n( "&Height:" ), formatCustomSize ); @@ -105,7 +105,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lpgHeight->setBuddy( epgHeight ); if ( m_layout.format != PG_CUSTOM ) epgHeight->setEnabled( false ); - connect( epgHeight, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( heightChanged(double) ) ); + connect( epgHeight, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( heightChanged(double) ) ); // --------------- orientation --------------- m_orientGroup = new TQHButtonGroup( i18n( "Orientation" ), this ); @@ -122,7 +122,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, lbLandscape->setMaximumWidth( lbLandscape->pixmap()->width() ); new TQRadioButton( i18n("La&ndscape"), m_orientGroup ); - connect( m_orientGroup, TQT_SIGNAL (clicked (int)), this, TQT_SLOT( orientationChanged(int) )); + connect( m_orientGroup, TQ_SIGNAL (clicked (int)), this, TQ_SLOT( orientationChanged(int) )); // --------------- page margins --------------- TQVGroupBox *marginsFrame = new TQVGroupBox( i18n( "Margins" ), this ); @@ -136,22 +136,22 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, // left margin ebrLeft = new KoUnitDoubleSpinBox( marginsFrame, "Left" ); marginsLayout->addWidget( ebrLeft, 1, 0 ); - connect( ebrLeft, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( leftChanged( double ) ) ); + connect( ebrLeft, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( leftChanged( double ) ) ); // right margin ebrRight = new KoUnitDoubleSpinBox( marginsFrame, "Right" ); marginsLayout->addWidget( ebrRight, 1, 2 ); - connect( ebrRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); + connect( ebrRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) ); // top margin ebrTop = new KoUnitDoubleSpinBox( marginsFrame, "Top" ); marginsLayout->addWidget( ebrTop, 0, 1 , TQt::AlignCenter ); - connect( ebrTop, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( topChanged( double ) ) ); + connect( ebrTop, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( topChanged( double ) ) ); // bottom margin ebrBottom = new KoUnitDoubleSpinBox( marginsFrame, "Bottom" ); marginsLayout->addWidget( ebrBottom, 2, 1, TQt::AlignCenter ); - connect( ebrBottom, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( bottomChanged( double ) ) ); + connect( ebrBottom, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( bottomChanged( double ) ) ); // ------------- preview ----------- pgPreview = new KoPagePreview( this, "Preview", m_layout ); diff --git a/lib/kofficeui/KoPartSelectAction.cpp b/lib/kofficeui/KoPartSelectAction.cpp index e5aaf73c..3e1d013e 100644 --- a/lib/kofficeui/KoPartSelectAction.cpp +++ b/lib/kofficeui/KoPartSelectAction.cpp @@ -40,7 +40,7 @@ KoPartSelectAction::KoPartSelectAction( const TQString& text, const TQString& ic : TDEActionMenu( text, icon, parent, name ) { if (receiver) - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); init(); } @@ -53,7 +53,7 @@ void KoPartSelectAction::init() KService::Ptr serv = (*it).service(); if (!serv->genericName().isEmpty()) { TDEAction *action = new TDEAction( serv->genericName().replace('&',"&&"), serv->icon(), 0, - this, TQT_SLOT( slotActionActivated() ), + this, TQ_SLOT( slotActionActivated() ), parentCollection(), serv->name().latin1() ); insert( action ); } diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp index 897aba8d..8119ade3 100644 --- a/lib/kofficeui/KoPartSelectDia.cpp +++ b/lib/kofficeui/KoPartSelectDia.cpp @@ -38,10 +38,10 @@ KoPartSelectDia::KoPartSelectDia( TQWidget* parent, const char* name ) : listview->setAllColumnsShowFocus( TRUE ); listview->setShowSortIndicator( TRUE ); setMainWidget( listview ); - connect( listview, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotOk() ) ); - connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( selectionChanged( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotOk() ) ); + connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( selectionChanged( TQListViewItem * ) ) ); // Query for documents m_lstEntries = KoDocumentEntry::query(); diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp index b5ab6ec9..500496d6 100644 --- a/lib/kofficeui/KoRuler.cpp +++ b/lib/kofficeui/KoRuler.cpp @@ -136,7 +136,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, TQt::Orientation _orient setupMenu(); // For compatibility, emitting doubleClicked shall emit openPageLayoutDia - connect( this, TQT_SIGNAL( doubleClicked() ), this, TQT_SIGNAL( openPageLayoutDia() ) ); + connect( this, TQ_SIGNAL( doubleClicked() ), this, TQ_SIGNAL( openPageLayoutDia() ) ); } /*================================================================*/ @@ -1014,12 +1014,12 @@ void KoRuler::setupMenu() if ( m_unit == unit ) d->rb_menu->setItemChecked( i, true ); } - connect( d->rb_menu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotMenuActivated( int ) ) ); + connect( d->rb_menu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotMenuActivated( int ) ) ); d->rb_menu->insertSeparator(); - d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQT_SLOT(pageLayoutDia())); + d->mPageLayout=d->rb_menu->insertItem(i18n("Page Layout..."), this, TQ_SLOT(pageLayoutDia())); d->rb_menu->insertSeparator(); - d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQT_SLOT(rbRemoveTab())); + d->mRemoveTab=d->rb_menu->insertItem(i18n("Remove Tabulator"), this, TQ_SLOT(rbRemoveTab())); d->rb_menu->setItemEnabled( d->mRemoveTab, false ); } diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index 0558c512..e8840c0b 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -57,7 +57,7 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, d = new KoSelectActionPrivate; setShowCurrentSelection(true); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int))); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int))); } KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const TQObject* receiver, @@ -65,8 +65,8 @@ KoSelectAction::KoSelectAction(const TQString &text, const TQString& icon, const { d = new KoSelectActionPrivate; - connect(this, TQT_SIGNAL(selectionChanged(int)), receiver, slot); - connect(popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(execute(int))); + connect(this, TQ_SIGNAL(selectionChanged(int)), receiver, slot); + connect(popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(execute(int))); } KoSelectAction::~KoSelectAction() @@ -105,7 +105,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) menu->setItemEnabled( id, false ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -116,8 +116,8 @@ int KoSelectAction::plug(TQWidget* widget, int index) int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); } else { TDEInstance *instance; @@ -128,8 +128,8 @@ int KoSelectAction::plug(TQWidget* widget, int index) instance = TDEGlobal::instance(); } - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); } @@ -138,7 +138,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) if (!whatsThis().isEmpty()) TQWhatsThis::add( bar->getButton(id_), whatsThis() ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->getButton(id_)->setPopup(popupMenu(), true ); @@ -156,7 +156,7 @@ int KoSelectAction::plug(TQWidget* widget, int index) bar->setItemEnabled( id, false ); addContainer( bar, id ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 8ee0799e..fb6074bc 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -43,8 +43,8 @@ class KOFFICEUI_EXPORT KoSelectAction : public TDEAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a selectionChanged(int) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp index 4e7c3931..bb90c7b9 100644 --- a/lib/kofficeui/KoTabBar.cpp +++ b/lib/kofficeui/KoTabBar.cpp @@ -363,17 +363,17 @@ KoTabBar::KoTabBar( TQWidget* parent, const char* name ) // initialize the scroll buttons d->scrollFirstButton = new TQToolButton( this ); - connect( d->scrollFirstButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollFirst() ) ); + connect( d->scrollFirstButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollFirst() ) ); d->scrollLastButton = new TQToolButton( this ); - connect( d->scrollLastButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollLast() ) ); + connect( d->scrollLastButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollLast() ) ); d->scrollBackButton = new TQToolButton( this ); - connect( d->scrollBackButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollBack() ) ); + connect( d->scrollBackButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollBack() ) ); d->scrollForwardButton = new TQToolButton( this ); - connect( d->scrollForwardButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( scrollForward() ) ); + connect( d->scrollForwardButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( scrollForward() ) ); d->layoutButtons(); d->updateButtons(); } @@ -634,7 +634,7 @@ void KoTabBar::autoScrollBack() if( !canScrollBack() ) d->autoScroll = false; else - TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollBack() ) ); + TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollBack() ) ); } void KoTabBar::autoScrollForward() @@ -646,7 +646,7 @@ void KoTabBar::autoScrollForward() if( !canScrollForward() ) d->autoScroll = false; else - TQTimer::singleShot( 400, this, TQT_SLOT( autoScrollForward() ) ); + TQTimer::singleShot( 400, this, TQ_SLOT( autoScrollForward() ) ); } void KoTabBar::paintEvent( TQPaintEvent* ) diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp index 8fc563c7..ed02ebea 100644 --- a/lib/kofficeui/KoTabChooser.cpp +++ b/lib/kofficeui/KoTabChooser.cpp @@ -155,10 +155,10 @@ void KoTabChooser::setupMenu() { rb_menu = new TQPopupMenu(); TQ_CHECK_PTR( rb_menu ); - mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQT_SLOT( rbLeft() ) ); - mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQT_SLOT( rbCenter() ) ); - mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQT_SLOT( rbRight() ) ); - mDecPoint = rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQT_SLOT( rbDecPoint() ) ); + mLeft = rb_menu->insertItem( i18n( "Tabulator &Left" ), this, TQ_SLOT( rbLeft() ) ); + mCenter = rb_menu->insertItem( i18n( "Tabulator &Center" ), this, TQ_SLOT( rbCenter() ) ); + mRight = rb_menu->insertItem( i18n( "Tabulator &Right" ), this, TQ_SLOT( rbRight() ) ); + mDecPoint = rb_menu->insertItem( i18n( "Tabulator &Decimal Point" ), this, TQ_SLOT( rbDecPoint() ) ); rb_menu->setCheckable( false ); } diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index c42ff001..fa9b52cd 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -335,8 +335,8 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout d->m_instance->config()->setGroup( oldGroup ); d->m_recent->showPreviews(); - connect(d->m_recent, TQT_SIGNAL( doubleClicked ( TQIconViewItem * ) ), - this, TQT_SLOT( recentSelected( TQIconViewItem * ) ) ); + connect(d->m_recent, TQ_SIGNAL( doubleClicked ( TQIconViewItem * ) ), + this, TQ_SLOT( recentSelected( TQIconViewItem * ) ) ); } @@ -377,11 +377,11 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * } d->m_filedialog->setMimeFilter( mimeFilter ); - connect(d->m_filedialog, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT ( slotOk() )); + connect(d->m_filedialog, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT ( slotOk() )); - connect(d->m_filedialog, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT ( slotCancel() )); + connect(d->m_filedialog, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT ( slotCancel() )); } @@ -445,11 +445,11 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou canvas->sort(); canvas->setSelectionMode(TQIconView::Single); - connect( canvas, TQT_SIGNAL( clicked ( TQIconViewItem * ) ), - this, TQT_SLOT( currentChanged( TQIconViewItem * ) ) ); + connect( canvas, TQ_SIGNAL( clicked ( TQIconViewItem * ) ), + this, TQ_SLOT( currentChanged( TQIconViewItem * ) ) ); - connect( canvas, TQT_SIGNAL( doubleClicked( TQIconViewItem * ) ), - this, TQT_SLOT( chosen(TQIconViewItem *) ) ); + connect( canvas, TQ_SIGNAL( doubleClicked( TQIconViewItem * ) ), + this, TQ_SLOT( chosen(TQIconViewItem *) ) ); entriesnumber++; } diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h index b2dd4df5..0295da1a 100644 --- a/lib/kofficeui/KoTemplateChooseDia.h +++ b/lib/kofficeui/KoTemplateChooseDia.h @@ -99,10 +99,10 @@ class KoTCDRecentFilesIconView : public KFileIconView { KoTCDRecentFilesIconView( TQWidget* parent, const char* name ) : KFileIconView( parent, name ), toolTip(0) { - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); } virtual ~KoTCDRecentFilesIconView(); protected: diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index cb418650..ae827d75 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -114,8 +114,8 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst namefield->addWidget(label); d->m_name=new KLineEdit(mainwidget); d->m_name->setFocus(); - connect(d->m_name, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(slotNameChanged(const TQString &))); + connect(d->m_name, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(slotNameChanged(const TQString &))); namefield->addWidget(d->m_name); label=new TQLabel(i18n("Group:"), mainwidget); @@ -133,10 +133,10 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst TQHBoxLayout *bbox=new TQHBoxLayout(leftbox); d->m_add=new TQPushButton(i18n("&Add Group..."), mainwidget); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddGroup())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddGroup())); bbox->addWidget(d->m_add); d->m_remove=new TQPushButton(i18n("&Remove"), mainwidget); - connect(d->m_remove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemove())); + connect(d->m_remove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemove())); bbox->addWidget(d->m_remove); TQVBoxLayout *rightbox=new TQVBoxLayout(mbox); @@ -148,15 +148,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst pixlayout->addStretch(1); d->m_default=new TQRadioButton(i18n("&Default"), pixbox); d->m_default->setChecked(true); - connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault())); + connect(d->m_default, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDefault())); pixlayout->addWidget(d->m_default); TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout); d->m_custom=new TQRadioButton(i18n("Custom"), pixbox); d->m_custom->setChecked(false); - connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom())); + connect(d->m_custom, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCustom())); custombox->addWidget(d->m_custom); d->m_select=new TQPushButton(i18n("&Select..."), pixbox); - connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect())); + connect(d->m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelect())); custombox->addWidget(d->m_select, 1); custombox->addStretch(1); pixlayout->addStretch(1); @@ -178,7 +178,7 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, TDEInst d->m_changed=false; updatePixmap(); - connect(d->m_groups,TQT_SIGNAL( selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(d->m_groups,TQ_SIGNAL( selectionChanged()),this,TQ_SLOT(slotSelectionChanged())); d->m_remove->setEnabled(d->m_groups->currentItem()); } diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 86d2ad88..ceba3d71 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -52,7 +52,7 @@ KoToolBox::KoToolBox( TDEMainWindow *mainWin, const char* name, TDEInstance* ins m_buttonGroup = new TQButtonGroup( 0L ); m_buttonGroup->setExclusive( true ); - connect( m_buttonGroup, TQT_SIGNAL( pressed( int ) ), this, TQT_SLOT( slotButtonPressed( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( pressed( int ) ), this, TQ_SLOT( slotButtonPressed( int ) ) ); m_tools.setAutoDelete( true ); // Create separate lists for the various sorts of tools diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index f202177c..7e03f0bf 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -76,29 +76,29 @@ TQPopupMenu* KoColorPanel::createColorPopup( KoColorPanel::MenuStyle style, cons p.fillRect( 0, 0, 12, 12, defaultColor ); p.end(); proxy = new KoColorPopupProxy( defaultColor, 0, menu, "color proxy" ); - connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); - menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQT_SLOT( slotDefaultColor() ) ); + connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + menu->insertItem( TQIconSet( pixmap ), i18n( "Default Color" ), proxy, TQ_SLOT( slotDefaultColor() ) ); menu->insertSeparator(); } KoColorPanel* panel = new KoColorPanel( menu, "default colors" ); panel->insertDefaultColors(); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); menu->insertItem( panel ); if ( style == CustomColors ) { menu->insertSeparator(); panel = new KoColorPanel( menu, "custom panel" ); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); menu->insertItem( panel ); if ( !proxy ) { proxy = new KoColorPopupProxy( TQColor(), panel, menu, "color proxy" ); - connect( proxy, TQT_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); + connect( proxy, TQ_SIGNAL( colorSelected( const TQColor& ) ), receiver, slot ); } else proxy->setRecentColorPanel( panel ); menu->insertSeparator(); - menu->insertItem( i18n( "More Colors..." ), proxy, TQT_SLOT( slotMoreColors() ) ); + menu->insertItem( i18n( "More Colors..." ), proxy, TQ_SLOT( slotMoreColors() ) ); } return menu; @@ -833,7 +833,7 @@ bool KoToolButton::eventFilter( TQObject* o, TQEvent* e ) void KoToolButton::init() { m_popup = KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::yellow, this, - TQT_SLOT( colorSelected( const TQColor& ) ), + TQ_SLOT( colorSelected( const TQColor& ) ), this, "no-name" ); // We are interested in the mouse clicks on the arrow button m_popup->installEventFilter( this ); diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp index 5c5bdbd9..7bf6d308 100644 --- a/lib/kofficeui/KoUnitWidgets.cpp +++ b/lib/kofficeui/KoUnitWidgets.cpp @@ -129,7 +129,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, const char *name ) setAcceptLocalizedNumbers( true ); setUnit( KoUnit::U_PT ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } @@ -152,7 +152,7 @@ KoUnitDoubleSpinBox::KoUnitDoubleSpinBox( TQWidget *parent, changeValue( value ); setLineStep( 0.5 ); - connect(this, TQT_SIGNAL(valueChanged( double )), TQT_SLOT(privateValueChanged())); + connect(this, TQ_SIGNAL(valueChanged( double )), TQ_SLOT(privateValueChanged())); } void @@ -292,7 +292,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, const char *name ) lineEdit()->setValidator( m_validator ); setUnit( KoUnit::U_PT ); changeValue( KoUnit::ptToUnit( 0.0, KoUnit::U_PT ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, double upper, double value, KoUnit::Unit unit, @@ -305,7 +305,7 @@ KoUnitDoubleComboBox::KoUnitDoubleComboBox( TQWidget *parent, double lower, doub lineEdit()->setValidator( m_validator ); setUnit( unit ); changeValue( KoUnit::ptToUnit( value, unit ) ); - connect( this, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( this, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } void @@ -386,16 +386,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } @@ -410,16 +410,16 @@ KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double low up->setMaximumHeight( 15 ); up->setMaximumWidth( 15 ); layout->addWidget( up, 0, 0 ); - connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); + connect( up, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); TQPushButton *down = new TQPushButton( "-", this ); down->setMaximumHeight( 15 ); down->setMaximumWidth( 15 ); layout->addWidget( down, 1, 0 ); - connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); + connect( down, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name ); - connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) ); + connect( m_combo, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( valueChanged( double ) ) ); layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 ); } diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp index 78a4fc20..c3e37a32 100644 --- a/lib/kofficeui/KoZoomAction.cpp +++ b/lib/kofficeui/KoZoomAction.cpp @@ -108,8 +108,8 @@ void KoZoomAction::init() setCurrentItem( values.findIndex( i18n("%1%").arg( 100 ) ) ); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - TQT_SLOT( activated( const TQString& ) ) ); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + TQ_SLOT( activated( const TQString& ) ) ); } #include "KoZoomAction.moc" diff --git a/lib/kofficeui/Kolinestyleaction.h b/lib/kofficeui/Kolinestyleaction.h index e310c226..e67afa4f 100644 --- a/lib/kofficeui/Kolinestyleaction.h +++ b/lib/kofficeui/Kolinestyleaction.h @@ -38,8 +38,8 @@ class KOFFICEUI_EXPORT KoLineStyleAction : public KoSelectAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a selectionChanged(int) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a selectionChanged(int) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index a000ca56..0abb5247 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -70,7 +70,7 @@ KoLineWidthAction::KoLineWidthAction(const TQString &text, const TQString& icon, createMenu(); - connect(this, TQT_SIGNAL(lineWidthChanged(double)), receiver, slot); + connect(this, TQ_SIGNAL(lineWidthChanged(double)), receiver, slot); } KoLineWidthAction::~KoLineWidthAction() diff --git a/lib/kofficeui/Kolinewidthaction.h b/lib/kofficeui/Kolinewidthaction.h index 4adc9266..737cea1c 100644 --- a/lib/kofficeui/Kolinewidthaction.h +++ b/lib/kofficeui/Kolinewidthaction.h @@ -42,8 +42,8 @@ class KOFFICEUI_EXPORT KoLineWidthAction : public KoSelectAction /** Same as above, but it also connects a slot to the selectionChanged(int) signal. * @param text The text that will be displayed. * @param icon The dynamically loaded icon that goes with this action. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a lineWidthChanged(double) signal is emited. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a lineWidthChanged(double) signal is emited. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index d34c2392..a27d7f23 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -252,10 +252,10 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) instance = TDEGlobal::instance(); */ id = menu->insertItem( iconSet( TDEIcon::Small, 0 ), text(), this,//dsweet - TQT_SLOT( slotActivated() ), 0, -1, index ); + TQ_SLOT( slotActivated() ), 0, -1, index ); } else - id = menu->insertItem( text(), this, TQT_SLOT( slotActivated() ), //dsweet + id = menu->insertItem( text(), this, TQ_SLOT( slotActivated() ), //dsweet 0, -1, index ); updateShortcut( menu, id ); @@ -269,7 +269,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) menu->setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( parentCollection() ) parentCollection()->connectHighlight( menu, this ); @@ -289,13 +289,13 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) if ( icon().isEmpty() ) // old code using TQIconSet directly { - bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), + bar->insertButton( iconSet( TDEIcon::Small ).pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); } else - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); bar->getButton( id_ )->setName( TQCString("toolbutton_")+name() ); @@ -308,7 +308,7 @@ int TDESelectColorAction::plug( TQWidget* w, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( parentCollection() ) parentCollection()->connectHighlight( bar, this ); diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index c7287a72..5e38c950 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -44,7 +44,7 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, TQBoxLayout* l = new TQHBoxLayout( w, KDialog::marginHint(), KDialog::spacingHint() ); TQGroupBox* b1 = new TQVGroupBox( TQString::fromLatin1( "KoColorPanel 1" ), w ); panel = new KoColorPanel( b1, "panel1" ); - connect( panel, TQT_SIGNAL( colorSelected( const TQColor& ) ), TQT_SLOT( slotColorSelected( const TQColor& ) ) ); + connect( panel, TQ_SIGNAL( colorSelected( const TQColor& ) ), TQ_SLOT( slotColorSelected( const TQColor& ) ) ); //panel->insertDefaultColors(); l->addWidget( b1 ); @@ -57,20 +57,20 @@ TopLevel::TopLevel( TQWidget* parent, const char* name) : TQMainWindow( parent, menuBar()->insertItem( "&File", file ); file->insertItem( "Custom + Default", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQt::red, this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Custom", KoColorPanel::createColorPopup( KoColorPanel::CustomColors, TQColor(), this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Plain + Default", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQt::green, this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertItem( "Plain", KoColorPanel::createColorPopup( KoColorPanel::Plain, TQColor(), this, - TQT_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); + TQ_SLOT( slotColorSelected( const TQColor& ) ), file, "blah" ) ); file->insertSeparator(); - file->insertItem( "Default Colors", this, TQT_SLOT( defaultColors() ), CTRL+Key_D ); - file->insertItem( "Insert Random Color", this, TQT_SLOT( insertRandomColor() ), CTRL+Key_R ); + file->insertItem( "Default Colors", this, TQ_SLOT( defaultColors() ), CTRL+Key_D ); + file->insertItem( "Insert Random Color", this, TQ_SLOT( insertRandomColor() ), CTRL+Key_R ); file->insertSeparator(); - file->insertItem( "Clear", this, TQT_SLOT( clearColors() ), CTRL+Key_C ); + file->insertItem( "Clear", this, TQ_SLOT( clearColors() ), CTRL+Key_C ); file->insertSeparator(); - file->insertItem( "&Quit", tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); + file->insertItem( "&Quit", tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q ); TDEToolBar* toolBar = new TDEToolBar( this ); addDockWindow( toolBar ); diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 8eaf1d9d..3328b474 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -78,7 +78,7 @@ TTDESelectColorAction::TTDESelectColorAction( const TQString& text, Type type, d->defaultColor=TQColor(); setText(text); m_type = type; - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); init(); } @@ -87,10 +87,10 @@ void TTDESelectColorAction::init() m_pStandardColor = new TKColorPanel(); m_pRecentColor = new TKColorPanel(); - connect(m_pStandardColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&))); - connect(m_pStandardColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject())); - connect(m_pRecentColor,TQT_SIGNAL(colorSelected(const TQColor&)),TQT_SLOT(panelColorSelected(const TQColor&))); - connect(m_pRecentColor,TQT_SIGNAL(reject()),TQT_SLOT(panelReject())); + connect(m_pStandardColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&))); + connect(m_pStandardColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject())); + connect(m_pRecentColor,TQ_SIGNAL(colorSelected(const TQColor&)),TQ_SLOT(panelColorSelected(const TQColor&))); + connect(m_pRecentColor,TQ_SIGNAL(reject()),TQ_SLOT(panelReject())); m_pRecentColor->clear(); @@ -102,17 +102,17 @@ void TTDESelectColorAction::init() switch (m_type) { case TextColor: - m_pMenu->insertItem(i18n("More Text Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Text Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(black); setIcon("textcolor"); break; case LineColor: - m_pMenu->insertItem(i18n("More Line Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Line Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(black); setIcon("color_line"); break; case FillColor: - m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQT_SLOT(selectColorDialog())); + m_pMenu->insertItem(i18n("More Fill Colors..."),this,TQ_SLOT(selectColorDialog())); setCurrentColor(white); setIcon("color_fill"); break; @@ -122,11 +122,11 @@ void TTDESelectColorAction::init() if(d->defaultColorMenu) { m_pMenu->insertSeparator(); - m_pMenu->insertItem(i18n("Default Color"),this,TQT_SLOT(defaultColor())); + m_pMenu->insertItem(i18n("Default Color"),this,TQ_SLOT(defaultColor())); } - connect(m_pStandardColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); - connect(m_pRecentColor,TQT_SIGNAL(sizeChanged()),m_pMenu,TQT_SLOT(updateItemSize())); + connect(m_pStandardColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize())); + connect(m_pRecentColor,TQ_SIGNAL(sizeChanged()),m_pMenu,TQ_SLOT(updateItemSize())); } TTDESelectColorAction::~TTDESelectColorAction() @@ -368,7 +368,7 @@ void TKColorPanel::insertColor( const TQColor& color ) if ( m_activeColor == color ) f->setActive(true); - connect(f,TQT_SIGNAL(selected(const TQColor&)),TQT_SLOT(selected(const TQColor&))); + connect(f,TQ_SIGNAL(selected(const TQColor&)),TQ_SLOT(selected(const TQColor&))); addToGrid(f); } diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp index 6725812a..17ca8c29 100644 --- a/lib/kofficeui/ttdeaction.cpp +++ b/lib/kofficeui/ttdeaction.cpp @@ -65,13 +65,13 @@ int TTDEAction::plug(TQWidget* widget, int index) TTDEToolBarButton* b = new TTDEToolBarButton(icon(),plainText(),bar,name(),instance); // we don't need clicked() and buttonClicked(), do we? - // connect(b,TQT_SIGNAL(clicked()),TQT_SLOT(slotActivated())); + // connect(b,TQ_SIGNAL(clicked()),TQ_SLOT(slotActivated())); b->setIconMode(m_imode); initToolBarButton(b); bar->insertWidget( id_, 100, b, index ); addContainer(bar,id_); - connect( bar, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( bar, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); return containerCount() - 1; } @@ -80,7 +80,7 @@ int TTDEAction::plug(TQWidget* widget, int index) void TTDEAction::initToolBarButton(TTDEToolBarButton* button) { - connect(button,TQT_SIGNAL(buttonClicked()),TQT_SLOT(slotActivated())); + connect(button,TQ_SIGNAL(buttonClicked()),TQ_SLOT(slotActivated())); } TK::IconMode TTDEAction::iconMode() @@ -197,7 +197,7 @@ int TKBaseSelectAction::plug(TQWidget* widget, int index) bar->insertWidget( id_, 100, base, index ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); setCurrentItem(currentItem()); @@ -213,7 +213,7 @@ int TKBaseSelectAction::currentItem() void TKBaseSelectAction::initComboBox(TKComboBox* cb) { - connect(cb,TQT_SIGNAL(activated(int)),TQT_SLOT(slotActivated(int))); + connect(cb,TQ_SIGNAL(activated(int)),TQ_SLOT(slotActivated(int))); } void TKBaseSelectAction::setEditable(bool editable) @@ -260,7 +260,7 @@ TTDESelectAction::~TTDESelectAction() void TTDESelectAction::initComboBox(TKComboBox* cb) { TKBaseSelectAction::initComboBox(cb); - connect(cb,TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotActivated(const TQString&))); + connect(cb,TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotActivated(const TQString&))); cb->insertStringList(items()); } diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index 8188919e..16b36d35 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -99,9 +99,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQString& icon, const TQString& txt, setFocusPolicy( TQWidget::NoFocus ); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) ); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); installEventFilter(this); @@ -117,9 +117,9 @@ TTDEToolBarButton::TTDEToolBarButton( const TQPixmap& pixmap, const TQString& tx setFocusPolicy( TQWidget::NoFocus ); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotClicked()) ); - connect(this, TQT_SIGNAL(pressed()), TQT_SLOT(slotPressed()) ); - connect(this, TQT_SIGNAL(released()), TQT_SLOT(slotReleased()) ); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotClicked()) ); + connect(this, TQ_SIGNAL(pressed()), TQ_SLOT(slotPressed()) ); + connect(this, TQ_SIGNAL(released()), TQ_SLOT(slotReleased()) ); installEventFilter(this); @@ -272,7 +272,7 @@ void TTDEToolBarButton::setDelayedPopup (TQPopupMenu *p, bool toggle ) if (!d->m_delayTimer) { d->m_delayTimer = new TQTimer(this); - connect(d->m_delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDelayTimeout())); + connect(d->m_delayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDelayTimeout())); } setPopup(p); @@ -514,9 +514,9 @@ void TTDEToolBarButton::setToggle(bool flag) { d->m_isToggle = flag; if (flag == true) - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); else - disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); modeChange(); repaint(); diff --git a/lib/kopainter/koColorChooser.cpp b/lib/kopainter/koColorChooser.cpp index 02439a8c..35058916 100644 --- a/lib/kopainter/koColorChooser.cpp +++ b/lib/kopainter/koColorChooser.cpp @@ -54,12 +54,12 @@ KoColorChooser::KoColorChooser(TQWidget *parent, const char *name) : TQWidget(pa mColorSelector->setFixedHeight(20); mGrid->addMultiCellWidget(m_tab, 0, 1, 0, 4); mGrid->addMultiCellWidget(mColorSelector, 2, 2, 0, 4); - connect(mRGBWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mHSVWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); -// connect(mLABWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mGreyWidget, TQT_SIGNAL(colorChanged(const KoColor &)), this, TQT_SLOT(childColorChanged(const KoColor &))); - connect(mColorSelector, TQT_SIGNAL(valueChanged(int, int)), this, TQT_SLOT(slotChangeXY(int, int))); - connect(m_tab, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(mRGBWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mHSVWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); +// connect(mLABWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mGreyWidget, TQ_SIGNAL(colorChanged(const KoColor &)), this, TQ_SLOT(childColorChanged(const KoColor &))); + connect(mColorSelector, TQ_SIGNAL(valueChanged(int, int)), this, TQ_SLOT(slotChangeXY(int, int))); + connect(m_tab, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(slotCurrentChanged(TQWidget*))); slotChangeColor(KoColor::black()); } @@ -147,17 +147,17 @@ RGBWidget::RGBWidget(TQWidget *parent) : ColorWidget(parent) mGrid->addWidget(mGIn, 2, 4); mGrid->addWidget(mBIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mRSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRSliderChanged(int))); - connect(mGSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGSliderChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBSliderChanged(int))); + connect(mRSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRSliderChanged(int))); + connect(mGSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGSliderChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBSliderChanged(int))); /* connect spin box */ - connect(mRIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRInChanged(int))); - connect(mGIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGInChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int))); + connect(mRIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRInChanged(int))); + connect(mGIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGInChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBInChanged(int))); } ColorWidget::ColorWidget(TQWidget *parent) : TQWidget(parent) @@ -328,17 +328,17 @@ HSVWidget::HSVWidget(TQWidget *parent): ColorWidget(parent) mGrid->addWidget(mSIn, 2, 4); mGrid->addWidget(mVIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mHSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHSliderChanged(int))); - connect(mSSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSSliderChanged(int))); - connect(mVSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVSliderChanged(int))); + connect(mHSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHSliderChanged(int))); + connect(mSSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSSliderChanged(int))); + connect(mVSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVSliderChanged(int))); /* connect spin box */ - connect(mHIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHInChanged(int))); - connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSInChanged(int))); - connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVInChanged(int))); + connect(mHIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHInChanged(int))); + connect(mSIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSInChanged(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVInChanged(int))); } void HSVWidget::slotRefreshColor() @@ -465,13 +465,13 @@ GreyWidget::GreyWidget(TQWidget *parent): ColorWidget(parent) mGrid->addMultiCellWidget(mVSlider, 1, 1, 2, 3); mGrid->addWidget(mVIn, 1, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color slider */ - connect(mVSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVSliderChanged(int))); + connect(mVSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVSliderChanged(int))); /* connect spin box */ - connect(mVIn, TQT_SIGNAL(valueChanged(int)), mVSlider, TQT_SLOT(slotSetValue(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), mVSlider, TQ_SLOT(slotSetValue(int))); } void GreyWidget::slotRefreshColor() @@ -563,17 +563,17 @@ LABWidget::LABWidget(TQWidget *parent) : ColorWidget(parent) mGrid->addWidget(mAIn, 2, 4); mGrid->addWidget(mBIn, 3, 4); - connect(mColorPatch, TQT_SIGNAL(colorChanged(const TQColor &)), this, TQT_SLOT(slotPatchChanged(const TQColor &))); + connect(mColorPatch, TQ_SIGNAL(colorChanged(const TQColor &)), this, TQ_SLOT(slotPatchChanged(const TQColor &))); /* connect color sliders */ - connect(mLSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLSliderChanged(int))); - connect(mASlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotASliderChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBSliderChanged(int))); + connect(mLSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLSliderChanged(int))); + connect(mASlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotASliderChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBSliderChanged(int))); /* connect spin box */ - connect(mLIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotLInChanged(int))); - connect(mAIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotAInChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBInChanged(int))); + connect(mLIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotLInChanged(int))); + connect(mAIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotAInChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBInChanged(int))); } void LABWidget::slotRefreshColor() diff --git a/lib/kopainter/koColorSlider.cpp b/lib/kopainter/koColorSlider.cpp index 720357ca..0fd26a28 100644 --- a/lib/kopainter/koColorSlider.cpp +++ b/lib/kopainter/koColorSlider.cpp @@ -245,8 +245,8 @@ TQWidget(parent) mMax = 255; mValue = 0; - connect(mSlider, TQT_SIGNAL(positionChanged(int)), this, TQT_SLOT(slotSliderMoved(int))); - connect(mColorFrame, TQT_SIGNAL(clicked(const TQPoint &)), this, TQT_SLOT(slotFrameClicked(const TQPoint &))); + connect(mSlider, TQ_SIGNAL(positionChanged(int)), this, TQ_SLOT(slotSliderMoved(int))); + connect(mColorFrame, TQ_SIGNAL(clicked(const TQPoint &)), this, TQ_SLOT(slotFrameClicked(const TQPoint &))); } KoColorSlider::~KoColorSlider() diff --git a/lib/kopainter/koIconChooser.cpp b/lib/kopainter/koIconChooser.cpp index bae95a21..aa9f4aca 100644 --- a/lib/kopainter/koIconChooser.cpp +++ b/lib/kopainter/koIconChooser.cpp @@ -439,8 +439,8 @@ KoPatternChooser::KoPatternChooser( const TQPtrList<KoIconItem> &list, TQWidget //frame->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); chooser = new KoIconChooser( TQSize(30,30), this, "pattern chooser" ); - TQObject::connect( chooser, TQT_SIGNAL(selected( KoIconItem * ) ), - this, TQT_SIGNAL( selected( KoIconItem * ))); + TQObject::connect( chooser, TQ_SIGNAL(selected( KoIconItem * ) ), + this, TQ_SIGNAL( selected( KoIconItem * ))); TQPtrListIterator<KoIconItem> itr( list ); for( itr.toFirst(); itr.current(); ++itr ) diff --git a/lib/kopainter/ko_cmyk_widget.cpp b/lib/kopainter/ko_cmyk_widget.cpp index 21c96abe..3c691cb7 100644 --- a/lib/kopainter/ko_cmyk_widget.cpp +++ b/lib/kopainter/ko_cmyk_widget.cpp @@ -118,20 +118,20 @@ KoCMYKWidget::KoCMYKWidget(TQWidget *parent, const char *name) : super(parent, n mGrid->addWidget(mYIn, 2, 4); mGrid->addWidget(mKIn, 3, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); /* connect color sliders */ - connect(mCSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCChanged(int))); - connect(mMSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotMChanged(int))); - connect(mYSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotYChanged(int))); - connect(mKSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotKChanged(int))); + connect(mCSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCChanged(int))); + connect(mMSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotMChanged(int))); + connect(mYSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotYChanged(int))); + connect(mKSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotKChanged(int))); /* connect spin box */ - connect(mCIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotCChanged(int))); - connect(mMIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotMChanged(int))); - connect(mYIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotYChanged(int))); - connect(mKIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotKChanged(int))); + connect(mCIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotCChanged(int))); + connect(mMIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotMChanged(int))); + connect(mYIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotYChanged(int))); + connect(mKIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotKChanged(int))); } void KoCMYKWidget::slotCChanged(int c) @@ -225,14 +225,14 @@ void KoCMYKWidget::update(const TQColor fgColor, const TQColor bgColor) CMYKColor col = RgbToCmyk(color); - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); mCSlider->blockSignals(true); mCIn->blockSignals(true); diff --git a/lib/kopainter/ko_gray_widget.cpp b/lib/kopainter/ko_gray_widget.cpp index 16a65aa2..bbbb4875 100644 --- a/lib/kopainter/ko_gray_widget.cpp +++ b/lib/kopainter/ko_gray_widget.cpp @@ -63,14 +63,14 @@ KoGrayWidget::KoGrayWidget(TQWidget *parent, const char *name) : super(parent, n mGrid->addMultiCellWidget(mSlider, 0, 0, 2, 3); mGrid->addWidget(mIn, 0, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); /* connect color slider */ - connect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); /* connect spin box */ - connect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); } void KoGrayWidget::slotChanged(int v) @@ -107,8 +107,8 @@ void KoGrayWidget::update(const TQColor & fgColor, const TQColor & bgColor) TQColor color = (m_ColorButton->current() == KDualColorButton::Foreground)? m_fgColor : m_bgColor; - disconnect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); - disconnect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + disconnect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); + disconnect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); mIn->blockSignals(true); mSlider->blockSignals(true); @@ -120,17 +120,17 @@ void KoGrayWidget::update(const TQColor & fgColor, const TQColor & bgColor) mIn->blockSignals(false); mSlider->blockSignals(false); - connect(mSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); - connect(mIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(mSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); + connect(mIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); } void KoGrayWidget::slotFGColorSelected(const TQColor& c) { m_fgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); emit sigFgColorChanged(m_fgColor); } @@ -139,9 +139,9 @@ void KoGrayWidget::slotBGColorSelected(const TQColor& c) { m_bgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); emit sigBgColorChanged(m_bgColor); } diff --git a/lib/kopainter/ko_hsv_widget.cpp b/lib/kopainter/ko_hsv_widget.cpp index 83919d30..d6df2800 100644 --- a/lib/kopainter/ko_hsv_widget.cpp +++ b/lib/kopainter/ko_hsv_widget.cpp @@ -84,17 +84,17 @@ KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, nam mGrid->addMultiCellWidget(m_VSelector, 0, 3, 5, 5); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQT_SLOT(currentChanged(KDualColorButton::DualColor))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQ_SLOT(currentChanged(KDualColorButton::DualColor))); - connect(m_VSelector, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); - connect(m_colorwheel, TQT_SIGNAL(valueChanged(const KoColor&)), this, TQT_SLOT(slotWheelChanged(const KoColor&))); + connect(m_VSelector, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVChanged(int))); + connect(m_colorwheel, TQ_SIGNAL(valueChanged(const KoColor&)), this, TQ_SLOT(slotWheelChanged(const KoColor&))); /* connect spin box */ - connect(mHIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHChanged(int))); - connect(mSIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSChanged(int))); - connect(mVIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotVChanged(int))); + connect(mHIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHChanged(int))); + connect(mSIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSChanged(int))); + connect(mVIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotVChanged(int))); //setFixedSize(mGrid -> minimumSize()); m_autovalue = true; // So on the initial selection of h or v, s gets set to 255. @@ -181,9 +181,9 @@ void KoHSVWidget::setBgColor(const TQColor & c) void KoHSVWidget::changedFgColor() { //kdDebug() << "ChangedFgColor\n"; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor.color() ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); update( m_fgColor, m_bgColor); @@ -193,9 +193,9 @@ void KoHSVWidget::changedFgColor() void KoHSVWidget::changedBgColor() { //kdDebug() << "changedBgColor()\n"; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor.color() ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); update(m_fgColor, m_bgColor ); diff --git a/lib/kopainter/ko_rgb_widget.cpp b/lib/kopainter/ko_rgb_widget.cpp index 22fb9772..1073ac6b 100644 --- a/lib/kopainter/ko_rgb_widget.cpp +++ b/lib/kopainter/ko_rgb_widget.cpp @@ -98,19 +98,19 @@ KoRGBWidget::KoRGBWidget(TQWidget *parent, const char *name) : super(parent, nam mGrid->addWidget(mGIn, 1, 4); mGrid->addWidget(mBIn, 2, 4); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); - connect(m_ColorButton, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQT_SLOT(currentChanged(KDualColorButton::DualColor))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), this, TQ_SLOT(currentChanged(KDualColorButton::DualColor))); /* connect color sliders */ - connect(mRSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRChanged(int))); - connect(mGSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGChanged(int))); - connect(mBSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBChanged(int))); + connect(mRSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRChanged(int))); + connect(mGSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGChanged(int))); + connect(mBSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBChanged(int))); /* connect spin box */ - connect(mRIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotRChanged(int))); - connect(mGIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotGChanged(int))); - connect(mBIn, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBChanged(int))); + connect(mRIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotRChanged(int))); + connect(mGIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotGChanged(int))); + connect(mBIn, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBChanged(int))); update(TQt::black, TQt::white); } @@ -198,9 +198,9 @@ void KoRGBWidget::update(const TQColor fgColor, const TQColor bgColor) void KoRGBWidget::slotFGColorSelected(const TQColor& c) { m_fgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); m_ColorButton->setForeground( m_fgColor ); - connect(m_ColorButton, TQT_SIGNAL(fgChanged(const TQColor &)), this, TQT_SLOT(slotFGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(fgChanged(const TQColor &)), this, TQ_SLOT(slotFGColorSelected(const TQColor &))); update( m_fgColor, m_bgColor); emit sigFgColorChanged(m_fgColor); @@ -210,9 +210,9 @@ void KoRGBWidget::slotBGColorSelected(const TQColor& c) { m_bgColor = c; - disconnect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + disconnect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); m_ColorButton->setBackground( m_bgColor ); - connect(m_ColorButton, TQT_SIGNAL(bgChanged(const TQColor &)), this, TQT_SLOT(slotBGColorSelected(const TQColor &))); + connect(m_ColorButton, TQ_SIGNAL(bgChanged(const TQColor &)), this, TQ_SLOT(slotBGColorSelected(const TQColor &))); update(m_fgColor, m_bgColor); emit sigBgColorChanged(m_bgColor); diff --git a/lib/kopalette/kopalettemanager.cpp b/lib/kopalette/kopalettemanager.cpp index 48dc682d..afbc693b 100644 --- a/lib/kopalette/kopalettemanager.cpp +++ b/lib/kopalette/kopalettemanager.cpp @@ -62,7 +62,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const m_widgetNames = new TQStringList(); m_mapper = new TQSignalMapper(this); - connect(m_mapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotTogglePalette(int))); + connect(m_mapper, TQ_SIGNAL(mapped(int)), this, TQ_SLOT(slotTogglePalette(int))); m_viewActionMenu = new TDEActionMenu(i18n("Palettes"), m_actionCollection, "view_palette_action_menu"); TDEConfig * cfg = TDEGlobal::config(); @@ -74,7 +74,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const if ( palettesShown) { m_toggleShowHidePalettes = new TDEToggleAction(i18n("Hide All Palette Windows"), "CTRL+SHIFT+H", this, - TQT_SLOT(slotToggleAllPalettes()), + TQ_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); m_toggleShowHidePalettes->setCheckedState(i18n("Show Palette Windows Again")); @@ -82,7 +82,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const else { m_toggleShowHidePalettes = new TDEToggleAction(i18n("Show Palette Windows Again"), "CTRL+SHIFT+H", this, - TQT_SLOT(slotToggleAllPalettes()), + TQ_SLOT(slotToggleAllPalettes()), m_actionCollection, "toggleAllPaletteWindows"); m_toggleShowHidePalettes->setCheckedState(i18n("Hide All Palette Windows")); @@ -107,7 +107,7 @@ KoPaletteManager::KoPaletteManager(KoView * view, TDEActionCollection *ac, const /* TDEAction * a = new TDEAction(i18n("Restore Palettes"), 0, this, - TQT_SLOT(slotReset()), + TQ_SLOT(slotReset()), this, "restorePalettes"); m_viewActionMenu->insert(a); */ @@ -165,7 +165,7 @@ void KoPaletteManager::addWidget(TQWidget * widget, } TDEToggleAction * a; - a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQT_SLOT(map()), m_actionCollection); + a = new TDEToggleAction(i18n("Show %1").arg(widget->caption()), 0, m_mapper, TQ_SLOT(map()), m_actionCollection); a->setCheckedState(i18n("Hide %1").arg(widget->caption())); m_mapper->setMapping(a, m_widgetNames->count()); // This is the position at which we'll insert the action diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp index 8dfb6e8b..8c62f14b 100644 --- a/lib/koproperty/editor.cpp +++ b/lib/koproperty/editor.cpp @@ -77,8 +77,8 @@ class EditorPrivate previouslyCollapsedGroupItem = 0; childFormPreviouslyCollapsedGroupItem = 0; slotPropertyChanged_enabled = true; - TQObject::connect(&changeSetLaterTimer, TQT_SIGNAL(timeout()), - editor, TQT_SLOT(changeSetLater())); + TQObject::connect(&changeSetLaterTimer, TQ_SIGNAL(timeout()), + editor, TQ_SLOT(changeSetLater())); } ~EditorPrivate() { @@ -141,7 +141,7 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) d->undoButton->setPixmap(SmallIcon("edit-undo")); TQToolTip::add(d->undoButton, i18n("Undo changes")); d->undoButton->hide(); - connect(d->undoButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(undo())); + connect(d->undoButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(undo())); installEventFilter(this); viewport()->installEventFilter(this); @@ -164,14 +164,14 @@ Editor::Editor(TQWidget *parent, bool autoSync, const char *name) updateFont(); // d->baseRowHeight = TQFontMetrics(font()).height() + itemMargin()*2; - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem *))); - connect(this, TQT_SIGNAL(currentChanged(TQListViewItem *)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem *))); - connect(this, TQT_SIGNAL(expanded(TQListViewItem *)), this, TQT_SLOT(slotExpanded(TQListViewItem *))); - connect(this, TQT_SIGNAL(collapsed(TQListViewItem *)), this, TQT_SLOT(slotCollapsed(TQListViewItem *))); - connect(header(), TQT_SIGNAL(sizeChange(int, int, int)), this, TQT_SLOT(slotColumnSizeChanged(int, int, int))); -// connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateEditorGeometry())); -// connect(header(), TQT_SIGNAL(clicked(int)), this, TQT_SLOT(updateEditorGeometryAndGroupLabels())); - connect(header(), TQT_SIGNAL(sectionHandleDoubleClicked (int)), this, TQT_SLOT(slotColumnSizeChanged(int))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem *))); + connect(this, TQ_SIGNAL(currentChanged(TQListViewItem *)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem *))); + connect(this, TQ_SIGNAL(expanded(TQListViewItem *)), this, TQ_SLOT(slotExpanded(TQListViewItem *))); + connect(this, TQ_SIGNAL(collapsed(TQListViewItem *)), this, TQ_SLOT(slotCollapsed(TQListViewItem *))); + connect(header(), TQ_SIGNAL(sizeChange(int, int, int)), this, TQ_SLOT(slotColumnSizeChanged(int, int, int))); +// connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateEditorGeometry())); +// connect(header(), TQ_SIGNAL(clicked(int)), this, TQ_SLOT(updateEditorGeometryAndGroupLabels())); + connect(header(), TQ_SIGNAL(sectionHandleDoubleClicked (int)), this, TQ_SLOT(slotColumnSizeChanged(int))); updateGroupLabelsPosition(); } @@ -343,12 +343,12 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& d->set = set; if (d->set) { //receive property changes - connect(d->set, TQT_SIGNAL(propertyChangedInternal(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); - connect(d->set, TQT_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), - this, TQT_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); - connect(d->set,TQT_SIGNAL(aboutToBeCleared()), this, TQT_SLOT(slotSetWillBeCleared())); - connect(d->set,TQT_SIGNAL(aboutToBeDeleted()), this, TQT_SLOT(slotSetWillBeDeleted())); + connect(d->set, TQ_SIGNAL(propertyChangedInternal(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyChanged(KoProperty::Set&, KoProperty::Property&))); + connect(d->set, TQ_SIGNAL(propertyReset(KoProperty::Set&, KoProperty::Property&)), + this, TQ_SLOT(slotPropertyReset(KoProperty::Set&, KoProperty::Property&))); + connect(d->set,TQ_SIGNAL(aboutToBeCleared()), this, TQ_SLOT(slotSetWillBeCleared())); + connect(d->set,TQ_SIGNAL(aboutToBeDeleted()), this, TQ_SLOT(slotSetWillBeDeleted())); } fill(); @@ -365,7 +365,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString& if (item) { d->itemToSelectLater = item; - TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater())); + TQTimer::singleShot(10, this, TQ_SLOT(selectItemLater())); //d->doNotSetFocusOnSelection = !hasParent(this, focusWidget()); //setSelected(item, true); //d->doNotSetFocusOnSelection = false; @@ -644,12 +644,12 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty) d->widgetCache[property] = widget; widget->setProperty(0); // to force reloading property later widget->hide(); - connect(widget, TQT_SIGNAL(valueChanged(Widget*)), - this, TQT_SLOT(slotWidgetValueChanged(Widget*)) ); - connect(widget, TQT_SIGNAL(acceptInput(Widget*)), - this, TQT_SLOT(slotWidgetAcceptInput(Widget*)) ); - connect(widget, TQT_SIGNAL(rejectInput(Widget*)), - this, TQT_SLOT(slotWidgetRejectInput(Widget*)) ); + connect(widget, TQ_SIGNAL(valueChanged(Widget*)), + this, TQ_SLOT(slotWidgetValueChanged(Widget*)) ); + connect(widget, TQ_SIGNAL(acceptInput(Widget*)), + this, TQ_SLOT(slotWidgetAcceptInput(Widget*)) ); + connect(widget, TQ_SIGNAL(rejectInput(Widget*)), + this, TQ_SLOT(slotWidgetRejectInput(Widget*)) ); } //update geometry earlier, because Widget::setValue() can depend on widget's geometry diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp index fb71a445..a913c483 100644 --- a/lib/koproperty/editors/booledit.cpp +++ b/lib/koproperty/editors/booledit.cpp @@ -50,7 +50,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name) m_toggle->move(0, 0); m_toggle->resize(width(), height()); setFocusWidget(m_toggle); - connect(m_toggle, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_toggle, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } BoolEdit::~BoolEdit() diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp index f3cb2a2a..9288abb4 100644 --- a/lib/koproperty/editors/coloredit.cpp +++ b/lib/koproperty/editors/coloredit.cpp @@ -35,7 +35,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name) TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); m_edit = new KColorCombo(this); m_edit->setFocusPolicy(TQWidget::NoFocus); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding); m_edit->setMinimumHeight(5); l->addWidget(m_edit); diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp index 92b437e9..3438beab 100644 --- a/lib/koproperty/editors/combobox.cpp +++ b/lib/koproperty/editors/combobox.cpp @@ -53,7 +53,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name) //not needed for combo setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); } ComboBox::~ComboBox() diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp index 4b61d80f..2c39ecc3 100644 --- a/lib/koproperty/editors/dateedit.cpp +++ b/lib/koproperty/editors/dateedit.cpp @@ -44,7 +44,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDate&)), this, TQT_SLOT(slotValueChanged(const TQDate&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDate&)), this, TQ_SLOT(slotValueChanged(const TQDate&))); } DateEdit::~DateEdit() diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp index 74636c89..d45ae2df 100644 --- a/lib/koproperty/editors/datetimeedit.cpp +++ b/lib/koproperty/editors/datetimeedit.cpp @@ -43,7 +43,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQDateTime&)), this, TQT_SLOT(slotValueChanged(const TQDateTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQDateTime&)), this, TQ_SLOT(slotValueChanged(const TQDateTime&))); } DateTimeEdit::~DateTimeEdit() diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index e53e785f..e9f48db7 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -86,7 +86,7 @@ FontEdit::FontEdit(Property *property, TQWidget *parent, const char *name) m_edit->setMinimumHeight(5); setEditor(m_edit); setFocusWidget(m_edit->label()); - connect(m_edit, TQT_SIGNAL(fontSelected(const TQFont& )), this, TQT_SLOT(slotValueChanged(const TQFont&))); + connect(m_edit, TQ_SIGNAL(fontSelected(const TQFont& )), this, TQ_SLOT(slotValueChanged(const TQFont&))); } FontEdit::~FontEdit() diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp index b8345390..f1b5e30e 100644 --- a/lib/koproperty/editors/linestyledit.cpp +++ b/lib/koproperty/editors/linestyledit.cpp @@ -152,7 +152,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotValueChanged(int))); } LineStyleEdit::~LineStyleEdit() diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index 070de038..0aac449a 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -80,7 +80,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name) m_popup->hide(); setFocusWidget(m_edit); - connect(m_button, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectPixmap())); + connect(m_button, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectPixmap())); } PixmapEdit::~PixmapEdit() diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp index 3a53d9a0..fcb6ab89 100644 --- a/lib/koproperty/editors/spinbox.cpp +++ b/lib/koproperty/editors/spinbox.cpp @@ -102,7 +102,7 @@ IntEdit::IntEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int))); + connect(m_edit, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotValueChanged(int))); } IntEdit::~IntEdit() @@ -253,7 +253,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name) setLeavesTheSpaceForRevertButton(true); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotValueChanged(double))); + connect(m_edit, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotValueChanged(double))); } DoubleEdit::~DoubleEdit() diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp index 1b61a251..0d0be87b 100644 --- a/lib/koproperty/editors/stringedit.cpp +++ b/lib/koproperty/editors/stringedit.cpp @@ -37,7 +37,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name) l->addWidget(m_edit); setFocusWidget(m_edit); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); } StringEdit::~StringEdit() diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp index dee5b335..79e7257e 100644 --- a/lib/koproperty/editors/stringlistedit.cpp +++ b/lib/koproperty/editors/stringlistedit.cpp @@ -55,7 +55,7 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char l->addWidget(m_selectButton); setFocusWidget(m_selectButton); - connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showEditor())); + connect(m_selectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showEditor())); } StringListEdit::~StringListEdit() diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp index 98882e58..8c2308ee 100644 --- a/lib/koproperty/editors/symbolcombo.cpp +++ b/lib/koproperty/editors/symbolcombo.cpp @@ -50,8 +50,8 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name) m_select->setMinimumHeight(5); l->addWidget(m_select); - connect(m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectChar())); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_select, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectChar())); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); } SymbolCombo::~SymbolCombo() diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp index 94692a47..d7c41b67 100644 --- a/lib/koproperty/editors/timeedit.cpp +++ b/lib/koproperty/editors/timeedit.cpp @@ -43,7 +43,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name) l->addWidget(m_edit); setLeavesTheSpaceForRevertButton(true); - connect(m_edit, TQT_SIGNAL(valueChanged(const TQTime&)), this, TQT_SLOT(slotValueChanged(const TQTime&))); + connect(m_edit, TQ_SIGNAL(valueChanged(const TQTime&)), this, TQ_SLOT(slotValueChanged(const TQTime&))); } TimeEdit::~TimeEdit() diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp index 426fe0bd..78ee3e87 100644 --- a/lib/koproperty/editors/urledit.cpp +++ b/lib/koproperty/editors/urledit.cpp @@ -42,7 +42,7 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name) setProperty(property); - connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&))); + connect(m_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotValueChanged(const TQString&))); m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); } diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp index 16fdacc8..3d50a2b1 100644 --- a/lib/koproperty/set.cpp +++ b/lib/koproperty/set.cpp @@ -439,21 +439,21 @@ Set::typeName() const Buffer::Buffer() :Set(false) { - connect( this, TQT_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); - connect( this, TQT_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); } Buffer::Buffer(const Set *set) :Set(false) { - connect( this, TQT_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyChanged( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedChanged( KoProperty::Set&, KoProperty::Property& ) ) ); - connect( this, TQT_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), - this, TQT_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); + connect( this, TQ_SIGNAL( propertyReset( KoProperty::Set&, KoProperty::Property& ) ), + this, TQ_SLOT(intersectedReset( KoProperty::Set&, KoProperty::Property& ) ) ); initialSet( set ); } diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp index f72bbbd3..bed2b571 100644 --- a/lib/kotext/DateFormatWidget.cpp +++ b/lib/kotext/DateFormatWidget.cpp @@ -52,10 +52,10 @@ DateFormatWidget::DateFormatWidget( TQWidget* parent, const char* name, WFlags label_correction->setText(i18n("Correct in Days")); - connect( CheckBox1, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(slotPersonalizeChanged(bool))); - connect( combo1, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( combo1, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( KIntNumInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slotOffsetChanged(int))); + connect( CheckBox1, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(slotPersonalizeChanged(bool))); + connect( combo1, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( combo1, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( KIntNumInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slotOffsetChanged(int))); slotPersonalizeChanged(false); } diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 5b548756..b62812d8 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -71,18 +71,18 @@ KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const exceptionLine = new KoAutoFormatLineEdit( this ); grid->addWidget(exceptionLine,1,0); - connect(exceptionLine,TQT_SIGNAL(keyReturnPressed()),TQT_SLOT(slotAddException())); - connect(exceptionLine ,TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT(textChanged ( const TQString & ))); + connect(exceptionLine,TQ_SIGNAL(keyReturnPressed()),TQ_SLOT(slotAddException())); + connect(exceptionLine ,TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT(textChanged ( const TQString & ))); pbAddException=new TQPushButton(i18n("Add"),this); - connect(pbAddException, TQT_SIGNAL(clicked()),TQT_SLOT(slotAddException())); + connect(pbAddException, TQ_SIGNAL(clicked()),TQ_SLOT(slotAddException())); grid->addWidget(pbAddException,1,1); pbAddException->setEnabled(false); pbRemoveException=new TQPushButton(i18n("Remove"),this); - connect(pbRemoveException, TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveException())); + connect(pbRemoveException, TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveException())); grid->addWidget(pbRemoveException,2,1,TQt::AlignTop); exceptionList=new TQListBox(this); @@ -92,8 +92,8 @@ KoAutoFormatExceptionWidget::KoAutoFormatExceptionWidget(TQWidget *parent, const grid->setRowStretch( 2, 1 ); - connect( exceptionList , TQT_SIGNAL(selectionChanged () ), - this,TQT_SLOT(slotExceptionListSelected()) ); + connect( exceptionList , TQ_SIGNAL(selectionChanged () ), + this,TQ_SLOT(slotExceptionListSelected()) ); pbRemoveException->setEnabled( exceptionList->currentItem()!=-1); @@ -188,7 +188,7 @@ KoAutoFormatDia::KoAutoFormatDia( TQWidget *parent, const char *name, setupTab3(); setupTab4(); setInitialSize( TQSize(500, 300) ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotResetConf())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotResetConf())); noSignal=false; } @@ -322,8 +322,8 @@ void KoAutoFormatDia::setupTab1() "formatting means that a correct bullet is used to draw the list." ) ); - connect( cbUseBulletStyle, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotBulletStyleToggled( bool ) ) ); + connect( cbUseBulletStyle, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotBulletStyleToggled( bool ) ) ); vbox->addWidget(cbUseBulletStyle); TQHBoxLayout *hbox = new TQHBoxLayout(); @@ -345,9 +345,9 @@ void KoAutoFormatDia::setupTab1() initTab1(); - connect( pbBulletStyle, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseBulletStyle() ) ); - connect( pbDefaultBulletStyle, TQT_SIGNAL( clicked()), - TQT_SLOT( defaultBulletStyle() ) ); + connect( pbBulletStyle, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseBulletStyle() ) ); + connect( pbDefaultBulletStyle, TQ_SIGNAL( clicked()), + TQ_SLOT( defaultBulletStyle() ) ); } void KoAutoFormatDia::initTab1() @@ -384,8 +384,8 @@ void KoAutoFormatDia::setupTab2() cbTypographicDoubleQuotes->setText( i18n( "Replace &double quotes with typographical quotes" ) ); - connect( cbTypographicDoubleQuotes,TQT_SIGNAL(toggled ( bool)), - TQT_SLOT(slotChangeStateDouble(bool))); + connect( cbTypographicDoubleQuotes,TQ_SIGNAL(toggled ( bool)), + TQ_SLOT(slotChangeStateDouble(bool))); vbox->addWidget( cbTypographicDoubleQuotes ); @@ -415,9 +415,9 @@ void KoAutoFormatDia::setupTab2() hbox->addStretch( 1 ); - connect(pbDoubleQuote1, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseDoubleQuote1() )); - connect(pbDoubleQuote2, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseDoubleQuote2() )); - connect(pbDoubleDefault, TQT_SIGNAL( clicked()), TQT_SLOT( defaultDoubleQuote() )); + connect(pbDoubleQuote1, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseDoubleQuote1() )); + connect(pbDoubleQuote2, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseDoubleQuote2() )); + connect(pbDoubleDefault, TQ_SIGNAL( clicked()), TQ_SLOT( defaultDoubleQuote() )); vbox->addItem( hbox ); @@ -425,8 +425,8 @@ void KoAutoFormatDia::setupTab2() cbTypographicSimpleQuotes->setText( i18n( "Replace &single quotes with typographical quotes" ) ); - connect( cbTypographicSimpleQuotes,TQT_SIGNAL(toggled ( bool)), - TQT_SLOT(slotChangeStateSimple(bool))); + connect( cbTypographicSimpleQuotes,TQ_SIGNAL(toggled ( bool)), + TQ_SLOT(slotChangeStateSimple(bool))); vbox->addWidget( cbTypographicSimpleQuotes ); @@ -456,9 +456,9 @@ void KoAutoFormatDia::setupTab2() hbox->addStretch( 1 ); - connect(pbSimpleQuote1, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseSimpleQuote1() )); - connect(pbSimpleQuote2, TQT_SIGNAL( clicked() ), TQT_SLOT( chooseSimpleQuote2() )); - connect(pbSimpleDefault, TQT_SIGNAL( clicked()), TQT_SLOT( defaultSimpleQuote() )); + connect(pbSimpleQuote1, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseSimpleQuote1() )); + connect(pbSimpleQuote2, TQ_SIGNAL( clicked() ), TQ_SLOT( chooseSimpleQuote2() )); + connect(pbSimpleDefault, TQ_SIGNAL( clicked()), TQ_SLOT( defaultSimpleQuote() )); vbox->addItem( hbox ); vbox->addStretch( 1 ); @@ -524,7 +524,7 @@ void KoAutoFormatDia::setupTab3() } autoFormatLanguage->insertStringList(lst); - connect(autoFormatLanguage->listBox(), TQT_SIGNAL(selected ( const TQString & )), this, TQT_SLOT(changeAutoformatLanguage(const TQString & ))); + connect(autoFormatLanguage->listBox(), TQ_SIGNAL(selected ( const TQString & )), this, TQ_SLOT(changeAutoformatLanguage(const TQString & ))); grid->addMultiCellWidget( autoFormatLanguage, 0, 0, 4, 6 ); TQLabel *lblAutoFormatLanguage = new TQLabel( i18n("Replacements and exceptions for language:"), tab3); @@ -532,7 +532,7 @@ void KoAutoFormatDia::setupTab3() cbAdvancedAutoCorrection = new TQCheckBox( tab3 ); cbAdvancedAutoCorrection->setText( i18n("Enable word replacement") ); - connect( cbAdvancedAutoCorrection, TQT_SIGNAL(clicked ()), this, TQT_SLOT( slotChangeAdvancedAutoCorrection())); + connect( cbAdvancedAutoCorrection, TQ_SIGNAL(clicked ()), this, TQ_SLOT( slotChangeAdvancedAutoCorrection())); grid->addMultiCellWidget( cbAdvancedAutoCorrection, 1, 1, 0, 6 ); cbAutoCorrectionWithFormat = new TQCheckBox( tab3 ); @@ -547,17 +547,17 @@ void KoAutoFormatDia::setupTab3() lblFind->setBuddy( m_find ); - connect( m_find, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotfind( const TQString & ) ) ); - connect( m_find, TQT_SIGNAL( keyReturnPressed() ), - TQT_SLOT( slotAddEntry())); + connect( m_find, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotfind( const TQString & ) ) ); + connect( m_find, TQ_SIGNAL( keyReturnPressed() ), + TQ_SLOT( slotAddEntry())); pbSpecialChar1 = new TQPushButton( "...", tab3 ); TQToolTip::add( pbSpecialChar1, i18n( "Insert a special character..." ) ); pbSpecialChar1->setFixedWidth( 40 ); grid->addWidget( pbSpecialChar1, 3, 2 ); - connect(pbSpecialChar1,TQT_SIGNAL(clicked()), TQT_SLOT(chooseSpecialChar1())); + connect(pbSpecialChar1,TQ_SIGNAL(clicked()), TQ_SLOT(chooseSpecialChar1())); lblReplace = new TQLabel( i18n( "&Replace:" ), tab3 ); grid->addWidget( lblReplace, 3, 3 ); @@ -567,22 +567,22 @@ void KoAutoFormatDia::setupTab3() lblReplace->setBuddy( m_replace ); - connect( m_replace, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotfind2( const TQString & ) ) ); - connect( m_replace, TQT_SIGNAL( keyReturnPressed() ), - TQT_SLOT( slotAddEntry())); + connect( m_replace, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotfind2( const TQString & ) ) ); + connect( m_replace, TQ_SIGNAL( keyReturnPressed() ), + TQ_SLOT( slotAddEntry())); pbSpecialChar2 = new TQPushButton( "...", tab3 ); TQToolTip::add( pbSpecialChar2, i18n( "Insert a special character..." ) ); pbSpecialChar2->setFixedWidth( 40 ); grid->addWidget( pbSpecialChar2, 3, 5 ); - connect(pbSpecialChar2,TQT_SIGNAL(clicked()), TQT_SLOT(chooseSpecialChar2())); + connect(pbSpecialChar2,TQ_SIGNAL(clicked()), TQ_SLOT(chooseSpecialChar2())); pbAdd = new TQPushButton( i18n( "&Add"), tab3 ); grid->addWidget( pbAdd, 3, 6 ); - connect(pbAdd,TQT_SIGNAL(clicked()),this, TQT_SLOT(slotAddEntry())); + connect(pbAdd,TQ_SIGNAL(clicked()),this, TQ_SLOT(slotAddEntry())); m_pListView = new TDEListView( tab3 ); m_pListView->addColumn( i18n( "Find" ) ); @@ -590,25 +590,25 @@ void KoAutoFormatDia::setupTab3() m_pListView->setAllColumnsShowFocus( true ); grid->addMultiCellWidget( m_pListView, 4, 10, 0, 5 ); - connect(m_pListView, TQT_SIGNAL(doubleClicked ( TQListViewItem * )), - TQT_SLOT(slotChangeTextFormatEntry()) ); - connect(m_pListView, TQT_SIGNAL(clicked ( TQListViewItem * ) ), - TQT_SLOT(slotEditEntry()) ); + connect(m_pListView, TQ_SIGNAL(doubleClicked ( TQListViewItem * )), + TQ_SLOT(slotChangeTextFormatEntry()) ); + connect(m_pListView, TQ_SIGNAL(clicked ( TQListViewItem * ) ), + TQ_SLOT(slotEditEntry()) ); pbRemove = new TQPushButton( i18n( "Remove" ), tab3 ); grid->addWidget( pbRemove, 4, 6, TQt::AlignTop ); - connect(pbRemove,TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveEntry())); + connect(pbRemove,TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveEntry())); pbChangeFormat= new TQPushButton( i18n( "Change Format..." ), tab3 ); grid->addWidget( pbChangeFormat, 5, 6, TQt::AlignTop ); - connect( pbChangeFormat, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeTextFormatEntry())); + connect( pbChangeFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeTextFormatEntry())); pbClearFormat= new TQPushButton( i18n( "Clear Format" ), tab3 ); grid->addWidget( pbClearFormat, 6, 6, TQt::AlignTop ); - connect( pbClearFormat, TQT_SIGNAL(clicked()), TQT_SLOT(slotClearTextFormatEntry())); + connect( pbClearFormat, TQ_SIGNAL(clicked()), TQ_SLOT(slotClearTextFormatEntry())); grid->setRowStretch( 10, 1 ); initTab3(); diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp index 6546c51c..1be09595 100644 --- a/lib/kotext/KoBgSpellCheck.cpp +++ b/lib/kotext/KoBgSpellCheck.cpp @@ -73,12 +73,12 @@ KoBgSpellCheck::KoBgSpellCheck( const Broker::Ptr& broker, TQObject *parent, d->intraWordPosition = 0; d->backSpeller = new KoSpell( broker, this, "KoSpell" ); - connect( d->backSpeller, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(spellCheckerMisspelling(const TQString &, int )) ); - connect( d->backSpeller, TQT_SIGNAL(done()), - TQT_SLOT(spellCheckerDone()) ); - connect( d->backSpeller, TQT_SIGNAL(aboutToFeedText()), - TQT_SLOT(slotClearPara()) ); + connect( d->backSpeller, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(spellCheckerMisspelling(const TQString &, int )) ); + connect( d->backSpeller, TQ_SIGNAL(done()), + TQ_SLOT(spellCheckerDone()) ); + connect( d->backSpeller, TQ_SIGNAL(aboutToFeedText()), + TQ_SLOT(slotClearPara()) ); } KoBgSpellCheck::~KoBgSpellCheck() @@ -90,12 +90,12 @@ void KoBgSpellCheck::registerNewTextObject( KoTextObject *obj ) { Q_ASSERT( obj ); - connect( obj, TQT_SIGNAL(paragraphCreated(KoTextParag*)), - TQT_SLOT(slotParagraphCreated(KoTextParag*)) ); - connect( obj, TQT_SIGNAL(paragraphModified(KoTextParag*, int, int, int)), - TQT_SLOT(slotParagraphModified(KoTextParag*, int, int, int)) ); - connect( obj, TQT_SIGNAL(paragraphDeleted(KoTextParag*)), - TQT_SLOT(slotParagraphDeleted(KoTextParag*)) ); + connect( obj, TQ_SIGNAL(paragraphCreated(KoTextParag*)), + TQ_SLOT(slotParagraphCreated(KoTextParag*)) ); + connect( obj, TQ_SIGNAL(paragraphModified(KoTextParag*, int, int, int)), + TQ_SLOT(slotParagraphModified(KoTextParag*, int, int, int)) ); + connect( obj, TQ_SIGNAL(paragraphDeleted(KoTextParag*)), + TQ_SLOT(slotParagraphDeleted(KoTextParag*)) ); } void KoBgSpellCheck::setEnabled( bool b ) @@ -140,7 +140,7 @@ void KoBgSpellCheck::spellCheckerMisspelling( const TQString &old, int pos ) if ( d->startupChecking && d->marked > delayAfterMarked ) { d->marked = 0; - TQTimer::singleShot( 1000, this, TQT_SLOT(checkerContinue()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(checkerContinue()) ); } else { if ( d->startupChecking ) ++d->marked; diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp index 727c6e5b..f0625da3 100644 --- a/lib/kotext/KoCommentDia.cpp +++ b/lib/kotext/KoCommentDia.cpp @@ -45,8 +45,8 @@ KoCommentDia::KoCommentDia( TQWidget *parent, const TQString &_note, const TQStr if ( authorName.isEmpty() ) pbAddAuthorName->setEnabled( false ); else - connect (pbAddAuthorName, TQT_SIGNAL(clicked ()), this , TQT_SLOT(slotAddAuthorName())); - connect ( m_multiLine , TQT_SIGNAL( textChanged()), this, TQT_SLOT( slotTextChanged( ))); + connect (pbAddAuthorName, TQ_SIGNAL(clicked ()), this , TQ_SLOT(slotAddAuthorName())); + connect ( m_multiLine , TQ_SIGNAL( textChanged()), this, TQ_SLOT( slotTextChanged( ))); slotTextChanged( ); resize( 300,100 ); diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp index 9def0ec8..867730e8 100644 --- a/lib/kotext/KoCompletionDia.cpp +++ b/lib/kotext/KoCompletionDia.cpp @@ -41,7 +41,7 @@ KoCompletionDia::KoCompletionDia( TQWidget *parent, const char *name, KoAutoForm TQVBox *page = makeVBoxMainWidget(); m_widget = new KoCompletion(page, autoFormat); m_widget->layout()->setMargin(0); - connect( this, TQT_SIGNAL( user1Clicked() ), m_widget, TQT_SLOT(slotResetConf())); + connect( this, TQ_SIGNAL( user1Clicked() ), m_widget, TQ_SLOT(slotResetConf())); setButtonWhatsThis(Ok,i18n("This will save your options.")); setButtonWhatsThis(Cancel,i18n("This will abort all changes.")); setButtonWhatsThis(User1,i18n("This will reset to the state after you clicked on the Make Default button.")); @@ -57,7 +57,7 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl m_autoFormat( *autoFormat ), m_docAutoFormat( autoFormat ) { - connect(cbAllowCompletion, TQT_SIGNAL(toggled ( bool )), this, TQT_SLOT( changeButtonStatus())); + connect(cbAllowCompletion, TQ_SIGNAL(toggled ( bool )), this, TQ_SLOT( changeButtonStatus())); TQStringList lst; lst << i18n( "Enter" ); lst << i18n( "Tab" ); @@ -66,12 +66,12 @@ KoCompletion::KoCompletion(TQWidget *parent, KoAutoFormat *autoFormat) : KoCompl lst << i18n( "Right" ); m_completionKeyAction->insertStringList( lst ); - connect( m_lbListCompletion, TQT_SIGNAL( selected ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & ))); - connect( m_lbListCompletion, TQT_SIGNAL( highlighted ( const TQString & ) ), this, TQT_SLOT( slotCompletionWordSelected( const TQString & ))); + connect( m_lbListCompletion, TQ_SIGNAL( selected ( const TQString & ) ), this, TQ_SLOT( slotCompletionWordSelected( const TQString & ))); + connect( m_lbListCompletion, TQ_SIGNAL( highlighted ( const TQString & ) ), this, TQ_SLOT( slotCompletionWordSelected( const TQString & ))); - connect( pbAddCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCompletionEntry())); - connect( pbRemoveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveCompletionEntry())); - connect( pbSaveCompletionEntry, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSaveCompletionEntry())); + connect( pbAddCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCompletionEntry())); + connect( pbRemoveCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCompletionEntry())); + connect( pbSaveCompletionEntry, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSaveCompletionEntry())); slotResetConf(); // aka load config changeButtonStatus(); diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp index 93c3dafd..2a0c7e99 100644 --- a/lib/kotext/KoCreateStyleDia.cpp +++ b/lib/kotext/KoCreateStyleDia.cpp @@ -35,7 +35,7 @@ KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent m_styleName = new TQLineEdit( page ); m_styleName->setMinimumWidth( m_styleName->sizeHint().width() * 3 ); - connect( m_styleName, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(nameChanged( const TQString &))); + connect( m_styleName, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(nameChanged( const TQString &))); m_styleName->setFocus(); enableButtonOK( false ); } diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp index a331596a..41c2f5df 100644 --- a/lib/kotext/KoCustomVariablesDia.cpp +++ b/lib/kotext/KoCustomVariablesDia.cpp @@ -71,12 +71,12 @@ void KoVariableNameDia::init() names = new TQComboBox( TRUE, row1 ); names->setFocus(); - connect( names, TQT_SIGNAL( textChanged ( const TQString & )), - this, TQT_SLOT( textChanged ( const TQString & ))); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( accept() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( names, TQ_SIGNAL( textChanged ( const TQString & )), + this, TQ_SLOT( textChanged ( const TQString & ))); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( accept() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); enableButtonOK( !names->currentText().isEmpty() ); resize( 350, 100 ); } @@ -164,10 +164,10 @@ KoCustomVariablesList::KoCustomVariablesList( TQWidget *parent ) header()->setMovingEnabled( FALSE ); addColumn( i18n( "Variable" ) ); addColumn( i18n( "Value" ) ); - connect( header(), TQT_SIGNAL( sizeChange( int, int, int ) ), - this, TQT_SLOT( columnSizeChange( int, int, int ) ) ); - connect( header(), TQT_SIGNAL( sectionClicked( int ) ), - this, TQT_SLOT( sectionClicked( int ) ) ); + connect( header(), TQ_SIGNAL( sizeChange( int, int, int ) ), + this, TQ_SLOT( columnSizeChange( int, int, int ) ) ); + connect( header(), TQ_SIGNAL( sectionClicked( int ) ), + this, TQ_SLOT( sectionClicked( int ) ) ); setResizeMode(TQListView::LastColumn); setSorting( -1 ); @@ -227,10 +227,10 @@ KoCustomVariablesDia::KoCustomVariablesDia( TQWidget *parent, const TQPtrList<Ko } - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); showButtonOK(lst.count()>0); resize( 600, 400 ); @@ -255,13 +255,13 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent ) m_name->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotAddOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotAddOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); - connect( m_name, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged(const TQString&) ) ); + connect( m_name, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged(const TQString&) ) ); enableButtonOK( false ); resize( 350, 100 ); @@ -279,13 +279,13 @@ KoCustomVarDialog::KoCustomVarDialog( TQWidget *parent, KoCustomVariable *var ) m_value->setFocus(); - connect( this, TQT_SIGNAL( okClicked() ), - this, TQT_SLOT( slotEditOk() ) ); - connect( this, TQT_SIGNAL( cancelClicked() ), - this, TQT_SLOT( reject() ) ); + connect( this, TQ_SIGNAL( okClicked() ), + this, TQ_SLOT( slotEditOk() ) ); + connect( this, TQ_SIGNAL( cancelClicked() ), + this, TQ_SLOT( reject() ) ); - connect( m_value, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( slotTextChanged(const TQString&) ) ); + connect( m_value, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( slotTextChanged(const TQString&) ) ); enableButtonOK( true ); resize( 350, 100 ); diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp index 93b24a53..e3c969b3 100644 --- a/lib/kotext/KoDecorationTab.cpp +++ b/lib/kotext/KoDecorationTab.cpp @@ -34,11 +34,11 @@ KoDecorationTab::KoDecorationTab( TQWidget* parent, const char* name, WFlags fl { shadowDistanceKDoubleNumInput->setRange(0, 9, 0.5, false); - connect( textKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( fontColorChanged( const TQColor& ) ) ); - connect( backgroundKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( backgroundColorChanged( const TQColor& ) ) ); - connect( shadowKColorButton, TQT_SIGNAL( changed( const TQColor& ) ), this, TQT_SIGNAL( shadowColorChanged( const TQColor& ) ) ); - connect( shadowDistanceKDoubleNumInput, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( shadowDistanceChanged( double ) ) ); - connect( shadowDirectionButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SIGNAL( shadowDirectionChanged( int ) ) ); + connect( textKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( fontColorChanged( const TQColor& ) ) ); + connect( backgroundKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( backgroundColorChanged( const TQColor& ) ) ); + connect( shadowKColorButton, TQ_SIGNAL( changed( const TQColor& ) ), this, TQ_SIGNAL( shadowColorChanged( const TQColor& ) ) ); + connect( shadowDistanceKDoubleNumInput, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SIGNAL( shadowDistanceChanged( double ) ) ); + connect( shadowDirectionButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SIGNAL( shadowDirectionChanged( int ) ) ); } KoDecorationTab::~KoDecorationTab() diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp index fbde5028..fd29ee47 100644 --- a/lib/kotext/KoFontDia.cpp +++ b/lib/kotext/KoFontDia.cpp @@ -62,45 +62,45 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, fontTab = new KoFontTab( TDEFontChooser::SmoothScalableFonts, this ); fontTabWidget->addTab( fontTab, i18n( "Font" ) ); - connect( fontTab, TQT_SIGNAL( familyChanged() ), this, TQT_SLOT( slotFontFamilyChanged() ) ); - connect( fontTab, TQT_SIGNAL( boldChanged() ), this, TQT_SLOT( slotFontBoldChanged() ) ); - connect( fontTab, TQT_SIGNAL( italicChanged() ), this, TQT_SLOT( slotFontItalicChanged() ) ); - connect( fontTab, TQT_SIGNAL( sizeChanged() ), this, TQT_SLOT( slotFontSizeChanged() ) ); + connect( fontTab, TQ_SIGNAL( familyChanged() ), this, TQ_SLOT( slotFontFamilyChanged() ) ); + connect( fontTab, TQ_SIGNAL( boldChanged() ), this, TQ_SLOT( slotFontBoldChanged() ) ); + connect( fontTab, TQ_SIGNAL( italicChanged() ), this, TQ_SLOT( slotFontItalicChanged() ) ); + connect( fontTab, TQ_SIGNAL( sizeChanged() ), this, TQ_SLOT( slotFontSizeChanged() ) ); //Highlighting tab highlightingTab = new KoHighlightingTab( this ); fontTabWidget->addTab( highlightingTab, i18n( "Highlighting" ) ); - connect( highlightingTab, TQT_SIGNAL( underlineChanged( int ) ), this, TQT_SLOT( slotUnderlineChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( underlineStyleChanged( int ) ), this, TQT_SLOT( slotUnderlineStyleChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( underlineColorChanged( const TQColor & ) ), this, TQT_SLOT( slotUnderlineColorChanged( const TQColor & ) ) ); - connect( highlightingTab, TQT_SIGNAL( strikethroughChanged( int ) ), this, TQT_SLOT( slotStrikethroughChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( strikethroughStyleChanged( int ) ), this, TQT_SLOT( slotStrikethroughStyleChanged( int ) ) ); - connect( highlightingTab, TQT_SIGNAL( wordByWordChanged( bool ) ), this, TQT_SLOT( slotWordByWordChanged( bool ) ) ); - connect( highlightingTab, TQT_SIGNAL( capitalisationChanged( int ) ), this, TQT_SLOT( slotCapitalisationChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineChanged( int ) ), this, TQ_SLOT( slotUnderlineChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineStyleChanged( int ) ), this, TQ_SLOT( slotUnderlineStyleChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( underlineColorChanged( const TQColor & ) ), this, TQ_SLOT( slotUnderlineColorChanged( const TQColor & ) ) ); + connect( highlightingTab, TQ_SIGNAL( strikethroughChanged( int ) ), this, TQ_SLOT( slotStrikethroughChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( strikethroughStyleChanged( int ) ), this, TQ_SLOT( slotStrikethroughStyleChanged( int ) ) ); + connect( highlightingTab, TQ_SIGNAL( wordByWordChanged( bool ) ), this, TQ_SLOT( slotWordByWordChanged( bool ) ) ); + connect( highlightingTab, TQ_SIGNAL( capitalisationChanged( int ) ), this, TQ_SLOT( slotCapitalisationChanged( int ) ) ); //Decoratio tab decorationTab = new KoDecorationTab( this ); fontTabWidget->addTab( decorationTab, i18n( "Decoration" ) ); - connect( decorationTab, TQT_SIGNAL( fontColorChanged( const TQColor& ) ), this, TQT_SLOT( slotFontColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( backgroundColorChanged( const TQColor& ) ), this, TQT_SLOT( slotBackgroundColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowColorChanged( const TQColor& ) ), this, TQT_SLOT( slotShadowColorChanged( const TQColor& ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowDistanceChanged( double ) ), this, TQT_SLOT( slotShadowDistanceChanged( double ) ) ); - connect( decorationTab, TQT_SIGNAL( shadowDirectionChanged( int ) ), this, TQT_SLOT( slotShadowDirectionChanged( int ) ) ); + connect( decorationTab, TQ_SIGNAL( fontColorChanged( const TQColor& ) ), this, TQ_SLOT( slotFontColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( backgroundColorChanged( const TQColor& ) ), this, TQ_SLOT( slotBackgroundColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowColorChanged( const TQColor& ) ), this, TQ_SLOT( slotShadowColorChanged( const TQColor& ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowDistanceChanged( double ) ), this, TQ_SLOT( slotShadowDistanceChanged( double ) ) ); + connect( decorationTab, TQ_SIGNAL( shadowDirectionChanged( int ) ), this, TQ_SLOT( slotShadowDirectionChanged( int ) ) ); //Layout tab layoutTab = new KoLayoutTab( true, this ); fontTabWidget->addTab( layoutTab, i18n( "Layout" ) ); - connect( layoutTab, TQT_SIGNAL( subSuperScriptChanged() ), this, TQT_SLOT( slotSubSuperChanged() ) );; - connect( layoutTab, TQT_SIGNAL( offsetChanged( int ) ), this, TQT_SLOT( slotOffsetChanged( int ) ) ); - connect( layoutTab, TQT_SIGNAL( relativeSizeChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); - connect( layoutTab, TQT_SIGNAL( hyphenationChanged( bool ) ), this, TQT_SLOT( slotHyphenationChanged( bool ) ) ); + connect( layoutTab, TQ_SIGNAL( subSuperScriptChanged() ), this, TQ_SLOT( slotSubSuperChanged() ) );; + connect( layoutTab, TQ_SIGNAL( offsetChanged( int ) ), this, TQ_SLOT( slotOffsetChanged( int ) ) ); + connect( layoutTab, TQ_SIGNAL( relativeSizeChanged( double ) ), this, TQ_SLOT( slotRelativeSizeChanged( double ) ) ); + connect( layoutTab, TQ_SIGNAL( hyphenationChanged( bool ) ), this, TQ_SLOT( slotHyphenationChanged( bool ) ) ); //Language tab languageTab = new KoLanguageTab( broker, this ); fontTabWidget->addTab( languageTab, i18n( "Language" ) ); - connect( languageTab, TQT_SIGNAL( languageChanged() ), this, TQT_SLOT( slotLanguageChanged() ) ); + connect( languageTab, TQ_SIGNAL( languageChanged() ), this, TQ_SLOT( slotLanguageChanged() ) ); //Related properties List View //relatedPropertiesListView = new TDEListView( mainHBox ); @@ -115,7 +115,7 @@ KoFontDia::KoFontDia( const KoTextFormat& initialFormat, void KoFontDia::init() { - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset()) ); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset()) ); slotReset(); } diff --git a/lib/kotext/KoFontTab.cpp b/lib/kotext/KoFontTab.cpp index 78a9f67f..fcf70a93 100644 --- a/lib/kotext/KoFontTab.cpp +++ b/lib/kotext/KoFontTab.cpp @@ -28,7 +28,7 @@ KoFontTab::KoFontTab( uint fontListCriteria, TQWidget* parent, const char* name, characterFont->setFamilyList( list ); characterFont->setSampleBoxVisible(false); comparisonFont = characterFont->font(); - connect( characterFont, TQT_SIGNAL( fontSelected( const TQFont & ) ), this, TQT_SLOT( slotFontChanged( const TQFont & ) ) ); + connect( characterFont, TQ_SIGNAL( fontSelected( const TQFont & ) ), this, TQ_SLOT( slotFontChanged( const TQFont & ) ) ); } KoFontTab::~KoFontTab() diff --git a/lib/kotext/KoHighlightingTab.cpp b/lib/kotext/KoHighlightingTab.cpp index 405887bf..9f22ca63 100644 --- a/lib/kotext/KoHighlightingTab.cpp +++ b/lib/kotext/KoHighlightingTab.cpp @@ -46,13 +46,13 @@ KoHighlightingTab::KoHighlightingTab( TQWidget* parent, const char* name, WFlags } capitalisationButtonGroup->setButton( 0 ); - connect( underlineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUnderlineChanged( int ) ) ); - connect( underlineLineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( underlineStyleChanged( int ) ) ); - connect( underlineKColorButton, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SIGNAL( underlineColorChanged( const TQColor & ) ) ); - connect( strikethroughStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotStrikethroughChanged( int ) ) ); - connect( strikethroughLineStyleKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( strikethroughStyleChanged( int ) ) ); - connect( underlineWordByWordCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( wordByWordChanged( bool ) ) ); - connect( capitalisationButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SIGNAL( capitalisationChanged( int ) ) ); + connect( underlineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUnderlineChanged( int ) ) ); + connect( underlineLineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( underlineStyleChanged( int ) ) ); + connect( underlineKColorButton, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SIGNAL( underlineColorChanged( const TQColor & ) ) ); + connect( strikethroughStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotStrikethroughChanged( int ) ) ); + connect( strikethroughLineStyleKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( strikethroughStyleChanged( int ) ) ); + connect( underlineWordByWordCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( wordByWordChanged( bool ) ) ); + connect( capitalisationButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SIGNAL( capitalisationChanged( int ) ) ); } KoHighlightingTab::~KoHighlightingTab() diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp index 1e048939..1b330200 100644 --- a/lib/kotext/KoImportStyleDia.cpp +++ b/lib/kotext/KoImportStyleDia.cpp @@ -39,7 +39,7 @@ KoImportStyleDia::KoImportStyleDia( KoStyleCollection* currentCollection, TQWidg m_listStyleName->setSelectionMode( TQListBox::Multi ); enableButtonOK( m_listStyleName->count() != 0 ); setButtonText( KDialogBase::User1, i18n("Load...") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotLoadFile())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotLoadFile())); setInitialSize( TQSize( 300, 400 ) ); setFocus(); } diff --git a/lib/kotext/KoLanguageTab.cpp b/lib/kotext/KoLanguageTab.cpp index b5b6e0dd..e7d84953 100644 --- a/lib/kotext/KoLanguageTab.cpp +++ b/lib/kotext/KoLanguageTab.cpp @@ -47,7 +47,7 @@ KoLanguageTab::KoLanguageTab( KSpell2::Broker::Ptr broker, TQWidget* parent, con else languageKComboBox->insertItem( *itName ); } - connect( languageKComboBox, TQT_SIGNAL( activated( int ) ), this, TQT_SIGNAL( languageChanged() ) ); + connect( languageKComboBox, TQ_SIGNAL( activated( int ) ), this, TQ_SIGNAL( languageChanged() ) ); } KoLanguageTab::~KoLanguageTab() diff --git a/lib/kotext/KoLayoutTab.cpp b/lib/kotext/KoLayoutTab.cpp index 9a2d4e18..c587b1b4 100644 --- a/lib/kotext/KoLayoutTab.cpp +++ b/lib/kotext/KoLayoutTab.cpp @@ -33,10 +33,10 @@ KoLayoutTab::KoLayoutTab( bool withSubSuperScript, TQWidget* parent, const char* { if ( !withSubSuperScript ) positionButtonGroup->hide(); - connect( positionButtonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotSubSuperScriptChanged( int ) ) ); - connect( offsetSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SIGNAL( offsetChanged( int ) ) ); - connect( relativeSizeKDoubleSpinBox, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( slotRelativeSizeChanged( double ) ) ); - connect( hyphenateCheckBox, TQT_SIGNAL( toggled( bool ) ), this, TQT_SIGNAL( hyphenationChanged( bool ) ) ); + connect( positionButtonGroup, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotSubSuperScriptChanged( int ) ) ); + connect( offsetSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SIGNAL( offsetChanged( int ) ) ); + connect( relativeSizeKDoubleSpinBox, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( slotRelativeSizeChanged( double ) ) ); + connect( hyphenateCheckBox, TQ_SIGNAL( toggled( bool ) ), this, TQ_SIGNAL( hyphenationChanged( bool ) ) ); } KoLayoutTab::~KoLayoutTab() diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp index 826c44a5..c9ed078b 100644 --- a/lib/kotext/KoParagDia.cpp +++ b/lib/kotext/KoParagDia.cpp @@ -71,7 +71,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp lstStyle = new TQListBox( gStyle, "styleListBox" ); grid->addMultiCellWidget( lstStyle, 1, 11, 0, 0); fillStyleCombo(); - connect( lstStyle, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( numStyleChanged() ) ); + connect( lstStyle, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( numStyleChanged() ) ); TQLabel *lPrefix = new TQLabel( gStyle, "lPrefix" ); @@ -116,7 +116,7 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp bCustom = new TQPushButton( "", gStyle, "bCustom" ); lCustom->setBuddy( bCustom ); customCharBox->addWidget( bCustom ); - connect( bCustom, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectCustomBullet() ) ); + connect( bCustom, TQ_SIGNAL( clicked() ), this, TQ_SLOT( selectCustomBullet() ) ); TQSpacerItem* spacer_2 = new TQSpacerItem( 0, 0, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); customCharBox->addItem( spacer_2 ); @@ -166,14 +166,14 @@ KoCounterStyleWidget::KoCounterStyleWidget( bool displayDepth, bool onlyStyleTyp } - connect( cbRestart, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( restartChanged(bool) ) ); + connect( cbRestart, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( restartChanged(bool) ) ); - connect( sSuffix, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( suffixChanged(const TQString &) ) ); - connect( sPrefix, TQT_SIGNAL( textChanged (const TQString &) ), this, TQT_SLOT( prefixChanged(const TQString &) ) ); - connect( spnStart, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( startChanged(int) ) ); - connect( spnDepth, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); - connect( spnDisplayLevels, TQT_SIGNAL( valueChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( cbAlignment, TQT_SIGNAL( activated (const TQString&) ), this, TQT_SLOT( alignmentChanged(const TQString&) ) ); + connect( sSuffix, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( suffixChanged(const TQString &) ) ); + connect( sPrefix, TQ_SIGNAL( textChanged (const TQString &) ), this, TQ_SLOT( prefixChanged(const TQString &) ) ); + connect( spnStart, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( startChanged(int) ) ); + connect( spnDepth, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( depthChanged(int) ) ); + connect( spnDisplayLevels, TQ_SIGNAL( valueChanged (int) ), this, TQ_SLOT( displayLevelsChanged(int) ) ); + connect( cbAlignment, TQ_SIGNAL( activated (const TQString&) ), this, TQ_SLOT( alignmentChanged(const TQString&) ) ); noSignals = false; if ( disableAll ) { @@ -899,7 +899,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eLeft = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); lLeft->setBuddy( eLeft ); indentGrid->addWidget( eLeft, 1, 1 ); - connect( eLeft, TQT_SIGNAL( valueChangedPt(double ) ), this, TQT_SLOT( leftChanged( double ) ) ); + connect( eLeft, TQ_SIGNAL( valueChangedPt(double ) ), this, TQ_SLOT( leftChanged( double ) ) ); TQLabel * lRight = new TQLabel( i18n("&Right:"), indentFrame ); lRight->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -908,7 +908,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eRight = new KoUnitDoubleSpinBox( indentFrame, 0, 9999, 1, 0.0, m_unit ); lRight->setBuddy( eRight ); indentGrid->addWidget( eRight, 2, 1 ); - connect( eRight, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( rightChanged( double ) ) ); + connect( eRight, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( rightChanged( double ) ) ); TQLabel * lFirstLine = new TQLabel( i18n("&First line:"), indentFrame ); lFirstLine->setAlignment( TQt::AlignVCenter | TQt::AlignRight ); @@ -916,7 +916,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eFirstLine = new KoUnitDoubleSpinBox( indentFrame, -9999, 9999, 1, 0.0, m_unit ); lFirstLine->setBuddy( eFirstLine ); - connect( eFirstLine, TQT_SIGNAL( valueChangedPt( double ) ), this, TQT_SLOT( firstChanged( double ) ) ); + connect( eFirstLine, TQ_SIGNAL( valueChangedPt( double ) ), this, TQ_SLOT( firstChanged( double ) ) ); indentGrid->addWidget( eFirstLine, 3, 1 ); // grid row spacing @@ -940,7 +940,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW cSpacing->insertItem( i18n( "At Least (%1)" ).arg(unitName) ); cSpacing->insertItem( i18n( "Fixed (%1)").arg(unitName) ); // LS_FIXED - connect( cSpacing, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( spacingActivated( int ) ) ); + connect( cSpacing, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( spacingActivated( int ) ) ); spacingGrid->addWidget( cSpacing, 1, 0 ); sSpacingStack = new TQWidgetStack( spacingFrame ); @@ -948,11 +948,11 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eSpacing = new KoUnitDoubleSpinBox( spacingFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); eSpacing->setRange( 0, 9999, 1, false); - connect( eSpacing, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( spacingChanged( double ) ) ); + connect( eSpacing, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( spacingChanged( double ) ) ); eSpacingPercent = new KIntNumInput( 100, spacingFrame ); eSpacingPercent->setRange( 0, 1000, 10, false ); eSpacingPercent->setSuffix( " %" ); - connect( eSpacingPercent, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( spacingChanged( int ) ) ); + connect( eSpacingPercent, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( spacingChanged( int ) ) ); sSpacingStack->addWidget( eSpacing ); sSpacingStack->addWidget( eSpacingPercent ); @@ -977,7 +977,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eBefore = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, CM_TO_POINT(1), 0.0, m_unit ); eBefore->setRange( 0 , 9999, 1, false); - connect( eBefore, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( beforeChanged( double ) ) ); + connect( eBefore, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( beforeChanged( double ) ) ); pSpaceGrid->addWidget( eBefore, 1, 1 ); TQLabel * lAfter = new TQLabel( i18n("After:"), pSpaceFrame ); @@ -986,7 +986,7 @@ KoIndentSpacingWidget::KoIndentSpacingWidget( KoUnit::Unit unit, double _frameW eAfter = new KoUnitDoubleSpinBox( pSpaceFrame, 0, 9999, 1, 0.0, m_unit ); eAfter->setRange( 0, 9999, 1, false); - connect( eAfter, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SLOT( afterChanged( double ) ) ); + connect( eAfter, TQ_SIGNAL( valueChanged( double ) ), this, TQ_SLOT( afterChanged( double ) ) ); pSpaceGrid->addWidget( eAfter, 2, 1 ); // grid row spacing @@ -1211,16 +1211,16 @@ KoParagAlignWidget::KoParagAlignWidget( bool breakLine, TQWidget * parent, const TQVGroupBox * AlignGroup = new TQVGroupBox( i18n( "Alignment" ), this ); rLeft = new TQRadioButton( i18n( "&Left" ), AlignGroup ); - connect( rLeft, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignLeft() ) ); + connect( rLeft, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignLeft() ) ); rCenter = new TQRadioButton( i18n( "C&enter" ), AlignGroup ); - connect( rCenter, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignCenter() ) ); + connect( rCenter, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignCenter() ) ); rRight = new TQRadioButton( i18n( "&Right" ), AlignGroup ); - connect( rRight, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignRight() ) ); + connect( rRight, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignRight() ) ); rJustify = new TQRadioButton( i18n( "&Justify" ), AlignGroup ); - connect( rJustify, TQT_SIGNAL( clicked() ), this, TQT_SLOT( alignJustify() ) ); + connect( rJustify, TQ_SIGNAL( clicked() ), this, TQ_SLOT( alignJustify() ) ); clearAligns(); rLeft->setChecked( true ); @@ -1376,23 +1376,23 @@ KoParagDecorationWidget::KoParagDecorationWidget( TQWidget * parent, wDeco->cbBorderWidth->insertItem(TQString::number(i)); // Setup the border toggle buttons, and merge checkbox - connect( wDeco->bBorderLeft, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdLeftToggled( bool ) ) ); - connect( wDeco->bBorderRight, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdRightToggled( bool ) ) ); - connect( wDeco->bBorderTop, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdTopToggled( bool ) ) ); - connect( wDeco->bBorderBottom, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdBottomToggled( bool ) ) ); - connect( wDeco->cbJoinBorder, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( brdJoinToggled( bool ) ) ); + connect( wDeco->bBorderLeft, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdLeftToggled( bool ) ) ); + connect( wDeco->bBorderRight, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdRightToggled( bool ) ) ); + connect( wDeco->bBorderTop, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdTopToggled( bool ) ) ); + connect( wDeco->bBorderBottom, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdBottomToggled( bool ) ) ); + connect( wDeco->cbJoinBorder, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( brdJoinToggled( bool ) ) ); // Set up Border preview widget wPreview = new KoBorderPreview( wDeco->borderPreview ); TQVBoxLayout *previewLayout = new TQVBoxLayout( wDeco->borderPreview ); previewLayout->addWidget( wPreview ); - connect( wPreview, TQT_SIGNAL( choosearea(TQMouseEvent * ) ), - this, TQT_SLOT( slotPressEvent(TQMouseEvent *) ) ); + connect( wPreview, TQ_SIGNAL( choosearea(TQMouseEvent * ) ), + this, TQ_SLOT( slotPressEvent(TQMouseEvent *) ) ); } /////// @@ -1625,21 +1625,21 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent, gNumbering->insert( rChapter , KoParagCounter::NUM_CHAPTER); numberingGroupLayout->addWidget( rChapter ); Form1Layout->addWidget( gNumbering ); - connect( gNumbering, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( numTypeChanged( int ) ) ); + connect( gNumbering, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( numTypeChanged( int ) ) ); m_styleWidget = new KoCounterStyleWidget( true, false, disableAll, this ); - connect( m_styleWidget, TQT_SIGNAL( sig_suffixChanged (const TQString &) ), this, TQT_SLOT( suffixChanged(const TQString &) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_prefixChanged (const TQString &) ), this, TQT_SLOT( prefixChanged(const TQString &) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_startChanged(int) ), this, TQT_SLOT( startChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_restartChanged(bool) ), this, TQT_SLOT( restartChanged(bool) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_depthChanged (int) ), this, TQT_SLOT( depthChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_displayLevelsChanged (int) ), this, TQT_SLOT( displayLevelsChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_alignmentChanged (int) ), this, TQT_SLOT( alignmentChanged(int) ) ); - connect( m_styleWidget, TQT_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQT_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_suffixChanged (const TQString &) ), this, TQ_SLOT( suffixChanged(const TQString &) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_prefixChanged (const TQString &) ), this, TQ_SLOT( prefixChanged(const TQString &) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_startChanged(int) ), this, TQ_SLOT( startChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_restartChanged(bool) ), this, TQ_SLOT( restartChanged(bool) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_depthChanged (int) ), this, TQ_SLOT( depthChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_displayLevelsChanged (int) ), this, TQ_SLOT( displayLevelsChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_alignmentChanged (int) ), this, TQ_SLOT( alignmentChanged(int) ) ); + connect( m_styleWidget, TQ_SIGNAL( changeCustomBullet( const TQString & , TQChar ) ), this, TQ_SLOT( slotChangeCustomBullet( const TQString & , TQChar ) ) ); - connect( m_styleWidget, TQT_SIGNAL( sig_numTypeChanged( int ) ), this, TQT_SLOT( numTypeChanged(int ) ) ); - connect( m_styleWidget, TQT_SIGNAL( changeStyle( KoParagCounter::Style ) ), this, TQT_SLOT( styleChanged (KoParagCounter::Style ) ) ); + connect( m_styleWidget, TQ_SIGNAL( sig_numTypeChanged( int ) ), this, TQ_SLOT( numTypeChanged(int ) ) ); + connect( m_styleWidget, TQ_SIGNAL( changeStyle( KoParagCounter::Style ) ), this, TQ_SLOT( styleChanged (KoParagCounter::Style ) ) ); Form1Layout->addWidget( m_styleWidget ); @@ -1898,16 +1898,16 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram //signal valueChanged passes value which the user see (unlike the value() function) //so fromUserValue has to be used in slotTabValueChanged - connect(sTabPos,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotTabValueChanged(double ))); - connect(sTabPos,TQT_SIGNAL( keyReturnPressed()),this,TQT_SLOT(newClicked())); - connect(sAlignChar,TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotAlignCharChanged( const TQString & ))); - connect(bNew,TQT_SIGNAL(clicked ()),this,TQT_SLOT(newClicked())); - connect(bDelete,TQT_SIGNAL(clicked ()),this,TQT_SLOT(deleteClicked())); - connect(bDeleteAll,TQT_SIGNAL(clicked ()),this,TQT_SLOT(deleteAllClicked())); - connect(bgAlign,TQT_SIGNAL(clicked (int)),this,TQT_SLOT(updateAlign(int))); - connect(cFilling,TQT_SIGNAL(activated (int)),this,TQT_SLOT(updateFilling(int))); - connect(eWidth,TQT_SIGNAL(valueChangedPt( double ) ),this,TQT_SLOT(updateWidth())); - connect(lstTabs,TQT_SIGNAL(highlighted (int)),this,TQT_SLOT(setActiveItem(int))); + connect(sTabPos,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotTabValueChanged(double ))); + connect(sTabPos,TQ_SIGNAL( keyReturnPressed()),this,TQ_SLOT(newClicked())); + connect(sAlignChar,TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotAlignCharChanged( const TQString & ))); + connect(bNew,TQ_SIGNAL(clicked ()),this,TQ_SLOT(newClicked())); + connect(bDelete,TQ_SIGNAL(clicked ()),this,TQ_SLOT(deleteClicked())); + connect(bDeleteAll,TQ_SIGNAL(clicked ()),this,TQ_SLOT(deleteAllClicked())); + connect(bgAlign,TQ_SIGNAL(clicked (int)),this,TQ_SLOT(updateAlign(int))); + connect(cFilling,TQ_SIGNAL(activated (int)),this,TQ_SLOT(updateFilling(int))); + connect(eWidth,TQ_SIGNAL(valueChangedPt( double ) ),this,TQ_SLOT(updateWidth())); + connect(lstTabs,TQ_SIGNAL(highlighted (int)),this,TQ_SLOT(setActiveItem(int))); noSignals=false; } @@ -2182,7 +2182,7 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name, m_tabulatorsWidget->layout()->setMargin(0); } - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset())); setInitialSize( TQSize(630, 500) ); } diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 4e81463d..554a6805 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -67,7 +67,7 @@ KoSearchContextUI::KoSearchContextUI( KoSearchContext *ctx, TQWidget *parent ) { m_bOptionsShown = false; m_btnShowOptions = new TQPushButton( i18n("Show Formatting Options"), parent ); - connect( m_btnShowOptions, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowOptions() ) ); + connect( m_btnShowOptions, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowOptions() ) ); m_grid = new TQGridLayout( m_parent, 1, 1, 0, 6 ); m_grid->addWidget( m_btnShowOptions, 0, 0 ); @@ -174,30 +174,30 @@ KoFindReplace::KoFindReplace( TQWidget * parent, KoReplaceDia * dialog, const TQ m_lastTextObjectHighlighted( 0 ) { connectFind( m_replace ); - connect( m_replace, TQT_SIGNAL( replace( const TQString &, int , int, int ) ), - this, TQT_SLOT( replace( const TQString &, int , int,int ) ) ); + connect( m_replace, TQ_SIGNAL( replace( const TQString &, int , int, int ) ), + this, TQ_SLOT( replace( const TQString &, int , int,int ) ) ); } void KoFindReplace::connectFind( KFind* find ) { - connect( find, TQT_SIGNAL( optionsChanged() ), - this, TQT_SLOT( optionsChanged() ) ); - connect( find, TQT_SIGNAL( dialogClosed() ), - this, TQT_SLOT( dialogClosed() ) ); + connect( find, TQ_SIGNAL( optionsChanged() ), + this, TQ_SLOT( optionsChanged() ) ); + connect( find, TQ_SIGNAL( dialogClosed() ), + this, TQ_SLOT( dialogClosed() ) ); // Connect highlight signal to code which handles highlighting // of found text. - connect( find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( highlight( const TQString &, int, int ) ) ); + connect( find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( highlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect( find, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( slotFindNext() ) ); + connect( find, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( slotFindNext() ) ); m_bInit = true; m_currentParagraphModified = false; m_matchingIndex = -1; // Also connect to the textiterator - connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + connect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); } KoFindReplace::~KoFindReplace() @@ -389,16 +389,16 @@ void KoFindReplace::replace( const TQString &text, int matchingIndex, TQString rep = text.mid( matchingIndex, replacementLength ); // Don't let the replacement set the paragraph to "modified by user" - disconnect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + disconnect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); KCommand *cmd = currentTextObj->replaceSelectionCommand( &cursor, rep, TQString(), KoTextDocument::HighlightSelection, repaint ? KoTextObject::DefaultInsertFlags : KoTextObject::DoNotRepaint ); - connect( &m_textIterator, TQT_SIGNAL( currentParagraphModified( int, int, int ) ), - this, TQT_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); + connect( &m_textIterator, TQ_SIGNAL( currentParagraphModified( int, int, int ) ), + this, TQ_SLOT( slotCurrentParagraphModified( int, int, int ) ) ); if( cmd ) macroCommand()->addCommand(cmd); @@ -549,8 +549,8 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC setButtonText( KDialogBase::User1, i18n("Reset") ); setButtonText( KDialogBase::User2, i18n("Clear") ); - connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset())); - connect( this, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT(slotClear())); + connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT(slotReset())); + connect( this, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT(slotClear())); TQGridLayout *m_grid = new TQGridLayout( page, 15, 2, 0, 6 ); m_checkFamily = new TQCheckBox( i18n( "Family:" ),page ); @@ -670,29 +670,29 @@ KoFormatDia::KoFormatDia( TQWidget* parent, const TQString & _caption, KoSearchC m_grid->addMultiCellWidget( tmpSep, 14, 14, 0, 1 ); // signals and slots connections - TQObject::connect( m_checkFamily, TQT_SIGNAL( toggled( bool ) ), m_familyItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkSize, TQT_SIGNAL( toggled( bool ) ), m_sizeItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkColor, TQT_SIGNAL( toggled( bool ) ), m_colorItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBgColor, TQT_SIGNAL( toggled( bool ) ), m_bgColorItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkFamily, TQ_SIGNAL( toggled( bool ) ), m_familyItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkSize, TQ_SIGNAL( toggled( bool ) ), m_sizeItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkColor, TQ_SIGNAL( toggled( bool ) ), m_colorItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBgColor, TQ_SIGNAL( toggled( bool ) ), m_bgColorItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkStrikeOut, TQT_SIGNAL( toggled( bool ) ), m_strikeOutItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordYes, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkFontAttribute, TQT_SIGNAL( toggled( bool ) ), m_fontAttributeItem, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkLanguage, TQT_SIGNAL( toggled( bool ) ), m_languageItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBold, TQ_SIGNAL( toggled( bool ) ), m_boldYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkItalic, TQ_SIGNAL( toggled( bool ) ), m_italicYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkStrikeOut, TQ_SIGNAL( toggled( bool ) ), m_strikeOutItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkShadow, TQ_SIGNAL( toggled( bool ) ), m_shadowYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkWordByWord, TQ_SIGNAL( toggled( bool ) ), m_wordByWordYes, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkFontAttribute, TQ_SIGNAL( toggled( bool ) ), m_fontAttributeItem, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkLanguage, TQ_SIGNAL( toggled( bool ) ), m_languageItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkBold, TQT_SIGNAL( toggled( bool ) ), m_boldNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkItalic, TQT_SIGNAL( toggled( bool ) ), m_italicNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkShadow, TQT_SIGNAL( toggled( bool ) ), m_shadowNo, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkWordByWord, TQT_SIGNAL( toggled( bool ) ), m_wordByWordNo, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkBold, TQ_SIGNAL( toggled( bool ) ), m_boldNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkItalic, TQ_SIGNAL( toggled( bool ) ), m_italicNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkShadow, TQ_SIGNAL( toggled( bool ) ), m_shadowNo, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkWordByWord, TQ_SIGNAL( toggled( bool ) ), m_wordByWordNo, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkVertAlign, TQT_SIGNAL( toggled( bool ) ), m_vertAlignItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkVertAlign, TQ_SIGNAL( toggled( bool ) ), m_vertAlignItem, TQ_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_checkUnderline, TQT_SIGNAL( toggled( bool ) ), m_underlineItem, TQT_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_checkUnderline, TQ_SIGNAL( toggled( bool ) ), m_underlineItem, TQ_SLOT( setEnabled( bool ) ) ); slotReset(); } diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp index 8e96a44f..0f90443b 100644 --- a/lib/kotext/KoSpell.cpp +++ b/lib/kotext/KoSpell.cpp @@ -74,7 +74,7 @@ bool KoSpell::check( KoTextIterator *itr, bool dialog ) return ret; d->itr = itr; - connect( d->itr, TQT_SIGNAL( currentParagraphDeleted() ), TQT_SLOT( slotCurrentParagraphDeleted() ) ); + connect( d->itr, TQ_SIGNAL( currentParagraphDeleted() ), TQ_SLOT( slotCurrentParagraphDeleted() ) ); d->lastTxtDocument = d->itr->currentTextObject()->textDocument(); d->needsIncrement = false; ret = !d->itr->atEnd(); diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp index 3ec2e5c1..f00fe0f1 100644 --- a/lib/kotext/KoStyleManager.cpp +++ b/lib/kotext/KoStyleManager.cpp @@ -149,32 +149,32 @@ void KoStyleManager::setupWidget(const KoStyleCollection& styleCollection) m_moveUpButton = new TQPushButton( frame1, "moveUpButton" ); m_moveUpButton->setIconSet( SmallIconSet( "go-up" ) ); - connect( m_moveUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveUpStyle() ) ); + connect( m_moveUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveUpStyle() ) ); frame1Layout->addWidget( m_moveUpButton, 1, 1 ); m_moveDownButton = new TQPushButton( frame1, "moveDownButton" ); m_moveDownButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_moveDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( moveDownStyle() ) ); + connect( m_moveDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( moveDownStyle() ) ); frame1Layout->addWidget( m_moveDownButton, 1, 0 ); m_deleteButton = new TQPushButton( frame1, "deleteButton" ); m_deleteButton->setText( i18n( "&Delete" ) ); - connect( m_deleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteStyle() ) ); + connect( m_deleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteStyle() ) ); frame1Layout->addWidget( m_deleteButton, 2, 1 ); m_newButton = new TQPushButton( frame1, "newButton" ); m_newButton->setText( i18n( "New" ) ); - connect( m_newButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addStyle() ) ); + connect( m_newButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addStyle() ) ); frame1Layout->addWidget( m_newButton, 2, 0 ); m_tabs = new TQTabWidget( frame1 ); frame1Layout->addMultiCellWidget( m_tabs, 0, 2, 2, 2 ); - connect( m_stylesList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( switchStyle() ) ); - connect( m_tabs, TQT_SIGNAL( currentChanged ( TQWidget * ) ), this, TQT_SLOT( switchTabs() ) ); + connect( m_stylesList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( switchStyle() ) ); + connect( m_tabs, TQ_SIGNAL( currentChanged ( TQWidget * ) ), this, TQ_SLOT( switchTabs() ) ); } void KoStyleManager::addGeneralTab( int flags ) { @@ -186,7 +186,7 @@ void KoStyleManager::addGeneralTab( int flags ) { m_nameString = new TQLineEdit( tab ); m_nameString->resize(m_nameString->sizeHint() ); - connect( m_nameString, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( renameStyle(const TQString &) ) ); + connect( m_nameString, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( renameStyle(const TQString &) ) ); tabLayout->addWidget( m_nameString, 0, 1 ); diff --git a/lib/kotext/KoTextIterator.cpp b/lib/kotext/KoTextIterator.cpp index 8ac76173..ca3311ae 100644 --- a/lib/kotext/KoTextIterator.cpp +++ b/lib/kotext/KoTextIterator.cpp @@ -163,10 +163,10 @@ void KoTextIterator::connectTextObjects() { TQValueList<KoTextObject *>::Iterator it = m_lstObjects.begin(); for( ; it != m_lstObjects.end(); ++it ) { - connect( (*it), TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); - connect( (*it), TQT_SIGNAL( paragraphModified( KoTextParag*, int, int, int ) ), - this, TQT_SLOT( slotParagraphModified( KoTextParag*, int, int, int ) ) ); + connect( (*it), TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); + connect( (*it), TQ_SIGNAL( paragraphModified( KoTextParag*, int, int, int ) ), + this, TQ_SLOT( slotParagraphModified( KoTextParag*, int, int, int ) ) ); // We don't connect to destroyed(), because for undo/redo purposes, // we never really delete textdocuments nor textobjects. // So this is never called. diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp index cae6e9e4..01eea0fa 100644 --- a/lib/kotext/KoTextObject.cpp +++ b/lib/kotext/KoTextObject.cpp @@ -88,30 +88,30 @@ void KoTextObject::init() m_highlightSelectionAdded = false; interval = 0; changeIntervalTimer = new TQTimer( this ); - connect( changeIntervalTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doChangeInterval() ) ); + connect( changeIntervalTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doChangeInterval() ) ); formatTimer = new TQTimer( this ); - connect( formatTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( formatMore() ) ); + connect( formatTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( formatMore() ) ); // Apply default style to initial paragraph if ( m_lastFormatted && m_defaultStyle ) m_lastFormatted->applyStyle( m_defaultStyle ); - connect( textdoc, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ) ); - connect( textdoc, TQT_SIGNAL( paragraphDeleted( KoTextParag* ) ), - this, TQT_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); - connect( textdoc, TQT_SIGNAL( newCommand( KCommand* ) ), - this, TQT_SIGNAL( newCommand( KCommand* ) ) ); - connect( textdoc, TQT_SIGNAL( repaintChanged() ), - this, TQT_SLOT( emitRepaintChanged() ) ); + connect( textdoc, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ) ); + connect( textdoc, TQ_SIGNAL( paragraphDeleted( KoTextParag* ) ), + this, TQ_SLOT( slotParagraphDeleted( KoTextParag* ) ) ); + connect( textdoc, TQ_SIGNAL( newCommand( KCommand* ) ), + this, TQ_SIGNAL( newCommand( KCommand* ) ) ); + connect( textdoc, TQ_SIGNAL( repaintChanged() ), + this, TQ_SLOT( emitRepaintChanged() ) ); - connect( this, TQT_SIGNAL(paragraphModified( KoTextParag*, int, int , int ) ), - this, TQT_SLOT(slotParagraphModified(KoTextParag *, int, int , int))); - connect( this, TQT_SIGNAL(paragraphCreated( KoTextParag* )), - this, TQT_SLOT(slotParagraphCreated(KoTextParag *))); + connect( this, TQ_SIGNAL(paragraphModified( KoTextParag*, int, int , int ) ), + this, TQ_SLOT(slotParagraphModified(KoTextParag *, int, int , int))); + connect( this, TQ_SIGNAL(paragraphCreated( KoTextParag* )), + this, TQ_SLOT(slotParagraphCreated(KoTextParag *))); } KoTextObject::~KoTextObject() @@ -231,7 +231,7 @@ void KoTextObject::undo() emit setCursor( c ); setLastFormattedParag( textdoc->firstParag() ); delete cursor; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAfterUndoRedo() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAfterUndoRedo() ) ); } void KoTextObject::redo() @@ -248,7 +248,7 @@ void KoTextObject::redo() emit setCursor( c ); // see undo setLastFormattedParag( textdoc->firstParag() ); delete cursor; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAfterUndoRedo() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAfterUndoRedo() ) ); } KoTextObject::UndoRedoInfo::UndoRedoInfo( KoTextObject *to ) diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index d70f9f72..86f87a54 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -68,12 +68,12 @@ KoTextView::KoTextView( KoTextObject *textobj ) m_bReadWrite = true; m_textobj = textobj; dcop=0; - connect( m_textobj, TQT_SIGNAL( hideCursor() ), this, TQT_SLOT( hideCursor() ) ); - connect( m_textobj, TQT_SIGNAL( showCursor() ), this, TQT_SLOT( showCursor() ) ); - connect( m_textobj, TQT_SIGNAL( setCursor( KoTextCursor * ) ), this, TQT_SLOT( setCursor( KoTextCursor * ) ) ); - connect( m_textobj, TQT_SIGNAL( updateUI(bool, bool) ), this, TQT_SLOT( updateUI(bool, bool) ) ); - connect( m_textobj, TQT_SIGNAL( showCurrentFormat() ), this, TQT_SLOT( showCurrentFormat() ) ); - connect( m_textobj, TQT_SIGNAL( ensureCursorVisible() ), this, TQT_SLOT( ensureCursorVisible() ) ); + connect( m_textobj, TQ_SIGNAL( hideCursor() ), this, TQ_SLOT( hideCursor() ) ); + connect( m_textobj, TQ_SIGNAL( showCursor() ), this, TQ_SLOT( showCursor() ) ); + connect( m_textobj, TQ_SIGNAL( setCursor( KoTextCursor * ) ), this, TQ_SLOT( setCursor( KoTextCursor * ) ) ); + connect( m_textobj, TQ_SIGNAL( updateUI(bool, bool) ), this, TQ_SLOT( updateUI(bool, bool) ) ); + connect( m_textobj, TQ_SIGNAL( showCurrentFormat() ), this, TQ_SLOT( showCurrentFormat() ) ); + connect( m_textobj, TQ_SIGNAL( ensureCursorVisible() ), this, TQ_SLOT( ensureCursorVisible() ) ); m_cursor = new KoTextCursor( m_textobj->textDocument() ); @@ -81,14 +81,14 @@ KoTextView::KoTextView( KoTextObject *textobj ) showCursor(); blinkTimer = new TQTimer( this ); - connect( blinkTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( blinkCursor() ) ); + connect( blinkTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( blinkCursor() ) ); if ( TQApplication::cursorFlashTime() > 0 ) blinkTimer->start( TQApplication::cursorFlashTime() / 2 ); dragStartTimer = new TQTimer( this ); - connect( dragStartTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( startDrag() ) ); + connect( dragStartTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( startDrag() ) ); m_textobj->formatMore( 2 ); @@ -837,7 +837,7 @@ void KoTextView::handleMouseDoubleClickEvent( TQMouseEvent*ev, const TQPoint& i possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void KoTextView::tripleClickTimeout() @@ -855,7 +855,7 @@ void KoTextView::handleMouseTripleClickEvent( TQMouseEvent*ev, const TQPoint& /* afterTripleClick= true; inDoubleClick = FALSE; *m_cursor = selectParagUnderCursor( *m_cursor ); - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(afterTripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(afterTripleClickTimeout())); } void KoTextView::afterTripleClickTimeout() @@ -1133,7 +1133,7 @@ TQPtrList<TDEAction> KoTextView::dataToolActionList(TDEInstance * instance, cons // Maybe one day we'll have tools that use libkotext (or qt3's qrt), to act on formatted text tools += KDataToolInfo::query( "KoTextString", "application/x-qrichtext", instance ); - return KDataToolAction::dataToolActionList( tools, this, TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); + return KDataToolAction::dataToolActionList( tools, this, TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); } TQString KoTextView::currentWordOrSelection() const diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp index 0c55f52e..981c0f03 100644 --- a/lib/kotext/KoVariable.cpp +++ b/lib/kotext/KoVariable.cpp @@ -584,7 +584,7 @@ TQPtrList<TDEAction> KoVariableCollection::popupActionList() const // We store the subtype number as the action name TQCString name; name.setNum(i); TDEToggleAction * act = new TDEToggleAction( *it, TDEShortcut(), 0, name ); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeSubType()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotChangeSubType()) ); if ( i == m_varSelected->subType() ) act->setChecked( true ); //m_subTextMap.insert( act, i ); @@ -608,7 +608,7 @@ TQPtrList<TDEAction> KoVariableCollection::popupActionList() const TQString text = format->convert( m_varSelected->varValue() ); // We store the raw format as the action name TDEToggleAction * act = new TDEToggleAction(text, TDEShortcut(), 0, (*it).utf8()); - connect( act, TQT_SIGNAL(activated()), this, TQT_SLOT(slotChangeFormat()) ); + connect( act, TQ_SIGNAL(activated()), this, TQ_SLOT(slotChangeFormat()) ); if ( (*it) == currentFormat ) act->setChecked( true ); listAction.append( act ); diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp index 5bbd3d1f..b022cce8 100644 --- a/lib/kotext/TimeFormatWidget.cpp +++ b/lib/kotext/TimeFormatWidget.cpp @@ -38,10 +38,10 @@ TimeFormatWidget::TimeFormatWidget( TQWidget* parent, const char* name, WFlags combo2->setCurrentItem( 0 ); label_correction->setText(i18n("Correct in Minutes")); - connect( CheckBox1, TQT_SIGNAL(toggled ( bool )),this,TQT_SLOT(slotPersonalizeChanged(bool))); - connect( combo1, TQT_SIGNAL(activated ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( combo1, TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(slotDefaultValueChanged(const TQString &))); - connect( KIntNumInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT( slotOffsetChanged(int))); + connect( CheckBox1, TQ_SIGNAL(toggled ( bool )),this,TQ_SLOT(slotPersonalizeChanged(bool))); + connect( combo1, TQ_SIGNAL(activated ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( combo1, TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(slotDefaultValueChanged(const TQString &))); + connect( KIntNumInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT( slotOffsetChanged(int))); slotPersonalizeChanged(false); } diff --git a/lib/kross/api/eventsignal.cpp b/lib/kross/api/eventsignal.cpp index 9e07eed1..32537a68 100644 --- a/lib/kross/api/eventsignal.cpp +++ b/lib/kross/api/eventsignal.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSignal::call(const TQString& /*name*/, TDESharedPtr<List> argum TQString n = m_signal; - if(n.startsWith("2")) // Remove prefix of SIGNAL-macros + if(n.startsWith("2")) // Remove prefix of TQ_SIGNAL-macros n.remove(0,1); int signalid = m_sender->metaObject()->findSignal(n.latin1(), false); diff --git a/lib/kross/api/eventslot.cpp b/lib/kross/api/eventslot.cpp index cffe5ae8..5e655cdb 100644 --- a/lib/kross/api/eventslot.cpp +++ b/lib/kross/api/eventslot.cpp @@ -51,7 +51,7 @@ Object::Ptr EventSlot::call(const TQString& /*name*/, List::Ptr arguments) TQString n = m_slot; //TODO name; //Variant::toString(args->item(0)); - if(n.startsWith("1")) // Remove prefix of SLOT-macros + if(n.startsWith("1")) // Remove prefix of TQ_SLOT-macros n.remove(0,1); int slotid = m_receiver->metaObject()->findSlot(n.latin1(), false); @@ -98,7 +98,7 @@ TQCString EventSlot::getSlot(const TQCString& signal) krossdebug( TQString("signal=%1 slot=%2 slotid=%3 params=%4 mdname=%5") .arg(signal).arg(slot).arg(slotid).arg(params).arg(md->name) ); - return TQCString("1" + slot); // Emulate the TQT_SLOT(...) macro by adding as first char a "1". + return TQCString("1" + slot); // Emulate the TQ_SLOT(...) macro by adding as first char a "1". } bool EventSlot::connect(EventManager* eventmanager, TQObject* senderobj, const TQCString& signal, TQString function, const TQCString& slot) diff --git a/lib/kross/api/qtobject.h b/lib/kross/api/qtobject.h index 22829f02..25e0f153 100644 --- a/lib/kross/api/qtobject.h +++ b/lib/kross/api/qtobject.h @@ -39,7 +39,7 @@ namespace Kross { namespace Api { /** * Class to wrap \a TQObject or inherited instances. * - * This class publishs all SIGNAL's, SLOT's and TQ_PROPERTY's + * This class publishs all TQ_SIGNAL's, TQ_SLOT's and TQ_PROPERTY's * the TQObject has. */ class QtObject : public Kross::Api::Class<QtObject> diff --git a/lib/kross/main/scriptaction.cpp b/lib/kross/main/scriptaction.cpp index 2e775fcb..e8cbd4a6 100644 --- a/lib/kross/main/scriptaction.cpp +++ b/lib/kross/main/scriptaction.cpp @@ -164,7 +164,7 @@ ScriptAction::ScriptAction(const TQString& scriptconfigfile, const TQDomElement& TDEAction::setIcon(icon); // connect signal - connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activate())); + connect(this, TQ_SIGNAL(activated()), this, TQ_SLOT(activate())); } ScriptAction::~ScriptAction() diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index e96c4a90..75e2c2b0 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -76,10 +76,10 @@ ScriptGUIClient::ScriptGUIClient(KXMLGUIClient* guiclient, TQWidget* parent) setInstance( ScriptGUIClient::instance() ); // action to execute a scriptfile. - new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQT_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); + new TDEAction(i18n("Execute Script File..."), 0, 0, this, TQ_SLOT(executeScriptFile()), actionCollection(), "executescriptfile"); // acion to show the ScriptManagerGUI dialog. - new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQT_SLOT(showScriptManager()), actionCollection(), "configurescripts"); + new TDEAction(i18n("Scripts Manager..."), 0, 0, this, TQ_SLOT(showScriptManager()), actionCollection(), "configurescripts"); // The predefined ScriptActionCollection's this ScriptGUIClient provides. d->collections.replace("installedscripts", @@ -250,11 +250,11 @@ bool ScriptGUIClient::loadScriptConfigDocument(const TQString& scriptconfigfile, installedcollection->attach( action ); } - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); } emit collectionChanged(installedcollection); return true; @@ -329,11 +329,11 @@ bool ScriptGUIClient::loadScriptFile() ScriptActionCollection* loadedcollection = d->collections["loadedscripts"]; if(loadedcollection) { ScriptAction::Ptr action = new ScriptAction( url.path() ); - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); loadedcollection->detach(action); loadedcollection->attach(action); @@ -361,11 +361,11 @@ bool ScriptGUIClient::executeScriptFile(const TQString& file) bool ScriptGUIClient::executeScriptAction(ScriptAction::Ptr action) { - connect(action.data(), TQT_SIGNAL( failed(const TQString&, const TQString&) ), - this, TQT_SLOT( executionFailed(const TQString&, const TQString&) )); - connect(action.data(), TQT_SIGNAL( success() ), - this, TQT_SLOT( successfullyExecuted() )); - connect(action.data(), TQT_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQT_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); + connect(action.data(), TQ_SIGNAL( failed(const TQString&, const TQString&) ), + this, TQ_SLOT( executionFailed(const TQString&, const TQString&) )); + connect(action.data(), TQ_SIGNAL( success() ), + this, TQ_SLOT( successfullyExecuted() )); + connect(action.data(), TQ_SIGNAL( activated(const Kross::Api::ScriptAction*) ), TQ_SIGNAL( executionStarted(const Kross::Api::ScriptAction*))); action->activate(); bool ok = action->hadException(); action->finalize(); // execution is done. diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index 50a0101f..d04f8d9d 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -135,45 +135,45 @@ WdgScriptsManager::WdgScriptsManager(ScriptGUIClient* scr, TQWidget* parent, con slotFillScriptsList(); slotSelectionChanged(0); - connect(scriptsList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(scriptsList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); btnExec->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "application-x-executable", TDEIcon::MainToolbar, 16 )); - connect(btnExec, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + connect(btnExec, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); btnLoad->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "document-open", TDEIcon::MainToolbar, 16 )); - connect(btnLoad, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + connect(btnLoad, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); btnUnload->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUnload, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + connect(btnUnload, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); btnInstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "fileimport", TDEIcon::MainToolbar, 16 )); - connect(btnInstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + connect(btnInstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); btnUninstall->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "window-close", TDEIcon::MainToolbar, 16 )); - connect(btnUninstall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + connect(btnUninstall, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF btnNewStuff->setIconSet(TDEGlobal::instance()->iconLoader()->loadIconSet( "knewstuff", TDEIcon::MainToolbar, 16 )); - connect(btnNewStuff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + connect(btnNewStuff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif /* toolBar->setIconText( TDEToolBar::IconTextRight ); toolBar->insertButton("application-x-executable", WdgScriptsManagerPrivate::ExecBtn, false, i18n("Execute")); - toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotExecuteScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::ExecBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotExecuteScript())); toolBar->insertLineSeparator(); toolBar->insertButton("document-open", WdgScriptsManagerPrivate::LoadBtn, true, i18n("Load")); - toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLoadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::LoadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLoadScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UnloadBtn, false, i18n("Unload")); - toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUnloadScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UnloadBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUnloadScript())); toolBar->insertLineSeparator(); toolBar->insertButton("fileimport", WdgScriptsManagerPrivate::InstallBtn, true, i18n("Install")); - toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotInstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::InstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotInstallScript())); toolBar->insertButton("window-close", WdgScriptsManagerPrivate::UninstallBtn, false, i18n("Uninstall")); - toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUninstallScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::UninstallBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUninstallScript())); #ifdef KROSS_SUPPORT_NEWSTUFF toolBar->insertLineSeparator(); toolBar->insertButton("knewstuff", WdgScriptsManagerPrivate::NewStuffBtn, true, i18n("Get More Scripts")); - toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotGetNewScript())); + toolBar->addConnection(WdgScriptsManagerPrivate::NewStuffBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotGetNewScript())); #endif */ - connect(scr, TQT_SIGNAL( collectionChanged(ScriptActionCollection*) ), - this, TQT_SLOT( slotFillScriptsList() )); + connect(scr, TQ_SIGNAL( collectionChanged(ScriptActionCollection*) ), + this, TQ_SLOT( slotFillScriptsList() )); } WdgScriptsManager::~WdgScriptsManager() @@ -325,7 +325,7 @@ void WdgScriptsManager::slotGetNewScript() if(! d->newstuff) { d->newstuff = new ScriptNewStuff(d->m_scripguiclient, type); - connect(d->newstuff, TQT_SIGNAL(installFinished()), this, TQT_SLOT(slotResourceInstalled())); + connect(d->newstuff, TQ_SIGNAL(installFinished()), this, TQ_SLOT(slotResourceInstalled())); } KNS::Engine *engine = new KNS::Engine(d->newstuff, type, this); @@ -333,8 +333,8 @@ void WdgScriptsManager::slotGetNewScript() d->setType(type); KNS::ProviderLoader *p = new KNS::ProviderLoader(this); - TQObject::connect(p, TQT_SIGNAL(providersLoaded(Provider::List*)), - d, TQT_SLOT(slotProviders(Provider::List*))); + TQObject::connect(p, TQ_SIGNAL(providersLoaded(Provider::List*)), + d, TQ_SLOT(slotProviders(Provider::List*))); p->load(type, "https://www.trinitydesktop.org/ocs/providers.xml"); d->exec(); diff --git a/lib/kross/python/scripts/gui.py b/lib/kross/python/scripts/gui.py index aa4dc986..19a51ce4 100755 --- a/lib/kross/python/scripts/gui.py +++ b/lib/kross/python/scripts/gui.py @@ -224,7 +224,7 @@ class TQtDialog: tqt.TQPushButton.__init__(self, parent) self.commandmethod = commandmethod self.setText(caption) - tqt.TQObject.connect(self, tqt.SIGNAL("clicked()"), self.commandmethod) + tqt.TQObject.connect(self, tqt.TQ_SIGNAL("clicked()"), self.commandmethod) class CheckBox(tqt.TQCheckBox): @@ -268,7 +268,7 @@ class TQtDialog: label.setBuddy(self.edit) browsebutton = Button(dialog, self, "...", self.browseButtonClicked) - #tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + #tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def get(self): return self.edit.text() diff --git a/lib/kross/test/main.cpp b/lib/kross/test/main.cpp index 90665a72..146e0c20 100644 --- a/lib/kross/test/main.cpp +++ b/lib/kross/test/main.cpp @@ -114,8 +114,8 @@ void runInterpreter(const TQString& interpretername, const TQString& scriptcode) /* // Connect TQObject signal with scriptfunction. - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignal()), "testobjectCallback"); - scriptcontainer->connect(testobject, TQT_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignal()), "testobjectCallback"); + scriptcontainer->connect(testobject, TQ_SIGNAL(testSignalString(const TQString&)), "testobjectCallbackWithParams"); // Call the testSlot to emit the testSignal. testobject->testSlot(); */ diff --git a/lib/kross/test/testaction.cpp b/lib/kross/test/testaction.cpp index 42963904..8dd43647 100644 --- a/lib/kross/test/testaction.cpp +++ b/lib/kross/test/testaction.cpp @@ -24,11 +24,11 @@ TestAction::TestAction(Kross::Api::ScriptContainer::Ptr scriptcontainer) { m_actioncollection = new TDEActionCollection(this, this); - m_action1 = new TDEAction("Action1_Text", 0, this, TQT_SLOT(activatedAction1()), m_actioncollection, "Action1"); + m_action1 = new TDEAction("Action1_Text", 0, this, TQ_SLOT(activatedAction1()), m_actioncollection, "Action1"); m_actionlist.append(m_action1); scriptcontainer->addTDEAction(m_action1); - m_action2 = new TDEAction("Action2_Text", 0, this, TQT_SLOT(activatedAction2()), m_actioncollection, "Action2"); + m_action2 = new TDEAction("Action2_Text", 0, this, TQ_SLOT(activatedAction2()), m_actioncollection, "Action2"); m_actionlist.append(m_action2); scriptcontainer->addTDEAction(m_action2); } diff --git a/lib/kross/test/testgui.py b/lib/kross/test/testgui.py index 9c2747e8..c42f4f75 100644 --- a/lib/kross/test/testgui.py +++ b/lib/kross/test/testgui.py @@ -67,7 +67,7 @@ class TQtTest: label.setBuddy(self.edit) browsebutton = Button("...", self) - tqt.TQObject.connect(browsebutton, tqt.SIGNAL("clicked()"), self.browseButtonClicked) + tqt.TQObject.connect(browsebutton, tqt.TQ_SIGNAL("clicked()"), self.browseButtonClicked) def file(self): return self.edit.text() @@ -112,11 +112,11 @@ class TQtTest: self.layout.addWidget(buttonbox) savebutton = Button("Save", buttonbox) - tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("accept()")) - #tqt.TQObject.connect(savebutton, tqt.SIGNAL("clicked()"), self.exportButtonClicked) + tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("accept()")) + #tqt.TQObject.connect(savebutton, tqt.TQ_SIGNAL("clicked()"), self.exportButtonClicked) cancelbutton = Button("Cancel", buttonbox) - tqt.TQObject.connect(cancelbutton, tqt.SIGNAL("clicked()"), self, tqt.SLOT("close()")) + tqt.TQObject.connect(cancelbutton, tqt.TQ_SIGNAL("clicked()"), self, tqt.TQ_SLOT("close()")) def accept(self): print("ACCEPTTTTTTTT !!!!!!!!!!!!!!!!!!!!!!!!!!!!") diff --git a/lib/kross/test/testobject.cpp b/lib/kross/test/testobject.cpp index 884e7e37..30385edd 100644 --- a/lib/kross/test/testobject.cpp +++ b/lib/kross/test/testobject.cpp @@ -29,17 +29,17 @@ TestObject::TestObject() TestObject::TestObject(TQObject* parent, Kross::Api::ScriptContainer::Ptr scriptcontainer) : TQObject(parent, "TestObject") { - connect(this, TQT_SIGNAL(testSignal()), this, TQT_SLOT(testSignalSlot())); - connect(this, TQT_SIGNAL(stdoutSignal(const TQString&)), this, TQT_SLOT(stdoutSlot(const TQString&))); - connect(this, TQT_SIGNAL(stderrSignal(const TQString&)), this, TQT_SLOT(stderrSlot(const TQString&))); + connect(this, TQ_SIGNAL(testSignal()), this, TQ_SLOT(testSignalSlot())); + connect(this, TQ_SIGNAL(stdoutSignal(const TQString&)), this, TQ_SLOT(stdoutSlot(const TQString&))); + connect(this, TQ_SIGNAL(stderrSignal(const TQString&)), this, TQ_SLOT(stderrSlot(const TQString&))); scriptcontainer->addTQObject(this); -//scriptcontainer->addSignal("stdout", this, TQT_SIGNAL(stdoutSignal(const TQString&))); -//scriptcontainer->addSlot("stderr", this, TQT_SLOT(stderrSlot(const TQString&))); +//scriptcontainer->addSignal("stdout", this, TQ_SIGNAL(stdoutSignal(const TQString&))); +//scriptcontainer->addSlot("stderr", this, TQ_SLOT(stderrSlot(const TQString&))); - //scriptcontainer->addSignal("myTestSignal", this, TQT_SIGNAL(testSignal())); - //scriptcontainer->addSlot("myTestSlot", this, TQT_SLOT(testSlot())); + //scriptcontainer->addSignal("myTestSignal", this, TQ_SIGNAL(testSignal())); + //scriptcontainer->addSlot("myTestSlot", this, TQ_SLOT(testSlot())); } TestObject::~TestObject() diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index 4d9c90e3..9e6908f5 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -83,7 +83,7 @@ TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptco TQHBox* btnbox = new TQHBox(mainbox); KPushButton* execbtn = new KPushButton("Execute", btnbox); - connect(execbtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(execute())); + connect(execbtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(execute())); setCentralWidget(mainbox); setMinimumSize(600,420); diff --git a/lib/store/tests/storedroptest.cpp b/lib/store/tests/storedroptest.cpp index bc7dec00..e522e9a4 100644 --- a/lib/store/tests/storedroptest.cpp +++ b/lib/store/tests/storedroptest.cpp @@ -32,7 +32,7 @@ int main( int argc, char** argv ) window->resize( 500, 500 ); window->show(); - TQObject::connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), tqApp, TQT_SLOT( quit() ) ); + TQObject::connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), tqApp, TQ_SLOT( quit() ) ); return app.exec(); } |