Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 209ac1e561619ff446be4b3411ed74e59fff168e)

1 files changed, 13 insertions, 13 deletions

diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 208c2692..e93bfe1f 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -66,7 +66,7 @@ KviTrashcanLabel::KviTrashcanLabel(TQWidget * p)
 	m_uFlashCount = 0;
 	m_pFlashTimer = 0;
 	m_clrOriginal = paletteBackgroundColor();
-	connect(KviActionManager::instance(),TQT_SIGNAL(removeActionsHintRequest()),this,TQT_SLOT(flash()));
+	connect(KviActionManager::instance(),TQ_SIGNAL(removeActionsHintRequest()),this,TQ_SLOT(flash()));
 }
 
 KviTrashcanLabel::~KviTrashcanLabel()
@@ -83,7 +83,7 @@ void KviTrashcanLabel::flash()
 	m_uFlashCount = 0;
 	if(m_pFlashTimer)return;
 	m_pFlashTimer = new TQTimer();
-	connect(m_pFlashTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat()));
+	connect(m_pFlashTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat()));
 	m_pFlashTimer->start(200);
 }
 
@@ -139,7 +139,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	m_pLabelEdit = new TQLineEdit(this);
 	g->addMultiCellWidget(m_pLabelEdit,1,1,1,5);
 	m_pLabelEdit->setText(szLabel);
-	connect(m_pLabelEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(labelTextChanged(const TQString &)));
+	connect(m_pLabelEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(labelTextChanged(const TQString &)));
 	
 	l = new TQLabel(__tr2qs("Icon") + ":",this);
 	g->addWidget(l,2,0);
@@ -150,7 +150,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	
 	m_pIconButton = new TQPushButton(this);
 	g->addMultiCellWidget(m_pIconButton,2,2,5,5);
-	connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked()));
+	connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked()));
 
 	iconSelected(szIconId);
 
@@ -173,17 +173,17 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,
 	m_pLabelEdit->setFocus();
 	
 	TQPushButton * pb = new TQPushButton(__tr2qs("OK"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	pb->setMinimumWidth(80);
 	g->addMultiCellWidget(pb,4,4,4,5);
 	
 	pb = new TQPushButton(__tr2qs("Cancel"),this);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject()));
 	pb->setMinimumWidth(80);
 	g->addWidget(pb,4,3);
 	
 	m_pAdvancedButton = new TQPushButton(__tr2qs("Advanced..."),this);
-	connect(m_pAdvancedButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedClicked()));
+	connect(m_pAdvancedButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(advancedClicked()));
 	m_pAdvancedButton->setMinimumWidth(100);
 	g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1);
 	
@@ -294,15 +294,15 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	g->addMultiCellWidget(m_pDrawer,0,6,0,0);
 
 	TQPushButton * b = new TQPushButton(__tr2qs("New ToolBar"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newToolBar()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(newToolBar()));
 	g->addWidget(b,0,1);
 
 	m_pDeleteToolBarButton = new TQPushButton(__tr2qs("Delete ToolBar"),this);
-	connect(m_pDeleteToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteToolBar()));
+	connect(m_pDeleteToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteToolBar()));
 	g->addWidget(m_pDeleteToolBarButton,1,1);
 
 	m_pRenameToolBarButton = new TQPushButton(__tr2qs("Edit ToolBar"),this);
-	connect(m_pRenameToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameToolBar()));
+	connect(m_pRenameToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameToolBar()));
 	g->addWidget(m_pRenameToolBarButton,2,1);
 
 	TQFrame * f = new TQFrame(this);
@@ -310,14 +310,14 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	g->addWidget(f,3,1);
 	
 	m_pExportToolBarButton = new TQPushButton(__tr2qs("Export ToolBar"),this);
-	connect(m_pExportToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportToolBar()));
+	connect(m_pExportToolBarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportToolBar()));
 	g->addWidget(m_pExportToolBarButton,4,1);
 
 	KviTrashcanLabel * t = new KviTrashcanLabel(this);
 	g->addWidget(t,6,1);
 
 	b = new TQPushButton(__tr2qs("Close"),this);
-	connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked()));
+	connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked()));
 	g->addWidget(b,7,1);
 
 	g->setRowStretch(5,1);
@@ -325,7 +325,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p)
 	
 	m_pDrawer->fill();
 
-	connect(KviActionManager::instance(),TQT_SIGNAL(currentToolBarChanged()),this,TQT_SLOT(currentToolBarChanged()));
+	connect(KviActionManager::instance(),TQ_SIGNAL(currentToolBarChanged()),this,TQ_SLOT(currentToolBarChanged()));
 	KviActionManager::instance()->customizeToolBarsDialogCreated();
 	
 	currentToolBarChanged();