Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit c0332621bc998c9786f4841e86a62b7711fe4abf)

9 files changed, 85 insertions, 85 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 );