From 677dae3bd35bd025d338292a296632d3d2f183e4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 28 Dec 2023 21:15:50 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit 209ac1e561619ff446be4b3411ed74e59fff168e) --- src/modules/objects/class_button.cpp | 2 +- src/modules/objects/class_checkbox.cpp | 4 ++-- src/modules/objects/class_combobox.cpp | 6 +++--- src/modules/objects/class_lineedit.cpp | 6 +++--- src/modules/objects/class_listbox.cpp | 6 +++--- src/modules/objects/class_listview.cpp | 22 +++++++++++----------- src/modules/objects/class_painter.cpp | 4 ++-- src/modules/objects/class_popupmenu.cpp | 4 ++-- src/modules/objects/class_process.cpp | 6 +++--- src/modules/objects/class_radiobutton.cpp | 2 +- src/modules/objects/class_slider.cpp | 2 +- src/modules/objects/class_socket.cpp | 20 ++++++++++---------- src/modules/objects/class_spinbox.cpp | 2 +- src/modules/objects/class_tabwidget.cpp | 2 +- src/modules/objects/class_tbrowser.cpp | 2 +- src/modules/objects/class_toolbutton.cpp | 2 +- src/modules/objects/class_wizard.cpp | 4 ++-- 17 files changed, 48 insertions(+), 48 deletions(-) (limited to 'src/modules/objects') diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp index 2af3b0c6..db4ee3e5 100644 --- a/src/modules/objects/class_button.cpp +++ b/src/modules/objects/class_button.cpp @@ -58,7 +58,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button) bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQPushButton(parentScriptWidget(),name()),true); - connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp index 4975c30f..2be2e3fe 100644 --- a/src/modules/objects/class_checkbox.cpp +++ b/src/modules/objects/class_checkbox.cpp @@ -80,8 +80,8 @@ bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLi { KviStyledCheckBox * cb = new KviStyledCheckBox(parentScriptWidget(), name()); setObject(cb, true); - connect(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool))); - connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(cb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggled(bool))); + connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp index 197c7c02..baf15336 100644 --- a/src/modules/objects/class_combobox.cpp +++ b/src/modules/objects/class_combobox.cpp @@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox) bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQComboBox(parentScriptWidget(), name()), true); - connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int ))); + connect (((TQComboBox *)widget()),TQ_SIGNAL(activated( int )),this,TQ_SLOT(slotActivated( int ))); return true; } @@ -246,9 +246,9 @@ bool KviKvsObject_combobox::functionsetEditable(KviKvsObjectFunctionCall *c) if(widget()) { ((TQComboBox *)widget())->setEditable(bFlag); - if (bFlag) connect (((TQComboBox *)widget())->lineEdit(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & ))); + if (bFlag) connect (((TQComboBox *)widget())->lineEdit(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & ))); else - disconnect (((TQComboBox *)widget())->lineEdit(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & ))); + disconnect (((TQComboBox *)widget())->lineEdit(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & ))); } return true; diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp index 2a39996c..e6f4037a 100644 --- a/src/modules/objects/class_lineedit.cpp +++ b/src/modules/objects/class_lineedit.cpp @@ -218,9 +218,9 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit) bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { setObject(new TQLineEdit(parentScriptWidget(),getName()),true); - connect(widget(),TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotreturnPressed())); - connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus())); - connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & ))); + connect(widget(),TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotreturnPressed())); + connect(widget(),TQ_SIGNAL(lostFocus()),this,TQ_SLOT(slotlostFocus())); + connect(widget(),TQ_SIGNAL(textChanged(const TQString & )),this,TQ_SLOT(slottextChanged(const TQString & ))); return true; } diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp index 84afcd69..5b2301b5 100644 --- a/src/modules/objects/class_listbox.cpp +++ b/src/modules/objects/class_listbox.cpp @@ -151,10 +151,10 @@ bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis { KviTalListBox * b = new KviTalListBox(parentScriptWidget()); b->setSelectionMode(KviTalListBox::Single); - connect(b,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); - connect(b,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(currentItemChanged(KviTalListBoxItem *))); + connect(b,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); + connect(b,TQ_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQ_SLOT(currentItemChanged(KviTalListBoxItem *))); - connect(b,TQT_SIGNAL(onItem(KviTalListBoxItem *)),this,TQT_SLOT(onItem(KviTalListBoxItem *))); + connect(b,TQ_SIGNAL(onItem(KviTalListBoxItem *)),this,TQ_SLOT(onItem(KviTalListBoxItem *))); setObject(b,true);; return true; diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp index ea15b09f..c23abd5f 100644 --- a/src/modules/objects/class_listview.cpp +++ b/src/modules/objects/class_listview.cpp @@ -213,17 +213,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview) bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new KviKvsMdmListView(parentScriptWidget(),name(),this),true); - connect(widget(),TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged())); - connect(widget(),TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(slotCurrentChanged(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(returnPressed(KviTalListViewItem *)),this,TQT_SLOT(slotReturnPressed(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(spacePressed(KviTalListViewItem *)),this,TQT_SLOT(slotSpacePressed(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(onItem(KviTalListViewItem *)),this,TQT_SLOT(slotOnItem(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(expanded(KviTalListViewItem *)),this,TQT_SLOT(slotItemExpanded(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(collapsed(KviTalListViewItem *)),this,TQT_SLOT(slotItemCollapsed(KviTalListViewItem *))); - connect(widget(),TQT_SIGNAL(rightButtonClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotRightButtonClicked(KviTalListViewItem *,const TQPoint &,int))); - connect(widget(),TQT_SIGNAL(itemRenamed(KviTalListViewItem *,int,const TQString &)),this,TQT_SLOT(slotItemRenamed(KviTalListViewItem *,int,const TQString &))); + connect(widget(),TQ_SIGNAL(clicked(KviTalListViewItem *)),this,TQ_SLOT(slotClicked(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(slotSelectionChanged(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(slotMultipleSelectionChanged())); + connect(widget(),TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(slotCurrentChanged(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(returnPressed(KviTalListViewItem *)),this,TQ_SLOT(slotReturnPressed(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(spacePressed(KviTalListViewItem *)),this,TQ_SLOT(slotSpacePressed(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(onItem(KviTalListViewItem *)),this,TQ_SLOT(slotOnItem(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(expanded(KviTalListViewItem *)),this,TQ_SLOT(slotItemExpanded(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(collapsed(KviTalListViewItem *)),this,TQ_SLOT(slotItemCollapsed(KviTalListViewItem *))); + connect(widget(),TQ_SIGNAL(rightButtonClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotRightButtonClicked(KviTalListViewItem *,const TQPoint &,int))); + connect(widget(),TQ_SIGNAL(itemRenamed(KviTalListViewItem *,int,const TQString &)),this,TQ_SLOT(slotItemRenamed(KviTalListViewItem *,int,const TQString &))); return true; } diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 341706d8..3627b9e2 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -792,7 +792,7 @@ void KviKvsObject_painter::attachDevice(KviKvsObject * o,TQPaintDevice * p) // it is emitted BEFORE the real TQPaintDevice is deleted, so we can eventually // call m_pPainter->end() in time - TQObject::connect(m_pDeviceObject,TQT_SIGNAL(aboutToDie()),this,TQT_SLOT(detachDevice())); + TQObject::connect(m_pDeviceObject,TQ_SIGNAL(aboutToDie()),this,TQ_SLOT(detachDevice())); m_pPainter->begin(p); } @@ -800,7 +800,7 @@ void KviKvsObject_painter::detachDevice() { if(!m_pDeviceObject)return; if(!m_pPainter)return; - disconnect(m_pDeviceObject,TQT_SIGNAL(aboutToDie()),this,TQT_SLOT(detachDevice())); + disconnect(m_pDeviceObject,TQ_SIGNAL(aboutToDie()),this,TQ_SLOT(detachDevice())); m_pPainter->end(); m_pDeviceObject = 0; } diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp index b600841c..3c4cc759 100644 --- a/src/modules/objects/class_popupmenu.cpp +++ b/src/modules/objects/class_popupmenu.cpp @@ -185,8 +185,8 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu) bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true); - connect(widget(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotactivated(int))); - connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int))); + connect(widget(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotactivated(int))); + connect(widget(),TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slothighlighted(int))); return true; } diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp index 9b92ac2f..256c8212 100644 --- a/src/modules/objects/class_process.cpp +++ b/src/modules/objects/class_process.cpp @@ -181,8 +181,8 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_process,"process","object") KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_process,KviKvsObject) m_pProcess = new TQProcess(); - connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(slotReadStdout())); - connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(slotReadStderr())); + connect(m_pProcess,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(slotReadStdout())); + connect(m_pProcess,TQ_SIGNAL(readyReadStderr()),this,TQ_SLOT(slotReadStderr())); KVSO_END_CONSTRUCTOR(KviKvsObject_process) @@ -261,7 +261,7 @@ bool KviKvsObject_process::functionclosekill(KviKvsObjectFunctionCall *c) //I try to to terminate the process the nice way.... m_pProcess->tryTerminate(); //If the process is still running after 5 seconds, I'll terminate the process in the hard way. - TQTimer::singleShot( 5000, m_pProcess, TQT_SLOT( kill() ) ); + TQTimer::singleShot( 5000, m_pProcess, TQ_SLOT( kill() ) ); return true; } bool KviKvsObject_process::functionkill(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp index a7114f8a..85bc9ec5 100644 --- a/src/modules/objects/class_radiobutton.cpp +++ b/src/modules/objects/class_radiobutton.cpp @@ -83,7 +83,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton) bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQRadioButton(parentScriptWidget(),name()),true); - connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool))); + connect(widget(),TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggled(bool))); return true; } bool KviKvsObject_radiobutton::functionSetText(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp index 08e56170..a55a2593 100644 --- a/src/modules/objects/class_slider.cpp +++ b/src/modules/objects/class_slider.cpp @@ -131,7 +131,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider) bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQSlider(parentScriptWidget(), name()), true); - connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int))); + connect(widget(),TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp index 841a1f0f..5f30bbd0 100644 --- a/src/modules/objects/class_socket.cpp +++ b/src/modules/objects/class_socket.cpp @@ -72,7 +72,7 @@ KviScriptSocketObject::KviScriptSocketObject(KviScriptObjectClass * cla,KviScrip m_bIpV6 = false; m_uLocalPort = 0; m_secondarySock = KVI_INVALID_SOCKET; - connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tryFlush())); + connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tryFlush())); } KviScriptSocketObject::~KviScriptSocketObject() @@ -413,7 +413,7 @@ KVSO_BEGIN_CONSTRUCTOR(KviKvsObject_socket,KviKvsObject) m_bIpV6 = false; m_uLocalPort = 0; m_secondarySock = KVI_INVALID_SOCKET; - connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(tryFlush())); + connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(tryFlush())); KVSO_END_CONSTRUCTOR(KviKvsObject_socket) KVSO_BEGIN_DESTRUCTOR(KviKvsObject_socket) @@ -767,7 +767,7 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c) // and setup the READ notifier... m_pSn = new TQSocketNotifier(m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(incomingConnection(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(incomingConnection(int))); m_pSn->setEnabled(true); m_iStatus = KVI_SCRIPT_SOCKET_STATUS_LISTENING; @@ -849,7 +849,7 @@ void KviKvsObject_socket::acceptConnection(kvi_socket_t s,kvi_u32_t uPort,const m_iStatus = KVI_SCRIPT_SOCKET_STATUS_CONNECTED; m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readNotifierFired(int))); m_pSn->setEnabled(true); } @@ -857,7 +857,7 @@ void KviKvsObject_socket::delayedConnect() { if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = new TQTimer(); - connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doConnect())); + connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doConnect())); m_pDelayTimer->start(0,true); } @@ -951,11 +951,11 @@ tqDebug ("Socket created"); } tqDebug ("Socket connected"); m_pDelayTimer = new TQTimer(); - connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectTimeout())); + connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectTimeout())); m_pDelayTimer->start(m_uConnectTimeout,true); m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(writeNotifierFired(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(writeNotifierFired(int))); m_pSn->setEnabled(true); } @@ -973,7 +973,7 @@ void KviKvsObject_socket::delayedLookupRemoteIp() { if(m_pDelayTimer)delete m_pDelayTimer; m_pDelayTimer = new TQTimer(); - connect(m_pDelayTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(lookupRemoteIp())); + connect(m_pDelayTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(lookupRemoteIp())); m_pDelayTimer->start(0,true); } @@ -984,7 +984,7 @@ void KviKvsObject_socket::lookupRemoteIp() m_pDelayTimer = 0; if(m_pDns)delete m_pDns; m_pDns = new KviDns(); - connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupDone(KviDns *))); + connect(m_pDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(lookupDone(KviDns *))); if(!m_pDns->lookup(m_szRemoteIp,KviDns::Any)) { unsigned int uOldConnectionId = m_uConnectionId; @@ -1052,7 +1052,7 @@ void KviKvsObject_socket::writeNotifierFired(int) // Succesfully connected // create the correct read notifier now... m_pSn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readNotifierFired(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readNotifierFired(int))); m_pSn->setEnabled(true); #ifdef COMPILE_IPV6_SUPPORT diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp index 09fc4efd..5f06c78e 100644 --- a/src/modules/objects/class_spinbox.cpp +++ b/src/modules/objects/class_spinbox.cpp @@ -133,7 +133,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox) bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQSpinBox(parentScriptWidget(), name()), true); - connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int))); + connect(widget(),TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(valueChanged(int))); return true; } diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp index e6c748ff..5196573f 100644 --- a/src/modules/objects/class_tabwidget.cpp +++ b/src/modules/objects/class_tabwidget.cpp @@ -183,7 +183,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget) bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQTabWidget(parentScriptWidget(), name()), true); - connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int))); + connect(widget(),TQ_SIGNAL(currentChanged(int)),this,TQ_SLOT(slotcurrentChanged(int))); return true; } bool KviKvsObject_tabwidget::functionaddTab(KviKvsObjectFunctionCall *c) diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp index c6154667..9e21a32d 100644 --- a/src/modules/objects/class_tbrowser.cpp +++ b/src/modules/objects/class_tbrowser.cpp @@ -84,7 +84,7 @@ bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVarian { TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name()); setObject(tb, true); - connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &))); + connect(tb,TQ_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQ_SLOT(anchorClicked(const TQString &,const TQString &))); return true; } diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp index e4d7ecf8..f7fc1f4e 100644 --- a/src/modules/objects/class_toolbutton.cpp +++ b/src/modules/objects/class_toolbutton.cpp @@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton) bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams) { setObject(new TQToolButton(parentScriptWidget(), name()), true); - connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(widget(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); return true; } diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index 87cba0a2..496a24d7 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -344,8 +344,8 @@ KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_w :KviTalWizard(par) { m_pParentScript=parent; - connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked())); - connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked())); + connect (this->backButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotBackClicked())); + connect (this->nextButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextClicked())); } void KviKvsMdmWizard::accept() { -- cgit v1.2.1