Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 38 insertions, 38 deletions

diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 7fe805c7..1a5265c2 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -201,7 +201,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(TQWidget * par)
 
 	m_pMenuButton = new TQPushButton(__tr2qs("Test"),this);
 	g->addWidget(m_pMenuButton,0,2);
-	connect(m_pMenuButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(testPopup()));
+	connect(m_pMenuButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(testPopup()));
 	TQSplitter * spl = new TQSplitter(TQt::Vertical,this);
 
 	m_pListView = new KviTalListView(spl);
@@ -214,9 +214,9 @@ KviSinglePopupEditor::KviSinglePopupEditor(TQWidget * par)
 	m_pListView->setSorting(-1);
 
 
-	connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(selectionChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(selectionChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 	m_pEditor = KviScriptEditor::createInstance(spl);
 
@@ -287,7 +287,7 @@ void KviSinglePopupEditor::testPopup()
 	if(m_pTestPopup)delete m_pTestPopup;
 	m_pTestPopup = getMenu();
 	if(!m_pTestPopup)return;
-	connect(m_pTestPopup,TQT_SIGNAL(testModeItemClicked(KviKvsPopupMenuItem *)),this,TQT_SLOT(testModeMenuItemClicked(KviKvsPopupMenuItem *)));
+	connect(m_pTestPopup,TQ_SIGNAL(testModeItemClicked(KviKvsPopupMenuItem *)),this,TQ_SLOT(testModeMenuItemClicked(KviKvsPopupMenuItem *)));
 	TQPoint pnt = m_pMenuButton->mapToGlobal(TQPoint(0,m_pMenuButton->height()));
 	KviKvsVariantList * parms = new KviKvsVariantList();
 	parms->append(new KviKvsVariant(TQString("test1")));
@@ -378,52 +378,52 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
-	m_pContextPopup->insertItem(__tr2qs("New Separator Below"),this,TQT_SLOT(contextNewSeparatorBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Separator Below"),this,TQ_SLOT(contextNewSeparatorBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Separator Above"),this,TQT_SLOT(contextNewSeparatorAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Separator Above"),this,TQ_SLOT(contextNewSeparatorAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Separator Inside"),this,TQT_SLOT(contextNewSeparatorInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Separator Inside"),this,TQ_SLOT(contextNewSeparatorInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Label Below"),this,TQT_SLOT(contextNewLabelBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Label Below"),this,TQ_SLOT(contextNewLabelBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Label Above"),this,TQT_SLOT(contextNewLabelAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Label Above"),this,TQ_SLOT(contextNewLabelAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Label Inside"),this,TQT_SLOT(contextNewLabelInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Label Inside"),this,TQ_SLOT(contextNewLabelInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Item Below"),this,TQT_SLOT(contextNewItemBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Item Below"),this,TQ_SLOT(contextNewItemBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Item Above"),this,TQT_SLOT(contextNewItemAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Item Above"),this,TQ_SLOT(contextNewItemAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Item Inside"),this,TQT_SLOT(contextNewItemInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Item Inside"),this,TQ_SLOT(contextNewItemInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New Menu Below"),this,TQT_SLOT(contextNewMenuBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New Menu Below"),this,TQ_SLOT(contextNewMenuBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Menu Above"),this,TQT_SLOT(contextNewMenuAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New Menu Above"),this,TQ_SLOT(contextNewMenuAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New Menu Inside"),this,TQT_SLOT(contextNewMenuInside())),
+		m_pContextPopup->insertItem(__tr2qs("New Menu Inside"),this,TQ_SLOT(contextNewMenuInside())),
 		it && bIsMenu);
 
 		m_pContextPopup->insertSeparator();
 
-	m_pContextPopup->insertItem(__tr2qs("New External Menu Below"),this,TQT_SLOT(contextNewExtMenuBelow()));
+	m_pContextPopup->insertItem(__tr2qs("New External Menu Below"),this,TQ_SLOT(contextNewExtMenuBelow()));
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New External Menu Above"),this,TQT_SLOT(contextNewExtMenuAbove())),
+		m_pContextPopup->insertItem(__tr2qs("New External Menu Above"),this,TQ_SLOT(contextNewExtMenuAbove())),
 		it);
 	m_pContextPopup->setItemEnabled(
-		m_pContextPopup->insertItem(__tr2qs("New External Menu Inside"),this,TQT_SLOT(contextNewExtMenuInside())),
+		m_pContextPopup->insertItem(__tr2qs("New External Menu Inside"),this,TQ_SLOT(contextNewExtMenuInside())),
 		it && bIsMenu);
 
 	m_pContextPopup->insertSeparator();
@@ -432,28 +432,28 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),
 			__tr2qs("Cu&t"),
-			this,TQT_SLOT(contextCut())),
+			this,TQ_SLOT(contextCut())),
 		it);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),
 			__tr2qs("&Copy"),
-			this,TQT_SLOT(contextCopy())),
+			this,TQ_SLOT(contextCopy())),
 		it);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("&Paste Below"),this,TQT_SLOT(contextPasteBelow())),
+			__tr2qs("&Paste Below"),this,TQ_SLOT(contextPasteBelow())),
 		m_pClipboard);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("Paste Above"),this,TQT_SLOT(contextPasteAbove())),
+			__tr2qs("Paste Above"),this,TQ_SLOT(contextPasteAbove())),
 		it && m_pClipboard);
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 			*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),
-			__tr2qs("Paste Inside"),this,TQT_SLOT(contextPasteInside())),
+			__tr2qs("Paste Inside"),this,TQ_SLOT(contextPasteInside())),
 		it && bIsMenu && m_pClipboard);
 
 
@@ -465,7 +465,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		bSeparatorInserted = true;
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROLOGUE)),
-				__tr2qs("New Menu Prologue"),this,TQT_SLOT(contextNewPrologue()));
+				__tr2qs("New Menu Prologue"),this,TQ_SLOT(contextNewPrologue()));
 //	}
 
 //	if(!findEpilogue(parentMenu))
@@ -473,7 +473,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 		if(!bSeparatorInserted)m_pContextPopup->insertSeparator();
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EPILOGUE)),
-				__tr2qs("New Menu Epilogue"),this,TQT_SLOT(contextNewEpilogue()));
+				__tr2qs("New Menu Epilogue"),this,TQ_SLOT(contextNewEpilogue()));
 //	}
 
 	m_pContextPopup->popup(pnt);
@@ -1034,9 +1034,9 @@ KviPopupEditor::KviPopupEditor(TQWidget * par)
 	m_pListView->setShowSortIndicator(true);
 
 	TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),box);
-	connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAll()));
+	connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAll()));
 	TQPushButton * gn = new TQPushButton(__tr2qs("&Export selected To..."),box);
-	connect(gn,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportSelected()));
+	connect(gn,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportSelected()));
 
 	m_pEditor = new KviSinglePopupEditor(spl);
 
@@ -1073,9 +1073,9 @@ void KviPopupEditor::oneTimeSetup()
 		++it;
 	}
 
-	connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *)));
-	connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
-		this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
+	connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *)));
+	connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),
+		this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int)));
 
 }
 
@@ -1087,20 +1087,20 @@ void KviPopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	m_pContextPopup->insertItem(
 		*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUP)),
 		__tr2qs("&New Popup"),
-		this,TQT_SLOT(newPopup()));
+		this,TQ_SLOT(newPopup()));
 
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),
 				__tr2qs("Re&move Popup"),
-				this,TQT_SLOT(removeCurrentPopup())),
+				this,TQ_SLOT(removeCurrentPopup())),
 	it);
 	
 	m_pContextPopup->setItemEnabled(
 		m_pContextPopup->insertItem(
 				*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)),
 				__tr2qs("&Export Popup To..."),
-				this,TQT_SLOT(exportCurrentPopup())),
+				this,TQ_SLOT(exportCurrentPopup())),
 	it);
 
 	m_pContextPopup->popup(pnt);
@@ -1316,17 +1316,17 @@ KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
 	TQGridLayout * g = new TQGridLayout(m_pBase,1,4,4,4);
 
 	TQPushButton * btn = new TQPushButton(__tr2qs("&OK"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,1);
 
 	btn = new TQPushButton(__tr2qs("&Apply"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
 	g->addWidget(btn,0,2);
 
 	btn = new TQPushButton(__tr2qs("Cancel"),m_pBase);
-	connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked()));
+	connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked()));
 	btn->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	g->addWidget(btn,0,3);