Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

3 files changed, 39 insertions, 39 deletions

diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
index f55f9d14..a2783f2d 100644
--- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
+++ b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp
@@ -69,8 +69,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
     cubeLayout->addWidget (updatePushButton, 0/*stretch*/, TQt::AlignHCenter);
 
 
-    connect (updatePushButton, TQT_SIGNAL (clicked ()),
-             this, TQT_SLOT (slotColorSimilarityValueChanged ()));
+    connect (updatePushButton, TQ_SIGNAL (clicked ()),
+             this, TQ_SLOT (slotColorSimilarityValueChanged ()));
 
 
     TQGroupBox *inputGroupBox = new TQGroupBox (i18n ("RGB Color Cube Distance"), baseWidget);
@@ -86,8 +86,8 @@ kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
     inputLayout->addWidget (m_colorSimilarityInput);
 
 
-    connect (m_colorSimilarityInput, TQT_SIGNAL (valueChanged (int)),
-             this, TQT_SLOT (slotColorSimilarityValueChanged ()));
+    connect (m_colorSimilarityInput, TQ_SIGNAL (valueChanged (int)),
+             this, TQ_SLOT (slotColorSimilarityValueChanged ()));
 
 
     TQVBoxLayout *baseLayout = new TQVBoxLayout (baseWidget, 0/*margin*/, spacingHint () * 2);
diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp
index b60f70ed..67e1e7e8 100644
--- a/kolourpaint/widgets/kpcolortoolbar.cpp
+++ b/kolourpaint/widgets/kpcolortoolbar.cpp
@@ -476,8 +476,8 @@ kpColorCells::kpColorCells (TQWidget *parent,
     setAcceptDrops (true);
     setAcceptDrags (true);
     
-    connect (this, TQT_SIGNAL (colorDoubleClicked (int)),
-             TQT_SLOT (slotColorDoubleClicked (int)));
+    connect (this, TQ_SIGNAL (colorDoubleClicked (int)),
+             TQ_SLOT (slotColorDoubleClicked (int)));
 
     if (!ownColorsInitialised)
     {
@@ -674,9 +674,9 @@ void kpColorCells::mouseReleaseEvent (TQMouseEvent *e)
             m_mouseButton = 1;
     }
 
-    connect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int)));
+    connect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int)));
     KColorCells::mouseReleaseEvent (e);
-    disconnect (this, TQT_SIGNAL (colorSelected (int)), this, TQT_SLOT (slotColorSelected (int)));
+    disconnect (this, TQ_SIGNAL (colorSelected (int)), this, TQ_SLOT (slotColorSelected (int)));
 
 #if DEBUG_KP_COLOR_TOOL_BAR
     kdDebug () << "kpColorCells::mouseReleaseEvent() setting m_mouseButton back to -1" << endl;
@@ -830,16 +830,16 @@ kpColorPalette::kpColorPalette (TQWidget *parent,
 
     m_transparentColorCell = new kpTransparentColorCell (this);
     m_transparentColorCell->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    connect (m_transparentColorCell, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
-    connect (m_transparentColorCell, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+    connect (m_transparentColorCell, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+    connect (m_transparentColorCell, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
 
     m_colorCells = new kpColorCells (this);
-    connect (m_colorCells, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
-    connect (m_colorCells, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+    connect (m_colorCells, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+    connect (m_colorCells, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
 
     setOrientation (o);
 }
@@ -965,25 +965,25 @@ kpColorToolBar::kpColorToolBar (const TQString &label, kpMainWindow *mainWindow,
 
     m_dualColorButton = new kpDualColorButton (mainWindow, base);
     m_dualColorButton->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    connect (m_dualColorButton, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
-             this, TQT_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
-    connect (m_dualColorButton, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (foregroundColorChanged (const kpColor &)));
-    connect (m_dualColorButton, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
-             this, TQT_SIGNAL (backgroundColorChanged (const kpColor &)));
+    connect (m_dualColorButton, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)),
+             this, TQ_SIGNAL (colorsSwapped (const kpColor &, const kpColor &)));
+    connect (m_dualColorButton, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (foregroundColorChanged (const kpColor &)));
+    connect (m_dualColorButton, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+             this, TQ_SIGNAL (backgroundColorChanged (const kpColor &)));
     m_boxLayout->addWidget (m_dualColorButton, 0/*stretch*/);
 
     m_colorPalette = new kpColorPalette (base);
-    connect (m_colorPalette, TQT_SIGNAL (foregroundColorChanged (const kpColor &)),
-             m_dualColorButton, TQT_SLOT (setForegroundColor (const kpColor &)));
-    connect (m_colorPalette, TQT_SIGNAL (backgroundColorChanged (const kpColor &)),
-             m_dualColorButton, TQT_SLOT (setBackgroundColor (const kpColor &)));
+    connect (m_colorPalette, TQ_SIGNAL (foregroundColorChanged (const kpColor &)),
+             m_dualColorButton, TQ_SLOT (setForegroundColor (const kpColor &)));
+    connect (m_colorPalette, TQ_SIGNAL (backgroundColorChanged (const kpColor &)),
+             m_dualColorButton, TQ_SLOT (setBackgroundColor (const kpColor &)));
     m_boxLayout->addWidget (m_colorPalette, 0/*stretch*/);
 
     m_colorSimilarityToolBarItem = new kpColorSimilarityToolBarItem (mainWindow, base);
     m_colorSimilarityToolBarItem->setSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    connect (m_colorSimilarityToolBarItem, TQT_SIGNAL (colorSimilarityChanged (double, int)),
-             this, TQT_SIGNAL (colorSimilarityChanged (double, int)));
+    connect (m_colorSimilarityToolBarItem, TQ_SIGNAL (colorSimilarityChanged (double, int)),
+             this, TQ_SIGNAL (colorSimilarityChanged (double, int)));
     m_boxLayout->addWidget (m_colorSimilarityToolBarItem, 0/*stretch*/);
 
     // HACK: couldn't get TQSpacerItem to work
diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp
index dcd79e77..0df59f2e 100644
--- a/kolourpaint/widgets/kptooltoolbar.cpp
+++ b/kolourpaint/widgets/kptooltoolbar.cpp
@@ -131,8 +131,8 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
          it != m_toolWidgets.end ();
          it++)
     {
-        connect (*it, TQT_SIGNAL (optionSelected (int, int)),
-                 this, TQT_SIGNAL (toolWidgetOptionSelected ()));
+        connect (*it, TQ_SIGNAL (optionSelected (int, int)),
+                 this, TQ_SIGNAL (toolWidgetOptionSelected ()));
     }
 
 #if DEBUG_KP_TOOL_TOOL_BAR
@@ -151,7 +151,7 @@ kpToolToolBar::kpToolToolBar (const TQString &label, kpMainWindow *mainWindow, i
     m_buttonGroup = new TQButtonGroup ();  // invisible
     m_buttonGroup->setExclusive (true);
 
-    connect (m_buttonGroup, TQT_SIGNAL (clicked (int)), TQT_SLOT (slotToolButtonClicked ()));
+    connect (m_buttonGroup, TQ_SIGNAL (clicked (int)), TQ_SLOT (slotToolButtonClicked ()));
 
     hideAllToolWidgets ();
 }
@@ -247,10 +247,10 @@ void kpToolToolBar::registerTool (kpTool *tool)
     m_buttonToolPairs.append (kpButtonToolPair (b, tool));
 
 
-    connect (tool, TQT_SIGNAL (actionActivated ()),
-             this, TQT_SLOT (slotToolActionActivated ()));
-    connect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)),
-             this, TQT_SLOT (slotToolActionToolTipChanged ()));
+    connect (tool, TQ_SIGNAL (actionActivated ()),
+             this, TQ_SLOT (slotToolActionActivated ()));
+    connect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)),
+             this, TQ_SLOT (slotToolActionToolTipChanged ()));
 }
 
 // public
@@ -265,10 +265,10 @@ void kpToolToolBar::unregisterTool (kpTool *tool)
             delete ((*it).m_button);
             m_buttonToolPairs.erase (it);
 
-            disconnect (tool, TQT_SIGNAL (actionActivated ()),
-                        this, TQT_SLOT (slotToolActionActivated ()));
-            disconnect (tool, TQT_SIGNAL (actionToolTipChanged (const TQString &)),
-                        this, TQT_SLOT (slotToolActionToolTipChanged ()));
+            disconnect (tool, TQ_SIGNAL (actionActivated ()),
+                        this, TQ_SLOT (slotToolActionActivated ()));
+            disconnect (tool, TQ_SIGNAL (actionToolTipChanged (const TQString &)),
+                        this, TQ_SLOT (slotToolActionToolTipChanged ()));
             break;
         }
     }