diff options
Diffstat (limited to 'src')
155 files changed, 1141 insertions, 1141 deletions
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp index 17c2afb9..4d79b488 100644 --- a/src/kvilib/ext/kvi_garbage.cpp +++ b/src/kvilib/ext/kvi_garbage.cpp @@ -51,7 +51,7 @@ void KviGarbageCollector::collect(TQObject * g) //tqDebug("COLLECTING GARBAGE %s",g->className()); m_pGarbageList->append(g); // tqDebug("Registering garbage object %d (%s:%s)",g,g->className(),g->name()); - connect(g,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide())); + connect(g,TQ_SIGNAL(destroyed()),this,TQ_SLOT(garbageSuicide())); triggerCleanup(0); } @@ -83,7 +83,7 @@ void KviGarbageCollector::triggerCleanup(int iTimeout) m_pCleanupTimer->stop(); } else { m_pCleanupTimer = new TQTimer(this); - connect(m_pCleanupTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(cleanup())); + connect(m_pCleanupTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(cleanup())); } m_pCleanupTimer->start(iTimeout); } @@ -118,7 +118,7 @@ void KviGarbageCollector::cleanup() for(TQObject * o2 = dying.first();o2;o2 = dying.next()) { //tqDebug("KILLING GARBAGE CLASS %s",o2->className()); - disconnect(o2,TQT_SIGNAL(destroyed()),this,TQT_SLOT(garbageSuicide())); + disconnect(o2,TQ_SIGNAL(destroyed()),this,TQ_SLOT(garbageSuicide())); m_pGarbageList->removeRef(o2); } diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp index 4651a3c6..69a25250 100644 --- a/src/kvilib/ext/kvi_sharedfiles.cpp +++ b/src/kvilib/ext/kvi_sharedfiles.cpp @@ -101,7 +101,7 @@ KviSharedFilesManager::KviSharedFilesManager() m_pSharedListDict = new KviPointerHashTable<TQString,KviSharedFileList>(); m_pSharedListDict->setAutoDelete(true); m_pCleanupTimer = new TQTimer(); - connect(m_pCleanupTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(cleanup())); + connect(m_pCleanupTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(cleanup())); } KviSharedFilesManager::~KviSharedFilesManager() diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp index 7aaa5f25..beb4ed38 100644 --- a/src/kvilib/irc/kvi_ircuserdb.cpp +++ b/src/kvilib/irc/kvi_ircuserdb.cpp @@ -227,10 +227,10 @@ void KviIrcUserDataBase::removeUser(const TQString &nick,KviIrcUserEntry * e) void KviIrcUserDataBase::setupConnectionWithReguserDb() { - connect(g_pRegisteredUserDataBase,TQT_SIGNAL(userRemoved(const TQString&)),this,TQT_SLOT(registeredUserRemoved(const TQString&))); - connect(g_pRegisteredUserDataBase,TQT_SIGNAL(userChanged(const TQString&)),this,TQT_SLOT(registeredUserChanged(const TQString&))); - connect(g_pRegisteredUserDataBase,TQT_SIGNAL(userAdded(const TQString&)),this,TQT_SLOT(registeredUserAdded(const TQString&))); - connect(g_pRegisteredUserDataBase,TQT_SIGNAL(databaseCleared()),this,TQT_SLOT(registeredDatabaseCleared())); + connect(g_pRegisteredUserDataBase,TQ_SIGNAL(userRemoved(const TQString&)),this,TQ_SLOT(registeredUserRemoved(const TQString&))); + connect(g_pRegisteredUserDataBase,TQ_SIGNAL(userChanged(const TQString&)),this,TQ_SLOT(registeredUserChanged(const TQString&))); + connect(g_pRegisteredUserDataBase,TQ_SIGNAL(userAdded(const TQString&)),this,TQ_SLOT(registeredUserAdded(const TQString&))); + connect(g_pRegisteredUserDataBase,TQ_SIGNAL(databaseCleared()),this,TQ_SLOT(registeredDatabaseCleared())); } diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp index a8045f82..4e5f3ff3 100644 --- a/src/kvilib/net/kvi_http.cpp +++ b/src/kvilib/net/kvi_http.cpp @@ -171,7 +171,7 @@ bool KviHttpRequest::start() if(kvi_isValidStringIp(m_url.host().ptr())) { m_szIp = m_url.host(); - TQTimer::singleShot(10,this,TQT_SLOT(haveServerIp())); + TQTimer::singleShot(10,this,TQ_SLOT(haveServerIp())); return true; } @@ -181,7 +181,7 @@ bool KviHttpRequest::start() bool KviHttpRequest::startDnsLookup() { m_pDns = new KviDns(); - connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupDone(KviDns *))); + connect(m_pDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(dnsLookupDone(KviDns *))); if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IpV4)) { diff --git a/src/kvilib/net/kvi_http.h b/src/kvilib/net/kvi_http.h index 6f8e5c4c..39d71b3f 100644 --- a/src/kvilib/net/kvi_http.h +++ b/src/kvilib/net/kvi_http.h @@ -45,7 +45,7 @@ class KviHttpRequestThread; // // This class implements a HTTP protocol client. // It's able to send GET, POST and HEAD requests, -// download stuff to a file or to a qt TQT_SLOT(). +// download stuff to a file or to a qt TQ_SLOT(). // class KVILIB_API KviHttpRequest : public TQObject, public KviHeapObject diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp index 306f6c75..f8404bb4 100644 --- a/src/kvilib/system/kvi_thread.cpp +++ b/src/kvilib/system/kvi_thread.cpp @@ -203,7 +203,7 @@ KviThreadManager::KviThreadManager() } m_pSn = new TQSocketNotifier(m_fd[KVI_THREAD_PIPE_SIDE_MASTER],TQSocketNotifier::Read); - connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(eventsPending(int))); + connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(eventsPending(int))); m_pSn->setEnabled(true); #endif } diff --git a/src/kvilib/tal/kvi_tal_iconview.cpp b/src/kvilib/tal/kvi_tal_iconview.cpp index 9abe0f64..5a5e40ee 100644 --- a/src/kvilib/tal/kvi_tal_iconview.cpp +++ b/src/kvilib/tal/kvi_tal_iconview.cpp @@ -29,20 +29,20 @@ KviTalIconView::KviTalIconView(TQWidget * pParent,TQt::WFlags f) : TQIconView(pParent,0,f) { - connect(this,TQT_SIGNAL(selectionChanged(TQIconViewItem *)),this,TQT_SLOT(redirect_selectionChanged(TQIconViewItem *))); - connect(this,TQT_SIGNAL(currentChanged(TQIconViewItem *)),this,TQT_SLOT(redirect_currentChanged(TQIconViewItem *))); - connect(this,TQT_SIGNAL(clicked(TQIconViewItem *)),this,TQT_SLOT(redirect_clicked(TQIconViewItem *))); - connect(this,TQT_SIGNAL(clicked(TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_clicked(TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(pressed(TQIconViewItem *)),this,TQT_SLOT(redirect_pressed(TQIconViewItem *))); - connect(this,TQT_SIGNAL(pressed(TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_pressed(TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(doubleClicked(TQIconViewItem *)),this,TQT_SLOT(redirect_doubleClicked(TQIconViewItem *))); - connect(this,TQT_SIGNAL(returnPressed(TQIconViewItem *)),this,TQT_SLOT(redirect_returnPressed(TQIconViewItem *))); - connect(this,TQT_SIGNAL(rightButtonClicked(TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_rightButtonClicked(TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(rightButtonPressed(TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_rightButtonPressed(TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(mouseButtonClicked(int,TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_mouseButtonClicked(int,TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(mouseButtonPressed(int,TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_mouseButtonPressed(int,TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem *,const TQPoint &)),this,TQT_SLOT(redirect_contextMenuRequested(TQIconViewItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(onItem(TQIconViewItem *)),this,TQT_SLOT(redirect_onItem(TQIconViewItem *))); + connect(this,TQ_SIGNAL(selectionChanged(TQIconViewItem *)),this,TQ_SLOT(redirect_selectionChanged(TQIconViewItem *))); + connect(this,TQ_SIGNAL(currentChanged(TQIconViewItem *)),this,TQ_SLOT(redirect_currentChanged(TQIconViewItem *))); + connect(this,TQ_SIGNAL(clicked(TQIconViewItem *)),this,TQ_SLOT(redirect_clicked(TQIconViewItem *))); + connect(this,TQ_SIGNAL(clicked(TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_clicked(TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(pressed(TQIconViewItem *)),this,TQ_SLOT(redirect_pressed(TQIconViewItem *))); + connect(this,TQ_SIGNAL(pressed(TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_pressed(TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(doubleClicked(TQIconViewItem *)),this,TQ_SLOT(redirect_doubleClicked(TQIconViewItem *))); + connect(this,TQ_SIGNAL(returnPressed(TQIconViewItem *)),this,TQ_SLOT(redirect_returnPressed(TQIconViewItem *))); + connect(this,TQ_SIGNAL(rightButtonClicked(TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_rightButtonClicked(TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(rightButtonPressed(TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_rightButtonPressed(TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(mouseButtonClicked(int,TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_mouseButtonClicked(int,TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(mouseButtonPressed(int,TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_mouseButtonPressed(int,TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem *,const TQPoint &)),this,TQ_SLOT(redirect_contextMenuRequested(TQIconViewItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(onItem(TQIconViewItem *)),this,TQ_SLOT(redirect_onItem(TQIconViewItem *))); } void KviTalIconView::redirect_selectionChanged(TQIconViewItem * pItem) diff --git a/src/kvilib/tal/kvi_tal_listbox.cpp b/src/kvilib/tal/kvi_tal_listbox.cpp index 72a0cf28..b6107e2c 100644 --- a/src/kvilib/tal/kvi_tal_listbox.cpp +++ b/src/kvilib/tal/kvi_tal_listbox.cpp @@ -33,22 +33,22 @@ KviTalListBox::KviTalListBox(TQWidget * pParent,TQt::WFlags f) : TQListBox(pParent,0,f) { - connect(this,TQT_SIGNAL(highlighted(TQListBoxItem *)),this,TQT_SLOT(redirect_highlighted(TQListBoxItem *))); - connect(this,TQT_SIGNAL(selected(TQListBoxItem *)),this,TQT_SLOT(redirect_selected(TQListBoxItem *))); - connect(this,TQT_SIGNAL(selectionChanged(TQListBoxItem *)),this,TQT_SLOT(redirect_selectionChanged(TQListBoxItem *))); - connect(this,TQT_SIGNAL(currentChanged(TQListBoxItem *)),this,TQT_SLOT(redirect_currentChanged(TQListBoxItem *))); - connect(this,TQT_SIGNAL(clicked(TQListBoxItem *)),this,TQT_SLOT(redirect_clicked(TQListBoxItem *))); - connect(this,TQT_SIGNAL(clicked(TQListBoxItem *,const TQPoint &)),this,TQT_SLOT(redirect_clicked(TQListBoxItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(pressed(TQListBoxItem *)),this,TQT_SLOT(redirect_pressed(TQListBoxItem *))); - connect(this,TQT_SIGNAL(pressed(TQListBoxItem *,const TQPoint &)),this,TQT_SLOT(redirect_pressed(TQListBoxItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQT_SLOT(redirect_doubleClicked(TQListBoxItem *))); - connect(this,TQT_SIGNAL(returnPressed(TQListBoxItem *)),this,TQT_SLOT(redirect_returnPressed(TQListBoxItem *))); - connect(this,TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)),this,TQT_SLOT(redirect_rightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect(this,TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)),this,TQT_SLOT(redirect_rightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(this,TQT_SIGNAL(mouseButtonPressed(int,TQListBoxItem *,const TQPoint &)),this,TQT_SLOT(redirect_mouseButtonPressed(int,TQListBoxItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(mouseButtonClicked(int,TQListBoxItem *,const TQPoint &)),this,TQT_SLOT(redirect_mouseButtonClicked(int,TQListBoxItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)),this,TQT_SLOT(redirect_contextMenuRequested(TQListBoxItem *,const TQPoint &))); - connect(this,TQT_SIGNAL(onItem(TQListBoxItem *)),this,TQT_SLOT(redirect_onItem(TQListBoxItem *))); + connect(this,TQ_SIGNAL(highlighted(TQListBoxItem *)),this,TQ_SLOT(redirect_highlighted(TQListBoxItem *))); + connect(this,TQ_SIGNAL(selected(TQListBoxItem *)),this,TQ_SLOT(redirect_selected(TQListBoxItem *))); + connect(this,TQ_SIGNAL(selectionChanged(TQListBoxItem *)),this,TQ_SLOT(redirect_selectionChanged(TQListBoxItem *))); + connect(this,TQ_SIGNAL(currentChanged(TQListBoxItem *)),this,TQ_SLOT(redirect_currentChanged(TQListBoxItem *))); + connect(this,TQ_SIGNAL(clicked(TQListBoxItem *)),this,TQ_SLOT(redirect_clicked(TQListBoxItem *))); + connect(this,TQ_SIGNAL(clicked(TQListBoxItem *,const TQPoint &)),this,TQ_SLOT(redirect_clicked(TQListBoxItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(pressed(TQListBoxItem *)),this,TQ_SLOT(redirect_pressed(TQListBoxItem *))); + connect(this,TQ_SIGNAL(pressed(TQListBoxItem *,const TQPoint &)),this,TQ_SLOT(redirect_pressed(TQListBoxItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(doubleClicked(TQListBoxItem *)),this,TQ_SLOT(redirect_doubleClicked(TQListBoxItem *))); + connect(this,TQ_SIGNAL(returnPressed(TQListBoxItem *)),this,TQ_SLOT(redirect_returnPressed(TQListBoxItem *))); + connect(this,TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)),this,TQ_SLOT(redirect_rightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(this,TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)),this,TQ_SLOT(redirect_rightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(this,TQ_SIGNAL(mouseButtonPressed(int,TQListBoxItem *,const TQPoint &)),this,TQ_SLOT(redirect_mouseButtonPressed(int,TQListBoxItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(mouseButtonClicked(int,TQListBoxItem *,const TQPoint &)),this,TQ_SLOT(redirect_mouseButtonClicked(int,TQListBoxItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)),this,TQ_SLOT(redirect_contextMenuRequested(TQListBoxItem *,const TQPoint &))); + connect(this,TQ_SIGNAL(onItem(TQListBoxItem *)),this,TQ_SLOT(redirect_onItem(TQListBoxItem *))); } void KviTalListBox::redirect_highlighted(TQListBoxItem *item) diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp index 1bb6bdc9..ce54641b 100644 --- a/src/kvilib/tal/kvi_tal_listview.cpp +++ b/src/kvilib/tal/kvi_tal_listview.cpp @@ -36,24 +36,24 @@ KviTalListView::KviTalListView(TQWidget * pParent) : TQListView(pParent) { - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem *)),this,TQT_SLOT(redirect_selectionChanged(TQListViewItem *))); - connect(this,TQT_SIGNAL(currentChanged(TQListViewItem *)),this,TQT_SLOT(redirect_currentChanged(TQListViewItem *))); - connect(this,TQT_SIGNAL(clicked(TQListViewItem *)),this,TQT_SLOT(redirect_clicked(TQListViewItem *))); - connect(this,TQT_SIGNAL(clicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_clicked(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(pressed(TQListViewItem *)),this,TQT_SLOT(redirect_pressed(TQListViewItem *))); - connect(this,TQT_SIGNAL(pressed(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_pressed(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem *)),this,TQT_SLOT(redirect_doubleClicked(TQListViewItem *))); - connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_doubleClicked(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(returnPressed(TQListViewItem *)),this,TQT_SLOT(redirect_returnPressed(TQListViewItem *))); - connect(this,TQT_SIGNAL(spacePressed(TQListViewItem *)),this,TQT_SLOT(redirect_spacePressed(TQListViewItem *))); - connect(this,TQT_SIGNAL(rightButtonClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_rightButtonClicked(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_rightButtonPressed(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(mouseButtonClicked(int,TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_mouseButtonClicked(int,TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(mouseButtonPressed(int,TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_mouseButtonPressed(int,TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(redirect_contextMenuRequested(TQListViewItem *,const TQPoint &,int))); - connect(this,TQT_SIGNAL(onItem(TQListViewItem *)),this,TQT_SLOT(redirect_onItem(TQListViewItem *))); - connect(this,TQT_SIGNAL(expanded(TQListViewItem *)),this,TQT_SLOT(redirect_expanded(TQListViewItem *))); - connect(this,TQT_SIGNAL(collapsed(TQListViewItem *)),this,TQT_SLOT(redirect_collapsed(TQListViewItem *))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem *)),this,TQ_SLOT(redirect_selectionChanged(TQListViewItem *))); + connect(this,TQ_SIGNAL(currentChanged(TQListViewItem *)),this,TQ_SLOT(redirect_currentChanged(TQListViewItem *))); + connect(this,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(redirect_clicked(TQListViewItem *))); + connect(this,TQ_SIGNAL(clicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_clicked(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(pressed(TQListViewItem *)),this,TQ_SLOT(redirect_pressed(TQListViewItem *))); + connect(this,TQ_SIGNAL(pressed(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_pressed(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem *)),this,TQ_SLOT(redirect_doubleClicked(TQListViewItem *))); + connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_doubleClicked(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(returnPressed(TQListViewItem *)),this,TQ_SLOT(redirect_returnPressed(TQListViewItem *))); + connect(this,TQ_SIGNAL(spacePressed(TQListViewItem *)),this,TQ_SLOT(redirect_spacePressed(TQListViewItem *))); + connect(this,TQ_SIGNAL(rightButtonClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_rightButtonClicked(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_rightButtonPressed(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(mouseButtonClicked(int,TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_mouseButtonClicked(int,TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(mouseButtonPressed(int,TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_mouseButtonPressed(int,TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(redirect_contextMenuRequested(TQListViewItem *,const TQPoint &,int))); + connect(this,TQ_SIGNAL(onItem(TQListViewItem *)),this,TQ_SLOT(redirect_onItem(TQListViewItem *))); + connect(this,TQ_SIGNAL(expanded(TQListViewItem *)),this,TQ_SLOT(redirect_expanded(TQListViewItem *))); + connect(this,TQ_SIGNAL(collapsed(TQListViewItem *)),this,TQ_SLOT(redirect_collapsed(TQListViewItem *))); } void KviTalListView::redirect_selectionChanged(TQListViewItem * pItem) diff --git a/src/kvilib/tal/kvi_tal_wizard.cpp b/src/kvilib/tal/kvi_tal_wizard.cpp index 2555efd0..8b48c9c1 100644 --- a/src/kvilib/tal/kvi_tal_wizard.cpp +++ b/src/kvilib/tal/kvi_tal_wizard.cpp @@ -191,9 +191,9 @@ KviTalWizard::KviTalWizard(TQWidget * pParent) m_p->pCancelButton->setMinimumWidth(80); TQObject::connect( m_p->pCancelButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), this, - TQT_SLOT(cancelButtonClicked()) + TQ_SLOT(cancelButtonClicked()) ); TQWidget * pSpacer = new TQWidget(pButtonBox); @@ -203,9 +203,9 @@ KviTalWizard::KviTalWizard(TQWidget * pParent) m_p->pHelpButton->setMinimumWidth(80); TQObject::connect( m_p->pHelpButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), this, - TQT_SLOT(helpButtonClicked()) + TQ_SLOT(helpButtonClicked()) ); TQWidget * pLargeSpacer = new TQWidget(pButtonBox); @@ -218,9 +218,9 @@ KviTalWizard::KviTalWizard(TQWidget * pParent) m_p->pBackButton->setMinimumWidth(80); TQObject::connect( m_p->pBackButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), this, - TQT_SLOT(backButtonClicked()) + TQ_SLOT(backButtonClicked()) ); m_p->pNextSpacer = new TQWidget(pButtonBox); @@ -232,9 +232,9 @@ KviTalWizard::KviTalWizard(TQWidget * pParent) m_p->pNextButton->setMinimumWidth(80); TQObject::connect( m_p->pNextButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), this, - TQT_SLOT(nextButtonClicked()) + TQ_SLOT(nextButtonClicked()) ); m_p->pFinishSpacer = new TQWidget(pButtonBox); @@ -244,9 +244,9 @@ KviTalWizard::KviTalWizard(TQWidget * pParent) m_p->pFinishButton->setMinimumWidth(80); TQObject::connect( m_p->pFinishButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), this, - TQT_SLOT(finishButtonClicked()) + TQ_SLOT(finishButtonClicked()) ); m_p->pLayout->setMargin(8); diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp index 91da5b43..57684a2b 100644 --- a/src/kvirc/kernel/kvi_action.cpp +++ b/src/kvirc/kernel/kvi_action.cpp @@ -46,7 +46,7 @@ KviAction::~KviAction() if(m_pWidgetList) { for(TQWidget * b = m_pWidgetList->first();b;b = m_pWidgetList->next()) - disconnect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); + disconnect(b,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); m_pWidgetList->setAutoDelete(true); delete m_pWidgetList; } @@ -70,7 +70,7 @@ bool KviAction::isKviUserActionNeverOverrideThis() void KviAction::registerAccelerator() { if(!m_szKeySequence.isEmpty()) - m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,TQT_SLOT(activate())); + m_iAccelId = g_pFrame->registerAccelerator(m_szKeySequence,this,TQ_SLOT(activate())); } void KviAction::unregisterAccelerator() @@ -130,18 +130,18 @@ TQPixmap * KviAction::bigIcon() void KviAction::setup() { - connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); + connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages())); if(m_uFlags & InternalWindowMask) { - connect(g_pFrame,TQT_SIGNAL(activeWindowChanged()),this,TQT_SLOT(activeWindowChanged())); + connect(g_pFrame,TQ_SIGNAL(activeWindowChanged()),this,TQ_SLOT(activeWindowChanged())); if((m_uFlags & WindowOnlyIfUsersSelected) && (m_uFlags & (WindowChannel | WindowConsole | WindowQuery))) - connect(g_pFrame,TQT_SIGNAL(activeWindowSelectionStateChanged(bool)),this,TQT_SLOT(activeWindowSelectionStateChanged(bool))); + connect(g_pFrame,TQ_SIGNAL(activeWindowSelectionStateChanged(bool)),this,TQ_SLOT(activeWindowSelectionStateChanged(bool))); activeWindowChanged(); } else { if(m_uFlags & NeedsConnection) { - connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged())); - connect(g_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(activeContextChanged())); + connect(g_pFrame,TQ_SIGNAL(activeContextStateChanged()),this,TQ_SLOT(activeContextStateChanged())); KviIrcContext * c = g_pFrame->activeContext(); if(!c)setEnabled(false); else { @@ -161,7 +161,7 @@ void KviAction::setup() } else { if(m_uFlags & NeedsContext) { - connect(g_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(activeContextChanged())); + connect(g_pFrame,TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(activeContextChanged())); if(!g_pFrame->activeContext())setEnabled(false); else setEnabled(true); } @@ -383,9 +383,9 @@ bool KviAction::addToPopupMenu(KviTalPopupMenu *pMenu) if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; if(p) { - id = pMenu->insertItem(*p,t,this,TQT_SLOT(activate())); + id = pMenu->insertItem(*p,t,this,TQ_SLOT(activate())); } else { - id = pMenu->insertItem(t,this,TQT_SLOT(activate())); + id = pMenu->insertItem(t,this,TQ_SLOT(activate())); } if(!isEnabled())pMenu->setItemEnabled(id,false); return true; @@ -400,7 +400,7 @@ void KviAction::widgetDestroyed() void KviAction::registerWidget(TQWidget * b) { - connect(b,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); + connect(b,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); if(!m_pWidgetList) { m_pWidgetList = new KviPointerList<TQWidget>; @@ -417,7 +417,7 @@ TQWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar) p ? *p : TQPixmap(), visibleName(), visibleName(), - this,TQT_SLOT(activate()),pParentToolBar,m_szName); + this,TQ_SLOT(activate()),pParentToolBar,m_szName); if(!isEnabled())b->setEnabled(false); registerWidget(b); return b; diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp index 4d92f5ee..c4af1e7e 100644 --- a/src/kvirc/kernel/kvi_actionmanager.cpp +++ b/src/kvirc/kernel/kvi_actionmanager.cpp @@ -85,7 +85,7 @@ KviActionManager::~KviActionManager() KviPointerHashTableIterator<TQString,KviAction> it(*m_pActions); while(KviAction * a = it.current()) { - disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); + disconnect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed())); ++it; } delete m_pActions; @@ -249,7 +249,7 @@ void KviActionManager::delayedRegisterAccelerators() bool KviActionManager::registerAction(KviAction * a) { if(m_pActions->find(a->name()))return false; - connect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); + connect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed())); m_pActions->insert(a->name(),a); if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed! return true; @@ -265,7 +265,7 @@ bool KviActionManager::unregisterAction(const TQString &szName) { KviAction * a = m_pActions->find(szName); if(!a)return false; - disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed())); + disconnect(a,TQ_SIGNAL(destroyed()),this,TQ_SLOT(actionDestroyed())); a->unregisterAccelerator(); return m_pActions->remove(szName); } diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp index 0cfc7b7b..bf309864 100644 --- a/src/kvirc/kernel/kvi_app.cpp +++ b/src/kvirc/kernel/kvi_app.cpp @@ -1056,7 +1056,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co delete g_pKdeDesktopBackground; g_pKdeDesktopBackground = 0; // this signal shouldn't be connected ,but well.. let's make sure - disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int))); } g_pKdeDesktopBackground = 0; @@ -1074,7 +1074,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co TQString name = TQString("DESKTOP%1").arg(rinfo.currentDesktop()); g_pKdeDesktopBackground = new TDESharedPixmap(); - connect(g_pKdeDesktopBackground,TQT_SIGNAL(done(bool)),this,TQT_SLOT(kdeRootPixmapDownloadComplete(bool))); + connect(g_pKdeDesktopBackground,TQ_SIGNAL(done(bool)),this,TQ_SLOT(kdeRootPixmapDownloadComplete(bool))); if(!(g_pKdeDesktopBackground->isAvailable(name))) { @@ -1091,7 +1091,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co client->send("kdesktop","KBackgroundIface","setExport(int)",data); m_bUpdatePseudoTransparencyPending = true; // Now wait a while and try again.... - TQTimer::singleShot(500,this,TQT_SLOT(updatePseudoTransparency())); + TQTimer::singleShot(500,this,TQ_SLOT(updatePseudoTransparency())); return; } @@ -1116,7 +1116,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co g_pKdeDesktopBackground = 0; } // forget the backgroundChanged signal (will do nothing if it is not connected) - disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int))); #endif //COMPILE_TDE_SUPPORT if(g_pShadedParentGlobalDesktopBackground) { @@ -1134,7 +1134,7 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const TQString &szRemoteUrl,co { if(m_bUpdatePseudoTransparencyPending)return; m_bUpdatePseudoTransparencyPending = true; - TQTimer::singleShot(0,this,TQT_SLOT(updatePseudoTransparency())); + TQTimer::singleShot(0,this,TQ_SLOT(updatePseudoTransparency())); } #ifdef COMPILE_TDE_SUPPORT @@ -1263,9 +1263,9 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess) // create shaded copies... createGlobalBackgrounds(g_pKdeDesktopBackground); // make sure that this signal is not connected twice - disconnect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); + disconnect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int))); // connect it - connect(this,TQT_SIGNAL(backgroundChanged(int)),this,TQT_SLOT(kdeRootPixmapChanged(int))); + connect(this,TQ_SIGNAL(backgroundChanged(int)),this,TQ_SLOT(kdeRootPixmapChanged(int))); } delete g_pKdeDesktopBackground; g_pKdeDesktopBackground = 0; @@ -1308,7 +1308,7 @@ void KviApp::triggerUpdateGui() { if(m_bUpdateGuiPending)return; m_bUpdateGuiPending = true; - TQTimer::singleShot(0,this,TQT_SLOT(updateGui())); + TQTimer::singleShot(0,this,TQ_SLOT(updateGui())); } void KviApp::updateGui() diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp index 9650e6d3..e37fb3a8 100644 --- a/src/kvirc/kernel/kvi_coreactions.cpp +++ b/src/kvirc/kernel/kvi_coreactions.cpp @@ -108,7 +108,7 @@ void register_core_actions(KviActionManager * m) __smallicon, \ __flags, \ __accel); \ - TQObject::connect(a,TQT_SIGNAL(activated()),__object,__slot); \ + TQObject::connect(a,TQ_SIGNAL(activated()),__object,__slot); \ m->registerAction(a) SCRIPT_ACTION( @@ -381,7 +381,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_CASCADEWINDOWS, g_pFrame->mdiManager(), - TQT_SLOT(cascadeMaximized()), + TQ_SLOT(cascadeMaximized()), __tr2qs("Cascade windows"), __tr2qs("Arranges the MDI windows in a maximized-cascade fashion"), KviActionManager::categoryGUI(), @@ -393,7 +393,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_TILEWINDOWS, g_pFrame->mdiManager(), - TQT_SLOT(tile()), + TQ_SLOT(tile()), __tr2qs("Tile windows"), __tr2qs("Tiles the MDI windows with the currently selected tile method"), KviActionManager::categoryGUI(), @@ -405,7 +405,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_MINIMIZEALLWINDOWS, g_pFrame->mdiManager(), - TQT_SLOT(minimizeAll()), + TQ_SLOT(minimizeAll()), __tr2qs("Minimize all windows"), __tr2qs("Minimized all the currently visible MDI windows"), KviActionManager::categoryGUI(), @@ -417,7 +417,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_NEWIRCCONTEXT, g_pFrame, - TQT_SLOT(newConsole()), + TQ_SLOT(newConsole()), __tr2qs("New IRC Context"), __tr2qs("Creates a new IRC context console"), KviActionManager::categoryIrc(), @@ -429,7 +429,7 @@ void register_core_actions(KviActionManager * m) SLOT_ACTION( KVI_COREACTION_QUITKVIRC, g_pApp, - TQT_SLOT(quit()), + TQ_SLOT(quit()), __tr2qs("Quit KVIrc"), __tr2qs("Quits KVIrc closing all the current connections"), KviActionManager::categoryGeneric(), @@ -457,11 +457,11 @@ KviIrcContextDisplayAction::KviIrcContextDisplayAction(TQObject * pParent) void KviIrcContextDisplayAction::setup() { KviAction::setup(); - connect(g_pFrame,TQT_SIGNAL(activeConnectionServerInfoChanged()),this,TQT_SLOT(activeContextStateChanged())); - connect(g_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(activeContextStateChanged())); - connect(g_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(activeContextStateChanged())); - connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged())); - connect(g_pFrame,TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionServerInfoChanged()),this,TQ_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionNickNameChanged()),this,TQ_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionUserModeChanged()),this,TQ_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionAwayStateChanged()),this,TQ_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionLagChanged()),this,TQ_SLOT(activeContextStateChanged())); } bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p) @@ -642,30 +642,30 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p) case KviIrcContext::Idle: t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,TQT_SLOT(activate())); + p->insertItem(t,this,TQ_SLOT(activate())); break; case KviIrcContext::Connecting: case KviIrcContext::LoggingIn: t = m_szAbortConnectionString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,TQT_SLOT(activate())); + p->insertItem(t,this,TQ_SLOT(activate())); break; case KviIrcContext::Connected: t = m_szDisconnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(t,this,TQT_SLOT(activate())); + p->insertItem(t,this,TQ_SLOT(activate())); break; default: t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(t,this,TQT_SLOT(activate())); + id = p->insertItem(t,this,TQ_SLOT(activate())); p->setItemEnabled(id,false); break; } } else { t = m_szConnectString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(t,this,TQT_SLOT(activate())); + id = p->insertItem(t,this,TQ_SLOT(activate())); p->setItemEnabled(id,false); } return true; @@ -678,7 +678,7 @@ TQWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)), m_szConnectString, m_szConnectString, - this,TQT_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name()); registerWidget(b); activeContextStateChanged(); return b; @@ -723,8 +723,8 @@ void KviSubmenuAction::setup() if(!m_pPopup) { m_pPopup = new KviTalPopupMenu(); - connect(m_pPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(popupAboutToShow())); - connect(m_pPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(popupActivated(int))); + connect(m_pPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(popupAboutToShow())); + connect(m_pPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(popupActivated(int))); } } @@ -751,7 +751,7 @@ TQWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t) *(bigIcon()), visibleName(), visibleName(), - this,TQT_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name()); b->setPopup(m_pPopup); b->setShowSubmenuIndicator(true); @@ -1049,7 +1049,7 @@ void KviGoAwayAction::setup() KviKvsAction::setup(); m_szAwayString = __tr2qs("Enter Away Mode"); m_szBackString = __tr2qs("Leave Away Mode"); - connect(g_pFrame,TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(activeContextStateChanged())); + connect(g_pFrame,TQ_SIGNAL(activeConnectionAwayStateChanged()),this,TQ_SLOT(activeContextStateChanged())); } bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) @@ -1066,22 +1066,22 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p) { t = m_szBackString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,TQT_SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),t,this,TQ_SLOT(activate())); } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate())); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate())); p->setItemEnabled(id,false); } } else { t = m_szAwayString; if(!m_szKeySequence.isEmpty())t += '\t' + m_szKeySequence; - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQT_SLOT(activate())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NOTAWAY)),t,this,TQ_SLOT(activate())); p->setItemEnabled(id,false); } return true; @@ -1094,7 +1094,7 @@ TQWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t) *(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")), m_szAwayString, m_szAwayString, - this,TQT_SLOT(activate()),t,name()); + this,TQ_SLOT(activate()),t,name()); registerWidget(b); activeContextStateChanged(); return b; diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp index 3bc1c362..6d9f328a 100644 --- a/src/kvirc/kernel/kvi_iconmanager.cpp +++ b/src/kvirc/kernel/kvi_iconmanager.cpp @@ -549,7 +549,7 @@ void KviIconManager::showIconWidget() if(!m_pIconWidget) { m_pIconWidget = new KviIconWidget(); - connect(m_pIconWidget,TQT_SIGNAL(closed()),this,TQT_SLOT(iconWidgetClosed())); + connect(m_pIconWidget,TQ_SIGNAL(closed()),this,TQ_SLOT(iconWidgetClosed())); } m_pIconWidget->show(); m_pIconWidget->raise(); diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp index ea100f08..22b3b2d7 100644 --- a/src/kvirc/kernel/kvi_ircconnection.cpp +++ b/src/kvirc/kernel/kvi_ircconnection.cpp @@ -109,7 +109,7 @@ KviIrcConnection::~KviIrcConnection() m_bIdentdAttached = false; if(m_pLocalhostDns) { - TQObject::disconnect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),0,0); + TQObject::disconnect(m_pLocalhostDns,TQ_SIGNAL(lookupDone(KviDns *)),0,0); if(m_pLocalhostDns->isRunning()) { g_pGarbageCollector->collect(m_pLocalhostDns); @@ -600,7 +600,7 @@ void KviIrcConnection::delayedStartNotifyList() if(m_pNotifyListTimer)delete m_pNotifyListTimer; m_pNotifyListTimer = new TQTimer(); - connect(m_pNotifyListTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(restartNotifyList())); + connect(m_pNotifyListTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(restartNotifyList())); m_pNotifyListTimer->start(15000,true); // This delay is large enough to fire after the MOTD has been sent, @@ -805,7 +805,7 @@ void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQStrin // look it up too if(m_pLocalhostDns)delete m_pLocalhostDns; // it could be only another local host lookup m_pLocalhostDns = new KviDns(); - connect(m_pLocalhostDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(hostNameLookupTerminated(KviDns *))); + connect(m_pLocalhostDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(hostNameLookupTerminated(KviDns *))); if(!m_pLocalhostDns->lookup(szHostName,KviDns::Any)) { diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp index c25c45aa..117fcc12 100644 --- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp +++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp @@ -127,7 +127,7 @@ void KviIrcConnectionTargetResolver::start(KviIrcConnectionTarget * t) m_pStartTimer = 0; } m_pStartTimer = new TQTimer(this); - connect(m_pStartTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asyncStartResolve())); + connect(m_pStartTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(asyncStartResolve())); m_pTarget = t; @@ -228,7 +228,7 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname() } m_pProxyDns = new KviDns(); - connect(m_pProxyDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(proxyLookupTerminated(KviDns *))); + connect(m_pProxyDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(proxyLookupTerminated(KviDns *))); if(!m_pProxyDns->lookup(m_pTarget->proxy()->m_szHostname.ptr(), m_pTarget->proxy()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4)) @@ -345,8 +345,8 @@ void KviIrcConnectionTargetResolver::lookupServerHostname() m_pServerDns = 0; } m_pServerDns = new KviDns(); - connect(m_pServerDns,TQT_SIGNAL(lookupDone(KviDns *)),this, - TQT_SLOT(serverLookupTerminated(KviDns *))); + connect(m_pServerDns,TQ_SIGNAL(lookupDone(KviDns *)),this, + TQ_SLOT(serverLookupTerminated(KviDns *))); if(!m_pServerDns->lookup(m_pTarget->server()->m_szHostname, m_pTarget->server()->isIpV6() ? KviDns::IpV6 : KviDns::IpV4)) { diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index 183b46ca..2195a109 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -808,7 +808,7 @@ void KviIrcContext::beginAsynchronousConnect(unsigned int uDelayInMSecs) { if(m_pReconnectTimer)delete m_pReconnectTimer; m_pReconnectTimer = new TQTimer(this); - connect(m_pReconnectTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(asynchronousConnect())); + connect(m_pReconnectTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(asynchronousConnect())); m_pReconnectTimer->start(uDelayInMSecs); } diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp index 4f845060..3d9e0451 100644 --- a/src/kvirc/kernel/kvi_irclink.cpp +++ b/src/kvirc/kernel/kvi_irclink.cpp @@ -133,7 +133,7 @@ void KviIrcLink::createSocket(const TQString &szLinkFilterName) if(m_pLinkFilter) { - connect(m_pLinkFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(linkFilterDestroyed())); + connect(m_pLinkFilter,TQ_SIGNAL(destroyed()),this,TQ_SLOT(linkFilterDestroyed())); m_pConsole->output(KVI_OUT_SYSTEMMESSAGE, __tr2qs("Using filtered IRC protocol: Link filter is \"%Q\""),&szLinkFilterName); return; @@ -167,7 +167,7 @@ void KviIrcLink::start() m_eState = Connecting; if(m_pResolver)delete m_pResolver; // this should never happen m_pResolver = new KviIrcConnectionTargetResolver(m_pConnection); - connect(m_pResolver,TQT_SIGNAL(terminated()),this,TQT_SLOT(resolverTerminated())); + connect(m_pResolver,TQ_SIGNAL(terminated()),this,TQ_SLOT(resolverTerminated())); m_pResolver->start(m_pTarget); } diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp index f82e749f..3c87453e 100644 --- a/src/kvirc/kernel/kvi_ircsocket.cpp +++ b/src/kvirc/kernel/kvi_ircsocket.cpp @@ -104,7 +104,7 @@ KviIrcSocket::KviIrcSocket(KviIrcLink * pLink) m_bInProcessData = false; m_pFlushTimer = new TQTimer(); // queue flush timer - connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(flushSendQueue())); + connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(flushSendQueue())); } KviIrcSocket::~KviIrcSocket() @@ -375,13 +375,13 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char * // and setup the WRITE notifier... m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); - TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(writeNotifierFired(int))); + TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(writeNotifierFired(int))); m_pWsn->setEnabled(true); // set the timer if(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) < 5)KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) = 5; m_pTimeoutTimer = new TQTimer(); - TQObject::connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); + TQObject::connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintIrcSocketTimeout) * 1000,true); // and wait for connect @@ -458,7 +458,7 @@ void KviIrcSocket::connectedToProxy() m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readProxyData(int))); + TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readProxyData(int))); switch(m_pProxy->protocol()) { @@ -741,7 +741,7 @@ void KviIrcSocket::proxyLoginV5() // The VER field is set to X'05' for this version of the protocol. The // NMETHODS field contains the number of method identifier octets that // appear in the METHODS field. - // The values currently defined for TQT_METHOD are: + // The values currently defined for METHOD are: // // o X'00' NO AUTHENTICATION REQUIRED // o X'01' GSSAPI @@ -966,18 +966,18 @@ void KviIrcSocket::proxyHandleV5AuthReply(unsigned char reply) void KviIrcSocket::proxyHandleV5MethodReply(unsigned char reply) { // The server selects from one of the methods given in METHODS, and - // sends a TQT_METHOD selection message: + // sends a METHOD selection message: // // +----+--------+ - // |VER | TQT_METHOD | + // |VER | METHOD | // +----+--------+ // | 1 | 1 | // +----+--------+ // - // If the selected TQT_METHOD is X'FF', none of the methods listed by the + // If the selected METHOD is X'FF', none of the methods listed by the // client are acceptable, and the client MUST close the connection. // - // The values currently defined for TQT_METHOD are: + // The values currently defined for METHOD are: // // o X'00' NO AUTHENTICATION REQUIRED // o X'01' GSSAPI @@ -1179,7 +1179,7 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen) } m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readHttpProxyErrorData(int))); + TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readHttpProxyErrorData(int))); m_pRsn->setEnabled(true); setState(ProxyHttpError); @@ -1269,12 +1269,12 @@ void KviIrcSocket::doSSLHandshake(int) break; case KviSSL::WantRead: m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pRsn->setEnabled(true); break; case KviSSL::WantWrite: m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); - TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pWsn->setEnabled(true); break; case KviSSL::RemoteEndClosedConnection: @@ -1297,7 +1297,7 @@ void KviIrcSocket::doSSLHandshake(int) } else { // can recover ? (EAGAIN , EINTR ?) m_pWsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Write); - TQObject::connect(m_pWsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pWsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pWsn->setEnabled(true); return; } @@ -1341,7 +1341,7 @@ void KviIrcSocket::linkUp() } m_pRsn = new TQSocketNotifier((int)m_sock,TQSocketNotifier::Read); - TQObject::connect(m_pRsn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(readData(int))); + TQObject::connect(m_pRsn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(readData(int))); m_pRsn->setEnabled(true); // yahoo! diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp index 2903a95d..aef09c47 100644 --- a/src/kvirc/kernel/kvi_notifylist.cpp +++ b/src/kvirc/kernel/kvi_notifylist.cpp @@ -330,11 +330,11 @@ KviIsOnNotifyListManager::KviIsOnNotifyListManager(KviIrcConnection * pConnectio m_pUserhostList = new KviPointerList<TQString>; m_pUserhostList->setAutoDelete(true); m_pDelayedNotifyTimer = new TQTimer(); - connect(m_pDelayedNotifyTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newNotifySession())); + connect(m_pDelayedNotifyTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newNotifySession())); m_pDelayedIsOnTimer = new TQTimer(); - connect(m_pDelayedIsOnTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newIsOnSession())); + connect(m_pDelayedIsOnTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newIsOnSession())); m_pDelayedUserhostTimer = new TQTimer(); - connect(m_pDelayedUserhostTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(newUserhostSession())); + connect(m_pDelayedUserhostTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(newUserhostSession())); m_bRunning = false; } diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp index b9f85d02..06c0c4ed 100644 --- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp +++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp @@ -45,9 +45,9 @@ KviKvsAsyncDnsOperation::KviKvsAsyncDnsOperation(KviWindow * pWnd,TQString &szQu m_eType = eType; m_pCallback = pCallback; m_pMagic = pMagic; - connect(m_pDns,TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(lookupTerminated(KviDns *))); + connect(m_pDns,TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(lookupTerminated(KviDns *))); if(!m_pDns->lookup(szQuery,eType)) - TQTimer::singleShot(10,this,TQT_SLOT(dnsStartFailed())); + TQTimer::singleShot(10,this,TQ_SLOT(dnsStartFailed())); } KviKvsAsyncDnsOperation::~KviKvsAsyncDnsOperation() diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp index 701a265a..2b973b53 100644 --- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp +++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp @@ -1086,7 +1086,7 @@ namespace KviKvsCoreSimpleCommands if(KVSCSC_pSwitches->find('q',"quit")) { - TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit())); + TQTimer::singleShot(0,g_pApp,TQ_SLOT(quit())); } else { KVSCSC_REQUIRE_CONNECTION KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected")); diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp index 49a528c8..2f5c28b3 100644 --- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp @@ -103,7 +103,7 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject) m_pDnsObjects->setAutoDelete(true); } m_pDnsObjects->replace(pObject->dns(),pObject); - connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *))); + connect(pObject->dns(),TQ_SIGNAL(lookupDone(KviDns *)),this,TQ_SLOT(dnsLookupTerminated(KviDns *))); } void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns) diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp index 3bfca497..5efa91ec 100644 --- a/src/kvirc/kvs/kvi_kvs_object.cpp +++ b/src/kvirc/kvs/kvi_kvs_object.cpp @@ -694,7 +694,7 @@ KviKvsObject::~KviKvsObject() if(m_pObject) { - disconnect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); + disconnect(m_pObject,TQ_SIGNAL(destroyed()),this,TQ_SLOT(objectDestroyed())); if(m_bObjectOwner)delete m_pObject; } @@ -730,7 +730,7 @@ void KviKvsObject::registerChild(KviKvsObject *pChild) m_pChildList->append(pChild); } -// SIGNAL/TQT_SLOT stuff +// TQ_SIGNAL/TQ_SLOT stuff bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget,const TQString &slotName) { @@ -1517,7 +1517,7 @@ bool KviKvsObject::die() { if(m_bInDelayedDeath)return false; m_bInDelayedDeath = true; - TQTimer::singleShot(0,this,TQT_SLOT(delayedDie())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedDie())); return true; } @@ -1540,7 +1540,7 @@ void KviKvsObject::setObject(TQObject * o,bool bIsOwned) m_bObjectOwner = bIsOwned; m_pObject = o; o->installEventFilter(this); - connect(m_pObject,TQT_SIGNAL(destroyed()),this,TQT_SLOT(objectDestroyed())); + connect(m_pObject,TQ_SIGNAL(destroyed()),this,TQ_SLOT(objectDestroyed())); } void KviKvsObject::objectDestroyed() diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp index b531904a..5f0293d0 100644 --- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp +++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp @@ -285,7 +285,7 @@ KviKvsPopupMenuItemLabel::~KviKvsPopupMenuItemLabel() { if(m_pLabel) { - TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed())); delete m_pLabel; } delete m_pSignalRelay; @@ -306,7 +306,7 @@ void KviKvsPopupMenuItemLabel::clear() { if(m_pLabel) { - TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed())); delete m_pLabel; m_pLabel = 0; } @@ -319,11 +319,11 @@ void KviKvsPopupMenuItemLabel::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTopLe TQPixmap * pPix = evaluateIcon(pData); if(m_pLabel) { - TQObject::disconnect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); + TQObject::disconnect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed())); delete m_pLabel; } m_pLabel = new TQLabel(szText,pMenu); - TQObject::connect(m_pLabel,TQT_SIGNAL(destroyed()),m_pSignalRelay,TQT_SLOT(labelDestroyed())); + TQObject::connect(m_pLabel,TQ_SIGNAL(destroyed()),m_pSignalRelay,TQ_SLOT(labelDestroyed())); pMenu->insertItem(m_pLabel); m_pLabel->setFrameStyle(TQFrame::StyledPanel | TQFrame::Raised); if(pPix)m_pLabel->setPixmap(*pPix); @@ -538,8 +538,8 @@ KviKvsPopupMenu::KviKvsPopupMenu(const TQString &szName) m_pTopLevelData = 0; m_pTempTopLevelData = 0; m_bSetupDone = false; - connect(this,TQT_SIGNAL(activated(int)),this,TQT_SLOT(itemClicked(int))); - connect(this,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMenuContents())); + connect(this,TQ_SIGNAL(activated(int)),this,TQ_SLOT(itemClicked(int))); + connect(this,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupMenuContents())); } diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp index ab4a7c16..aa09d885 100644 --- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp +++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp @@ -96,19 +96,19 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT) { - connect(m_pProcess,TQT_SIGNAL(readyReadStdout()),this,TQT_SLOT(readStdout())); + connect(m_pProcess,TQ_SIGNAL(readyReadStdout()),this,TQ_SLOT(readStdout())); c |= KviProcess::Stdout; } if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR) { - connect(m_pProcess,TQT_SIGNAL(readyReadStderr()),this,TQT_SLOT(readStderr())); + connect(m_pProcess,TQ_SIGNAL(readyReadStderr()),this,TQ_SLOT(readStderr())); c |= KviProcess::Stderr; } m_pProcess->setCommunication(c); - connect(m_pProcess,TQT_SIGNAL(processExited()),this,TQT_SLOT(processExited())); + connect(m_pProcess,TQ_SIGNAL(processExited()),this,TQ_SLOT(processExited())); if(!m_pProcess->start()) { @@ -129,14 +129,14 @@ bool KviKvsProcessAsyncOperation::start() if(m_pData->iMaxRunTime > 0) { m_pRunTimeTimer = new TQTimer(this); - connect(m_pRunTimeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(maxRunTimeExpired())); + connect(m_pRunTimeTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(maxRunTimeExpired())); m_pRunTimeTimer->start(m_pData->iMaxRunTime); } if(m_pData->iPingTimeout > 0) { m_pPingTimer = new TQTimer(this); - connect(m_pPingTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(ping())); + connect(m_pPingTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(ping())); m_pPingTimer->start(m_pData->iPingTimeout); } @@ -155,7 +155,7 @@ void KviKvsProcessAsyncOperation::triggerSelfDelete() { if(m_bDeletePending)return; m_bDeletePending = true; - TQTimer::singleShot(m_pData->iMaxRunTime,this,TQT_SLOT(selfDelete())); + TQTimer::singleShot(m_pData->iMaxRunTime,this,TQ_SLOT(selfDelete())); } void KviKvsProcessAsyncOperation::selfDelete() diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp index 5602dc42..4d83edd0 100644 --- a/src/kvirc/module/kvi_modulemanager.cpp +++ b/src/kvirc/module/kvi_modulemanager.cpp @@ -47,7 +47,7 @@ KviModuleManager::KviModuleManager() m_pModuleDict->setAutoDelete(false); m_pCleanupTimer = new TQTimer(this); - connect(m_pCleanupTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(cleanupUnusedModules())); + connect(m_pCleanupTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(cleanupUnusedModules())); } KviModuleManager::~KviModuleManager() diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp index a927e362..37e79921 100644 --- a/src/kvirc/ui/kvi_channel.cpp +++ b/src/kvirc/ui/kvi_channel.cpp @@ -125,8 +125,8 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // Topic widget on the left m_pTopicWidget = new KviTopicWidget(m_pTopSplitter,"topic_widget"); - connect(m_pTopicWidget,TQT_SIGNAL(topicSelected(const TQString &)), - this,TQT_SLOT(topicSelected(const TQString &))); + connect(m_pTopicWidget,TQ_SIGNAL(topicSelected(const TQString &)), + this,TQ_SLOT(topicSelected(const TQString &))); // mode label follows the topic widget m_pModeWidget = new KviModeWidget(m_pTopSplitter,this,"mode_"); KviTalToolTip::add(m_pModeWidget,__tr2qs("Channel mode")); @@ -143,7 +143,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // With the IRC view over m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); m_pIrcView->setName(name); - connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); // And the double view (that may be unused) m_pMessageView = 0; // The userlist on the right @@ -152,29 +152,29 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name // and the related buttons m_pDoubleViewButton = createToolButton(m_pButtonContainer,"double_view_button",KVI_SMALLICON_HIDEDOUBLEVIEW,KVI_SMALLICON_SHOWDOUBLEVIEW,__tr2qs("Split View"),false); - connect(m_pDoubleViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleDoubleView())); + connect(m_pDoubleViewButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleDoubleView())); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); + connect(m_pListViewButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleListView())); m_pBanEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,__tr2qs("Ban Editor"),buttonContainer(),false,"ban_editor_button"); - connect(m_pBanEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanEditor())); + connect(m_pBanEditorButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleBanEditor())); if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('e')) { m_pBanExceptionEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_BANUNEXCEPT,KVI_SMALLICON_BANEXCEPT,__tr2qs("Ban Exception Editor"),buttonContainer(),false,"ban_exception_editor_button"); - connect(m_pBanExceptionEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanExceptionEditor())); + connect(m_pBanExceptionEditorButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleBanExceptionEditor())); } else { m_pBanExceptionEditorButton=0; } if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('I')) { m_pInviteEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_INVITEUNEXCEPT,KVI_SMALLICON_INVITEEXCEPT,__tr2qs("Invite Exception Editor"),buttonContainer(),false,"invite_exception_editor_button"); - connect(m_pInviteEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleInviteEditor())); + connect(m_pInviteEditorButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleInviteEditor())); } else { m_pInviteEditorButton = 0; } m_pModeEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_CHANMODEHIDE,KVI_SMALLICON_CHANMODE,__tr2qs("Mode Editor"),buttonContainer(),false,"mode_editor_button"); - connect(m_pModeEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleModeEditor())); + connect(m_pModeEditorButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleModeEditor())); m_pModeEditor = 0; #ifdef COMPILE_CRYPT_SUPPORT @@ -189,7 +189,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleToolButtons())); m_pUserListView = new KviUserListView(m_pSplitter,m_pListViewButton,connection()->userDataBase(),this, AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view"); @@ -358,7 +358,7 @@ void KviChannel::showDoubleView(bool bShow) { m_pMessageView->setPrivateBackgroundPixmap(*(m_privateBackground.pixmap())); } - connect(m_pMessageView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pMessageView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); m_pMessageView->setMasterView(m_pIrcView); m_pIrcView->splitMessagesTo(m_pMessageView); m_pMessageView->show(); @@ -394,8 +394,8 @@ void KviChannel::toggleModeEditor() resizeEvent(0); } else { m_pModeEditor = new KviModeEditor(m_pSplitter,m_pModeEditorButton,"mode_editor",console(),m_szChannelMode,m_szChannelKey,m_szChannelLimit.ptr()); - connect(m_pModeEditor,TQT_SIGNAL(setMode(const char *)),this,TQT_SLOT(setMode(const char *))); - connect(m_pModeEditor,TQT_SIGNAL(done()),this,TQT_SLOT(modeSelectorDone())); + connect(m_pModeEditor,TQ_SIGNAL(setMode(const char *)),this,TQ_SLOT(setMode(const char *))); + connect(m_pModeEditor,TQ_SIGNAL(done()),this,TQ_SLOT(modeSelectorDone())); m_pModeEditor->show(); //setFocusHandlerNoClass(m_pInput,m_pModeEditor,"TQLineEdit"); if(!m_pModeEditorButton->isOn())m_pModeEditorButton->setOn(true); @@ -476,8 +476,8 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p } *ppEd = new KviMaskEditor(m_pSplitter,*ppBtn,l,flag,edName); - connect(*ppEd,TQT_SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), - this,TQT_SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); + connect(*ppEd,TQ_SIGNAL(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *)), + this,TQ_SLOT(removeMasks(KviMaskEditor *,KviPointerList<KviMaskEntry> *))); //setFocusHandler(m_pInput,*ppEd); //socket it! (*ppEd)->show(); if(!(*ppBtn))return; diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp index f8cae843..3a1e7a6f 100644 --- a/src/kvirc/ui/kvi_console.cpp +++ b/src/kvirc/ui/kvi_console.cpp @@ -133,20 +133,20 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags) m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins m_pButtonBox->setStretchFactor(m_pAddressEdit,1); KviTalToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI")); - connect(m_pAddressEdit,TQT_SIGNAL(activated(const TQString & )),this,TQT_SLOT(ircUriChanged(const TQString & ))); - connect(g_pApp,TQT_SIGNAL(recentUrlsChanged()),this,TQT_SLOT(recentUrlsChanged())); + connect(m_pAddressEdit,TQ_SIGNAL(activated(const TQString & )),this,TQ_SLOT(ircUriChanged(const TQString & ))); + connect(g_pApp,TQ_SIGNAL(recentUrlsChanged()),this,TQ_SLOT(recentUrlsChanged())); m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); // FIXME: #warning "If notify list is disabled avoid to show this" // FIXME: #warning "Button to show/hide the notifyListView (NOT DELETE RE_CREATE!)" // The userlist on the right //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pNotifyViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Notify List"),buttonContainer(),true,"list_view_button"); - connect(m_pNotifyViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleNotifyView())); + connect(m_pNotifyViewButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleNotifyView())); m_pNotifyListView = new KviUserListView(m_pSplitter,m_pNotifyViewButton,0,this,19,__tr2qs("Notify List"),"notify_list_view"); @@ -255,19 +255,19 @@ void KviConsole::fillContextPopup(KviTalPopupMenu * p) cc = channelCount(); qc = queryCount(); p->insertSeparator(); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQT_SLOT(partAllChannels())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Part All Channels"),connection(),TQ_SLOT(partAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),TQT_SLOT(closeAllQueries())); + id = p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUERY)),__tr2qs("Close All Queries"),connection(),TQ_SLOT(closeAllQueries())); if(!qc)p->setItemEnabled(id,false); } p->insertSeparator(); - p->insertItem(__tr2qs("Unhighlight All Windows"),context(),TQT_SLOT(unhighlightAllWindows())); + p->insertItem(__tr2qs("Unhighlight All Windows"),context(),TQ_SLOT(unhighlightAllWindows())); if(connection()) { - id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),TQT_SLOT(unhighlightAllChannels())); + id = p->insertItem(__tr2qs("Unhighlight All Channels"),connection(),TQ_SLOT(unhighlightAllChannels())); if(!cc)p->setItemEnabled(id,false); - id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),TQT_SLOT(unhighlightAllQueries())); + id = p->insertItem(__tr2qs("Unhighlight All Queries"),connection(),TQ_SLOT(unhighlightAllQueries())); if(!qc)p->setItemEnabled(id,false); } } @@ -513,7 +513,7 @@ void KviConsole::updateUri() void KviConsole::connectionAttached() { //need to update URI - connect(m_pContext->connection(),TQT_SIGNAL(chanListChanged()),this,TQT_SLOT(updateUri())); + connect(m_pContext->connection(),TQ_SIGNAL(chanListChanged()),this,TQ_SLOT(updateUri())); updateUri(); m_pNotifyListView->setUserDataBase(connection()->userDataBase()); } diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp index 5af9b913..d56824e1 100644 --- a/src/kvirc/ui/kvi_cryptcontroller.cpp +++ b/src/kvirc/ui/kvi_cryptcontroller.cpp @@ -94,10 +94,10 @@ m_pEnableCheck = new KviStyledCheckBox(__tr2qs("Use the crypt engine"),this); g->addMultiCellWidget(m_pEnableCheck,2,2,0,3); - connect(m_pEnableCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCheckToggled(bool))); + connect(m_pEnableCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCheckToggled(bool))); m_pListBox = new KviTalListBox(this); - connect(m_pListBox,TQT_SIGNAL(highlighted(KviTalListBoxItem *)),this,TQT_SLOT(engineHighlighted(KviTalListBoxItem *))); + connect(m_pListBox,TQ_SIGNAL(highlighted(KviTalListBoxItem *)),this,TQ_SLOT(engineHighlighted(KviTalListBoxItem *))); g->addMultiCellWidget(m_pListBox,3,8,0,0); m_pDescriptionLabel = new TQLabel(this); @@ -135,7 +135,7 @@ m_pOkButton = new TQPushButton(__tr2qs("OK"),this); g->addMultiCellWidget(m_pOkButton,9,9,0,3); - connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(m_pOkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); g->setRowStretch(3,1); g->setColStretch(2,1); diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp index 96d25e88..de358916 100644 --- a/src/kvirc/ui/kvi_ctcppagedialog.cpp +++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp @@ -47,7 +47,7 @@ KviCtcpPageDialog::KviCtcpPageDialog() g->addWidget(m_pWidgetStack,0,0); m_pTabBar = new TQTabBar(this); m_pTabBar->setShape(TQTabBar::TriangularBelow); - connect(m_pTabBar,TQT_SIGNAL(selected(int)),this,TQT_SLOT(tabSelected(int))); + connect(m_pTabBar,TQ_SIGNAL(selected(int)),this,TQ_SLOT(tabSelected(int))); g->addWidget(m_pTabBar,1,0); g->setRowStretch(0,1); @@ -55,7 +55,7 @@ KviCtcpPageDialog::KviCtcpPageDialog() g->addRowSpacing(2,15); m_pCloseButton = new TQPushButton(__tr2qs("Close"),this); - connect(m_pCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(die())); + connect(m_pCloseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(die())); g->addWidget(m_pCloseButton,3,0); setMinimumSize(300,200); diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp index a93c7da0..24259c2c 100644 --- a/src/kvirc/ui/kvi_customtoolbar.cpp +++ b/src/kvirc/ui/kvi_customtoolbar.cpp @@ -78,8 +78,8 @@ KviCustomToolBar::KviCustomToolBar(KviCustomToolBarDescriptor * d,const TQString m_pDraggedChild = 0; m_pFilteredChildren = 0; setAcceptDrops(true); - connect(KviActionManager::instance(),TQT_SIGNAL(beginCustomizeToolBars()),this,TQT_SLOT(beginCustomize())); - connect(KviActionManager::instance(),TQT_SIGNAL(endCustomizeToolBars()),this,TQT_SLOT(endCustomize())); + connect(KviActionManager::instance(),TQ_SIGNAL(beginCustomizeToolBars()),this,TQ_SLOT(beginCustomize())); + connect(KviActionManager::instance(),TQ_SIGNAL(endCustomizeToolBars()),this,TQ_SLOT(endCustomize())); setMinimumSize(20,20); d->registerToolBar(this); if(KviActionManager::customizingToolBars()) @@ -124,7 +124,7 @@ void KviCustomToolBar::filterChild(TQObject * o) m_pFilteredChildren->insert(o,b); if(!*b)((TQWidget *)o)->setEnabled(true); o->installEventFilter(this); - connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); + connect(o,TQ_SIGNAL(destroyed()),this,TQ_SLOT(filteredChildDestroyed())); } void KviCustomToolBar::unfilterChild(TQObject * o) @@ -136,7 +136,7 @@ void KviCustomToolBar::unfilterChild(TQObject * o) { if(!*b)((TQWidget *)o)->setEnabled(false); o->removeEventFilter(this); - disconnect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(filteredChildDestroyed())); + disconnect(o,TQ_SIGNAL(destroyed()),this,TQ_SLOT(filteredChildDestroyed())); } } } diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp index f8e3a60d..0fcdac80 100644 --- a/src/kvirc/ui/kvi_frame.cpp +++ b/src/kvirc/ui/kvi_frame.cpp @@ -115,8 +115,8 @@ KviFrame::KviFrame() setUsesBigPixmaps(KVI_OPTION_BOOL(KviOption_boolUseBigIcons)); m_pMdi = new KviMdiManager(m_pSplitter,this,"mdi_manager"); - connect(m_pMdi,TQT_SIGNAL(enteredSdiMode()),this,TQT_SLOT(enteredSdiMode())); - connect(m_pMdi,TQT_SIGNAL(leftSdiMode()),this,TQT_SLOT(leftSdiMode())); + connect(m_pMdi,TQ_SIGNAL(enteredSdiMode()),this,TQ_SLOT(enteredSdiMode())); + connect(m_pMdi,TQ_SIGNAL(leftSdiMode()),this,TQ_SLOT(leftSdiMode())); // This theoretically had to exists before KviMdiManager (that uses enterSdiMode) m_pMenuBar = new KviMenuBar(this,"main_menu_bar"); @@ -385,7 +385,7 @@ KviAccel * KviFrame::installAccelerators(TQWidget * wnd) i++; } - connect(ac,TQT_SIGNAL(activated(int)),this,TQT_SLOT(accelActivated(int))); + connect(ac,TQ_SIGNAL(activated(int)),this,TQ_SLOT(accelActivated(int))); return ac; } @@ -932,7 +932,7 @@ void KviFrame::closeEvent(TQCloseEvent *e) { dockExtension()->setPrevWindowState(windowState()); - TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(hide()) ); } return; } @@ -1043,8 +1043,8 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) { p->clear(); - disconnect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); // just to be sure - connect(p,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolbarsPopupSelected(int))); + disconnect(p,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toolbarsPopupSelected(int))); // just to be sure + connect(p,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toolbarsPopupSelected(int))); int id; int cnt = 0; @@ -1098,7 +1098,7 @@ void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p) } if(cnt > 0)p->insertSeparator(); - p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,TQT_SLOT(customizeToolBars())); + p->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)),__tr2qs("Customize..."),this,TQ_SLOT(customizeToolBars())); } void KviFrame::customizeToolBars() @@ -1337,7 +1337,7 @@ void KviFrame::hideEvent ( TQHideEvent * e) { executeInternalCommand(KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } - TQTimer::singleShot( 0, this, TQT_SLOT(hide()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(hide()) ); } } diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp index d657c444..d9490328 100644 --- a/src/kvirc/ui/kvi_historywin.cpp +++ b/src/kvirc/ui/kvi_historywin.cpp @@ -43,7 +43,7 @@ KviHistoryWindow::KviHistoryWindow() { m_pOwner = 0; setHScrollBarMode(TQScrollView::AlwaysOff); - connect(this,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(itemSelected(const TQString &))); + connect(this,TQ_SIGNAL(selected(const TQString &)),this,TQ_SLOT(itemSelected(const TQString &))); m_iTimerId = -1; } @@ -69,9 +69,9 @@ void KviHistoryWindow::fill() void KviHistoryWindow::popup(KviInput *owner) { - if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQ_SIGNAL(destroyed()),this,TQ_SLOT(ownerDead())); m_pOwner = owner; - connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); + connect(m_pOwner,TQ_SIGNAL(destroyed()),this,TQ_SLOT(ownerDead())); fill(); show(); } diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp index 7c16fe5f..18330547 100644 --- a/src/kvirc/ui/kvi_htmldialog.cpp +++ b/src/kvirc/ui/kvi_htmldialog.cpp @@ -89,7 +89,7 @@ KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) pb->setDefault(pData->iDefaultButton == 1); int iCoord = iButtons == 1 ? 1 : 0; g->addWidget(pb,3,iCoord); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button1Pressed())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(button1Pressed())); if(!pData->szButton2Text.isEmpty()) { @@ -98,7 +98,7 @@ KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) pb->setDefault(pData->iDefaultButton == 2); iCoord = iButtons == 2 ? 2 : 1; g->addWidget(pb,3,iCoord); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button2Pressed())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(button2Pressed())); if(!pData->szButton3Text.isEmpty()) { @@ -106,7 +106,7 @@ KviHtmlDialog::KviHtmlDialog(TQWidget * pParent,KviHtmlDialogData * pData) pb->setText(pData->szButton3Text); pb->setDefault(pData->iDefaultButton == 3); g->addWidget(pb,3,2); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(button3Pressed())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(button3Pressed())); } } diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp index 652be479..4d79b932 100644 --- a/src/kvirc/ui/kvi_imagedialog.cpp +++ b/src/kvirc/ui/kvi_imagedialog.cpp @@ -109,7 +109,7 @@ KviImageDialog::KviImageDialog(TQWidget * par, setCaption(szCaption.isEmpty() ? __tr2qs("Choose image ...") : szCaption); m_pTimer = new TQTimer(this); - connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); TQGridLayout * g = new TQGridLayout(this,4,3,5,3); @@ -155,19 +155,19 @@ KviImageDialog::KviImageDialog(TQWidget * par, g->addMultiCellWidget(m_pListBox,2,2,0,2); TQPushButton * b = new TQPushButton(__tr2qs("Cancel"),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); g->addWidget(b,3,1); b = new TQPushButton(__tr2qs("Ok"),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); g->addWidget(b,3,2); g->setRowStretch(2,1); g->setColStretch(0,1); - connect(m_pTypeComboBox,TQT_SIGNAL(activated(int)),this,TQT_SLOT(jobTypeSelected(int))); - connect(m_pListBox,TQT_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListBoxItem *))); - connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(m_pTypeComboBox,TQ_SIGNAL(activated(int)),this,TQ_SLOT(jobTypeSelected(int))); + connect(m_pListBox,TQ_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListBoxItem *))); + connect(m_pTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); m_pTypeComboBox->setCurrentItem(idx); jobTypeSelected(idx); diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp index a34d9ccb..3a8d3d60 100644 --- a/src/kvirc/ui/kvi_input.cpp +++ b/src/kvirc/ui/kvi_input.cpp @@ -201,7 +201,7 @@ KviInputEditor::KviInputEditor(TQWidget * par,KviWindow *wnd,KviUserListView * v setFrameShadow( Plain ); m_pIconMenu = new KviTalPopupMenu(); - connect(m_pIconMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(iconPopupActivated(int))); + connect(m_pIconMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(iconPopupActivated(int))); setCursor(IbeamCursor); } @@ -782,30 +782,30 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e) } } - int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,TQT_SLOT(cut())); + int id = g_pInputPopup->insertItem(__tr2qs("Cu&t") + ACCEL_KEY(X),this,TQ_SLOT(cut())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,TQT_SLOT(copyToClipboard())); + id = g_pInputPopup->insertItem(__tr2qs("&Copy") + ACCEL_KEY(C),this,TQ_SLOT(copyToClipboard())); g_pInputPopup->setItemEnabled(id,hasSelection()); - id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,TQT_SLOT(pasteClipboardWithConfirmation())); + id = g_pInputPopup->insertItem(__tr2qs("&Paste") + ACCEL_KEY(V),this,TQ_SLOT(pasteClipboardWithConfirmation())); g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); - id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,TQT_SLOT(pasteSlow())); + id = g_pInputPopup->insertItem(__tr2qs("Paste (Slowly)"),this,TQ_SLOT(pasteSlow())); if ((type == KVI_WINDOW_TYPE_CHANNEL) || (type == KVI_WINDOW_TYPE_QUERY) || (type == KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,!szClip.isEmpty() && !m_bReadOnly); else g_pInputPopup->setItemEnabled(id,false); - id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,TQT_SLOT(pasteFile())); + id = g_pInputPopup->insertItem(__tr2qs("Paste &File") + ACCEL_KEY(F),this,TQ_SLOT(pasteFile())); if ((type != KVI_WINDOW_TYPE_CHANNEL) && (type != KVI_WINDOW_TYPE_QUERY) && (type != KVI_WINDOW_TYPE_DCCCHAT)) g_pInputPopup->setItemEnabled(id,false); else g_pInputPopup->setItemEnabled(id,!m_bReadOnly); if(m_bSpSlowFlag ==true) { - id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,TQT_SLOT(stopPasteSlow())); /*G&N 2005*/ + id = g_pInputPopup->insertItem(__tr2qs("Stop Paste"),this,TQ_SLOT(stopPasteSlow())); /*G&N 2005*/ } - id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,TQT_SLOT(clear())); + id = g_pInputPopup->insertItem(__tr2qs("Clear"),this,TQ_SLOT(clear())); g_pInputPopup->setItemEnabled(id,!m_szTextBuffer.isEmpty() && !m_bReadOnly); g_pInputPopup->insertSeparator(); - id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,TQT_SLOT(selectAll())); + id = g_pInputPopup->insertItem(__tr2qs("Select All"),this,TQ_SLOT(selectAll())); g_pInputPopup->setItemEnabled(id,(!m_szTextBuffer.isEmpty())); @@ -2234,7 +2234,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) if(g_pIconManager->getBigIcon("kvi_horizontal_left.png")) m_pHideToolsButton->setPixmap(*(g_pIconManager->getBigIcon("kvi_horizontal_left.png"))); - connect(m_pHideToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleToolButtons())); + connect(m_pHideToolsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleToolButtons())); m_pButtonContainer=new KviTalHBox(this); m_pButtonContainer->setSpacing(0); @@ -2249,7 +2249,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(historyButtonClicked())); } else { @@ -2265,7 +2265,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) m_pIconButton->setIconSet(is3); KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br><Ctrl+I><br>See also /help texticons")); - connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked())); + connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked())); m_pCommandlineModeButton = new KviStyledToolButton(m_pButtonContainer,"commandlinemodebutton"); @@ -2291,10 +2291,10 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view) szTip += " - <Ctrl+Backspace>"; KviTalToolTip::add(m_pMultiEditorButton,szTip); - connect(m_pMultiEditorButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(multilineEditorButtonToggled(bool))); + connect(m_pMultiEditorButton,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(multilineEditorButtonToggled(bool))); m_pInputEditor = new KviInputEditor(this,par,view); - connect(m_pInputEditor,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(inputEditorEnterPressed())); + connect(m_pInputEditor,TQ_SIGNAL(enterPressed()),this,TQ_SLOT(inputEditorEnterPressed())); m_pInputEditor->setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored,TQSizePolicy::Ignored)); @@ -2527,7 +2527,7 @@ void KviInput::applyOptions() is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled")); - m_pHistoryButton->disconnect(TQT_SIGNAL(clicked())); + m_pHistoryButton->disconnect(TQ_SIGNAL(clicked())); } if(!KVI_OPTION_BOOL(KviOption_boolDisableInputHistory)) @@ -2536,7 +2536,7 @@ void KviInput::applyOptions() is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),TQIconSet::Small); m_pHistoryButton->setIconSet(is1); KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br><Ctrl+PageUp>")); - connect(m_pHistoryButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyButtonClicked())); + connect(m_pHistoryButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(historyButtonClicked())); } m_pInputEditor->applyOptions(); diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp index 821f3ab8..9e1df88b 100644 --- a/src/kvirc/ui/kvi_irctoolbar.cpp +++ b/src/kvirc/ui/kvi_irctoolbar.cpp @@ -245,7 +245,7 @@ KviIrcContextDisplay::KviIrcContextDisplay(TQWidget * par,const char * name) : KviToolBarGraphicalApplet(par,name) { KviDynamicToolTip * tip = new KviDynamicToolTip(this); - connect(tip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(tip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp index 5df9132f..3a5b8794 100644 --- a/src/kvirc/ui/kvi_ircview.cpp +++ b/src/kvirc/ui/kvi_ircview.cpp @@ -352,10 +352,10 @@ KviIrcView::KviIrcView(TQWidget *parent,KviFrame *pFrm,KviWindow *pWnd) KviTalToolTip::add(m_pToolsButton,__tr2qs("Search tools")); m_pToolsButton->setFocusProxy(this); - connect(m_pToolsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showToolsPopup())); + connect(m_pToolsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showToolsPopup())); m_pToolsButton->show(); - connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarPositionChanged(int))); + connect(m_pScrollBar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(scrollBarPositionChanged(int))); m_iLastScrollBarValue = 0; // set the minimum width @@ -631,9 +631,9 @@ const TQString & KviIrcView::lastLineOfText() void KviIrcView::setMasterView(KviIrcView * v) { - if(m_pMasterView)disconnect(this,TQT_SLOT(masterDead())); + if(m_pMasterView)disconnect(this,TQ_SLOT(masterDead())); m_pMasterView = v; - if(m_pMasterView)connect(m_pMasterView,TQT_SIGNAL(destroyed()),this,TQT_SLOT(masterDead())); + if(m_pMasterView)connect(m_pMasterView,TQ_SIGNAL(destroyed()),this,TQ_SLOT(masterDead())); } void KviIrcView::masterDead() @@ -3823,18 +3823,18 @@ void KviIrcView::showToolsPopup() m_pToolsPopup->clear(); if(m_pToolWidget) - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,TQT_SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Hide Find Window"),this,TQ_SLOT(toggleToolWidget())); else - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,TQT_SLOT(toggleToolWidget())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)),__tr2qs("Show Find Window"),this,TQ_SLOT(toggleToolWidget())); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,TQT_SLOT(increaseFontSize())); - m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,TQT_SLOT(decreaseFontSize())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,TQT_SLOT(chooseFont())); - m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,TQT_SLOT(chooseBackground())); - int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,TQT_SLOT(resetBackground())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLUS)),__tr2qs("Zoom In"),this,TQ_SLOT(increaseFontSize())); + m_pToolsPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs("Zoom Out"),this,TQ_SLOT(decreaseFontSize())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Font..."),this,TQ_SLOT(chooseFont())); + m_pToolsPopup->insertItem(__tr2qs("Choose Temporary Background..."),this,TQ_SLOT(chooseBackground())); + int id = m_pToolsPopup->insertItem(__tr2qs("Reset Temporary Background"),this,TQ_SLOT(resetBackground())); m_pToolsPopup->setItemEnabled(id,m_pPrivateBackgroundPixmap != 0); m_pToolsPopup->insertSeparator(); - m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQT_SLOT(clearBuffer())); + m_pToolsPopup->insertItem(__tr2qs("Clear Buffer"),this,TQ_SLOT(clearBuffer())); TQSize s = m_pToolsPopup->sizeHint(); diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp index bc517c19..e71e1ab9 100644 --- a/src/kvirc/ui/kvi_ircviewtools.cpp +++ b/src/kvirc/ui/kvi_ircviewtools.cpp @@ -94,7 +94,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) TQToolButton *tb = new TQToolButton(TQt::DownArrow,this,"down_arrow"); tb->setFixedSize(14,14); tb->setAutoRepeat(false); - connect(tb,TQT_SIGNAL(clicked()),m_pIrcView,TQT_SLOT(toggleToolWidget())); + connect(tb,TQ_SIGNAL(clicked()),m_pIrcView,TQ_SLOT(toggleToolWidget())); gl->addWidget(tb,0,1); @@ -109,7 +109,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pStringToFind = new TQLineEdit(w); g->addMultiCellWidget(m_pStringToFind,0,0,0,2); - connect(m_pStringToFind,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(findNext())); + connect(m_pStringToFind,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(findNext())); m_pRegExp = new KviStyledCheckBox(__tr2qs("&Regular expression"),w); g->addMultiCellWidget(m_pRegExp,1,1,0,2); @@ -117,18 +117,18 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pExtendedRegExp = new KviStyledCheckBox(__tr2qs("E&xtended regexp."),w); g->addMultiCellWidget(m_pExtendedRegExp,2,2,0,2); m_pExtendedRegExp->setEnabled(false); - connect(m_pRegExp,TQT_SIGNAL(toggled(bool)),m_pExtendedRegExp,TQT_SLOT(setEnabled(bool))); + connect(m_pRegExp,TQ_SIGNAL(toggled(bool)),m_pExtendedRegExp,TQ_SLOT(setEnabled(bool))); m_pCaseSensitive = new KviStyledCheckBox(__tr2qs("C&ase sensitive"),w); g->addMultiCellWidget(m_pCaseSensitive,3,3,0,2); TQPushButton * pb = new TQPushButton(__tr2qs("Find &Prev."),w); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findPrev())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(findPrev())); g->addWidget(pb,4,0); pb = new TQPushButton(__tr2qs("&Find Next"),w); pb->setDefault(true); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(findNext())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(findNext())); g->addMultiCellWidget(pb,4,4,1,2); m_pFindResult = new TQLabel(w); @@ -160,19 +160,19 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) } pb = new TQPushButton(__tr2qs("Set &All"),w1); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableAll())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(filterEnableAll())); g->addWidget(pb,0,1); pb = new TQPushButton(__tr2qs("Set &None"),w1); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterEnableNone())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(filterEnableNone())); g->addWidget(pb,1,1); pb = new TQPushButton(__tr2qs("&Load From..."),w1); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterLoad())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(filterLoad())); g->addWidget(pb,2,1); pb = new TQPushButton(__tr2qs("&Save As..."),w1); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(filterSave())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(filterSave())); g->addWidget(pb,3,1); tw->addTab(w1,__tr2qs("Filter")); @@ -183,7 +183,7 @@ KviIrcViewToolWidget::KviIrcViewToolWidget(KviIrcView * par) m_pStringToFind->setFocus(); tw->showPage(w); KviAccel *a = new KviAccel( this ); - a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), this,TQ_SLOT(close()) ); } KviIrcViewToolWidget::~KviIrcViewToolWidget() diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 2639d14c..2e3168e7 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -79,12 +79,12 @@ KviMaskInputDialog::KviMaskInputDialog(const TQString &szMask,KviMaskEditor* pEd g->addMultiCellWidget(m_pEdit,1,1,0,3); m_pOkButton= new TQPushButton(__tr2qs("Ok"),this); - connect(m_pOkButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); + connect(m_pOkButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); g->addWidget(m_pOkButton,2,1); m_pOkButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); m_pChancelButton= new TQPushButton(__tr2qs("Cancel"),this); - connect(m_pChancelButton,TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(m_pChancelButton,TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); g->addWidget(m_pChancelButton,2,2); m_pChancelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); @@ -175,7 +175,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP new TQLabel(__tr2qs("Filter:"),hb); m_pSearch = new TQLineEdit(hb); - connect(m_pSearch,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(searchTextChanged ( const TQString & ))); + connect(m_pSearch,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(searchTextChanged ( const TQString & ))); l = new TQLabel(__tr2qs("Use doubleclick to edit item"),this); g->addWidget(l,1,1); @@ -192,7 +192,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP m_pMaskBox->setAllColumnsShowFocus(true); m_pMaskBox->setShowSortIndicator(true); m_pMaskBox->setSorting(2,false); - connect(m_pMaskBox,TQT_SIGNAL(doubleClicked ( KviTalListViewItem * )),this,TQT_SLOT(listViewDoubleClicked( KviTalListViewItem * ))); + connect(m_pMaskBox,TQ_SIGNAL(doubleClicked ( KviTalListViewItem * )),this,TQ_SLOT(listViewDoubleClicked( KviTalListViewItem * ))); g->addMultiCellWidget(m_pMaskBox,3,3,0,1); m_pRemoveMask = new TQPushButton(__tr2qs("Re&move"),this); @@ -200,7 +200,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP m_pRemoveMask->setFocusPolicy(TQWidget::ClickFocus); m_pRemoveMask->setFocusProxy(this); g->addWidget(m_pRemoveMask,4,1); - connect(m_pRemoveMask,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); + connect(m_pRemoveMask,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked())); m_pRemoveMask->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); m_pAddButton = new TQPushButton(__tr2qs("Add"),this); @@ -208,7 +208,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP m_pAddButton->setFocusPolicy(TQWidget::ClickFocus); m_pAddButton->setFocusProxy(this); g->addWidget(m_pAddButton,4,0); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); g->setColStretch(3,1); diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp index f3a06f49..6276f821 100644 --- a/src/kvirc/ui/kvi_mdicaption.cpp +++ b/src/kvirc/ui/kvi_mdicaption.cpp @@ -85,13 +85,13 @@ KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name) : TQWidget(parent,name) { m_pMaximizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button"); - connect(m_pMaximizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(maximize())); + connect(m_pMaximizeButton,TQ_SIGNAL(clicked()),parent,TQ_SLOT(maximize())); m_pMinimizeButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button"); - connect(m_pMinimizeButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(minimize())); + connect(m_pMinimizeButton,TQ_SIGNAL(clicked()),parent,TQ_SLOT(minimize())); m_pCloseButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),this,"close_button"); - connect(m_pCloseButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(closeRequest())); + connect(m_pCloseButton,TQ_SIGNAL(clicked()),parent,TQ_SLOT(closeRequest())); m_pSystemButton = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DEFAULTICON)),this,"icon_button"); - connect(m_pSystemButton,TQT_SIGNAL(clicked()),parent,TQT_SLOT(systemPopupSlot())); + connect(m_pSystemButton,TQ_SIGNAL(clicked()),parent,TQ_SLOT(systemPopupSlot())); m_lastMousePos = TQPoint(-1,-1); m_bMouseGrabbed = true; diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp index fd16ffaf..6f4e8947 100644 --- a/src/kvirc/ui/kvi_mdichild.cpp +++ b/src/kvirc/ui/kvi_mdichild.cpp @@ -230,13 +230,13 @@ void KviMdiChild::closeRequest() void KviMdiChild::systemPopupAboutToShow() { m_pSystemPopup->clear(); - if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,TQT_SLOT(maximize())); - if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,TQT_SLOT(minimize())); - if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,TQT_SLOT(restore())); + if(m_state != Maximized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),__tr("&Maximize"),this,TQ_SLOT(maximize())); + if(m_state != Minimized)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),__tr("M&inimize"),this,TQ_SLOT(minimize())); + if(m_state != Normal)m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),__tr("&Restore"),this,TQ_SLOT(restore())); if(closeEnabled()) { m_pSystemPopup->insertSeparator(); - m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,TQT_SLOT(closeRequest())); + m_pSystemPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr("&Close"),this,TQ_SLOT(closeRequest())); } } */ diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp index 89d858a6..07013f70 100644 --- a/src/kvirc/ui/kvi_mdimanager.cpp +++ b/src/kvirc/ui/kvi_mdimanager.cpp @@ -73,10 +73,10 @@ KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name m_pSdiMinimizeButton = 0; m_pWindowPopup = new KviTalPopupMenu(this); - connect(m_pWindowPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(menuActivated(int))); - connect(m_pWindowPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillWindowPopup())); + connect(m_pWindowPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(menuActivated(int))); + connect(m_pWindowPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillWindowPopup())); m_pTileMethodPopup = new KviTalPopupMenu(this); - connect(m_pTileMethodPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(tileMethodMenuActivated(int))); + connect(m_pTileMethodPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(tileMethodMenuActivated(int))); viewport()->setBackgroundMode(TQWidget::NoBackground); setStaticBackground(true); @@ -85,7 +85,7 @@ KviMdiManager::KviMdiManager(TQWidget * parent,KviFrame * pFrm,const char * name setFocusPolicy(TQWidget::NoFocus); viewport()->setFocusPolicy(TQWidget::NoFocus); - connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); + connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages())); } KviMdiManager::~KviMdiManager() @@ -498,9 +498,9 @@ void KviMdiManager::updateSDIMode() if(!m_pSdiIconButton) { m_pSdiIconButton = new KviMenuBarToolButton(b,*pix,"nonne"); - connect(m_pSdiIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(activeChildSystemPopup())); + connect(m_pSdiIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(activeChildSystemPopup())); m_iSdiIconItemId = b->insertItem(m_pSdiIconButton,-1,0); - connect(m_pSdiIconButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiIconButtonDestroyed())); + connect(m_pSdiIconButton,TQ_SIGNAL(destroyed()),this,TQ_SLOT(sdiIconButtonDestroyed())); } else { m_pSdiIconButton->setPixmap(*pix); } @@ -537,19 +537,19 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC) pButtonParent = b; m_pSdiMinimizeButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),"btnminimize"); - connect(m_pSdiMinimizeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(minimizeActiveChild())); + connect(m_pSdiMinimizeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(minimizeActiveChild())); m_iSdiMinimizeItemId = b->insertItem(m_pSdiMinimizeButton,-1,b->count()); - connect(m_pSdiMinimizeButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiMinimizeButtonDestroyed())); + connect(m_pSdiMinimizeButton,TQ_SIGNAL(destroyed()),this,TQ_SLOT(sdiMinimizeButtonDestroyed())); m_pSdiRestoreButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),"btnrestore"); - connect(m_pSdiRestoreButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(restoreActiveChild())); + connect(m_pSdiRestoreButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(restoreActiveChild())); m_iSdiRestoreItemId = b->insertItem(m_pSdiRestoreButton,-1,b->count()); - connect(m_pSdiRestoreButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiRestoreButtonDestroyed())); + connect(m_pSdiRestoreButton,TQ_SIGNAL(destroyed()),this,TQ_SLOT(sdiRestoreButtonDestroyed())); m_pSdiCloseButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),"btnclose"); - connect(m_pSdiCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeActiveChild())); + connect(m_pSdiCloseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeActiveChild())); m_iSdiCloseItemId = b->insertItem(m_pSdiCloseButton,-1,b->count()); - connect(m_pSdiCloseButton,TQT_SIGNAL(destroyed()),this,TQT_SLOT(sdiCloseButtonDestroyed())); + connect(m_pSdiCloseButton,TQ_SIGNAL(destroyed()),this,TQ_SLOT(sdiCloseButtonDestroyed())); m_pSdiRestoreButton->show(); m_pSdiMinimizeButton->show(); @@ -620,14 +620,14 @@ void KviMdiManager::fillWindowPopup() { m_pWindowPopup->clear(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,TQT_SLOT(cascadeWindows())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,TQT_SLOT(cascadeMaximized())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("&Cascade Windows")),this,TQ_SLOT(cascadeWindows())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CASCADEWINDOWS)),(__tr2qs("Cascade &Maximized")),this,TQ_SLOT(cascadeMaximized())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,TQT_SLOT(tile())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("&Tile Windows")),this,TQ_SLOT(tile())); m_pTileMethodPopup->clear(); - int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,TQT_SLOT(toggleAutoTile())); + int id = m_pTileMethodPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AUTOTILEWINDOWS)),(__tr2qs("&Auto Tile")),this,TQ_SLOT(toggleAutoTile())); m_pTileMethodPopup->setItemChecked(id,KVI_OPTION_BOOL(KviOption_boolAutoTileWindows)); m_pTileMethodPopup->setItemParameter(id,-1); m_pTileMethodPopup->insertSeparator(); @@ -653,12 +653,12 @@ void KviMdiManager::fillWindowPopup() m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TILEWINDOWS)),(__tr2qs("Tile Met&hod")),m_pTileMethodPopup); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,TQT_SLOT(expandVertical())); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,TQT_SLOT(expandHorizontal())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,TQ_SLOT(expandVertical())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,TQ_SLOT(expandHorizontal())); m_pWindowPopup->insertSeparator(); - m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,TQT_SLOT(minimizeAll())); -// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,TQT_SLOT(restoreAll())); + m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,TQ_SLOT(minimizeAll())); +// m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,TQ_SLOT(restoreAll())); // m_pWindowPopup->insertSeparator(); int i=100; diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp index 0bf2c955..9507a5e7 100644 --- a/src/kvirc/ui/kvi_menubar.cpp +++ b/src/kvirc/ui/kvi_menubar.cpp @@ -51,7 +51,7 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name) m_pDefaultItemId = 0; KviTalPopupMenu * pop = new KviTalPopupMenu(this,"KVIrc"); - connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupMainPopup())); + connect(pop,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupMainPopup())); #ifndef Q_OS_MACX addDefaultItem("&KVIrc",pop); #else @@ -59,31 +59,31 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name) addDefaultItem("&IRC",pop); #endif //Q_OS_MACX m_pRecentServersPopup = new KviTalPopupMenu(this,"recentservers"); - connect(m_pRecentServersPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupRecentServersPopup())); - connect(m_pRecentServersPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(newConnectionToServer(int))); + connect(m_pRecentServersPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupRecentServersPopup())); + connect(m_pRecentServersPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(newConnectionToServer(int))); m_pScriptItemList = 0; pop = new KviTalPopupMenu(this,"scripting"); - connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupScriptingPopup())); + connect(pop,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupScriptingPopup())); addDefaultItem(__tr2qs("Scri&pting"),pop); pop = new KviTalPopupMenu(this,"tools"); - connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolsPopup())); - connect(pop,TQT_SIGNAL(activated(int)),this,TQT_SLOT(toolsPopupSelected(int))); + connect(pop,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupToolsPopup())); + connect(pop,TQ_SIGNAL(activated(int)),this,TQ_SLOT(toolsPopupSelected(int))); addDefaultItem(__tr2qs("&Tools"),pop); m_pToolbarsPopup = new KviTalPopupMenu(this,"toolbars"); - connect(m_pToolbarsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupToolbarsPopup())); + connect(m_pToolbarsPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupToolbarsPopup())); pop = new KviTalPopupMenu(this,"settings"); - connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupSettingsPopup())); + connect(pop,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupSettingsPopup())); addDefaultItem(__tr2qs("&Settings"),pop); addDefaultItem(__tr2qs("&Window"),par->mdiManager()->windowPopup()); pop = new KviTalPopupMenu(this,"help"); - connect(pop,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupHelpPopup())); + connect(pop,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupHelpPopup())); addDefaultItem(__tr2qs("&Help"),pop); } @@ -110,52 +110,52 @@ void KviMenuBar::setupHelpPopup() help->clear(); // FIXME: Convert these to actions! - int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + int id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HELP)),__tr2qs("&Help Browser (Panel)"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWSTATICWINDOW); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MDIHELP)),__tr2qs("Help Browser (&Window)"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_HELP_NEWMDIWINDOW); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IDEA)),__tr2qs("&Tip of the Day"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_TIP_OPEN); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("About &KVIrc"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Home&page"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE); if(kvi_strEqualCIN(KviLocale::localeName(),"ru",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc Russian Home&page"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_RU); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HOMEPAGE)),__tr2qs("KVIrc French Home&page"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_KVIRC_HOMEPAGE_FR); } help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE)),__tr2qs("Subscribe to the Mailing List"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_MAILINGLIST); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BOMB)),__tr2qs("Report a Bug / Propose Improvements"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_BUGTRACK); help->insertSeparator(); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on Freenode"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_FREENODE); - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc International Channel on IRCNet"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_ON_IRCNET); if(kvi_strEqualCIN(KviLocale::localeName(),"it",2)) { // join #kvirc.net on azzurra - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc Italian Channel on AzzurraNet"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_IT_ON_AZZURRA); } if(kvi_strEqualCIN(KviLocale::localeName(),"fr",2)) { // join #kvirc-fr on freenode - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on Freenode"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_FREENODE); // join #kvirc on europnet - id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = help->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)),__tr2qs("Join KVIrc French Channel on EuropNet"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); help->setItemParameter(id,KVI_INTERNALCOMMAND_OPENURL_KVIRC_FR_ON_EUROPNET); } // add your localized #kvirc channels here... @@ -170,7 +170,7 @@ void KviMenuBar::setupSettingsPopup() opt->insertItem(__tr2qs("Toolbars"),m_pToolbarsPopup); - int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,TQT_SLOT(toggleStatusBar())); + int id = opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_STATUSBAR)),__tr2qs("Show StatusBar"),m_pFrm,TQ_SLOT(toggleStatusBar())); opt->setItemChecked(id,m_pFrm->mainStatusBar()); @@ -185,7 +185,7 @@ void KviMenuBar::setupSettingsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EDITREGUSERS,opt) opt->insertSeparator(); - opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,TQT_SLOT(saveConfiguration())); + opt->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FLOPPY)),__tr2qs("&Save Configuration"),g_pApp,TQ_SLOT(saveConfiguration())); } void KviMenuBar::setupScriptingPopup() @@ -204,7 +204,7 @@ void KviMenuBar::setupScriptingPopup() ACTION_POPUP_ITEM(KVI_COREACTION_EXECUTEKVS,script) script->insertSeparator(); - script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,TQT_SLOT(restoreDefaultScript())); + script->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TEXTEXCLAMATIVE)),__tr2qs("Restore &Default Script"),g_pApp,TQ_SLOT(restoreDefaultScript())); } void KviMenuBar::setupMainPopup() @@ -216,7 +216,7 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->activeContext()) if(m_pFrm->activeContext()->state()==KviIrcContext::Connected) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs("Disconnect"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_QUIT); } main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs("New &Connection To"),m_pRecentServersPopup); @@ -225,10 +225,10 @@ void KviMenuBar::setupMainPopup() if(m_pFrm->dockExtension()) { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Hide &Dock Icon"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE); } else { - int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + int id = main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Show &Dock Icon"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); main->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_SHOW); } @@ -236,7 +236,7 @@ void KviMenuBar::setupMainPopup() #ifndef Q_OS_MACX main->insertSeparator(); - main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit())); + main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQ_SLOT(quit())); #endif //Q_OS_MACX } @@ -296,10 +296,10 @@ void KviMenuBar::setupToolsPopup() ACTION_POPUP_ITEM(KVI_COREACTION_SCREENSHOT,m) // moved the old tools here - m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQT_SLOT(showIconWidget())); + m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ICONMANAGER)),__tr2qs("Show &Icon Table"),g_pIconManager,TQ_SLOT(showIconWidget())); #ifdef COMPILE_TDE_SUPPORT int id; - id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),__tr2qs("Open &Terminal"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); m->setItemParameter(id,KVI_INTERNALCOMMAND_TERM_OPEN); #endif @@ -370,7 +370,7 @@ bool KviMenuBar::removeMenu(const TQString &text) KviScriptMenuBarItem * i = findMenu(text); if(i) { - disconnect(i->pPopup,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); + disconnect(i->pPopup,TQ_SIGNAL(destroyed()),this,TQ_SLOT(menuDestroyed())); removeItem(i->id); m_pScriptItemList->removeRef(i); return true; @@ -402,7 +402,7 @@ void KviMenuBar::addMenu(const TQString &text,KviKvsPopupMenu * p,int index) it->szPopupName = p->name(); it->pPopup = p; it->id = insertItem(text,p,-1,index); - connect(p,TQT_SIGNAL(destroyed()),this,TQT_SLOT(menuDestroyed())); + connect(p,TQ_SIGNAL(destroyed()),this,TQ_SLOT(menuDestroyed())); m_pScriptItemList->append(it); } diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp index 0c998975..257d4165 100644 --- a/src/kvirc/ui/kvi_modeeditor.cpp +++ b/src/kvirc/ui/kvi_modeeditor.cpp @@ -81,7 +81,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons else b = new TQPushButton(__tr2qs("Close"),this); pMasterLayout->addWidget(b,1,0); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(commit())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(commit())); TQWidget * pBackground = new TQWidget(pScrollView->viewport()); @@ -127,7 +127,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons m_pLimitBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pLimitBox,i,i,0,2); - connect(m_pLimitBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(limitBoxToggled(bool))); + connect(m_pLimitBox,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(limitBoxToggled(bool))); m_pLimitEdit = new TQLineEdit(pBackground); m_pLimitEdit->setEnabled(isEnabled); i++; @@ -146,7 +146,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons m_pKeyBox->setEnabled(isEnabled); i++; g->addMultiCellWidget(m_pKeyBox,i,i,0,2); - connect(m_pKeyBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(keyBoxToggled(bool))); + connect(m_pKeyBox,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(keyBoxToggled(bool))); m_pKeyEdit = new TQLineEdit(pBackground); m_pKeyEdit->setEnabled(isEnabled); i++; diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp index 9210530c..dfccd5bd 100644 --- a/src/kvirc/ui/kvi_modew.cpp +++ b/src/kvirc/ui/kvi_modew.cpp @@ -59,7 +59,7 @@ void KviModeWidget::reset() m_pLabel=new KviThemedLabel(this,0); refreshModes(); m_pLabel->show(); - connect(m_pLabel,TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(labelDoubleClick())); + connect(m_pLabel,TQ_SIGNAL(doubleClicked()),this,TQ_SLOT(labelDoubleClick())); TQResizeEvent* ev=new TQResizeEvent(size(),size()); resizeEvent(ev); delete ev; @@ -109,7 +109,7 @@ void KviModeWidget::labelDoubleClick() m_pLineEdit->setFocus(); resizeEvent(new TQResizeEvent(size(),size())); m_pLineEdit->installEventFilter( this ); - connect(m_pLineEdit,TQT_SIGNAL(textChanged ( const TQString & ) ),this,TQT_SLOT(editorTextChanged( const TQString & ))); + connect(m_pLineEdit,TQ_SIGNAL(textChanged ( const TQString & ) ),this,TQ_SLOT(editorTextChanged( const TQString & ))); } } diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp index e267e7b8..d1afa080 100644 --- a/src/kvirc/ui/kvi_optionswidget.cpp +++ b/src/kvirc/ui/kvi_optionswidget.cpp @@ -667,7 +667,7 @@ void KviOptionsWidget::addAdvancedButton(int x1,int y1,int x2,int y2) if(!w->inherits("KviGeneralOptionsDialog"))return; TQPushButton * b = new TQPushButton(__tr2qs("Advanced..."),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(switchToAdvancedPage())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(switchToAdvancedPage())); addWidgetToLayout(b,x1,y1,x2,y2); } diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp index 3387fedd..3b552557 100644 --- a/src/kvirc/ui/kvi_query.cpp +++ b/src/kvirc/ui/kvi_query.cpp @@ -87,12 +87,12 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) m_pSplitter = new TQSplitter(TQt::Horizontal,this,"main_splitter"); m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this); - connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); //m_pEditorsContainer= new KviToolWindowsContainer(m_pSplitter); m_pListViewButton = new KviWindowToolPageButton(KVI_SMALLICON_HIDELISTVIEW,KVI_SMALLICON_SHOWLISTVIEW,__tr2qs("Show User List"),buttonContainer(),true,"list_view_button"); - connect(m_pListViewButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleListView())); + connect(m_pListViewButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleListView())); #ifdef COMPILE_CRYPT_SUPPORT createCryptControllerButton(m_pButtonGrid); @@ -106,7 +106,7 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const TQString &nick) // FIXME: #warning "Maybe tell the user all that we know about the remote end(s)....channels..." m_pIrcView->enableDnd(TRUE); - connect(m_pIrcView,TQT_SIGNAL(fileDropped(const char *)),this,TQT_SLOT(slotDndEvents(const char *))); + connect(m_pIrcView,TQ_SIGNAL(fileDropped(const char *)),this,TQ_SLOT(slotDndEvents(const char *))); updateCaption(); } diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp index d26c7237..d0306393 100644 --- a/src/kvirc/ui/kvi_scriptbutton.cpp +++ b/src/kvirc/ui/kvi_scriptbutton.cpp @@ -35,7 +35,7 @@ KviScriptUserButton::KviScriptUserButton(TQWidget * par,const char * name) { m_pScript = 0; // setAutoRaise(true); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(btnClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(btnClicked())); setAutoRaise(true); } diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp index 4a9697f2..16558805 100644 --- a/src/kvirc/ui/kvi_selectors.cpp +++ b/src/kvirc/ui/kvi_selectors.cpp @@ -222,7 +222,7 @@ KviPixmapSelector::KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixm m_pCheckBox = new KviStyledCheckBox(txt,this); m_pCheckBox->setChecked(m_localPixmap.pixmap()); - connect(m_pCheckBox,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(checkBoxToggled(bool))); + connect(m_pCheckBox,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(checkBoxToggled(bool))); g->addMultiCellWidget(m_pCheckBox,0,0,0,1); m_pPreview = new KviPixmapPreview(this); @@ -236,7 +236,7 @@ KviPixmapSelector::KviPixmapSelector(TQWidget * par,const TQString & txt,KviPixm m_pChooseButton = new TQPushButton("...",this); g->addWidget(m_pChooseButton,2,1); - connect(m_pChooseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(choosePixmap())); + connect(m_pChooseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(choosePixmap())); g->setRowStretch(1,1); g->setColStretch(0,1); @@ -314,7 +314,7 @@ KviFileSelector::KviFileSelector(TQWidget * par,const TQString & txt,TQString * //m_pLineEdit->setMinimumWidth(200); m_pLineEdit->setText(*pOption); m_pButton = new TQPushButton(__tr2qs("&Browse..."),this); - connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browseClicked())); + connect(m_pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(browseClicked())); setSpacing(4); setStretchFactor(m_pLineEdit,1); @@ -399,17 +399,17 @@ KviStringListSelector::KviStringListSelector(TQWidget * par,const TQString & txt m_pLabel = new TQLabel(txt,this); m_pListBox = new KviTalListBox(this); m_pLineEdit = new TQLineEdit(this); - connect(m_pLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); - connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); + connect(m_pLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged(const TQString &))); + connect(m_pLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); + connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked())); m_pOption = pOption; m_pListBox->insertStringList(*pOption); m_pListBox->setSelectionMode(KviTalListBox::Extended); - connect(m_pListBox,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); + connect(m_pListBox,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListBox,1); setEnabled(bEnabled); @@ -499,7 +499,7 @@ KviColorSelector::KviColorSelector(TQWidget * par,const TQString & txt,TQColor * m_pButton = new TQPushButton(" ",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); + connect(m_pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -553,7 +553,7 @@ KviFontSelector::KviFontSelector(TQWidget * par,const TQString & txt,TQFont * pO m_pButton = new TQPushButton("",this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeClicked())); + connect(m_pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -601,7 +601,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(TQWidget * par,const TQString m_pButton = new TQPushButton(__tr2qs("Sample Text"),this); // m_pButton->setMinimumWidth(150); - connect(m_pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(buttonClicked())); + connect(m_pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(buttonClicked())); setSpacing(4); setStretchFactor(m_pLabel,1); @@ -619,7 +619,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(TQWidget * par,const TQString m_pContextPopup = new KviTalPopupMenu(this); m_pForePopup = new KviTalPopupMenu(this); - connect(m_pForePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(foreSelected(int))); + connect(m_pForePopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(foreSelected(int))); int i; for(i=0;i<KVI_MIRCCOLOR_MAX_FOREGROUND;i++) { @@ -631,7 +631,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(TQWidget * par,const TQString m_pContextPopup->insertItem(__tr2qs("Foreground"),m_pForePopup); m_pBackPopup = new KviTalPopupMenu(this); - connect(m_pBackPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(backSelected(int))); + connect(m_pBackPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(backSelected(int))); i = m_pBackPopup->insertItem(__tr2qs("Transparent")); m_pBackPopup->setItemParameter(i,KVI_TRANSPARENT); for(i=0;i<KVI_MIRCCOLOR_MAX_BACKGROUND;i++) @@ -705,7 +705,7 @@ KviSoundSelector::KviSoundSelector(TQWidget * par,const TQString & txt,TQString :KviFileSelector(par,txt,pOption,bEnabled) { m_pPlayButton = new TQPushButton(__tr2qs("Play"),this); - connect(m_pPlayButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(playSound())); + connect(m_pPlayButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(playSound())); } KviSoundSelector::~KviSoundSelector() @@ -743,20 +743,20 @@ KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & t KviTalHBox* pEditsHBox = new KviTalHBox(this); m_pChanLineEdit = new TQLineEdit(pEditsHBox); - connect(m_pChanLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); - connect(m_pChanLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); + connect(m_pChanLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged(const TQString &))); + connect(m_pChanLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addClicked())); m_pPassLineEdit = new TQLineEdit(pEditsHBox); m_pPassLineEdit->setEchoMode(TQLineEdit::Password); - connect(m_pPassLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(textChanged(const TQString &))); - connect(m_pPassLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addClicked())); + connect(m_pPassLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(textChanged(const TQString &))); + connect(m_pPassLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addClicked())); KviTalHBox * hBox = new KviTalHBox(this); m_pAddButton = new TQPushButton(__tr2qs("A&dd"),hBox); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),hBox); - connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); + connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked())); m_pOption = pOption; for ( TQStringList::Iterator it = pOption->begin(); it != pOption->end(); ++it ) { @@ -765,7 +765,7 @@ KviCahnnelListSelector::KviCahnnelListSelector(TQWidget * par,const TQString & t m_pListView->setSelectionMode(KviTalListView::Extended); m_pListView->setAllColumnsShowFocus(TRUE); - connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); + connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); setSpacing(4); setStretchFactor(m_pListView,1); setEnabled(bEnabled); diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp index 7fac1579..e9e8b8c5 100644 --- a/src/kvirc/ui/kvi_splash.cpp +++ b/src/kvirc/ui/kvi_splash.cpp @@ -101,7 +101,7 @@ KviSplashScreen::KviSplashScreen() setPixmap(*pix); m_pTimer = new TQTimer(this); - connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(suicide())); + connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(suicide())); delete pix; } diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp index 6570a52a..2ec878b6 100644 --- a/src/kvirc/ui/kvi_statusbar.cpp +++ b/src/kvirc/ui/kvi_statusbar.cpp @@ -108,16 +108,16 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame) m_iLastMinimumHeight = 0; m_bStopLayoutOnAddRemove = true; - connect(m_pFrame,TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(setPermanentMessage())); - connect(m_pFrame,TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(setPermanentMessage())); - connect(m_pFrame,TQT_SIGNAL(activeConnectionUserModeChanged()),this,TQT_SLOT(setPermanentMessage())); - connect(m_pFrame,TQT_SIGNAL(activeConnectionNickNameChanged()),this,TQT_SLOT(setPermanentMessage())); + connect(m_pFrame,TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(setPermanentMessage())); + connect(m_pFrame,TQ_SIGNAL(activeContextStateChanged()),this,TQ_SLOT(setPermanentMessage())); + connect(m_pFrame,TQ_SIGNAL(activeConnectionUserModeChanged()),this,TQ_SLOT(setPermanentMessage())); + connect(m_pFrame,TQ_SIGNAL(activeConnectionNickNameChanged()),this,TQ_SLOT(setPermanentMessage())); setPermanentMessage(); m_bStopLayoutOnAddRemove = false; m_pToolTip = new KviDynamicToolTip(this); - connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(m_pToolTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); updateLayout(); } @@ -315,7 +315,7 @@ KviTalPopupMenu * KviStatusBar::contextPopup() if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(contextPopupAboutToShow())); } m_pClickedApplet = appletAt(TQCursor::pos()); return m_pContextPopup; @@ -342,14 +342,14 @@ void KviStatusBar::contextPopupAboutToShow() KviTQString::sprintf(tmp,__tr2qs("Remove %Q"),&app); m_pContextPopup->insertSeparator(); - m_pContextPopup->insertItem(tmp,this,TQT_SLOT(removeClickedApplet())); + m_pContextPopup->insertItem(tmp,this,TQ_SLOT(removeClickedApplet())); } if(!m_pAppletsPopup) { m_pAppletsPopup = new KviTalPopupMenu(this); - connect(m_pAppletsPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(appletsPopupAboutToShow())); - connect(m_pAppletsPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(appletsPopupActivated(int))); + connect(m_pAppletsPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(appletsPopupAboutToShow())); + connect(m_pAppletsPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(appletsPopupActivated(int))); } m_pContextPopup->insertItem(__tr2qs("Add Applet"),m_pAppletsPopup); @@ -572,7 +572,7 @@ void KviStatusBar::showFirstMessageInQueue() if(!m_pMessageTimer) { m_pMessageTimer = new TQTimer(this); - TQObject::connect(m_pMessageTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(messageTimerFired())); + TQObject::connect(m_pMessageTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(messageTimerFired())); } else { m_pMessageTimer->stop(); } diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp index 2f4413b9..3a23bd34 100644 --- a/src/kvirc/ui/kvi_statusbarapplet.cpp +++ b/src/kvirc/ui/kvi_statusbarapplet.cpp @@ -155,9 +155,9 @@ KviStatusBarAwayIndicator::KviStatusBarAwayIndicator(KviStatusBar * pParent,KviS : KviStatusBarApplet(pParent,pDescriptor) { m_bAwayOnAllContexts = false; - connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); - connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); - connect(pParent->frame(),TQT_SIGNAL(activeConnectionAwayStateChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeContextStateChanged()),this,TQ_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeConnectionAwayStateChanged()),this,TQ_SLOT(updateDisplay())); updateDisplay(); @@ -191,7 +191,7 @@ void KviStatusBarAwayIndicator::toggleContext() void KviStatusBarAwayIndicator::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,TQT_SLOT(toggleContext())); + int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,TQ_SLOT(toggleContext())); p->setItemChecked(id,m_bAwayOnAllContexts); } @@ -266,9 +266,9 @@ not_connected: KviStatusBarLagIndicator::KviStatusBarLagIndicator(KviStatusBar * pParent,KviStatusBarAppletDescriptor *pDescriptor) : KviStatusBarApplet(pParent,pDescriptor) { - connect(pParent->frame(),TQT_SIGNAL(activeContextChanged()),this,TQT_SLOT(updateDisplay())); - connect(pParent->frame(),TQT_SIGNAL(activeContextStateChanged()),this,TQT_SLOT(updateDisplay())); - connect(pParent->frame(),TQT_SIGNAL(activeConnectionLagChanged()),this,TQT_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeContextChanged()),this,TQ_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeContextStateChanged()),this,TQ_SLOT(updateDisplay())); + connect(pParent->frame(),TQ_SIGNAL(activeConnectionLagChanged()),this,TQ_SLOT(updateDisplay())); updateDisplay(); @@ -419,7 +419,7 @@ void KviStatusBarClock::timerEvent(TQTimerEvent *) void KviStatusBarClock::fillContextPopup(KviTalPopupMenu * p) { - int id = p->insertItem("UTC",this,TQT_SLOT(toggleUtc())); + int id = p->insertItem("UTC",this,TQ_SLOT(toggleUtc())); p->setItemChecked(id,m_bUtc); } @@ -500,7 +500,7 @@ void KviStatusBarConnectionTimer::toggleTotal() void KviStatusBarConnectionTimer::fillContextPopup(KviTalPopupMenu *p) { - int id = p->insertItem(__tr2qs("Show total connection time"),this,TQT_SLOT(toggleTotal())); + int id = p->insertItem(__tr2qs("Show total connection time"),this,TQ_SLOT(toggleTotal())); p->setItemChecked(id,m_bTotal); } diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp index c8299c64..3a9de7d4 100644 --- a/src/kvirc/ui/kvi_styled_controls.cpp +++ b/src/kvirc/ui/kvi_styled_controls.cpp @@ -111,7 +111,7 @@ void KviStyledControl::enterEvent ( TQEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQ_SIGNAL(timeout()), m_pInternal, TQ_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } @@ -130,7 +130,7 @@ void KviStyledControl::leaveEvent ( TQEvent * ) { if(!m_pTimer->isActive()) { - m_pTimer->connect( m_pTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(paintTimerShot()) ); + m_pTimer->connect( m_pTimer, TQ_SIGNAL(timeout()), m_pInternal, TQ_SLOT(paintTimerShot()) ); m_pTimer->start(KVI_STYLE_TIMER_STEP); } } diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp index 604868b7..a0a73e7d 100644 --- a/src/kvirc/ui/kvi_taskbar.cpp +++ b/src/kvirc/ui/kvi_taskbar.cpp @@ -77,7 +77,7 @@ KviTaskBarBase::KviTaskBarBase() { // FIXME: this timer should be started only if KVI_OPTION_BOOL(KviOption_boolUseTaskBarActivityMeter) m_pActivityMeterTimer = new TQTimer(); - connect(m_pActivityMeterTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateActivityMeter())); + connect(m_pActivityMeterTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateActivityMeter())); m_pActivityMeterTimer->start(5000); } @@ -184,7 +184,7 @@ KviTaskBarButton::KviTaskBarButton(TQWidget * par,KviWindow * wnd,const char * n { m_bActive = false; m_pTip = new KviDynamicToolTip(this); - connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(m_pTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); // setBackgroundMode(TQWidget::NoBackground); setToggleButton (true); setFlat ( KVI_OPTION_BOOL(KviOption_boolUseFlatClassicTaskbarButtons) ); @@ -457,7 +457,7 @@ KviClassicTaskBar::KviClassicTaskBar() setMinimumHeight(m_iButtonHeight+5); setResizeEnabled( true ); - connect(this,TQT_SIGNAL(orientationChanged(TQt::Orientation)),this,TQT_SLOT(orientationChangedSlot(TQt::Orientation))); + connect(this,TQ_SIGNAL(orientationChanged(TQt::Orientation)),this,TQ_SLOT(orientationChangedSlot(TQt::Orientation))); } KviClassicTaskBar::~KviClassicTaskBar() @@ -714,7 +714,7 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTalListView * par,KviWindow * wnd) m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); m_pAnimTimer=new TQTimer(); - TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); + TQObject::connect( m_pAnimTimer, TQ_SIGNAL(timeout()), m_pInternal, TQ_SLOT(timerShot())); applyOptions(); } @@ -725,7 +725,7 @@ KviTreeTaskBarItem::KviTreeTaskBarItem(KviTreeTaskBarItem * par,KviWindow * wnd) m_bIncreasing=0; m_pInternal=new KviTreeTaskBarItemInternal(this); m_pAnimTimer=new TQTimer(); - TQObject::connect( m_pAnimTimer, TQT_SIGNAL(timeout()), m_pInternal, TQT_SLOT(timerShot())); + TQObject::connect( m_pAnimTimer, TQ_SIGNAL(timeout()), m_pInternal, TQ_SLOT(timerShot())); applyOptions(); } @@ -1074,8 +1074,8 @@ void KviTreeTaskBarListView::contentsMousePressEvent(TQMouseEvent *e) if(e->button() & TQt::RightButton) { KviTalPopupMenu* pPopup=new KviTalPopupMenu(); - pPopup->insertItem(__tr2qs("Sort"),this,TQT_SLOT(sort())); - pPopup->insertItem(__tr2qs("Reverse Sort"),this,TQT_SLOT(reverseSort())); + pPopup->insertItem(__tr2qs("Sort"),this,TQ_SLOT(sort())); + pPopup->insertItem(__tr2qs("Reverse Sort"),this,TQ_SLOT(reverseSort())); pPopup->popup(TQCursor::pos()); } } @@ -1175,7 +1175,7 @@ KviTreeTaskBar::KviTreeTaskBar() setResizeEnabled(true); m_pToolTip = new KviDynamicToolTip(m_pListView->viewport(),"tree_taskbar_tooltip"); - connect(m_pToolTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(m_pToolTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); } KviTreeTaskBar::~KviTreeTaskBar() diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp index ca0ee909..e4f6fb5e 100644 --- a/src/kvirc/ui/kvi_texticonwin.cpp +++ b/src/kvirc/ui/kvi_texticonwin.cpp @@ -45,9 +45,9 @@ KviTextIconWindow::KviTextIconWindow() setFixedSize(KVI_TEXTICON_WIN_WIDTH,KVI_TEXTICON_WIN_HEIGHT); m_pOwner = 0; fill(); - connect(g_pTextIconManager,TQT_SIGNAL(changed()),this,TQT_SLOT(fill())); - connect(this,TQT_SIGNAL(doubleClicked( KviTalIconViewItem * )),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); - connect(this,TQT_SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,TQT_SLOT(itemSelected(KviTalIconViewItem *))); + connect(g_pTextIconManager,TQ_SIGNAL(changed()),this,TQ_SLOT(fill())); + connect(this,TQ_SIGNAL(doubleClicked( KviTalIconViewItem * )),this,TQ_SLOT(itemSelected(KviTalIconViewItem *))); + connect(this,TQ_SIGNAL(returnPressed ( KviTalIconViewItem * ) ),this,TQ_SLOT(itemSelected(KviTalIconViewItem *))); m_bAltMode = false; setWordWrapIconText(true); } @@ -80,11 +80,11 @@ void KviTextIconWindow::fill() void KviTextIconWindow::popup(TQWidget *owner,bool bAltMode) { - if(m_pOwner)disconnect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); + if(m_pOwner)disconnect(m_pOwner,TQ_SIGNAL(destroyed()),this,TQ_SLOT(ownerDead())); m_pOwner = owner; m_szTypedSeq = ""; m_bAltMode = bAltMode; - connect(m_pOwner,TQT_SIGNAL(destroyed()),this,TQT_SLOT(ownerDead())); + connect(m_pOwner,TQ_SIGNAL(destroyed()),this,TQ_SLOT(ownerDead())); show(); } diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp index f37c0f63..331dc0db 100644 --- a/src/kvirc/ui/kvi_toolbar.cpp +++ b/src/kvirc/ui/kvi_toolbar.cpp @@ -80,18 +80,18 @@ void KviToolBar::mousePressEvent(TQMouseEvent *e) g_pToolBarContextPopup->insertItem(__tr2qs("Orientation"),g_pToolBarPositionsPopup); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,TQT_SLOT(moveToTop())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,TQT_SLOT(moveToLeft())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,TQT_SLOT(moveToRight())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,TQT_SLOT(moveToBottom())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Top"),this,TQ_SLOT(moveToTop())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Left"),this,TQ_SLOT(moveToLeft())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Right"),this,TQ_SLOT(moveToRight())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Bottom"),this,TQ_SLOT(moveToBottom())); g_pToolBarPositionsPopup->insertSeparator(); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,TQT_SLOT(moveToTornOff())); - g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,TQT_SLOT(moveToMinimized())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Detached"),this,TQ_SLOT(moveToTornOff())); + g_pToolBarPositionsPopup->insertItem(__tr2qs("Flat"),this,TQ_SLOT(moveToMinimized())); g_pToolBarContextPopup->insertItem(__tr2qs("Icon Size"),g_pToolBarIconSizesPopup); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,TQT_SLOT(setSmallIcons())); - g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,TQT_SLOT(setBigIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Small (22x22)"),this,TQ_SLOT(setSmallIcons())); + g_pToolBarIconSizesPopup->insertItem(__tr2qs("Large (32x32)"),this,TQ_SLOT(setBigIcons())); g_pToolBarContextPopup->popup(TQCursor::pos()); } diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp index 54e4572d..61f13e7c 100644 --- a/src/kvirc/ui/kvi_topicw.cpp +++ b/src/kvirc/ui/kvi_topicw.cpp @@ -98,7 +98,7 @@ KviTopicWidget::KviTopicWidget(TQWidget * par,const char * name) // m_pCompletionBox->setHScrollBarMode( KviTalListBox::AlwaysOff ); m_pCompletionBox->setFrameStyle( TQFrame::Box | TQFrame::Plain ); m_pCompletionBox->setLineWidth( 1 ); - connect(m_pCompletionBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(complete(int))); + connect(m_pCompletionBox,TQ_SIGNAL(selected(int)),this,TQ_SLOT(complete(int))); m_pCompletionBox->hide(); } @@ -561,8 +561,8 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) m_pInput->setMaxBufferSize(maxlen); m_pInput->setGeometry(0,0,width() - (height() << 2)+height(),height()); m_pInput->setText(m_szTopic); - connect(m_pInput,TQT_SIGNAL(enterPressed()),this,TQT_SLOT(acceptClicked())); - connect(m_pInput,TQT_SIGNAL(escapePressed()),this,TQT_SLOT(discardClicked())); + connect(m_pInput,TQ_SIGNAL(enterPressed()),this,TQ_SLOT(acceptClicked())); + connect(m_pInput,TQ_SIGNAL(escapePressed()),this,TQ_SLOT(discardClicked())); m_pInput->installEventFilter(this); m_pHistory = new TQPushButton(this); @@ -570,7 +570,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height()); KviTalToolTip::add(m_pHistory,__tr2qs("History")); m_pHistory->show(); - connect(m_pHistory,TQT_SIGNAL(clicked()),this,TQT_SLOT(historyClicked())); + connect(m_pHistory,TQ_SIGNAL(clicked()),this,TQ_SLOT(historyClicked())); m_pAccept = new TQPushButton(this); m_pAccept->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); @@ -578,14 +578,14 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *) m_pAccept->setEnabled(bCanEdit); m_pAccept->show(); KviTalToolTip::add(m_pAccept,__tr2qs("Commit Changes")); - connect(m_pAccept,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked())); + connect(m_pAccept,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptClicked())); m_pDiscard = new TQPushButton(this); m_pDiscard->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); m_pDiscard->setGeometry(width() - height(),0,height(),height()); KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes")); m_pDiscard->show(); - connect(m_pDiscard,TQT_SIGNAL(clicked()),this,TQT_SLOT(discardClicked())); + connect(m_pDiscard,TQ_SIGNAL(clicked()),this,TQ_SLOT(discardClicked())); m_pInput->show(); m_pInput->setFocus(); @@ -599,7 +599,7 @@ void KviTopicWidget::mousePressEvent(TQMouseEvent * e) if(!m_pContextPopup) { m_pContextPopup = new KviTalPopupMenu(this); - connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(contextPopupAboutToShow())); + connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(contextPopupAboutToShow())); } m_pContextPopup->popup(mapToGlobal(e->pos())); } @@ -608,7 +608,7 @@ void KviTopicWidget::contextPopupAboutToShow() { if(!m_pContextPopup)return; // hm ? m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,TQT_SLOT(copy())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs("Copy to clipboard"),this,TQ_SLOT(copy())); } void KviTopicWidget::copy() diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp index 7c848527..7fb4b491 100644 --- a/src/kvirc/ui/kvi_userlistview.cpp +++ b/src/kvirc/ui/kvi_userlistview.cpp @@ -1313,7 +1313,7 @@ KviUserListViewArea::KviUserListViewArea(KviUserListView * par) m_pScrollBar = new TQScrollBar(TQt::Vertical,this,"scrollbar"); m_pScrollBar->setRange(0,0); m_pScrollBar->setValue(0); - connect(m_pScrollBar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(scrollBarMoved(int))); + connect(m_pScrollBar,TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(scrollBarMoved(int))); m_pScrollBar->setPageStep(height()); m_pScrollBar->setLineStep(m_pListView->m_iFontHeight); m_iLastScrollBarVal = 0; diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp index d17f8559..29ec742c 100644 --- a/src/kvirc/ui/kvi_window.cpp +++ b/src/kvirc/ui/kvi_window.cpp @@ -142,7 +142,7 @@ KviWindow::KviWindow(int type,KviFrame * lpFrm,const TQString &name,KviConsole * setBackgroundMode(NoBackground); setFocusPolicy(TQWidget::StrongFocus); - connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); + connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages())); } KviWindow::~KviWindow() @@ -431,7 +431,7 @@ void KviWindow::createCryptControllerButton(TQWidget * par) { #ifdef COMPILE_CRYPT_SUPPORT m_pCryptControllerButton = new KviWindowToolPageButton(KVI_SMALLICON_UNLOCKEDOFF,KVI_SMALLICON_UNLOCKED,__tr2qs("Crypting"),buttonContainer(),false,"crypt_controller_button"); - connect(m_pCryptControllerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleCryptController())); + connect(m_pCryptControllerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(toggleCryptController())); #endif // COMPILE_CRYPT_SUPPORT } @@ -439,7 +439,7 @@ void KviWindow::createTextEncodingButton(TQWidget * par) { if(m_pTextEncodingButton)delete m_pTextEncodingButton; m_pTextEncodingButton = createToolButton(par,"text_encoding_button",KVI_SMALLICON_TEXTENCODING,KVI_SMALLICON_TEXTENCODING,__tr2qs("Private Text Encoding"),false); - connect(m_pTextEncodingButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(textEncodingButtonClicked())); + connect(m_pTextEncodingButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(textEncodingButtonClicked())); } void KviWindow::textEncodingButtonClicked() @@ -482,7 +482,7 @@ void KviWindow::toggleCryptController() if(m_pSplitter && m_pInput) { m_pCryptController = new KviCryptController(m_pSplitter,m_pCryptControllerButton,"crypt_controller",this,m_pCryptSessionInfo); - connect(m_pCryptController,TQT_SIGNAL(done()),this,TQT_SLOT(cryptControllerFinished())); + connect(m_pCryptController,TQ_SIGNAL(done()),this,TQ_SLOT(cryptControllerFinished())); //setFocusHandlerNoClass(m_pInput,m_pCryptController,"TQLineEdit"); //link it! m_pCryptController->show(); if(!m_pCryptControllerButton) @@ -502,7 +502,7 @@ void KviWindow::setCryptSessionInfo(KviCryptSessionInfo * inf) m_pCryptSessionInfo = inf; if(m_pCryptSessionInfo) { - connect(m_pCryptSessionInfo->pEngine,TQT_SIGNAL(destroyed()),this,TQT_SLOT(cryptSessionInfoDestroyed())); + connect(m_pCryptSessionInfo->pEngine,TQ_SIGNAL(destroyed()),this,TQ_SLOT(cryptSessionInfoDestroyed())); } if(m_pCryptControllerButton) { @@ -703,7 +703,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupStandard->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupStandard,TQ_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmart) @@ -711,7 +711,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmart->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmart,TQ_SIGNAL(activated(int)),0,0); } if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8) @@ -719,7 +719,7 @@ void KviWindow::createSystemTextEncodingPopup() else { g_pMdiWindowSystemTextEncodingPopupSmartUtf8->clear(); - disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),0,0); + disconnect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQ_SIGNAL(activated(int)),0,0); } TQTextCodec * c = defaultTextCodec(); @@ -731,7 +731,7 @@ void KviWindow::createSystemTextEncodingPopup() tmp += ")"; } - int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,TQT_SLOT(systemTextEncodingPopupDefault())); + int id = g_pMdiWindowSystemTextEncodingPopup->insertItem(tmp,this,TQ_SLOT(systemTextEncodingPopupDefault())); if(m_szTextEncoding.isEmpty())g_pMdiWindowSystemTextEncodingPopup->setItemChecked(id,true); g_pMdiWindowSystemTextEncodingPopup->insertSeparator(); @@ -752,9 +752,9 @@ void KviWindow::createSystemTextEncodingPopup() d = KviLocale::encodingDescription(i); } - connect(g_pMdiWindowSystemTextEncodingPopupSmart,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartActivated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); - connect(g_pMdiWindowSystemTextEncodingPopupStandard,TQT_SIGNAL(activated(int)),this,TQT_SLOT(systemTextEncodingPopupStandardActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmart,TQ_SIGNAL(activated(int)),this,TQ_SLOT(systemTextEncodingPopupSmartActivated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupSmartUtf8,TQ_SIGNAL(activated(int)),this,TQ_SLOT(systemTextEncodingPopupSmartUtf8Activated(int))); + connect(g_pMdiWindowSystemTextEncodingPopupStandard,TQ_SIGNAL(activated(int)),this,TQ_SLOT(systemTextEncodingPopupStandardActivated(int))); } @@ -770,27 +770,27 @@ void KviWindow::systemPopupRequest(const TQPoint &pnt) if(mdiParent()) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_UNDOCK)), - __tr2qs("&Undock"),this,TQT_SLOT(undock())); + __tr2qs("&Undock"),this,TQ_SLOT(undock())); else g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCK)), - __tr2qs("&Dock"),this,TQT_SLOT(dock())); + __tr2qs("&Dock"),this,TQ_SLOT(dock())); g_pMdiWindowSystemMainPopup->insertSeparator(); int id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)), - __tr2qs("Mi&nimize"),this,TQT_SLOT(minimize())); + __tr2qs("Mi&nimize"),this,TQ_SLOT(minimize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMinimized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)), - __tr2qs("Ma&ximize"),this,TQT_SLOT(maximize())); + __tr2qs("Ma&ximize"),this,TQ_SLOT(maximize())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,!isMaximized()); id = g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)), - __tr2qs("&Restore"),this,TQT_SLOT(restore())); + __tr2qs("&Restore"),this,TQ_SLOT(restore())); g_pMdiWindowSystemMainPopup->setItemEnabled(id,isMinimized()||isMaximized()); g_pMdiWindowSystemMainPopup->insertSeparator(); g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)), - __tr2qs("Close"),this,TQT_SLOT(close())); + __tr2qs("Close"),this,TQ_SLOT(close())); g_pMdiWindowSystemMainPopup->insertSeparator(); @@ -802,7 +802,7 @@ void KviWindow::systemPopupRequest(const TQPoint &pnt) g_pMdiWindowSystemMainPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_XY)), - __tr2qs("Sa&ve Window Properties"),this,TQT_SLOT(savePropertiesAsDefault())); + __tr2qs("Sa&ve Window Properties"),this,TQ_SLOT(savePropertiesAsDefault())); fillContextPopup(g_pMdiWindowSystemMainPopup); @@ -878,7 +878,7 @@ void KviWindow::dock() void KviWindow::delayedAutoRaise() { - TQTimer::singleShot(0,this,TQT_SLOT(autoRaise())); + TQTimer::singleShot(0,this,TQ_SLOT(autoRaise())); } void KviWindow::autoRaise() @@ -896,7 +896,7 @@ void KviWindow::autoRaise() void KviWindow::delayedClose() { - TQTimer::singleShot(0,this,TQT_SLOT(close())); + TQTimer::singleShot(0,this,TQ_SLOT(close())); } void KviWindow::closeEvent(TQCloseEvent *e) @@ -924,7 +924,7 @@ void KviWindow::youAreDocked() } ((KviMdiChild *)parent())->setIcon(*myIconPtr()); updateCaption(); - connect(((KviMdiChild *)parent()),TQT_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQT_SLOT(systemPopupRequest(const TQPoint &))); + connect(((KviMdiChild *)parent()),TQ_SIGNAL(systemPopupRequest(const TQPoint &)),this,TQ_SLOT(systemPopupRequest(const TQPoint &))); } void KviWindow::youAreUndocked() @@ -1060,7 +1060,7 @@ void KviWindow::childInserted(TQWidget * o) { o->removeEventFilter(this); // ensure that we don't filter twice o->installEventFilter(this); // we filter its events - connect(o,TQT_SIGNAL(destroyed()),this,TQT_SLOT(childDestroyed())); + connect(o,TQ_SIGNAL(destroyed()),this,TQ_SLOT(childDestroyed())); if(o->inherits("KviInput")) m_pFocusHandler = o; diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index 52651e26..540a7fb3 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -144,7 +144,7 @@ KviAboutDialog::KviAboutDialog() addTab(w,__tr2qs_ctx("License","about")); - connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(closeButtonPressed())); + connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(closeButtonPressed())); } KviAboutDialog::~KviAboutDialog() diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index c0b0e7bc..608a90e5 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -185,7 +185,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed gl->addWidget(m_pSmallIconEdit,2,1); m_pSmallIconButton = new TQToolButton(tab); m_pSmallIconButton->setMinimumSize(TQSize(20,20)); - connect(m_pSmallIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseSmallIcon())); + connect(m_pSmallIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseSmallIcon())); gl->addWidget(m_pSmallIconButton,2,2); TQString s= __tr2qs("The small icon associated to this action.<br>" \ "It will appear at least in the popup menus when this action is inserted.<br>" \ @@ -200,7 +200,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed m_pBigIconButton = new TQToolButton(tab); m_pBigIconButton->setMinimumSize(TQSize(48,48)); m_pBigIconButton->setUsesBigPixmap(true); - connect(m_pBigIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseBigIcon())); + connect(m_pBigIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseBigIcon())); gl->addMultiCellWidget(m_pBigIconButton,3,4,2,3); s = __tr2qs("The big icon associated to this action.<br>" \ "It will appear at least in the toolbar buttons when this action is inserted.<br>" \ @@ -234,7 +234,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed m_pNeedsContextCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Context"),tab); - connect(m_pNeedsContextCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(needsContextCheckToggled(bool))); + connect(m_pNeedsContextCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(needsContextCheckToggled(bool))); TQToolTip::add(m_pNeedsContextCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window belongs to an irc context")); gl->addMultiCellWidget(m_pNeedsContextCheck,0,0,0,3); @@ -244,7 +244,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed gl->addWidget(l,1,0); m_pNeedsConnectionCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Connection"),tab); - connect(m_pNeedsConnectionCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(needsConnectionCheckToggled(bool))); + connect(m_pNeedsConnectionCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(needsConnectionCheckToggled(bool))); TQToolTip::add(m_pNeedsConnectionCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window has an active IRC connection")); gl->addMultiCellWidget(m_pNeedsConnectionCheck,1,1,1,3); @@ -259,7 +259,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed gl->addMultiCellWidget(m_pEnableAtLoginCheck,2,2,2,3); m_pSpecificWindowsCheck = new KviStyledCheckBox(__tr2qs("Enable Only in Specified Windows"),tab); - connect(m_pSpecificWindowsCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(specificWindowsCheckToggled(bool))); + connect(m_pSpecificWindowsCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(specificWindowsCheckToggled(bool))); TQToolTip::add(m_pSpecificWindowsCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window is of a specified type")); gl->addMultiCellWidget(m_pSpecificWindowsCheck,3,3,0,3); @@ -267,7 +267,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed m_pWindowConsoleCheck = new KviStyledCheckBox(__tr2qs("Enable in Console Windows"),tab); TQToolTip::add(m_pWindowConsoleCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window is a console")); - connect(m_pWindowConsoleCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); + connect(m_pWindowConsoleCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); gl->addMultiCellWidget(m_pWindowConsoleCheck,4,4,1,3); m_pConsoleOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab); @@ -278,7 +278,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed m_pWindowChannelCheck = new KviStyledCheckBox(__tr2qs("Enable in Channel Windows"),tab); TQToolTip::add(m_pWindowChannelCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window is a channel")); - connect(m_pWindowChannelCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); + connect(m_pWindowChannelCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); gl->addMultiCellWidget(m_pWindowChannelCheck,6,6,1,3); m_pChannelOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab); @@ -289,7 +289,7 @@ KviSingleActionEditor::KviSingleActionEditor(TQWidget * par,KviActionEditor * ed m_pWindowQueryCheck = new KviStyledCheckBox(__tr2qs("Enable in Query Windows"),tab); TQToolTip::add(m_pWindowQueryCheck,__tr2qs("Check this option if this action should be enabled only when " \ "the active window is a query")); - connect(m_pWindowQueryCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); + connect(m_pWindowQueryCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(channelQueryOrConsoleWindowCheckToggled(bool))); gl->addMultiCellWidget(m_pWindowQueryCheck,8,8,1,3); m_pQueryOnlyIfUsersSelectedCheck = new KviStyledCheckBox(__tr2qs("Only If There Are Selected Users"),tab); @@ -660,17 +660,17 @@ KviActionEditor::KviActionEditor(TQWidget * par) //m_pListView->setMultiSelection(false); m_pListView->setShowSortIndicator(true); m_pListView->setFocusPolicy(TQWidget::StrongFocus); - connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentChanged(KviTalListViewItem *))); m_pNewActionButton = new TQPushButton(__tr2qs("New Action"),box); - connect(m_pNewActionButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newAction())); + connect(m_pNewActionButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newAction())); m_pDeleteActionsButton = new TQPushButton(__tr2qs("Delete Actions"),box); - connect(m_pDeleteActionsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteActions())); + connect(m_pDeleteActionsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteActions())); m_pExportActionsButton = new TQPushButton(__tr2qs("Export Actions..."),box); - connect(m_pExportActionsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportActions())); + connect(m_pExportActionsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportActions())); box->setSpacing(1); @@ -917,19 +917,19 @@ KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm) TQPushButton * btn = new TQPushButton(__tr2qs("OK"),m_pBase); btn->setMinimumWidth(80); - 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); btn->setMinimumWidth(80); - 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); btn->setMinimumWidth(80); - 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); diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp index f89d9bfe..a19022a2 100644 --- a/src/modules/addon/managementdialog.cpp +++ b/src/modules/addon/managementdialog.cpp @@ -188,17 +188,17 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p) g->addMultiCellWidget(m_pListView,0,10,1,1); m_pConfigureButton = new TQPushButton(__tr2qs("Configure"),this); - connect(m_pConfigureButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(configureScript())); + connect(m_pConfigureButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(configureScript())); g->addWidget(m_pConfigureButton,0,2); m_pHelpButton = new TQPushButton(__tr2qs("Show Help"),this); - connect(m_pHelpButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showScriptHelp())); + connect(m_pHelpButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showScriptHelp())); g->addWidget(m_pHelpButton,1,2); g->addRowSpacing(2,40); m_pUninstallButton = new TQPushButton(__tr2qs("Uninstall"),this); - connect(m_pUninstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(uninstallScript())); + connect(m_pUninstallButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(uninstallScript())); g->addWidget(m_pUninstallButton,3,2); g->addRowSpacing(4,15); @@ -210,15 +210,15 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p) g->addRowSpacing(6,15); m_pInstallButton = new TQPushButton(__tr2qs("Install Addon..."),this); - connect(m_pInstallButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(installScript())); + connect(m_pInstallButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(installScript())); g->addWidget(m_pInstallButton,7,2); m_pGetScriptsButton = new TQPushButton(__tr2qs("More Addons..."),this); - connect(m_pGetScriptsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreScripts())); + connect(m_pGetScriptsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(getMoreScripts())); g->addWidget(m_pGetScriptsButton,8,2); TQPushButton * 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,10,2); g->setRowStretch(9,1); @@ -227,7 +227,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(TQWidget * p) fillListView(); currentChanged(0); - connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentChanged(KviTalListViewItem *))); //currentToolBarChanged(); if(g_rectManagementDialogGeometry.y() < 5) diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp index e609fef9..8ebd9f22 100644 --- a/src/modules/aliaseditor/aliaseditor.cpp +++ b/src/modules/aliaseditor/aliaseditor.cpp @@ -226,13 +226,13 @@ KviAliasEditor::KviAliasEditor(TQWidget * par) m_pNameLabel = new TQLabel(__tr2qs("No item selected"),hbox); m_pRenameButton = new TQPushButton(__tr2qs("Rename"),hbox); m_pRenameButton->setEnabled(false); - connect(m_pRenameButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameItem())); + connect(m_pRenameButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameItem())); hbox->setStretchFactor(m_pNameLabel,2); TQToolTip::add(m_pRenameButton,__tr2qs("Edit the alias or namespace name")); m_pEditor = KviScriptEditor::createInstance(box); m_pEditor->setFocus(); - connect(m_pEditor,TQT_SIGNAL(find(const TQString &)),this,TQT_SLOT(slotFindWord(const TQString &))); - connect(m_pEditor,TQT_SIGNAL(replaceAll(const TQString &,const TQString &)),this,TQT_SLOT(slotReplaceAll(const TQString &,const TQString &))); + connect(m_pEditor,TQ_SIGNAL(find(const TQString &)),this,TQ_SLOT(slotFindWord(const TQString &))); + connect(m_pEditor,TQ_SIGNAL(replaceAll(const TQString &,const TQString &)),this,TQ_SLOT(slotReplaceAll(const TQString &,const TQString &))); m_pContextPopup = new KviTalPopupMenu(this); @@ -380,9 +380,9 @@ void KviAliasEditor::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))); } bool KviAliasEditor::hasSelectedItems(KviTalListViewItem * it) @@ -417,12 +417,12 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)), __tr2qs("Add Alias"), - this,TQT_SLOT(newAlias())); + this,TQ_SLOT(newAlias())); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)), __tr2qs("Add Namespace"), - this,TQT_SLOT(newNamespace())); + this,TQ_SLOT(newNamespace())); bool bHasItems = m_pListView->firstChild() != 0; @@ -433,7 +433,7 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c id = m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), __tr2qs("Remove Selected"), - this,TQT_SLOT(removeSelectedItems())); + this,TQ_SLOT(removeSelectedItems())); m_pContextPopup->setItemEnabled(id,bHasSelected); @@ -442,20 +442,20 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), __tr2qs("Export Selected..."), - this,TQT_SLOT(exportSelected())); + this,TQ_SLOT(exportSelected())); m_pContextPopup->setItemEnabled(id,bHasSelected); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), __tr2qs("Export Selected in singles files..."), - this,TQT_SLOT(exportSelectedSepFiles())); + this,TQ_SLOT(exportSelectedSepFiles())); m_pContextPopup->setItemEnabled(id,bHasSelected); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), __tr2qs("Export All..."), - this,TQT_SLOT(exportAll())); + this,TQ_SLOT(exportAll())); m_pContextPopup->setItemEnabled(id,bHasItems); m_pContextPopup->insertSeparator(); @@ -463,13 +463,13 @@ void KviAliasEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH)), __tr2qs("Find In Aliases..."), - this,TQT_SLOT(slotFind())); + this,TQ_SLOT(slotFind())); m_pContextPopup->setItemEnabled(id,bHasItems); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_NAMESPACE)), __tr2qs("Collapse All Namespaces"), - this,TQT_SLOT(slotCollapseNamespaces())); + this,TQ_SLOT(slotCollapseNamespaces())); m_pContextPopup->setItemEnabled(id,bHasItems); @@ -1332,17 +1332,17 @@ KviAliasEditorWindow::KviAliasEditorWindow(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); diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp index 0ed81a51..57b51f01 100644 --- a/src/modules/avatar/libkviavatar.cpp +++ b/src/modules/avatar/libkviavatar.cpp @@ -88,17 +88,17 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(TQWidget * par,cons g->addMultiCellWidget(m_pLineEdit,1,1,0,1); TQPushButton * b = new TQPushButton(__tr2qs("&Browse..."),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFileClicked())); g->addWidget(b,1,2); KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2); b = new TQPushButton(__tr2qs("&OK"),h); b->setMinimumWidth(80); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); b = new TQPushButton(__tr2qs("Cancel"),h); b->setMinimumWidth(80); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); g->setRowStretch(0,1); g->setColStretch(0,1); diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp index 8c5e71e0..57c31930 100644 --- a/src/modules/channelsjoin/channelsjoinwindow.cpp +++ b/src/modules/channelsjoin/channelsjoinwindow.cpp @@ -66,8 +66,8 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) m_pListView->setRootIsDecorated(true); m_pListView->setSelectionMode(KviTalListView::Single); g->addMultiCellWidget(m_pListView,0,0,0,1); - connect(m_pListView,TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(itemClicked(KviTalListViewItem *))); - connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(clicked(KviTalListViewItem *)),this,TQ_SLOT(itemClicked(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *))); m_pGroupBox = new KviTalGroupBox(2,TQt::Horizontal,__tr2qs("Channel" ),this); @@ -76,8 +76,8 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) TQLabel * l = new TQLabel(szMsg,m_pGroupBox); m_pChannelEdit = new TQLineEdit(m_pGroupBox); - connect(m_pChannelEdit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(editReturnPressed())); - connect(m_pChannelEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(editTextChanged(const TQString &))); + connect(m_pChannelEdit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(editReturnPressed())); + connect(m_pChannelEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(editTextChanged(const TQString &))); szMsg = __tr2qs("Password"); szMsg.append(":"); @@ -92,7 +92,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) m_pJoinButton = new TQPushButton(__tr2qs("&Join"),this); // Join on return pressed m_pJoinButton->setDefault(true); - connect(m_pJoinButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(joinClicked())); + connect(m_pJoinButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(joinClicked())); g->addMultiCellWidget(m_pJoinButton,2,2,0,1,AlignHCenter); @@ -103,7 +103,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) TQPushButton * cancelButton = new TQPushButton(__tr2qs("Close"),this); - connect(cancelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(cancelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); g->addWidget(cancelButton,3,1); @@ -112,9 +112,9 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(TQWidget * par, const char * name) hb->setSpacing(4); TQPushButton * namesButton = new TQPushButton("/names", hb); - connect(namesButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(namesClicked())); + connect(namesButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(namesClicked())); TQPushButton * whoButton = new TQPushButton("/who", hb); - connect(whoButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(whoClicked())); + connect(whoButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(whoClicked())); g->addWidget(hb,2,0); */ diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp index 3cc9d851..eb58a9a7 100644 --- a/src/modules/codetester/codetester.cpp +++ b/src/modules/codetester/codetester.cpp @@ -54,7 +54,7 @@ KviCodeTester::KviCodeTester(TQWidget * par) g->addMultiCellWidget(m_pEditor,0,0,0,3); m_pExecuteButton = new TQPushButton(__tr2qs("&Execute"),this); g->addWidget(m_pExecuteButton,1,3); - connect(m_pExecuteButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(execute())); + connect(m_pExecuteButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(execute())); m_pModeLabel = new TQLabel(__tr("Params:"),this); g->addWidget(m_pModeLabel,1,1); diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp index cfbc01ba..a766f932 100644 --- a/src/modules/dcc/broker.cpp +++ b/src/modules/dcc/broker.cpp @@ -291,10 +291,10 @@ void KviDccBroker::handleChatRequest(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,caption); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(executeChat(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(executeChat(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -345,10 +345,10 @@ void KviDccBroker::activeVoiceManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC VOICE request","dcc")); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(activeVoiceExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -416,10 +416,10 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,__tr2qs_ctx("DCC CANVAS request","dcc")); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(activeCanvasExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -544,10 +544,10 @@ void KviDccBroker::recvFileManage(KviDccDescriptor * dcc) KviDccAcceptBox * box = new KviDccAcceptBox(this,dcc,tmp,title); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(accepted(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(chooseSaveFileName(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(rejected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); } else { // auto accept @@ -685,12 +685,12 @@ void KviDccBroker::renameOverwriteResume(KviDccBox *box,KviDccDescriptor * dcc) KviDccRenameBox * box = new KviDccRenameBox(this,dcc,tmp,bDisableResume); m_pBoxList->append(box); - connect(box,TQT_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *))); - connect(box,TQT_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)), - this,TQT_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(renameSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(renameDccSendFile(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(overwriteSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(recvFileExecute(KviDccBox *,KviDccDescriptor *))); + connect(box,TQ_SIGNAL(cancelSelected(KviDccBox *,KviDccDescriptor *)), + this,TQ_SLOT(cancelDcc(KviDccBox *,KviDccDescriptor *))); box->show(); return; } else { diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp index 4acb85ce..d9ccd025 100644 --- a/src/modules/dcc/canvas.cpp +++ b/src/modules/dcc/canvas.cpp @@ -68,8 +68,8 @@ KviDccCanvas::KviDccCanvas(KviFrame *pFrm,KviDccDescriptor * dcc,const char * na // setFocusHandler(m_pInput,this); m_pMarshal = new KviDccMarshal(this); - connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int))); - connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected())); + connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int))); + connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected())); if(!(m_pDescriptor->bActive)) diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 252f789c..70e928e9 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1409,7 +1409,7 @@ KviCanvasItemPropertiesWidget::KviCanvasItemPropertiesWidget(TQWidget * par) setSorting(false); setLeftMargin(0); verticalHeader()->hide(); - connect(this,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(cellEdited(int,int))); + connect(this,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(cellEdited(int,int))); } KviCanvasItemPropertiesWidget::~KviCanvasItemPropertiesWidget() @@ -1506,24 +1506,24 @@ KviCanvasWidget::KviCanvasWidget(TQWidget * par) l.append(20); m_pSplitter->setSizes(l); - connect(m_pPropertiesWidget,TQT_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQT_SLOT(propertyChanged(const TQString &,const TQVariant &))); + connect(m_pPropertiesWidget,TQ_SIGNAL(propertyChanged(const TQString &,const TQVariant &)),m_pCanvasView,TQ_SLOT(propertyChanged(const TQString &,const TQVariant &))); KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar); KviTalPopupMenu * shapes = new KviTalPopupMenu(add); KviTalPopupMenu * polygons = new KviTalPopupMenu(add); KviTalPopupMenu * items = new KviTalPopupMenu(add); - shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQT_SLOT(insertLine())); - shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertRectangle())); - shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQT_SLOT(insertEllipse())); - shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQT_SLOT(insertPie())); - shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQT_SLOT(insertChord())); - - items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQT_SLOT(insertRichText())); - - polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonTriangle())); - polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonRectangle())); - polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonPentagon())); - polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQT_SLOT(insertPolygonHexagon())); + shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,TQ_SLOT(insertLine())); + shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertRectangle())); + shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,TQ_SLOT(insertEllipse())); + shapes->insertItem(__tr2qs_ctx("&Pie","dcc"),m_pCanvasView,TQ_SLOT(insertPie())); + shapes->insertItem(__tr2qs_ctx("&Chord","dcc"),m_pCanvasView,TQ_SLOT(insertChord())); + + items->insertItem(__tr2qs_ctx("&Rich text (html)","dcc"),m_pCanvasView,TQ_SLOT(insertRichText())); + + polygons->insertItem(__tr2qs_ctx("&Triangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonTriangle())); + polygons->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonRectangle())); + polygons->insertItem(__tr2qs_ctx("&Pentagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonPentagon())); + polygons->insertItem(__tr2qs_ctx("&Hexagon","dcc"),m_pCanvasView,TQ_SLOT(insertPolygonHexagon())); add->insertItem(__tr2qs_ctx("&Shape","dcc"),shapes); add->insertItem(__tr2qs_ctx("&Item","dcc"),items); diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp index 67f5647f..9ad8ded4 100644 --- a/src/modules/dcc/chat.cpp +++ b/src/modules/dcc/chat.cpp @@ -100,7 +100,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this); - connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); m_pInput = new KviInput(this); //setFocusHandler(m_pInput,this); @@ -110,12 +110,12 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name) if(KVI_OPTION_BOOL(KviOption_boolAutoLogDccChat))m_pIrcView->startLogging(); m_pMarshal = new KviDccMarshal(this); - connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int))); - connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected())); - connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress())); + connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int))); + connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected())); + connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress())); #ifdef COMPILE_SSL_SUPPORT - connect(m_pMarshal,TQT_SIGNAL(startingSSLHandshake()),this,TQT_SLOT(startingSSLHandshake())); - connect(m_pMarshal,TQT_SIGNAL(sslError(const char *)),this,TQT_SLOT(sslError(const char *))); + connect(m_pMarshal,TQ_SIGNAL(startingSSLHandshake()),this,TQ_SLOT(startingSSLHandshake())); + connect(m_pMarshal,TQ_SIGNAL(sslError(const char *)),this,TQ_SLOT(sslError(const char *))); #endif m_pSlaveThread = 0; diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 01d4a3b4..9f4e3967 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -62,9 +62,9 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const btn->setDefault(true); //btn->setFocus(); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptClicked())); btn = new TQPushButton(__tr2qs_ctx("&Reject","dcc"),this); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(rejectClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(rejectClicked())); hb->addWidget(btn); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))); @@ -122,20 +122,20 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const TQPushButton * btn = new TQPushButton(__tr2qs_ctx("&Rename","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(renameClicked())); btn = new TQPushButton(__tr2qs_ctx("Over&write","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(overwriteClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(overwriteClicked())); btn = new TQPushButton(__tr2qs_ctx("Re&sume","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(resumeClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(resumeClicked())); if(bDisableResume)btn->setEnabled(false); btn = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this); hb->addWidget(btn); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); btn->setDefault(true); //btn->setFocus(); diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp index 0a386eec..ba920ec7 100644 --- a/src/modules/dcc/marshal.cpp +++ b/src/modules/dcc/marshal.cpp @@ -123,7 +123,7 @@ int KviDccMarshal::dccListen(const TQString &ip,const TQString &port,bool bUseTi if(m_pTimeoutTimer)delete m_pTimeoutTimer; m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doListen())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doListen())); m_pTimeoutTimer->start(100,true); return KviError_success; @@ -277,7 +277,7 @@ void KviDccMarshal::doListen() // and setup the READ notifier... m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int))); m_pSn->setEnabled(true); // set the timer @@ -287,7 +287,7 @@ void KviDccMarshal::doListen() if(m_bUseTimeout) { m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true); } // and wait for connect @@ -312,7 +312,7 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout if(m_pTimeoutTimer)delete m_pTimeoutTimer; m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(doConnect())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(doConnect())); m_pTimeoutTimer->start(100,true); return KviError_success; @@ -415,7 +415,7 @@ void KviDccMarshal::doConnect() // and setup the WRITE notifier... m_pSn = new TQSocketNotifier(m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(snActivated(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(snActivated(int))); m_pSn->setEnabled(true); // set the timer @@ -425,7 +425,7 @@ void KviDccMarshal::doConnect() if(m_bUseTimeout) { m_pTimeoutTimer = new TQTimer(); - connect(m_pTimeoutTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(connectionTimedOut())); + connect(m_pTimeoutTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(connectionTimedOut())); m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true); } @@ -587,12 +587,12 @@ void KviDccMarshal::doSSLHandshake(int) break; case KviSSL::WantRead: m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Read); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); break; case KviSSL::WantWrite: m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); break; case KviSSL::RemoteEndClosedConnection: @@ -607,7 +607,7 @@ void KviDccMarshal::doSSLHandshake(int) { // can recover ? (EAGAIN , EINTR ?) m_pSn = new TQSocketNotifier((int)m_fd,TQSocketNotifier::Write); - TQObject::connect(m_pSn,TQT_SIGNAL(activated(int)),this,TQT_SLOT(doSSLHandshake(int))); + TQObject::connect(m_pSn,TQ_SIGNAL(activated(int)),this,TQ_SLOT(doSSLHandshake(int))); m_pSn->setEnabled(true); return; } else { diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp index 385bd695..05236d95 100644 --- a/src/modules/dcc/send.cpp +++ b/src/modules/dcc/send.cpp @@ -736,12 +736,12 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc) m_pMarshal = new KviDccMarshal(this); - connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int))); - connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected())); - connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress())); + connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int))); + connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected())); + connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress())); #ifdef COMPILE_SSL_SUPPORT - connect(m_pMarshal,TQT_SIGNAL(startingSSLHandshake()),this,TQT_SLOT(startingSSLHandshake())); - connect(m_pMarshal,TQT_SIGNAL(sslError(const char *)),this,TQT_SLOT(sslError(const char *))); + connect(m_pMarshal,TQ_SIGNAL(startingSSLHandshake()),this,TQ_SLOT(startingSSLHandshake())); + connect(m_pMarshal,TQ_SIGNAL(sslError(const char *)),this,TQ_SLOT(sslError(const char *))); #endif m_szDccType = dcc->bIsTdcc ? (dcc->bRecvFile ? "TRECV" : "TSEND") : (dcc->bRecvFile ? "RECV" : "SEND"); @@ -851,7 +851,7 @@ void KviDccFileTransfer::startConnection() if(m_pResumeTimer)delete m_pResumeTimer; m_pResumeTimer = new TQTimer(this); - connect(m_pResumeTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(resumeTimedOut())); + connect(m_pResumeTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(resumeTimedOut())); m_pResumeTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true); } else { listenOrConnect(); @@ -933,15 +933,15 @@ void KviDccFileTransfer::abort() void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column) { - m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQT_SLOT(configureBandwidth())); + m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,TQ_SLOT(configureBandwidth())); m->insertSeparator(); - m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQT_SLOT(retryDCC())); - m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQT_SLOT(retryTDCC())); - m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQT_SLOT(retryRevDCC())); + m->insertItem(__tr2qs_ctx("Resend DCC","dcc"),this,TQ_SLOT(retryDCC())); + m->insertItem(__tr2qs_ctx("Resend TDCC","dcc"),this,TQ_SLOT(retryTDCC())); + m->insertItem(__tr2qs_ctx("Resend RevDCC","dcc"),this,TQ_SLOT(retryRevDCC())); /* FIX ME credo che il problema sia che se riavvio un trasferimento, a sua volta gia' avviato, questo non ha irc contex, perche' la finestra "in cui e' nato"e' sta quella della dcc. Conservarsi l'id della finestra? */ - int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQT_SLOT(abort())); + int id = m->insertItem(__tr2qs_ctx("Abort","dcc"),this,TQ_SLOT(abort())); if(!active())m->setItemEnabled(id,false); } @@ -949,7 +949,7 @@ void KviDccFileTransfer::configureBandwidth() { if(m_pBandwidthDialog)return; m_pBandwidthDialog = new KviDccFileTransferBandwidthDialog(g_pFrame,this); - connect(m_pBandwidthDialog,TQT_SIGNAL(destroyed()),this,TQT_SLOT(bandwidthDialogDestroyed())); + connect(m_pBandwidthDialog,TQ_SIGNAL(destroyed()),this,TQ_SLOT(bandwidthDialogDestroyed())); m_pBandwidthDialog->setModal(true); m_pBandwidthDialog->show(); } @@ -1842,7 +1842,7 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget * m_pLimitBox = new TQSpinBox(0,MAX_DCC_BANDWIDTH_LIMIT-1,1,this); m_pLimitBox->setEnabled((iVal >= 0) && (iVal < MAX_DCC_BANDWIDTH_LIMIT)); - connect(m_pEnableLimitCheck,TQT_SIGNAL(toggled(bool)),m_pLimitBox,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableLimitCheck,TQ_SIGNAL(toggled(bool)),m_pLimitBox,TQ_SLOT(setEnabled(bool))); g->addMultiCellWidget(m_pLimitBox,0,0,1,2); szText = " "; @@ -1851,12 +1851,12 @@ KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(TQWidget * m_pLimitBox->setValue(iVal < MAX_DCC_BANDWIDTH_LIMIT ? iVal : 0); TQPushButton * pb = new TQPushButton(__tr2qs_ctx("OK","dcc"),this); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); pb->setMinimumWidth(80); g->addWidget(pb,2,2); pb = new TQPushButton(__tr2qs_ctx("Cancel","dcc"),this); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); pb->setMinimumWidth(80); g->addWidget(pb,2,1); diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp index 6b5267b6..be674ab8 100644 --- a/src/modules/dcc/voice.cpp +++ b/src/modules/dcc/voice.cpp @@ -686,7 +686,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name setMixerVolume(m_pVolumeSlider->value()); m_pVolumeSlider->setMaximumWidth(16); m_pVolumeSlider->setMaximumHeight(2*m_pPlayingLabel->height()); - connect(m_pVolumeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setMixerVolume(int))); + connect(m_pVolumeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setMixerVolume(int))); m_pTalkButton = new TQToolButton(m_pHBox); m_pTalkButton->setEnabled(false); @@ -697,7 +697,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name m_pTalkButton->setIconSet(iset); m_pTalkButton->setUsesBigPixmap(true); - connect(m_pTalkButton,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(startOrStopTalking(bool))); + connect(m_pTalkButton,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(startOrStopTalking(bool))); m_pHBox->setStretchFactor(vbox,1); m_pHBox->setMargin(2); @@ -706,9 +706,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name //setFocusHandler(m_pIrcView,this); m_pMarshal = new KviDccMarshal(this); - connect(m_pMarshal,TQT_SIGNAL(error(int)),this,TQT_SLOT(handleMarshalError(int))); - connect(m_pMarshal,TQT_SIGNAL(connected()),this,TQT_SLOT(connected())); - connect(m_pMarshal,TQT_SIGNAL(inProgress()),this,TQT_SLOT(connectionInProgress())); + connect(m_pMarshal,TQ_SIGNAL(error(int)),this,TQ_SLOT(handleMarshalError(int))); + connect(m_pMarshal,TQ_SIGNAL(connected()),this,TQ_SLOT(connected())); + connect(m_pMarshal,TQ_SIGNAL(inProgress()),this,TQ_SLOT(connectionInProgress())); m_pUpdateTimer = new TQTimer(); @@ -923,7 +923,7 @@ void KviDccVoice::connected() } updateCaption(); - connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo())); + connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo())); m_pUpdateTimer->start(1000); KviDccVoiceThreadOptions * opt = new KviDccVoiceThreadOptions; @@ -940,7 +940,7 @@ void KviDccVoice::connected() opt->iSampleRate = m_pDescriptor->iSampleRate; m_pSlaveThread = new KviDccVoiceThread(this,m_pMarshal->releaseSocket(),opt); - connect(m_pUpdateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(updateInfo())); + connect(m_pUpdateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(updateInfo())); m_pSlaveThread->start(); m_pTalkButton->setEnabled(true); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index fdc61a0c..ec482051 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -260,7 +260,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( } TQPushButton * pb1 = new TQPushButton(szB,box); if(bDef)pb1->setDefault(true); - connect(pb1,TQT_SIGNAL(clicked()),this,TQT_SLOT(b0Clicked())); + connect(pb1,TQ_SIGNAL(clicked()),this,TQ_SLOT(b0Clicked())); } if(!szButton1.isEmpty()) @@ -279,7 +279,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( } TQPushButton * pb2 = new TQPushButton(szB,box); if(bDef)pb2->setDefault(true); - connect(pb2,TQT_SIGNAL(clicked()),this,TQT_SLOT(b1Clicked())); + connect(pb2,TQ_SIGNAL(clicked()),this,TQ_SLOT(b1Clicked())); } if(!szButton2.isEmpty()) @@ -298,7 +298,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( } TQPushButton * pb3 = new TQPushButton(szB,box); if(bDef)pb3->setDefault(true); - connect(pb3,TQT_SIGNAL(clicked()),this,TQT_SLOT(b2Clicked())); + connect(pb3,TQ_SIGNAL(clicked()),this,TQ_SLOT(b2Clicked())); } } diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp index 534e6535..bf7baaeb 100644 --- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp +++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp @@ -110,7 +110,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_iOther = 0; m_pFlashingTimer = new TQTimer(this,"flashing_timer"); - connect( m_pFlashingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flashingTimerShot()) ); + connect( m_pFlashingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flashingTimerShot()) ); m_bFlashed=0; g_pDockWidgetList->append(this); m_pFrm = frm; @@ -130,7 +130,7 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_pTip = new KviDynamicToolTip(this,"dock_tooltip"); - connect(m_pTip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(m_pTip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); m_pAwayPopup = new KviTalPopupMenu(this); @@ -147,18 +147,18 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name) m_iAwayMenuId = m_pContextPopup->insertItem ( __tr2qs("Away"), m_pAwayPopup); m_pContextPopup->changeItem(m_iAwayMenuId,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_AWAY)),__tr2qs("Away")); - int id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + int id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_OPTIONS)),__tr2qs("&Configure KVIrc..."),m_pFrm,TQ_SLOT(executeInternalCommand(int))); m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_OPTIONS_DIALOG); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("&About KVIrc"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("&About KVIrc"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_ABOUT_ABOUTKVIRC); m_pContextPopup->insertSeparator(); - m_iToggleFrame = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW)),TQString(""),this,TQT_SLOT(toggleParentFrame())); + m_iToggleFrame = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAW)),TQString(""),this,TQ_SLOT(toggleParentFrame())); m_pContextPopup->insertSeparator(); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQT_SLOT(executeInternalCommand(int))); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DOCKWIDGET)),__tr2qs("Un&dock"),m_pFrm,TQ_SLOT(executeInternalCommand(int))); m_pContextPopup->setItemParameter(id,KVI_INTERNALCOMMAND_DOCKWIDGET_HIDE); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQT_SLOT(quit())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,TQ_SLOT(quit())); m_pContextPopup->setAccel(__tr2qs("Ctrl+Q"),id); - connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup())); + connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillContextPopup())); } @@ -417,10 +417,10 @@ void KviDockWidget::fillContextPopup() m_pContextPopup->setItemVisible(m_iAwayMenuId,true); m_pAwayPopup->clear(); - int iAllAway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,TQT_SLOT(doAway(int))); + int iAllAway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on all"),this,TQ_SLOT(doAway(int))); m_pAwayPopup->setItemParameter(iAllAway,-1); - int iAllUnaway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on all"),this,TQT_SLOT(doAway(int))); + int iAllUnaway=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on all"),this,TQ_SLOT(doAway(int))); m_pAwayPopup->setItemParameter(iAllUnaway,-2); int iSeparator=m_pAwayPopup->insertSeparator(); @@ -439,10 +439,10 @@ void KviDockWidget::fillContextPopup() int id; if(pConsole->connection()->userInfo()->isAway()) { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Back on %1").arg(pConsole->currentNetworkName()),this,TQ_SLOT(doAway(int))); bAllUnaway=0; } else { - id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQT_SLOT(doAway(int))); + id=m_pAwayPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CONSOLE)),__tr2qs("Away on %1").arg(pConsole->currentNetworkName()),this,TQ_SLOT(doAway(int))); bAllAway=0; } m_pAwayPopup->setItemParameter(id,pConsole->ircContextId()); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 258db5fb..6ae4740d 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -181,11 +181,11 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(TQWidget * TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","editor"),this); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); g->addWidget(b,2,1); b = new TQPushButton(__tr2qs_ctx("Cancel","editor"),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); g->addWidget(b,2,2); @@ -225,7 +225,7 @@ KviScriptEditorWidget::KviScriptEditorWidget(TQWidget * pParent) updateOptions(); m_szFind=""; completelistbox=new KviCompletionBox(this); - connect (completelistbox,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(slotComplete(const TQString &))); + connect (completelistbox,TQ_SIGNAL(selected(const TQString &)),this,TQ_SLOT(slotComplete(const TQString &))); } KviScriptEditorWidget::~KviScriptEditorWidget() @@ -236,8 +236,8 @@ KviScriptEditorWidget::~KviScriptEditorWidget() TQPopupMenu * KviScriptEditorWidget::createPopupMenu( const TQPoint& pos ) { TQPopupMenu *pop=KviTalTextEdit::createPopupMenu(pos); - pop->insertItem(__tr2qs("Context sensitive help"),this,TQT_SLOT(slotHelp()),TQt::CTRL+TQt::Key_H); - pop->insertItem(__tr2qs("&Replace"),this,TQT_SLOT(slotReplace()),TQt::CTRL+TQt::Key_R); + pop->insertItem(__tr2qs("Context sensitive help"),this,TQ_SLOT(slotHelp()),TQt::CTRL+TQt::Key_H); + pop->insertItem(__tr2qs("&Replace"),this,TQ_SLOT(slotReplace()),TQt::CTRL+TQt::Key_R); return pop; } @@ -250,9 +250,9 @@ void KviScriptEditorWidget::slotFind() void KviScriptEditorWidget::slotReplace() { KviScriptEditorReplaceDialog *dialog=new KviScriptEditorReplaceDialog(this,tr("Find & Replace")); - connect (dialog,TQT_SIGNAL(replaceAll(const TQString &,const TQString &)),m_pParent,TQT_SLOT(slotReplaceAll(const TQString &,const TQString &))); - connect (dialog,TQT_SIGNAL(initFind()),m_pParent,TQT_SLOT(slotInitFind())); - connect (dialog,TQT_SIGNAL(nextFind(const TQString &)),m_pParent,TQT_SLOT(slotNextFind(const TQString &))); + connect (dialog,TQ_SIGNAL(replaceAll(const TQString &,const TQString &)),m_pParent,TQ_SLOT(slotReplaceAll(const TQString &,const TQString &))); + connect (dialog,TQ_SIGNAL(initFind()),m_pParent,TQ_SLOT(slotInitFind())); + connect (dialog,TQ_SIGNAL(nextFind(const TQString &)),m_pParent,TQ_SLOT(slotNextFind(const TQString &))); if(dialog->exec()){}; } @@ -840,10 +840,10 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par) g->addWidget(b,1,0); KviTalPopupMenu * pop = new KviTalPopupMenu(b); - pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,TQT_SLOT(loadFromFile())); - pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,TQT_SLOT(saveToFile())); + pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,TQ_SLOT(loadFromFile())); + pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,TQ_SLOT(saveToFile())); pop->insertSeparator(); - pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,TQT_SLOT(configureColors())); + pop->insertItem(__tr2qs_ctx("&Configure Editor...","editor"),this,TQ_SLOT(configureColors())); b->setPopup(pop); b->setPopupDelay(1); @@ -859,11 +859,11 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par) m_pRowColLabel->setMinimumWidth(80); g->addWidget(m_pRowColLabel,1,3); - connect(m_pFindLineedit,TQT_SIGNAL(returnPressed()),m_pEditor,TQT_SLOT(slotFind())); - connect(m_pFindLineedit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotFind())); - connect(m_pEditor,TQT_SIGNAL(keyPressed()),this,TQT_SLOT(updateRowColLabel())); - connect(m_pEditor,TQT_SIGNAL(textChanged()),this,TQT_SLOT(updateRowColLabel())); - connect(m_pEditor,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(updateRowColLabel())); + connect(m_pFindLineedit,TQ_SIGNAL(returnPressed()),m_pEditor,TQ_SLOT(slotFind())); + connect(m_pFindLineedit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(slotFind())); + connect(m_pEditor,TQ_SIGNAL(keyPressed()),this,TQ_SLOT(updateRowColLabel())); + connect(m_pEditor,TQ_SIGNAL(textChanged()),this,TQ_SLOT(updateRowColLabel())); + connect(m_pEditor,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(updateRowColLabel())); m_lastCursorPos = TQPoint(-1,-1); } @@ -1143,10 +1143,10 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, co clearWState( WState_Polished ); setTabOrder(m_pFindlineedit,m_pReplacelineedit); // signals and slots connections - connect( replacebutton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotReplace() ) ); - connect( findNext, TQT_SIGNAL( clicked() ),this,TQT_SLOT( slotNextFind())); - connect( cancelbutton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) ); - connect( m_pFindlineedit, TQT_SIGNAL( textChanged(const TQString &)), this, TQT_SLOT( textChanged(const TQString &))); + connect( replacebutton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotReplace() ) ); + connect( findNext, TQ_SIGNAL( clicked() ),this,TQ_SLOT( slotNextFind())); + connect( cancelbutton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( reject() ) ); + connect( m_pFindlineedit, TQ_SIGNAL( textChanged(const TQString &)), this, TQ_SLOT( textChanged(const TQString &))); } diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp index efa75538..06d6e3e2 100644 --- a/src/modules/eventeditor/eventeditor.cpp +++ b/src/modules/eventeditor/eventeditor.cpp @@ -83,7 +83,7 @@ KviEventEditor::KviEventEditor(TQWidget * par) m_pListView->setRootIsDecorated(true); TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),boxi); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAllEvents())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAllEvents())); KviTalVBox * box = new KviTalVBox(spl); m_pNameEditor = new TQLineEdit(box); @@ -129,9 +129,9 @@ void KviEventEditor::oneTimeSetup() m_pContextPopup = new KviTalPopupMenu(this); - 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))); } void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col) @@ -147,27 +147,27 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c if(!(((KviEventHandlerListViewItem *)it)->m_bEnabled)) m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), - __tr2qs("&Enable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled())); + __tr2qs("&Enable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled())); else m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)), - __tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled())); + __tr2qs("&Disable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled())); //m_pContextPopup->setItemChecked(id,((KviEventHandlerListViewItem *)it)->m_bEnabled); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), __tr2qs("Re&move Handler"), - this,TQT_SLOT(removeCurrentHandler())); + this,TQ_SLOT(removeCurrentHandler())); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), __tr2qs("&Export Handler To..."), - this,TQT_SLOT(exportCurrentHandler())); + this,TQ_SLOT(exportCurrentHandler())); } else { m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), __tr2qs("&New Handler"), - this,TQT_SLOT(addHandlerForCurrentEvent())); + this,TQ_SLOT(addHandlerForCurrentEvent())); } m_pContextPopup->popup(pnt); @@ -430,17 +430,17 @@ KviEventEditorWindow::KviEventEditorWindow(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); diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp index 8c2950c3..7d780984 100644 --- a/src/modules/filetransferwindow/filetransferwindow.cpp +++ b/src/modules/filetransferwindow/filetransferwindow.cpp @@ -147,7 +147,7 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pMemPixmap = new TQPixmap(1,1); m_pTimer = new TQTimer(this); - connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); m_pInput = new KviInput(this,0); @@ -162,13 +162,13 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pListView->addColumn(__tr2qs_ctx("Progress","filetransferwindow"),350); KviDynamicToolTip * tp = new KviDynamicToolTip(m_pListView->viewport()); - connect(tp,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(tp,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); //m_pListView->setFocusPolicy(NoFocus); //m_pListView->viewport()->setFocusPolicy(NoFocus); - //connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), - // this,TQT_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int))); + //connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), + // this,TQ_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int))); TQFontMetrics fm(font()); m_iLineSpacing = fm.lineSpacing(); @@ -176,12 +176,12 @@ KviFileTransferWindow::KviFileTransferWindow(KviModuleExtensionDescriptor * d,Kv m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); m_pListView->installEventFilter(this); - connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); - connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(doubleClicked(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(doubleClicked(KviTalListViewItem *,const TQPoint &,int))); fillTransferView(); - connect(KviFileTransferManager::instance(),TQT_SIGNAL(transferRegistered(KviFileTransfer *)),this,TQT_SLOT(transferRegistered(KviFileTransfer *))); - connect(KviFileTransferManager::instance(),TQT_SIGNAL(transferUnregistering(KviFileTransfer *)),this,TQT_SLOT(transferUnregistering(KviFileTransfer *))); + connect(KviFileTransferManager::instance(),TQ_SIGNAL(transferRegistered(KviFileTransfer *)),this,TQ_SLOT(transferRegistered(KviFileTransfer *))); + connect(KviFileTransferManager::instance(),TQ_SIGNAL(transferUnregistering(KviFileTransfer *)),this,TQ_SLOT(transferUnregistering(KviFileTransfer *))); KviFileTransferManager::instance()->setTransferWindow(this); @@ -282,7 +282,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo if(!m_pOpenFilePopup) { m_pOpenFilePopup= new KviTalPopupMenu(this); - connect(m_pOpenFilePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(openFilePopupActivated(int))); + connect(m_pOpenFilePopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(openFilePopupActivated(int))); } m_pContextPopup->clear(); @@ -327,7 +327,7 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo TQString mimetype = KMimeType::findByPath(szFile)->name(); KServiceTypeProfile::OfferList offers = KServiceTypeProfile::offers(mimetype,"Application"); - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQT_SLOT(openLocalFile())); + id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQ_SLOT(openLocalFile())); m_pLocalFilePopup->setItemParameter(id,-1); m_pOpenFilePopup->clear(); @@ -345,32 +345,32 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo m_pOpenFilePopup->insertSeparator(); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQT_SLOT(openLocalFileWith())); + id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQ_SLOT(openLocalFileWith())); m_pOpenFilePopup->setItemParameter(id,-1); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),m_pOpenFilePopup); m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Terminal at Location","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); #endif //COMPILE_TDE_SUPPORT //-| Grifisx & Noldor |- #ifdef COMPILE_ON_WINDOWS - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQT_SLOT(openLocalFile())); + id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Open","filetransferwindow"),this,TQ_SLOT(openLocalFile())); m_pLocalFilePopup->setItemParameter(id,-1); m_pOpenFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),this,TQT_SLOT(openLocalFileWith())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &With","filetransferwindow"),this,TQ_SLOT(openLocalFileWith())); m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open &Location","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("MS-DOS Prompt at Location","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); #endif //COMPILE_ON_WINDOWS // G&N end - m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Copy Path to Clipboard","filetransferwindow"),this,TQ_SLOT(copyLocalFileToClipboard())); - id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Delete file","filetransferwindow"),this,TQT_SLOT(deleteLocalFile())); + id = m_pLocalFilePopup->insertItem(__tr2qs_ctx("&Delete file","filetransferwindow"),this,TQ_SLOT(deleteLocalFile())); m_pLocalFilePopup->setItemEnabled(id,i->transfer()->terminated()); m_pContextPopup->insertItem(__tr2qs_ctx("Local &File","filetransferwindow"),m_pLocalFilePopup); @@ -395,14 +395,14 @@ void KviFileTransferWindow::rightButtonPressed(KviTalListViewItem *it,const TQPo item = (KviFileTransferItem *)item->nextSibling(); } - id = m_pContextPopup->insertItem(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,TQT_SLOT(clearTerminated())); + id = m_pContextPopup->insertItem(__tr2qs_ctx("&Clear Terminated","filetransferwindow"),this,TQ_SLOT(clearTerminated())); m_pContextPopup->setItemEnabled(id,bHaveTerminated); bool bAreTransfersActive = false; if(m_pListView->childCount() >= 1) bAreTransfersActive = true; - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear &All","filetransferwindow"),this,TQT_SLOT(clearAll())); + id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear &All","filetransferwindow"),this,TQ_SLOT(clearAll())); m_pContextPopup->setItemEnabled(id,bAreTransfersActive); m_pContextPopup->popup(pnt); diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 1de90892..098a51be 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -57,18 +57,18 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) m_pBtnIndex = new KviStyledToolButton(m_pToolBar); m_pBtnIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX)); - connect(m_pBtnIndex,TQT_SIGNAL(clicked()),this,TQT_SLOT(showIndex())); + connect(m_pBtnIndex,TQ_SIGNAL(clicked()),this,TQ_SLOT(showIndex())); //m_pBtnIndex->setUsesBigPixmap(true); m_pBtnBackward = new KviStyledToolButton(m_pToolBar); m_pBtnBackward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPBACK)); - connect(m_pBtnBackward,TQT_SIGNAL(clicked()),m_pTextBrowser,TQT_SLOT(backward())); + connect(m_pBtnBackward,TQ_SIGNAL(clicked()),m_pTextBrowser,TQ_SLOT(backward())); m_pBtnBackward->setEnabled(false); //m_pBtnBackward->setUsesBigPixmap(true); m_pBtnForward = new KviStyledToolButton(m_pToolBar); m_pBtnForward->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPFORWARD)); - connect(m_pBtnForward,TQT_SIGNAL(clicked()),m_pTextBrowser,TQT_SLOT(forward())); + connect(m_pBtnForward,TQ_SIGNAL(clicked()),m_pTextBrowser,TQ_SLOT(forward())); m_pBtnForward->setEnabled(false); //m_pBtnForward->setUsesBigPixmap(true); @@ -78,13 +78,13 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) { TQToolButton * b = new KviStyledToolButton(m_pToolBar); b->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPCLOSE)); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(doClose())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(doClose())); //b->setUsesBigPixmap(true); } m_pToolBar->setStretchFactor(pSpacer,1); - connect(m_pTextBrowser,TQT_SIGNAL(backwardAvailable(bool)),m_pBtnBackward,TQT_SLOT(setEnabled(bool))); - connect(m_pTextBrowser,TQT_SIGNAL(forwardAvailable(bool)),m_pBtnForward,TQT_SLOT(setEnabled(bool))); + connect(m_pTextBrowser,TQ_SIGNAL(backwardAvailable(bool)),m_pBtnBackward,TQ_SLOT(setEnabled(bool))); + connect(m_pTextBrowser,TQ_SIGNAL(forwardAvailable(bool)),m_pBtnForward,TQ_SLOT(setEnabled(bool))); m_pTextBrowser->viewport()->installEventFilter(this); @@ -113,7 +113,7 @@ void KviHelpWidget::doClose() // hack needed to workaround "TQToolBar::emulateButtonClicked()" // that refers to the "this" pointer after this slot has been // called (from the "too-small-toolbar-for-all-items-popup") - TQTimer::singleShot(0,this,TQT_SLOT(suicide())); + TQTimer::singleShot(0,this,TQ_SLOT(suicide())); } void KviHelpWidget::suicide() diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 3a815244..56f8663a 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -62,7 +62,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) g_pDocIndex->readDict(); } else { TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); - connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) ); + connect(g_pDocIndex,TQ_SIGNAL(indexingProgress(int)), pProgressDialog, TQ_SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); g_pDocIndex->writeDocumentList(); @@ -84,33 +84,33 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab); m_pIndexSearch = new TQLineEdit(pSearchBox); - connect( m_pIndexSearch, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( searchInIndex(const TQString&) ) ); - connect( m_pIndexSearch, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( showIndexTopic() ) ); + connect( m_pIndexSearch, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( searchInIndex(const TQString&) ) ); + connect( m_pIndexSearch, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( showIndexTopic() ) ); KviStyledToolButton* pBtnRefreshIndex = new KviStyledToolButton(pSearchBox); pBtnRefreshIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_REFRESH_IMAGE_NAME)); - connect(pBtnRefreshIndex,TQT_SIGNAL(clicked()),this,TQT_SLOT(refreshIndex())); + connect(pBtnRefreshIndex,TQ_SIGNAL(clicked()),this,TQ_SLOT(refreshIndex())); TQToolTip::add( pBtnRefreshIndex, __tr2qs("Refresh index") ); m_pIndexListBox = new KviTalListBox(m_pIndexTab); TQStringList docList=g_pDocIndex->titlesList(); m_pIndexListBox->insertStringList(docList); - connect(m_pIndexListBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(indexSelected ( int ))); + connect(m_pIndexListBox,TQ_SIGNAL(selected(int)),this,TQ_SLOT(indexSelected ( int ))); m_pIndexListBox->sort(); m_pSearchTab = new KviTalVBox(m_pTabWidget); m_pTabWidget->insertTab(m_pSearchTab,__tr2qs("Search")); m_pTermsEdit = new TQLineEdit(m_pSearchTab); -/* connect( m_pTermsEdit, TQT_SIGNAL( textChanged(const TQString&) ), - this, TQT_SLOT( searchInIndex(const TQString&) ) );*/ - connect( m_pTermsEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( startSearch() ) ); +/* connect( m_pTermsEdit, TQ_SIGNAL( textChanged(const TQString&) ), + this, TQ_SLOT( searchInIndex(const TQString&) ) );*/ + connect( m_pTermsEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( startSearch() ) ); m_pResultBox = new KviTalListBox(m_pSearchTab); - connect(m_pResultBox,TQT_SIGNAL(selected(int)),this,TQT_SLOT(searchSelected ( int ))); + connect(m_pResultBox,TQ_SIGNAL(selected(int)),this,TQ_SLOT(searchSelected ( int ))); KviValueList<int> li; li.append(width()-80); @@ -145,7 +145,7 @@ void KviHelpWindow::refreshIndex() { m_pIndexListBox->clear(); TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); - connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) ); + connect(g_pDocIndex,TQ_SIGNAL(indexingProgress(int)), pProgressDialog, TQ_SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); g_pDocIndex->writeDocumentList(); diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index 19d7a77c..1596d4ed 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -39,8 +39,8 @@ Index::Index( const TQString &dp, const TQString &hp ) { alreadyHaveDocList = FALSE; lastWindowClosed = FALSE; - connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), - this, TQT_SLOT( setLastWinClosed() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), + this, TQ_SLOT( setLastWinClosed() ) ); } @@ -53,8 +53,8 @@ Index::Index( const TQStringList &dl, const TQString &hp ) docList = dl; alreadyHaveDocList = TRUE; lastWindowClosed = FALSE; - connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), - this, TQT_SLOT( setLastWinClosed() ) ); + connect( tqApp, TQ_SIGNAL( lastWindowClosed() ), + this, TQ_SLOT( setLastWinClosed() ) ); } diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 48a8ee37..c9ee4ff1 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -58,14 +58,14 @@ KviHttpFileTransfer::KviHttpFileTransfer() m_pHttpRequest = new KviHttpRequest(); - connect(m_pHttpRequest,TQT_SIGNAL(status(const TQString &)),this,TQT_SLOT(statusMessage(const TQString &))); - connect(m_pHttpRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(transferTerminated(bool))); - connect(m_pHttpRequest,TQT_SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,TQT_SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *))); - connect(m_pHttpRequest,TQT_SIGNAL(resolvingHost(const TQString &)),this,TQT_SLOT(resolvingHost(const TQString &))); - connect(m_pHttpRequest,TQT_SIGNAL(requestSent(const TQStringList &)),this,TQT_SLOT(requestSent(const TQStringList &))); - connect(m_pHttpRequest,TQT_SIGNAL(contactingHost(const TQString &)),this,TQT_SLOT(contactingHost(const TQString &))); - connect(m_pHttpRequest,TQT_SIGNAL(receivedResponse(const TQString &)),this,TQT_SLOT(receivedResponse(const TQString &))); - connect(m_pHttpRequest,TQT_SIGNAL(connectionEstabilished()),this,TQT_SLOT(connectionEstabilished())); + connect(m_pHttpRequest,TQ_SIGNAL(status(const TQString &)),this,TQ_SLOT(statusMessage(const TQString &))); + connect(m_pHttpRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(transferTerminated(bool))); + connect(m_pHttpRequest,TQ_SIGNAL(header(KviPointerHashTable<const char *,KviStr> *)),this,TQ_SLOT(headersReceived(KviPointerHashTable<const char *,KviStr> *))); + connect(m_pHttpRequest,TQ_SIGNAL(resolvingHost(const TQString &)),this,TQ_SLOT(resolvingHost(const TQString &))); + connect(m_pHttpRequest,TQ_SIGNAL(requestSent(const TQStringList &)),this,TQ_SLOT(requestSent(const TQStringList &))); + connect(m_pHttpRequest,TQ_SIGNAL(contactingHost(const TQString &)),this,TQ_SLOT(contactingHost(const TQString &))); + connect(m_pHttpRequest,TQ_SIGNAL(receivedResponse(const TQString &)),this,TQ_SLOT(receivedResponse(const TQString &))); + connect(m_pHttpRequest,TQ_SIGNAL(connectionEstabilished()),this,TQ_SLOT(connectionEstabilished())); m_eGeneralStatus = Initializing; m_szStatusString = __tr2qs_ctx("Initializing","http"); @@ -104,7 +104,7 @@ void KviHttpFileTransfer::abort() void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column) { - int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,TQT_SLOT(abort())); + int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,TQ_SLOT(abort())); if(!active())m->setItemEnabled(id,false); } @@ -457,7 +457,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess) { if(m_pAutoCleanTimer)delete m_pAutoCleanTimer; m_pAutoCleanTimer = new TQTimer(); - connect(m_pAutoCleanTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(autoClean())); + connect(m_pAutoCleanTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(autoClean())); m_pAutoCleanTimer->start(100,true); } } diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 2a991dee..3bc5d0f7 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -53,15 +53,15 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pRequestButton = new TQToolButton(box,"request_button"); m_pRequestButton->setUsesBigPixmap(false); m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINKS))); - connect(m_pRequestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(requestLinks())); + connect(m_pRequestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(requestLinks())); TQToolTip::add(m_pRequestButton,__tr2qs("Request Links")); TQLabel * l = new TQLabel(box,""); box->setStretchFactor(l,1); m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label"); - connect(lpConsole->context(),TQT_SIGNAL(stateChanged()), - this,TQT_SLOT(connectionStateChange())); + connect(lpConsole->context(),TQ_SIGNAL(stateChanged()), + this,TQ_SLOT(connectionStateChange())); m_pSplitter = new TQSplitter(TQt::Horizontal,this,"splitter"); m_pVertSplitter = new TQSplitter(TQt::Vertical,m_pSplitter,"vsplitter"); @@ -72,8 +72,8 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pListView->addColumn(__tr2qs("Description")); m_pListView->setRootIsDecorated(true); m_pListView->setAllColumnsShowFocus(true); - connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(showHostPopup(KviTalListViewItem *,const TQPoint &,int))); m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); @@ -81,7 +81,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pLinkList->setAutoDelete(true); m_pHostPopup = new KviTalPopupMenu(); - connect(m_pHostPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(hostPopupClicked(int))); + connect(m_pHostPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(hostPopupClicked(int))); connectionStateChange(); diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 9b40b912..b43eef29 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -179,22 +179,22 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) KviTalHBox * box = new KviTalHBox(m_pTopSplitter); m_pOpenButton = new KviStyledToolButton(box); m_pOpenButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); - connect(m_pOpenButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importList())); + connect(m_pOpenButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importList())); m_pSaveButton = new KviStyledToolButton(box); m_pSaveButton->setPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))); - connect(m_pSaveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportList())); + connect(m_pSaveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportList())); m_pRequestButton = new KviStyledToolButton(box,"request_button"); m_pRequestButton->setUsesBigPixmap(false); m_pRequestButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LIST))); - connect(m_pRequestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(requestList())); + connect(m_pRequestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(requestList())); TQToolTip::add(m_pRequestButton,__tr2qs("Request List")); m_pStopListDownloadButton = new KviStyledToolButton(box,"stoplistdownload_button"); m_pStopListDownloadButton->setUsesBigPixmap(false); m_pStopListDownloadButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NICKNAMEPROBLEM))); - connect(m_pStopListDownloadButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(stoplistdownload())); + connect(m_pStopListDownloadButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(stoplistdownload())); TQToolTip::add(m_pStopListDownloadButton,__tr2qs("Stop list download")); m_pParamsEdit = new TQLineEdit(box); @@ -215,14 +215,14 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pListView->setColumnWidthMode(3,KviTalListView::Maximum); m_pListView->setSorting(100); - connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *))); m_pIrcView = new KviIrcView(m_pVertSplitter,lpFrm,this); m_pConsole->ircContext()->setListWindowPointer(this); - connect(m_pConsole->context(),TQT_SIGNAL(stateChanged()), - this,TQT_SLOT(connectionStateChange())); + connect(m_pConsole->context(),TQ_SIGNAL(stateChanged()), + this,TQ_SLOT(connectionStateChange())); connectionStateChange(); @@ -443,7 +443,7 @@ void KviListWindow::processData(KviIrcMessage *msg) if(!m_pFlushTimer) { m_pFlushTimer = new TQTimer(this); - connect(m_pFlushTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(flush())); + connect(m_pFlushTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(flush())); m_pFlushTimer->start(1000); m_pRequestButton->setEnabled(false); } diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index a5845b8a..2b15ac1d 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -76,8 +76,8 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pListView->setMultiSelection(false); m_pListView->setShowSortIndicator(true); m_pListView->setRootIsDecorated(true); - connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemSelected(KviTalListViewItem *))); - connect(m_pListView,TQT_SIGNAL(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )),this,TQT_SLOT(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int ))); + connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(itemSelected(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int )),this,TQ_SLOT(rightButtonClicked ( KviTalListViewItem * , const TQPoint &, int ))); m_pSearchTab = new TQWidget(m_pTabWidget); m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview")); @@ -110,13 +110,13 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab); m_pFileNameMask = new TQLineEdit(m_pSearchTab); - connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); + connect(m_pFileNameMask,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(applyFilter())); layout->addWidget(l,6,0); layout->addWidget(m_pFileNameMask,6,1); l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab); m_pContentsMask = new TQLineEdit(m_pSearchTab); - connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter())); + connect(m_pContentsMask,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(applyFilter())); layout->addWidget(l,7,0); layout->addWidget(m_pContentsMask,7,1); @@ -125,7 +125,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pFromDateEdit->setDate(TQDate::currentDate()); layout->addWidget(m_pEnableFromFilter,8,0); layout->addWidget(m_pFromDateEdit,8,1); - connect(m_pEnableFromFilter,TQT_SIGNAL(toggled(bool)),m_pFromDateEdit,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableFromFilter,TQ_SIGNAL(toggled(bool)),m_pFromDateEdit,TQ_SLOT(setEnabled(bool))); m_pFromDateEdit->setEnabled(false); m_pEnableToFilter = new KviStyledCheckBox(__tr2qs_ctx("Only newier than","logview"),m_pSearchTab); @@ -133,11 +133,11 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra m_pToDateEdit->setDate(TQDate::currentDate()); layout->addWidget(m_pEnableToFilter,9,0); layout->addWidget(m_pToDateEdit,9,1); - connect(m_pEnableToFilter,TQT_SIGNAL(toggled(bool)),m_pToDateEdit,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableToFilter,TQ_SIGNAL(toggled(bool)),m_pToDateEdit,TQ_SLOT(setEnabled(bool))); m_pToDateEdit->setEnabled(false); TQPushButton *pb = new TQPushButton(__tr2qs_ctx("Apply filter","logview"),m_pSearchTab); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyFilter())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyFilter())); layout->addWidget(pb,10,1); TQWidget *w = new TQWidget(m_pSearchTab); @@ -159,7 +159,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra KviAccel *a = new KviAccel( this ); a->connectItem( a->insertItem(TQt::Key_F+TQt::CTRL), m_pIrcView, - TQT_SLOT(toggleToolWidget()) ); + TQ_SLOT(toggleToolWidget()) ); } @@ -360,7 +360,7 @@ void KviLogViewMDIWindow::rightButtonClicked ( KviTalListViewItem * it, const TQ if(!it) return; if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return; KviTalPopupMenu* popup = new KviTalPopupMenu(this); - popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQT_SLOT(deleteCurrent())); + popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,TQ_SLOT(deleteCurrent())); popup->exec( TQCursor::pos() ); } diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index e1066237..96b74cf1 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -182,7 +182,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe setNextEnabled(vb,false); setFinishEnabled(vb,true); - connect(this,TQT_SIGNAL(selected(const TQString &)),this,TQT_SLOT(pageSelected(const TQString &))); + connect(this,TQ_SIGNAL(selected(const TQString &)),this,TQ_SLOT(pageSelected(const TQString &))); } KviRemoteMircServerImportWizard::~KviRemoteMircServerImportWizard() @@ -218,8 +218,8 @@ void KviRemoteMircServerImportWizard::start() if(m_pRequest)delete m_pRequest; m_pRequest = new KviHttpRequest(); - connect(m_pRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(getListTerminated(bool))); - connect(m_pRequest,TQT_SIGNAL(status(const TQString &)),this,TQT_SLOT(getListMessage(const TQString &))); + connect(m_pRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(getListTerminated(bool))); + connect(m_pRequest,TQ_SIGNAL(status(const TQString &)),this,TQ_SLOT(getListMessage(const TQString &))); g_pApp->getTmpFileName(m_szTmpFileName,"servers.ini"); if(!m_pRequest->get(KviUrl(url),KviHttpRequest::StoreToFile,m_szTmpFileName)) diff --git a/src/modules/my/idle.cpp b/src/modules/my/idle.cpp index 0917aec7..cd62b125 100644 --- a/src/modules/my/idle.cpp +++ b/src/modules/my/idle.cpp @@ -45,7 +45,7 @@ Idle::Idle() if(platform) ++platform_ref; - connect(&d->checkTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doCheck())); + connect(&d->checkTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doCheck())); } Idle::~Idle() diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index 634af964..3e2f7d15 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -128,7 +128,7 @@ KviNotifierWindow::KviNotifierWindow() m_pLineEdit->setGeometry(0,0,0,0); m_pLineEdit->hide(); m_pLineEdit->installEventFilter(this); - connect(m_pLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(returnPressed())); + connect(m_pLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(returnPressed())); szFamily = cfg.readEntry("InputFontFamily","Arial"); m_pLineEdit->setFont(TQFont(szFamily,cfg.readIntEntry("InputFontSize",9))); @@ -174,7 +174,7 @@ KviNotifierWindow::KviNotifierWindow() TQFontMetrics titleFontMetrics(*m_pTitleFont); m_pWndBorder->centerTitle(titleFontMetrics.height()); - connect(g_pApp,TQT_SIGNAL(reloadImages()),this,TQT_SLOT(reloadImages())); + connect(g_pApp,TQ_SIGNAL(reloadImages()),this,TQ_SLOT(reloadImages())); } KviNotifierWindow::~KviNotifierWindow() @@ -326,7 +326,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate) if(bDoAnimate) { m_pShowHideTimer = new TQTimer(); - connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); m_dOpacity = OPACITY_STEP; m_eState = Showing; m_bCrashShowWorkAround=true; @@ -455,7 +455,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate) } else { //tqDebug ("starting hide animation notifier x() %d and notifier y() % - WBorderx() %d and WBordery() %d and bDoanimate %d",x(),y(),m_pWndBorder->x(),m_pWndBorder->y(),bDoAnimate); m_pShowHideTimer = new TQTimer(); - connect(m_pShowHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); + connect(m_pShowHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(heartbeat())); m_dOpacity = 1.0 - OPACITY_STEP; m_eState = Hiding; update(); @@ -493,7 +493,7 @@ void KviNotifierWindow::startBlinking() if(!KVI_OPTION_BOOL(KviOption_boolDisableNotifierFlashing)) { m_pBlinkTimer = new TQTimer(); - connect(m_pBlinkTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(blink())); + connect(m_pBlinkTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(blink())); m_iBlinkCount = 0; m_pBlinkTimer->start(m_iBlinkTimeout); } @@ -509,11 +509,11 @@ void KviNotifierWindow::startAutoHideTimer() int nSecs = m_tAutoHideAt - m_tStartedAt; if(nSecs < 5)nSecs = 5; m_pAutoHideTimer = new TQTimer(); - connect(m_pAutoHideTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(autoHide())); + connect(m_pAutoHideTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(autoHide())); m_pAutoHideTimer->start(nSecs * 1000); m_pProgressTimer= new TQTimer(); - connect(m_pProgressTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(progressUpdate())); + connect(m_pProgressTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(progressUpdate())); m_pProgressTimer->start(60); } @@ -927,7 +927,7 @@ void KviNotifierWindow::keyReleaseEvent(TQKeyEvent * e) void KviNotifierWindow::delayedRaise(KviWindow * pWnd) { m_pWindowToRaise = pWnd; - TQTimer::singleShot(0,this,TQT_SLOT(delayedRaiseSlot())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedRaiseSlot())); } void KviNotifierWindow::delayedRaiseSlot() @@ -1128,7 +1128,7 @@ void KviNotifierWindow::contextPopup(const TQPoint &pos) if(!m_pContextPopup) { m_pContextPopup = new TQPopupMenu(this); - connect(m_pContextPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(fillContextPopup())); + connect(m_pContextPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(fillContextPopup())); m_pDisablePopup = new TQPopupMenu(this); } @@ -1139,17 +1139,17 @@ void KviNotifierWindow::fillContextPopup() { m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQT_SLOT(hideNow())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Hide","notifier"),this,TQ_SLOT(hideNow())); m_pContextPopup->insertSeparator(); m_pDisablePopup->clear(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQT_SLOT(disableFor1Minute())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQT_SLOT(disableFor5Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQT_SLOT(disableFor15Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQT_SLOT(disableFor30Minutes())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQT_SLOT(disableFor60Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Minute","notifier"),this,TQ_SLOT(disableFor1Minute())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("5 Minutes","notifier"),this,TQ_SLOT(disableFor5Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("15 Minutes","notifier"),this,TQ_SLOT(disableFor15Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("30 Minutes","notifier"),this,TQ_SLOT(disableFor30Minutes())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),__tr2qs_ctx("1 Hour","notifier"),this,TQ_SLOT(disableFor60Minutes())); m_pDisablePopup->insertSeparator(); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQT_SLOT(disableUntilKVIrcRestarted())); - m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQT_SLOT(disablePermanently())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Until KVIrc is Restarted","notifier"),this,TQ_SLOT(disableUntilKVIrcRestarted())); + m_pDisablePopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Permanently (Until Explicitly Enabled)","notifier"),this,TQ_SLOT(disablePermanently())); m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Disable","notifier"),m_pDisablePopup); } diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp index 9e024d5b..faf10ba6 100644 --- a/src/modules/notifier/notifierwindowtabs.cpp +++ b/src/modules/notifier/notifierwindowtabs.cpp @@ -64,8 +64,8 @@ KviNotifierWindowTab::KviNotifierWindowTab(KviWindow * pWnd, TQString label) if(pWnd) { - connect(pWnd,TQT_SIGNAL(windowNameChanged()),this,TQT_SLOT(labelChanged())); - connect(pWnd,TQT_SIGNAL(destroyed()),this,TQT_SLOT(closeMe())); + connect(pWnd,TQ_SIGNAL(windowNameChanged()),this,TQ_SLOT(labelChanged())); + connect(pWnd,TQ_SIGNAL(destroyed()),this,TQ_SLOT(closeMe())); } } 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() { diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index badaf18b..fd5dbd1c 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -59,13 +59,13 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w) //b->setMinimumWidth(m_pCancel->sizeHint().width()); g->addWidget(b,1,1); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); m_pCancel = new TQPushButton(__tr2qs_ctx("Cancel","options"),this); KviTalToolTip::add(m_pCancel,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); g->addWidget(m_pCancel,1,2); - connect(m_pCancel,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(m_pCancel,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); m_pCancel->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index f446277d..4dd17505 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -192,19 +192,19 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) m_pListView->header()->hide(); m_pListView->setRootIsDecorated(true); m_pListView->setSorting(-1); - connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); KviTalHBox * hbox = new KviTalHBox(vbox); vbox->setSpacing(2); vbox->setMargin(0); m_pSearchLineEdit = new TQLineEdit(hbox); - connect(m_pSearchLineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(searchClicked())); + connect(m_pSearchLineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(searchClicked())); m_pSearchButton = new KviStyledToolButton(hbox); m_pSearchButton->setUsesBigPixmap(false); m_pSearchButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SEARCH))); - connect(m_pSearchButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(searchClicked())); - connect(m_pSearchLineEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(searchLineEditTextChanged(const TQString &))); + connect(m_pSearchButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(searchClicked())); + connect(m_pSearchLineEdit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(searchLineEditTextChanged(const TQString &))); #ifdef COMPILE_INFO_TIPS TQString szTip = __tr2qs_ctx("<p>This is the search tool for this options dialog.</p>" \ @@ -240,14 +240,14 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) TQPushButton * b = new TQPushButton(__tr2qs_ctx("&OK","options"),this,"btnok"); KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, accepting all changes.","options")); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); //b->setMinimumWidth(whatIsThisWidth); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); g1->addWidget(b,1,2); b = new TQPushButton(__tr2qs_ctx("&Apply","options"),this,"btnapply"); KviTalToolTip::add(b,__tr2qs_ctx("Commit all changes immediately.","options")); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(applyClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(applyClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); g1->addWidget(b,1,3); @@ -255,7 +255,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) KviTalToolTip::add(b,__tr2qs_ctx("Close this dialog, discarding all changes.","options")); b->setDefault(true); //b->setMinimumWidth(whatIsThisWidth); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); g1->addWidget(b,1,4); @@ -280,7 +280,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup) } KviAccel *a = new KviAccel( this ); - a->connectItem( a->insertItem(TQt::Key_Escape), this,TQT_SLOT(close()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), this,TQ_SLOT(close()) ); } diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp index d08b7a2a..0e326d9f 100644 --- a/src/modules/options/instances.cpp +++ b/src/modules/options/instances.cpp @@ -3462,7 +3462,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg { if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer")) { - disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); + disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); delete e->pWidget->parent(); e->pWidget = 0; } else { @@ -3502,7 +3502,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan { e->pWidget = e->createProc(par); g_iOptionWidgetInstances++; - connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed())); + connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); } if(e->pWidget->parent() != par) { diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp index 2ba98233..ea27a764 100644 --- a/src/modules/options/libkvioptions.cpp +++ b/src/modules/options/libkvioptions.cpp @@ -228,7 +228,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c) { if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click... { - TQObject::connect(g_pSplashScreen,TQT_SIGNAL(destroyed()),wc,TQT_SLOT(show())); + TQObject::connect(g_pSplashScreen,TQ_SIGNAL(destroyed()),wc,TQ_SLOT(show())); return true; } } diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh index ac4926b5..5c0cbb78 100755 --- a/src/modules/options/mkcreateinstanceproc.sh +++ b/src/modules/options/mkcreateinstanceproc.sh @@ -310,7 +310,7 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg { if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer")) { - disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + disconnect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); delete e->pWidget->parent(); e->pWidget = 0; } else { @@ -350,7 +350,7 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan { e->pWidget = e->createProc(par); g_iOptionWidgetInstances++; - connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed())); + connect(e->pWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(widgetDestroyed())); } if(e->pWidget->parent() != par) { diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp index 026dcdd9..972cdc68 100644 --- a/src/modules/options/optw_antispam.cpp +++ b/src/modules/options/optw_antispam.cpp @@ -38,9 +38,9 @@ KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent) KviTalGroupBox *g = addGroupBox(0,0,0,0,1,TQt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options")); m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg); - connect(m_b1,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool))); + connect(m_b1,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool))); m_b2 = addBoolSelector(g,__tr2qs_ctx("Private notices","options"),KviOption_boolUseAntiSpamOnNotice); - connect(m_b2,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(reenableStuff(bool))); + connect(m_b2,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(reenableStuff(bool))); m_b3 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Silent anti-spam (no warnings)","options"),KviOption_boolSilentAntiSpam); m_sl = addStringListSelector(0,2,0,2,__tr2qs_ctx("Words considered spam:","options"),KviOption_stringlistSpamWords); diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp index 7b578bda..aaa8d319 100644 --- a/src/modules/options/optw_avatar.cpp +++ b/src/modules/options/optw_avatar.cpp @@ -48,18 +48,18 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent addBoolSelector(g,__tr2qs_ctx("Do not scale avatar if it is less than required size","options"),KviOption_boolDoNotStretchAvatars); KviUIntSelector *u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintAvatarScaleWidth,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintAvatarScaleHeight,0,512,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatars)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); //2nd g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Scaling on load (and in user tooltips)","options")); b = addBoolSelector(g,__tr2qs_ctx("Scale avatar images on image load","options"),KviOption_boolScaleAvatarsOnLoad); u = addUIntSelector(g,__tr2qs_ctx("Image width:","options"),KviOption_uintScaleAvatarsOnLoadWidth,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Image height:","options"),KviOption_uintScaleAvatarsOnLoadHeight,0,1280,80,KVI_OPTION_BOOL(KviOption_boolScaleAvatarsOnLoad)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); // 2st Box KviTalGroupBox *gs = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Request CTCP","options")); @@ -78,7 +78,7 @@ KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent "will be automatically requested.<br>" \ "A reasonable value might be 102400 bytes (100 K).</center>","options")); #endif - connect(bs,TQT_SIGNAL(toggled(bool)),us,TQT_SLOT(setEnabled(bool))); + connect(bs,TQ_SIGNAL(toggled(bool)),us,TQ_SLOT(setEnabled(bool))); bs = addBoolSelector(gs,__tr2qs_ctx("Automatically accept incoming avatars","options"),KviOption_boolAutoAcceptIncomingAvatars); #ifdef COMPILE_INFO_TIPS diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp index 2b6610ae..f8d7cb37 100644 --- a/src/modules/options/optw_away.cpp +++ b/src/modules/options/optw_away.cpp @@ -42,11 +42,11 @@ KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent) KviTalGroupBox *g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Away Nickname","options")); m_pEnableAwayNick = addBoolSelector(g,__tr2qs_ctx("Change nickname on away","options"),KviOption_boolChangeNickAway); - connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool))); + connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool))); m_pEnableCustomAwayNick = addBoolSelector(g,__tr2qs_ctx("Use automatic nickname ([5 letters]AWAY)","options"),KviOption_boolAutoGeneratedAwayNick,KVI_OPTION_BOOL(KviOption_boolChangeNickAway)); - connect(m_pEnableAwayNick,TQT_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQT_SLOT(setEnabled(bool))); - connect(m_pEnableCustomAwayNick,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableCustomAwayText(bool))); + connect(m_pEnableAwayNick,TQ_SIGNAL(toggled(bool)),m_pEnableCustomAwayNick,TQ_SLOT(setEnabled(bool))); + connect(m_pEnableCustomAwayNick,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableCustomAwayText(bool))); // m_p <-- stands for pointer // m_sz <-- stands for a string :) diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index 577529ac..f65a52dd 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -89,13 +89,13 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent) KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Maximum attempts (0: unlimited):","options"), KviOption_uintMaxAutoReconnectAttempts,0,100,5, KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(gbox,__tr2qs_ctx("Delay between attempts:","options"), KviOption_uintAutoReconnectDelay,0,86400,5, KVI_OPTION_BOOL(KviOption_boolAutoReconnectOnUnexpectedDisconnect)); u->setSuffix(__tr2qs_ctx(" sec","options")); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); #ifdef COMPILE_INFO_TIPS mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 sec</b><br>Maximum value: <b>86400 sec</b></center>","options")); #endif @@ -126,20 +126,20 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent) &(KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)),true); KviFileSelector * f = addFileSelector(gbox,__tr2qs_ctx("Certificate location:","options"), &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePath)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); - connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool))); KviPasswordSelector * p = new KviPasswordSelector(gbox,__tr2qs_ctx("Certificate password:","options"), &(KVI_OPTION_STRING(KviOption_stringSSLCertificatePass)),KVI_OPTION_BOOL(KviOption_boolUseSSLCertificate)); - connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool))); gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Private Key","options")); b = addBoolSelector(gbox,__tr2qs_ctx("Use SSL private key","options"), &(KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)),true); f = addFileSelector(gbox,__tr2qs_ctx("Private key location:","options"), &(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPath)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); - connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool))); p = addPasswordSelector(gbox,__tr2qs_ctx("Private key password:","options"), &(KVI_OPTION_STRING(KviOption_stringSSLPrivateKeyPass)),KVI_OPTION_BOOL(KviOption_boolUseSSLPrivateKey)); - connect(b,TQT_SIGNAL(toggled(bool)),p,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),p,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,2,0,2); #else createLayout(1,1); @@ -174,17 +174,17 @@ KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent) #ifdef COMPILE_INFO_TIPS mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>10000 usec</b><br>Maximum value: <b>10000000 usec</b></center>","options")); #endif - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); g = addGroupBox(0,3,0,3,2,TQt::Horizontal,__tr2qs_ctx("Network Interfaces","options")); b = addBoolSelector(g,__tr2qs_ctx("Bind IPv4 connections to:","options"),KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress); KviStringSelector * s = addStringSelector(g,"",KviOption_stringIpV4ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV4ConnectionsToSpecifiedAddress)); - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); #ifdef COMPILE_IPV6_SUPPORT b = addBoolSelector(g,__tr2qs_ctx("Bind IPv6 connections to:","options"),KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress); s = addStringSelector(g,"",KviOption_stringIpV6ConnectionBindAddress,KVI_OPTION_BOOL(KviOption_boolBindIrcIpV6ConnectionsToSpecifiedAddress)); - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); #endif //!COMPILE_IPV6_SUPPORT addRowSpacer(0,4,0,4); @@ -208,10 +208,10 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent) createLayout(6,1); m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool))); KviTalGroupBox * gbox = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Output verbosity","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool))); addLabel(gbox,__tr2qs_ctx("Output identd messages to:","options")); @@ -235,30 +235,30 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent) gbox = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); KviBoolSelector *b = addBoolSelector(gbox,__tr2qs_ctx("Enable ident service only while connecting to server","options"),KviOption_boolUseIdentServiceOnlyOnConnect); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool))); KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"), KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"), KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService)); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool))); gbox = addGroupBox(0,3,0,3,1,TQt::Horizontal,__tr2qs_ctx("IPv6 Settings","options"),KVI_OPTION_BOOL(KviOption_boolUseIdentService)); m_pEnableIpv6 = addBoolSelector(gbox,__tr2qs_ctx("Enable service for IPv6","options"), KviOption_boolIdentdEnableIpV6, KVI_OPTION_BOOL(KviOption_boolUseIdentService)); #ifdef COMPILE_IPV6_SUPPORT - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),m_pEnableIpv6,TQT_SLOT(setEnabled(bool))); - connect(m_pEnableIpv6,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableIpv4InIpv6(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),m_pEnableIpv6,TQ_SLOT(setEnabled(bool))); + connect(m_pEnableIpv6,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableIpv4InIpv6(bool))); #else m_pEnableIpv6->setEnabled(false); #endif m_pIpv4InIpv6 = addBoolSelector(gbox,__tr2qs_ctx("IP stack treats IPv4 as part of IPv6 namespace","options"), KviOption_boolIdentdIpV6ContainsIpV4, KVI_OPTION_BOOL(KviOption_boolUseIdentService) && KVI_OPTION_BOOL(KviOption_boolIdentdEnableIpV6)); - connect(m_pEnableIdent,TQT_SIGNAL(toggled(bool)),gbox,TQT_SLOT(setEnabled(bool))); + connect(m_pEnableIdent,TQ_SIGNAL(toggled(bool)),gbox,TQ_SLOT(setEnabled(bool))); addLabel(0,4,0,4, #ifdef COMPILE_ON_WINDOWS diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp index 99a47f47..56cdf0c1 100644 --- a/src/modules/options/optw_ctcpfloodprotection.cpp +++ b/src/modules/options/optw_ctcpfloodprotection.cpp @@ -85,13 +85,13 @@ KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidge #ifdef COMPILE_INFO_TIPS mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>0 requests</b><br>Maximum value: <b>10000 requests</b></center>","options")); #endif - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(1,1,1,1,__tr2qs_ctx("within:","options"),KviOption_uintCtcpFloodCheckInterval,1,3600,6,KVI_OPTION_BOOL(KviOption_boolUseCtcpFloodProtection)); u->setSuffix(__tr2qs_ctx(" sec","options")); #ifdef COMPILE_INFO_TIPS mergeTip(u,__tr2qs_ctx("<center>Minimum value: <b>1 sec</b><br>Maximum value: <b>3600 sec</b></center>","options")); #endif - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); KviTalGroupBox * g = addGroupBox(0,2,1,2,2,TQt::Horizontal,__tr2qs_ctx("Ignored Requests","options")); addBoolSelector(g,__tr2qs_ctx("PING","options"),KviOption_boolIgnoreCtcpPing); diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp index 6e1e447f..263c4f11 100644 --- a/src/modules/options/optw_dcc.cpp +++ b/src/modules/options/optw_dcc.cpp @@ -89,7 +89,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) "If you set it to <b>0.0.0.0</b>, KVIrc will try to use the first available IPv4 interface</center>","options")); #endif - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); b = addBoolSelector(g,__tr2qs_ctx("Use user-defined port range","options"),KviOption_boolUserDefinedPortRange); @@ -100,10 +100,10 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) KviTalHBox * hb = new KviTalHBox(g); hb->setSpacing(4); KviUIntSelector * u = addUIntSelector(hb,__tr2qs_ctx("Lowest port:","options"),KviOption_uintDccMinPort,1,65535,5000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(hb,__tr2qs_ctx("Highest port:","options"),KviOption_uintDccMaxPort,1,65535,30000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); b = addBoolSelector(g,__tr2qs_ctx("Send a fixed address in requests","options"),KviOption_boolDccSendFakeAddressByDefault); @@ -113,7 +113,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) #endif s = addStringSelector(g,__tr2qs_ctx("Send address/interface:","options"),KviOption_stringDefaultDccFakeAddress,KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); #ifdef COMPILE_INFO_TIPS mergeTip(s,__tr2qs_ctx("<center>This is the fixed address that will be sent with all DCC requests if you enable the option above.</center>","options")); @@ -122,7 +122,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) KviBoolSelector * b2; b2 = addBoolSelector(g,__tr2qs_ctx("Guess address from IRC server if unroutable","options"), KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable,!KVI_OPTION_BOOL(KviOption_boolDccSendFakeAddressByDefault)); - connect(b,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool))); #ifdef COMPILE_INFO_TIPS mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \ @@ -139,7 +139,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent) "It's an ugly hack - use it only if nothing else works.</center>","options")); #endif - connect(b2,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool))); + connect(b2,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool))); b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Notify failed DCC handshakes to the remote end","options"), KviOption_boolNotifyFailedDccHandshakes); @@ -219,8 +219,8 @@ KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent KviBoolSelector * b1 = addBoolSelector(0,3,0,3,__tr2qs_ctx("Always open transfer window as minimized","options"),KviOption_boolCreateMinimizedDccSend); - connect(b1,TQT_SIGNAL(toggled(bool)),b3,TQT_SLOT(setNotEnabled(bool))); - connect(b2,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool))); + connect(b1,TQ_SIGNAL(toggled(bool)),b3,TQ_SLOT(setNotEnabled(bool))); + connect(b2,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,4,0,4); } @@ -265,13 +265,13 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed); KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed)); u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); hb = new KviTalHBox(g); b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed); u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed)); u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options")); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(g,__tr2qs_ctx("Maximum number of DCC transfers","options"),KviOption_uintMaxDccSendTransfers,0,1000,10); @@ -302,7 +302,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * pare #endif // COMPILE_INFO_TIPS u = addUIntSelector(hb,"",KviOption_uintDccSendIdleStepInMSec,1,65536,30,KVI_OPTION_BOOL(KviOption_boolDccSendForceIdleStep)); - connect(b,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u->setSuffix(__tr2qs_ctx(" msec","options")); #ifdef COMPILE_INFO_TIPS @@ -352,7 +352,7 @@ KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent) KviBoolSelector * b1 = addBoolSelector(0,1,0,1,__tr2qs_ctx("Always open as minimized","options"),KviOption_boolCreateMinimizedDccChat); - connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool))); + connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool))); addRowSpacer(0,2,0,2); } @@ -371,7 +371,7 @@ KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(TQWidget *p):KviOptionsWidget KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccVoice); b = addBoolSelector(g,__tr2qs_ctx("Open minimized when auto-accepted","options"),KviOption_boolCreateMinimizedDccVoiceWhenAutoAccepted,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedDccVoice)); - connect(b1,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setNotEnabled(bool))); + connect(b1,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setNotEnabled(bool))); addBoolSelector(0,2,0,2,__tr2qs_ctx("Force half-duplex mode on sound device","options"), KviOption_boolDccVoiceForceHalfDuplex); addBoolSelector(0,3,0,3,__tr2qs_ctx("Volume slider controls PCM, not Master","options"), KviOption_boolDccVoiceVolumeSliderControlsPCM); diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp index 52e5a64f..2016fa80 100644 --- a/src/modules/options/optw_highlighting.cpp +++ b/src/modules/options/optw_highlighting.cpp @@ -51,9 +51,9 @@ KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent) connect( addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable word highlighting","options"),KviOption_boolUseWordHighlighting), - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addStringListSelector(0,1,0,1,__tr2qs_ctx("Words to highlight:","options"),KviOption_stringlistHighlightWords,KVI_OPTION_BOOL(KviOption_boolUseWordHighlighting)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); addStringSelector(0,2,0,2,__tr2qs_ctx("Word splitters:","options"),KviOption_stringWordSplitters); // This can be used even without Word highlighting b = addBoolSelector(0,3,0,3,__tr2qs_ctx("Highlight messages containing my nickname","options"),KviOption_boolAlwaysHighlightNick); @@ -101,8 +101,8 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent) #ifdef COMPILE_INFO_TIPS mergeTip(b5, __tr2qs_ctx("<center>If this option is enabled, the taskbar will also alert for messages which are shown in queries.</center>","options")); #endif - connect(b3,TQT_SIGNAL(toggled(bool)),b4,TQT_SLOT(setEnabled(bool))); - connect(b3,TQT_SIGNAL(toggled(bool)),b5,TQT_SLOT(setEnabled(bool))); + connect(b3,TQ_SIGNAL(toggled(bool)),b4,TQ_SLOT(setEnabled(bool))); + connect(b3,TQ_SIGNAL(toggled(bool)),b5,TQ_SLOT(setEnabled(bool))); KviBoolSelector * b6 = addBoolSelector(g,__tr2qs_ctx("Use custom alert level","options"),KviOption_boolHighlightOnlyAtCostumHighlightLevel); #ifdef COMPILE_INFO_TIPS @@ -113,7 +113,7 @@ KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent) #ifdef COMPILE_INFO_TIPS mergeTip(b6, __tr2qs_ctx("<center>This option sets the minimum alert level for the taskbar.</center>","options")); #endif - connect(b6,TQT_SIGNAL(toggled(bool)),b7,TQT_SLOT(setEnabled(bool))); + connect(b6,TQ_SIGNAL(toggled(bool)),b7,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,1,0,1); } diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp index e2e81b8c..0c3db84f 100644 --- a/src/modules/options/optw_identity.cpp +++ b/src/modules/options/optw_identity.cpp @@ -91,11 +91,11 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(TQWidget * par,const TQStri TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Cancel","options"),h); //g->addWidget(pb,4,2); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); pb = new TQPushButton(__tr2qs_ctx("Ok","options"),h); pb->setDefault(true); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); g->setColStretch(0,1); @@ -138,11 +138,11 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(TQWidget * par,const TQString & TQPushButton * b = new TQPushButton(__tr2qs_ctx("Abort","options"),this); g->addWidget(b,1,1); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); m_pRequest = new KviHttpRequest(); - TQTimer::singleShot(0,this,TQT_SLOT(startDownload())); + TQTimer::singleShot(0,this,TQ_SLOT(startDownload())); g->setRowStretch(0,1); g->setColStretch(0,1); @@ -157,8 +157,8 @@ KviAvatarDownloadDialog::~KviAvatarDownloadDialog() void KviAvatarDownloadDialog::startDownload() { - connect(m_pRequest,TQT_SIGNAL(terminated(bool)),this,TQT_SLOT(downloadTerminated(bool))); - connect(m_pRequest,TQT_SIGNAL(status(const char *)),this,TQT_SLOT(downloadMessage(const char *))); + connect(m_pRequest,TQ_SIGNAL(terminated(bool)),this,TQ_SLOT(downloadTerminated(bool))); + connect(m_pRequest,TQ_SIGNAL(status(const char *)),this,TQ_SLOT(downloadMessage(const char *))); TQString tmp = m_szUrl; g_pIconManager->urlToCachedFileName(tmp); @@ -235,18 +235,18 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(TQWidget * par,const TQString g->addMultiCellWidget(m_pLineEdit,1,1,0,1); TQPushButton * b = new TQPushButton(__tr2qs_ctx("&Browse...","options"),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFileClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFileClicked())); g->addWidget(b,1,2); KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2); b = new TQPushButton(__tr2qs_ctx("&OK","options"),h); b->setMinimumWidth(80); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); //g->addWidget(b,2,1); b = new TQPushButton(__tr2qs_ctx("Cancel","options"),h); b->setMinimumWidth(80); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); //g->addWidget(b,2,2); g->setRowStretch(0,1); @@ -329,7 +329,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * pare sel->setValidator(v); TQPushButton * pb = new TQPushButton(__tr2qs_ctx("Alternatives...","options"),hb); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(setNickAlternatives())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(setNickAlternatives())); sel = addStringSelector(gbox,__tr2qs_ctx("Username:","options"),KviOption_stringUsername); sel->setMinimumLabelWidth(120); @@ -519,7 +519,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent addWidgetToLayout(m_pAvatarPreview,0,1,0,1); m_pAvatarPreview->setPixmap(m_pLocalAvatar); m_pAvatarPreview->setEnabled(bHaveAvatar); - connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarPreview,TQT_SLOT(setEnabled(bool))); + connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarPreview,TQ_SLOT(setEnabled(bool))); #ifdef COMPILE_INFO_TIPS mergeTip(m_pAvatarPreview,szTip); #endif @@ -532,13 +532,13 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent m_pAvatarNameEdit->setReadOnly(true); m_pAvatarNameEdit->setEnabled(bHaveAvatar); m_pAvatarNameEdit->setText(KVI_OPTION_STRING(KviOption_stringMyAvatar)); - connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQT_SLOT(setEnabled(bool))); + connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pAvatarNameEdit,TQ_SLOT(setEnabled(bool))); m_pChooseAvatarButton = new TQPushButton(__tr2qs_ctx("Choose...","options"),hb); m_pChooseAvatarButton->setEnabled(bHaveAvatar); - connect(m_pUseAvatarCheck,TQT_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQT_SLOT(setEnabled(bool))); + connect(m_pUseAvatarCheck,TQ_SIGNAL(toggled(bool)),m_pChooseAvatarButton,TQ_SLOT(setEnabled(bool))); - connect(m_pChooseAvatarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseAvatar())); + connect(m_pChooseAvatarButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseAvatar())); layout()->setRowStretch(1,2); } diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp index 3dd923e3..06a70035 100644 --- a/src/modules/options/optw_ignore.cpp +++ b/src/modules/options/optw_ignore.cpp @@ -39,7 +39,7 @@ KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent) m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg); m_pIgnoreNotice = addBoolSelector(g,__tr2qs_ctx("Private/channel notices","options"),KviOption_boolEnableIgnoreOnNotice); - connect(m_pIgnorePrivmsg,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableVerbose(bool))); + connect(m_pIgnorePrivmsg,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableVerbose(bool))); m_pVerboseIgnore = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use verbose ignore (show messages in console)","options"), KviOption_boolVerboseIgnore, diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp index b745c0cd..424786b6 100644 --- a/src/modules/options/optw_interfacelookglobal.cpp +++ b/src/modules/options/optw_interfacelookglobal.cpp @@ -41,7 +41,7 @@ KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent) KviFontSelector * f = addFontSelector(0,2,1,2,__tr2qs_ctx("Global application font:","options"),KviOption_fontApplication, KVI_OPTION_BOOL(KviOption_boolUseGlobalApplicationFont)); - connect(b,TQT_SIGNAL(toggled(bool)),f,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),f,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,3,1,3); } @@ -82,22 +82,22 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * KviUIntSelector * u = addUIntSelector(0,1,1,1,__tr2qs_ctx("Child window opacity:","options"),KviOption_uintGlobalTransparencyChildFadeFactor, 0,100,35,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); u = addUIntSelector(0,2,1,2,__tr2qs_ctx("Parent window opacity:","options"),KviOption_uintGlobalTransparencyParentFadeFactor, 0,100,10,KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),u,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),u,TQ_SLOT(setEnabled(bool))); KviColorSelector * c = addColorSelector(0,3,1,3,__tr2qs_ctx("Blend color:","options"),KviOption_colorGlobalTransparencyFade, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),c,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),c,TQ_SLOT(setEnabled(bool))); // addRowSpacer(0,13,0,13); #ifdef COMPILE_TDE_SUPPORT m_pObtainBackgroundFromKdeBoolSelector = addBoolSelector(0,4,1,4,__tr2qs_ctx("Use TDE desktop for transparency","options"),KviOption_boolObtainGlobalBackgroundFromKde, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQT_SLOT(setEnabled(bool))); - connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),m_pObtainBackgroundFromKdeBoolSelector,TQ_SLOT(setEnabled(bool))); + connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); m_pUpdateKdeBackgroundOnChangeBoolSelector = addBoolSelector(0,5,1,5,__tr2qs_ctx("Keep in sync with TDE background changes","options"),KviOption_boolUpdateKdeBackgroundOnChange, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde)); @@ -105,15 +105,15 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,6,1,6,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency) && !KVI_OPTION_BOOL(KviOption_boolObtainGlobalBackgroundFromKde)); layout()->setRowStretch(6,1); - connect(m_pObtainBackgroundFromKdeBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); + connect(m_pObtainBackgroundFromKdeBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool))); #else //!COMPILE_TDE_SUPPORT m_pGlobalBackgroundPixmapSelector = addPixmapSelector(0,4,1,4,__tr2qs_ctx("Transparency blend image:","options"),KviOption_pixmapGlobalTransparencyBackground, KVI_OPTION_BOOL(KviOption_boolUseGlobalPseudoTransparency)); layout()->setRowStretch(4,1); #endif //!COMPILE_TDE_SUPPORT - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableGlobalBackgroundPixmapSelector(bool))); - connect(m_pUseTransparencyBoolSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableGlobalBackgroundPixmapSelector(bool))); + connect(m_pUseTransparencyBoolSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableUpdateKdeBackgroundBoolSelector(bool))); #else createLayout(1,1); addRowSpacer(0,0,0,0); diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp index 3c21a659..addfa7a4 100644 --- a/src/modules/options/optw_lag.cpp +++ b/src/modules/options/optw_lag.cpp @@ -53,7 +53,7 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent) "the pings (if any) will be sent really less often. " \ "5000 is a reasonable value.</center>","options")); #endif - connect(pUse,TQT_SIGNAL(toggled(bool)),pInterval,TQT_SLOT(setEnabled(bool))); + connect(pUse,TQ_SIGNAL(toggled(bool)),pInterval,TQ_SLOT(setEnabled(bool))); KviUIntSelector * pAlarm = addUIntSelector(g, __tr2qs_ctx("Trigger event if lag exceeds:","options"), KviOption_uintLagAlarmTime,5000,1000000,30000, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); pAlarm->setSuffix(__tr2qs_ctx(" msec","options")); @@ -63,15 +63,15 @@ KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent) "the threshold OnLagAlarmTimeUp will be triggered and when the lag falls " \ "back below the threshold then OnLagAlarmTimeDown will be triggered</center>","options")); #endif - connect(pUse,TQT_SIGNAL(toggled(bool)),pAlarm,TQT_SLOT(setEnabled(bool))); + connect(pUse,TQ_SIGNAL(toggled(bool)),pAlarm,TQ_SLOT(setEnabled(bool))); KviBoolSelector * pShow = addBoolSelector(g, __tr2qs_ctx("Show lag in IRC context display","options"), KviOption_boolShowLagOnContextDisplay, KVI_OPTION_BOOL(KviOption_boolUseLagMeterEngine)); #ifdef COMPILE_INFO_TIPS mergeTip(pShow,__tr2qs_ctx("<center>This makes the IRC context display applet show the current lag after the user's nickname (in seconds)</center>","options")); #endif - connect(pUse,TQT_SIGNAL(toggled(bool)),pShow,TQT_SLOT(setEnabled(bool))); - connect(pUse,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool))); + connect(pUse,TQ_SIGNAL(toggled(bool)),pShow,TQ_SLOT(setEnabled(bool))); + connect(pUse,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,2,0,2); diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp index c4fb6943..5b1ec8a2 100644 --- a/src/modules/options/optw_mediatypes.cpp +++ b/src/modules/options/optw_mediatypes.cpp @@ -75,7 +75,7 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent) - connect(m_pListView,TQT_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQT_SLOT(currentItemChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(currentChanged(KviTalListViewItem *)),this,TQ_SLOT(currentItemChanged(KviTalListViewItem *))); layout()->addMultiCellWidget(m_pListView,0,0,0,2); @@ -132,11 +132,11 @@ KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent) layout()->addMultiCellWidget(f,9,9,0,2); TQPushButton * b = new TQPushButton(__tr2qs_ctx("&New","options"),this); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newMediaType())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(newMediaType())); layout()->addWidget(b,10,1); m_pDelete = new TQPushButton(__tr2qs_ctx("Re&move","options"),this); - connect(m_pDelete,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMediaType())); + connect(m_pDelete,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMediaType())); layout()->addWidget(m_pDelete,10,2); diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp index b7a7a5e0..ea9dfafb 100644 --- a/src/modules/options/optw_messages.cpp +++ b/src/modules/options/optw_messages.cpp @@ -89,7 +89,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent) b1 = addBoolSelector(g,__tr2qs_ctx("\"Smart\" nickname colors","options"),KviOption_boolColorNicks); b2 = addBoolSelector(g,__tr2qs_ctx("Use same colors as in the userlist","options"),KviOption_boolUseUserListColorsAsNickColors,!KVI_OPTION_BOOL(KviOption_boolColorNicks)); - connect(b1,TQT_SIGNAL(toggled(bool)),b2,TQT_SLOT(setNotEnabled(bool))); + connect(b1,TQ_SIGNAL(toggled(bool)),b2,TQ_SLOT(setNotEnabled(bool))); addBoolSelector(g,__tr2qs_ctx("Show nicknames in bold","options"),KviOption_boolBoldedNicks); addBoolSelector(g,__tr2qs_ctx("Show user and host","options"),KviOption_boolShowUserAndHostInPrivmsgView); addBoolSelector(g,__tr2qs_ctx("Show channel mode prefix","options"),KviOption_boolShowChannelUserFlagInPrivmsgView); @@ -99,23 +99,23 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent) l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), l, - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); KviTalVBox * vb = new KviTalVBox(g); vb->setSpacing(5); connect( b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addStringSelector(vb,__tr2qs_ctx("Prefix:","options"),KviOption_stringExtendedPrivmsgPrefix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect( b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addStringSelector(vb,__tr2qs_ctx("Postfix:","options"),KviOption_stringExtendedPrivmsgPostfix,KVI_OPTION_BOOL(KviOption_boolUseExtendedPrivmsgView)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); addRowSpacer(0,3,0,3); } @@ -130,24 +130,24 @@ KviTimestampOptionsWidget::KviTimestampOptionsWidget(TQWidget * pParent) createLayout(5,1); m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp); - connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool))); + connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool))); KviBoolSelector* b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Use UTC time for timestamp","options"),KviOption_boolIrcViewTimestampUTC,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); - connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),b,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),b,TQ_SLOT(setEnabled(bool))); KviTalHBox *hb = new KviTalHBox(this); addWidgetToLayout(hb,0,2,0,2); m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp)); - connect(m_pSpecialTimestampColorSelector,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableTimestampSelector(bool))); - connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool))); + connect(m_pSpecialTimestampColorSelector,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableTimestampSelector(bool))); + connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool))); m_pTimestampColorSelector = addMircTextColorSelector(hb,"",KviOption_uintTimeStampForeground,KviOption_uintTimeStampBackground,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp) && KVI_OPTION_BOOL(KviOption_boolUseSpecialColorForTimestamp)); KviStringSelector * st=addStringSelector(0,3,0,3,__tr2qs_ctx("Timestamp format:","options"),KviOption_stringIrcViewTimestampFormat); - connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),st,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),st,TQ_SLOT(setEnabled(bool))); - connect(m_pUseTimestampSelector,TQT_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQT_SLOT(setEnabled(bool))); + connect(m_pUseTimestampSelector,TQ_SIGNAL(toggled(bool)),m_pSpecialTimestampColorSelector,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,4,0,4); } @@ -418,11 +418,11 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent) } m_pIconButton = new KviStyledToolButton(box); - connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked())); + connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(iconButtonClicked())); m_pIconPopup = new KviTalPopupMenu(this); KviIconWidget * iw = new KviIconWidget(m_pIconPopup); - connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(newIconSelected(int))); + connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(newIconSelected(int))); m_pIconPopup->insertItem(iw); @@ -431,9 +431,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent) KviTalHBox * h = new KviTalHBox(this); addWidgetToLayout(h,0,1,3,1); TQPushButton * b = new TQPushButton(__tr2qs_ctx("Load From...","options"),h); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(load())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(load())); b = new TQPushButton(__tr2qs_ctx("Save As...","options"),h); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(save())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(save())); KviMessageListViewItem * it; @@ -446,9 +446,9 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent) layout()->setRowStretch(0,1); layout()->setColStretch(0,1); - connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(itemChanged(KviTalListViewItem *))); - connect(m_pForeListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *))); - connect(m_pBackListBox,TQT_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQT_SLOT(colorChanged(KviTalListBoxItem *))); + connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQ_SLOT(itemChanged(KviTalListViewItem *))); + connect(m_pForeListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *))); + connect(m_pBackListBox,TQ_SIGNAL(selectionChanged(KviTalListBoxItem *)),this,TQ_SLOT(colorChanged(KviTalListBoxItem *))); itemChanged(0); } diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp index 612627f9..83f0a4a6 100644 --- a/src/modules/options/optw_nickserv.cpp +++ b/src/modules/options/optw_nickserv.cpp @@ -136,13 +136,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF TQPushButton * p = new TQPushButton(__tr2qs_ctx("Cancel","options"),this); p->setMinimumWidth(100); - connect(p,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(p,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); gl->addWidget(p,iNextLine,2); m_pOkButton = new TQPushButton(__tr2qs_ctx("OK","options"),this); m_pOkButton->setMinimumWidth(100); m_pOkButton->setDefault(true); - connect(m_pOkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(okPressed())); + connect(m_pOkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(okPressed())); gl->addWidget(m_pOkButton,iNextLine,3); gl->setColStretch(1,1); @@ -257,7 +257,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent) m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options")); - connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls())); + connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls())); gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); #ifdef COMPILE_INFO_TIPS @@ -274,18 +274,18 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent) #endif m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),this); - connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule())); + connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule())); gl->addWidget(m_pAddRuleButton,2,0); m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),this); - connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule())); + connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule())); gl->addWidget(m_pEditRuleButton,2,1); m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),this); - connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule())); + connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule())); gl->addWidget(m_pDelRuleButton,2,2); - connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls())); + connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls())); if(rs && rs->rules()) { diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp index 423be23a..e1b4711a 100644 --- a/src/modules/options/optw_notify.cpp +++ b/src/modules/options/optw_notify.cpp @@ -38,60 +38,60 @@ KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent) KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList); KviTalGroupBox *g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Configuration","options")); - connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Show notifications in active window","options"), KviOption_boolNotifyListChangesToActiveWindow,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Flash window when users are going online","options"), KviOption_boolFlashWindowOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Popup notifier when users are going online","options"), KviOption_boolPopupNotifierOnNotifyOnLine,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); g = addGroupBox(0,2,0,2,1,TQt::Horizontal,__tr2qs_ctx("Advanced configuration","options")); - connect(b,TQT_SIGNAL(toggled(bool)),g,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),g,TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Check USERHOST for online users","options"), KviOption_boolNotifyListSendUserhostForOnlineUsers,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Use \"smart\" notify list manager","options"), KviOption_boolUseIntelligentNotifyListManager,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addBoolSelector(g,__tr2qs_ctx("Use the WATCH method if available","options"), KviOption_boolUseWatchListIfAvailable,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addUIntSelector(g,__tr2qs_ctx("Check interval (in seconds)","options"), KviOption_uintNotifyListCheckTimeInSecs, 5,3600,180,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addUIntSelector(g,__tr2qs_ctx("ISON delay (in seconds)","options"), KviOption_uintNotifyListIsOnDelayTimeInSecs, 5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); connect(b, - TQT_SIGNAL(toggled(bool)), + TQ_SIGNAL(toggled(bool)), addUIntSelector(g,__tr2qs_ctx("USERHOST delay (in seconds)","options"), KviOption_uintNotifyListUserhostDelayTimeInSecs, 5,180,6,KVI_OPTION_BOOL(KviOption_boolUseNotifyList)), - TQT_SLOT(setEnabled(bool))); + TQ_SLOT(setEnabled(bool))); addLabel(0,3,0,3,__tr2qs_ctx("<p><b>Note:</b><br>The notify list is managed using the \"Registered Users\" settings.</p>","options")); addRowSpacer(0,4,0,4); diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp index 02c29e4f..b36a0fb3 100644 --- a/src/modules/options/optw_proxy.cpp +++ b/src/modules/options/optw_proxy.cpp @@ -67,10 +67,10 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) m_pListView->setAllColumnsShowFocus(true); m_pListView->setSelectionMode(KviTalListView::Single); - connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)), - this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); - connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)), + this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); #ifdef COMPILE_INFO_TIPS TQString tiptxt = __tr2qs_ctx("<center>This is the list of available proxy servers.<br>" \ @@ -85,7 +85,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) TQToolButton * tb = new KviStyledToolButton(vbox); tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY))); tb->setAutoRaise(true); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(newProxy())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(newProxy())); #ifdef COMPILE_INFO_TIPS mergeTip(tb,__tr2qs_ctx("New Proxy","options")); #endif @@ -94,7 +94,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) tb->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT))); //tb->setEnabled(false); tb->setAutoRaise(true); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent())); #ifdef COMPILE_INFO_TIPS mergeTip(tb,__tr2qs_ctx("Remove Proxy","options")); #endif @@ -138,7 +138,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent) m_pProtocolBox->insertStringList(l); m_pIpV6Check = new KviStyledCheckBox(__tr2qs_ctx("Use IPv6 protocol","options"),gbox); - connect(m_pIpV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(ipV6CheckToggled(bool))); + connect(m_pIpV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(ipV6CheckToggled(bool))); #ifndef COMPILE_IPV6_SUPPORT m_pIpV6Check->setEnabled(false); #endif @@ -333,8 +333,8 @@ void KviProxyOptionsWidget::commit() void KviProxyOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,const TQPoint &pnt,int col) { m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQT_SLOT(newProxy())); - m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQT_SLOT(removeCurrent())),it); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY)),__tr2qs_ctx("&New Proxy","options"),this,TQ_SLOT(newProxy())); + m_pContextPopup->setItemEnabled(m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Proxy","options"),this,TQ_SLOT(removeCurrent())),it); m_pContextPopup->popup(TQCursor::pos()); } diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index adca6260..336d899b 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -277,7 +277,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options")); m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options")); - connect(m_pNickServListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableNickServControls())); + connect(m_pNickServListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableNickServControls())); gl->addMultiCellWidget(m_pNickServListView,1,1,0,2); #ifdef COMPILE_INFO_TIPS @@ -291,19 +291,19 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * #endif m_pAddRuleButton = new TQPushButton(__tr2qs_ctx("Add Rule","options"),tab); - connect(m_pAddRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addNickServRule())); + connect(m_pAddRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addNickServRule())); gl->addWidget(m_pAddRuleButton,2,0); m_pEditRuleButton = new TQPushButton(__tr2qs_ctx("Edit Rule","options"),tab); - connect(m_pEditRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editNickServRule())); + connect(m_pEditRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editNickServRule())); gl->addWidget(m_pEditRuleButton,2,1); m_pDelRuleButton = new TQPushButton(__tr2qs_ctx("Delete Rule","options"),tab); - connect(m_pDelRuleButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delNickServRule())); + connect(m_pDelRuleButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delNickServRule())); gl->addWidget(m_pDelRuleButton,2,2); - connect(m_pNickServCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(enableDisableNickServControls())); + connect(m_pNickServCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(enableDisableNickServControls())); if(rs && rs->rules()) { @@ -324,12 +324,12 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(TQWidget * par,KviIrcNetwork * b->setMinimumWidth(80); g->addWidget(b,3,2); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this); g->addWidget(b,3,3); b->setMinimumWidth(80); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); g->setRowStretch(2,1); @@ -525,7 +525,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) bool bHasUmode = !(s->initUMode().isEmpty()); KviStr szDefUMode = KVI_OPTION_STRING(KviOption_stringDefaultUserMode); m_pUseDefaultInitUMode->setChecked(!bHasUmode); - connect(m_pUseDefaultInitUMode,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useDefaultInitUModeToggled(bool))); + connect(m_pUseDefaultInitUMode,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useDefaultInitUModeToggled(bool))); m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox); m_pIMode->setEnabled(bHasUmode); @@ -564,7 +564,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pPortEditor,__tr2qs_ctx("<center>This is the default <b>port</b> that this server will be contacted on.<br>Usually <b>6667</b> is OK.</center>","options")); #endif - connect(m_pPortEditor,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(portEditorTextChanged(const TQString &))); + connect(m_pPortEditor,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(portEditorTextChanged(const TQString &))); @@ -613,7 +613,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) #else m_pUseIPV6Check->setEnabled(false); #endif - connect(m_pUseIPV6Check,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(useIPV6CheckToggled(bool))); + connect(m_pUseIPV6Check,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(useIPV6CheckToggled(bool))); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pUseIPV6Check,__tr2qs_ctx("<center>This check identifies IPv6 servers.<br>If enabled, KVIrc will attempt to use the IPv6 protocol " \ @@ -804,12 +804,12 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s) b->setMinimumWidth(80); g->addWidget(b,3,2); b->setDefault(true); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); b = new TQPushButton(__tr2qs_ctx("Cancel","options"),this); g->addWidget(b,3,3); b->setMinimumWidth(80); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); g->setRowStretch(2,1); g->setColStretch(1,1); @@ -1029,8 +1029,8 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pContextPopup = new KviTalPopupMenu(this); m_pImportPopup = new KviTalPopupMenu(this); - connect(m_pImportPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(importPopupAboutToShow())); - connect(m_pImportPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(importPopupActivated(int))); + connect(m_pImportPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(importPopupAboutToShow())); + connect(m_pImportPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(importPopupActivated(int))); m_pServerDetailsDialog = 0; m_pNetworkDetailsDialog = 0; @@ -1043,12 +1043,12 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pListView->setRootIsDecorated(true); m_pListView->setAllColumnsShowFocus(true); m_pListView->setSelectionMode(KviTalListView::Single); - connect(m_pListView,TQT_SIGNAL(selectionChanged(KviTalListViewItem *)), - this,TQT_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); - connect(m_pListView,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), - this,TQT_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); - connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )), - this,TQT_SLOT(detailsClicked())); + connect(m_pListView,TQ_SIGNAL(selectionChanged(KviTalListViewItem *)), + this,TQ_SLOT(listViewItemSelectionChanged(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *,const TQPoint &,int)), + this,TQ_SLOT(listViewRightButtonPressed(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem*, const TQPoint&, int )), + this,TQ_SLOT(detailsClicked())); #ifdef COMPILE_INFO_TIPS TQString tiptxt = __tr2qs_ctx("<center>This is the list of available IRC servers.<br>" \ @@ -1064,7 +1064,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pNewNetworkButton = new KviStyledToolButton(vbox); m_pNewNetworkButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD))); m_pNewNetworkButton->setAutoRaise(true); - connect(m_pNewNetworkButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newNetwork())); + connect(m_pNewNetworkButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newNetwork())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pNewNetworkButton,__tr2qs_ctx("New Network","options")); #endif @@ -1072,7 +1072,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pNewServerButton = new KviStyledToolButton(vbox); m_pNewServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER))); m_pNewServerButton->setAutoRaise(true); - connect(m_pNewServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(newServer())); + connect(m_pNewServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(newServer())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pNewServerButton,__tr2qs_ctx("New Server","options")); #endif @@ -1081,7 +1081,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pRemoveButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT))); m_pRemoveButton->setEnabled(false); m_pRemoveButton->setAutoRaise(true); - connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeCurrent())); + connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeCurrent())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pRemoveButton,__tr2qs_ctx("Remove Network/Server","options")); #endif @@ -1093,7 +1093,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pCopyServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY))); m_pCopyServerButton->setEnabled(false); m_pCopyServerButton->setAutoRaise(true); - connect(m_pCopyServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(copyServer())); + connect(m_pCopyServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(copyServer())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pCopyServerButton,__tr2qs_ctx("Copy Server","options")); #endif @@ -1102,7 +1102,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) m_pPasteServerButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE))); m_pPasteServerButton->setEnabled(false); m_pPasteServerButton->setAutoRaise(true); - connect(m_pPasteServerButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(pasteServer())); + connect(m_pPasteServerButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(pasteServer())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pPasteServerButton,__tr2qs_ctx("Paste Server","options")); #endif @@ -1151,22 +1151,22 @@ KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent) */ m_pDetailsButton = new TQPushButton(__tr2qs_ctx("Advanced...","options"),gbox); - connect(m_pDetailsButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(detailsClicked())); + connect(m_pDetailsButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(detailsClicked())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pDetailsButton,__tr2qs_ctx("<center>Click here to edit advanced options for this entry</center>","options")); #endif m_pConnectCurrent = new TQPushButton(__tr2qs_ctx("Connect &Now","options"),this); addWidgetToLayout(m_pConnectCurrent,0,2,0,2); - connect(m_pConnectCurrent,TQT_SIGNAL(clicked()),this,TQT_SLOT(connectCurrentClicked())); + connect(m_pConnectCurrent,TQ_SIGNAL(clicked()),this,TQ_SLOT(connectCurrentClicked())); #ifdef COMPILE_INFO_TIPS KviTalToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options")); #endif m_pRecentPopup = new KviTalPopupMenu(this); - connect(m_pRecentPopup,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(recentServersPopupAboutToShow())); - connect(m_pRecentPopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(recentServersPopupClicked(int))); + connect(m_pRecentPopup,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(recentServersPopupAboutToShow())); + connect(m_pRecentPopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(recentServersPopupClicked(int))); TQToolButton * tb = new KviStyledToolButton(this); addWidgetToLayout(tb,1,2,1,2); @@ -1427,21 +1427,21 @@ void KviServerOptionsWidget::listViewRightButtonPressed(KviTalListViewItem *it,c int id; bool bServer = (it && ((KviServerOptionsListViewItem *)it)->m_pServerData); m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQT_SLOT(newNetwork())); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQT_SLOT(removeCurrent())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),__tr2qs_ctx("New Network","options"),this,TQ_SLOT(newNetwork())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Remove Network","options"),this,TQ_SLOT(removeCurrent())); m_pContextPopup->setItemEnabled(id,!bServer); m_pContextPopup->insertSeparator(); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQT_SLOT(newServer())); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQT_SLOT(removeCurrent())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs_ctx("&New Server","options"),this,TQ_SLOT(newServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CUT)),__tr2qs_ctx("Re&move Server","options"),this,TQ_SLOT(removeCurrent())); m_pContextPopup->setItemEnabled(id,bServer); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQT_SLOT(copyServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_COPY)),__tr2qs_ctx("&Copy Server","options"),this,TQ_SLOT(copyServer())); m_pContextPopup->setItemEnabled(id,bServer); - id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQT_SLOT(pasteServer())); + id = m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PASTE)),__tr2qs_ctx("&Paste Server","options"),this,TQ_SLOT(pasteServer())); m_pContextPopup->setItemEnabled(id,m_pClipboard); m_pContextPopup->insertSeparator(); - // m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQT_SLOT(importFromIni())); - m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQT_SLOT(clearList())); + // m_pContextPopup->insertItem(__c2q(__tr("Merge list from server.ini","options")),this,TQ_SLOT(importFromIni())); + m_pContextPopup->insertItem(__tr2qs_ctx("Clear List","options"),this,TQ_SLOT(clearList())); m_pContextPopup->insertSeparator(); m_pContextPopup->insertItem(__tr2qs_ctx("Import List","options"),m_pImportPopup); m_pContextPopup->popup(TQCursor::pos()); @@ -1501,8 +1501,8 @@ void KviServerOptionsWidget::importPopupActivated(int id) return; } - connect(m_pImportFilter,TQT_SIGNAL(server(const KviIrcServer &,const char *)),this,TQT_SLOT(importServer(const KviIrcServer &,const char *))); - connect(m_pImportFilter,TQT_SIGNAL(destroyed()),this,TQT_SLOT(importerDead())); + connect(m_pImportFilter,TQ_SIGNAL(server(const KviIrcServer &,const char *)),this,TQ_SLOT(importServer(const KviIrcServer &,const char *))); + connect(m_pImportFilter,TQ_SIGNAL(destroyed()),this,TQ_SLOT(importerDead())); m_pImportFilter->start(); } diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp index 72f527a7..b77262ce 100644 --- a/src/modules/options/optw_sound.cpp +++ b/src/modules/options/optw_sound.cpp @@ -70,10 +70,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) m_pSoundSystemBox = new TQComboBox(false,h); m_pSoundAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h); - connect(m_pSoundAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundAutoDetect())); + connect(m_pSoundAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundAutoDetect())); m_pSoundTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h); - connect(m_pSoundTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(soundTest())); + connect(m_pSoundTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(soundTest())); g = addGroupBox(0,1,0,1,1,TQt::Horizontal,__tr2qs_ctx("Media Player","options"),true); @@ -86,10 +86,10 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent) m_pMediaPlayerBox = new TQComboBox(false,h); m_pMediaAutoDetectButton = new TQPushButton(__tr2qs_ctx("Auto-detect","options"),h); - connect(m_pMediaAutoDetectButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaAutoDetect())); + connect(m_pMediaAutoDetectButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaAutoDetect())); m_pMediaTestButton = new TQPushButton(__tr2qs_ctx("Test","options"),h); - connect(m_pMediaTestButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(mediaTest())); + connect(m_pMediaTestButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(mediaTest())); addRowSpacer(0,2,0,2); diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp index 01a0290f..f9c24501 100644 --- a/src/modules/options/optw_texticons.cpp +++ b/src/modules/options/optw_texticons.cpp @@ -42,8 +42,8 @@ KviTextIconEditor::KviTextIconEditor(TQWidget * par,KviTextIcon * icon,KviTextIc m_pIcon = icon; m_pPopup = 0; updateIcon(); - connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(doPopup())); - connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseFromFile())); + connect(m_pIconButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(doPopup())); + connect(m_pBrowseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseFromFile())); } @@ -58,7 +58,7 @@ void KviTextIconEditor::doPopup() { m_pPopup = new KviTalPopupMenu(this); KviIconWidget * iw = new KviIconWidget(m_pPopup); - connect(iw,TQT_SIGNAL(selected(int)),this,TQT_SLOT(iconSelected(int))); + connect(iw,TQ_SIGNAL(selected(int)),this,TQ_SLOT(iconSelected(int))); m_pPopup->insertItem(iw); } m_pPopup->popup(TQCursor::pos()); @@ -164,15 +164,15 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent) m_pAdd = new TQPushButton(__tr2qs_ctx("Add","options"),this); layout()->addWidget(m_pAdd,1,0); - connect(m_pAdd,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAdd,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pDel = new TQPushButton(__tr2qs_ctx("Delete","options"),this); layout()->addWidget(m_pDel,1,1); - connect(m_pDel,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked())); + connect(m_pDel,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked())); m_pDel->setEnabled(false); - connect(m_pTable,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); + connect(m_pTable,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); } KviTextIconsOptionsWidget::~KviTextIconsOptionsWidget() diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp index 6ddc3ede..32a5f4cf 100644 --- a/src/modules/options/optw_tray.cpp +++ b/src/modules/options/optw_tray.cpp @@ -56,8 +56,8 @@ KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent) addRowSpacer(0,6,0,6); - connect(m_pEnable,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool))); - connect(m_pLevelBasedNotify,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabled(bool))); + connect(m_pEnable,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool))); + connect(m_pLevelBasedNotify,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabled(bool))); setEnabled(true); } diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp index 6e356770..f7b366e9 100644 --- a/src/modules/options/optw_urlhandlers.cpp +++ b/src/modules/options/optw_urlhandlers.cpp @@ -62,7 +62,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent) m_pMailtoHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); m_pOtherHandler->setEnabled(!KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers)); - connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggleEditors(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(toggleEditors(bool))); #endif diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp index e5f68b48..a75c1efa 100644 --- a/src/modules/options/optw_userlist.cpp +++ b/src/modules/options/optw_userlist.cpp @@ -65,7 +65,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(T hb->setSpacing(4); KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick); KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick)); - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,3,0,3); } @@ -81,7 +81,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent) KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid); KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,TQT_SIGNAL(toggled(bool)),s,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),s,TQ_SLOT(setEnabled(bool))); KviTalHBox* hb = new KviTalHBox(this); addWidgetToLayout(hb,0,2,0,2); @@ -89,7 +89,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent) TQLabel * l = new TQLabel(__tr2qs_ctx("Grid type:","options"),hb); l->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool))); m_pGridTypeCombo = new TQComboBox(false,hb); m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Grid","options")); m_pGridTypeCombo->insertItem(__tr2qs_ctx("3D Buttons","options")); @@ -97,7 +97,7 @@ KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent) m_pGridTypeCombo->insertItem(__tr2qs_ctx("Dotted Grid","options")); m_pGridTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintUserListViewGridType)); m_pGridTypeCombo->setEnabled(KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid)); - connect(b,TQT_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQT_SLOT(setEnabled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),m_pGridTypeCombo,TQ_SLOT(setEnabled(bool))); addRowSpacer(0,3,0,3); } 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); diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp index b7786fee..a1221d73 100644 --- a/src/modules/raweditor/raweditor.cpp +++ b/src/modules/raweditor/raweditor.cpp @@ -85,7 +85,7 @@ KviRawEditor::KviRawEditor(TQWidget * par) m_pListView->setRootIsDecorated(true); TQPushButton * pb = new TQPushButton(__tr2qs("&Export All To..."),boxi); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportAllEvents())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportAllEvents())); KviTalVBox * box = new KviTalVBox(spl); m_pNameEditor = new TQLineEdit(box); @@ -130,9 +130,9 @@ void KviRawEditor::oneTimeSetup() m_pContextPopup = new KviTalPopupMenu(this); - 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))); } void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col) @@ -146,25 +146,25 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled)) m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), - __tr2qs("&Enable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled())); + __tr2qs("&Enable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled())); else m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)), - __tr2qs("&Disable Handler"),this,TQT_SLOT(toggleCurrentHandlerEnabled())); + __tr2qs("&Disable Handler"),this,TQ_SLOT(toggleCurrentHandlerEnabled())); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)), __tr2qs("Re&move Handler"), - this,TQT_SLOT(removeCurrentHandler())); + this,TQ_SLOT(removeCurrentHandler())); m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)), __tr2qs("&Export Handler To..."), - this,TQT_SLOT(exportCurrentHandler())); + this,TQ_SLOT(exportCurrentHandler())); } else { m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)), __tr2qs("&New Handler"), - this,TQT_SLOT(addHandlerForCurrentRaw())); + this,TQ_SLOT(addHandlerForCurrentRaw())); } } @@ -172,7 +172,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col m_pContextPopup->insertItem( *(g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)), __tr2qs("&Add Raw Event..."), - this,TQT_SLOT(addRaw())); + this,TQ_SLOT(addRaw())); m_pContextPopup->popup(pnt); } @@ -451,17 +451,17 @@ KviRawEditorWindow::KviRawEditorWindow(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); diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp index f4865263..d0eee4a6 100644 --- a/src/modules/reguser/dialog.cpp +++ b/src/modules/reguser/dialog.cpp @@ -188,8 +188,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) "Notify list fine-tuning can be performed by editing the entry properties.</center>")); #endif // COMPILE_INFO_TIPS - connect(m_pListView,TQT_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQT_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int))); - connect(m_pListView,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQT_SLOT(itemDoubleClicked(KviTalListViewItem *))); + connect(m_pListView,TQ_SIGNAL(pressed(KviTalListViewItem *,const TQPoint &,int)),this,TQ_SLOT(itemPressed(KviTalListViewItem *,const TQPoint &,int))); + connect(m_pListView,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),this,TQ_SLOT(itemDoubleClicked(KviTalListViewItem *))); g->addMultiCellWidget(m_pListView,0,1,0,1); @@ -198,7 +198,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) g->addWidget(vbox,0,2); m_pWizardAddButton = new TQPushButton(__tr2qs("Add (Wizard)..."),vbox); - connect(m_pWizardAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addWizardClicked())); + connect(m_pWizardAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addWizardClicked())); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pWizardAddButton,__tr2qs("Add a registered user by means of a user-friendly wizard.")); #endif // COMPILE_INFO_TIPS @@ -206,21 +206,21 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) m_pAddButton = new TQPushButton(__tr2qs("&Add..."),vbox); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pAddButton,__tr2qs("Open the edit dialog to create a new user entry.")); #endif // COMPILE_INFO_TIPS m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); m_pAddGroupButton = new TQPushButton(__tr2qs("&Add Group..."),vbox); - connect(m_pAddGroupButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addGroupClicked())); + connect(m_pAddGroupButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addGroupClicked())); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pAddGroupButton,__tr2qs("Adds a new group")); #endif // COMPILE_INFO_TIPS m_pAddGroupButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); m_pRemoveButton = new TQPushButton(__tr2qs("Re&move"),vbox); - connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); + connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked())); m_pRemoveButton->setEnabled(false); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pRemoveButton,__tr2qs("Remove the currently selected entries.")); @@ -229,7 +229,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) m_pEditButton = new TQPushButton(__tr2qs("&Edit..."),vbox); - connect(m_pEditButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editClicked())); + connect(m_pEditButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editClicked())); m_pEditButton->setEnabled(false); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pEditButton,__tr2qs("Edit the first selected entry.")); @@ -241,7 +241,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) m_pExportButton = new TQPushButton(__tr("Export To..."),vbox); m_pExportButton->setEnabled(false); - connect(m_pExportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportClicked())); + connect(m_pExportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(exportClicked())); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pExportButton,__tr2qs("Export the selected entries to a file.<br>All the data associated with the selected registered users will be exported.<br>You (or anyone else) can later import the entries by using the \"Import\" button.")); #endif // COMPILE_INFO_TIPS @@ -249,7 +249,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) m_pImportButton = new TQPushButton(__tr("Import From..."),vbox); - connect(m_pImportButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(importClicked())); + connect(m_pImportButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(importClicked())); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pImportButton,__tr2qs("Import entries from a file exported earlier by the \"export\" function of this dialog.")); #endif // COMPILE_INFO_TIPS @@ -264,12 +264,12 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) b = new TQPushButton(__tr2qs("&OK"),hbox); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); //b->setMinimumWidth(120); b = new TQPushButton(__tr2qs("Cancel"),hbox); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(cancelClicked())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(cancelClicked())); b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); //b->setMinimumWidth(120); @@ -279,8 +279,8 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par) g->setColStretch(0,1); g->setRowStretch(1,1); - connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged())); - connect(m_pListView,TQT_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQT_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ))); + connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(selectionChanged())); + connect(m_pListView,TQ_SIGNAL(rightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ) ),this,TQ_SLOT(listViewRightButtonClicked ( KviTalListViewItem *, const TQPoint &, int ))); fillList(); @@ -428,7 +428,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem * m_TmpDict.replace(id,g->data()); } - connect(groups,TQT_SIGNAL(activated ( int )),this,TQT_SLOT(moveToGroupMenuClicked(int))); + connect(groups,TQ_SIGNAL(activated ( int )),this,TQ_SLOT(moveToGroupMenuClicked(int))); KviTalPopupMenu *mainPopup = new KviTalPopupMenu; mainPopup->insertItem(__tr("Move to group"),groups); diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 6a82fa7e..2da4c6f9 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -92,18 +92,18 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value")); m_pTable->setMinimumSize(250,250); - //connect(m_pTable,TQT_SIGNAL(valueChanged(int,int)),this,TQT_SLOT(propertyValueChanged(int,int))); + //connect(m_pTable,TQ_SIGNAL(valueChanged(int,int)),this,TQ_SLOT(propertyValueChanged(int,int))); KviTalVBox * vb = new KviTalVBox(this); vb->setSpacing(4); g->addWidget(vb,0,2); m_pAddButton = new TQPushButton(__tr2qs("&New"),vb); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pAddButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); m_pDelButton = new TQPushButton(__tr2qs("&Remove"),vb); - connect(m_pDelButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delClicked())); + connect(m_pDelButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delClicked())); m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); KviTalHBox * b = new KviTalHBox(this); @@ -111,12 +111,12 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(TQWidget * p,KviPointerHa g->addMultiCellWidget(b,2,2,1,2); TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); pb = new TQPushButton(__tr2qs("Cancel"),b); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); g->setRowStretch(1,1); @@ -255,11 +255,11 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m) g->addWidget(b,2,1); TQPushButton * pb = new TQPushButton(__tr2qs("&OK"),b); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); //pb->setMinimumWidth(120); pb = new TQPushButton(__tr2qs("Cancel"),b); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); //pb->setMinimumWidth(120); @@ -346,7 +346,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist g->addMultiCellWidget(l,3,3,0,1); m_pMaskListBox = new KviTalListBox(p1); - connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(maskCurrentChanged(KviTalListBoxItem *))); + connect(m_pMaskListBox,TQ_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQ_SLOT(maskCurrentChanged(KviTalListBoxItem *))); m_pMaskListBox->setMinimumSize(300,200); g->addMultiCellWidget(m_pMaskListBox,4,4,0,1); @@ -356,17 +356,17 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist b->setSpacing(4); m_pAddMaskButton = new TQPushButton(__tr2qs("&Add..."),b); - connect(m_pAddMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addMaskClicked())); + connect(m_pAddMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addMaskClicked())); m_pAddMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_NEWITEM))); m_pDelMaskButton = new TQPushButton(__tr2qs("Re&move"),b); m_pDelMaskButton->setEnabled(false); - connect(m_pDelMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(delMaskClicked())); + connect(m_pDelMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(delMaskClicked())); m_pDelMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM))); m_pEditMaskButton = new TQPushButton(__tr2qs("&Edit"),b); m_pEditMaskButton->setEnabled(false); - connect(m_pEditMaskButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editMaskClicked())); + connect(m_pEditMaskButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editMaskClicked())); m_pEditMaskButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EDITITEM))); g->setRowStretch(4,1); @@ -386,7 +386,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist l = new TQLabel(__tr2qs("Notify nicknames:"),p2); l->setEnabled(m_pNotifyCheck->isChecked()); g->addWidget(l,1,0); - connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),l,TQT_SLOT(setEnabled(bool))); + connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),l,TQ_SLOT(setEnabled(bool))); #ifdef COMPILE_INFO_TIPS TQToolTip::add(m_pNotifyCheck,__tr2qs("<center>You can enter a space separated list of nicknames.</center>")); #endif @@ -395,7 +395,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist m_pNotifyNick = new TQLineEdit(p2); m_pNotifyNick->setEnabled(false); g->addMultiCellWidget(m_pNotifyNick,1,1,1,2); - connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),m_pNotifyNick,TQT_SLOT(setEnabled(bool))); + connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),m_pNotifyNick,TQ_SLOT(setEnabled(bool))); f = new TQFrame(p2); @@ -429,7 +429,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist g->addWidget(m_pCustomColorSelector,5,2); TQPushButton * pb = new TQPushButton(__tr2qs("All Properties..."),p2); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(editAllPropertiesClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(editAllPropertiesClicked())); g->addWidget(pb,6,2); g->setColStretch(1,1); @@ -444,7 +444,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb); TQGroupBox * gb = new TQGroupBox(__tr2qs("Ignore features"),vb); - connect(m_pIgnoreEnabled,TQT_SIGNAL(toggled(bool)),gb,TQT_SLOT(setEnabled(bool))); + connect(m_pIgnoreEnabled,TQ_SIGNAL(toggled(bool)),gb,TQ_SLOT(setEnabled(bool))); TQVBoxLayout * layout = new TQVBoxLayout(gb,20,3); @@ -473,8 +473,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist setCancelButton(__tr2qs("Cancel")); setOkButton(__tr2qs("&OK")); - connect(this,TQT_SIGNAL(applyButtonPressed()),this,TQT_SLOT(okClicked())); - connect(this,TQT_SIGNAL(cancelButtonPressed()),this,TQT_SLOT(reject())); + connect(this,TQ_SIGNAL(applyButtonPressed()),this,TQ_SLOT(okClicked())); + connect(this,TQ_SIGNAL(cancelButtonPressed()),this,TQ_SLOT(reject())); if(r) { diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index e0e49a4b..f77a4350 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -95,7 +95,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere if(mask.nick() != "*")m_pEditRealName->setText(mask.nick()); - connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &))); + connect(m_pEditRealName,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(realNameChanged(const TQString &))); // PAGE 2 @@ -119,18 +119,18 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pNicknameEdit1 = new TQLineEdit(m_pPage2); m_pNicknameEdit1->setAlignment(TQt::AlignRight); if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick()); - connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); + connect(m_pNicknameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &))); m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 ); m_pUsernameEdit1 = new TQLineEdit(m_pPage2); m_pUsernameEdit1->setAlignment(TQt::AlignHCenter); if(mask.hasUser())m_pUsernameEdit1->setText(mask.user()); - connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); + connect(m_pUsernameEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &))); m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2); m_pHostEdit1 = new TQLineEdit(m_pPage2); if(mask.hasHost())m_pHostEdit1->setText(mask.host()); - connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &))); + connect(m_pHostEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(maskChanged(const TQString &))); m_pPage2Layout->addWidget(m_pHostEdit1,1,4); m_pNicknameEdit2 = new TQLineEdit(m_pPage2); @@ -211,7 +211,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pNotifyCheck = new TQCheckBox(m_pPage4); m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list")); m_pNotifyCheck->setChecked(false); - connect(m_pNotifyCheck,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(notifyCheckToggled(bool))); + connect(m_pNotifyCheck,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(notifyCheckToggled(bool))); m_pPage4Layout->addMultiCellWidget(m_pNotifyCheck,2,2,0,1); m_pNotifyNickLabel1 = new TQLabel(m_pPage4); @@ -224,11 +224,11 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4); if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick()); - connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &))); + connect(m_pNotifyNickEdit1,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &))); m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1); m_pNotifyNickEdit2 = new TQLineEdit(m_pPage4); - connect(m_pNotifyNickEdit2,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &))); + connect(m_pNotifyNickEdit2,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(notifyNickChanged(const TQString &))); m_pPage4Layout->addWidget(m_pNotifyNickEdit2,4,1); m_pPage4Layout->setRowStretch(0,1); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 597b3c20..355874ec 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -231,19 +231,19 @@ KviSetupWizard::KviSetupWizard() m_pDirButtonGroup = new KviTalVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox); m_pDirUsePrev = new TQRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup); - connect(m_pDirUsePrev,TQT_SIGNAL(clicked()),this,TQT_SLOT(oldDirClicked())); + connect(m_pDirUsePrev,TQ_SIGNAL(clicked()),this,TQ_SLOT(oldDirClicked())); m_pOldPathBox = new KviTalHBox(m_pDirButtonGroup); m_pOldDataPathEdit = new TQLineEdit(m_pOldPathBox); - connect(m_pOldDataPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(oldDataTextChanged ( const TQString & ))); + connect(m_pOldDataPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(oldDataTextChanged ( const TQString & ))); TQPushButton * pb = new TQPushButton(__tr2qs("&Browse..."),m_pOldPathBox); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseOldDataPath())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseOldDataPath())); m_pOldPathBox->setSpacing(3); m_pOldPathBox->setStretchFactor(m_pOldDataPathEdit,1); m_pDirUseNew = new TQRadioButton(__tr2qs("Use new settings folder"),m_pDirButtonGroup); - connect(m_pDirUseNew,TQT_SIGNAL(clicked()),this,TQT_SLOT(newDirClicked())); + connect(m_pDirUseNew,TQ_SIGNAL(clicked()),this,TQ_SLOT(newDirClicked())); TQLabel* l = new TQLabel(m_pDirButtonGroup); l->setText(__tr2qs("Settings folder:")); @@ -252,7 +252,7 @@ KviSetupWizard::KviSetupWizard() m_pDataPathEdit = new TQLineEdit(m_pNewPathBox); pb = new TQPushButton(__tr2qs("&Browse..."),m_pNewPathBox); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseDataPath())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseDataPath())); m_pNewPathBox->setSpacing(3); m_pNewPathBox->setStretchFactor(m_pDataPathEdit,1); @@ -280,7 +280,7 @@ KviSetupWizard::KviSetupWizard() m_pIncomingPathEdit = new TQLineEdit(m_pNewIncomingBox); pb = new TQPushButton(__tr2qs("&Browse..."),m_pNewIncomingBox); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(chooseIncomingPath())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(chooseIncomingPath())); m_pNewIncomingBox->setSpacing(3); m_pNewIncomingBox->setStretchFactor(m_pIncomingPathEdit,1); @@ -308,8 +308,8 @@ KviSetupWizard::KviSetupWizard() setHelpEnabled(m_pDirectory,false); - connect(m_pDataPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(newDataTextChanged ( const TQString & ))); - connect(m_pIncomingPathEdit,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(newIncomingTextChanged ( const TQString & ))); + connect(m_pDataPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(newDataTextChanged ( const TQString & ))); + connect(m_pIncomingPathEdit,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(newIncomingTextChanged ( const TQString & ))); ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // Identity diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp index 6895f0c8..dcc8079c 100644 --- a/src/modules/sharedfileswindow/sharedfileswindow.cpp +++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp @@ -73,7 +73,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile * m_pBrowseButton = new TQPushButton(__tr2qs_ctx("&Browse...","sharedfileswindow"),this); g->addWidget( m_pBrowseButton, 1, 3 ); - connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browse())); + connect(m_pBrowseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(browse())); l = new TQLabel(__tr2qs_ctx("User mask:","sharedfileswindow"),this); g->addWidget(l, 2, 0 ); @@ -87,16 +87,16 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile * m_pExpireDateTimeEdit = new TQDateTimeEdit(this); g->addMultiCellWidget(m_pExpireDateTimeEdit, 3, 3, 1, 3 ); - connect(m_pExpireCheckBox,TQT_SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,TQT_SLOT(setEnabled(bool))); + connect(m_pExpireCheckBox,TQ_SIGNAL(toggled(bool)),m_pExpireDateTimeEdit,TQ_SLOT(setEnabled(bool))); TQPushButton * pb; pb = new TQPushButton(__tr2qs_ctx("&OK","sharedfileswindow"),this); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(okClicked())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT))); g->addWidget(pb,5,2); pb = new TQPushButton(__tr2qs_ctx("Cancel","sharedfileswindow"),this); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(reject())); pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD))); g->addWidget(pb,5,3); @@ -218,20 +218,20 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF m_pListView->addColumn(__tr2qs_ctx("Mask","sharedfileswindow"),200); m_pListView->addColumn(__tr2qs_ctx("Expires","sharedfileswindow"),200); m_pListView->setSelectionMode(KviTalListView::Single); - connect(m_pListView,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableButtons())); + connect(m_pListView,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableButtons())); - connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFilesChanged()),this,TQT_SLOT(fillFileView())); - connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFileAdded(KviSharedFile *)),this,TQT_SLOT(sharedFileAdded(KviSharedFile *))); - connect(g_pSharedFilesManager,TQT_SIGNAL(sharedFileRemoved(KviSharedFile *)),this,TQT_SLOT(sharedFileRemoved(KviSharedFile *))); + connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFilesChanged()),this,TQ_SLOT(fillFileView())); + connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFileAdded(KviSharedFile *)),this,TQ_SLOT(sharedFileAdded(KviSharedFile *))); + connect(g_pSharedFilesManager,TQ_SIGNAL(sharedFileRemoved(KviSharedFile *)),this,TQ_SLOT(sharedFileRemoved(KviSharedFile *))); KviTalHBox * b = new KviTalHBox(vbox); m_pAddButton = new TQPushButton(__tr2qs_ctx("&Add...","sharedfileswindow"),b); - connect(m_pAddButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(addClicked())); + connect(m_pAddButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(addClicked())); m_pRemoveButton = new TQPushButton(__tr2qs_ctx("Re&move","sharedfileswindow"),b); - connect(m_pRemoveButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeClicked())); + connect(m_pRemoveButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeClicked())); m_pEditButton = new TQPushButton(__tr2qs_ctx("&Edit","sharedfileswindow"),b); - connect(m_pEditButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(editClicked())); + connect(m_pEditButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(editClicked())); fillFileView(); } @@ -380,7 +380,7 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi if(!m_pOpenFilePopup) { m_pOpenFilePopup= new KviTalPopupMenu(this); - connect(m_pOpenFilePopup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(openFilePopupActivated(int))); + connect(m_pOpenFilePopup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(openFilePopupActivated(int))); } m_pContextPopup->clear(); @@ -440,18 +440,18 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi m_pOpenFilePopup->insertSeparator(); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("Default application","filetransferwindow"),this,TQT_SLOT(openLocalFile())); + id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("Default application","filetransferwindow"),this,TQ_SLOT(openLocalFile())); m_pOpenFilePopup->setItemParameter(id,-1); - id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQT_SLOT(openLocalFileWith())); + id = m_pOpenFilePopup->insertItem(__tr2qs_ctx("&Other...","filetransferwindow"),this,TQ_SLOT(openLocalFileWith())); m_pOpenFilePopup->setItemParameter(id,-1); m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open with","filetransferwindow"),m_pOpenFilePopup); m_pLocalFilePopup->insertSeparator(); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQT_SLOT(openLocalFileFolder())); - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQT_SLOT(openLocalFileTerminal())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Open folder","filetransferwindow"),this,TQ_SLOT(openLocalFileFolder())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Reach in terminal","filetransferwindow"),this,TQ_SLOT(openLocalFileTerminal())); m_pLocalFilePopup->insertSeparator(); #endif //COMPILE_TDE_SUPPORT - m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQT_SLOT(copyLocalFileToClipboard())); + m_pLocalFilePopup->insertItem(__tr2qs_ctx("Copy path to clipboard","filetransferwindow"),this,TQ_SLOT(copyLocalFileToClipboard())); m_pContextPopup->insertItem(__tr2qs_ctx("Local file","filetransferwindow"),m_pLocalFilePopup); } @@ -474,10 +474,10 @@ void KviSharedFilesWindow::rightButtonPressed(KviTalListViewItem *it,const TQPoi item = (KviSharedFilesItem *)item->nextSibling(); } - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,TQT_SLOT(clearTerminated())); + id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear terminated","filetransferwindow"),this,TQ_SLOT(clearTerminated())); m_pContextPopup->setItemEnabled(id,bHaveTerminated); - id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,TQT_SLOT(clearAll())); + id = m_pContextPopup->insertItem(__tr2qs_ctx("Clear all","filetransferwindow"),this,TQ_SLOT(clearAll())); m_pContextPopup->setItemEnabled(id,it); m_pContextPopup->popup(pnt); diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp index bebb9692..2c4f3764 100644 --- a/src/modules/spaste/controller.cpp +++ b/src/modules/spaste/controller.cpp @@ -63,7 +63,7 @@ bool SPasteController::pasteFileInit(TQString &fileName) if(m_pFile)return false; // can't paste two files at a time m_pFile = new TQFile(fileName); if(!m_pFile->open(IO_ReadOnly))return false; - connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(pasteFile())); + connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(pasteFile())); m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay)); return true; } @@ -79,7 +79,7 @@ bool SPasteController::pasteClipboardInit(void) m_pClipBuff = new TQStringList(TQStringList::split("\n",tmp,true)); m_clipBuffIterator = m_pClipBuff->begin(); } - connect(m_pTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(pasteClipboard())); + connect(m_pTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(pasteClipboard())); m_pTimer->start(KVI_OPTION_UINT(KviOption_uintPasteDelay)); return true; } diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp index 67879833..e2eb8865 100644 --- a/src/modules/term/termwidget.cpp +++ b/src/modules/term/termwidget.cpp @@ -62,7 +62,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) m_pCloseButton->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE))); TQToolTip::add(m_pCloseButton,__tr2qs("Close this window")); m_pHBox->setStretchFactor(m_pTitleLabel,2); - connect(m_pCloseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked())); + connect(m_pCloseButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(closeClicked())); } else { m_pHBox = 0; m_pTitleLabel = 0; @@ -84,7 +84,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) { // tqDebug("PART %d",m_pKonsolePart); m_pKonsoleWidget = m_pKonsolePart->widget(); - connect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed())); + connect(m_pKonsoleWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(konsoleDestroyed())); // tqDebug("Widget %d",m_pKonsoleWidget); } else { m_pKonsoleWidget = new TQLabel(this, @@ -100,7 +100,7 @@ KviTermWidget::KviTermWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) KviTermWidget::~KviTermWidget() { if(m_pKonsoleWidget) - disconnect(m_pKonsoleWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(konsoleDestroyed())); + disconnect(m_pKonsoleWidget,TQ_SIGNAL(destroyed()),this,TQ_SLOT(konsoleDestroyed())); if(m_bIsStandalone)g_pTermWidgetList->removeRef(this); if(g_pTermWindowList->isEmpty() && g_pTermWidgetList->isEmpty())g_pTermModule->unlock(); @@ -135,7 +135,7 @@ void KviTermWidget::konsoleDestroyed() m_pKonsoleWidget = 0; m_pKonsolePart = 0; hide(); - TQTimer::singleShot(0,this,TQT_SLOT(autoClose())); + TQTimer::singleShot(0,this,TQ_SLOT(autoClose())); } void KviTermWidget::autoClose() diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index 48b60869..7afabc9b 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -160,7 +160,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent) tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_SAVE))); tb->setUsesBigPixmap(true); TQToolTip::add(tb,__tr2qs_ctx("Save Current Theme...","theme")); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(saveCurrentTheme())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(saveCurrentTheme())); sep = new TQFrame(hb); sep->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); @@ -170,13 +170,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent) m_pPackThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_PACK))); m_pPackThemeButton->setUsesBigPixmap(true); TQToolTip::add(m_pPackThemeButton,__tr2qs_ctx("Export Selected Themes to a Distributable Package","theme")); - connect(m_pPackThemeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(packTheme())); + connect(m_pPackThemeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(packTheme())); m_pDeleteThemeButton = new KviStyledToolButton(hb); m_pDeleteThemeButton->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_REMOVE))); m_pDeleteThemeButton->setUsesBigPixmap(true); TQToolTip::add(m_pDeleteThemeButton,__tr2qs_ctx("Delete Selected Themes","theme")); - connect(m_pDeleteThemeButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteTheme())); + connect(m_pDeleteThemeButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(deleteTheme())); sep = new TQFrame(hb); sep->setFrameStyle(TQFrame::VLine | TQFrame::Sunken); @@ -186,13 +186,13 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent) tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_OPEN))); tb->setUsesBigPixmap(true); TQToolTip::add(tb,__tr2qs_ctx("Install Theme Package From Disk","theme")); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(installFromFile())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(installFromFile())); tb = new KviStyledToolButton(hb); tb->setIconSet(*(g_pIconManager->getBigIcon(KVI_BIGICON_WWW))); tb->setUsesBigPixmap(true); TQToolTip::add(tb,__tr2qs_ctx("Get More Themes...","theme")); - connect(tb,TQT_SIGNAL(clicked()),this,TQT_SLOT(getMoreThemes())); + connect(tb,TQ_SIGNAL(clicked()),this,TQ_SLOT(getMoreThemes())); TQWidget *w= new TQWidget(hb); w->setSizePolicy(TQSizePolicy::Expanding,TQSizePolicy::Minimum); @@ -201,17 +201,17 @@ KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent) m_pListBox->setMinimumHeight(400); m_pListBox->setMinimumWidth(400); m_pListBox->setSelectionMode(KviTalListBox::Extended); - connect(m_pListBox,TQT_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQT_SLOT(applyTheme(KviTalListBoxItem *))); - connect(m_pListBox,TQT_SIGNAL(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)), - this,TQT_SLOT(contextMenuRequested(KviTalListBoxItem *,const TQPoint &))); - connect(m_pListBox,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(enableDisableButtons())); + connect(m_pListBox,TQ_SIGNAL(doubleClicked(KviTalListBoxItem *)),this,TQ_SLOT(applyTheme(KviTalListBoxItem *))); + connect(m_pListBox,TQ_SIGNAL(contextMenuRequested(KviTalListBoxItem *,const TQPoint &)), + this,TQ_SLOT(contextMenuRequested(KviTalListBoxItem *,const TQPoint &))); + connect(m_pListBox,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(enableDisableButtons())); g->addMultiCellWidget(m_pListBox,1,1,0,1); KviDynamicToolTip * tip = new KviDynamicToolTip(m_pListBox); - connect(tip,TQT_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQT_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); + connect(tip,TQ_SIGNAL(tipRequest(KviDynamicToolTip *,const TQPoint &)),this,TQ_SLOT(tipRequest(KviDynamicToolTip *,const TQPoint &))); TQPushButton * 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,2,1); g->setRowStretch(1,0); @@ -280,8 +280,8 @@ void KviThemeManagementDialog::contextMenuRequested(KviTalListBoxItem * it,const { m_pListBox->setCurrentItem(it); m_pContextPopup->clear(); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs_ctx("&Remove Theme","theme"),this,TQT_SLOT(deleteTheme())); - m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)),__tr2qs_ctx("&Apply Theme","theme"),this,TQT_SLOT(applyCurrentTheme())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINUS)),__tr2qs_ctx("&Remove Theme","theme"),this,TQ_SLOT(deleteTheme())); + m_pContextPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)),__tr2qs_ctx("&Apply Theme","theme"),this,TQ_SLOT(applyCurrentTheme())); m_pContextPopup->popup(pos); } } diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index 8afd2b3b..d4c5f5b8 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -271,7 +271,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem TQString szFilter = "*.png *.jpg *.xpm"; m_pImageSelector = new KviFileSelector(pPage,"",&m_szImagePath,true,0,szFilter); - connect(m_pImageSelector,TQT_SIGNAL(selectionChanged(const TQString &)),this,TQT_SLOT(imageSelectionChanged(const TQString &))); + connect(m_pImageSelector,TQ_SIGNAL(selectionChanged(const TQString &)),this,TQ_SLOT(imageSelectionChanged(const TQString &))); pLayout->addWidget(m_pImageSelector,2,0); pLayout->setRowStretch(1,1); diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index e7b78334..fd8ac85f 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -158,12 +158,12 @@ KviSaveThemeDialog::KviSaveThemeDialog(TQWidget * pParent) TQString szFilter = "*.png *.jpg *.xpm"; m_pImageSelector = new KviFileSelector(pPage,"",&m_szScreenshotPath,true,0,szFilter); - connect(m_pImageSelector,TQT_SIGNAL(selectionChanged(const TQString &)),this,TQT_SLOT(imageSelectionChanged(const TQString &))); + connect(m_pImageSelector,TQ_SIGNAL(selectionChanged(const TQString &)),this,TQ_SLOT(imageSelectionChanged(const TQString &))); pLayout->addWidget(m_pImageSelector,2,0); TQPushButton * pButton = new TQPushButton(pPage); pButton->setText(__tr2qs_ctx("Make Screenshot Now","theme")); - connect(pButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(makeScreenshot())); + connect(pButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(makeScreenshot())); pLayout->addWidget(pButton,3,0); pLayout->setRowStretch(1,1); diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp index 7ad6bf55..911a3f9f 100644 --- a/src/modules/tip/libkvitip.cpp +++ b/src/modules/tip/libkvitip.cpp @@ -111,7 +111,7 @@ KviTipWindow::KviTipWindow() KVI_TIP_WINDOW_BUTTON_WIDTH, KVI_TIP_WINDOW_BUTTON_HEIGHT ); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(nextTip())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(nextTip())); pb = new TQPushButton(__tr2qs("Close"),this); pb->setGeometry( @@ -120,7 +120,7 @@ KviTipWindow::KviTipWindow() KVI_TIP_WINDOW_BUTTON_WIDTH, KVI_TIP_WINDOW_BUTTON_HEIGHT ); - connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(close())); + connect(pb,TQ_SIGNAL(clicked()),this,TQ_SLOT(close())); pb->setDefault(true); m_pShowAtStartupCheck = new KviStyledCheckBox(__tr2qs("Show at startup"),this); 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(); diff --git a/src/modules/torrent/tc_ktorrentdcopinterface.cpp b/src/modules/torrent/tc_ktorrentdcopinterface.cpp index 046186e8..1ffd120b 100644 --- a/src/modules/torrent/tc_ktorrentdcopinterface.cpp +++ b/src/modules/torrent/tc_ktorrentdcopinterface.cpp @@ -113,7 +113,7 @@ KviKTorrentDCOPInterface::KviKTorrentDCOPInterface() printf("KviKTorrentDCOPInterface\n"); TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimer())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimer())); timer->start(250, FALSE); // make sure we have a list of files, diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp index 78a41e67..79ae46d2 100644 --- a/src/modules/torrent/tc_statusbarapplet.cpp +++ b/src/modules/torrent/tc_statusbarapplet.cpp @@ -8,7 +8,7 @@ KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviSt : KviStatusBarApplet(parent, desc) { TQTimer *timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update())); + connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(update())); timer->start(250, FALSE); // updateDisplay(); // diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp index dfd884e8..522e4fcc 100644 --- a/src/modules/url/libkviurl.cpp +++ b/src/modules/url/libkviurl.cpp @@ -117,15 +117,15 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList) KviTalPopupMenu *pop; pop = new KviTalPopupMenu(this); - pop->insertItem(__tr2qs("&Configure"),this,TQT_SLOT(config())); - pop->insertItem(__tr2qs("&Help"),this,TQT_SLOT(help())); - pop->insertItem(__tr2qs("Clo&se"),this,TQT_SLOT(close_slot())); + pop->insertItem(__tr2qs("&Configure"),this,TQ_SLOT(config())); + pop->insertItem(__tr2qs("&Help"),this,TQ_SLOT(help())); + pop->insertItem(__tr2qs("Clo&se"),this,TQ_SLOT(close_slot())); m_pMenuBar->insertItem(__tr2qs("&Module"),pop); pop = new KviTalPopupMenu(this); - pop->insertItem(__tr2qs("&Load"),this,TQT_SLOT(loadList())); - pop->insertItem(__tr2qs("&Save"),this,TQT_SLOT(saveList())); - pop->insertItem(__tr2qs("&Clear"),this,TQT_SLOT(clear())); + pop->insertItem(__tr2qs("&Load"),this,TQ_SLOT(loadList())); + pop->insertItem(__tr2qs("&Save"),this,TQ_SLOT(saveList())); + pop->insertItem(__tr2qs("&Clear"),this,TQ_SLOT(clear())); m_pMenuBar->insertItem(__tr2qs("&List"),pop); m_pUrlList->setShowSortIndicator(true); @@ -140,8 +140,8 @@ UrlDialog::UrlDialog(KviPointerList<KviUrl> *g_pList) m_pUrlList->setColumnWidth(2,cfg.readIntEntry("Count",70)); m_pUrlList->setColumnWidth(3,cfg.readIntEntry("Timestamp",70)); - connect(m_pUrlList,TQT_SIGNAL(doubleClicked(KviTalListViewItem *)),TQT_SLOT(dblclk_url(KviTalListViewItem *))); - connect(m_pUrlList,TQT_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQT_SLOT(popup(KviTalListViewItem *, const TQPoint &, int))); + connect(m_pUrlList,TQ_SIGNAL(doubleClicked(KviTalListViewItem *)),TQ_SLOT(dblclk_url(KviTalListViewItem *))); + connect(m_pUrlList,TQ_SIGNAL(rightButtonPressed(KviTalListViewItem *, const TQPoint &, int)),TQ_SLOT(popup(KviTalListViewItem *, const TQPoint &, int))); // setFocusHandlerNoChildren(m_pUrlList); m_pUrlList->setFocusPolicy(TQWidget::StrongFocus); @@ -257,15 +257,15 @@ void UrlDialog::popup(KviTalListViewItem *item, const TQPoint &point, int col) if (col == 0) { m_szUrl = item->text(0); KviTalPopupMenu p(0,"menu"); - p.insertItem(__tr2qs("&Remove"),this,TQT_SLOT(remove())); - p.insertItem(__tr2qs("&Find Text"),this,TQT_SLOT(findtext())); + p.insertItem(__tr2qs("&Remove"),this,TQ_SLOT(remove())); + p.insertItem(__tr2qs("&Find Text"),this,TQ_SLOT(findtext())); p.insertSeparator(); m_pListPopup = new KviTalPopupMenu(0,"list"); int i=0; for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next()){ if ((w->type() <= 2) || (w->type() == 2) || (w->type() == 6)) { // values defined in kvi_define.h (console,channel,query,chat,uwindow) m_pListPopup->insertItem(TQString(w->plainTextCaption()),i); - m_pListPopup->connectItem(i,this,TQT_SLOT(sayToWin(int))); + m_pListPopup->connectItem(i,this,TQ_SLOT(sayToWin(int))); i++; } } @@ -362,11 +362,11 @@ ConfigDialog::ConfigDialog() TQPushButton *b; // configure buttons b = new TQPushButton(__tr2qs("&Cancel"),this,"discard"); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(discardbtn())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(discardbtn())); g->addWidget(b,4,0); b = new TQPushButton(__tr2qs("&OK"),this,"accept"); - connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(acceptbtn())); + connect(b,TQ_SIGNAL(clicked()),this,TQ_SLOT(acceptbtn())); g->addWidget(b,4,1); show(); @@ -413,7 +413,7 @@ BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled) TQGridLayout *g = new TQGridLayout(this,2,2,10,10); m_pEnable = new KviStyledCheckBox(__tr2qs("Enable URL ban list"),this); - connect(m_pEnable,TQT_SIGNAL(clicked()),this,TQT_SLOT(enableClicked())); + connect(m_pEnable,TQ_SIGNAL(clicked()),this,TQ_SLOT(enableClicked())); m_pEnable->setChecked(banEnabled); g->addMultiCellWidget(m_pEnable,0,0,0,1); @@ -425,12 +425,12 @@ BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled) g->addMultiCellWidget(m_pBanList,1,1,0,1); m_pAddBtn = new TQPushButton(__tr2qs("&Add Ban"),this,"add"); - connect(m_pAddBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(addBan())); + connect(m_pAddBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(addBan())); m_pAddBtn->setEnabled(m_pEnable->isChecked()); g->addWidget(m_pAddBtn,2,0); m_pRemoveBtn = new TQPushButton(__tr2qs("&Remove Selected"),this,"remove"); - connect(m_pRemoveBtn,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeBan())); + connect(m_pRemoveBtn,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeBan())); m_pRemoveBtn->setEnabled(m_pEnable->isChecked()); g->addWidget(m_pRemoveBtn,2,1); } diff --git a/src/modules/window/userwindow.cpp b/src/modules/window/userwindow.cpp index e0a77c29..adf52cd3 100644 --- a/src/modules/window/userwindow.cpp +++ b/src/modules/window/userwindow.cpp @@ -53,7 +53,7 @@ KviUserWindow::KviUserWindow(KviFrame * pFrm,const char * name,int iIcon,KviCons // "vertical_splitter"); // With the IRC view over m_pIrcView = new KviIrcView(this,pFrm,this); - // connect(m_pIrcView,TQT_SIGNAL(rightClicked()),this,TQT_SLOT(textViewRightClicked())); + // connect(m_pIrcView,TQ_SIGNAL(rightClicked()),this,TQ_SLOT(textViewRightClicked())); // The userlist on the right // m_pUserListView = new KviUserListView(m_pSplitter,connection()->userDataBase(),this, // AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view"); |