diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-13 17:34:53 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-18 09:59:16 +0900 |
| commit | 40393e30bb743346b6b40bf130da35419c12ebdc (patch) | |
| tree | 9330d82486c7b3125b8275914565b324f9af523e | |
| parent | 05594058244ba6a1866d5758ae412fb5afd6d727 (diff) | |
| download | tdenetwork-40393e30bb743346b6b40bf130da35419c12ebdc.tar.gz tdenetwork-40393e30bb743346b6b40bf130da35419c12ebdc.zip | |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)
526 files changed, 5174 insertions, 5174 deletions
diff --git a/dcoprss/document.cpp b/dcoprss/document.cpp index fb5cd904..46f63e5d 100644 --- a/dcoprss/document.cpp +++ b/dcoprss/document.cpp @@ -79,8 +79,8 @@ void RSSDocument::loadingComplete(Loader *ldr, Document doc, Status stat) Image *img = m_Doc->image(); if ( img ) { - connect(img, TQT_SIGNAL(gotPixmap(const TQPixmap &)), - TQT_SLOT(pixmapLoaded(const TQPixmap &))); + connect(img, TQ_SIGNAL(gotPixmap(const TQPixmap &)), + TQ_SLOT(pixmapLoaded(const TQPixmap &))); img->getPixmap(); pixmapUpdating(DCOPRef(this)); } @@ -250,7 +250,7 @@ void RSSDocument::refresh() kdDebug() << "Document going to refresh" << endl; m_isLoading = true; Loader *loader = Loader::create(this, - TQT_SLOT(loadingComplete(Loader *, Document, Status))); + TQ_SLOT(loadingComplete(Loader *, Document, Status))); loader->loadFrom(KURL( m_Url ), new FileRetriever()); documentUpdating(DCOPRef(this)); } @@ -266,8 +266,8 @@ void RSSDocument::refresh() Image *img = m_Doc->image(); if ( img ) { - connect(img, TQT_SIGNAL(gotPixmap(const TQPixmap &)), - TQT_SLOT(pixmapLoaded(const TQPixmap &))); + connect(img, TQ_SIGNAL(gotPixmap(const TQPixmap &)), + TQ_SLOT(pixmapLoaded(const TQPixmap &))); img->getPixmap(); pixmapUpdating(DCOPRef(this)); } diff --git a/dcoprss/feedbrowser.cpp b/dcoprss/feedbrowser.cpp index 7ba86c51..6bee25e6 100644 --- a/dcoprss/feedbrowser.cpp +++ b/dcoprss/feedbrowser.cpp @@ -47,8 +47,8 @@ void CategoryItem::setOpen( bool open ) void CategoryItem::populate() { m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" ); - connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ), - this, TQT_SLOT( gotCategories( const TQStringList & ) ) ); + connect( m_dcopIface, TQ_SIGNAL( gotCategories( const TQStringList & ) ), + this, TQ_SLOT( gotCategories( const TQStringList & ) ) ); m_dcopIface->getCategories( m_category ); } @@ -92,8 +92,8 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name ) Close, Close, true ) { m_dcopIface = new DCOPRSSIface( this, "m_dcopIface" ); - connect( m_dcopIface, TQT_SIGNAL( gotCategories( const TQStringList & ) ), - this, TQT_SLOT( gotTopCategories( const TQStringList & ) ) ); + connect( m_dcopIface, TQ_SIGNAL( gotCategories( const TQStringList & ) ), + this, TQ_SLOT( gotTopCategories( const TQStringList & ) ) ); TQVBox *mainWidget = makeVBoxMainWidget(); @@ -101,10 +101,10 @@ FeedBrowserDlg::FeedBrowserDlg( TQWidget *parent, const char *name ) m_feedList->setAllColumnsShowFocus( true ); m_feedList->setRootIsDecorated( true ); m_feedList->addColumn( i18n( "Name" ) ); - connect( m_feedList, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); - connect( m_feedList, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( m_feedList, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); + connect( m_feedList, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( itemSelected( TQListViewItem * ) ) ); resize( 500, 400 ); diff --git a/dcoprss/query.cpp b/dcoprss/query.cpp index dcaa556e..dcd6e515 100644 --- a/dcoprss/query.cpp +++ b/dcoprss/query.cpp @@ -31,7 +31,7 @@ void SlotCaller::call( TQObject *object, const char *slot, const KXMLRPC::Query::Result &result ) { SlotCaller caller; - connect( &caller, TQT_SIGNAL( signal( const KXMLRPC::Query::Result &) ), + connect( &caller, TQ_SIGNAL( signal( const KXMLRPC::Query::Result &) ), object, slot ); emit caller.signal( result ); } @@ -89,7 +89,7 @@ void QueryService::findFeeds( const TQString &query ) args << query << "headlines_rank"; cachedCall( "syndic8.FindFeeds", Server::toVariantList( args ), - TQT_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) ); } void QueryService::findSites( const TQString& query ) @@ -97,7 +97,7 @@ void QueryService::findSites( const TQString& query ) kdDebug() << "QueryService::findSites()" << endl; cachedCall( "syndic8.FindSites", Server::toVariantList( query ), - TQT_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotFoundFeeds( const KXMLRPC::Query::Result & ) ) ); } void QueryService::getFeedInfo( const TQVariant& ids ) @@ -105,7 +105,7 @@ void QueryService::getFeedInfo( const TQVariant& ids ) kdDebug() << "QueryService::getFeedInfo()" << endl; cachedCall( "syndic8.GetFeedInfo", Server::toVariantList( ids ), - TQT_SLOT( slotGotFeedInfo( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotGotFeedInfo( const KXMLRPC::Query::Result & ) ) ); } void QueryService::getCategories( const TQString &category ) @@ -114,12 +114,12 @@ void QueryService::getCategories( const TQString &category ) if ( category == "Top" ) { cachedCall( "syndic8.GetCategoryRoots", Server::toVariantList( TQString::fromLatin1( "DMOZ" ) ), - TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) ); } else { TQStringList args; args << "DMOZ" << category; cachedCall( "syndic8.GetCategoryChildren", Server::toVariantList( args ), - TQT_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotGotCategories( const KXMLRPC::Query::Result & ) ) ); } } @@ -131,7 +131,7 @@ void QueryService::getFeedsInCategory( const TQString &category ) args << "DMOZ" << category; cachedCall( "syndic8.GetFeedsInCategory", Server::toVariantList( args ), - TQT_SLOT( slotGotFeedsInCategory( const KXMLRPC::Query::Result & ) ) ); + TQ_SLOT( slotGotFeedsInCategory( const KXMLRPC::Query::Result & ) ) ); } void QueryService::slotFoundFeeds( const KXMLRPC::Query::Result &result ) diff --git a/dcoprss/xmlrpciface.cpp b/dcoprss/xmlrpciface.cpp index e34907e2..7c868d50 100644 --- a/dcoprss/xmlrpciface.cpp +++ b/dcoprss/xmlrpciface.cpp @@ -55,12 +55,12 @@ void Query::call( const TQString &server, const TQString &method, TDEIO::TransferJob *job = TDEIO::http_post( KURL( server ), postData, false ); job->addMetaData( "UserAgent", userAgent ); job->addMetaData( "content-type", "Content-Type: text/xml; charset=utf-8" ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void Query::slotInfoMessage( TDEIO::Job *, const TQString &msg ) @@ -373,9 +373,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args, } Query *query = Query::create( this ); - connect( query, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - connect( query, TQT_SIGNAL( finished( const KXMLRPC::Query::Result & ) ), + connect( query, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + connect( query, TQ_SIGNAL( finished( const KXMLRPC::Query::Result & ) ), receiver, slot ); query->call( m_url.url(), method, args, m_userAgent ); } @@ -390,9 +390,9 @@ void Server::call( const TQString &method, const TQValueList<TQVariant> &args, } Query *query = Query::create( this ); - connect( query, TQT_SIGNAL( infoMessage( const TQString &msg ) ), + connect( query, TQ_SIGNAL( infoMessage( const TQString &msg ) ), infoObject, infoSlot ); - connect( query, TQT_SIGNAL( finished( const KXMLRPC::Query::Result & ) ), + connect( query, TQ_SIGNAL( finished( const KXMLRPC::Query::Result & ) ), receiver, slot ); query->call( m_url.url(), method, args, m_userAgent ); } diff --git a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp index 099e29ea..bd82714f 100644 --- a/filesharing/advanced/kcm_sambaconf/dictmanager.cpp +++ b/filesharing/advanced/kcm_sambaconf/dictmanager.cpp @@ -64,7 +64,7 @@ void DictManager::handleUnsupportedWidget(const TQString & s, TQWidget* w) { void DictManager::add(const TQString & key, TQLineEdit* lineEdit) { if (_share->optionSupported(key)) { lineEditDict.insert(key,lineEdit); - connect(lineEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedSlot())); + connect(lineEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedSlot())); } else handleUnsupportedWidget(key,lineEdit); } @@ -72,7 +72,7 @@ void DictManager::add(const TQString & key, TQLineEdit* lineEdit) { void DictManager::add(const TQString & key, TQCheckBox* checkBox){ if (_share->optionSupported(key)) { checkBoxDict.insert(key,checkBox); - connect(checkBox, TQT_SIGNAL(clicked()), this, TQT_SLOT(changedSlot())); + connect(checkBox, TQ_SIGNAL(clicked()), this, TQ_SLOT(changedSlot())); } else handleUnsupportedWidget(key,checkBox); } @@ -80,7 +80,7 @@ void DictManager::add(const TQString & key, TQCheckBox* checkBox){ void DictManager::add(const TQString & key, KURLRequester* urlRq){ if (_share->optionSupported(key)) { urlRequesterDict.insert(key,urlRq); - connect(urlRq, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(changedSlot())); + connect(urlRq, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(changedSlot())); } else handleUnsupportedWidget(key,urlRq); } @@ -88,7 +88,7 @@ void DictManager::add(const TQString & key, KURLRequester* urlRq){ void DictManager::add(const TQString & key, TQSpinBox* spinBox){ if (_share->optionSupported(key)) { spinBoxDict.insert(key,spinBox); - connect(spinBox, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(changedSlot())); + connect(spinBox, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(changedSlot())); } else handleUnsupportedWidget(key,spinBox); } @@ -97,7 +97,7 @@ void DictManager::add(const TQString & key, TQComboBox* comboBox, TQStringList* if (_share->optionSupported(key)) { comboBoxDict.insert(key,comboBox); comboBoxValuesDict.insert(key,values); - connect(comboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(changedSlot())); + connect(comboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(changedSlot())); } else handleUnsupportedWidget(key,comboBox); } diff --git a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp index 2b629f42..8ed4cacb 100644 --- a/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp +++ b/filesharing/advanced/kcm_sambaconf/hiddenfileview.cpp @@ -121,18 +121,18 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share) _dlg->hiddenChk->setTristate(true); _dlg->vetoChk->setTristate(true); - connect( _dlg->hiddenChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( hiddenChkClicked(bool) )); - connect( _dlg->vetoChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( vetoChkClicked(bool) )); - connect( _dlg->vetoOplockChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( vetoOplockChkClicked(bool) )); + connect( _dlg->hiddenChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( hiddenChkClicked(bool) )); + connect( _dlg->vetoChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( vetoChkClicked(bool) )); + connect( _dlg->vetoOplockChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( vetoOplockChkClicked(bool) )); _dlg->hiddenEdit->setText( _share->getValue("hide files") ); - connect( _dlg->hiddenEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView())); + connect( _dlg->hiddenEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView())); _dlg->vetoEdit->setText( _share->getValue("veto files") ); - connect( _dlg->vetoEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView())); + connect( _dlg->vetoEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView())); _dlg->vetoOplockEdit->setText( _share->getValue("veto oplock files") ); - connect( _dlg->vetoOplockEdit, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(updateView())); + connect( _dlg->vetoOplockEdit, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(updateView())); // new TQLabel(i18n("Hint")+" : ",grid); // new TQLabel(i18n("You have to separate the entries with a '/'. You can use the wildcards '*' and '?'"),grid); @@ -142,18 +142,18 @@ HiddenFileView::HiddenFileView(ShareDlgImpl* shareDlg, SambaShare* share) _dir = new KDirLister(true); _dir->setShowingDotFiles(true); - connect( _dir, TQT_SIGNAL(newItems(const KFileItemList &)), - this, TQT_SLOT(insertNewFiles(const KFileItemList &))); + connect( _dir, TQ_SIGNAL(newItems(const KFileItemList &)), + this, TQ_SLOT(insertNewFiles(const KFileItemList &))); - connect( _dir, TQT_SIGNAL(deleteItem(KFileItem*)), - this, TQT_SLOT(deleteItem(KFileItem*))); + connect( _dir, TQ_SIGNAL(deleteItem(KFileItem*)), + this, TQ_SLOT(deleteItem(KFileItem*))); - connect( _dir, TQT_SIGNAL(refreshItems(const KFileItemList &)), - this, TQT_SLOT(refreshItems(const KFileItemList &))); + connect( _dir, TQ_SIGNAL(refreshItems(const KFileItemList &)), + this, TQ_SLOT(refreshItems(const KFileItemList &))); - connect( _hiddenActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hiddenChkClicked(bool))); - connect( _vetoActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(vetoChkClicked(bool))); - connect( _vetoOplockActn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(vetoOplockChkClicked(bool))); + connect( _hiddenActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hiddenChkClicked(bool))); + connect( _vetoActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(vetoChkClicked(bool))); + connect( _vetoOplockActn, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(vetoOplockChkClicked(bool))); } void HiddenFileView::initListView() @@ -172,15 +172,15 @@ void HiddenFileView::initListView() _vetoActn->plug(_popup); _vetoOplockActn->plug(_popup); - connect( _dlg->hiddenListView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect( _dlg->hiddenListView, TQT_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(showContextMenu())); + connect( _dlg->hiddenListView, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); + connect( _dlg->hiddenListView, TQ_SIGNAL(contextMenu(TDEListView*,TQListViewItem*,const TQPoint&)), + this, TQ_SLOT(showContextMenu())); - connect( _dlg->hideDotFilesChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideDotFilesChkClicked(bool))); - connect( _dlg->hideUnreadableChk, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(hideUnreadableChkClicked(bool))); + connect( _dlg->hideDotFilesChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hideDotFilesChkClicked(bool))); + connect( _dlg->hideUnreadableChk, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(hideUnreadableChkClicked(bool))); - connect( _dlg->hiddenListView, TQT_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)), - this, TQT_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int))); + connect( _dlg->hiddenListView, TQ_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)), + this, TQ_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int))); } HiddenFileView::~HiddenFileView() diff --git a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp index c4b9c25f..c4e41d14 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp +++ b/filesharing/advanced/kcm_sambaconf/kcmsambaconf.cpp @@ -202,8 +202,8 @@ KcmSambaConf::~KcmSambaConf() { void KcmSambaConf::createSmbConfigWidget() { m_smbConfConfigWidget = new SmbConfConfigWidget(this); - connect( m_smbConfConfigWidget, TQT_SIGNAL(smbConfChoosed(const TQString &)), - this, TQT_SLOT(slotSpecifySmbConf(const TQString &))); + connect( m_smbConfConfigWidget, TQ_SIGNAL(smbConfChoosed(const TQString &)), + this, TQ_SLOT(slotSpecifySmbConf(const TQString &))); } void KcmSambaConf::slotSpecifySmbConf(const TQString & smbConf) { @@ -231,45 +231,45 @@ void KcmSambaConf::init() { _interface = new KcmInterface(this); - connect ( _interface->sambaUserPasswordBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(sambaUserPasswordBtnClicked())); + connect ( _interface->sambaUserPasswordBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(sambaUserPasswordBtnClicked())); - connect ( _interface->editShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editShare())); - connect ( _interface->addShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addShare())); - connect ( _interface->removeShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeShare())); + connect ( _interface->editShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editShare())); + connect ( _interface->addShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addShare())); + connect ( _interface->removeShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeShare())); - connect ( _interface->editPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editPrinter())); - connect ( _interface->addPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(addPrinter())); - connect ( _interface->removePrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(removePrinter())); + connect ( _interface->editPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editPrinter())); + connect ( _interface->addPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(addPrinter())); + connect ( _interface->removePrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(removePrinter())); - connect ( _interface->editDefaultPrinterBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editPrinterDefaults())); - connect ( _interface->editDefaultShareBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(editShareDefaults())); + connect ( _interface->editDefaultPrinterBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editPrinterDefaults())); + connect ( _interface->editDefaultShareBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(editShareDefaults())); - connect( _interface->domainRadio, TQT_SIGNAL(toggled(bool)), - _interface->joinADomainBtn, TQT_SLOT( setEnabled(bool) )); + connect( _interface->domainRadio, TQ_SIGNAL(toggled(bool)), + _interface->joinADomainBtn, TQ_SLOT( setEnabled(bool) )); - connect(_interface->nullPasswordsChk,TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(nullPasswordsEnabled(bool))); + connect(_interface->nullPasswordsChk,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(nullPasswordsEnabled(bool))); - connect( _interface->addSambaUserBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT( addSambaUserBtnClicked() )); + connect( _interface->addSambaUserBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT( addSambaUserBtnClicked() )); - connect( _interface->removeSambaUserBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT( removeSambaUserBtnClicked() )); + connect( _interface->removeSambaUserBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT( removeSambaUserBtnClicked() )); _interface->removeSambaUserBtn->setIconSet(SmallIconSet("1rightarrow")); _interface->addSambaUserBtn->setIconSet(SmallIconSet("1leftarrow")); - connect( _interface->sambaUsersListView, TQT_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)), - this, TQT_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int))); + connect( _interface->sambaUsersListView, TQ_SIGNAL(mouseButtonPressed(int,TQListViewItem*,const TQPoint &,int)), + this, TQ_SLOT(slotMouseButtonPressed(int,TQListViewItem*,const TQPoint &,int))); - connect( _interface->joinADomainBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT( joinADomainBtnClicked() )); + connect( _interface->joinADomainBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT( joinADomainBtnClicked() )); - connect( _interface->loadBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT( loadBtnClicked() )); + connect( _interface->loadBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT( loadBtnClicked() )); - connect( _interface, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged())); + connect( _interface, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged())); } @@ -366,11 +366,11 @@ void KcmSambaConf::editShare() return; ShareDlgImpl* dlg = new ShareDlgImpl(_interface,item->getShare()); - connect(dlg, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged())); + connect(dlg, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged())); dlg->exec(); item->updateShare(); - disconnect(dlg, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged())); + disconnect(dlg, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged())); delete dlg; @@ -504,8 +504,8 @@ void KcmSambaConf::load(const TQString & smbFile) _sambaFile = new SambaFile(_smbconf,false); - connect( _sambaFile, TQT_SIGNAL(completed()), this, TQT_SLOT(fillFields())); - connect( _sambaFile, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(loadCanceled(const TQString &))); + connect( _sambaFile, TQ_SIGNAL(completed()), this, TQ_SLOT(fillFields())); + connect( _sambaFile, TQ_SIGNAL(canceled(const TQString &)), this, TQ_SLOT(loadCanceled(const TQString &))); _sambaFile->load(); @@ -579,7 +579,7 @@ void KcmSambaConf::fillFields() loadUserTab(); - connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(configChanged())); + connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(configChanged())); } diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 81c95f6c..4953b27c 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -108,7 +108,7 @@ void PrinterDlgImpl::initDialog() _userTab = new UserTabImpl(this,_share); _tabs->insertTab(_userTab,i18n("&Users"),1); _userTab->load(); - connect(_userTab, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot())); + connect(_userTab, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot())); // Printing @@ -156,7 +156,7 @@ void PrinterDlgImpl::initDialog() _dictMngr->add("root postexec",rootPostExecEdit); _dictMngr->load( _share ); - connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot())); + connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot())); } diff --git a/filesharing/advanced/kcm_sambaconf/sambafile.cpp b/filesharing/advanced/kcm_sambaconf/sambafile.cpp index a9eb26a5..f667857c 100644 --- a/filesharing/advanced/kcm_sambaconf/sambafile.cpp +++ b/filesharing/advanced/kcm_sambaconf/sambafile.cpp @@ -200,8 +200,8 @@ bool SambaFile::slotApply() srcURL.setPath( _tempFile->name() ); TDEIO::FileCopyJob * job = TDEIO::file_copy( srcURL, url, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotSaveJobFinished ( TDEIO::Job * ) ) ); return (job->error()==0); } @@ -347,8 +347,8 @@ int SambaFile::getSambaVersion() { _parmOutput = TQString(""); _sambaVersion = 2; - connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); + connect( &testParam, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); if (testParam.start(TDEProcess::Block, TDEProcess::Stdout)) { if (_parmOutput.find(" 3.") > -1) { @@ -383,8 +383,8 @@ SambaShare* SambaFile::getTestParmValues(bool reload) testParam << "/dev/null"; _parmOutput = TQString(""); - connect( &testParam, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); + connect( &testParam, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(testParmStdOutReceived(TDEProcess*,char*,int))); if (testParam.start(TDEProcess::Block,TDEProcess::Stdout)) { @@ -493,7 +493,7 @@ bool SambaFile::load() destURL.setPath( localPath ); TDEIO::FileCopyJob * job = TDEIO::file_copy( url, destURL, 0600, true, false, true ); // emit started( d->m_job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } else { localPath = path; diff --git a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp index 7d73a3d7..4332ee7f 100644 --- a/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/sharedlgimpl.cpp @@ -122,7 +122,7 @@ void ShareDlgImpl::initDialog() _userTab = new UserTabImpl(this,_share); _tabs->insertTab(_userTab,i18n("&Users"),1); _userTab->load(); - connect(_userTab, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot())); + connect(_userTab, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot())); // Filename settings @@ -256,8 +256,8 @@ void ShareDlgImpl::initDialog() _dictMngr->load( _share ); - connect( _tabs, TQT_SIGNAL(currentChanged(TQWidget*)), this, TQT_SLOT(tabChangedSlot(TQWidget*))); - connect(_dictMngr, TQT_SIGNAL(changed()), this, TQT_SLOT(changedSlot())); + connect( _tabs, TQ_SIGNAL(currentChanged(TQWidget*)), this, TQ_SLOT(tabChangedSlot(TQWidget*))); + connect(_dictMngr, TQ_SIGNAL(changed()), this, TQ_SLOT(changedSlot())); } ShareDlgImpl::~ShareDlgImpl() diff --git a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp index b3cc0b82..543f3989 100644 --- a/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbconfconfigwidget.cpp @@ -51,7 +51,7 @@ SmbConfConfigWidget::SmbConfConfigWidget(TQWidget* parent) TQHBoxLayout *hbox = new TQHBoxLayout(NULL, 0, KDialog::spacingHint()); TQPushButton *btn = new TQPushButton(i18n("Specify Location"), this); - connect(btn, TQT_SIGNAL(pressed()), this, TQT_SLOT( btnPressed())); + connect(btn, TQ_SIGNAL(pressed()), this, TQ_SLOT( btnPressed())); btn->setDefault(false); btn->setAutoDefault(false); diff --git a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp index cf91918f..0e78d312 100644 --- a/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp +++ b/filesharing/advanced/kcm_sambaconf/smbpasswdfile.cpp @@ -115,8 +115,8 @@ bool SmbPasswdFile::executeSmbpasswd(const TQStringList & args) { TDEProcess p; p << "smbpasswd" << args; - connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); + connect( &p, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); _smbpasswdOutput = ""; @@ -141,8 +141,8 @@ bool SmbPasswdFile::addUser(const SambaUser & user,const TQString & password) p << password; - connect( &p, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), - this, TQT_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); + connect( &p, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), + this, TQ_SLOT(smbpasswdStdOutReceived(TDEProcess*,char*,int))); _smbpasswdOutput = ""; diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp index 9636b5cb..666901b0 100644 --- a/filesharing/advanced/nfs/nfsdialog.cpp +++ b/filesharing/advanced/nfs/nfsdialog.cpp @@ -66,16 +66,16 @@ void NFSDialog::initGUI() { layout->addWidget( m_gui ); TDEAccel* accel = new TDEAccel( m_gui->listView ); - accel->insert( "Delete", TQt::Key_Delete, this, TQT_SLOT(slotRemoveHost())); + accel->insert( "Delete", TQt::Key_Delete, this, TQ_SLOT(slotRemoveHost())); } void NFSDialog::initSlots() { - connect( m_gui->removeHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotRemoveHost())); - connect( m_gui->addHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotAddHost())); - connect( m_gui->modifyHostBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotModifyHost())); - connect( m_gui->listView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT( slotModifyHost())); + connect( m_gui->removeHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotRemoveHost())); + connect( m_gui->addHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotAddHost())); + connect( m_gui->modifyHostBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotModifyHost())); + connect( m_gui->listView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT( slotModifyHost())); } diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp index 4b62845e..e4575cdb 100644 --- a/filesharing/advanced/nfs/nfshostdlg.cpp +++ b/filesharing/advanced/nfs/nfshostdlg.cpp @@ -44,7 +44,7 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry) TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 ); layout->addWidget( m_gui ); - connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified())); + connect( m_gui, TQ_SIGNAL(modified()), this, TQ_SLOT(setModified())); init(); diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp index c4e9a4b2..d6ca9f37 100644 --- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp +++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp @@ -78,8 +78,8 @@ PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterU KFile::ExistingOnly | KFile::LocalOnly ); urlRq->setURL(m_path); - connect( urlRq, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(urlRqTextChanged(const TQString&))); + connect( urlRq, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(urlRqTextChanged(const TQString&))); } else { urlRq->hide(); folderLbl->hide(); @@ -90,7 +90,7 @@ PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterU enableNFS(false,i18n("Reading NFS configuration file ...")); - //TQTimer::singleShot(1, this, TQT_SLOT(load)); + //TQTimer::singleShot(1, this, TQ_SLOT(load)); load(); } diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp index 2b05706c..4ce5e828 100644 --- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp +++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp @@ -78,7 +78,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, } KPushButton* btn = new KPushButton( i18n("Configure File Sharing..."), widget ); - connect( btn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); + connect( btn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); btn->setDefault(false); TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L ); hBox->addWidget( btn, 0, TQt::AlignLeft ); @@ -91,8 +91,8 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg, d = new Private(); d->page = new PropertiesPage(vbox, properties->items(),false); - connect(d->page, TQT_SIGNAL(changed()), - this, TQT_SIGNAL(changed())); + connect(d->page, TQ_SIGNAL(changed()), + this, TQ_SIGNAL(changed())); kdDebug(5009) << "Fileshare properties dialog plugin loaded" << endl; diff --git a/filesharing/simple/fileshare.cpp b/filesharing/simple/fileshare.cpp index 2ce40e3a..d1e23711 100644 --- a/filesharing/simple/fileshare.cpp +++ b/filesharing/simple/fileshare.cpp @@ -76,9 +76,9 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS sharing=new TQRadioButton( i18n("&Allow users to share files from their HOME folder"), box); */ m_ccgui = new ControlCenterGUI(this); - connect( m_ccgui, TQT_SIGNAL( changed()), this, TQT_SLOT(configChanged())); - connect( m_ccgui->allowedUsersBtn, TQT_SIGNAL( clicked()), - this, TQT_SLOT(allowedUsersBtnClicked())); + connect( m_ccgui, TQ_SIGNAL( changed()), this, TQ_SLOT(configChanged())); + connect( m_ccgui->allowedUsersBtn, TQ_SIGNAL( clicked()), + this, TQ_SLOT(allowedUsersBtnClicked())); TQString path = TQString::fromLocal8Bit( getenv( "PATH" ) ); path += TQString::fromLatin1(":/usr/sbin"); @@ -108,10 +108,10 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS m_ccgui->infoLbl->hide(); layout->addWidget(m_ccgui); updateShareListView(); - connect( KNFSShare::instance(), TQT_SIGNAL( changed()), - this, TQT_SLOT(updateShareListView())); - connect( KSambaShare::instance(), TQT_SIGNAL( changed()), - this, TQT_SLOT(updateShareListView())); + connect( KNFSShare::instance(), TQ_SIGNAL( changed()), + this, TQ_SLOT(updateShareListView())); + connect( KSambaShare::instance(), TQ_SIGNAL( changed()), + this, TQ_SLOT(updateShareListView())); } @@ -120,12 +120,12 @@ KFileShareConfig::KFileShareConfig(TQWidget *parent, const char *name, const TQS ((KFileShare::shareMode() == KFileShare::Advanced) && (KFileShare::authorization() == KFileShare::Authorized))) { - connect( m_ccgui->addShareBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addShareBtnClicked())); - connect( m_ccgui->changeShareBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(changeShareBtnClicked())); - connect( m_ccgui->removeShareBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeShareBtnClicked())); + connect( m_ccgui->addShareBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addShareBtnClicked())); + connect( m_ccgui->changeShareBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(changeShareBtnClicked())); + connect( m_ccgui->removeShareBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeShareBtnClicked())); m_ccgui->listView->setSelectionMode(TQListView::Extended); m_ccgui->shareBtnPnl->setEnabled(true); } diff --git a/filesharing/simple/groupconfigdlg.cpp b/filesharing/simple/groupconfigdlg.cpp index 67d66274..56530e7c 100644 --- a/filesharing/simple/groupconfigdlg.cpp +++ b/filesharing/simple/groupconfigdlg.cpp @@ -81,12 +81,12 @@ void GroupConfigDlg::initGUI() { m_gui->groupUsersRadio->setChecked(m_restricted); m_gui->writeAccessChk->setChecked(!m_rootPassNeeded); - connect( m_gui->addBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddUser())); - connect( m_gui->removeBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveUser())); - connect( m_gui->otherGroupBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotChangeGroup())); + connect( m_gui->addBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddUser())); + connect( m_gui->removeBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveUser())); + connect( m_gui->otherGroupBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotChangeGroup())); if (m_simpleSharing) { // if simple sharing users never need the root password diff --git a/kdict/actions.cpp b/kdict/actions.cpp index 2448a2e9..f35dfbb4 100644 --- a/kdict/actions.cpp +++ b/kdict/actions.cpp @@ -50,15 +50,15 @@ int DictComboAction::plug( TQWidget *widget, int index ) bar->setItemAutoSized(id_,m_autoSized); if ( m_combo ) { - connect(bar->getCombo(id_), TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotComboActivated(const TQString&))); - connect(bar->getCombo(id_), TQT_SIGNAL(activated(int)), TQT_SLOT(slotComboActivated(int))); + connect(bar->getCombo(id_), TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotComboActivated(const TQString&))); + connect(bar->getCombo(id_), TQ_SIGNAL(activated(int)), TQ_SLOT(slotComboActivated(int))); if (m_editable) m_combo->setInsertionPolicy( TQComboBox::NoInsertion ); } addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -222,7 +222,7 @@ int DictLabelAction::plug( TQWidget *widget, int index ) addContainer( tb, id ); - connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); m_label = label; @@ -284,12 +284,12 @@ int DictButtonAction::plug( TQWidget *widget, int index ) TQPushButton *button = new TQPushButton( text(), widget ); button->adjustSize(); - connect(button,TQT_SIGNAL(clicked()),this,TQT_SLOT(activate())); + connect(button,TQ_SIGNAL(clicked()),this,TQ_SLOT(activate())); tb->insertWidget( id, button->width(), button, index ); addContainer( tb, id ); - connect( tb, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( tb, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); m_button = button; diff --git a/kdict/applet/kdictapplet.cpp b/kdict/applet/kdictapplet.cpp index 04268177..1fa07914 100644 --- a/kdict/applet/kdictapplet.cpp +++ b/kdict/applet/kdictapplet.cpp @@ -60,7 +60,7 @@ void PopupBox::hideEvent(TQHideEvent *) { emit(hidden()); popupEnabled = false; - TQTimer::singleShot(100, this, TQT_SLOT(enablePopup())); + TQTimer::singleShot(100, this, TQ_SLOT(enablePopup())); } @@ -111,7 +111,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid clipboardBtn->setBackgroundOrigin(AncestorOrigin); clipboardBtn->setFont(f); clipboardBtn->setFixedSize(16,16); - connect(clipboardBtn, TQT_SIGNAL(clicked()), TQT_SLOT(queryClipboard())); + connect(clipboardBtn, TQ_SIGNAL(clicked()), TQ_SLOT(queryClipboard())); baseLay->addWidget(clipboardBtn,0,3); TQToolTip::add(clipboardBtn,i18n("Define selected text")); @@ -120,7 +120,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid defineBtn->setFont(f); defineBtn->setFixedSize(16,16); defineBtn->setEnabled(false); - connect(defineBtn, TQT_SIGNAL(clicked()), TQT_SLOT(startDefine())); + connect(defineBtn, TQ_SIGNAL(clicked()), TQ_SLOT(startDefine())); baseLay->addWidget(defineBtn,0,4); TQToolTip::add(defineBtn,i18n("Define word/phrase")); @@ -129,7 +129,7 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid matchBtn->setFont(f); matchBtn->setFixedSize(16,16); matchBtn->setEnabled(false); - connect(matchBtn, TQT_SIGNAL(clicked()), TQT_SLOT(startMatch())); + connect(matchBtn, TQ_SIGNAL(clicked()), TQ_SLOT(startMatch())); baseLay->addWidget(matchBtn,0,5); TQToolTip::add(matchBtn,i18n("Find matching definitions")); @@ -141,8 +141,8 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid internalCombo->setFocus(); internalCombo->clearEdit(); internalCombo->lineEdit()->installEventFilter( this ); - connect(internalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&))); - connect(internalCombo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(comboTextChanged(const TQString&))); + connect(internalCombo, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(startQuery(const TQString&))); + connect(internalCombo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(comboTextChanged(const TQString&))); TQToolTip::add(internalCombo,i18n("Look up a word or phrase with Kdict")); baseLay->addMultiCellWidget(internalCombo,1,1,1,5); @@ -151,21 +151,21 @@ DictApplet::DictApplet(const TQString& configFile, Type type, int actions, TQWid // widgets for a vertical panel verticalBtn = new TQPushButton(this); - connect(verticalBtn, TQT_SIGNAL(pressed()), TQT_SLOT(showExternalCombo())); + connect(verticalBtn, TQ_SIGNAL(pressed()), TQ_SLOT(showExternalCombo())); TQToolTip::add(verticalBtn,i18n("Look up a word or phrase with Kdict")); popupBox = new PopupBox(); popupBox->setFixedSize(160, 22); - connect(popupBox, TQT_SIGNAL(hidden()), TQT_SLOT(externalComboHidden())); + connect(popupBox, TQ_SIGNAL(hidden()), TQ_SLOT(externalComboHidden())); externalCombo = new KHistoryCombo(popupBox); externalCombo->setCompletionObject(completionObject); - connect(externalCombo, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(startQuery(const TQString&))); + connect(externalCombo, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(startQuery(const TQString&))); externalCombo->setFixedSize(160, externalCombo->sizeHint().height()); - connect(internalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); - connect(externalCombo, TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), - this, TQT_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); + connect(internalCombo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQ_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); + connect(externalCombo, TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)), + this, TQ_SLOT(updateCompletionMode(TDEGlobalSettings::Completion))); // restore history and completion list TDEConfig *c = config(); @@ -282,7 +282,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data) waiting = 1; delayedFunc = fun.copy(); delayedData = data; - TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); + TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand())); return; } else { QCStringList list = client->remoteObjects("kdict"); @@ -290,7 +290,7 @@ void DictApplet::sendCommand(const TQCString &fun, const TQString &data) waiting = 1; delayedFunc = fun.copy(); delayedData = data; - TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); + TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand())); return; } } @@ -309,13 +309,13 @@ void DictApplet::sendDelayedCommand() DCOPClient *client = kapp->dcopClient(); if (!client->isApplicationRegistered("kdict")) { waiting++; - TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); + TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand())); return; } else { QCStringList list = client->remoteObjects("kdict"); if (list.findIndex("KDictIface")==-1) { waiting++; - TQTimer::singleShot(100, this, TQT_SLOT(sendDelayedCommand())); + TQTimer::singleShot(100, this, TQ_SLOT(sendDelayedCommand())); return; } } diff --git a/kdict/dict.cpp b/kdict/dict.cpp index 6864cfe8..f7d183cd 100644 --- a/kdict/dict.cpp +++ b/kdict/dict.cpp @@ -1199,7 +1199,7 @@ DictInterface::DictInterface() } notifier = new TQSocketNotifier(fdPipeIn[0],TQSocketNotifier::Read,this); - connect(notifier,TQT_SIGNAL(activated(int)),this,TQT_SLOT(clientDone())); + connect(notifier,TQ_SIGNAL(activated(int)),this,TQ_SLOT(clientDone())); // initialize the KSocks stuff in the main thread, otherwise we get // strange effects on FreeBSD @@ -1218,7 +1218,7 @@ DictInterface::DictInterface() DictInterface::~DictInterface() { - disconnect(notifier,TQT_SIGNAL(activated(int)),this,TQT_SLOT(clientDone())); + disconnect(notifier,TQ_SIGNAL(activated(int)),this,TQ_SLOT(clientDone())); if (client) { client->request_termination(); diff --git a/kdict/matchview.cpp b/kdict/matchview.cpp index 556685f5..424ae13e 100644 --- a/kdict/matchview.cpp +++ b/kdict/matchview.cpp @@ -120,7 +120,7 @@ MatchView::MatchView(TQWidget *parent, const char *name) boxLayout->addSpacing(1); w_strat = new TQComboBox(false,this); w_strat->setFixedHeight(w_strat->sizeHint().height()); - connect(w_strat,TQT_SIGNAL(activated(int)),this,TQT_SLOT(strategySelected(int))); + connect(w_strat,TQ_SIGNAL(activated(int)),this,TQ_SLOT(strategySelected(int))); boxLayout->addWidget(w_strat,0); boxLayout->addSpacing(1); @@ -134,12 +134,12 @@ MatchView::MatchView(TQWidget *parent, const char *name) w_list->setTreeStepSize(18); w_list->setSorting(-1); // disable sorting w_list->setMinimumHeight(w_strat->sizeHint().height()); - connect(w_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(enableGetButton())); - connect(w_list,TQT_SIGNAL(returnPressed(TQListViewItem *)),TQT_SLOT(returnPressed(TQListViewItem *))); - connect(w_list,TQT_SIGNAL(doubleClicked(TQListViewItem *)),TQT_SLOT(getOneItem(TQListViewItem *))); - connect(w_list,TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); - connect(w_list,TQT_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),TQT_SLOT(buildPopupMenu(TQListViewItem *,const TQPoint &,int))); + connect(w_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(enableGetButton())); + connect(w_list,TQ_SIGNAL(returnPressed(TQListViewItem *)),TQ_SLOT(returnPressed(TQListViewItem *))); + connect(w_list,TQ_SIGNAL(doubleClicked(TQListViewItem *)),TQ_SLOT(getOneItem(TQListViewItem *))); + connect(w_list,TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(mouseButtonPressed(int, TQListViewItem *, const TQPoint &, int))); + connect(w_list,TQ_SIGNAL(rightButtonPressed(TQListViewItem *,const TQPoint &,int)),TQ_SLOT(buildPopupMenu(TQListViewItem *,const TQPoint &,int))); boxLayout->addWidget(w_list,1); boxLayout->addSpacing(1); @@ -147,16 +147,16 @@ MatchView::MatchView(TQWidget *parent, const char *name) w_get->setFixedHeight(w_get->sizeHint().height()-3); w_get->setMinimumWidth(w_get->sizeHint().width()-20); w_get->setEnabled(false); - connect(w_get, TQT_SIGNAL(clicked()), this, TQT_SLOT(getSelected())); + connect(w_get, TQ_SIGNAL(clicked()), this, TQ_SLOT(getSelected())); boxLayout->addWidget(w_get,0); w_getAll = new TQPushButton(i18n("Get &All"),this); w_getAll->setFixedHeight(w_getAll->sizeHint().height()-3); w_getAll->setMinimumWidth(w_getAll->sizeHint().width()-20); w_getAll->setEnabled(false); - connect(w_getAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(getAll())); + connect(w_getAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(getAll())); boxLayout->addWidget(w_getAll,0); - connect(interface,TQT_SIGNAL(matchReady(const TQStringList &)),this,TQT_SLOT(newList(const TQStringList &))); + connect(interface,TQ_SIGNAL(matchReady(const TQStringList &)),this,TQ_SLOT(newList(const TQStringList &))); rightBtnMenu = new TDEPopupMenu(); } @@ -380,10 +380,10 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int) if ((i!=0L)&&(i->isExpandable()||i->parent())) { popupCurrent = (MatchViewItem *)(i); - rightBtnMenu->insertItem(i18n("&Get"),this,TQT_SLOT(popupGetCurrent())); + rightBtnMenu->insertItem(i18n("&Get"),this,TQ_SLOT(popupGetCurrent())); if (!i->isExpandable()) { // toplevel item -> only "get" - rightBtnMenu->insertItem(i18n("&Match"),this,TQT_SLOT(popupMatchCurrent())); - rightBtnMenu->insertItem(i18n("&Define"),this,TQT_SLOT(popupDefineCurrent())); + rightBtnMenu->insertItem(i18n("&Match"),this,TQ_SLOT(popupMatchCurrent())); + rightBtnMenu->insertItem(i18n("&Define"),this,TQ_SLOT(popupDefineCurrent())); } rightBtnMenu->insertSeparator(); } @@ -396,20 +396,20 @@ void MatchView::buildPopupMenu(TQListViewItem *i, const TQPoint &_point, int) } if (!text.isEmpty()) { popupClip = kapp->clipboard()->text(); - rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQT_SLOT(popupMatchClip())); - rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQT_SLOT(popupDefineClip())); + rightBtnMenu->insertItem(i18n("Match &Clipboard Content"),this,TQ_SLOT(popupMatchClip())); + rightBtnMenu->insertItem(SmallIcon("define_clip"),i18n("D&efine Clipboard Content"),this,TQ_SLOT(popupDefineClip())); rightBtnMenu->insertSeparator(); } - int ID = rightBtnMenu->insertItem(i18n("Get &Selected"),this,TQT_SLOT(getSelected())); + int ID = rightBtnMenu->insertItem(i18n("Get &Selected"),this,TQ_SLOT(getSelected())); rightBtnMenu->setItemEnabled(ID,getOn); - ID = rightBtnMenu->insertItem(i18n("Get &All"),this,TQT_SLOT(getAll())); + ID = rightBtnMenu->insertItem(i18n("Get &All"),this,TQ_SLOT(getAll())); rightBtnMenu->setItemEnabled(ID,getAllOn); if (w_list->childCount()) { rightBtnMenu->insertSeparator(); - rightBtnMenu->insertItem(i18n("E&xpand List"),this,TQT_SLOT(expandList())); - rightBtnMenu->insertItem(i18n("C&ollapse List"),this,TQT_SLOT(collapseList())); + rightBtnMenu->insertItem(i18n("E&xpand List"),this,TQ_SLOT(expandList())); + rightBtnMenu->insertItem(i18n("C&ollapse List"),this,TQ_SLOT(collapseList())); } rightBtnMenu->popup(_point); diff --git a/kdict/options.cpp b/kdict/options.cpp index 0d6b65cd..9afbcb16 100644 --- a/kdict/options.cpp +++ b/kdict/options.cpp @@ -501,7 +501,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) TQLabel *l = new TQLabel(w_server, i18n("Host&name:"), serverTab); grid->addWidget(l,0,0); grid->addMultiCellWidget(w_server,0,0,1,2); - connect( w_server, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_server, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); w_port = new KLineEdit(serverTab); w_port->setValidator(new KIntValidator(0,65536,this)); @@ -509,7 +509,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_port, i18n("&Port:"), serverTab); grid->addWidget(l,1,0); grid->addWidget(w_port,1,1); - connect( w_port, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_port, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); w_idleHold = new KIntSpinBox(0,300,5,0,10,serverTab); w_idleHold->setSuffix(i18n(" sec")); @@ -517,7 +517,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_idleHold, i18n("Hold conn&ection for:"), serverTab); grid->addWidget(l,2,0); grid->addWidget(w_idleHold,2,1); - connect( w_idleHold, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_idleHold, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); w_timeout = new KIntSpinBox(5,600,5,5,10,serverTab); w_timeout->setSuffix(i18n(" sec")); @@ -525,7 +525,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_timeout, i18n("T&imeout:"), serverTab); grid->addWidget(l,3,0); grid->addWidget(w_timeout,3,1); - connect( w_timeout, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_timeout, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); w_pipesize = new KIntSpinBox(100,5000,2,2,10,serverTab); w_pipesize->setSuffix(i18n(" bytes")); @@ -533,7 +533,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_pipesize, i18n("Command &buffer:"), serverTab); grid->addWidget(l,4,0); grid->addWidget(w_pipesize,4,1); - connect( w_pipesize, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_pipesize, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( slotChanged() ) ); TQStringList encodingNames = TDEGlobal::charsets()->descriptiveEncodingNames(); int i=0,x=0; @@ -550,20 +550,20 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_encoding, i18n("Encod&ing:"), serverTab); grid->addWidget(l,5,0); grid->addMultiCellWidget(w_encoding,5,5,1,2); - connect( w_encoding, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_encoding, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotChanged() ) ); w_auth = new TQCheckBox(i18n("Server requires a&uthentication"),serverTab); w_auth->setChecked(global->authEnabled); grid->addMultiCellWidget(w_auth,6,6,0,2); - connect( w_auth, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(w_auth,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotAuthRequiredToggled(bool))); + connect( w_auth, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(w_auth,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotAuthRequiredToggled(bool))); w_user = new KLineEdit(serverTab); w_user->setText(global->user); l_user = new TQLabel(w_user, i18n("U&ser:"),serverTab); grid->addWidget(l_user,7,0); grid->addMultiCellWidget(w_user,7,7,1,2); - connect( w_user, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_user, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); w_secret = new KLineEdit(serverTab); w_secret->setEchoMode(TQLineEdit::Password); @@ -571,7 +571,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l_secret = new TQLabel(w_secret, i18n("Pass&word:"), serverTab); grid->addWidget(l_secret,8,0); grid->addMultiCellWidget(w_secret,8,8,1,2); - connect( w_secret, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect( w_secret, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); slotAuthRequiredToggled( w_auth->isChecked() ); @@ -586,42 +586,42 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) //color-list c_List = new DialogListBox(false, appTab); topL->addMultiCellWidget(c_List,1,3,0,1); - connect(c_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotColItemSelected(TQListBoxItem*))); - connect(c_List, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotColSelectionChanged())); + connect(c_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotColItemSelected(TQListBoxItem*))); + connect(c_List, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotColSelectionChanged())); c_olorCB = new TQCheckBox(i18n("&Use custom colors"),appTab); topL->addWidget(c_olorCB,0,0); - connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool))); - connect(c_olorCB, TQT_SIGNAL(toggled(bool) ), this, TQT_SLOT( slotChanged())); + connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool))); + connect(c_olorCB, TQ_SIGNAL(toggled(bool) ), this, TQ_SLOT( slotChanged())); c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), appTab); - connect(c_olChngBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotColChangeBtnClicked())); + connect(c_olChngBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotColChangeBtnClicked())); topL->addWidget(c_olChngBtn,1,2); c_olDefBtn=new TQPushButton(i18n("Default&s"), appTab); - connect(c_olDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotColDefaultBtnClicked())); + connect(c_olDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotColDefaultBtnClicked())); topL->addWidget(c_olDefBtn,2,2); - connect(c_olDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(c_olDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); //font-list f_List = new DialogListBox(false, appTab); topL->addMultiCellWidget(f_List,5,7,0,1); - connect(f_List, TQT_SIGNAL(selected(TQListBoxItem*)),TQT_SLOT(slotFontItemSelected(TQListBoxItem*))); - connect(f_List, TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotFontSelectionChanged())); + connect(f_List, TQ_SIGNAL(selected(TQListBoxItem*)),TQ_SLOT(slotFontItemSelected(TQListBoxItem*))); + connect(f_List, TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotFontSelectionChanged())); f_ontCB = new TQCheckBox(i18n("Use custom &fonts"),appTab); topL->addWidget(f_ontCB,4,0); - connect(f_ontCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFontCheckBoxToggled(bool))); - connect(f_ontCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(f_ontCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFontCheckBoxToggled(bool))); + connect(f_ontCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), appTab); - connect(f_ntChngBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotFontChangeBtnClicked())); + connect(f_ntChngBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotFontChangeBtnClicked())); topL->addWidget(f_ntChngBtn,5,2); f_ntDefBtn=new TQPushButton(i18n("Defaul&ts"), appTab); - connect(f_ntDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotFontDefaultBtnClicked())); + connect(f_ntDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotFontDefaultBtnClicked())); topL->addWidget(f_ntDefBtn,6,2); - connect(f_ntDefBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); + connect(f_ntDefBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); topL->setColStretch(1,2); topL->setColStretch(2,0); @@ -658,9 +658,9 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) w_layout[2] = new TQRadioButton(i18n("A separate heading for &each definition"),bGroup); w_layout[2]->setChecked(global->headLayout == 2); bvbox->addWidget(w_layout[2],1); - connect(w_layout[0], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(w_layout[1], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(w_layout[2], TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(w_layout[0], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(w_layout[1], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(w_layout[2], TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); vbox->addWidget(bGroup,0); vbox->addStretch(1); @@ -680,21 +680,21 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) l = new TQLabel(w_MaxDefinitions, i18n("De&finitions:"), group); grid->addWidget(l,1,0); grid->addWidget(w_MaxDefinitions,1,1); - connect(w_MaxDefinitions, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(w_MaxDefinitions, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); w_Maxbrowse = new KIntSpinBox(1,100,1,1,10,group); w_Maxbrowse->setValue(global->maxBrowseListEntrys); l = new TQLabel(w_Maxbrowse, i18n("Cached &results:"), group); grid->addWidget(l,2,0); grid->addWidget(w_Maxbrowse,2,1); - connect(w_Maxbrowse, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(w_Maxbrowse, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); w_Maxhist = new KIntSpinBox(10,5000,10,10,10,group); w_Maxhist->setValue(global->maxHistEntrys); l = new TQLabel(w_Maxhist, i18n("Hi&story entries:"), group); grid->addWidget(l,3,0); grid->addWidget(w_Maxhist,3,1); - connect(w_Maxhist, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); + connect(w_Maxhist, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); grid->setColStretch(1,1); @@ -709,12 +709,12 @@ OptionsDialog::OptionsDialog(TQWidget *parent, const char *name) w_Savehist = new TQCheckBox(i18n("Sa&ve history on exit"),group); w_Savehist->setChecked(global->saveHistory); vbox2->addWidget(w_Savehist,0); - connect(w_Savehist, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(w_Savehist, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); w_Clipboard = new TQCheckBox(i18n("D&efine selected text on start"),group); w_Clipboard->setChecked(global->defineClipboard); vbox2->addWidget(w_Clipboard,1); - connect(w_Clipboard, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); + connect(w_Clipboard, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); vbox->addWidget(group,0); vbox->addStretch(2); diff --git a/kdict/queryview.cpp b/kdict/queryview.cpp index c96dc540..d1d93c1d 100644 --- a/kdict/queryview.cpp +++ b/kdict/queryview.cpp @@ -141,15 +141,15 @@ QueryView::QueryView(TQWidget *_parent) part->setJavaEnabled(false); part->setURLCursor(KCursor::handCursor()); setFocusPolicy(TQWidget::NoFocus); - connect(part, TQT_SIGNAL(completed()), TQT_SLOT(partCompleted())); - connect(part, TQT_SIGNAL(middleButtonClicked()), TQT_SLOT(middleButtonClicked())); + connect(part, TQ_SIGNAL(completed()), TQ_SLOT(partCompleted())); + connect(part, TQ_SIGNAL(middleButtonClicked()), TQ_SLOT(middleButtonClicked())); rightBtnMenu = new TDEPopupMenu(this); - connect(part,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQT_SLOT(buildPopupMenu(const TQString &, const TQPoint &))); - connect(part->browserExtension(),TQT_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)), - this,TQT_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &))); - connect(part->browserExtension(),TQT_SIGNAL(enableAction(const char *,bool)),this,TQT_SLOT(enableAction(const char *,bool))); - TQTimer::singleShot( 0, this, TQT_SLOT(optionsChanged()) ); - connect(interface,TQT_SIGNAL(resultReady(const TQString &, const TQString &)), TQT_SLOT(resultReady(const TQString &, const TQString &))); + connect(part,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)),this,TQ_SLOT(buildPopupMenu(const TQString &, const TQPoint &))); + connect(part->browserExtension(),TQ_SIGNAL(openURLRequest(const KURL &,const KParts::URLArgs &)), + this,TQ_SLOT(slotURLRequest(const KURL &,const KParts::URLArgs &))); + connect(part->browserExtension(),TQ_SIGNAL(enableAction(const char *,bool)),this,TQ_SLOT(enableAction(const char *,bool))); + TQTimer::singleShot( 0, this, TQ_SLOT(optionsChanged()) ); + connect(interface,TQ_SIGNAL(resultReady(const TQString &, const TQString &)), TQ_SLOT(resultReady(const TQString &, const TQString &))); } @@ -160,9 +160,9 @@ QueryView::~QueryView() void QueryView::setActions(TDEToolBarPopupAction* NactBack, TDEToolBarPopupAction* NactForward, DictComboAction* NactQueryCombo) { actBack = NactBack; - connect(actBack->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseBack(int))); + connect(actBack->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(browseBack(int))); actForward = NactForward; - connect(actForward->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(browseForward(int))); + connect(actForward->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(browseForward(int))); actQueryCombo = NactQueryCombo; } @@ -407,27 +407,27 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) if (type.length()) { // valid url if(type=="define") { rightBtnMenu->insertItem(i18n("Define &Synonym"), - this,TQT_SLOT(popupDefineLink())); + this,TQ_SLOT(popupDefineLink())); rightBtnMenu->insertItem(i18n("M&atch Synonym"), - this,TQT_SLOT(popupMatchLink())); + this,TQ_SLOT(popupMatchLink())); rightBtnMenu->insertSeparator(); } if(type=="dbinfo") { - rightBtnMenu->insertItem(i18n("D&atabase Information"),this,TQT_SLOT(popupDbInfo())); + rightBtnMenu->insertItem(i18n("D&atabase Information"),this,TQ_SLOT(popupDbInfo())); rightBtnMenu->insertSeparator(); } if(type=="realhttp") { popupLink.prepend("http://"); rightBtnMenu->insertItem(SmallIcon("document-open"), i18n("&Open Link"), - this,TQT_SLOT(popupOpenLink())); + this,TQ_SLOT(popupOpenLink())); rightBtnMenu->insertSeparator(); } if(type=="realftp") { popupLink.prepend("ftp://"); rightBtnMenu->insertItem(SmallIcon("document-open"), i18n("&Open Link"), - this,TQT_SLOT(popupOpenLink())); + this,TQ_SLOT(popupOpenLink())); rightBtnMenu->insertSeparator(); } } @@ -436,9 +436,9 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) if (part->hasSelection()) { popupSelect = part->selectedText(); rightBtnMenu->insertItem(i18n("&Define Selection"), - this,TQT_SLOT(popupDefineSelect())); + this,TQ_SLOT(popupDefineSelect())); rightBtnMenu->insertItem(i18n("&Match Selection"), - this,TQT_SLOT(popupMatchSelect())); + this,TQ_SLOT(popupMatchSelect())); rightBtnMenu->insertSeparator(); } else { kapp->clipboard()->setSelectionMode(false); @@ -451,9 +451,9 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) popupSelect = TQApplication::clipboard()->text(); rightBtnMenu->insertItem(SmallIcon("define_clip"), i18n("&Define Clipboard Content"), - this,TQT_SLOT(popupDefineSelect())); + this,TQ_SLOT(popupDefineSelect())); rightBtnMenu->insertItem(i18n("&Match Clipboard Content"), - this,TQT_SLOT(popupMatchSelect())); + this,TQ_SLOT(popupMatchSelect())); rightBtnMenu->insertSeparator(); } } @@ -464,13 +464,13 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) if (browseList.at(browsePos-1)->queryText.isEmpty()) rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back: Information"), - this,TQT_SLOT(browseBack())); + this,TQ_SLOT(browseBack())); else rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back: '%1'").arg(getShortString(browseList.at(browsePos-1)->queryText,25)), - this,TQT_SLOT(browseBack())); + this,TQ_SLOT(browseBack())); } else { - ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQT_SLOT(browseBack())); + ID = rightBtnMenu->insertItem(SmallIcon("back"), i18n("&Back"), this, TQ_SLOT(browseBack())); rightBtnMenu->setItemEnabled(ID,false); } @@ -478,13 +478,13 @@ void QueryView::buildPopupMenu(const TQString &url, const TQPoint &point) if (browseList.at(browsePos+1)->queryText.isEmpty()) rightBtnMenu->insertItem(SmallIcon("forward"), i18n("&Forward: Information"), - this,TQT_SLOT(browseForward())); + this,TQ_SLOT(browseForward())); else rightBtnMenu->insertItem(SmallIcon("forward"), i18n("&Forward: '%1'").arg(getShortString(browseList.at(browsePos+1)->queryText,25)), - this,TQT_SLOT(browseForward())); + this,TQ_SLOT(browseForward())); } else { - ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQT_SLOT(browseForward())); + ID = rightBtnMenu->insertItem(SmallIcon("forward"),i18n("&Forward"),this,TQ_SLOT(browseForward())); rightBtnMenu->setItemEnabled(ID,false); } @@ -544,7 +544,7 @@ void QueryView::browseBack(int index) browsePos = x; actQueryCombo->setEditText(browseList.at(browsePos)->queryText); showResult(); - TQTimer::singleShot(0, this, TQT_SLOT(updateBrowseActions())); // don't clear the menu in this slot + TQTimer::singleShot(0, this, TQ_SLOT(updateBrowseActions())); // don't clear the menu in this slot } } @@ -557,7 +557,7 @@ void QueryView::browseForward(int index) browsePos = x; actQueryCombo->setEditText(browseList.at(browsePos)->queryText); showResult(); - TQTimer::singleShot(0, this, TQT_SLOT(updateBrowseActions())); // don't clear the menu in this slot + TQTimer::singleShot(0, this, TQ_SLOT(updateBrowseActions())); // don't clear the menu in this slot } } diff --git a/kdict/sets.cpp b/kdict/sets.cpp index d49828b6..4a98e7d6 100644 --- a/kdict/sets.cpp +++ b/kdict/sets.cpp @@ -47,7 +47,7 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) w_set->setFixedHeight(w_set->sizeHint().height()); w_set->setInsertionPolicy (TQComboBox::NoInsertion); w_set->insertStringList(sets); - connect(w_set, TQT_SIGNAL(activated(int)),this, TQT_SLOT(activateSet(int))); + connect(w_set, TQ_SIGNAL(activated(int)),this, TQ_SLOT(activateSet(int))); TQLabel *l = new TQLabel(w_set, i18n("&Set:"),page); l->setMinimumSize(l->sizeHint()); subLayout1->addWidget(l,0); @@ -56,17 +56,17 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) subLayout1->addSpacing(8); w_save = new TQPushButton(i18n("S&ave"),page); - connect(w_save,TQT_SIGNAL(clicked()),this, TQT_SLOT(transferSet())); + connect(w_save,TQ_SIGNAL(clicked()),this, TQ_SLOT(transferSet())); subLayout1->addWidget(w_save,0); TQPushButton *btn = new TQPushButton(i18n("&New"),page); btn->setMinimumSize(btn->sizeHint()); - connect(btn, TQT_SIGNAL(clicked()),this, TQT_SLOT(newPressed())); + connect(btn, TQ_SIGNAL(clicked()),this, TQ_SLOT(newPressed())); subLayout1->addWidget(btn,0); w_delete = new TQPushButton(i18n("&Delete"),page); w_delete->setMinimumSize(w_delete->sizeHint()); - connect(w_delete, TQT_SIGNAL(clicked()),this, TQT_SLOT(deletePressed())); + connect(w_delete, TQ_SIGNAL(clicked()),this, TQ_SLOT(deletePressed())); subLayout1->addWidget(w_delete,0); topLayout->addSpacing(8); @@ -80,8 +80,8 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) topLayout->addLayout(subLayout2,1); w_leftBox = new TQListBox(page); - connect(w_leftBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(leftSelected(int))); - connect(w_leftBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(leftHighlighted(int))); + connect(w_leftBox, TQ_SIGNAL(selected(int)),this, TQ_SLOT(leftSelected(int))); + connect(w_leftBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(leftHighlighted(int))); TQLabel *leftLabel = new TQLabel(w_leftBox, i18n("S&elected databases:"),page); leftLabel->setMinimumSize(leftLabel->sizeHint()); subLayout2->addWidget(leftLabel,0,0); @@ -89,27 +89,27 @@ DbSetsDialog::DbSetsDialog(TQWidget *parent, const char *name) w_allLeft = new TQPushButton(page); w_allLeft->setIconSet(BarIconSet("2leftarrow")); - connect(w_allLeft, TQT_SIGNAL(clicked()),this, TQT_SLOT(allLeftPressed())); + connect(w_allLeft, TQ_SIGNAL(clicked()),this, TQ_SLOT(allLeftPressed())); subLayout2->addWidget(w_allLeft,2,1); w_left = new TQPushButton(page); w_left->setIconSet(BarIconSet("1leftarrow")); - connect(w_left, TQT_SIGNAL(clicked()),this, TQT_SLOT(leftPressed())); + connect(w_left, TQ_SIGNAL(clicked()),this, TQ_SLOT(leftPressed())); subLayout2->addWidget(w_left,3,1); w_right = new TQPushButton(page); w_right->setIconSet(BarIconSet("1rightarrow")); - connect(w_right, TQT_SIGNAL(clicked()),this, TQT_SLOT(rightPressed())); + connect(w_right, TQ_SIGNAL(clicked()),this, TQ_SLOT(rightPressed())); subLayout2->addWidget(w_right,4,1); w_allRight = new TQPushButton(page); w_allRight->setIconSet(BarIconSet("2rightarrow")); - connect(w_allRight, TQT_SIGNAL(clicked()),this, TQT_SLOT(allRightPressed())); + connect(w_allRight, TQ_SIGNAL(clicked()),this, TQ_SLOT(allRightPressed())); subLayout2->addWidget(w_allRight,5,1); w_rightBox = new TQListBox(page); - connect(w_rightBox, TQT_SIGNAL(selected(int)),this, TQT_SLOT(rightSelected(int))); - connect(w_rightBox, TQT_SIGNAL(highlighted(int)),this, TQT_SLOT(rightHighlighted(int))); + connect(w_rightBox, TQ_SIGNAL(selected(int)),this, TQ_SLOT(rightSelected(int))); + connect(w_rightBox, TQ_SIGNAL(highlighted(int)),this, TQ_SLOT(rightHighlighted(int))); TQLabel *rightLabel = new TQLabel(w_rightBox, i18n("A&vailable databases:"),page); rightLabel->setMinimumSize(rightLabel->sizeHint()); subLayout2->addWidget(rightLabel,0,2); diff --git a/kdict/toplevel.cpp b/kdict/toplevel.cpp index d6ac7302..eb1af9c9 100644 --- a/kdict/toplevel.cpp +++ b/kdict/toplevel.cpp @@ -61,26 +61,26 @@ TopLevel::TopLevel(TQWidget* parent, const char* name) global->topLevel = this; global->read(); interface = new DictInterface(); - connect(interface,TQT_SIGNAL(infoReady()),TQT_SLOT(stratDbChanged())); - connect(interface,TQT_SIGNAL(started(const TQString&)),TQT_SLOT(clientStarted(const TQString&))); - connect(interface,TQT_SIGNAL(stopped(const TQString&)),TQT_SLOT(clientStopped(const TQString&))); + connect(interface,TQ_SIGNAL(infoReady()),TQ_SLOT(stratDbChanged())); + connect(interface,TQ_SIGNAL(started(const TQString&)),TQ_SLOT(clientStarted(const TQString&))); + connect(interface,TQ_SIGNAL(stopped(const TQString&)),TQ_SLOT(clientStopped(const TQString&))); queryView = new QueryView(this); - connect(queryView,TQT_SIGNAL(defineRequested(const TQString&)),TQT_SLOT(define(const TQString&))); - connect(queryView,TQT_SIGNAL(matchRequested(const TQString&)),TQT_SLOT(match(const TQString&))); - connect(queryView,TQT_SIGNAL(clipboardRequested()),TQT_SLOT(defineClipboard())); - connect(queryView,TQT_SIGNAL(enableCopy(bool)),TQT_SLOT(enableCopy(bool))); - connect(queryView,TQT_SIGNAL(enablePrintSave()),TQT_SLOT(enablePrintSave())); - connect(queryView,TQT_SIGNAL(renderingStarted()),TQT_SLOT(renderingStarted())); - connect(queryView,TQT_SIGNAL(renderingStopped()),TQT_SLOT(renderingStopped())); - connect(queryView,TQT_SIGNAL(newCaption(const TQString&)),TQT_SLOT(newCaption(const TQString&))); + connect(queryView,TQ_SIGNAL(defineRequested(const TQString&)),TQ_SLOT(define(const TQString&))); + connect(queryView,TQ_SIGNAL(matchRequested(const TQString&)),TQ_SLOT(match(const TQString&))); + connect(queryView,TQ_SIGNAL(clipboardRequested()),TQ_SLOT(defineClipboard())); + connect(queryView,TQ_SIGNAL(enableCopy(bool)),TQ_SLOT(enableCopy(bool))); + connect(queryView,TQ_SIGNAL(enablePrintSave()),TQ_SLOT(enablePrintSave())); + connect(queryView,TQ_SIGNAL(renderingStarted()),TQ_SLOT(renderingStarted())); + connect(queryView,TQ_SIGNAL(renderingStopped()),TQ_SLOT(renderingStopped())); + connect(queryView,TQ_SIGNAL(newCaption(const TQString&)),TQ_SLOT(newCaption(const TQString&))); matchView = new MatchView(); - connect(matchView,TQT_SIGNAL(defineRequested(const TQString&)),TQT_SLOT(define(const TQString&))); - connect(matchView,TQT_SIGNAL(matchRequested(const TQString&)),TQT_SLOT(match(const TQString&))); - connect(matchView,TQT_SIGNAL(clipboardRequested()),TQT_SLOT(matchClipboard())); - connect(matchView,TQT_SIGNAL(windowClosed()),TQT_SLOT(toggleMatchListShow())); - connect(&resetStatusbarTimer,TQT_SIGNAL(timeout()),TQT_SLOT(resetStatusbar())); + connect(matchView,TQ_SIGNAL(defineRequested(const TQString&)),TQ_SLOT(define(const TQString&))); + connect(matchView,TQ_SIGNAL(matchRequested(const TQString&)),TQ_SLOT(match(const TQString&))); + connect(matchView,TQ_SIGNAL(clipboardRequested()),TQ_SLOT(matchClipboard())); + connect(matchView,TQ_SIGNAL(windowClosed()),TQ_SLOT(toggleMatchListShow())); + connect(&resetStatusbarTimer,TQ_SIGNAL(timeout()),TQ_SLOT(resetStatusbar())); setupStatusBar(); setupActions(); @@ -314,80 +314,80 @@ bool TopLevel::queryClose() void TopLevel::setupActions() { // file menu... - actSave = KStdAction::save(queryView, TQT_SLOT(saveQuery()), actionCollection()); + actSave = KStdAction::save(queryView, TQ_SLOT(saveQuery()), actionCollection()); actSave->setText(i18n("&Save As...")); actSave->setEnabled(false); - actPrint = KStdAction::print(queryView, TQT_SLOT(printQuery()), actionCollection()); + actPrint = KStdAction::print(queryView, TQ_SLOT(printQuery()), actionCollection()); actPrint->setEnabled(false); actStartQuery = new TDEAction(i18n("St&art Query"),"reload", 0 , this, - TQT_SLOT(doDefine()), actionCollection(), "start_query"); + TQ_SLOT(doDefine()), actionCollection(), "start_query"); actStopQuery = new TDEAction(i18n("St&op Query"),"process-stop", 0 , this, - TQT_SLOT(stopClients()), actionCollection(), "stop_query"); + TQ_SLOT(stopClients()), actionCollection(), "stop_query"); actStopQuery->setEnabled(false); - KStdAction::quit(kapp, TQT_SLOT(closeAllWindows()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); // edit menu... - actCopy = KStdAction::copy(queryView, TQT_SLOT(copySelection()), actionCollection()); + actCopy = KStdAction::copy(queryView, TQ_SLOT(copySelection()), actionCollection()); actCopy->setEnabled(false); - KStdAction::selectAll(queryView, TQT_SLOT(selectAll()), actionCollection()); + KStdAction::selectAll(queryView, TQ_SLOT(selectAll()), actionCollection()); new TDEAction(i18n("&Define Clipboard Content"), "define_clip", 0 , this, - TQT_SLOT(defineClipboard()), actionCollection(), "define_clipboard"); + TQ_SLOT(defineClipboard()), actionCollection(), "define_clipboard"); new TDEAction(i18n("&Match Clipboard Content"), 0 , this, - TQT_SLOT(matchClipboard()), actionCollection(), "match_clipboard"); - KStdAction::find(queryView, TQT_SLOT(showFindDialog()), actionCollection()); + TQ_SLOT(matchClipboard()), actionCollection(), "match_clipboard"); + KStdAction::find(queryView, TQ_SLOT(showFindDialog()), actionCollection()); // history menu... actBack = new TDEToolBarPopupAction(i18n("&Back"), "back", TDEStdAccel::shortcut(TDEStdAccel::Back), - queryView, TQT_SLOT(browseBack()), actionCollection(),"browse_back"); + queryView, TQ_SLOT(browseBack()), actionCollection(),"browse_back"); actBack->setDelayed(true); actBack->setStickyMenu(false); actBack->setEnabled(false); actForward = new TDEToolBarPopupAction(i18n("&Forward"), "forward", TDEStdAccel::shortcut(TDEStdAccel::Forward), - queryView, TQT_SLOT(browseForward()), actionCollection(),"browse_forward"); + queryView, TQ_SLOT(browseForward()), actionCollection(),"browse_forward"); actForward->setDelayed(true); actForward->setStickyMenu(false); actForward->setEnabled(false); new TDEAction(i18n("&Clear History"), 0 , this, - TQT_SLOT(clearQueryHistory()), actionCollection(), "clear_history"); + TQ_SLOT(clearQueryHistory()), actionCollection(), "clear_history"); // server menu... new TDEAction(i18n("&Get Capabilities"), 0 , interface, - TQT_SLOT(updateServer()), actionCollection(), "get_capabilities"); + TQ_SLOT(updateServer()), actionCollection(), "get_capabilities"); new TDEAction(i18n("Edit &Database Sets..."), "edit", 0 , this, - TQT_SLOT(showSetsDialog()), actionCollection(), "edit_sets"); + TQ_SLOT(showSetsDialog()), actionCollection(), "edit_sets"); new TDEAction(i18n("&Summary"), 0 , interface, - TQT_SLOT(showDatabases()), actionCollection(), "db_summary"); + TQ_SLOT(showDatabases()), actionCollection(), "db_summary"); new TDEAction(i18n("S&trategy Information"), 0 , interface, - TQT_SLOT(showStrategies()), actionCollection(), "strategy_info"); + TQ_SLOT(showStrategies()), actionCollection(), "strategy_info"); new TDEAction(i18n("&Server Information"), 0 , interface, - TQT_SLOT(showInfo()), actionCollection(), "server_info"); + TQ_SLOT(showInfo()), actionCollection(), "server_info"); // settings menu... createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); actShowMatchList = new TDEToggleAction(i18n("Show &Match List"), 0 , this, - TQT_SLOT(toggleMatchListShow()), actionCollection(), "show_match"); + TQ_SLOT(toggleMatchListShow()), actionCollection(), "show_match"); actShowMatchList->setCheckedState(i18n("Hide &Match List")); actShowMatchList->setChecked(global->showMatchList); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(showOptionsDialog()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(showOptionsDialog()), actionCollection()); // toolbar... new TDEAction(i18n("Clear Input Field"), "query_erase", 0 , this, - TQT_SLOT(clearInput()), actionCollection(), "clear_query"); + TQ_SLOT(clearInput()), actionCollection(), "clear_query"); actQueryLabel = new DictLabelAction(i18n("&Look for:"), actionCollection(), "look_label"); actQueryCombo = new DictComboAction(i18n("Query"), actionCollection(), "query_combo",true,true); - connect(actQueryCombo,TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(define(const TQString&))); + connect(actQueryCombo,TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(define(const TQString&))); actQueryCombo->setCompletionMode(global->queryComboCompletionMode); actDbLabel = new DictLabelAction(i18n("&in"), actionCollection(), "in_label"); actDbCombo = new DictComboAction(i18n("Databases"), actionCollection(), "db_combo",false,false); - connect(actDbCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(databaseSelected(int))); - actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQT_SLOT(doDefine()), actionCollection(), "define_btn"); - actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQT_SLOT(doMatch()), actionCollection(), "match_btn"); + connect(actDbCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(databaseSelected(int))); + actDefineBtn = new DictButtonAction(i18n("&Define"), this, TQ_SLOT(doDefine()), actionCollection(), "define_btn"); + actMatchBtn = new DictButtonAction(i18n("&Match"), this, TQ_SLOT(doMatch()), actionCollection(), "match_btn"); queryView->setActions(actBack,actForward,actQueryCombo); } @@ -509,7 +509,7 @@ void TopLevel::buildHistMenu() unsigned int i = 0; while ((i<10)&&(i<global->queryHistory.count())) { - historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQT_SLOT(queryHistMenu()), + historyActionList.append( new TDEAction(getShortString(global->queryHistory[i],70), 0, this, TQ_SLOT(queryHistMenu()), (TQObject*)0, global->queryHistory[i].utf8().data()) ); i++; } @@ -548,7 +548,7 @@ void TopLevel::stratDbChanged() dbActionList.clear(); for (unsigned int i=0;i<global->serverDatabases.count();i++) - dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQT_SLOT(dbInfoMenuClicked()), + dbActionList.append( new TDEAction(global->serverDatabases[i], 0, this, TQ_SLOT(dbInfoMenuClicked()), (TQObject*)0, global->serverDatabases[i].utf8().data()) ); plugActionList("db_detail", dbActionList); @@ -684,7 +684,7 @@ void TopLevel::slotConfToolbar() { saveMainWindowSettings(TDEGlobal::config(),"toplevel_options"); KEditToolbar dlg(actionCollection(), "kdictui.rc"); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -702,8 +702,8 @@ void TopLevel::showSetsDialog() { if (!setsDlg) { setsDlg = new DbSetsDialog(this); - connect(setsDlg,TQT_SIGNAL(setsChanged()),this,TQT_SLOT(setsChanged())); - connect(setsDlg,TQT_SIGNAL(dialogClosed()),this,TQT_SLOT(hideSetsDialog())); + connect(setsDlg,TQ_SIGNAL(setsChanged()),this,TQ_SLOT(setsChanged())); + connect(setsDlg,TQ_SIGNAL(dialogClosed()),this,TQ_SLOT(hideSetsDialog())); setsDlg->show(); } else { KWin::activateWindow(setsDlg->winId()); @@ -731,8 +731,8 @@ void TopLevel::showOptionsDialog() { if (!optDlg) { optDlg = new OptionsDialog(this); - connect(optDlg,TQT_SIGNAL(optionsChanged()),this,TQT_SLOT(optionsChanged())); - connect(optDlg,TQT_SIGNAL(finished()),this,TQT_SLOT(hideOptionsDialog())); + connect(optDlg,TQ_SIGNAL(optionsChanged()),this,TQ_SLOT(optionsChanged())); + connect(optDlg,TQ_SIGNAL(finished()),this,TQ_SLOT(hideOptionsDialog())); optDlg->show(); } else { KWin::activateWindow(optDlg->winId()); diff --git a/kget/dlgDirectories.cpp b/kget/dlgDirectories.cpp index 7faec0e5..5d0e026e 100644 --- a/kget/dlgDirectories.cpp +++ b/kget/dlgDirectories.cpp @@ -45,8 +45,8 @@ DlgDirectories::DlgDirectories(TQWidget * parent) : DlgDirectoriesBase(parent) { - connect( le_ext, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); - connect( le_dir, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotDirectoryChanged( ) ) ); + connect( le_ext, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotDirectoryChanged( ) ) ); + connect( le_dir, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotDirectoryChanged( ) ) ); le_dir->setMode( KFile::Directory ); lv_entries->setSortColumn( -1 ); diff --git a/kget/dlgIndividual.cpp b/kget/dlgIndividual.cpp index c8a939e2..f06b939b 100644 --- a/kget/dlgIndividual.cpp +++ b/kget/dlgIndividual.cpp @@ -63,7 +63,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) // Actions - m_paDock = new TDEToggleAction(i18n("&Dock"),"tool_dock.png", 0, this, TQT_SLOT(slotToggleDock()), this, "dockIndividual"); + m_paDock = new TDEToggleAction(i18n("&Dock"),"tool_dock.png", 0, this, TQ_SLOT(slotToggleDock()), this, "dockIndividual"); TQVBoxLayout *topLayout = new TQVBoxLayout( this, KDialog::marginHint(),KDialog::spacingHint() ); @@ -126,7 +126,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) TQCheckBox * keepOpen = new TQCheckBox( i18n("&Keep this window open after the operation is complete."), this); - connect( keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) ); + connect( keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) ); topLayout->addWidget(keepOpen); TQFrame *line3 = new TQFrame( this ); @@ -138,19 +138,19 @@ DlgIndividual::DlgIndividual(Transfer * _item) topLayout->addLayout(hBox); openFile = new KPushButton( i18n("Open &File"), this ); - connect( openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) ); + connect( openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) ); hBox->addWidget( openFile ); openFile->setEnabled(false); openLocation = new KPushButton( i18n("Open &Destination"), this ); - connect( openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) ); + connect( openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) ); hBox->addWidget( openLocation ); hBox->addStretch(1); pbAdvanced = new KPushButton( i18n("Advanced"), this ); - connect(pbAdvanced, TQT_SIGNAL(clicked()), TQT_SLOT(slotToggleAdvanced())); + connect(pbAdvanced, TQ_SIGNAL(clicked()), TQ_SLOT(slotToggleAdvanced())); hBox->addWidget( pbAdvanced ); @@ -176,7 +176,7 @@ DlgIndividual::DlgIndividual(Transfer * _item) panelAdvanced->addTab(spins, i18n("Timer")); panelAdvanced->hide(); - connect(spins, TQT_SIGNAL(valueChanged(const TQDateTime &)), item, TQT_SLOT(slotStartTime(const TQDateTime &))); + connect(spins, TQ_SIGNAL(valueChanged(const TQDateTime &)), item, TQ_SLOT(slotStartTime(const TQDateTime &))); // adding item log ml_log = new TQTextEdit(panelAdvanced); diff --git a/kget/dlgPreferences.cpp b/kget/dlgPreferences.cpp index 777f5419..b27e4772 100644 --- a/kget/dlgPreferences.cpp +++ b/kget/dlgPreferences.cpp @@ -95,16 +95,16 @@ DlgPreferences::DlgPreferences(TQWidget * parent): topLayout->addStretch(); // type of connection influences autoDisconnect & timedDisconnect features - connect(conDlg, TQT_SIGNAL(typeChanged(int)), autDlg, TQT_SLOT(slotTypeChanged(int))); + connect(conDlg, TQ_SIGNAL(typeChanged(int)), autDlg, TQ_SLOT(slotTypeChanged(int))); loadAllData(); - connect( conDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); - connect( autDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); - connect( limDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); - connect( advDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); - connect( dirDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); - connect( sysDlg, TQT_SIGNAL( configChanged() ), this, TQT_SLOT( slotChanged() ) ); + connect( conDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); + connect( autDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); + connect( limDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); + connect( advDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); + connect( dirDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); + connect( sysDlg, TQ_SIGNAL( configChanged() ), this, TQ_SLOT( slotChanged() ) ); } diff --git a/kget/droptarget.cpp b/kget/droptarget.cpp index b415461c..990ff1aa 100644 --- a/kget/droptarget.cpp +++ b/kget/droptarget.cpp @@ -89,10 +89,10 @@ DropTarget::DropTarget(TDEMainWindow * mainWin):TQWidget() popupMenu->insertTitle(kapp->caption()); popupMenu->setCheckable(true); - pop_Max = popupMenu->insertItem(i18n("Maximize"), this, TQT_SLOT(toggleMinimizeRestore())); - pop_Min = popupMenu->insertItem(i18n("Minimize"), this, TQT_SLOT(toggleMinimizeRestore())); + pop_Max = popupMenu->insertItem(i18n("Maximize"), this, TQ_SLOT(toggleMinimizeRestore())); + pop_Min = popupMenu->insertItem(i18n("Minimize"), this, TQ_SLOT(toggleMinimizeRestore())); - pop_sticky = popupMenu->insertItem(i18n("Sticky"), this, TQT_SLOT(toggleSticky())); + pop_sticky = popupMenu->insertItem(i18n("Sticky"), this, TQ_SLOT(toggleSticky())); popupMenu->insertSeparator(); mainWin->action("drop_target")->plug(popupMenu); popupMenu->insertSeparator(); diff --git a/kget/kget_plug_in/kget_linkview.cpp b/kget/kget_plug_in/kget_linkview.cpp index 9a77e95f..8b220cb4 100644 --- a/kget/kget_plug_in/kget_linkview.cpp +++ b/kget/kget_plug_in/kget_linkview.cpp @@ -44,10 +44,10 @@ KGetLinkView::KGetLinkView( TQWidget *parent, const char *name ) TDEAction* actionDownload = new TDEAction( i18n("Download Selected Files"), "kget", CTRL+Key_D, - this, TQT_SLOT( slotStartLeech() ), + this, TQ_SLOT( slotStartLeech() ), actionCollection(), "startDownload" ); - TDEAction* actionSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), + TDEAction* actionSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection() ); m_links.setAutoDelete( true ); diff --git a/kget/kget_plug_in/kget_plug_in.cpp b/kget/kget_plug_in/kget_plug_in.cpp index b7f1ed69..c4d52fac 100644 --- a/kget/kget_plug_in/kget_plug_in.cpp +++ b/kget/kget_plug_in/kget_plug_in.cpp @@ -52,17 +52,17 @@ KGet_plug_in::KGet_plug_in( TQObject* parent, const char* name ) TDEActionMenu *menu = new TDEActionMenu( i18n("Download Manager"), pix, actionCollection(), "kget_menu" ); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT( showPopup() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT( showPopup() )); m_paToggleDropTarget=new TDEToggleAction(i18n("Show Drop Target"), TDEShortcut(), - this, TQT_SLOT(slotShowDrop()), + this, TQ_SLOT(slotShowDrop()), actionCollection(), "show_drop" ); menu->insert( m_paToggleDropTarget ); TDEAction *action = new TDEAction(i18n("List All Links"), TDEShortcut(), - this, TQT_SLOT( slotShowLinks() ), + this, TQ_SLOT( slotShowLinks() ), actionCollection(), "show_links"); menu->insert( action ); diff --git a/kget/logwindow.cpp b/kget/logwindow.cpp index 601beb31..be94180e 100644 --- a/kget/logwindow.cpp +++ b/kget/logwindow.cpp @@ -98,7 +98,7 @@ SeparatedLog::SeparatedLog(TQWidget * parent):TQWidget(parent) topGridLayout->addWidget(lv_log, 0, 0); - connect(lv_log, TQT_SIGNAL(selectionChanged(TQListViewItem *)), TQT_SLOT(transferSelected(TQListViewItem *))); + connect(lv_log, TQ_SIGNAL(selectionChanged(TQListViewItem *)), TQ_SLOT(transferSelected(TQListViewItem *))); ml_log = new TQTextEdit(this); ml_log->setTextFormat(LogText); @@ -174,7 +174,7 @@ LogWindow::LogWindow():KDialogBase(Tabbed, i18n("Log Window"), Close, Close, 0, sep_log = new SeparatedLog(page); topLayout->addWidget(sep_log); - connect(this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(close())); + connect(this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(close())); // resize( 500, 300 ); } diff --git a/kget/slave.cpp b/kget/slave.cpp index 60933dcd..dac9e184 100644 --- a/kget/slave.cpp +++ b/kget/slave.cpp @@ -183,17 +183,17 @@ void Slave::Connect() { mDebugIn << endl; - connect(copyjob, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *))); - connect(copyjob, TQT_SIGNAL(connected(TDEIO::Job *)), TQT_SLOT(slotConnected(TDEIO::Job *))); - connect(copyjob, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(copyjob, TQ_SIGNAL(canceled(TDEIO::Job *)), TQ_SLOT(slotCanceled(TDEIO::Job *))); + connect(copyjob, TQ_SIGNAL(connected(TDEIO::Job *)), TQ_SLOT(slotConnected(TDEIO::Job *))); + connect(copyjob, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); - connect(copyjob, TQT_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t)), TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(copyjob, TQ_SIGNAL(totalSize(TDEIO::Job *, TDEIO::filesize_t)), TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(copyjob, TQT_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), TQT_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); + connect(copyjob, TQ_SIGNAL(processedSize(TDEIO::Job *, TDEIO::filesize_t)), TQ_SLOT(slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t))); - connect(copyjob, TQT_SIGNAL(speed(TDEIO::Job *, unsigned long)), TQT_SLOT(slotSpeed(TDEIO::Job *, unsigned long))); + connect(copyjob, TQ_SIGNAL(speed(TDEIO::Job *, unsigned long)), TQ_SLOT(slotSpeed(TDEIO::Job *, unsigned long))); - connect(copyjob, TQT_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQT_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); + connect(copyjob, TQ_SIGNAL(infoMessage(TDEIO::Job *, const TQString &)), TQ_SLOT(slotInfoMessage(TDEIO::Job *, const TQString &))); mDebugOut << endl; } diff --git a/kget/tdemainwidget.cpp b/kget/tdemainwidget.cpp index 0e6cd31a..0cc65452 100644 --- a/kget/tdemainwidget.cpp +++ b/kget/tdemainwidget.cpp @@ -169,14 +169,14 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked) setCentralWidget(myTransferList); - connect(kapp, TQT_SIGNAL(saveYourself()), TQT_SLOT(slotSaveYourself())); + connect(kapp, TQ_SIGNAL(saveYourself()), TQ_SLOT(slotSaveYourself())); // Enable dropping setAcceptDrops(true); // Setup connection timer connectionTimer = new TQTimer(this); - connect(connectionTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckConnection())); + connect(connectionTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckConnection())); // setup socket for checking connection if ((_sock = sockets_open()) < 0) { @@ -191,7 +191,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked) // Setup animation timer animTimer = new TQTimer(this); animCounter = 0; - connect(animTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAnimTimeout())); + connect(animTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAnimTimeout())); if (ksettings.b_useAnimation) { animTimer->start(400); @@ -201,17 +201,17 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked) // Setup transfer timer for scheduled downloads and checkQueue() transferTimer = new TQTimer(this); - connect(transferTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTransferTimeout())); + connect(transferTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTransferTimeout())); transferTimer->start(10000); // 10 secs time interval // Setup autosave timer autosaveTimer = new TQTimer(this); - connect(autosaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotAutosaveTimeout())); + connect(autosaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotAutosaveTimeout())); setAutoSave(); // Setup clipboard timer clipboardTimer = new TQTimer(this); - connect(clipboardTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckClipboard())); + connect(clipboardTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckClipboard())); if (ksettings.b_autoPaste) { clipboardTimer->start(1000); } @@ -221,7 +221,7 @@ TDEMainWidget::TDEMainWidget(bool bStartDocked) // Setup special windows kdrop = new DropTarget(this); kdock = new DockWidget(this); - connect(kdock, TQT_SIGNAL(quitSelected()), TQT_SLOT(slotQuit())); + connect(kdock, TQ_SIGNAL(quitSelected()), TQ_SLOT(slotQuit())); // Set geometry if (ksettings.mainPosition.x() != -1) { @@ -337,76 +337,76 @@ void TDEMainWidget::setupGUI() TDEActionCollection *coll = actionCollection(); - connect(myTransferList, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotUpdateActions())); - connect(myTransferList, TQT_SIGNAL(transferSelected(Transfer *)), this, TQT_SLOT(slotOpenIndividual())); - connect(myTransferList, TQT_SIGNAL(popupMenu(Transfer *)), this, TQT_SLOT(slotPopupMenu(Transfer *))); + connect(myTransferList, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotUpdateActions())); + connect(myTransferList, TQ_SIGNAL(transferSelected(Transfer *)), this, TQ_SLOT(slotOpenIndividual())); + connect(myTransferList, TQ_SIGNAL(popupMenu(Transfer *)), this, TQ_SLOT(slotPopupMenu(Transfer *))); // file actions - m_paOpenTransfer = KStdAction::open(this, TQT_SLOT(slotOpenTransfer()), coll, "open_transfer"); - m_paPasteTransfer = KStdAction::paste(this, TQT_SLOT(slotPasteTransfer()), coll, "paste_transfer"); + m_paOpenTransfer = KStdAction::open(this, TQ_SLOT(slotOpenTransfer()), coll, "open_transfer"); + m_paPasteTransfer = KStdAction::paste(this, TQ_SLOT(slotPasteTransfer()), coll, "paste_transfer"); - m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, this, TQT_SLOT(slotExportTransfers()), coll, "export_transfers"); - m_paImportTransfers = new TDEAction(i18n("&Import Transfer List..."), 0, this, TQT_SLOT(slotImportTransfers()), coll, "import_transfers"); + m_paExportTransfers = new TDEAction(i18n("&Export Transfer List..."), 0, this, TQ_SLOT(slotExportTransfers()), coll, "export_transfers"); + m_paImportTransfers = new TDEAction(i18n("&Import Transfer List..."), 0, this, TQ_SLOT(slotImportTransfers()), coll, "import_transfers"); - m_paImportText = new TDEAction(i18n("Import Text &File..."), 0, this, TQT_SLOT(slotImportTextFile()), coll, "import_text"); + m_paImportText = new TDEAction(i18n("Import Text &File..."), 0, this, TQ_SLOT(slotImportTextFile()), coll, "import_text"); - m_paQuit = KStdAction::quit(this, TQT_SLOT(slotQuit()), coll, "quit"); + m_paQuit = KStdAction::quit(this, TQ_SLOT(slotQuit()), coll, "quit"); // transfer actions - m_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, this, TQT_SLOT(slotCopyToClipboard()), coll, "copy_url"); - m_paIndividual = new TDEAction(i18n("&Open Individual Window"), 0, this, TQT_SLOT(slotOpenIndividual()), coll, "open_individual"); + m_paCopy = new TDEAction(i18n("&Copy URL to Clipboard"), 0, this, TQ_SLOT(slotCopyToClipboard()), coll, "copy_url"); + m_paIndividual = new TDEAction(i18n("&Open Individual Window"), 0, this, TQ_SLOT(slotOpenIndividual()), coll, "open_individual"); - m_paMoveToBegin = new TDEAction(i18n("Move to &Beginning"), 0, this, TQT_SLOT(slotMoveToBegin()), coll, "move_begin"); + m_paMoveToBegin = new TDEAction(i18n("Move to &Beginning"), 0, this, TQ_SLOT(slotMoveToBegin()), coll, "move_begin"); - m_paMoveToEnd = new TDEAction(i18n("Move to &End"), 0, this, TQT_SLOT(slotMoveToEnd()), coll, "move_end"); + m_paMoveToEnd = new TDEAction(i18n("Move to &End"), 0, this, TQ_SLOT(slotMoveToEnd()), coll, "move_end"); #ifdef _DEBUG sDebug << "Loading pics" << endl; #endif - m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, this, TQT_SLOT(slotResumeCurrent()), coll, "resume"); - m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, this, TQT_SLOT(slotPauseCurrent()), coll, "pause"); - m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, this, TQT_SLOT(slotDeleteCurrent()), coll, "delete"); - m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, this, TQT_SLOT(slotRestartCurrent()), coll, "restart"); + m_paResume = new TDEAction(i18n("&Resume"),"tool_resume", 0, this, TQ_SLOT(slotResumeCurrent()), coll, "resume"); + m_paPause = new TDEAction(i18n("&Pause"),"tool_pause", 0, this, TQ_SLOT(slotPauseCurrent()), coll, "pause"); + m_paDelete = new TDEAction(i18n("&Delete"),"edit-delete", TQt::Key_Delete, this, TQ_SLOT(slotDeleteCurrent()), coll, "delete"); + m_paRestart = new TDEAction(i18n("Re&start"),"tool_restart", 0, this, TQ_SLOT(slotRestartCurrent()), coll, "restart"); - m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, this, TQT_SLOT(slotQueueCurrent()), coll, "queue"); - m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, this, TQT_SLOT(slotTimerCurrent()), coll, "timer"); - m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, this, TQT_SLOT(slotDelayCurrent()), coll, "delay"); + m_paQueue = new TDERadioAction(i18n("&Queue"),"tool_queue", 0, this, TQ_SLOT(slotQueueCurrent()), coll, "queue"); + m_paTimer = new TDERadioAction(i18n("&Timer"),"tool_timer", 0, this, TQ_SLOT(slotTimerCurrent()), coll, "timer"); + m_paDelay = new TDERadioAction(i18n("De&lay"),"tool_delay", 0, this, TQ_SLOT(slotDelayCurrent()), coll, "delay"); m_paQueue->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode"); m_paDelay->setExclusiveGroup("TransferMode"); // options actions - m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, this, TQT_SLOT(slotToggleAnimation()), coll, "toggle_animation"); - m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, this, TQT_SLOT(slotToggleExpertMode()), coll, "expert_mode"); - m_paUseLastDir = new TDEToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, this, TQT_SLOT(slotToggleUseLastDir()), coll, "use_last_dir"); - m_paAutoDisconnect = new TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, this, TQT_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); - m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, this, TQT_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); - m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, this, TQT_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); - m_paAutoPaste = new TDEToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, this, TQT_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); + m_paUseAnimation = new TDEToggleAction(i18n("Use &Animation"), 0, this, TQ_SLOT(slotToggleAnimation()), coll, "toggle_animation"); + m_paExpertMode = new TDEToggleAction(i18n("&Expert Mode"),"tool_expert", 0, this, TQ_SLOT(slotToggleExpertMode()), coll, "expert_mode"); + m_paUseLastDir = new TDEToggleAction(i18n("&Use-Last-Folder Mode"),"tool_uselastdir", 0, this, TQ_SLOT(slotToggleUseLastDir()), coll, "use_last_dir"); + m_paAutoDisconnect = new TDEToggleAction(i18n("Auto-&Disconnect Mode"),"tool_disconnect", 0, this, TQ_SLOT(slotToggleAutoDisconnect()), coll, "auto_disconnect"); + m_paAutoShutdown = new TDEToggleAction(i18n("Auto-S&hutdown Mode"), "tool_shutdown", 0, this, TQ_SLOT(slotToggleAutoShutdown()), coll, "auto_shutdown"); + m_paOfflineMode = new TDEToggleAction(i18n("&Offline Mode"),"tool_offline_mode_off", 0, this, TQ_SLOT(slotToggleOfflineMode()), coll, "offline_mode"); + m_paAutoPaste = new TDEToggleAction(i18n("Auto-Pas&te Mode"),"tool_clipboard", 0, this, TQ_SLOT(slotToggleAutoPaste()), coll, "auto_paste"); - m_paPreferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), coll); + m_paPreferences = KStdAction::preferences(this, TQ_SLOT(slotPreferences()), coll); - KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), coll); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbars()), coll); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfigureNotifications()), coll); + KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), coll); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), coll); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfigureNotifications()), coll); - m_menubarAction = KStdAction::showMenubar(this, TQT_SLOT(slotShowMenubar()), coll, "settings_showmenubar" ); + m_menubarAction = KStdAction::showMenubar(this, TQ_SLOT(slotShowMenubar()), coll, "settings_showmenubar" ); m_menubarAction->setChecked( !menuBar()->isHidden() ); // view actions createStandardStatusBarAction(); - m_paShowLog = new TDEToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, this, TQT_SLOT(slotToggleLogWindow()), coll, "toggle_log"); + m_paShowLog = new TDEToggleAction(i18n("Show &Log Window"),"tool_logwindow", 0, this, TQ_SLOT(slotToggleLogWindow()), coll, "toggle_log"); m_paShowLog->setCheckedState(i18n("Hide &Log Window")); - m_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, this, TQT_SLOT(slotToggleDropTarget()), coll, "drop_target"); - m_paKonquerorIntegration = new TDEAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, this, TQT_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration"); + m_paDropTarget = new TDEAction(i18n("Show Drop &Target"),"tool_drop_target", 0, this, TQ_SLOT(slotToggleDropTarget()), coll, "drop_target"); + m_paKonquerorIntegration = new TDEAction(i18n("Enable &KGet as Konqueror Download Manager"), "konqueror", 0, this, TQ_SLOT(slotKonquerorIntegration()), coll, "konqueror_integration"); if (ksettings.b_KonquerorIntegration) { m_paKonquerorIntegration->setText(i18n("Disable &KGet as Konqueror Download Manager")); } menuHelp = new KHelpMenu(this, TDEGlobal::instance()->aboutData()); - KStdAction::whatsThis(menuHelp, TQT_SLOT(contextHelpActivated()), coll, "whats_this"); + KStdAction::whatsThis(menuHelp, TQ_SLOT(contextHelpActivated()), coll, "whats_this"); createGUI("kgetui.rc"); @@ -510,7 +510,7 @@ void TDEMainWidget::slotConfigureToolbars() saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); KEditToolbar edit(factory()); - connect(&edit, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&edit, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); edit.exec(); #ifdef _DEBUG diff --git a/kget/transfer.cpp b/kget/transfer.cpp index 6025c4cf..1da1b853 100644 --- a/kget/transfer.cpp +++ b/kget/transfer.cpp @@ -120,25 +120,25 @@ Transfer::init(const uint _id) status = ST_STOPPED; - connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQT_SLOT(slotStatusChanged(Transfer *, int))); - connect(this, TQT_SIGNAL(statusChanged(Transfer *, int)), this, TQT_SLOT(slotUpdateActions())); + connect(this, TQ_SIGNAL(statusChanged(Transfer *, int)), tdemain, TQ_SLOT(slotStatusChanged(Transfer *, int))); + connect(this, TQ_SIGNAL(statusChanged(Transfer *, int)), this, TQ_SLOT(slotUpdateActions())); - connect(this, TQT_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQT_SLOT(logTransfer(uint, const TQString &, const TQString &))); + connect(this, TQ_SIGNAL(log(uint, const TQString &, const TQString &)), tdemain->logwin(), TQ_SLOT(logTransfer(uint, const TQString &, const TQString &))); // setup actions - m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQT_SLOT(slotResume()), this, "resume"); + m_paResume = new TDEAction(i18n("&Resume"), "tool_resume", 0, this, TQ_SLOT(slotResume()), this, "resume"); - m_paPause = new TDEAction(i18n("&Pause"), "tool_pause", 0, this, TQT_SLOT(slotRequestPause()), this, "pause"); + m_paPause = new TDEAction(i18n("&Pause"), "tool_pause", 0, this, TQ_SLOT(slotRequestPause()), this, "pause"); - m_paDelete = new TDEAction(i18n("&Delete"), "edit-delete", 0, this, TQT_SLOT(slotRequestRemove()), this, "delete"); + m_paDelete = new TDEAction(i18n("&Delete"), "edit-delete", 0, this, TQ_SLOT(slotRequestRemove()), this, "delete"); - m_paRestart = new TDEAction(i18n("Re&start"), "tool_restart", 0, this, TQT_SLOT(slotRequestRestart()), this, "restart"); + m_paRestart = new TDEAction(i18n("Re&start"), "tool_restart", 0, this, TQ_SLOT(slotRequestRestart()), this, "restart"); - m_paQueue = new TDERadioAction(i18n("&Queue"), "tool_queue", 0, this, TQT_SLOT(slotQueue()), this, "queue"); + m_paQueue = new TDERadioAction(i18n("&Queue"), "tool_queue", 0, this, TQ_SLOT(slotQueue()), this, "queue"); - m_paTimer = new TDERadioAction(i18n("&Timer"), "tool_timer", 0, this, TQT_SLOT(slotRequestSchedule()), this, "timer"); + m_paTimer = new TDERadioAction(i18n("&Timer"), "tool_timer", 0, this, TQ_SLOT(slotRequestSchedule()), this, "timer"); - m_paDelay = new TDERadioAction(i18n("De&lay"), "tool_delay", 0, this, TQT_SLOT(slotRequestDelay()), this, "delay"); + m_paDelay = new TDERadioAction(i18n("De&lay"), "tool_delay", 0, this, TQ_SLOT(slotRequestDelay()), this, "delay"); m_paQueue->setExclusiveGroup("TransferMode"); m_paTimer->setExclusiveGroup("TransferMode"); @@ -146,7 +146,7 @@ Transfer::init(const uint _id) // Actions - // m_paDock = new TDEAction(i18n("&Dock"),"tool_dock", 0, this,TQT_SLOT(slotRequestDelay()), this, "dockIndividual"); + // m_paDock = new TDEAction(i18n("&Dock"),"tool_dock", 0, this,TQ_SLOT(slotRequestDelay()), this, "dockIndividual"); // setup individual transfer dialog diff --git a/kget/transferlist.cpp b/kget/transferlist.cpp index d6acafc1..3fed43b6 100644 --- a/kget/transferlist.cpp +++ b/kget/transferlist.cpp @@ -113,8 +113,8 @@ TransferList::TransferList(TQWidget * parent, const char *name) phasesNum = animConn.count(); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem *)), TQT_SLOT(slotTransferSelected(TQListViewItem *))); - connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), TQT_SLOT(slotPopupMenu(TQListViewItem *))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem *)), TQ_SLOT(slotTransferSelected(TQListViewItem *))); + connect(this, TQ_SIGNAL(rightButtonPressed(TQListViewItem *, const TQPoint &, int)), TQ_SLOT(slotPopupMenu(TQListViewItem *))); } diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp index 6f341c46..c5c44f04 100644 --- a/knewsticker/common/newsengine.cpp +++ b/knewsticker/common/newsengine.cpp @@ -49,14 +49,14 @@ NewsSourceBase::NewsSourceBase(const Data &nsd, ConfigIface *config) m_cfg(dynamic_cast<ConfigAccess *>(config)), m_newsIconMgr(NewsIconMgr::self()) { - connect(this, TQT_SIGNAL(loadComplete(XMLNewsSource *, bool)), - TQT_SLOT(slotProcessArticles(XMLNewsSource *, bool))); + connect(this, TQ_SIGNAL(loadComplete(XMLNewsSource *, bool)), + TQ_SLOT(slotProcessArticles(XMLNewsSource *, bool))); } void NewsSourceBase::getIcon() { - connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), - this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); + connect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); m_newsIconMgr->getIcon( KURL( m_data.icon ) ); } @@ -160,8 +160,8 @@ void NewsSourceBase::slotGotIcon(const KURL &url, const TQPixmap &pixmap) if (url.url() == m_data.icon) { m_icon = pixmap; - disconnect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), - this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); + disconnect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); } } @@ -181,10 +181,10 @@ ProgramNewsSource::ProgramNewsSource(const NewsSourceBase::Data &nsd, m_program(new TDEProcess()), m_programOutput(0) { - connect(m_program, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotProgramExited(TDEProcess *))); - connect(m_program, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotGotProgramOutput(TDEProcess *, char *, int))); + connect(m_program, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotProgramExited(TDEProcess *))); + connect(m_program, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotGotProgramOutput(TDEProcess *, char *, int))); m_data.sourceFile = KURL(m_data.sourceFile).encodedPathAndQuery(); } diff --git a/knewsticker/common/newsiconmgr.cpp b/knewsticker/common/newsiconmgr.cpp index 4a2cb8d6..22525bc3 100644 --- a/knewsticker/common/newsiconmgr.cpp +++ b/knewsticker/common/newsiconmgr.cpp @@ -89,9 +89,9 @@ void NewsIconMgr::getIcon(const KURL &url) } } else { TDEIO::Job *job = TDEIO::get(url, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); KIODownload download; download.url = url; diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp index b9d2ef3a..a49b96fc 100644 --- a/knewsticker/common/xmlnewsaccess.cpp +++ b/knewsticker/common/xmlnewsaccess.cpp @@ -62,9 +62,9 @@ void XMLNewsSource::loadFrom(const KURL &url) TDEIO::Job *job = TDEIO::get(url, false, false); job->addMetaData(TQString::fromLatin1("UserAgent"), TQString::fromLatin1("KNewsTicker v0.2")); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); } void XMLNewsSource::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 0d41c26e..dc71105f 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -50,13 +50,13 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget TQHBoxLayout *layout = new TQHBoxLayout(this); m_contextMenu = new KNewsTickerMenu(this); - connect(m_contextMenu, TQT_SIGNAL(aboutToHide()), - TQT_SLOT(slotContextMenuAboutToHide())); + connect(m_contextMenu, TQ_SIGNAL(aboutToHide()), + TQ_SLOT(slotContextMenuAboutToHide())); setCustomMenu(m_contextMenu); m_arrowButton = new KArrowButton(this); TQToolTip::add(m_arrowButton, i18n("Show menu")); - connect(m_arrowButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotArrowButtonPressed())); + connect(m_arrowButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotArrowButtonPressed())); m_arrowButton->setFocusPolicy(TQWidget::NoFocus); setupArrowButton(); layout->addWidget(m_arrowButton); @@ -67,11 +67,11 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget m_dcopClient->registerAs("knewsticker", false); TQToolTip::add(m_scroller, TQString()); - connect(m_scroller, TQT_SIGNAL(contextMenu()), TQT_SLOT(slotOpenContextMenu())); + connect(m_scroller, TQ_SIGNAL(contextMenu()), TQ_SLOT(slotOpenContextMenu())); - connect(m_newsTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotUpdateNews())); + connect(m_newsTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotUpdateNews())); - connect(m_updateTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNotifyOfFailures())); + connect(m_updateTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNotifyOfFailures())); m_aboutData->addAuthor("Frerich Raabe", I18N_NOOP("Original author"), "raabe@kde.org"); @@ -141,10 +141,10 @@ void KNewsTicker::reparseConfig() if (!ns->data().enabled) continue; - connect(ns, TQT_SIGNAL(newNewsAvailable(const NewsSourceBase::Ptr &, bool)), - TQT_SLOT(slotNewsSourceUpdated(const NewsSourceBase::Ptr &, bool))); - connect(ns, TQT_SIGNAL(invalidInput(const NewsSourceBase::Ptr &)), - TQT_SLOT(slotNewsSourceFailed(const NewsSourceBase::Ptr &))); + connect(ns, TQ_SIGNAL(newNewsAvailable(const NewsSourceBase::Ptr &, bool)), + TQ_SLOT(slotNewsSourceUpdated(const NewsSourceBase::Ptr &, bool))); + connect(ns, TQ_SIGNAL(invalidInput(const NewsSourceBase::Ptr &)), + TQ_SLOT(slotNewsSourceFailed(const NewsSourceBase::Ptr &))); m_newsSources.append(ns); } @@ -429,7 +429,7 @@ void KNewsTickerMenu::populateMenu() NewsSourceBase::Ptr ns = *nIt; TDEPopupMenu *submenu = new TDEPopupMenu; - int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQT_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000); + int checkNewsId = submenu->insertItem(lookIcon, i18n("Check News"), this, TQ_SLOT(slotCheckNews(int)), 0, sources.findIndex(ns) + 1000); setItemParameter(checkNewsId, sources.findIndex(ns)); submenu->insertSeparator(); @@ -444,9 +444,9 @@ void KNewsTickerMenu::populateMenu() TQString headline = a->headline().replace('&', "&&"); int id; if ( a->read() ) - id = submenu->insertItem(oldArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); + id = submenu->insertItem(oldArticleIcon, headline, this, TQ_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); else - id = submenu->insertItem(newArticleIcon, headline, this, TQT_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); + id = submenu->insertItem(newArticleIcon, headline, this, TQ_SLOT(slotOpenArticle(int)), 0, articleIdx+2000); kdDebug( 5005 ) << "Setting articles index for " << a->headline() << " to " << articleIdx << endl; setItemParameter( id, articleIdx++ ); } @@ -460,8 +460,8 @@ void KNewsTickerMenu::populateMenu() if (!m_parent->m_cfg->newsSources().isEmpty()) insertSeparator(); - insertItem(lookIcon, i18n("Check News"), m_parent, TQT_SLOT(slotUpdateNews())); - int i = insertItem(i18n("Offline Mode"), this, TQT_SLOT(slotToggleOfflineMode()), 0, 4711 ); + insertItem(lookIcon, i18n("Check News"), m_parent, TQ_SLOT(slotUpdateNews())); + int i = insertItem(i18n("Offline Mode"), this, TQ_SLOT(slotToggleOfflineMode()), 0, 4711 ); setItemChecked(i, m_parent->m_cfg->offlineMode()); if (m_fullMenu) { @@ -473,10 +473,10 @@ void KNewsTickerMenu::populateMenu() insertTitle(logoIcon, i18n("KNewsTicker"), 0, 0); - insertItem(helpIcon, i18n("Help"), this, TQT_SLOT(slotShowHelp())); - insertItem(logoIcon, i18n("About KNewsTicker"), this, TQT_SLOT(slotShowAbout())); + insertItem(helpIcon, i18n("Help"), this, TQ_SLOT(slotShowHelp())); + insertItem(logoIcon, i18n("About KNewsTicker"), this, TQ_SLOT(slotShowAbout())); insertSeparator(); - insertItem(confIcon, i18n("Configure KNewsTicker..."), this, TQT_SLOT(slotConfigure())); + insertItem(confIcon, i18n("Configure KNewsTicker..."), this, TQ_SLOT(slotConfigure())); } } diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp index 0e558a1c..96457c36 100644 --- a/knewsticker/knewstickerconfig.cpp +++ b/knewsticker/knewstickerconfig.cpp @@ -109,31 +109,31 @@ KNewsTickerConfig::KNewsTickerConfig(ConfigAccess *cfg, TQWidget *parent, const m_child->lvNewsSources->viewport()->installEventFilter(this); m_child->lvNewsSources->installEventFilter(this); - connect(m_newsIconMgr, TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQT_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &))); - connect(m_child->bChooseFont, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseFont())); - - connect(m_child->lvNewsSources, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), - TQT_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); - connect(m_child->lvNewsSources, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotNewsSourceSelectionChanged())); - connect(m_child->lvNewsSources, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), - TQT_SLOT(slotModifyNewsSource(TQListViewItem *, const TQPoint &, int))); - connect(m_child->bAddNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddNewsSource())); - connect(m_child->bRemoveNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveNewsSource())); - connect(m_child->bModifyNewsSource, TQT_SIGNAL(clicked()), TQT_SLOT(slotModifyNewsSource())); - - connect(m_child->lvFilters, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - TQT_SLOT(slotFilterSelectionChanged(TQListViewItem *))); - connect(m_child->comboFilterAction, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotFilterActionChanged(const TQString &))); - connect(m_child->comboFilterNewsSource, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotFilterNewsSourceChanged(const TQString &))); - connect(m_child->comboFilterCondition, TQT_SIGNAL(activated(const TQString &)), - TQT_SLOT(slotFilterConditionChanged(const TQString &))); - connect(m_child->leFilterExpression, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotFilterExpressionChanged(const TQString &))); - connect(m_child->bAddFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFilter())); - connect(m_child->bRemoveFilter, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFilter())); + connect(m_newsIconMgr, TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), TQ_SLOT(slotGotNewsIcon(const KURL &, const TQPixmap &))); + connect(m_child->bChooseFont, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseFont())); + + connect(m_child->lvNewsSources, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem *, const TQPoint &)), + TQ_SLOT(slotNewsSourceContextMenu(TDEListView *, TQListViewItem *, const TQPoint &))); + connect(m_child->lvNewsSources, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotNewsSourceSelectionChanged())); + connect(m_child->lvNewsSources, TQ_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)), + TQ_SLOT(slotModifyNewsSource(TQListViewItem *, const TQPoint &, int))); + connect(m_child->bAddNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddNewsSource())); + connect(m_child->bRemoveNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveNewsSource())); + connect(m_child->bModifyNewsSource, TQ_SIGNAL(clicked()), TQ_SLOT(slotModifyNewsSource())); + + connect(m_child->lvFilters, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + TQ_SLOT(slotFilterSelectionChanged(TQListViewItem *))); + connect(m_child->comboFilterAction, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotFilterActionChanged(const TQString &))); + connect(m_child->comboFilterNewsSource, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotFilterNewsSourceChanged(const TQString &))); + connect(m_child->comboFilterCondition, TQ_SIGNAL(activated(const TQString &)), + TQ_SLOT(slotFilterConditionChanged(const TQString &))); + connect(m_child->leFilterExpression, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotFilterExpressionChanged(const TQString &))); + connect(m_child->bAddFilter, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFilter())); + connect(m_child->bRemoveFilter, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFilter())); load(); @@ -265,8 +265,8 @@ bool KNewsTickerConfig::eventFilter(TQObject *o, TQEvent *e) NewsSourceBase::Data nsd(name, newSourceUrl, "" , NewsSourceBase::Computers , 10, true, false); NewsSourceDlgImpl nsDlg(this, 0L, true); - connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)), - TQT_SLOT(slotAddNewsSource(const NewsSourceBase::Data &))); + connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)), + TQ_SLOT(slotAddNewsSource(const NewsSourceBase::Data &))); nsDlg.setup(nsd, false); nsDlg.exec(); } @@ -402,8 +402,8 @@ void KNewsTickerConfig::slotChooseFont() void KNewsTickerConfig::slotAddNewsSource() { NewsSourceDlgImpl nsDlg(this, 0L, true); - connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)), - TQT_SLOT(slotAddNewsSource(const NewsSourceBase::Data &))); + connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)), + TQ_SLOT(slotAddNewsSource(const NewsSourceBase::Data &))); nsDlg.exec(); } @@ -460,8 +460,8 @@ void KNewsTickerConfig::modifyNewsSource(TQListViewItem *item) void KNewsTickerConfig::openModifyDialog() { NewsSourceDlgImpl nsDlg(this, 0L, true); - connect(&nsDlg, TQT_SIGNAL(newsSource(const NewsSourceBase::Data &)), - TQT_SLOT(slotModifyNewsSource(const NewsSourceBase::Data &))); + connect(&nsDlg, TQ_SIGNAL(newsSource(const NewsSourceBase::Data &)), + TQ_SLOT(slotModifyNewsSource(const NewsSourceBase::Data &))); nsDlg.setup(m_modifyItem->data(), true); nsDlg.exec(); } diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp index 7f085134..f63a283f 100644 --- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp +++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp @@ -52,18 +52,18 @@ KntSrcFilePropsDlg::KntSrcFilePropsDlg(KPropertiesDialog *props) : KPropsDlgPlugin(props) { m_child = new KntSrcFilePropsDlgWidget(properties->addVBoxPage(i18n("News Resource"))); - connect(m_child->urlName, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(slotOpenURL(const TQString &))); - connect(m_child->lbArticles, TQT_SIGNAL(executed(TQListBoxItem *)), - TQT_SLOT(slotClickedArticle(TQListBoxItem *))); + connect(m_child->urlName, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(slotOpenURL(const TQString &))); + connect(m_child->lbArticles, TQ_SIGNAL(executed(TQListBoxItem *)), + TQ_SLOT(slotClickedArticle(TQListBoxItem *))); Loader *loader = Loader::create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - TQT_SLOT(slotConstructUI(Loader *, Document, Status))); + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + TQ_SLOT(slotConstructUI(Loader *, Document, Status))); loader->loadFrom(props->item()->url(), new FileRetriever); - connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), - TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); + connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); m_child->show(); } diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp index c9df6429..5da27a1c 100644 --- a/knewsticker/newsscroller.cpp +++ b/knewsticker/newsscroller.cpp @@ -143,7 +143,7 @@ NewsScroller::NewsScroller(TQWidget *parent, ConfigAccess *cfg, const char *name m_headlines.setAutoDelete(true); - connect(m_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(m_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); setAcceptDrops(true); diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp index 83fd6e04..df463422 100644 --- a/knewsticker/newssourcedlgimpl.cpp +++ b/knewsticker/newssourcedlgimpl.cpp @@ -42,16 +42,16 @@ SuggestProgressDlg::SuggestProgressDlg(const KURL &url, TQWidget *parent, const m_progressBar->setPercentageVisible(false); m_timeoutTimer = new TQTimer(this); - connect(m_timeoutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeoutTick())); + connect(m_timeoutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeoutTick())); m_timeoutTimer->start(1000); m_xmlSrc = new XMLNewsSource; - connect(m_xmlSrc, TQT_SIGNAL(loadComplete(XMLNewsSource *, bool)), - this, TQT_SLOT(slotLoadComplete(XMLNewsSource *, bool))); + connect(m_xmlSrc, TQ_SIGNAL(loadComplete(XMLNewsSource *, bool)), + this, TQ_SLOT(slotLoadComplete(XMLNewsSource *, bool))); m_xmlSrc->loadFrom(url); - connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), - this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); + connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); KURL u = url; if (url.isLocalFile()) u = TQString(); @@ -99,8 +99,8 @@ NewsSourceDlgImpl::NewsSourceDlgImpl(TQWidget *parent, const char *name, bool m : NewsSourceDlg(parent, name, modal, fl), m_modified(false) { - connect(NewsIconMgr::self(), TQT_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), - this, TQT_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); + connect(NewsIconMgr::self(), TQ_SIGNAL(gotIcon(const KURL &, const TQPixmap &)), + this, TQ_SLOT(slotGotIcon(const KURL &, const TQPixmap &))); for (unsigned int i = 0; i < DEFAULT_SUBJECTS; i++) comboCategory->insertItem( diff --git a/kopete/kopete/addaccountwizard/addaccountwizard.cpp b/kopete/kopete/addaccountwizard/addaccountwizard.cpp index aa320d34..88b7c418 100644 --- a/kopete/kopete/addaccountwizard/addaccountwizard.cpp +++ b/kopete/kopete/addaccountwizard/addaccountwizard.cpp @@ -78,12 +78,12 @@ AddAccountWizard::AddAccountWizard( TQWidget *parent, const char *name, bool mod } // hook up the user input - connect(m_selectService->protocolListView, TQT_SIGNAL(clicked(TQListViewItem *)), - this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); - connect(m_selectService->protocolListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT( slotProtocolListClicked(TQListViewItem *))); - connect(m_selectService->protocolListView, TQT_SIGNAL(doubleClicked(TQListViewItem *)), - this, TQT_SLOT(slotProtocolListDoubleClicked(TQListViewItem *))); + connect(m_selectService->protocolListView, TQ_SIGNAL(clicked(TQListViewItem *)), + this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect(m_selectService->protocolListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT( slotProtocolListClicked(TQListViewItem *))); + connect(m_selectService->protocolListView, TQ_SIGNAL(doubleClicked(TQListViewItem *)), + this, TQ_SLOT(slotProtocolListDoubleClicked(TQListViewItem *))); } void AddAccountWizard::slotProtocolListClicked( TQListViewItem * ) diff --git a/kopete/kopete/addcontactwizard/addcontactwizard.cpp b/kopete/kopete/addcontactwizard/addcontactwizard.cpp index 5b7ac5d4..72e9a9c2 100644 --- a/kopete/kopete/addcontactwizard/addcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/addcontactwizard.cpp @@ -115,17 +115,17 @@ AddContactWizard::AddContactWizard( TQWidget *parent, const char *name ) setFinishEnabled( finis, true ); // Addressee validation connections - connect( chkAddressee, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotCheckAddresseeChoice( bool ) ) ); - connect( m_addressbookSelectorWidget, TQT_SIGNAL(addresseeListClicked( TQListViewItem * )), TQT_SLOT(slotAddresseeListClicked( TQListViewItem * )) ); + connect( chkAddressee, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotCheckAddresseeChoice( bool ) ) ); + connect( m_addressbookSelectorWidget, TQ_SIGNAL(addresseeListClicked( TQListViewItem * )), TQ_SLOT(slotAddresseeListClicked( TQListViewItem * )) ); // Group manipulation connection - connect( addGroupButton, TQT_SIGNAL(clicked()) , TQT_SLOT(slotAddGroupClicked()) ); + connect( addGroupButton, TQ_SIGNAL(clicked()) , TQ_SLOT(slotAddGroupClicked()) ); // Account choice validation connections - connect( protocolListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); - connect( protocolListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); - connect( protocolListView, TQT_SIGNAL(spacePressed(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(spacePressed(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); // read sticky settings TDEConfig *config = kapp->config(); @@ -278,8 +278,8 @@ void AddContactWizard::next() if (!addPage) continue; - connect(addPage, TQT_SIGNAL(dataValid( AddContactPage *, bool )), - this, TQT_SLOT( slotDataValid( AddContactPage *, bool ))); + connect(addPage, TQ_SIGNAL(dataValid( AddContactPage *, bool )), + this, TQ_SLOT( slotDataValid( AddContactPage *, bool ))); addPage->show(); insertPage( addPage, i18n( "The user has to select the contact to add to the given account name", diff --git a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp index be2ddda7..72993632 100644 --- a/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp +++ b/kopete/kopete/addcontactwizard/fastaddcontactwizard.cpp @@ -50,9 +50,9 @@ FastAddContactWizard::FastAddContactWizard( TQWidget *parent, const char *name ) protocolListView->setCurrentItem( accountLVI ); // Account choice validation connections - connect( protocolListView, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); - connect( protocolListView, TQT_SIGNAL(selectionChanged(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); - connect( protocolListView, TQT_SIGNAL(spacePressed(TQListViewItem *)), this, TQT_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(selectionChanged(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); + connect( protocolListView, TQ_SIGNAL(spacePressed(TQListViewItem *)), this, TQ_SLOT(slotProtocolListClicked(TQListViewItem *))); setNextEnabled( selectService, false ); setFinishEnabled(finis, true); diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index de06b9e0..df6ba03c 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -78,8 +78,8 @@ ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent, setText( 0, nick ); setDragEnabled(true); - connect( m_contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + connect( m_contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; setStatus( parent->session()->contactOnlineStatus(m_contact) ); reposition(); @@ -154,17 +154,17 @@ ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWi for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it ) slotContactAdded( *it ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &) ), - TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem* ) ), - TQT_SLOT( slotExecute( TQListViewItem * ) ) ); - - connect( session, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), - this, TQT_SLOT( slotContactAdded(const Kopete::Contact*) ) ); - connect( session, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), - this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*) ) ); - connect( session, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), - this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &) ), + TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem* ) ), + TQ_SLOT( slotExecute( TQListViewItem * ) ) ); + + connect( session, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), + this, TQ_SLOT( slotContactAdded(const Kopete::Contact*) ) ); + connect( session, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), + this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*) ) ); + connect( session, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), + this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ) ); } ChatMembersListWidget::~ChatMembersListWidget() @@ -176,7 +176,7 @@ void ChatMembersListWidget::slotContextMenu( TDEListView*, TQListViewItem *item, if ( ContactItem *contactItem = dynamic_cast<ContactItem*>(item) ) { TDEPopupMenu *p = contactItem->contact()->popupMenu( session() ); - connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) ); + connect( p, TQ_SIGNAL( aboutToHide() ), p, TQ_SLOT( deleteLater() ) ); p->popup( point ); } } diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index a9bcdcba..5471d528 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -238,33 +238,33 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co // It is not possible to drag and drop on our widget view()->setAcceptDrops(false); - connect( KopetePrefs::prefs(), TQT_SIGNAL(messageAppearanceChanged()), - this, TQT_SLOT( slotAppearanceChanged() ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL(windowAppearanceChanged()), - this, TQT_SLOT( slotRefreshView() ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL(styleChanged(const TQString &)), - this, TQT_SLOT( setStyle(const TQString &) ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL(styleVariantChanged(const TQString &)), - this, TQT_SLOT( setStyleVariant(const TQString &) ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL(messageAppearanceChanged()), + this, TQ_SLOT( slotAppearanceChanged() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL(windowAppearanceChanged()), + this, TQ_SLOT( slotRefreshView() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL(styleChanged(const TQString &)), + this, TQ_SLOT( setStyle(const TQString &) ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL(styleVariantChanged(const TQString &)), + this, TQ_SLOT( setStyleVariant(const TQString &) ) ); // Refresh the style if the display name change. - connect( d->manager, TQT_SIGNAL(displayNameChanged()), this, TQT_SLOT(slotUpdateHeaderDisplayName()) ); - connect( d->manager, TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotUpdateHeaderPhoto()) ); + connect( d->manager, TQ_SIGNAL(displayNameChanged()), this, TQ_SLOT(slotUpdateHeaderDisplayName()) ); + connect( d->manager, TQ_SIGNAL(photoChanged()), this, TQ_SLOT(slotUpdateHeaderPhoto()) ); - connect ( browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect ( browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), - this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &)) ); - connect( view(), TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(slotScrollingTo(int,int)) ); + connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), + this, TQ_SLOT(slotRightClick(const TQString &, const TQPoint &)) ); + connect( view(), TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(slotScrollingTo(int,int)) ); //initActions - d->copyAction = KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() ); - d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() ); - d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() ); - d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() ); - d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() ); - d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() ); + d->copyAction = KStdAction::copy( this, TQ_SLOT(copy()), actionCollection() ); + d->saveAction = KStdAction::saveAs( this, TQ_SLOT(save()), actionCollection() ); + d->printAction = KStdAction::print( this, TQ_SLOT(print()),actionCollection() ); + d->closeAction = KStdAction::close( this, TQ_SLOT(slotCloseView()),actionCollection() ); + d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQ_SLOT( slotImportEmoticon() ), actionCollection() ); + d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQ_SLOT( slotCopyURL() ), actionCollection() ); // read formatting override flags readOverrides(); @@ -330,7 +330,7 @@ void ChatMessagePart::slotImportEmoticon() TQTextStream emoStream(fp); emoStream << themeXml.toString(4); fp->close(); - TQTimer::singleShot( 1500, Kopete::Emoticons::self(), TQT_SLOT( reload() ) ); + TQTimer::singleShot( 1500, Kopete::Emoticons::self(), TQ_SLOT( reload() ) ); } void ChatMessagePart::save() @@ -420,7 +420,7 @@ void ChatMessagePart::setStyle( const TQString &stylePath ) // Do the actual style switch // Wait for the event loop before switching the style - TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) ); } void ChatMessagePart::setStyle( ChatWindowStyle *style ) @@ -430,7 +430,7 @@ void ChatMessagePart::setStyle( ChatWindowStyle *style ) // Do the actual style switch // Wait for the event loop before switching the style - TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) ); } void ChatMessagePart::setStyleVariant( const TQString &variantPath ) @@ -593,7 +593,7 @@ void ChatMessagePart::appendMessage( Kopete::Message &message, bool restoring ) } if ( !d->scrollPressed ) - TQTimer::singleShot( 1, this, TQT_SLOT( slotScrollView() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotScrollView() ) ); #ifdef STYLE_TIMETEST kdDebug(14000) << "Message time: " << beforeMessage.msecsTo( TQTime::currentTime()) << endl; @@ -613,7 +613,7 @@ void ChatMessagePart::slotRefreshView() void ChatMessagePart::keepScrolledDown() { if ( !d->scrollPressed ) - TQTimer::singleShot( 1, this, TQT_SLOT( slotScrollView() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotScrollView() ) ); } const TQString ChatMessagePart::styleHTML() const @@ -715,7 +715,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) if ( Kopete::Contact *contact = contactFromNode( d->activeElement ) ) { chatWindowPopup = contact->popupMenu( d->manager ); - connect( chatWindowPopup, TQT_SIGNAL( aboutToHide() ), chatWindowPopup , TQT_SLOT( deleteLater() ) ); + connect( chatWindowPopup, TQ_SIGNAL( aboutToHide() ), chatWindowPopup , TQ_SLOT( deleteLater() ) ); } else { @@ -741,7 +741,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point ) chatWindowPopup->insertSeparator(); d->closeAction->plug( chatWindowPopup ); - connect( chatWindowPopup, TQT_SIGNAL( aboutToHide() ), chatWindowPopup, TQT_SLOT( deleteLater() ) ); + connect( chatWindowPopup, TQ_SIGNAL( aboutToHide() ), chatWindowPopup, TQ_SLOT( deleteLater() ) ); chatWindowPopup->popup( point ); } @@ -941,7 +941,7 @@ void ChatMessagePart::copy(bool justselection /* default false */) if(text.isEmpty()) return; - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection())); #ifndef TQT_NO_MIMECLIPBOARD if(!justselection) @@ -963,7 +963,7 @@ void ChatMessagePart::copy(bool justselection /* default false */) TQApplication::clipboard()->setText( text, TQClipboard::Clipboard ); TQApplication::clipboard()->setText( text, TQClipboard::Selection ); #endif - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); } @@ -1291,7 +1291,7 @@ void ChatMessagePart::slotUpdateHeaderPhoto() { // Do the actual style switch // Wait for the event loop before switching the style - TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) ); } void ChatMessagePart::changeStyle() diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp index 3eebf508..1822a96e 100644 --- a/kopete/kopete/chatwindow/chattexteditpart.cpp +++ b/kopete/kopete/chatwindow/chattexteditpart.cpp @@ -49,21 +49,21 @@ ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *pare edit()->setAutoFormatting( TQTextEdit::AutoNone ); // some signals and slots connections - connect( edit(), TQT_SIGNAL( textChanged()), this, TQT_SLOT( slotTextChanged() ) ); + connect( edit(), TQ_SIGNAL( textChanged()), this, TQ_SLOT( slotTextChanged() ) ); // timers for typing notifications m_typingRepeatTimer = new TQTimer(this, "m_typingRepeatTimer"); m_typingStopTimer = new TQTimer(this, "m_typingStopTimer"); - connect( m_typingRepeatTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRepeatTypingTimer() ) ); - connect( m_typingStopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStoppedTypingTimer() ) ); + connect( m_typingRepeatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRepeatTypingTimer() ) ); + connect( m_typingStopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStoppedTypingTimer() ) ); - connect( session, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), - this, TQT_SLOT( slotContactAdded(const Kopete::Contact*) ) ); - connect( session, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), - this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*) ) ); - connect( session, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), - this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + connect( session, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), + this, TQ_SLOT( slotContactAdded(const Kopete::Contact*) ) ); + connect( session, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), + this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*) ) ); + connect( session, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), + this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); slotContactAdded( session->myself() ); for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it ) @@ -195,8 +195,8 @@ void ChatTextEditPart::slotPropertyChanged( Kopete::Contact*, const TQString &ke void ChatTextEditPart::slotContactAdded( const Kopete::Contact *contact ) { - connect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + connect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; TQString contactName = contact->property(Kopete::Global::Properties::self()->nickName()).value().toString(); mComplete->addItem( contactName ); @@ -204,8 +204,8 @@ void ChatTextEditPart::slotContactAdded( const Kopete::Contact *contact ) void ChatTextEditPart::slotContactRemoved( const Kopete::Contact *contact ) { - disconnect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + disconnect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; TQString contactName = contact->property(Kopete::Global::Properties::self()->nickName()).value().toString(); mComplete->removeItem( contactName ); diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index bc4d3227..9d75badc 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -103,14 +103,14 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch m_editPart = new ChatTextEditPart( mgr, editDock, "kopeterichtexteditpart" ); // FIXME: is this used these days? it seems totally unnecessary - connect( editPart(), TQT_SIGNAL( toggleToolbar(bool)), this, TQT_SLOT(slotToggleRtfToolbar(bool)) ); + connect( editPart(), TQ_SIGNAL( toggleToolbar(bool)), this, TQ_SLOT(slotToggleRtfToolbar(bool)) ); - connect( editPart(), TQT_SIGNAL( messageSent( Kopete::Message & ) ), - this, TQT_SIGNAL( messageSent( Kopete::Message & ) ) ); - connect( editPart(), TQT_SIGNAL( canSendChanged( bool ) ), - this, TQT_SIGNAL( canSendChanged(bool) ) ); - connect( editPart(), TQT_SIGNAL( typing(bool) ), - mgr, TQT_SLOT( typing(bool) ) ); + connect( editPart(), TQ_SIGNAL( messageSent( Kopete::Message & ) ), + this, TQ_SIGNAL( messageSent( Kopete::Message & ) ) ); + connect( editPart(), TQ_SIGNAL( canSendChanged( bool ) ), + this, TQ_SIGNAL( canSendChanged(bool) ) ); + connect( editPart(), TQ_SIGNAL( typing(bool) ), + mgr, TQ_SLOT( typing(bool) ) ); //Make the edit area dockable for now editDock->setWidget( editPart()->widget() ); @@ -129,28 +129,28 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch m_remoteTypingMap.setAutoDelete( true ); //Manager signals - connect( mgr, TQT_SIGNAL( displayNameChanged() ), - this, TQT_SLOT( slotChatDisplayNameChanged() ) ); - connect( mgr, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), - this, TQT_SLOT( slotContactAdded(const Kopete::Contact*, bool) ) ); - connect( mgr, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), - this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ) ); - connect( mgr, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), - this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); - connect( mgr, TQT_SIGNAL( remoteTyping( const Kopete::Contact *, bool) ), - this, TQT_SLOT( remoteTyping(const Kopete::Contact *, bool) ) ); - connect( mgr, TQT_SIGNAL( eventNotification( const TQString& ) ), - this, TQT_SLOT( setStatusText( const TQString& ) ) ); + connect( mgr, TQ_SIGNAL( displayNameChanged() ), + this, TQ_SLOT( slotChatDisplayNameChanged() ) ); + connect( mgr, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ), + this, TQ_SLOT( slotContactAdded(const Kopete::Contact*, bool) ) ); + connect( mgr, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ), + this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ) ); + connect( mgr, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ), + this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + connect( mgr, TQ_SIGNAL( remoteTyping( const Kopete::Contact *, bool) ), + this, TQ_SLOT( remoteTyping(const Kopete::Contact *, bool) ) ); + connect( mgr, TQ_SIGNAL( eventNotification( const TQString& ) ), + this, TQ_SLOT( setStatusText( const TQString& ) ) ); //Connections to the manager and the ViewManager that every view should have - connect( this, TQT_SIGNAL( closing( KopeteView * ) ), - KopeteViewManager::viewManager(), TQT_SLOT( slotViewDestroyed( KopeteView * ) ) ); - connect( this, TQT_SIGNAL( activated( KopeteView * ) ), - KopeteViewManager::viewManager(), TQT_SLOT( slotViewActivated( KopeteView * ) ) ); - connect( this, TQT_SIGNAL( messageSent(Kopete::Message &) ), - mgr, TQT_SLOT( sendMessage(Kopete::Message &) ) ); - connect( mgr, TQT_SIGNAL( messageSuccess() ), - this, TQT_SLOT( messageSentSuccessfully() )); + connect( this, TQ_SIGNAL( closing( KopeteView * ) ), + KopeteViewManager::viewManager(), TQ_SLOT( slotViewDestroyed( KopeteView * ) ) ); + connect( this, TQ_SIGNAL( activated( KopeteView * ) ), + KopeteViewManager::viewManager(), TQ_SLOT( slotViewActivated( KopeteView * ) ) ); + connect( this, TQ_SIGNAL( messageSent(Kopete::Message &) ), + mgr, TQ_SLOT( sendMessage(Kopete::Message &) ) ); + connect( mgr, TQ_SIGNAL( messageSuccess() ), + this, TQ_SLOT( messageSentSuccessfully() )); // add contacts slotContactAdded( mgr->myself(), true ); @@ -161,8 +161,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch editPart()->widget()->setFocus(); // init actions - KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() ); - KStdAction::close( this, TQT_SLOT(closeView()),actionCollection() ); + KStdAction::copy( this, TQ_SLOT(copy()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(closeView()),actionCollection() ); setCaption( m_manager->displayName(), false ); @@ -521,7 +521,7 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping ) if( isTyping ) { m_remoteTypingMap.insert( key, new TQTimer(this) ); - connect( m_remoteTypingMap[ key ], TQT_SIGNAL( timeout() ), TQT_SLOT( slotRemoteTypingTimeout() ) ); + connect( m_remoteTypingMap[ key ], TQ_SIGNAL( timeout() ), TQ_SLOT( slotRemoteTypingTimeout() ) ); m_remoteTypingMap[ key ]->start( 6000, true ); } @@ -622,13 +622,13 @@ void ChatView::slotContactAdded(const Kopete::Contact *contact, bool suppress) if( contact->metaContact() && contact->metaContact() != Kopete::ContactList::self()->myself() ) { - connect( contact->metaContact(), TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), - this, TQT_SLOT( slotDisplayNameChanged(const TQString &, const TQString &) ) ); + connect( contact->metaContact(), TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), + this, TQ_SLOT( slotDisplayNameChanged(const TQString &, const TQString &) ) ); } else { - connect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + connect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; } if( !suppress && m_manager->members().count() > 1 ) @@ -670,13 +670,13 @@ void ChatView::slotContactRemoved( const Kopete::Contact *contact, const TQStrin { if( contact->metaContact() ) { - disconnect( contact->metaContact(), TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), - this, TQT_SLOT( slotDisplayNameChanged(const TQString&, const TQString&) ) ); + disconnect( contact->metaContact(), TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), + this, TQ_SLOT( slotDisplayNameChanged(const TQString&, const TQString&) ) ); } else { - disconnect(contact,TQT_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & )), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + disconnect(contact,TQ_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & )), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; } } @@ -758,7 +758,7 @@ void ChatView::appendMessage(Kopete::Message &message) { unreadMessageFrom = message.from()->nickName(); } - TQTimer::singleShot( 1000, this, TQT_SLOT( slotMarkMessageRead() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotMarkMessageRead() ) ); } else unreadMessageFrom = TQString(); @@ -1067,7 +1067,7 @@ void ChatView::dropEvent ( TQDropEvent * event ) void ChatView::registerContextMenuHandler( TQObject *target, const char* slot ) { connect( m_messagePart, - TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ), + TQ_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ), target, slot ); @@ -1076,7 +1076,7 @@ void ChatView::registerContextMenuHandler( TQObject *target, const char* slot ) void ChatView::registerTooltipHandler( TQObject *target, const char* slot ) { connect( m_messagePart, - TQT_SIGNAL( tooltipEvent( Kopete::Message &, const TQString &, TQString & ) ), + TQ_SIGNAL( tooltipEvent( Kopete::Message &, const TQString &, TQString & ) ), target, slot ); diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp index fac6fc40..eeed01dd 100644 --- a/kopete/kopete/chatwindow/emoticonselector.cpp +++ b/kopete/kopete/chatwindow/emoticonselector.cpp @@ -89,7 +89,7 @@ void EmoticonSelector::prepareList(void) { TQWidget *w = new EmoticonLabel(it.data().first(), it.key(), this); movieList.push_back( ((TQLabel*)w)->movie() ); - connect(w, TQT_SIGNAL(clicked(const TQString&)), this, TQT_SLOT(emoticonClicked(const TQString&))); + connect(w, TQ_SIGNAL(clicked(const TQString&)), this, TQ_SLOT(emoticonClicked(const TQString&))); // kdDebug(14000) << "adding Emoticon to row=" << row << ", col=" << col << "." << endl; lay->addWidget(w, row, col); if ( col == emoticonsPerRow ) diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp index eef4ab09..20549de2 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp @@ -196,7 +196,7 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name ) m_button_send->setEnabled( false ); m_button_send->setFont( statusBar()->font() ); m_button_send->setFixedHeight( statusBar()->sizeHint().height() ); - connect( m_button_send, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSendMessage() ) ); + connect( m_button_send, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSendMessage() ) ); statusBar()->addWidget( m_button_send, 0, true ); } else @@ -314,86 +314,86 @@ void KopeteChatWindow::initActions(void) createStandardStatusBarAction(); chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) , - this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" ); + this, TQ_SLOT( slotSendMessage() ), coll, "chat_send" ); chatSend->setEnabled( false ); - KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll ); - KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll ); - TDEAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll ); + KStdAction::save ( this, TQ_SLOT(slotChatSave()), coll ); + KStdAction::print ( this, TQ_SLOT(slotChatPrint()), coll ); + TDEAction* quitAction = KStdAction::quit ( this, TQ_SLOT(close()), coll ); quitAction->setText( i18n("Close All Chats") ); - tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" ); + tabClose = KStdAction::close ( this, TQ_SLOT(slotChatClosed()), coll, "tabs_close" ); tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(), - this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" ); + this, TQ_SLOT( slotNextTab() ), coll, "tabs_right" ); tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(), - this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" ); + this, TQ_SLOT( slotPreviousTab() ), coll, "tabs_left" ); tabLeft->setEnabled( false ); tabRight->setEnabled( false ); - nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete"); + nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQ_SLOT( slotNickComplete() ), coll , "nick_compete"); nickComplete->setShortcut( TQKeySequence( Key_Tab ) ); tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0, - this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" ); + this, TQ_SLOT( slotDetachChat() ), coll, "tabs_detach" ); tabDetach->setEnabled( false ); actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" ); actionDetachMenu->setDelayed( false ); - connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) ); - connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) ); + connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareDetachMenu()) ); + connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDetachChat(int)) ); actionTabPlacementMenu = new TDEActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" ); - connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) ); - connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) ); + connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPreparePlacementMenu()) ); + connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPlaceTabs(int)) ); tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) ); - KStdAction::cut( this, TQT_SLOT(slotCut()), coll); - KStdAction::copy( this, TQT_SLOT(slotCopy()), coll); - KStdAction::paste( this, TQT_SLOT(slotPaste()), coll); + KStdAction::cut( this, TQ_SLOT(slotCut()), coll); + KStdAction::copy( this, TQ_SLOT(slotCopy()), coll); + KStdAction::paste( this, TQ_SLOT(slotPaste()), coll); - new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQT_SLOT( slotSetFont() ), coll, "format_font" ); - new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); - new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); + new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQ_SLOT( slotSetFont() ), coll, "format_font" ); + new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQ_SLOT( slotSetFgColor() ), coll, "format_fgcolor" ); + new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQ_SLOT( slotSetBgColor() ), coll, "format_bgcolor" ); historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0, - this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" ); + this, TQ_SLOT( slotHistoryUp() ), coll, "history_up" ); historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) ); historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0, - this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" ); + this, TQ_SLOT( slotHistoryDown() ), coll, "history_down" ); historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) ); - KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" ); - KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" ); + KStdAction::prior( this, TQ_SLOT( slotPageUp() ), coll, "scroll_up" ); + KStdAction::next( this, TQ_SLOT( slotPageDown() ), coll, "scroll_down" ); - KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll ); + KStdAction::showMenubar( this, TQ_SLOT(slotViewMenuBar()), coll ); membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0, - this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" ); + this, TQ_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" ); membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0, - this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" ); + this, TQ_SLOT( slotViewMembersRight() ), coll, "options_membersright" ); toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0, - this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" ); + this, TQ_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" ); toggleMembers->setCheckedState(i18n("Hide")); toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0, - this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" ); + this, TQ_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" ); toggleAutoSpellCheck->setChecked( true ); actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" ); actionSmileyMenu->setDelayed( false ); - connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &))); + connect(actionSmileyMenu, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSmileyActivated(const TQString &))); actionContactMenu = new TDEActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" ); actionContactMenu->setDelayed( false ); - connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) ); + connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareContactMenu()) ); // add configure key bindings menu item - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), coll ); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), coll); KopeteStdAction::preferences( coll , "settings_prefs" ); //The Sending movie @@ -422,7 +422,7 @@ void KopeteChatWindow::initActions(void) createGUI( 0L ); // Special handling for remembering whether the format toolbar is visible or not - connect ( toolBar("formatToolBar"), TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotToggleFormatToolbar(bool)) ); + connect ( toolBar("formatToolBar"), TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(slotToggleFormatToolbar(bool)) ); } const TQString KopeteChatWindow::fileContents( const TQString &path ) const @@ -599,10 +599,10 @@ void KopeteChatWindow::createTabBar() #if KDE_IS_VERSION(3,4,0) m_tabBar->setAutomaticResizeTabs(true); #endif - connect( m_tabBar, TQT_SIGNAL( closeRequest( TQWidget* )), this, TQT_SLOT( slotCloseChat( TQWidget* ) ) ); + connect( m_tabBar, TQ_SIGNAL( closeRequest( TQWidget* )), this, TQ_SLOT( slotCloseChat( TQWidget* ) ) ); TQToolButton* m_rightWidget = new TQToolButton( m_tabBar ); - connect( m_rightWidget, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChatClosed() ) ); + connect( m_rightWidget, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChatClosed() ) ); m_rightWidget->setIconSet( SmallIcon( "tab_remove" ) ); m_rightWidget->adjustSize(); TQToolTip::add( m_rightWidget, i18n("Close the current tab")); @@ -610,8 +610,8 @@ void KopeteChatWindow::createTabBar() mainLayout->addWidget( m_tabBar ); m_tabBar->show(); - connect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) ); - connect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) ); + connect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) ); + connect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) ); for( ChatView *view = chatViewList.first(); view; view = chatViewList.next() ) addTab( view ); @@ -648,8 +648,8 @@ void KopeteChatWindow::addTab( ChatView *view ) view->show(); else view->hide(); - connect( view, TQT_SIGNAL( captionChanged( bool ) ), this, TQT_SLOT( updateChatLabel() ) ); - connect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) ); + connect( view, TQ_SIGNAL( captionChanged( bool ) ), this, TQ_SLOT( updateChatLabel() ) ); + connect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) ); view->setCaption( view->caption(), false ); } @@ -670,8 +670,8 @@ void KopeteChatWindow::deleteTabBar() { if( m_tabBar ) { - disconnect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) ); - disconnect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) ); + disconnect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) ); + disconnect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) ); if( !chatViewList.isEmpty() ) setPrimaryChatView( chatViewList.first() ); @@ -700,17 +700,17 @@ void KopeteChatWindow::attachChatView( ChatView* newView ) newView->editWidget()->installEventFilter( this ); KCursor::setAutoHideCursor( newView->editWidget(), true, true ); - connect( newView, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) ); - connect( newView, TQT_SIGNAL(messageSuccess( ChatView* )), this, TQT_SLOT(slotStopAnimation( ChatView* )) ); - connect( newView, TQT_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQT_SLOT( slotRTFEnabled( ChatView*, bool ) ) ); - connect( newView, TQT_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQT_SLOT(slotUpdateCaptionIcons( ChatView* ) ) ); - connect( newView, TQT_SIGNAL(updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) ); + connect( newView, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) ); + connect( newView, TQ_SIGNAL(messageSuccess( ChatView* )), this, TQ_SLOT(slotStopAnimation( ChatView* )) ); + connect( newView, TQ_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQ_SLOT( slotRTFEnabled( ChatView*, bool ) ) ); + connect( newView, TQ_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQ_SLOT(slotUpdateCaptionIcons( ChatView* ) ) ); + connect( newView, TQ_SIGNAL(updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) ); updateSpellCheckAction(); checkDetachEnable(); newView->loadChatSettings(); - connect( newView, TQT_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ), - this, TQT_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) ); + connect( newView, TQ_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ), + this, TQ_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) ); } void KopeteChatWindow::checkDetachEnable() @@ -730,9 +730,9 @@ void KopeteChatWindow::detachChatView( ChatView *view ) if( !chatViewList.removeRef( view ) ) return; - disconnect( view, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) ); - disconnect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) ); - disconnect( view, TQT_SIGNAL( updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) ); + disconnect( view, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) ); + disconnect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) ); + disconnect( view, TQ_SIGNAL( updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) ); view->editWidget()->removeEventFilter( this ); if( m_tabBar ) @@ -831,7 +831,7 @@ void KopeteChatWindow::updateBackground( const TQPixmap &pm ) backgroundFile = new KTempFile( TQString(), TQString::fromLatin1( ".bmp" ) ); pm.save( backgroundFile->name(), "BMP" ); - TQTimer::singleShot( 100, this, TQT_SLOT( slotEnableUpdateBg() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( slotEnableUpdateBg() ) ); } } @@ -844,7 +844,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) if(m_activeView) { - disconnect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) ); + disconnect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) ); guiFactory()->removeClient(m_activeView->msgManager()); m_activeView->saveChatSettings(); } @@ -860,7 +860,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget ) if( !chatViewList.contains( view ) ) attachChatView( view ); - connect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) ); + connect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) ); //Tell it it is active m_activeView->setActive( true ); @@ -982,8 +982,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void) for ( contact = m_them.first(); contact; contact = m_them.next() ) { TDEPopupMenu *p = contact->popupMenu(); - connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), - p, TQT_SLOT(deleteLater() ) ); + connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()), + p, TQ_SLOT(deleteLater() ) ); if( contact->metaContact() ) contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->metaContact()->displayName(), p ); @@ -995,8 +995,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void) { TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."), TQString::fromLatin1("folder_open"), contactsMenu ); - connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()), - moreMenu, TQT_SLOT(deleteLater() ) ); + connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()), + moreMenu, TQ_SLOT(deleteLater() ) ); moreMenu->plug( contactsMenu ); contactsMenu = moreMenu->popupMenu(); contactCount = 0; diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp index 2badcaa8..4eeccab7 100644 --- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp +++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp @@ -111,8 +111,8 @@ void ChatWindowStyleManager::loadStyles() d->styleDirLister = new KDirLister(this); d->styleDirLister->setDirOnlyMode(true); - connect(d->styleDirLister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewStyles(const KFileItemList &))); - connect(d->styleDirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDirectoryFinished())); + connect(d->styleDirLister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewStyles(const KFileItemList &))); + connect(d->styleDirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDirectoryFinished())); if( !d->styleDirs.isEmpty() ) d->styleDirLister->openURL(d->styleDirs.pop(), true); diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index 4f0b24ea..0fda236e 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -129,22 +129,22 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP doc.documentElement().removeChild( doc.documentElement().childNodes().item(1) ); //Remove MainToolbar doc.documentElement().removeChild( doc.documentElement().lastChild() ); // Remove Edit popup */ - connect( d->editPart, TQT_SIGNAL( messageSent( Kopete::Message & ) ), - this, TQT_SIGNAL( messageSent( Kopete::Message & ) ) ); - connect( d->editPart, TQT_SIGNAL( canSendChanged( bool ) ), - this, TQT_SLOT( slotUpdateReplySend() ) ); - connect( d->editPart, TQT_SIGNAL( typing(bool) ), - manager, TQT_SIGNAL( typing(bool) ) ); + connect( d->editPart, TQ_SIGNAL( messageSent( Kopete::Message & ) ), + this, TQ_SIGNAL( messageSent( Kopete::Message & ) ) ); + connect( d->editPart, TQ_SIGNAL( canSendChanged( bool ) ), + this, TQ_SLOT( slotUpdateReplySend() ) ); + connect( d->editPart, TQ_SIGNAL( typing(bool) ), + manager, TQ_SIGNAL( typing(bool) ) ); //Connections to the manager and the ViewManager that every view should have - connect( this, TQT_SIGNAL( closing( KopeteView * ) ), - KopeteViewManager::viewManager(), TQT_SLOT( slotViewDestroyed( KopeteView * ) ) ); - connect( this, TQT_SIGNAL( activated( KopeteView * ) ), - KopeteViewManager::viewManager(), TQT_SLOT( slotViewActivated( KopeteView * ) ) ); - connect( this, TQT_SIGNAL( messageSent(Kopete::Message &) ), - manager, TQT_SLOT( sendMessage(Kopete::Message &) ) ); - connect( manager, TQT_SIGNAL( messageSuccess() ), - this, TQT_SLOT( messageSentSuccessfully() )); + connect( this, TQ_SIGNAL( closing( KopeteView * ) ), + KopeteViewManager::viewManager(), TQ_SLOT( slotViewDestroyed( KopeteView * ) ) ); + connect( this, TQ_SIGNAL( activated( KopeteView * ) ), + KopeteViewManager::viewManager(), TQ_SLOT( slotViewActivated( KopeteView * ) ) ); + connect( this, TQ_SIGNAL( messageSent(Kopete::Message &) ), + manager, TQ_SLOT( sendMessage(Kopete::Message &) ) ); + connect( manager, TQ_SIGNAL( messageSuccess() ), + this, TQ_SLOT( messageSentSuccessfully() )); TQWidget *containerWidget = new TQWidget( v ); containerWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) ); @@ -153,16 +153,16 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP h->addStretch(); d->btnReadPrev = new KPushButton( i18n( "<< Prev" ), containerWidget ); - connect( d->btnReadPrev, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadPrev() ) ); + connect( d->btnReadPrev, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReadPrev() ) ); h->addWidget( d->btnReadPrev, 0, TQt::AlignRight | TQt::AlignVCenter ); d->btnReadPrev->setEnabled( false ); d->btnReadNext = new KPushButton( i18n( "(0) Next >>" ), containerWidget ); - connect( d->btnReadNext, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadNext() ) ); + connect( d->btnReadNext, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReadNext() ) ); h->addWidget( d->btnReadNext, 0, TQt::AlignRight | TQt::AlignVCenter ); d->btnReplySend = new KPushButton( containerWidget ); - connect( d->btnReplySend, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReplySend() ) ); + connect( d->btnReplySend, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReplySend() ) ); h->addWidget( d->btnReplySend, 0, TQt::AlignRight | TQt::AlignVCenter ); initActions(); @@ -207,33 +207,33 @@ void KopeteEmailWindow::initActions(void) TDEActionCollection *coll = actionCollection(); d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), 0, - this, TQT_SLOT( slotReplySend() ), coll, "chat_send" ); + this, TQ_SLOT( slotReplySend() ), coll, "chat_send" ); //Default to 'Return' for sending messages d->chatSend->setShortcut( TQKeySequence( Key_Return ) ); - KStdAction::quit ( this, TQT_SLOT( slotCloseView() ), coll ); + KStdAction::quit ( this, TQ_SLOT( slotCloseView() ), coll ); - KStdAction::cut( d->editPart->widget(), TQT_SLOT( cut() ), coll ); - KStdAction::copy( this, TQT_SLOT(slotCopy()), coll); - KStdAction::paste( d->editPart->widget(), TQT_SLOT( paste() ), coll ); + KStdAction::cut( d->editPart->widget(), TQ_SLOT( cut() ), coll ); + KStdAction::copy( this, TQ_SLOT(slotCopy()), coll); + KStdAction::paste( d->editPart->widget(), TQ_SLOT( paste() ), coll ); new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0, - d->editPart, TQT_SLOT( setFont() ), coll, "format_font" ); + d->editPart, TQ_SLOT( setFont() ), coll, "format_font" ); new TDEAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, - d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" ); + d->editPart, TQ_SLOT( setFgColor() ), coll, "format_color" ); new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, - d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" ); + d->editPart, TQ_SLOT( setBgColor() ), coll, "format_bgcolor" ); - KStdAction::showMenubar( this, TQT_SLOT( slotViewMenuBar() ), coll ); + KStdAction::showMenubar( this, TQ_SLOT( slotViewMenuBar() ), coll ); setStandardToolBarMenuEnabled( true ); d->actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" ); d->actionSmileyMenu->setDelayed( false ); - connect(d->actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &))); + connect(d->actionSmileyMenu, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSmileyActivated(const TQString &))); // add configure key bindings menu item - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll ); - KStdAction::configureToolbars(this, TQT_SLOT( slotConfToolbar() ), coll); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), coll ); + KStdAction::configureToolbars(this, TQ_SLOT( slotConfToolbar() ), coll); //FIXME: no longer works? KopeteStdAction::preferences( coll , "settings_prefs" ); @@ -319,7 +319,7 @@ void KopeteEmailWindow::appendMessage(Kopete::Message &message) d->unreadMessageFrom = message.from()->metaContact() ? message.from()->metaContact()->displayName() : message.from()->contactId(); - TQTimer::singleShot( 1000, this, TQT_SLOT(slotMarkMessageRead()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(slotMarkMessageRead()) ); } } diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp index e53d27e4..9e0c520f 100644 --- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp +++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp @@ -46,7 +46,7 @@ public: emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector"); m_popup->insertItem( emoticonSelector ); // TODO: Maybe connect to kopeteprefs and redo list only on config changes - connect( m_popup, TQT_SIGNAL( aboutToShow() ), emoticonSelector, TQT_SLOT( prepareList() ) ); + connect( m_popup, TQ_SIGNAL( aboutToShow() ), emoticonSelector, TQ_SLOT( prepareList() ) ); } ~KopeteEmoticonActionPrivate() @@ -86,8 +86,8 @@ KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name ) setIconSet( TQIconSet( icon ) ); setShortcutConfigurable( false ); - connect( d->emoticonSelector, TQT_SIGNAL( ItemSelected( const TQString & ) ), - this, TQT_SIGNAL( activated( const TQString & ) ) ); + connect( d->emoticonSelector, TQ_SIGNAL( ItemSelected( const TQString & ) ), + this, TQ_SIGNAL( activated( const TQString & ) ) ); } KopeteEmoticonAction::~KopeteEmoticonAction() @@ -149,7 +149,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) menu->setItemEnabled( id, false ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); @@ -166,8 +166,8 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) if ( icon().isEmpty() && !iconSet(TDEIcon::Small).isNull() ) { bar->insertButton( - iconSet(TDEIcon::Small).pixmap(), id_, TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotActivated()), isEnabled(), plainText(), + iconSet(TDEIcon::Small).pixmap(), id_, TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotActivated()), isEnabled(), plainText(), index ); } else @@ -179,8 +179,8 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); } @@ -189,7 +189,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) if (!whatsThis().isEmpty()) TQWhatsThis::add( bar->getButton(id_), whatsThis() ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) bar->setDelayedPopup(id_, popupMenu(), stickyMenu()); @@ -214,7 +214,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index ) bar->setItemEnabled( id, false ); addContainer( bar, id ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index 70b0692f..52f156d3 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -127,86 +127,86 @@ void KopeteRichTextEditPart::createActions( TDEActionCollection *ac ) enableRichText = new TDEToggleAction(i18n("Enable &Rich Text"), "pencil", 0, ac, "enableRichText" ); enableRichText->setCheckedState(i18n("Disable &Rich Text")); - connect( enableRichText, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( slotSetRichTextEnabled(bool) ) ); + connect( enableRichText, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( slotSetRichTextEnabled(bool) ) ); checkSpelling = new TDEAction( i18n("Check &Spelling"), "tools-check-spelling", 0, - editor, TQT_SLOT( checkSpelling() ), ac, "check_spelling" ); + editor, TQ_SLOT( checkSpelling() ), ac, "check_spelling" ); //Fg Color actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0, - this, TQT_SLOT( setFgColor() ), + this, TQ_SLOT( setFgColor() ), ac, "format_color" ); //BG Color actionBgColor = new TDEAction( i18n("Background Co&lor..."), "color_fill", 0, - this, TQT_SLOT( setBgColor() ), + this, TQ_SLOT( setBgColor() ), ac, "format_bgcolor" ); //Font Family action_font = new TDEFontAction( i18n("&Font"), 0, ac, "format_font" ); - connect( action_font, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( setFont( const TQString & ) ) ); + connect( action_font, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( setFont( const TQString & ) ) ); //Font Size action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0, ac, "format_font_size" ); - connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ), - this, TQT_SLOT( setFontSize(int) ) ); + connect( action_font_size, TQ_SIGNAL( fontSizeChanged(int) ), + this, TQ_SLOT( setFontSize(int) ) ); //Formatting action_bold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B, ac, "format_bold" ); - connect( action_bold, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setBold(bool) ) ); + connect( action_bold, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setBold(bool) ) ); action_italic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I, ac, "format_italic" ); - connect( action_italic, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setItalic(bool) ) ); + connect( action_italic, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setItalic(bool) ) ); action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U, ac, "format_underline" ); - connect( action_underline, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setUnderline(bool) ) ); + connect( action_underline, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setUnderline(bool) ) ); - connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - this, TQT_SLOT( updateCharFmt() ) ); + connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( updateCharFmt() ) ); updateCharFmt(); - connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ), - this, TQT_SLOT( updateFont() ) ); + connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ), + this, TQ_SLOT( updateFont() ) ); updateFont(); //Alignment action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0, ac, "format_align_left" ); - connect( action_align_left, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setAlignLeft(bool) ) ); + connect( action_align_left, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setAlignLeft(bool) ) ); action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0, ac, "format_align_center" ); - connect( action_align_center, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setAlignCenter(bool) ) ); + connect( action_align_center, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setAlignCenter(bool) ) ); action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0, ac, "format_align_right" ); - connect( action_align_right, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setAlignRight(bool) ) ); + connect( action_align_right, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setAlignRight(bool) ) ); action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0, ac, "format_align_justify" ); - connect( action_align_justify, TQT_SIGNAL( toggled(bool) ), - this, TQT_SLOT( setAlignJustify(bool) ) ); + connect( action_align_justify, TQ_SIGNAL( toggled(bool) ), + this, TQ_SLOT( setAlignJustify(bool) ) ); action_align_left->setExclusiveGroup( "alignment" ); action_align_center->setExclusiveGroup( "alignment" ); action_align_right->setExclusiveGroup( "alignment" ); action_align_justify->setExclusiveGroup( "alignment" ); - connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ), - this, TQT_SLOT( updateAligment() ) ); + connect( editor, TQ_SIGNAL( cursorPositionChanged( int,int ) ), + this, TQ_SLOT( updateAligment() ) ); updateAligment(); } diff --git a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp index 2ecac32f..943f4d08 100644 --- a/kopete/kopete/config/accounts/kopeteaccountconfig.cpp +++ b/kopete/kopete/config/accounts/kopeteaccountconfig.cpp @@ -63,15 +63,15 @@ KopeteAccountConfig::KopeteAccountConfig( TQWidget *parent, const char * /* name m_view->mButtonUp->setIconSet( SmallIconSet( "go-up" ) ); m_view->mButtonDown->setIconSet( SmallIconSet( "go-down" ) ); - connect( m_view->mButtonNew, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddAccount() ) ); - connect( m_view->mButtonEdit, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotEditAccount() ) ); - connect( m_view->mButtonRemove, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRemoveAccount() ) ); - connect( m_view->mButtonUp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAccountUp() ) ); - connect( m_view->mButtonDown, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAccountDown() ) ); - connect( m_view->mAccountList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotItemSelected() ) ); - connect( m_view->mAccountList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQT_SLOT( slotEditAccount() ) ); - connect( m_view->mUseColor, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotColorChanged() ) ); - connect( m_view->mColorButton, TQT_SIGNAL( changed( const TQColor & ) ), this, TQT_SLOT( slotColorChanged() ) ); + connect( m_view->mButtonNew, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddAccount() ) ); + connect( m_view->mButtonEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEditAccount() ) ); + connect( m_view->mButtonRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveAccount() ) ); + connect( m_view->mButtonUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAccountUp() ) ); + connect( m_view->mButtonDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAccountDown() ) ); + connect( m_view->mAccountList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotItemSelected() ) ); + connect( m_view->mAccountList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), this, TQ_SLOT( slotEditAccount() ) ); + connect( m_view->mUseColor, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotColorChanged() ) ); + connect( m_view->mColorButton, TQ_SIGNAL( changed( const TQColor & ) ), this, TQ_SLOT( slotColorChanged() ) ); m_view->mAccountList->setSorting(-1); @@ -181,7 +181,7 @@ void KopeteAccountConfig::slotAccountDown() void KopeteAccountConfig::slotAddAccount() { AddAccountWizard *m_addwizard = new AddAccountWizard( this, "addAccountWizard", true ); - connect( m_addwizard, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotAddWizardDone() ) ); + connect( m_addwizard, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( slotAddWizardDone() ) ); m_addwizard->show(); } diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 555c36a1..704e8ab4 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -193,41 +193,41 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const // "Emoticons" TAB ========================================================== d->mPrfsEmoticons = new AppearanceConfig_Emoticons(d->mAppearanceTabCtl); - connect(d->mPrfsEmoticons->chkUseEmoticons, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsEmoticons->chkRequireSpaces, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsEmoticons->icon_theme_list, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectedEmoticonsThemeChanged())); - connect(d->mPrfsEmoticons->btnInstallTheme, TQT_SIGNAL(clicked()), - this, TQT_SLOT(installEmoticonTheme())); - - connect(d->mPrfsEmoticons->btnGetThemes, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGetEmoticonThemes())); - connect(d->mPrfsEmoticons->btnRemoveTheme, TQT_SIGNAL(clicked()), - this, TQT_SLOT(removeSelectedEmoticonTheme())); - connect(d->mPrfsEmoticons->btnEditThemes, TQT_SIGNAL(clicked()), - this, TQT_SLOT(editSelectedEmoticonTheme())); + connect(d->mPrfsEmoticons->chkUseEmoticons, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsEmoticons->chkRequireSpaces, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsEmoticons->icon_theme_list, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectedEmoticonsThemeChanged())); + connect(d->mPrfsEmoticons->btnInstallTheme, TQ_SIGNAL(clicked()), + this, TQ_SLOT(installEmoticonTheme())); + + connect(d->mPrfsEmoticons->btnGetThemes, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGetEmoticonThemes())); + connect(d->mPrfsEmoticons->btnRemoveTheme, TQ_SIGNAL(clicked()), + this, TQ_SLOT(removeSelectedEmoticonTheme())); + connect(d->mPrfsEmoticons->btnEditThemes, TQ_SIGNAL(clicked()), + this, TQ_SLOT(editSelectedEmoticonTheme())); d->mAppearanceTabCtl->addTab(d->mPrfsEmoticons, i18n("&Emoticons")); // "Chat Window" TAB ======================================================== d->mPrfsChatWindow = new AppearanceConfig_ChatWindow(d->mAppearanceTabCtl); - connect(d->mPrfsChatWindow->styleList, TQT_SIGNAL(selectionChanged(TQListBoxItem *)), - this, TQT_SLOT(slotChatStyleSelected())); - connect(d->mPrfsChatWindow->variantList, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotChatStyleVariantSelected(const TQString &))); - connect(d->mPrfsChatWindow->deleteButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotDeleteChatStyle())); - connect(d->mPrfsChatWindow->installButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotInstallChatStyle())); - connect(d->mPrfsChatWindow->btnGetStyles, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotGetChatStyles())); - connect(d->mPrfsChatWindow->groupConsecutiveMessages, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); + connect(d->mPrfsChatWindow->styleList, TQ_SIGNAL(selectionChanged(TQListBoxItem *)), + this, TQ_SLOT(slotChatStyleSelected())); + connect(d->mPrfsChatWindow->variantList, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotChatStyleVariantSelected(const TQString &))); + connect(d->mPrfsChatWindow->deleteButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotDeleteChatStyle())); + connect(d->mPrfsChatWindow->installButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotInstallChatStyle())); + connect(d->mPrfsChatWindow->btnGetStyles, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotGetChatStyles())); + connect(d->mPrfsChatWindow->groupConsecutiveMessages, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); // Show the available styles when the Manager has finish to load the styles. - connect(ChatWindowStyleManager::self(), TQT_SIGNAL(loadStylesFinished()), this, TQT_SLOT(slotLoadChatStyles())); + connect(ChatWindowStyleManager::self(), TQ_SIGNAL(loadStylesFinished()), this, TQ_SLOT(slotLoadChatStyles())); d->mPrfsChatWindow->htmlFrame->setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); // Create the fake Chat Session @@ -252,30 +252,30 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const // "Contact List" TAB ======================================================= d->mPrfsContactList = new AppearanceConfig_ContactList(d->mAppearanceTabCtl); - connect(d->mPrfsContactList->mTreeContactList, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mSortByGroup, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mEditTooltips, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotEditTooltips())); - connect(d->mPrfsContactList->mIndentContacts, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mDisplayMode, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mIconMode, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mThemeURL, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mAnimateChanges, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mFadeVisibility, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mFoldVisibility, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mAutoHide, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsContactList->mAutoHideTimeout, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(emitChanged())); + connect(d->mPrfsContactList->mTreeContactList, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mSortByGroup, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mEditTooltips, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotEditTooltips())); + connect(d->mPrfsContactList->mIndentContacts, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mDisplayMode, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mIconMode, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mThemeURL, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mAnimateChanges, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mFadeVisibility, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mFoldVisibility, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mAutoHide, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsContactList->mAutoHideTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(emitChanged())); // don't enable the checkbox if XRender is not available #ifdef HAVE_XRENDER @@ -288,39 +288,39 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const // "Colors and Fonts" TAB =================================================== d->mPrfsColors = new AppearanceConfig_Colors(d->mAppearanceTabCtl); - connect(d->mPrfsColors->foregroundColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotHighlightChanged())); - connect(d->mPrfsColors->backgroundColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotHighlightChanged())); - connect(d->mPrfsColors->fontFace, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT(slotChangeFont())); - connect(d->mPrfsColors->textColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotUpdateChatPreview())); - connect(d->mPrfsColors->bgColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotUpdateChatPreview())); - connect(d->mPrfsColors->linkColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(slotUpdateChatPreview())); - connect(d->mPrfsColors->mGreyIdleMetaContacts, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->idleContactColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mUseCustomFonts, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mSmallFont, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mNormalFont, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mGroupFont, TQT_SIGNAL(fontSelected(const TQFont &)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mGroupNameColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(emitChanged())); - - connect(d->mPrfsColors->mBgOverride, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mFgOverride, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); - connect(d->mPrfsColors->mRtfOverride, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(emitChanged())); + connect(d->mPrfsColors->foregroundColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotHighlightChanged())); + connect(d->mPrfsColors->backgroundColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotHighlightChanged())); + connect(d->mPrfsColors->fontFace, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT(slotChangeFont())); + connect(d->mPrfsColors->textColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotUpdateChatPreview())); + connect(d->mPrfsColors->bgColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotUpdateChatPreview())); + connect(d->mPrfsColors->linkColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(slotUpdateChatPreview())); + connect(d->mPrfsColors->mGreyIdleMetaContacts, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->idleContactColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mUseCustomFonts, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mSmallFont, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mNormalFont, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mGroupFont, TQ_SIGNAL(fontSelected(const TQFont &)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mGroupNameColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(emitChanged())); + + connect(d->mPrfsColors->mBgOverride, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mFgOverride, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); + connect(d->mPrfsColors->mRtfOverride, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(emitChanged())); d->mAppearanceTabCtl->addTab(d->mPrfsColors, i18n("Colors && Fonts")); @@ -696,7 +696,7 @@ void AppearanceConfig::slotGetChatStyles() downloadDialog->setType( contentType ); // you have to do this by hand when providing your own Engine KNS::ProviderLoader *provider = new KNS::ProviderLoader( this ); - TQObject::connect( provider, TQT_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQT_SLOT( slotProviders (Provider::List *) ) ); + TQObject::connect( provider, TQ_SIGNAL( providersLoaded(Provider::List*) ), downloadDialog, TQ_SLOT( slotProviders (Provider::List *) ) ); provider->load( contentType, "https://www.trinitydesktop.org/ocs/providers.xml" ); downloadDialog->exec(); } @@ -869,7 +869,7 @@ void AppearanceConfig::slotGetEmoticonThemes() void AppearanceConfig::slotEditTooltips() { TooltipEditDialog *dlg = new TooltipEditDialog(this); - connect(dlg, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(dlg, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); dlg->exec(); delete dlg; } diff --git a/kopete/kopete/config/appearance/emoticonseditdialog.cpp b/kopete/kopete/config/appearance/emoticonseditdialog.cpp index 7bd23273..1432a328 100644 --- a/kopete/kopete/config/appearance/emoticonseditdialog.cpp +++ b/kopete/kopete/config/appearance/emoticonseditdialog.cpp @@ -60,7 +60,7 @@ void EditDialog::setupDlg() hb->addWidget(leText); vl->addLayout(hb); setMainWidget(wdg); - connect(btnIcon, TQT_SIGNAL(clicked()), this, TQT_SLOT(btnIconClicked())); + connect(btnIcon, TQ_SIGNAL(clicked()), this, TQ_SLOT(btnIconClicked())); } void EditDialog::btnIconClicked() @@ -134,10 +134,10 @@ EmoticonsEditDialog::EmoticonsEditDialog(TQWidget *parent, TQString theme, const mMainWidget->klvEmoticons->setColumnWidth(0, TQListView::Maximum); mMainWidget->klvEmoticons->setColumnWidth(1, TQListView::Maximum); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOkClicked())); - connect(mMainWidget->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddClicked())); - connect(mMainWidget->btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditClicked())); - connect(mMainWidget->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOkClicked())); + connect(mMainWidget->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddClicked())); + connect(mMainWidget->btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditClicked())); + connect(mMainWidget->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveClicked())); } void EmoticonsEditDialog::slotOkClicked() diff --git a/kopete/kopete/config/appearance/tooltipeditdialog.cpp b/kopete/kopete/config/appearance/tooltipeditdialog.cpp index d23fbe74..eb6b6269 100644 --- a/kopete/kopete/config/appearance/tooltipeditdialog.cpp +++ b/kopete/kopete/config/appearance/tooltipeditdialog.cpp @@ -66,8 +66,8 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) Kopete::Global::Properties::self()->templateMap()); TQStringList usedKeys = KopetePrefs::prefs()->toolTipContents(); - connect(mMainWidget->lstUnusedItems, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotAddButton())); - connect(mMainWidget->lstUsedItems, TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )), this, TQT_SLOT(slotRemoveButton())); + connect(mMainWidget->lstUnusedItems, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotAddButton())); + connect(mMainWidget->lstUsedItems, TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )), this, TQ_SLOT(slotRemoveButton())); // first fill the "used" list TQStringList::Iterator usedIt=usedKeys.end(); @@ -91,35 +91,35 @@ TooltipEditDialog::TooltipEditDialog(TQWidget *parent, const char* name) new TooltipItem(mMainWidget->lstUnusedItems, it.data().label(), it.key()); } - connect(mMainWidget->lstUnusedItems, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotUnusedSelected(TQListViewItem *))); - connect(mMainWidget->lstUsedItems, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotUsedSelected(TQListViewItem *))); + connect(mMainWidget->lstUnusedItems, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotUnusedSelected(TQListViewItem *))); + connect(mMainWidget->lstUsedItems, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotUsedSelected(TQListViewItem *))); TQIconSet iconSet; iconSet = SmallIconSet("go-up"); mMainWidget->tbUp->setIconSet(iconSet); mMainWidget->tbUp->setEnabled(false); mMainWidget->tbUp->setAutoRepeat(true); - connect(mMainWidget->tbUp, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpButton())); + connect(mMainWidget->tbUp, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpButton())); iconSet = SmallIconSet("go-down"); mMainWidget->tbDown->setIconSet(iconSet); mMainWidget->tbDown->setEnabled(false); mMainWidget->tbDown->setAutoRepeat(true); - connect(mMainWidget->tbDown, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); + connect(mMainWidget->tbDown, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownButton())); iconSet = TQApplication::reverseLayout() ? SmallIconSet("back") : SmallIconSet("forward"); mMainWidget->tbAdd->setIconSet(iconSet); mMainWidget->tbAdd->setEnabled(false); - connect(mMainWidget->tbAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddButton())); + connect(mMainWidget->tbAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddButton())); iconSet = TQApplication::reverseLayout() ? SmallIconSet("forward") : SmallIconSet("back"); mMainWidget->tbRemove->setIconSet(iconSet); mMainWidget->tbRemove->setEnabled(false); - connect(mMainWidget->tbRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton())); + connect(mMainWidget->tbRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveButton())); - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotOkClicked())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotOkClicked())); resize(TQSize(450, 450)); } diff --git a/kopete/kopete/config/avdevice/avdeviceconfig.cpp b/kopete/kopete/config/avdevice/avdeviceconfig.cpp index fe9c59aa..5add39fc 100644 --- a/kopete/kopete/config/avdevice/avdeviceconfig.cpp +++ b/kopete/kopete/config/avdevice/avdeviceconfig.cpp @@ -52,17 +52,17 @@ AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char * name , const TQSt // "Video" TAB ============================================================ mPrfsVideoDevice = new AVDeviceConfig_VideoDevice(mAVDeviceTabCtl); - connect(mPrfsVideoDevice->mDeviceKComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDeviceKComboBoxChanged(int))); - connect(mPrfsVideoDevice->mInputKComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotInputKComboBoxChanged(int))); - connect(mPrfsVideoDevice->mStandardKComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotStandardKComboBoxChanged(int))); - connect(mPrfsVideoDevice->mBrightnessSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotBrightnessSliderChanged(int))); - connect(mPrfsVideoDevice->mContrastSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotContrastSliderChanged(int))); - connect(mPrfsVideoDevice->mSaturationSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSaturationSliderChanged(int))); - connect(mPrfsVideoDevice->mWhitenessSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotWhitenessSliderChanged(int))); - connect(mPrfsVideoDevice->mHueSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotHueSliderChanged(int))); - connect(mPrfsVideoDevice->mImageAutoBrightnessContrast, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotImageAutoBrightnessContrastChanged(bool))); - connect(mPrfsVideoDevice->mImageAutoColorCorrection, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotImageAutoColorCorrectionChanged(bool))); - connect(mPrfsVideoDevice->mImageAsMirror, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotImageAsMirrorChanged(bool))); + connect(mPrfsVideoDevice->mDeviceKComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDeviceKComboBoxChanged(int))); + connect(mPrfsVideoDevice->mInputKComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotInputKComboBoxChanged(int))); + connect(mPrfsVideoDevice->mStandardKComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotStandardKComboBoxChanged(int))); + connect(mPrfsVideoDevice->mBrightnessSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotBrightnessSliderChanged(int))); + connect(mPrfsVideoDevice->mContrastSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotContrastSliderChanged(int))); + connect(mPrfsVideoDevice->mSaturationSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSaturationSliderChanged(int))); + connect(mPrfsVideoDevice->mWhitenessSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotWhitenessSliderChanged(int))); + connect(mPrfsVideoDevice->mHueSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotHueSliderChanged(int))); + connect(mPrfsVideoDevice->mImageAutoBrightnessContrast, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotImageAutoBrightnessContrastChanged(bool))); + connect(mPrfsVideoDevice->mImageAutoColorCorrection, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotImageAutoColorCorrectionChanged(bool))); + connect(mPrfsVideoDevice->mImageAsMirror, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotImageAsMirrorChanged(bool))); // why is this here? // mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap); @@ -81,7 +81,7 @@ AVDeviceConfig::AVDeviceConfig(TQWidget *parent, const char * name , const TQSt mVideoDevicePool->getImage(&qimage); if (qpixmap.convertFromImage(qimage,0) == true) mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap); - connect(&qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateImage()) ); + connect(&qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateImage()) ); qtimer.start(0,FALSE); } diff --git a/kopete/kopete/config/behavior/behaviorconfig.cpp b/kopete/kopete/config/behavior/behaviorconfig.cpp index e042c1d4..8f4e7de6 100644 --- a/kopete/kopete/config/behavior/behaviorconfig.cpp +++ b/kopete/kopete/config/behavior/behaviorconfig.cpp @@ -77,81 +77,81 @@ BehaviorConfig::BehaviorConfig(TQWidget *parent, const char * /* name */, const // "General" TAB ============================================================ - connect(mPrfsGeneral->mShowTrayChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsGeneral->mStartDockedChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsGeneral->mUseQueueChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsGeneral->mUseStackChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsGeneral->mQueueUnreadMessagesChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsGeneral->mAutoConnect, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mShowTrayChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mStartDockedChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mUseQueueChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mUseStackChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mQueueUnreadMessagesChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsGeneral->mAutoConnect, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); // "Events" TAB ============================================================ - connect(mPrfsEvents->mQueueOnlyHighlightedMessagesInGroupChatsChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mQueueOnlyMessagesOnAnotherDesktopChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mBalloonNotifyChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mBalloonNotifyIgnoreClosesChatViewChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mCloseBalloonChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mBalloonCloseDelay, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect(mPrfsEvents->mTrayflashNotifyChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mTrayflashNotifyLeftClickOpensMessageChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mTrayflashNotifySetCurrentDesktopToChatViewChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mSoundIfAwayChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mEventIfActive, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect(mPrfsEvents->mRaiseMsgWindowChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mQueueOnlyHighlightedMessagesInGroupChatsChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mQueueOnlyMessagesOnAnotherDesktopChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mBalloonNotifyChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mBalloonNotifyIgnoreClosesChatViewChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mCloseBalloonChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mBalloonCloseDelay, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect(mPrfsEvents->mTrayflashNotifyChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mTrayflashNotifyLeftClickOpensMessageChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mTrayflashNotifySetCurrentDesktopToChatViewChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mSoundIfAwayChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mEventIfActive, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect(mPrfsEvents->mRaiseMsgWindowChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); // "Chat" TAB =============================================================== - connect( mPrfsChat->cb_ShowEventsChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mPrfsChat->highlightEnabled, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mPrfsChat->cb_SpellCheckChk, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mPrfsChat->cmbChatGroupingPolicy, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mPrfsChat->mChatViewBufferSize, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mPrfsChat->truncateContactNameEnabled, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mPrfsChat->mMaxContactNameLength, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mPrfsChat->viewPlugin, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mPrfsChat->viewPlugin, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotUpdatePluginLabel(int))); + connect( mPrfsChat->cb_ShowEventsChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mPrfsChat->highlightEnabled, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mPrfsChat->cb_SpellCheckChk, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mPrfsChat->cmbChatGroupingPolicy, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mPrfsChat->mChatViewBufferSize, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mPrfsChat->truncateContactNameEnabled, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mPrfsChat->mMaxContactNameLength, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mPrfsChat->viewPlugin, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mPrfsChat->viewPlugin, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotUpdatePluginLabel(int))); // "Away" TAB =============================================================== - connect( mAwayConfigUI->rememberedMessages, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mAwayConfigUI->mAutoAwayTimeout, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotValueChanged(int))); - connect( mAwayConfigUI->mGoAvailable, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mAwayConfigUI->mUseAutoAway, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mAwayConfigUI->mDisplayLastAwayMessage, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mAwayConfigUI->mDisplayCustomAwayMessage, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(slotSettingsChanged(bool))); - connect( mAwayConfigUI->mAutoAwayMessageEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&))); + connect( mAwayConfigUI->rememberedMessages, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mAwayConfigUI->mAutoAwayTimeout, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotValueChanged(int))); + connect( mAwayConfigUI->mGoAvailable, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mAwayConfigUI->mUseAutoAway, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mAwayConfigUI->mDisplayLastAwayMessage, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mAwayConfigUI->mDisplayCustomAwayMessage, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(slotSettingsChanged(bool))); + connect( mAwayConfigUI->mAutoAwayMessageEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&))); } void BehaviorConfig::save() diff --git a/kopete/kopete/config/identity/kopeteidentityconfig.cpp b/kopete/kopete/config/identity/kopeteidentityconfig.cpp index f57de188..c6419c13 100644 --- a/kopete/kopete/config/identity/kopeteidentityconfig.cpp +++ b/kopete/kopete/config/identity/kopeteidentityconfig.cpp @@ -129,28 +129,28 @@ KopeteIdentityConfig::KopeteIdentityConfig(TQWidget *parent, const char */*name* load(); // Load Configuration // Action signal/slots - connect(d->m_view->buttonChangeAddressee, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChangeAddressee())); - connect(d->m_view->comboSelectIdentity, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotUpdateCurrentIdentity(const TQString& ))); - connect(d->m_view->buttonNewIdentity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewIdentity())); - connect(d->m_view->buttonCopyIdentity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyIdentity())); - connect(d->m_view->buttonRenameIdentity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRenameIdentity())); - connect(d->m_view->buttonRemoveIdentity, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRemoveIdentity())); - connect(d->m_view->comboPhotoURL, TQT_SIGNAL(urlSelected(const TQString& )), this, TQT_SLOT(slotChangePhoto(const TQString& ))); - connect(d->m_view->buttonClearPhoto, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearPhoto())); + connect(d->m_view->buttonChangeAddressee, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChangeAddressee())); + connect(d->m_view->comboSelectIdentity, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotUpdateCurrentIdentity(const TQString& ))); + connect(d->m_view->buttonNewIdentity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewIdentity())); + connect(d->m_view->buttonCopyIdentity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyIdentity())); + connect(d->m_view->buttonRenameIdentity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRenameIdentity())); + connect(d->m_view->buttonRemoveIdentity, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotRemoveIdentity())); + connect(d->m_view->comboPhotoURL, TQ_SIGNAL(urlSelected(const TQString& )), this, TQ_SLOT(slotChangePhoto(const TQString& ))); + connect(d->m_view->buttonClearPhoto, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearPhoto())); // Settings signal/slots - connect(d->m_view->radioNicknameContact, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - connect(d->m_view->radioNicknameCustom, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - connect(d->m_view->radioNicknameKABC, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - - connect(d->m_view->radioPhotoContact, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - connect(d->m_view->radioPhotoCustom, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - connect(d->m_view->radioPhotoKABC, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotEnableAndDisableWidgets())); - - connect(d->m_view->checkSyncPhotoKABC, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(slotSettingsChanged())); - connect(d->m_view->lineNickname, TQT_SIGNAL(textChanged(const TQString& )), this, TQT_SLOT(slotSettingsChanged())); - connect(d->m_view->comboNameContact, TQT_SIGNAL(activated(int )), this, TQT_SLOT(slotSettingsChanged())); - connect(d->m_view->comboPhotoContact, TQT_SIGNAL(activated(int )), this, TQT_SLOT(slotEnableAndDisableWidgets())); + connect(d->m_view->radioNicknameContact, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + connect(d->m_view->radioNicknameCustom, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + connect(d->m_view->radioNicknameKABC, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + + connect(d->m_view->radioPhotoContact, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + connect(d->m_view->radioPhotoCustom, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + connect(d->m_view->radioPhotoKABC, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotEnableAndDisableWidgets())); + + connect(d->m_view->checkSyncPhotoKABC, TQ_SIGNAL(toggled(bool )), this, TQ_SLOT(slotSettingsChanged())); + connect(d->m_view->lineNickname, TQ_SIGNAL(textChanged(const TQString& )), this, TQ_SLOT(slotSettingsChanged())); + connect(d->m_view->comboNameContact, TQ_SIGNAL(activated(int )), this, TQ_SLOT(slotSettingsChanged())); + connect(d->m_view->comboPhotoContact, TQ_SIGNAL(activated(int )), this, TQ_SLOT(slotEnableAndDisableWidgets())); } KopeteIdentityConfig::~KopeteIdentityConfig() diff --git a/kopete/kopete/config/plugins/kopetepluginconfig.cpp b/kopete/kopete/config/plugins/kopetepluginconfig.cpp index d54bc68a..a7ae332d 100644 --- a/kopete/kopete/config/plugins/kopetepluginconfig.cpp +++ b/kopete/kopete/config/plugins/kopetepluginconfig.cpp @@ -55,9 +55,9 @@ KopetePluginConfig::KopetePluginConfig( TQWidget *parent, const char *name ) ( new TQVBoxLayout( plainPage(), 0, 0 ) )->setAutoAdd( true ); d->pluginSelector = new KPluginSelector( plainPage() ); setMainWidget( d->pluginSelector ); - connect( d->pluginSelector, TQT_SIGNAL( changed( bool ) ), this, TQT_SLOT( setChanged( bool ) ) ); - connect( d->pluginSelector, TQT_SIGNAL( configCommitted( const TQCString & ) ), - KSettings::Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->pluginSelector, TQ_SIGNAL( changed( bool ) ), this, TQ_SLOT( setChanged( bool ) ) ); + connect( d->pluginSelector, TQ_SIGNAL( configCommitted( const TQCString & ) ), + KSettings::Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); d->pluginSelector->addPlugins( Kopete::PluginManager::self()->availablePlugins( "Plugins" ), i18n( "General Plugins" ), "Plugins" ); } diff --git a/kopete/kopete/contactlist/customnotificationprops.cpp b/kopete/kopete/contactlist/customnotificationprops.cpp index 82851eb4..b322c726 100644 --- a/kopete/kopete/contactlist/customnotificationprops.cpp +++ b/kopete/kopete/contactlist/customnotificationprops.cpp @@ -58,7 +58,7 @@ CustomNotificationProps::CustomNotificationProps( TQWidget *parent, Kopete::Noti m_eventList = contactSpecificEvents; slotEventsComboChanged( m_notifyWidget->cmbEvents->currentItem() ); // we have to do this after adding items - connect( m_notifyWidget->cmbEvents, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotEventsComboChanged( int ) ) ); + connect( m_notifyWidget->cmbEvents, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotEventsComboChanged( int ) ) ); } void CustomNotificationProps::slotEventsComboChanged( int itemNo ) diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index adf8ea32..7b060d3d 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -411,38 +411,38 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name setFullWidth( true ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), - TQT_SLOT( slotExpanded( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - TQT_SLOT( slotCollapsed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( executed( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( slotExecuted( TQListViewItem *, const TQPoint &, int ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotViewSelectionChanged() ) ); - connect( this, TQT_SIGNAL( itemRenamed( TQListViewItem * ) ), - TQT_SLOT( slotItemRenamed( TQListViewItem * ) ) ); - - connect( KopetePrefs::prefs(), TQT_SIGNAL( saved() ), TQT_SLOT( slotSettingsChanged() ) ); - - connect( Kopete::ContactList::self(), TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotListSelectionChanged() ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), + TQ_SLOT( slotExpanded( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + TQ_SLOT( slotCollapsed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( executed( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( slotExecuted( TQListViewItem *, const TQPoint &, int ) ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotViewSelectionChanged() ) ); + connect( this, TQ_SIGNAL( itemRenamed( TQListViewItem * ) ), + TQ_SLOT( slotItemRenamed( TQListViewItem * ) ) ); + + connect( KopetePrefs::prefs(), TQ_SIGNAL( saved() ), TQ_SLOT( slotSettingsChanged() ) ); + + connect( Kopete::ContactList::self(), TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotListSelectionChanged() ) ); connect( Kopete::ContactList::self(), - TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), - TQT_SLOT( slotMetaContactAdded( Kopete::MetaContact * ) ) ); + TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), + TQ_SLOT( slotMetaContactAdded( Kopete::MetaContact * ) ) ); connect( Kopete::ContactList::self(), - TQT_SIGNAL( metaContactRemoved( Kopete::MetaContact * ) ), - TQT_SLOT( slotMetaContactDeleted( Kopete::MetaContact * ) ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( groupAdded( Kopete::Group * ) ), - TQT_SLOT( slotGroupAdded( Kopete::Group * ) ) ); + TQ_SIGNAL( metaContactRemoved( Kopete::MetaContact * ) ), + TQ_SLOT( slotMetaContactDeleted( Kopete::MetaContact * ) ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( groupAdded( Kopete::Group * ) ), + TQ_SLOT( slotGroupAdded( Kopete::Group * ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( newEvent( Kopete::MessageEvent * ) ), - this, TQT_SLOT( slotNewMessageEvent( Kopete::MessageEvent * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( newEvent( Kopete::MessageEvent * ) ), + this, TQ_SLOT( slotNewMessageEvent( Kopete::MessageEvent * ) ) ); - connect( this, TQT_SIGNAL( dropped( TQDropEvent *, TQListViewItem *, TQListViewItem * ) ), - this, TQT_SLOT( slotDropped( TQDropEvent *, TQListViewItem *, TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( dropped( TQDropEvent *, TQListViewItem *, TQListViewItem * ) ), + this, TQ_SLOT( slotDropped( TQDropEvent *, TQListViewItem *, TQListViewItem * ) ) ); - connect( &undoTimer, TQT_SIGNAL(timeout()) , this, TQT_SLOT (slotTimeout() ) ); + connect( &undoTimer, TQ_SIGNAL(timeout()) , this, TQ_SLOT (slotTimeout() ) ); addColumn( i18n( "Contacts" ), 0 ); //add an unique colums to add every contact header()->hide(); // and hide the ugly header which show the single word "Contacts" @@ -461,33 +461,33 @@ KopeteContactListView::KopeteContactListView( TQWidget *parent, const char *name void KopeteContactListView::initActions( TDEActionCollection *ac ) { - actionUndo = KStdAction::undo( this , TQT_SLOT( slotUndo() ) , ac ); - actionRedo = KStdAction::redo( this , TQT_SLOT( slotRedo() ) , ac ); + actionUndo = KStdAction::undo( this , TQ_SLOT( slotUndo() ) , ac ); + actionRedo = KStdAction::redo( this , TQ_SLOT( slotRedo() ) , ac ); actionUndo->setEnabled(false); actionRedo->setEnabled(false); - new TDEAction( i18n( "Create New Group..." ), 0, 0, this, TQT_SLOT( addGroup() ), + new TDEAction( i18n( "Create New Group..." ), 0, 0, this, TQ_SLOT( addGroup() ), ac, "AddGroup" ); actionSendMessage = KopeteStdAction::sendMessage( - this, TQT_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); - actionStartChat = KopeteStdAction::chat( this, TQT_SLOT( slotStartChat() ), + this, TQ_SLOT( slotSendMessage() ), ac, "contactSendMessage" ); + actionStartChat = KopeteStdAction::chat( this, TQ_SLOT( slotStartChat() ), ac, "contactStartChat" ); actionMove = new KopeteGroupListAction( i18n( "&Move To" ), TQString::fromLatin1( "edit-cut" ), - 0, this, TQT_SLOT( slotMoveToGroup() ), ac, "contactMove" ); + 0, this, TQ_SLOT( slotMoveToGroup() ), ac, "contactMove" ); actionCopy = new KopeteGroupListAction( i18n( "&Copy To" ), TQString::fromLatin1( "edit-copy" ), 0, - this, TQT_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); + this, TQ_SLOT( slotCopyToGroup() ), ac, "contactCopy" ); - actionRemove = KopeteStdAction::deleteContact( this, TQT_SLOT( slotRemove() ), + actionRemove = KopeteStdAction::deleteContact( this, TQ_SLOT( slotRemove() ), ac, "contactRemove" ); actionSendEmail = new TDEAction( i18n( "Send Email..." ), TQString::fromLatin1( "mail_generic" ), - 0, this, TQT_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); + 0, this, TQ_SLOT( slotSendEmail() ), ac, "contactSendEmail" ); /* this actionRename is buggy, and useless with properties, removed in kopeteui.rc*/ actionRename = new TDEAction( i18n( "Rename" ), "document-save-as", 0, - this, TQT_SLOT( slotRename() ), ac, "contactRename" ); - actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( slotSendFile() ), + this, TQ_SLOT( slotRename() ), ac, "contactRename" ); + actionSendFile = KopeteStdAction::sendFile( this, TQ_SLOT( slotSendFile() ), ac, "contactSendFile" ); actionAddContact = new TDEActionMenu( i18n( "&Add Contact" ), @@ -495,15 +495,15 @@ void KopeteContactListView::initActions( TDEActionCollection *ac ) actionAddContact->popupMenu()->insertTitle( i18n("Select Account") ); actionAddTemporaryContact = new TDEAction( i18n( "Add to Your Contact List" ), "add_user", 0, - this, TQT_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); + this, TQ_SLOT( slotAddTemporaryContact() ), ac, "contactAddTemporaryContact" ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotMetaContactSelected( bool ) ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactSelected( bool ) ), this, TQ_SLOT( slotMetaContactSelected( bool ) ) ); - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered( Kopete::Account* )), TQT_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*))); - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered( const Kopete::Account* )), TQT_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *))); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountRegistered( Kopete::Account* )), TQ_SLOT(slotAddSubContactActionNewAccount(Kopete::Account*))); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountUnregistered( const Kopete::Account* )), TQ_SLOT(slotAddSubContactActionAccountDeleted(const Kopete::Account *))); actionProperties = new TDEAction( i18n( "&Properties" ), "edit_user", TQt::Key_Alt + TQt::Key_Return, - this, TQT_SLOT( slotProperties() ), ac, "contactProperties" ); + this, TQ_SLOT( slotProperties() ), ac, "contactProperties" ); // Update enabled/disabled actions slotViewSelectionChanged(); @@ -516,7 +516,7 @@ KopeteContactListView::~KopeteContactListView() void KopeteContactListView::slotAddSubContactActionNewAccount(Kopete::Account* account) { - TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , this, TQT_SLOT(slotAddContact()), account); + TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , this, TQ_SLOT(slotAddContact()), account); m_accountAddContactMap.insert( account, action); actionAddContact->insert( action ); } @@ -536,14 +536,14 @@ void KopeteContactListView::slotMetaContactAdded( Kopete::MetaContact *mc ) { d->viewStrategy->addMetaContact( mc ); - connect( mc, TQT_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), - TQT_SLOT( slotAddedToGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); - connect( mc, TQT_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), - TQT_SLOT( slotRemovedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); - connect( mc, TQT_SIGNAL( movedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ), - TQT_SLOT( slotMovedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ) ); - connect( mc, TQT_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), - TQT_SLOT( slotContactStatusChanged( Kopete::MetaContact * ) ) ); + connect( mc, TQ_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), + TQ_SLOT( slotAddedToGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); + connect( mc, TQ_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), + TQ_SLOT( slotRemovedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); + connect( mc, TQ_SIGNAL( movedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ), + TQ_SLOT( slotMovedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ) ); + connect( mc, TQ_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), + TQ_SLOT( slotContactStatusChanged( Kopete::MetaContact * ) ) ); } void KopeteContactListView::slotMetaContactDeleted( Kopete::MetaContact *mc ) @@ -678,7 +678,7 @@ void KopeteContactListView::slotContextMenu( TDEListView * /*listview*/, if ( c ) { TDEPopupMenu *p = c->popupMenu(); - connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) ); + connect( p, TQ_SIGNAL( aboutToHide() ), p, TQ_SLOT( deleteLater() ) ); p->popup( point ); } else @@ -710,7 +710,7 @@ void KopeteContactListView::slotContextMenu( TDEListView * /*listview*/, } TDEPopupMenu *contactMenu = it.current()->popupMenu(); - connect( popup, TQT_SIGNAL( aboutToHide() ), contactMenu, TQT_SLOT( deleteLater() ) ); + connect( popup, TQ_SIGNAL( aboutToHide() ), contactMenu, TQ_SLOT( deleteLater() ) ); TQString nick=c->property(Kopete::Global::Properties::self()->nickName()).value().toString(); TQString text= nick.isEmpty() ? c->contactId() : i18n( "Translators: format: '<displayName> (<id>)'", "%2 <%1>" ). arg( c->contactId(), nick ); text=text.replace("&","&&"); // cf BUG 115449 diff --git a/kopete/kopete/contactlist/kopetegrouplistaction.cpp b/kopete/kopete/contactlist/kopetegrouplistaction.cpp index 5936af4f..6bf4805f 100644 --- a/kopete/kopete/contactlist/kopetegrouplistaction.cpp +++ b/kopete/kopete/contactlist/kopetegrouplistaction.cpp @@ -33,11 +33,11 @@ KopeteGroupListAction::KopeteGroupListAction( const TQString &text, const TQStri const char *slot, TQObject *parent, const char *name ) : TDEListAction( text, pix, cut, parent, name ) { - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( groupAdded( Kopete::Group * ) ), this, TQT_SLOT( slotUpdateList() ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), this, TQT_SLOT( slotUpdateList() ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed(Kopete::Group*, const TQString& ) ), this, TQT_SLOT( slotUpdateList() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( groupAdded( Kopete::Group * ) ), this, TQ_SLOT( slotUpdateList() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), this, TQ_SLOT( slotUpdateList() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed(Kopete::Group*, const TQString& ) ), this, TQ_SLOT( slotUpdateList() ) ); slotUpdateList(); } diff --git a/kopete/kopete/contactlist/kopetegroupviewitem.cpp b/kopete/kopete/contactlist/kopetegroupviewitem.cpp index 0e50c24f..55f4165f 100644 --- a/kopete/kopete/contactlist/kopetegroupviewitem.cpp +++ b/kopete/kopete/contactlist/kopetegroupviewitem.cpp @@ -105,14 +105,14 @@ void KopeteGroupViewItem::initLVI() d->name->setToolTipSource( d->toolTipSource.get() ); d->count->setToolTipSource( d->toolTipSource.get() ); - connect( m_group, TQT_SIGNAL( displayNameChanged( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( refreshDisplayName() ) ); + connect( m_group, TQ_SIGNAL( displayNameChanged( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( refreshDisplayName() ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL( contactListAppearanceChanged() ), - TQT_SLOT( slotConfigChanged() ) ); - connect( kapp, TQT_SIGNAL( appearanceChanged() ), TQT_SLOT( slotConfigChanged() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL( contactListAppearanceChanged() ), + TQ_SLOT( slotConfigChanged() ) ); + connect( kapp, TQ_SIGNAL( appearanceChanged() ), TQ_SLOT( slotConfigChanged() ) ); - connect( m_group, TQT_SIGNAL( iconAppearanceChanged() ), TQT_SLOT( updateIcon() ) ); + connect( m_group, TQ_SIGNAL( iconAppearanceChanged() ), TQ_SLOT( updateIcon() ) ); refreshDisplayName(); slotConfigChanged(); diff --git a/kopete/kopete/contactlist/kopetelviprops.cpp b/kopete/kopete/contactlist/kopetelviprops.cpp index 64fb1233..e1472bd4 100644 --- a/kopete/kopete/contactlist/kopetelviprops.cpp +++ b/kopete/kopete/contactlist/kopetelviprops.cpp @@ -92,13 +92,13 @@ KopeteGVIProps::KopeteGVIProps(KopeteGroupViewItem *gvi, TQWidget *parent, const mainWidget->icnbOpen->setIcon( openName ); mainWidget->icnbClosed->setIcon( closeName ); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT( slotOkClicked() ) ); - connect( mainWidget->chkUseCustomIcons, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUseCustomIconsToggled( bool ) ) ); - connect( mainWidget->icnbOpen, TQT_SIGNAL( iconChanged( TQString ) ), - TQT_SLOT( slotIconChanged() ) ); - connect( mainWidget->icnbClosed, TQT_SIGNAL( iconChanged( TQString ) ), - TQT_SLOT( slotIconChanged() ) ); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT( slotOkClicked() ) ); + connect( mainWidget->chkUseCustomIcons, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUseCustomIconsToggled( bool ) ) ); + connect( mainWidget->icnbOpen, TQ_SIGNAL( iconChanged( TQString ) ), + TQ_SLOT( slotIconChanged() ) ); + connect( mainWidget->icnbClosed, TQ_SIGNAL( iconChanged( TQString ) ), + TQ_SLOT( slotIconChanged() ) ); slotUseCustomIconsToggled( mainWidget->chkUseCustomIcons->isChecked() ); } @@ -170,19 +170,19 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare setMainWidget( mainWidget ); item = lvi; - connect( mainWidget->radioNameKABC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->radioNameContact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->radioNameCustom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->radioPhotoKABC, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->radioPhotoContact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->radioPhotoCustom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->cmbPhotoUrl, TQT_SIGNAL(urlSelected(const TQString &)), TQT_SLOT(slotEnableAndDisableWidgets())); - connect( mainWidget->cmbAccountPhoto, TQT_SIGNAL(activated ( int )), TQT_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioNameKABC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioNameContact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioNameCustom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioPhotoKABC, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioPhotoContact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->radioPhotoCustom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->cmbPhotoUrl, TQ_SIGNAL(urlSelected(const TQString &)), TQ_SLOT(slotEnableAndDisableWidgets())); + connect( mainWidget->cmbAccountPhoto, TQ_SIGNAL(activated ( int )), TQ_SLOT(slotEnableAndDisableWidgets())); mainWidget->btnClearPhoto->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); - connect( mainWidget->btnClearPhoto, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearPhotoClicked() ) ); - connect( mainWidget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const TDEABC::Addressee & ) ), TQT_SLOT( slotAddresseeChanged( const TDEABC::Addressee & ) ) ); + connect( mainWidget->btnClearPhoto, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearPhotoClicked() ) ); + connect( mainWidget->widAddresseeLink, TQ_SIGNAL( addresseeChanged( const TDEABC::Addressee & ) ), TQ_SLOT( slotAddresseeChanged( const TDEABC::Addressee & ) ) ); mainWidget->chkUseCustomIcons->setChecked( item->metaContact()->useCustomIcon() ); TQString offlineName = item->metaContact()->icon( Kopete::ContactListElement::Offline ); @@ -232,17 +232,17 @@ KopeteMetaLVIProps::KopeteMetaLVIProps(KopeteMetaContactLVI *lvi, TQWidget *pare slotLoadNameSources(); slotLoadPhotoSources(); - connect( this, TQT_SIGNAL(okClicked()), this, TQT_SLOT( slotOkClicked() ) ); - connect( mainWidget->chkUseCustomIcons, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUseCustomIconsToggled( bool ) ) ); - connect( mainWidget->btnImportKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotImportClicked() ) ); - connect( mainWidget->btnExportKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotExportClicked() ) ); - connect( mFromKABC, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFromKABCClicked() ) ); - connect( mNotificationProps->widget()->customSound, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( slotOpenSoundDialog( KURLRequester * ))); + connect( this, TQ_SIGNAL(okClicked()), this, TQ_SLOT( slotOkClicked() ) ); + connect( mainWidget->chkUseCustomIcons, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUseCustomIconsToggled( bool ) ) ); + connect( mainWidget->btnImportKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotImportClicked() ) ); + connect( mainWidget->btnExportKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotExportClicked() ) ); + connect( mFromKABC, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFromKABCClicked() ) ); + connect( mNotificationProps->widget()->customSound, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( slotOpenSoundDialog( KURLRequester * ))); slotUseCustomIconsToggled( mainWidget->chkUseCustomIcons->isChecked() ); slotEnableAndDisableWidgets(); @@ -523,8 +523,8 @@ void KopeteMetaLVIProps::slotOpenSoundDialog( KURLRequester *requester ) { // taken from tdelibs/tdeio/tdefile/knotifydialog.cpp // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( slotOpenSoundDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( slotOpenSoundDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); //fileDialog->setCaption( i18n("Select Sound File") ); diff --git a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp index 21cad8d2..a4f162d2 100644 --- a/kopete/kopete/contactlist/kopetemetacontactlvi.cpp +++ b/kopete/kopete/contactlist/kopetemetacontactlvi.cpp @@ -214,43 +214,43 @@ void KopeteMetaContactLVI::initLVI() m_oldStatus = m_metaContact->status(); - connect( m_metaContact, TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), - TQT_SLOT( slotDisplayNameChanged() ) ); + connect( m_metaContact, TQ_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), + TQ_SLOT( slotDisplayNameChanged() ) ); - connect( m_metaContact, TQT_SIGNAL( photoChanged() ), - TQT_SLOT( slotPhotoChanged() ) ); + connect( m_metaContact, TQ_SIGNAL( photoChanged() ), + TQ_SLOT( slotPhotoChanged() ) ); - connect( m_metaContact, TQT_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), - TQT_SLOT( slotPhotoChanged() ) ); + connect( m_metaContact, TQ_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), + TQ_SLOT( slotPhotoChanged() ) ); - connect( m_metaContact, TQT_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), - this, TQT_SLOT(slotIdleStateChanged( ) ) ); + connect( m_metaContact, TQ_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), + this, TQ_SLOT(slotIdleStateChanged( ) ) ); - connect( m_metaContact, TQT_SIGNAL( contactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ), - TQT_SLOT( slotContactStatusChanged( Kopete::Contact * ) ) ); + connect( m_metaContact, TQ_SIGNAL( contactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ), + TQ_SLOT( slotContactStatusChanged( Kopete::Contact * ) ) ); - connect( m_metaContact, TQT_SIGNAL( contactAdded( Kopete::Contact * ) ), - TQT_SLOT( slotContactAdded( Kopete::Contact * ) ) ); + connect( m_metaContact, TQ_SIGNAL( contactAdded( Kopete::Contact * ) ), + TQ_SLOT( slotContactAdded( Kopete::Contact * ) ) ); - connect( m_metaContact, TQT_SIGNAL( contactRemoved( Kopete::Contact * ) ), - TQT_SLOT( slotContactRemoved( Kopete::Contact * ) ) ); + connect( m_metaContact, TQ_SIGNAL( contactRemoved( Kopete::Contact * ) ), + TQ_SLOT( slotContactRemoved( Kopete::Contact * ) ) ); - connect( m_metaContact, TQT_SIGNAL( iconAppearanceChanged() ), - TQT_SLOT( slotUpdateMetaContact() ) ); + connect( m_metaContact, TQ_SIGNAL( iconAppearanceChanged() ), + TQ_SLOT( slotUpdateMetaContact() ) ); - connect( m_metaContact, TQT_SIGNAL( useCustomIconChanged( bool ) ), - TQT_SLOT( slotUpdateMetaContact() ) ); + connect( m_metaContact, TQ_SIGNAL( useCustomIconChanged( bool ) ), + TQ_SLOT( slotUpdateMetaContact() ) ); - connect( m_metaContact, TQT_SIGNAL( contactIdleStateChanged( Kopete::Contact * ) ), - TQT_SLOT( slotIdleStateChanged( Kopete::Contact * ) ) ); + connect( m_metaContact, TQ_SIGNAL( contactIdleStateChanged( Kopete::Contact * ) ), + TQ_SLOT( slotIdleStateChanged( Kopete::Contact * ) ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL( contactListAppearanceChanged() ), - TQT_SLOT( slotConfigChanged() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL( contactListAppearanceChanged() ), + TQ_SLOT( slotConfigChanged() ) ); - connect( kapp, TQT_SIGNAL( appearanceChanged() ), TQT_SLOT( slotConfigChanged() ) ); + connect( kapp, TQ_SIGNAL( appearanceChanged() ), TQ_SLOT( slotConfigChanged() ) ); mBlinkTimer = new TQTimer( this, "mBlinkTimer" ); - connect( mBlinkTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotBlink() ) ); + connect( mBlinkTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotBlink() ) ); mIsBlinkIcon = false; //if ( !mBlinkIcon ) @@ -439,11 +439,11 @@ void KopeteMetaContactLVI::slotContactStatusChanged( Kopete::Contact *c ) break; case signedIn: connect(KNotification::event(m_metaContact, "kopete_contact_online", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , - TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() ) ); + TQ_SIGNAL(activated(unsigned int )) , this, TQ_SLOT( execute() ) ); break; case changedStatus: connect(KNotification::event(m_metaContact, "kopete_contact_status_change", text, m_metaContact->photo(), KopeteSystemTray::systemTray(), i18n( "Chat" )) , - TQT_SIGNAL(activated(unsigned int )) , this, TQT_SLOT( execute() )); + TQ_SIGNAL(activated(unsigned int )) , this, TQ_SLOT( execute() )); break; case signedOut: KNotification::event(m_metaContact, "kopete_contact_offline", text, m_metaContact->photo(), KopeteSystemTray::systemTray()); @@ -736,8 +736,8 @@ void KopeteMetaContactLVI::setDisplayMode( int mode, int iconmode ) new VSpacerComponent( imageBox ); if(!metaContact()->photoSource() && !Kopete::KABCPersistence::self()->addressBook()->findByUid( metaContact()->metaContactId() ).isEmpty() ) { //if the photo is the one of the kaddressbook, track every change in the adressbook, it might be the photo of our contact. - connect( Kopete::KABCPersistence::self()->addressBook() , TQT_SIGNAL(addressBookChanged (AddressBook *) ) , - this , TQT_SLOT(slotPhotoChanged())); + connect( Kopete::KABCPersistence::self()->addressBook() , TQ_SIGNAL(addressBookChanged (AddressBook *) ) , + this , TQ_SLOT(slotPhotoChanged())); } } else { d->metaContactIcon = new FaceComponent( hbox ); @@ -847,11 +847,11 @@ void KopeteMetaContactLVI::slotContactPropertyChanged( Kopete::Contact *contact, void KopeteMetaContactLVI::slotContactAdded( Kopete::Contact *c ) { - connect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, + connect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, + this, TQ_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); - connect( c->account() , TQT_SIGNAL( colorChanged(const TQColor& ) ) , this, TQT_SLOT( updateContactIcons() ) ); + connect( c->account() , TQ_SIGNAL( colorChanged(const TQColor& ) ) , this, TQ_SLOT( updateContactIcons() ) ); updateContactIcon( c ); @@ -861,11 +861,11 @@ void KopeteMetaContactLVI::slotContactAdded( Kopete::Contact *c ) void KopeteMetaContactLVI::slotContactRemoved( Kopete::Contact *c ) { - disconnect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, + disconnect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotContactPropertyChanged( Kopete::Contact *, + this, TQ_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); - disconnect( c->account() , TQT_SIGNAL( colorChanged(const TQColor& ) ) , this, TQT_SLOT( updateContactIcons() ) ); + disconnect( c->account() , TQ_SIGNAL( colorChanged(const TQColor& ) ) , this, TQ_SLOT( updateContactIcons() ) ); if ( ListView::Component *comp = contactComponent( c ) ) delete comp; @@ -1019,8 +1019,8 @@ void KopeteMetaContactLVI::catchEvent( Kopete::MessageEvent *event ) { d->events.append( event ); - connect( event, TQT_SIGNAL( done( Kopete::MessageEvent* ) ), - this, TQT_SLOT( slotEventDone( Kopete::MessageEvent * ) ) ); + connect( event, TQ_SIGNAL( done( Kopete::MessageEvent* ) ), + this, TQ_SLOT( slotEventDone( Kopete::MessageEvent * ) ) ); if ( mBlinkTimer->isActive() ) mBlinkTimer->stop(); diff --git a/kopete/kopete/contactlist/tdeabcexport.cpp b/kopete/kopete/contactlist/tdeabcexport.cpp index 12589fa9..6e67be96 100644 --- a/kopete/kopete/contactlist/tdeabcexport.cpp +++ b/kopete/kopete/contactlist/tdeabcexport.cpp @@ -58,10 +58,10 @@ class ContactLVI : public TQCheckListItem KabcExportWizard::KabcExportWizard( TQWidget *parent, const char *name ) : KabcExportWizard_Base( parent, name ) { - connect( m_addrBooks, TQT_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQT_SLOT( slotResourceSelectionChanged( TQListBoxItem * ) ) ); + connect( m_addrBooks, TQ_SIGNAL( selectionChanged( TQListBoxItem * ) ), TQ_SLOT( slotResourceSelectionChanged( TQListBoxItem * ) ) ); - connect( m_btnSelectAll, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAll() ) ); - connect( m_btnDeselectAll, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDeselectAll() ) ); + connect( m_btnSelectAll, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAll() ) ); + connect( m_btnDeselectAll, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDeselectAll() ) ); // fill resource selector m_addressBook = Kopete::KABCPersistence::self()->addressBook(); diff --git a/kopete/kopete/kimifaceimpl.cpp b/kopete/kopete/kimifaceimpl.cpp index faa721e0..be4c0311 100644 --- a/kopete/kopete/kimifaceimpl.cpp +++ b/kopete/kopete/kimifaceimpl.cpp @@ -43,8 +43,8 @@ KIMIfaceImpl::KIMIfaceImpl() : DCOPObject( "KIMIface" ), TQObject() { connect( Kopete::ContactList::self(), - TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), - TQT_SLOT( slotMetaContactAdded( Kopete::MetaContact * ) ) ); + TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), + TQ_SLOT( slotMetaContactAdded( Kopete::MetaContact * ) ) ); } KIMIfaceImpl::~KIMIfaceImpl() @@ -332,8 +332,8 @@ bool KIMIfaceImpl::addContact( const TQString &contactId, const TQString &protoc void KIMIfaceImpl::slotMetaContactAdded( Kopete::MetaContact *mc ) { - connect( mc, TQT_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), - TQT_SLOT( slotContactStatusChanged( Kopete::MetaContact * ) ) ); + connect( mc, TQ_SIGNAL( onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType ) ), + TQ_SLOT( slotContactStatusChanged( Kopete::MetaContact * ) ) ); } void KIMIfaceImpl::slotContactStatusChanged( Kopete::MetaContact *mc ) diff --git a/kopete/kopete/kopeteapplication.cpp b/kopete/kopete/kopeteapplication.cpp index b5cdc868..263ed973 100644 --- a/kopete/kopete/kopeteapplication.cpp +++ b/kopete/kopete/kopeteapplication.cpp @@ -83,7 +83,7 @@ KopeteApplication::KopeteApplication() * Additionally, it makes the GUI appear less 'blocking' during startup, so * there is a secondary benefit as well here. (Martijn) */ - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadPlugins() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadPlugins() ) ); m_mimeFactory = new Kopete::MimeSourceFactory; TQMimeSourceFactory::addFactory( m_mimeFactory ); @@ -177,15 +177,15 @@ void KopeteApplication::slotLoadPlugins() showConfigDialog = false; // pretend all plugins were loaded :) - TQTimer::singleShot(0, this, TQT_SLOT( slotAllPluginsLoaded() )); + TQTimer::singleShot(0, this, TQ_SLOT( slotAllPluginsLoaded() )); } else { Kopete::PluginManager::self()->loadAllPlugins(); } - connect( Kopete::PluginManager::self(), TQT_SIGNAL( allPluginsLoaded() ), - this, TQT_SLOT( slotAllPluginsLoaded() )); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( allPluginsLoaded() ), + this, TQ_SLOT( slotAllPluginsLoaded() )); if( showConfigDialog ) { diff --git a/kopete/kopete/kopeteballoon.cpp b/kopete/kopete/kopeteballoon.cpp index 37701db9..e921cfe4 100644 --- a/kopete/kopete/kopeteballoon.cpp +++ b/kopete/kopete/kopeteballoon.cpp @@ -109,23 +109,23 @@ KopeteBalloon::KopeteBalloon(const TQString &text, const TQString &pix) setPalette(TQToolTip::palette()); setAutoMask(TRUE); - connect(mViewButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalButtonClicked())); - connect(mViewButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(deleteLater())); - connect(mIgnoreButton, TQT_SIGNAL(clicked()), - this, TQT_SIGNAL(signalIgnoreButtonClicked())); - connect(mIgnoreButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(deleteLater())); - connect(mCaption, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SIGNAL(signalIgnoreButtonClicked())); - connect(mCaption, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(deleteLater())); + connect(mViewButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalButtonClicked())); + connect(mViewButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(deleteLater())); + connect(mIgnoreButton, TQ_SIGNAL(clicked()), + this, TQ_SIGNAL(signalIgnoreButtonClicked())); + connect(mIgnoreButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(deleteLater())); + connect(mCaption, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SIGNAL(signalIgnoreButtonClicked())); + connect(mCaption, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(deleteLater())); KopetePrefs *p = KopetePrefs::prefs(); // Autoclose balloon if (p->balloonClose()) - TQTimer::singleShot( p->balloonCloseDelay() * 1000, this, TQT_SIGNAL( signalTimeout( ) ) ); + TQTimer::singleShot( p->balloonCloseDelay() * 1000, this, TQ_SIGNAL( signalTimeout( ) ) ); } void KopeteBalloon::setAnchor(const TQPoint &anchor) diff --git a/kopete/kopete/kopeteeditglobalidentitywidget.cpp b/kopete/kopete/kopeteeditglobalidentitywidget.cpp index 8d510694..6c80cd4c 100644 --- a/kopete/kopete/kopeteeditglobalidentitywidget.cpp +++ b/kopete/kopete/kopeteeditglobalidentitywidget.cpp @@ -83,7 +83,7 @@ KopeteEditGlobalIdentityWidget::KopeteEditGlobalIdentityWidget(TQWidget *parent, createGUI(); // Update the GUI when a global identity key change. - connect(Kopete::ContactList::self(), TQT_SIGNAL(globalIdentityChanged(const TQString&, const TQVariant& )), this, TQT_SLOT(updateGUI(const TQString&, const TQVariant&))); + connect(Kopete::ContactList::self(), TQ_SIGNAL(globalIdentityChanged(const TQString&, const TQVariant& )), this, TQ_SLOT(updateGUI(const TQString&, const TQVariant&))); } KopeteEditGlobalIdentityWidget::~KopeteEditGlobalIdentityWidget() @@ -129,15 +129,15 @@ void KopeteEditGlobalIdentityWidget::createGUI() d->labelPicture->setMaximumSize(TQSize(d->iconSize, d->iconSize)); d->labelPicture->setFrameShape(TQFrame::Box); d->mainLayout->addWidget(d->labelPicture); - connect(d->labelPicture, TQT_SIGNAL(clicked()), this, TQT_SLOT(photoClicked())); + connect(d->labelPicture, TQ_SIGNAL(clicked()), this, TQ_SLOT(photoClicked())); // The nickname lineEdit d->lineNickname = new KLineEdit(this); d->mainLayout->addWidget(d->lineNickname); // Update the nickname when the user press return. - connect(d->lineNickname, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(changeNickname())); + connect(d->lineNickname, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(changeNickname())); // Show the nickname text in red when they are change. - connect(d->lineNickname, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(lineNicknameTextChanged(const TQString& ))); + connect(d->lineNickname, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(lineNicknameTextChanged(const TQString& ))); } void KopeteEditGlobalIdentityWidget::updateGUI(const TQString &key, const TQVariant &value) diff --git a/kopete/kopete/kopetewindow.cpp b/kopete/kopete/kopetewindow.cpp index 80cddf94..7f6f4c5d 100644 --- a/kopete/kopete/kopetewindow.cpp +++ b/kopete/kopete/kopetewindow.cpp @@ -140,8 +140,8 @@ KopeteWindow::KopeteWindow( TQWidget *parent, const char *name ) GlobalStatusMessageIconLabel *label = new GlobalStatusMessageIconLabel( statusBarMessage, "statusmsglabel" ); label->setFixedSize( 16, 16 ); label->setPixmap( SmallIcon( "kopetestatusmessage" ) ); - connect(label, TQT_SIGNAL(iconClicked( const TQPoint& )), - this, TQT_SLOT(slotGlobalStatusMessageIconClicked( const TQPoint& ))); + connect(label, TQ_SIGNAL(iconClicked( const TQPoint& )), + this, TQ_SLOT(slotGlobalStatusMessageIconClicked( const TQPoint& ))); TQToolTip::add( label, i18n( "Global status message" ) ); m_globalStatusMessage = new KSqueezedTextLabel( statusBarMessage ); statusBar()->addWidget(statusBarMessage, 1, false ); @@ -157,22 +157,22 @@ KopeteWindow::KopeteWindow( TQWidget *parent, const char *name ) // -------------------------------------------------------------------------------- // Trap all loaded plugins, so we can add their status bar icons accordingly , also used to add XMLGUIClient - connect( Kopete::PluginManager::self(), TQT_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), - this, TQT_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); - connect( Kopete::PluginManager::self(), TQT_SIGNAL( allPluginsLoaded() ), - this, TQT_SLOT( slotAllPluginsLoaded() )); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), + this, TQ_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( allPluginsLoaded() ), + this, TQ_SLOT( slotAllPluginsLoaded() )); //Connect the appropriate account signals /* Please note that I tried to put this in the slotAllPluginsLoaded() function * but it seemed to break the account icons in the statusbar --Matt */ - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered(Kopete::Account*)), - this, TQT_SLOT(slotAccountRegistered(Kopete::Account*))); - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered(const Kopete::Account*)), - this, TQT_SLOT(slotAccountUnregistered(const Kopete::Account*))); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountRegistered(Kopete::Account*)), + this, TQ_SLOT(slotAccountRegistered(Kopete::Account*))); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountUnregistered(const Kopete::Account*)), + this, TQ_SLOT(slotAccountUnregistered(const Kopete::Account*))); - connect( m_autoHideTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoHide() ) ); - connect( KopetePrefs::prefs(), TQT_SIGNAL( contactListAppearanceChanged() ), - this, TQT_SLOT( slotContactListAppearanceChanged() ) ); + connect( m_autoHideTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoHide() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL( contactListAppearanceChanged() ), + this, TQ_SLOT( slotContactListAppearanceChanged() ) ); createGUI ( "kopeteui.rc", false ); @@ -210,21 +210,21 @@ void KopeteWindow::initActions() actionAddContact->setDelayed( false ); // this signal mapper is needed to call slotAddContact with the correct arguments addContactMapper = new TQSignalMapper( this ); - connect( addContactMapper, TQT_SIGNAL( mapped( const TQString & ) ), - this, TQT_SLOT( slotAddContactDialogInternal( const TQString & ) ) ); + connect( addContactMapper, TQ_SIGNAL( mapped( const TQString & ) ), + this, TQ_SLOT( slotAddContactDialogInternal( const TQString & ) ) ); /* ConnectAll is now obsolete. "Go online" has replaced it. actionConnect = new TDEAction( i18n( "&Connect Accounts" ), "connect_creating", - 0, Kopete::AccountManager::self(), TQT_SLOT( connectAll() ), + 0, Kopete::AccountManager::self(), TQ_SLOT( connectAll() ), actionCollection(), "ConnectAll" ); */ actionDisconnect = new TDEAction( i18n( "O&ffline" ), "connect_no", - 0, this, TQT_SLOT( slotDisconnectAll() ), + 0, this, TQ_SLOT( slotDisconnectAll() ), actionCollection(), "DisconnectAll" ); actionExportContacts = new TDEAction( i18n( "&Export Contacts..." ), "", 0, this, - TQT_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" ); + TQ_SLOT( showExportDialog() ),actionCollection(), "ExportContacts" ); /* the connection menu has been replaced by the set status menu actionConnectionMenu = new TDEActionMenu( i18n("Connection"),"connect_established", @@ -238,28 +238,28 @@ void KopeteWindow::initActions() actionDisconnect->setEnabled(false); selectAway = new TDEAction( i18n("&Away"), SmallIcon("kopeteaway"), 0, - this, TQT_SLOT( slotGlobalAway() ), actionCollection(), + this, TQ_SLOT( slotGlobalAway() ), actionCollection(), "SetAwayAll" ); selectBusy = new TDEAction( i18n("&Busy"), SmallIcon("kopeteaway"), 0, - this, TQT_SLOT( slotGlobalBusy() ), actionCollection(), + this, TQ_SLOT( slotGlobalBusy() ), actionCollection(), "SetBusyAll" ); actionSetInvisible = new TDEAction( i18n( "&Invisible" ), "kopeteavailable", 0 , - this, TQT_SLOT( slotSetInvisibleAll() ), actionCollection(), + this, TQ_SLOT( slotSetInvisibleAll() ), actionCollection(), "SetInvisibleAll" ); /*actionSetAvailable = new TDEAction( i18n( "&Online" ), "kopeteavailable", 0 , Kopete::AccountManager::self(), - TQT_SLOT( setAvailableAll() ), actionCollection(), + TQ_SLOT( setAvailableAll() ), actionCollection(), "SetAvailableAll" );*/ actionSetAvailable = new TDEAction( i18n("&Online"), SmallIcon("kopeteavailable"), 0, this, - TQT_SLOT( slotGlobalAvailable() ), actionCollection(), + TQ_SLOT( slotGlobalAvailable() ), actionCollection(), "SetAvailableAll" ); actionAwayMenu = new TDEActionMenu( i18n("&Set Status"), "kopeteavailable", @@ -273,25 +273,25 @@ void KopeteWindow::initActions() actionPrefs = KopeteStdAction::preferences( actionCollection(), "settings_prefs" ); - KStdAction::quit(this, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(slotQuit()), actionCollection()); setStandardToolBarMenuEnabled(true); - menubarAction = KStdAction::showMenubar(this, TQT_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" ); - statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar"); + menubarAction = KStdAction::showMenubar(this, TQ_SLOT(showMenubar()), actionCollection(), "settings_showmenubar" ); + statusbarAction = KStdAction::showStatusbar(this, TQ_SLOT(showStatusbar()), actionCollection(), "settings_showstatusbar"); - KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" ); + KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection(), "settings_keys" ); new TDEAction( i18n( "Configure Plugins..." ), "preferences-desktop-peripherals", 0, this, - TQT_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" ); + TQ_SLOT( slotConfigurePlugins() ), actionCollection(), "settings_plugins" ); new TDEAction( i18n( "Configure &Global Shortcuts..." ), "configure_shortcuts", 0, this, - TQT_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" ); + TQ_SLOT( slotConfGlobalKeys() ), actionCollection(), "settings_global" ); - KStdAction::configureToolbars( this, TQT_SLOT(slotConfToolbar()), actionCollection() ); - KStdAction::configureNotifications(this, TQT_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" ); + KStdAction::configureToolbars( this, TQ_SLOT(slotConfToolbar()), actionCollection() ); + KStdAction::configureNotifications(this, TQ_SLOT(slotConfNotifications()), actionCollection(), "settings_notifications" ); actionShowOffliners = new TDEToggleAction( i18n( "Show Offline &Users" ), "show_offliners", CTRL + Key_U, - this, TQT_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" ); + this, TQ_SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" ); actionShowEmptyGroups = new TDEToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G, - this, TQT_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" ); + this, TQ_SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" ); actionShowOffliners->setCheckedState(i18n("Hide Offline &Users")); actionShowEmptyGroups->setCheckedState(i18n("Hide Empty &Groups")); @@ -306,7 +306,7 @@ void KopeteWindow::initActions() // quick search bar - clear button TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", - 0, searchBar, TQT_SLOT( clear() ), actionCollection(), "quicksearch_reset" ); + 0, searchBar, TQ_SLOT( clear() ), actionCollection(), "quicksearch_reset" ); resetQuickSearch->setWhatsThis( i18n( "Reset Quick Search\n" "Resets the quick search so that all contacts and groups are shown again." ) ); @@ -319,22 +319,22 @@ void KopeteWindow::initActions() // TDEActionMenu for selecting the global status message(kopeteonlinestatus_0) TDEActionMenu * setStatusMenu = new TDEActionMenu( i18n( "Set Status Message" ), "kopeteeditstatusmessage", actionCollection(), "SetStatusMessage" ); setStatusMenu->setDelayed( false ); - connect( setStatusMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), TQT_SLOT(slotBuildStatusMessageMenu() ) ); - connect( setStatusMenu->popupMenu(), TQT_SIGNAL( activated( int ) ), TQT_SLOT(slotStatusMessageSelected( int ) ) ); + connect( setStatusMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), TQ_SLOT(slotBuildStatusMessageMenu() ) ); + connect( setStatusMenu->popupMenu(), TQ_SIGNAL( activated( int ) ), TQ_SLOT(slotStatusMessageSelected( int ) ) ); // sync actions, config and prefs-dialog - connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + connect ( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged()) ); slotConfigChanged(); globalAccel = new TDEGlobalAccel( this ); globalAccel->insert( TQString::fromLatin1("Read Message"), i18n("Read Message"), i18n("Read the next pending message"), - CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQT_SLOT(slotReadMessage()) ); + CTRL+SHIFT+Key_I, KKey::QtWIN+CTRL+Key_I, Kopete::ChatSessionManager::self(), TQ_SLOT(slotReadMessage()) ); globalAccel->insert( TQString::fromLatin1("Show/Hide Contact List"), i18n("Show/Hide Contact List"), i18n("Show or hide the contact list"), - CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, TQT_SLOT(slotShowHide()) ); + CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, TQ_SLOT(slotShowHide()) ); globalAccel->insert( TQString::fromLatin1("Set Away/Back"), i18n("Set Away/Back"), i18n("Sets away from keyboard or sets back"), - CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, TQT_SLOT(slotToggleAway()) ); + CTRL+SHIFT+Key_W, KKey::QtWIN+CTRL+SHIFT+Key_W, this, TQ_SLOT(slotToggleAway()) ); globalAccel->readSettings(); globalAccel->updateConnections(); @@ -391,9 +391,9 @@ void KopeteWindow::initSystray() //actionConnectionMenu->plug ( tm, 1 ); tm->insertSeparator( 1 ); - TQObject::connect( m_tray, TQT_SIGNAL( aboutToShowMenu( TDEPopupMenu * ) ), - this, TQT_SLOT( slotTrayAboutToShowMenu( TDEPopupMenu * ) ) ); - TQObject::connect( m_tray, TQT_SIGNAL( quitSelected() ), this, TQT_SLOT( slotQuit() ) ); + TQObject::connect( m_tray, TQ_SIGNAL( aboutToShowMenu( TDEPopupMenu * ) ), + this, TQ_SLOT( slotTrayAboutToShowMenu( TDEPopupMenu * ) ) ); + TQObject::connect( m_tray, TQ_SIGNAL( quitSelected() ), this, TQ_SLOT( slotQuit() ) ); } KopeteWindow::~KopeteWindow() @@ -430,7 +430,7 @@ void KopeteWindow::loadOptions() // FIXME: HACK: Is there a way to do that automatic ? editGlobalIdentityWidget->setIconSize(toolBar("editGlobalIdentityBar")->iconSize()); - connect(toolBar("editGlobalIdentityBar"), TQT_SIGNAL(modechange()), editGlobalIdentityWidget, TQT_SLOT(iconSizeChanged())); + connect(toolBar("editGlobalIdentityBar"), TQ_SIGNAL(modechange()), editGlobalIdentityWidget, TQ_SLOT(iconSizeChanged())); applyMainWindowSettings( config, "General Options" ); config->setGroup("General Options"); @@ -518,9 +518,9 @@ void KopeteWindow::slotToggleShowOffliners() KopetePrefs *p = KopetePrefs::prefs(); p->setShowOffline ( actionShowOffliners->isChecked() ); - disconnect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + disconnect ( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged()) ); p->save(); - connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + connect ( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged()) ); } void KopeteWindow::slotToggleShowEmptyGroups() @@ -528,9 +528,9 @@ void KopeteWindow::slotToggleShowEmptyGroups() KopetePrefs *p = KopetePrefs::prefs(); p->setShowEmptyGroups ( actionShowEmptyGroups->isChecked() ); - disconnect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + disconnect ( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged()) ); p->save(); - connect ( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged()) ); + connect ( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged()) ); } void KopeteWindow::slotConfigChanged() @@ -578,8 +578,8 @@ void KopeteWindow::slotConfToolbar() { saveMainWindowSettings(TDEGlobal::config(), "General Options"); KEditToolbar *dlg = new KEditToolbar(factory()); - connect( dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(slotUpdateToolbar()) ); - connect( dlg, TQT_SIGNAL(finished()) , dlg, TQT_SLOT(deleteLater())); + connect( dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(slotUpdateToolbar()) ); + connect( dlg, TQ_SIGNAL(finished()) , dlg, TQ_SLOT(deleteLater())); dlg->show(); } @@ -704,22 +704,22 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account ) actionDisconnect->setEnabled(true); connect( account->myself(), - TQT_SIGNAL(onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ), - this, TQT_SLOT( slotAccountStatusIconChanged( Kopete::Contact * ) ) ); + TQ_SIGNAL(onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ), + this, TQ_SLOT( slotAccountStatusIconChanged( Kopete::Contact * ) ) ); -// connect( account, TQT_SIGNAL( iconAppearanceChanged() ), TQT_SLOT( slotAccountStatusIconChanged() ) ); - connect( account, TQT_SIGNAL( colorChanged(const TQColor& ) ), TQT_SLOT( slotAccountStatusIconChanged() ) ); +// connect( account, TQ_SIGNAL( iconAppearanceChanged() ), TQ_SLOT( slotAccountStatusIconChanged() ) ); + connect( account, TQ_SIGNAL( colorChanged(const TQColor& ) ), TQ_SLOT( slotAccountStatusIconChanged() ) ); connect( account->myself(), - TQT_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotAccountStatusIconChanged( Kopete::Contact* ) ) ); + TQ_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotAccountStatusIconChanged( Kopete::Contact* ) ) ); KopeteAccountStatusBarIcon *sbIcon = new KopeteAccountStatusBarIcon( account, m_statusBarWidget ); - connect( sbIcon, TQT_SIGNAL( rightClicked( Kopete::Account *, const TQPoint & ) ), - TQT_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *, + connect( sbIcon, TQ_SIGNAL( rightClicked( Kopete::Account *, const TQPoint & ) ), + TQ_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *, const TQPoint & ) ) ); - connect( sbIcon, TQT_SIGNAL( leftClicked( Kopete::Account *, const TQPoint & ) ), - TQT_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *, + connect( sbIcon, TQ_SIGNAL( leftClicked( Kopete::Account *, const TQPoint & ) ), + TQ_SLOT( slotAccountStatusIconRightClicked( Kopete::Account *, const TQPoint & ) ) ); m_accountStatusBarIcons.insert( account, sbIcon ); @@ -728,7 +728,7 @@ void KopeteWindow::slotAccountRegistered( Kopete::Account *account ) // add an item for this account to the add contact actionmenu TQString s = "actionAdd%1Contact"; s.arg( account->accountId() ); - TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQT_SLOT( map() ), account, s.latin1() ); + TDEAction *action = new TDEAction( account->accountLabel(), account->accountIcon(), 0 , addContactMapper, TQ_SLOT( map() ), account, s.latin1() ); addContactMapper->setMapping( action, account->protocol()->pluginId() + TQChar(0xE000) + account->accountId() ); actionAddContact->insert( action ); } @@ -882,7 +882,7 @@ void KopeteWindow::slotAccountStatusIconRightClicked( Kopete::Account *account, if ( !actionMenu ) return; - connect( actionMenu->popupMenu(), TQT_SIGNAL( aboutToHide() ), actionMenu, TQT_SLOT( deleteLater() ) ); + connect( actionMenu->popupMenu(), TQ_SIGNAL( aboutToHide() ), actionMenu, TQ_SLOT( deleteLater() ) ); actionMenu->popupMenu()->popup( p ); } @@ -895,7 +895,7 @@ void KopeteWindow::slotTrayAboutToShowMenu( TDEPopupMenu * popup ) if( menu ) menu->plug(popup, 1 ); - connect(popup , TQT_SIGNAL(aboutToHide()) , menu , TQT_SLOT(deleteLater())); + connect(popup , TQ_SIGNAL(aboutToHide()) , menu , TQ_SLOT(deleteLater())); } } @@ -909,7 +909,7 @@ void KopeteWindow::slotTrayAboutToShowMenu( TDEPopupMenu * popup ) { TDEActionMenu *menu = proto->protocolActions(); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) ); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) ); menu->popupMenu()->popup( p ); } }*/ @@ -990,7 +990,7 @@ void KopeteWindow::slotBuildStatusMessageMenu() newMessageLabel->setFocusPolicy( TQWidget::ClickFocus );*/ newMessagePix->setFocusProxy( m_newMessageEdit ); newMessagePix->setFocusPolicy( TQWidget::ClickFocus ); - connect( m_newMessageEdit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotNewStatusMessageEntered() ) ); + connect( m_newMessageEdit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotNewStatusMessageEntered() ) ); m_globalStatusMessageMenu->insertItem( newMessageBox ); @@ -1004,8 +1004,8 @@ void KopeteWindow::slotBuildStatusMessageMenu() { m_globalStatusMessageMenu->insertItem( KStringHandler::rsqueeze( *it ), i ); } -// connect( m_globalStatusMessageMenu, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotStatusMessageSelected( int ) ) ); -// connect( messageMenu, TQT_SIGNAL( aboutToHide() ), messageMenu, TQT_SLOT( deleteLater() ) ); +// connect( m_globalStatusMessageMenu, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotStatusMessageSelected( int ) ) ); +// connect( messageMenu, TQ_SIGNAL( aboutToHide() ), messageMenu, TQ_SLOT( deleteLater() ) ); m_newMessageEdit->setFocus(); @@ -1033,10 +1033,10 @@ void KopeteWindow::slotNewStatusMessageEntered() void KopeteWindow::slotGlobalStatusMessageIconClicked( const TQPoint &position ) { TDEPopupMenu *statusMessageIconMenu = new TDEPopupMenu(this, "statusMessageIconMenu"); - connect(statusMessageIconMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT(slotBuildStatusMessageMenu())); - connect( statusMessageIconMenu, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotStatusMessageSelected( int ) ) ); + connect(statusMessageIconMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT(slotBuildStatusMessageMenu())); + connect( statusMessageIconMenu, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotStatusMessageSelected( int ) ) ); statusMessageIconMenu->popup(position); } diff --git a/kopete/kopete/systemtray.cpp b/kopete/kopete/systemtray.cpp index 8a18b0dd..9d0fe5e8 100644 --- a/kopete/kopete/systemtray.cpp +++ b/kopete/kopete/systemtray.cpp @@ -61,15 +61,15 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name) mKopeteIcon = loadIcon("kopete"); - connect(mBlinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBlink())); - connect(Kopete::ChatSessionManager::self() , TQT_SIGNAL(newEvent(Kopete::MessageEvent*)), - this, TQT_SLOT(slotNewEvent(Kopete::MessageEvent*))); - connect(KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(slotConfigChanged())); + connect(mBlinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotBlink())); + connect(Kopete::ChatSessionManager::self() , TQ_SIGNAL(newEvent(Kopete::MessageEvent*)), + this, TQ_SLOT(slotNewEvent(Kopete::MessageEvent*))); + connect(KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(slotConfigChanged())); connect(Kopete::AccountManager::self(), - TQT_SIGNAL(accountOnlineStatusChanged(Kopete::Account *, + TQ_SIGNAL(accountOnlineStatusChanged(Kopete::Account *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &)), - this, TQT_SLOT(slotReevaluateAccountStates())); + this, TQ_SLOT(slotReevaluateAccountStates())); // the slot called by default by the quit action, KSystemTray::maybeQuit(), // just closes the parent window, which is hard to distinguish in that window's closeEvent() @@ -81,7 +81,7 @@ KopeteSystemTray::KopeteSystemTray(TQWidget* parent, const char* name) TDEAction *quit = actionCollection()->action( "file_quit" ); quit->disconnect(); KopeteWindow *myParent = static_cast<KopeteWindow *>( parent ); - connect( quit, TQT_SIGNAL( activated() ), myParent, TQT_SLOT( slotQuit() ) ); + connect( quit, TQ_SIGNAL( activated() ), myParent, TQ_SLOT( slotQuit() ) ); //setPixmap(mKopeteIcon); slotReevaluateAccountStates(); @@ -205,8 +205,8 @@ void KopeteSystemTray::slotNewEvent( Kopete::MessageEvent *event ) mBalloonEventList.append( event ); } - connect(event, TQT_SIGNAL(done(Kopete::MessageEvent*)), - this, TQT_SLOT(slotEventDone(Kopete::MessageEvent*))); + connect(event, TQ_SIGNAL(done(Kopete::MessageEvent*)), + this, TQ_SLOT(slotEventDone(Kopete::MessageEvent*))); if( event->message().manager() != 0 ) { @@ -262,7 +262,7 @@ void KopeteSystemTray::removeBalloonEvent(Kopete::MessageEvent *event) { //delay the addBalloon to let the time to event be deleted //in case a contact has been deleted cf Bug 100196 - TQTimer::singleShot(0, this, TQT_SLOT(addBalloon())); + TQTimer::singleShot(0, this, TQ_SLOT(addBalloon())); } else { @@ -303,10 +303,10 @@ void KopeteSystemTray::addBalloon() m_balloon = new KopeteBalloon( i18n( "<qt><nobr><b>New Message from %1:</b></nobr><br><nobr>\"%2\"</nobr></qt>" ) .arg( TQStyleSheet::escape( msgFrom ), msgText ), TQString() ); - connect(m_balloon, TQT_SIGNAL(signalBalloonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); - connect(m_balloon, TQT_SIGNAL(signalButtonClicked()), mBalloonEventList.first() , TQT_SLOT(apply())); - connect(m_balloon, TQT_SIGNAL(signalIgnoreButtonClicked()), mBalloonEventList.first() , TQT_SLOT(ignore())); - connect(m_balloon, TQT_SIGNAL(signalTimeout()), this , TQT_SLOT(slotRemoveBalloon())); + connect(m_balloon, TQ_SIGNAL(signalBalloonClicked()), mBalloonEventList.first() , TQ_SLOT(apply())); + connect(m_balloon, TQ_SIGNAL(signalButtonClicked()), mBalloonEventList.first() , TQ_SLOT(apply())); + connect(m_balloon, TQ_SIGNAL(signalIgnoreButtonClicked()), mBalloonEventList.first() , TQ_SLOT(ignore())); + connect(m_balloon, TQ_SIGNAL(signalTimeout()), this , TQ_SLOT(slotRemoveBalloon())); m_balloon->setAnchor(mapToGlobal(pos())); m_balloon->show(); KWin::setOnAllDesktops(m_balloon->winId(), true); diff --git a/kopete/libkopete/avdevice/qvideostream.cpp b/kopete/libkopete/avdevice/qvideostream.cpp index 5c4693b8..6002e1c8 100644 --- a/kopete/libkopete/avdevice/qvideostream.cpp +++ b/kopete/libkopete/avdevice/qvideostream.cpp @@ -540,8 +540,8 @@ QVideoStreamGLWidget::QVideoStreamGLWidget(TQWidget* parent, const char* name) { kdDebug() << "QVideoStreamGLWidget::QVideoStreamGLWidget()" << endl; - connect(_w, TQT_SIGNAL(resized(int, int)), - this, TQT_SLOT(resize(int, int))); + connect(_w, TQ_SIGNAL(resized(int, int)), + this, TQ_SLOT(resize(int, int))); topLevelWidget()->installEventFilter(this); _glfunTimer = new TQTimer(); diff --git a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp index 4c8cd6fd..6f6df426 100644 --- a/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp +++ b/kopete/libkopete/compat/kpixmapregionselectorwidget.cpp @@ -141,12 +141,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, this, TQT_SLOT(rotateClockwise()), + 0, this, TQ_SLOT(rotateClockwise()), popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, this, TQT_SLOT(rotateCounterclockwise()), + 0, this, TQ_SLOT(rotateCounterclockwise()), popup, "rotatecounterclockwise"); action->plug(popup); diff --git a/kopete/libkopete/kautoconfig.cpp b/kopete/libkopete/kautoconfig.cpp index 23215008..05457222 100644 --- a/kopete/libkopete/kautoconfig.cpp +++ b/kopete/libkopete/kautoconfig.cpp @@ -141,46 +141,46 @@ bool KAutoConfig::retrieveSettings(bool trackChanges){ if(trackChanges){ // QT - changedMap.insert(TQString::fromLatin1("TQButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQPushButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQT_SIGNAL(stateChanged(int))); - changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(activated (int))); + changedMap.insert(TQString::fromLatin1("TQButton"), TQ_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQCheckBox"), TQ_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQPushButton"), TQ_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQRadioButton"), TQ_SIGNAL(stateChanged(int))); + changedMap.insert(TQString::fromLatin1("TQComboBox"), TQ_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQDateEdit"), TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert(TQString::fromLatin1("TQDateTimeEdit"), TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert(TQString::fromLatin1("TQDial"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQSlider"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQT_SIGNAL(valueChanged(int))); - changedMap.insert(TQString::fromLatin1("TQTimeEdit"), TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert(TQString::fromLatin1("TQListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert(TQString::fromLatin1("TQComboBox"), TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQDateEdit"), TQ_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert(TQString::fromLatin1("TQDateTimeEdit"), TQ_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert(TQString::fromLatin1("TQDial"), TQ_SIGNAL(valueChanged (int))); + changedMap.insert(TQString::fromLatin1("TQLineEdit"), TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQSlider"), TQ_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1("TQSpinBox"), TQ_SIGNAL(valueChanged(int))); + changedMap.insert(TQString::fromLatin1("TQTimeEdit"), TQ_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert(TQString::fromLatin1("TQTextEdit"), TQ_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1("TQTextBrowser"), TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert(TQString::fromLatin1("TQMultiLineEdit"), TQ_SIGNAL(textChanged())); + changedMap.insert(TQString::fromLatin1("TQListBox"), TQ_SIGNAL(selectionChanged())); + changedMap.insert(TQString::fromLatin1("TQTabWidget"), TQ_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( TQString::fromLatin1("KComboBox"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("TDEFontCombo"), TQT_SIGNAL(activated (int))); - changedMap.insert( TQString::fromLatin1("TDEFontRequester"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("TDEFontChooser"), TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQT_SIGNAL(activated (int))); - - changedMap.insert( TQString::fromLatin1("KColorButton"), TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( TQString::fromLatin1("KDatePicker"), TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( TQString::fromLatin1("KEditListBox"), TQT_SIGNAL(changed())); - changedMap.insert( TQString::fromLatin1("TDEListBox"), TQT_SIGNAL(selectionChanged())); - changedMap.insert( TQString::fromLatin1("KLineEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextBrowser"), TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( TQString::fromLatin1("KTextEdit"), TQT_SIGNAL(textChanged())); - changedMap.insert( TQString::fromLatin1("KURLRequester"), TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( TQString::fromLatin1("KIntNumInput"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KIntSpinBox"), TQT_SIGNAL(valueChanged (int))); - changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQT_SIGNAL(valueChanged (double))); + changedMap.insert( TQString::fromLatin1("KComboBox"), TQ_SIGNAL(activated (int))); + changedMap.insert( TQString::fromLatin1("TDEFontCombo"), TQ_SIGNAL(activated (int))); + changedMap.insert( TQString::fromLatin1("TDEFontRequester"), TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::fromLatin1("TDEFontChooser"), TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( TQString::fromLatin1("KHistoryCombo"), TQ_SIGNAL(activated (int))); + + changedMap.insert( TQString::fromLatin1("KColorButton"), TQ_SIGNAL(changed(const TQColor &))); + changedMap.insert( TQString::fromLatin1("KDatePicker"), TQ_SIGNAL(dateSelected (TQDate))); + changedMap.insert( TQString::fromLatin1("KEditListBox"), TQ_SIGNAL(changed())); + changedMap.insert( TQString::fromLatin1("TDEListBox"), TQ_SIGNAL(selectionChanged())); + changedMap.insert( TQString::fromLatin1("KLineEdit"), TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KPasswordEdit"), TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KRestrictedLine"), TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KTextBrowser"), TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( TQString::fromLatin1("KTextEdit"), TQ_SIGNAL(textChanged())); + changedMap.insert( TQString::fromLatin1("KURLRequester"), TQ_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( TQString::fromLatin1("KIntNumInput"), TQ_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::fromLatin1("KIntSpinBox"), TQ_SIGNAL(valueChanged (int))); + changedMap.insert( TQString::fromLatin1("KDoubleNumInput"), TQ_SIGNAL(valueChanged (double))); } // Go through all of the children of the widgets and find all known widgets @@ -412,7 +412,7 @@ bool KAutoConfig::parseChildren(const TQWidget *widget, changedMap.end()) { connect(childWidget, changedMap[TQString::fromLatin1(childWidget->className())], - this, TQT_SIGNAL(widgetModified())); + this, TQ_SIGNAL(widgetModified())); } #ifndef NDEBUG else if(trackChanges && diff --git a/kopete/libkopete/kautoconfig.h b/kopete/libkopete/kautoconfig.h index 17a4e074..314fd4c7 100644 --- a/kopete/libkopete/kautoconfig.h +++ b/kopete/libkopete/kautoconfig.h @@ -186,14 +186,14 @@ public: * * Example: * \code - * addWidgetChangedSignal( "TQCheckbox", TQT_SIGNAL(stateChanged(int)) ); + * addWidgetChangedSignal( "TQCheckbox", TQ_SIGNAL(stateChanged(int)) ); * \endcode * * This is generally used in conjunction with the addition of a class * to TQSqlPropertyMap so KAutoConfig can get/set its values. * * @param widgetName - The class name of the widget (className()). - * @param signal - The signal (with "TQT_SIGNAL()" wrapper) that should be called. + * @param signal - The signal (with "TQ_SIGNAL()" wrapper) that should be called. */ inline void addWidgetChangedSignal( const TQString &widgetName, const TQCString &signal ){ diff --git a/kopete/libkopete/kcautoconfigmodule.cpp b/kopete/libkopete/kcautoconfigmodule.cpp index d079984a..7749d680 100644 --- a/kopete/libkopete/kcautoconfigmodule.cpp +++ b/kopete/libkopete/kcautoconfigmodule.cpp @@ -35,8 +35,8 @@ KCAutoConfigModule::KCAutoConfigModule( TQWidget * parent, const char * name, co , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( this ); - connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); - connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(widgetModified()), TQ_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(settingsChanged()), TQ_SLOT(widgetModified())); } KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) @@ -44,8 +44,8 @@ KCAutoConfigModule::KCAutoConfigModule( TDEInstance * instance, TQWidget * paren , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( this ); - connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); - connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(widgetModified()), TQ_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(settingsChanged()), TQ_SLOT(slotWidgetModified())); } @@ -54,8 +54,8 @@ KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config,TQWidget * parent, con : TDECModule( parent, name, args ) , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, this ); - connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); - connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(widgetModified()), TQ_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(settingsChanged()), TQ_SLOT(slotWidgetModified())); } KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instance, TQWidget * parent, const TQStringList & args ) @@ -63,8 +63,8 @@ KCAutoConfigModule::KCAutoConfigModule( TDEConfig *config , TDEInstance * instan , d( new KCAutoConfigModulePrivate ) { d->kautoconfig = new KAutoConfig( config, this ); - connect(d->kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(slotWidgetModified())); - connect(d->kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(widgetModified()), TQ_SLOT(slotWidgetModified())); + connect(d->kautoconfig, TQ_SIGNAL(settingsChanged()), TQ_SLOT(slotWidgetModified())); } diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp index e7bfdfe2..24d653a0 100644 --- a/kopete/libkopete/knotification.cpp +++ b/kopete/libkopete/knotification.cpp @@ -174,7 +174,7 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) WId winId=d->widget ? d->widget->topLevelWidget()->winId() : 0; KPassivePopup *pop = new KPassivePopup( checkWinId(appName, winId) ); - TQObject::connect(this, TQT_SIGNAL(closed()), pop, TQT_SLOT(deleteLater())); + TQObject::connect(this, TQ_SIGNAL(closed()), pop, TQ_SLOT(deleteLater())); TQVBox *vb = pop->standardView( title, pix.isNull() ? d->text: TQString() , icon ); TQVBox *vb2=vb; @@ -214,9 +214,9 @@ void KNotification::notifyByPassivePopup(const TQPixmap &pix ) linkCode+=TQString::fromLatin1("</p>"); KActiveLabel *link = new KActiveLabel(linkCode , vb ); //link->setAlignment( AlignRight ); - TQObject::disconnect(link, TQT_SIGNAL(linkClicked(const TQString &)), link, TQT_SLOT(openLink(const TQString &))); - TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), this, TQT_SLOT(slotPopupLinkClicked(const TQString &))); - TQObject::connect(link, TQT_SIGNAL(linkClicked(const TQString &)), pop, TQT_SLOT(hide())); + TQObject::disconnect(link, TQ_SIGNAL(linkClicked(const TQString &)), link, TQ_SLOT(openLink(const TQString &))); + TQObject::connect(link, TQ_SIGNAL(linkClicked(const TQString &)), this, TQ_SLOT(slotPopupLinkClicked(const TQString &))); + TQObject::connect(link, TQ_SIGNAL(linkClicked(const TQString &)), pop, TQ_SLOT(hide())); } pop->setAutoDelete( true ); @@ -391,12 +391,12 @@ KNotification *KNotification::userEvent( const TQString& text, const TQPixmap& p } if ( present & KNotifyClient::Messagebox ) { - TQTimer::singleShot(0,notify,TQT_SLOT(notifyByMessagebox())); + TQTimer::singleShot(0,notify,TQ_SLOT(notifyByMessagebox())); } else //not a message box (because closing the event when a message box is there is suicide) if(flags & CloseOnTimeout) { - TQTimer::singleShot(6*1000, notify, TQT_SLOT(close())); + TQTimer::singleShot(6*1000, notify, TQ_SLOT(close())); } if ( present & KNotifyClient::Execute ) { diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp index ac072f40..4eb70efe 100644 --- a/kopete/libkopete/kopeteaccount.cpp +++ b/kopete/libkopete/kopeteaccount.cpp @@ -96,8 +96,8 @@ Account::Account( Protocol *parent, const TQString &accountId, const char *name d->restoreStatus = Kopete::OnlineStatus::Online; d->restoreMessage = ""; - TQObject::connect( &d->suppressStatusTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotStopSuppression() ) ); + TQObject::connect( &d->suppressStatusTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotStopSuppression() ) ); } Account::~Account() @@ -128,14 +128,14 @@ void Account::disconnected( DisconnectReason reason ) //reconnect if needed if(reason == BadPassword ) { - TQTimer::singleShot(0, this, TQT_SLOT(reconnect())); + TQTimer::singleShot(0, this, TQ_SLOT(reconnect())); } else if ( KopetePrefs::prefs()->reconnectOnDisconnect() == true && reason > Manual ) { d->connectionTry++; //use a timer to allow the plugins to clean up after return if(d->connectionTry < 3) - TQTimer::singleShot(10000, this, TQT_SLOT(reconnect())); // wait 10 seconds before reconnect + TQTimer::singleShot(10000, this, TQ_SLOT(reconnect())); // wait 10 seconds before reconnect } if(reason== OtherClient) { @@ -233,8 +233,8 @@ bool Account::excludeConnect() const void Account::registerContact( Contact *c ) { d->contacts.insert( c->contactId(), c ); - TQObject::connect( c, TQT_SIGNAL( contactDestroyed( Kopete::Contact * ) ), - TQT_SLOT( contactDestroyed( Kopete::Contact * ) ) ); + TQObject::connect( c, TQ_SIGNAL( contactDestroyed( Kopete::Contact * ) ), + TQ_SLOT( contactDestroyed( Kopete::Contact * ) ) ); } void Account::contactDestroyed( Contact *c ) @@ -370,7 +370,7 @@ TDEActionMenu * Account::actionMenu() OnlineStatusManager::self()->createAccountStatusActions(this, menu); menu->popupMenu()->insertSeparator(); - menu->insert( new TDEAction ( i18n( "Properties" ), 0, this, TQT_SLOT( editAccount() ), menu, "actionAccountProperties" ) ); + menu->insert( new TDEAction ( i18n( "Properties" ), 0, this, TQ_SLOT( editAccount() ), menu, "actionAccountProperties" ) ); return menu; } @@ -397,20 +397,20 @@ void Account::setMyself( Contact *myself ) if ( d->myself ) { - TQObject::disconnect( d->myself, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); - TQObject::disconnect( d->myself, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); + TQObject::disconnect( d->myself, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + TQObject::disconnect( d->myself, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); } d->myself = myself; // d->contacts.remove( myself->contactId() ); - TQObject::connect( d->myself, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); - TQObject::connect( d->myself, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); + TQObject::connect( d->myself, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + TQObject::connect( d->myself, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotContactPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ); if ( isConnected() != wasConnected ) emit isConnectedChanged(); diff --git a/kopete/libkopete/kopeteaccountmanager.cpp b/kopete/libkopete/kopeteaccountmanager.cpp index 4b3db7cd..92a2243f 100644 --- a/kopete/libkopete/kopeteaccountmanager.cpp +++ b/kopete/libkopete/kopeteaccountmanager.cpp @@ -243,12 +243,12 @@ Account* AccountManager::registerAccount( Account *account ) d->accounts.sort(); // Connect to the account's status changed signal - connect(account->myself(), TQT_SIGNAL(onlineStatusChanged(Kopete::Contact *, + connect(account->myself(), TQ_SIGNAL(onlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &)), - this, TQT_SLOT(slotAccountOnlineStatusChanged(Kopete::Contact *, + this, TQ_SLOT(slotAccountOnlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &))); - connect(account, TQT_SIGNAL(accountDestroyed(const Kopete::Account *)) , this, TQT_SLOT( unregisterAccount(const Kopete::Account *) )); + connect(account, TQ_SIGNAL(accountDestroyed(const Kopete::Account *)) , this, TQ_SLOT( unregisterAccount(const Kopete::Account *) )); emit accountRegistered( account ); return account; @@ -357,8 +357,8 @@ void AccountManager::save() void AccountManager::load() { - connect( PluginManager::self(), TQT_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), - this, TQT_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); + connect( PluginManager::self(), TQ_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), + this, TQ_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); // Iterate over all groups that start with "Account_" as those are accounts // and load the required protocols if the account is enabled. diff --git a/kopete/libkopete/kopeteaway.cpp b/kopete/libkopete/kopeteaway.cpp index 4791d402..1a835386 100644 --- a/kopete/libkopete/kopeteaway.cpp +++ b/kopete/libkopete/kopeteaway.cpp @@ -143,7 +143,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") load(); - KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQT_SLOT( load() ) ); + KSettings::Dispatcher::self()->registerInstance( TDEGlobal::instance(), this, TQ_SLOT( load() ) ); // Set up the config object TDEConfig *config = TDEGlobal::config(); /* Load the saved away messages */ @@ -189,7 +189,7 @@ Kopete::Away::Away() : TQObject( kapp , "Kopete::Away") // init the timer d->timer = new TQTimer(this, "AwayTimer"); - connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerTimeout())); + connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerTimeout())); d->timer->start(4000); //init the time and other diff --git a/kopete/libkopete/kopeteawayaction.cpp b/kopete/libkopete/kopeteawayaction.cpp index da5b77fb..038a43dd 100644 --- a/kopete/libkopete/kopeteawayaction.cpp +++ b/kopete/libkopete/kopeteawayaction.cpp @@ -40,14 +40,14 @@ AwayAction::AwayAction(const TQString &text, const TQIconSet &pix, const TDEShor const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) : TDESelectAction(text, pix, cut, parent, name ) , d(new Private( OnlineStatus() ) ) { - TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), - this, TQT_SLOT( slotAwayChanged() ) ); + TQObject::connect( Kopete::Away::getInstance(), TQ_SIGNAL( messagesChanged() ), + this, TQ_SLOT( slotAwayChanged() ) ); - TQObject::connect( this, TQT_SIGNAL( awayMessageSelected( const TQString & ) ), + TQObject::connect( this, TQ_SIGNAL( awayMessageSelected( const TQString & ) ), receiver, slot ); - TQObject::connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotSelectAway( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotSelectAway( int ) ) ); slotAwayChanged(); } @@ -56,14 +56,14 @@ AwayAction::AwayAction( const OnlineStatus& status, const TQString &text, const const TQObject *receiver, const char *slot, TQObject *parent, const char *name ) : TDESelectAction(text, pix, cut, parent, name ) , d(new Private( status ) ) { - TQObject::connect( Kopete::Away::getInstance(), TQT_SIGNAL( messagesChanged() ), - this, TQT_SLOT( slotAwayChanged() ) ); + TQObject::connect( Kopete::Away::getInstance(), TQ_SIGNAL( messagesChanged() ), + this, TQ_SLOT( slotAwayChanged() ) ); - TQObject::connect( this, TQT_SIGNAL( awayMessageSelected( const Kopete::OnlineStatus &, const TQString & ) ), + TQObject::connect( this, TQ_SIGNAL( awayMessageSelected( const Kopete::OnlineStatus &, const TQString & ) ), receiver, slot ); - TQObject::connect( this, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotSelectAway( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotSelectAway( int ) ) ); slotAwayChanged(); } diff --git a/kopete/libkopete/kopeteawaydialog.cpp b/kopete/libkopete/kopeteawaydialog.cpp index fd4def67..4eb0ebc2 100644 --- a/kopete/libkopete/kopeteawaydialog.cpp +++ b/kopete/libkopete/kopeteawaydialog.cpp @@ -44,7 +44,7 @@ KopeteAwayDialog::KopeteAwayDialog( TQWidget *parent, const char *name ) d->base = new KopeteAwayDialog_Base( this ); setMainWidget( d->base ); - TQObject::connect( d->base->cmbHistory, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotComboBoxSelection( int ) ) ); + TQObject::connect( d->base->cmbHistory, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotComboBoxSelection( int ) ) ); awayInstance = Kopete::Away::getInstance(); mExtendedAwayType = 0; diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp index ab9b9a13..089a2b65 100644 --- a/kopete/libkopete/kopetechatsession.cpp +++ b/kopete/libkopete/kopetechatsession.cpp @@ -79,11 +79,11 @@ Kopete::ChatSession::ChatSession( const Kopete::Contact *user, for ( Kopete::Contact *c = others.first(); c; c = others.next() ) addContact( c, true ); - connect( user, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, - TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + connect( user, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, + TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); if( user->metaContact() ) - connect( user->metaContact(), TQT_SIGNAL( photoChanged() ), this, TQT_SIGNAL( photoChanged() ) ); + connect( user->metaContact(), TQ_SIGNAL( photoChanged() ), this, TQ_SIGNAL( photoChanged() ) ); slotUpdateDisplayName(); } @@ -111,8 +111,8 @@ void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact { Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ]; d->contactStatus[ contact ] = status; - disconnect( contact, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); + disconnect( contact, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldStatus ); } @@ -320,16 +320,16 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) d->mContactList.remove( old ); d->mContactList.append( c ); - disconnect( old, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); + disconnect( old, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); if ( old->metaContact() ) { - disconnect( old->metaContact(), TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); - disconnect( old->metaContact(), TQT_SIGNAL( photoChanged() ), this, TQT_SIGNAL( photoChanged() ) ); + disconnect( old->metaContact(), TQ_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); + disconnect( old->metaContact(), TQ_SIGNAL( photoChanged() ), this, TQ_SIGNAL( photoChanged() ) ); } else - disconnect( old, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); + disconnect( old, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); emit contactAdded( c, suppress ); emit contactRemoved( old, TQString() ); } @@ -339,17 +339,17 @@ void Kopete::ChatSession::addContact( const Kopete::Contact *c, bool suppress ) emit contactAdded( c, suppress ); } - connect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); + connect( c, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); ; if ( c->metaContact() ) { - connect( c->metaContact(), TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); - connect( c->metaContact(), TQT_SIGNAL( photoChanged() ), this, TQT_SIGNAL( photoChanged() ) ); + connect( c->metaContact(), TQ_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); + connect( c->metaContact(), TQ_SIGNAL( photoChanged() ), this, TQ_SIGNAL( photoChanged() ) ); } else - connect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); - connect( c, TQT_SIGNAL( contactDestroyed( Kopete::Contact * ) ), this, TQT_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); + connect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); + connect( c, TQ_SIGNAL( contactDestroyed( Kopete::Contact * ) ), this, TQ_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); slotUpdateDisplayName(); } @@ -371,17 +371,17 @@ void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQStrin { d->mContactList.remove( c ); - disconnect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); + disconnect( c, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotOnlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) ); if ( c->metaContact() ) { - disconnect( c->metaContact(), TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); - disconnect( c->metaContact(), TQT_SIGNAL( photoChanged() ), this, TQT_SIGNAL( photoChanged() ) ); + disconnect( c->metaContact(), TQ_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); + disconnect( c->metaContact(), TQ_SIGNAL( photoChanged() ), this, TQ_SIGNAL( photoChanged() ) ); } else - disconnect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQT_SLOT( slotUpdateDisplayName() ) ); - disconnect( c, TQT_SIGNAL( contactDestroyed( Kopete::Contact * ) ), this, TQT_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); + disconnect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), this, TQ_SLOT( slotUpdateDisplayName() ) ); + disconnect( c, TQ_SIGNAL( contactDestroyed( Kopete::Contact * ) ), this, TQ_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); slotUpdateDisplayName(); } @@ -443,7 +443,7 @@ KopeteView* Kopete::ChatSession::view( bool canCreate, const TQString &requested d->view = Kopete::ChatSessionManager::self()->createView( this, requestedPlugin ); if ( d->view ) { - connect( d->view->mainWidget(), TQT_SIGNAL( closing( KopeteView * ) ), this, TQT_SLOT( slotViewDestroyed( ) ) ); + connect( d->view->mainWidget(), TQ_SIGNAL( closing( KopeteView * ) ), this, TQ_SLOT( slotViewDestroyed( ) ) ); } else { diff --git a/kopete/libkopete/kopetechatsessionmanager.cpp b/kopete/libkopete/kopetechatsessionmanager.cpp index 57cc1752..64940963 100644 --- a/kopete/libkopete/kopetechatsessionmanager.cpp +++ b/kopete/libkopete/kopetechatsessionmanager.cpp @@ -128,15 +128,15 @@ void ChatSessionManager::registerChatSession(ChatSession * result) * There's no need for a slot here... just add a public remove() * method and call from KMM's destructor */ - connect( result, TQT_SIGNAL( messageAppended( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ) ); - connect( result, TQT_SIGNAL( messageSent( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SIGNAL( aboutToSend(Kopete::Message & ) ) ); - connect( result, TQT_SIGNAL( messageReceived( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SIGNAL( aboutToReceive(Kopete::Message & ) ) ); + connect( result, TQ_SIGNAL( messageAppended( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ) ); + connect( result, TQ_SIGNAL( messageSent( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SIGNAL( aboutToSend(Kopete::Message & ) ) ); + connect( result, TQ_SIGNAL( messageReceived( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SIGNAL( aboutToReceive(Kopete::Message & ) ) ); - connect( result, TQT_SIGNAL(messageAppended( Kopete::Message &, Kopete::ChatSession *) ), - TQT_SIGNAL( display( Kopete::Message &, Kopete::ChatSession *) ) ); + connect( result, TQ_SIGNAL(messageAppended( Kopete::Message &, Kopete::ChatSession *) ), + TQ_SIGNAL( display( Kopete::Message &, Kopete::ChatSession *) ) ); emit chatSessionCreated(result); } @@ -165,10 +165,10 @@ KopeteView * ChatSessionManager::createView( ChatSession *kmm , const TQString & TQObject *viewObject = dynamic_cast<TQObject *>(newView); if(viewObject) { - connect(viewObject, TQT_SIGNAL(activated(KopeteView *)), - this, TQT_SIGNAL(viewActivated(KopeteView *))); - connect(viewObject, TQT_SIGNAL(closing(KopeteView *)), - this, TQT_SIGNAL(viewClosing(KopeteView *))); + connect(viewObject, TQ_SIGNAL(activated(KopeteView *)), + this, TQ_SIGNAL(viewActivated(KopeteView *))); + connect(viewObject, TQ_SIGNAL(closing(KopeteView *)), + this, TQ_SIGNAL(viewClosing(KopeteView *))); } else { diff --git a/kopete/libkopete/kopetecommandhandler.cpp b/kopete/libkopete/kopetecommandhandler.cpp index 49443ab2..b628bde1 100644 --- a/kopete/libkopete/kopetecommandhandler.cpp +++ b/kopete/libkopete/kopetecommandhandler.cpp @@ -103,41 +103,41 @@ Kopete::CommandHandler::CommandHandler() : TQObject( tqApp ) mCommands.setAutoDelete( true ); p->pluginCommands.insert( this, mCommands ); - registerCommand( this, TQString::fromLatin1("help"), TQT_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("help"), TQ_SLOT( slotHelpCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /help [<command>] - Used to list available commands, or show help for a specified command." ), 0, 1 ); - registerCommand( this, TQString::fromLatin1("close"), TQT_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("close"), TQ_SLOT( slotCloseCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /close - Closes the current view." ) ); // FIXME: What's the difference with /close? The help doesn't explain it - Martijn - registerCommand( this, TQString::fromLatin1("part"), TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("part"), TQ_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /part - Closes the current view." ) ); - registerCommand( this, TQString::fromLatin1("clear"), TQT_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("clear"), TQ_SLOT( slotClearCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /clear - Clears the active view's chat buffer." ) ); - //registerCommand( this, TQString::fromLatin1("me"), TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), + //registerCommand( this, TQString::fromLatin1("me"), TQ_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession * ) ), // i18n( "USAGE: /me <text> - Formats message as in '<nickname> went to the store'." ) ); - registerCommand( this, TQString::fromLatin1("away"), TQT_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("away"), TQ_SLOT( slotAwayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /away [<reason>] - Marks you as away/back for the current account only." ) ); - registerCommand( this, TQString::fromLatin1("awayall"), TQT_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("awayall"), TQ_SLOT( slotAwayAllCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /awayall [<reason>] - Marks you as away/back for all accounts." ) ); - registerCommand( this, TQString::fromLatin1("say"), TQT_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("say"), TQ_SLOT( slotSayCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /say <text> - Say text in this chat. This is the same as just typing a message, but is very " "useful for scripts." ), 1 ); - registerCommand( this, TQString::fromLatin1("exec"), TQT_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), + registerCommand( this, TQString::fromLatin1("exec"), TQ_SLOT( slotExecCommand( const TQString &, Kopete::ChatSession * ) ), i18n( "USAGE: /exec [-o] <command> - Executes the specified command and displays the output in the chat buffer. " "If -o is specified, the output is sent to all members of the chat."), 1 ); - connect( Kopete::PluginManager::self(), TQT_SIGNAL( pluginLoaded( Kopete::Plugin*) ), - this, TQT_SLOT(slotPluginLoaded(Kopete::Plugin*) ) ); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( pluginLoaded( Kopete::Plugin*) ), + this, TQ_SLOT(slotPluginLoaded(Kopete::Plugin*) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( viewCreated( KopeteView * ) ), - this, TQT_SLOT( slotViewCreated( KopeteView* ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( viewCreated( KopeteView * ) ), + this, TQ_SLOT( slotViewCreated( KopeteView* ) ) ); } Kopete::CommandHandler::~CommandHandler() @@ -294,8 +294,8 @@ void Kopete::CommandHandler::slotExecCommand( const TQString &args, Kopete::Chat *proc << args; } - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(slotExecReturnedData(TDEProcess *, char *, int))); proc->start( TDEProcess::NotifyOnExit, TDEProcess::AllOutput ); } else @@ -469,7 +469,7 @@ void Kopete::CommandHandler::slotViewCreated( KopeteView *view ) void Kopete::CommandHandler::slotPluginLoaded( Kopete::Plugin *plugin ) { - connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); + connect( plugin, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( slotPluginDestroyed( TQObject * ) ) ); if( !p->pluginCommands.contains( plugin ) ) { //Create a TQDict optomized for a larger # of commands, and case insensitive diff --git a/kopete/libkopete/kopetecontact.cpp b/kopete/libkopete/kopetecontact.cpp index 35520c83..8606daa0 100644 --- a/kopete/libkopete/kopetecontact.cpp +++ b/kopete/libkopete/kopetecontact.cpp @@ -98,7 +98,7 @@ Contact::Contact( Account *account, const TQString &contactId, if ( account ) { account->registerContact( this ); - connect( account, TQT_SIGNAL( isConnectedChanged() ), TQT_SLOT( slotAccountIsConnectedChanged() ) ); + connect( account, TQ_SIGNAL( isConnectedChanged() ), TQ_SLOT( slotAccountIsConnectedChanged() ) ); } // Need to check this because myself() may have no parent @@ -106,8 +106,8 @@ Contact::Contact( Account *account, const TQString &contactId, // (ex: for unit tests or chat window style preview) if( parent && protocol() ) { - connect( parent, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), - protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); + connect( parent, TQ_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + protocol(), TQ_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); parent->addContact( this ); } @@ -210,7 +210,7 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager ) if( metaContact() && metaContact()->isTemporary() && contactId() != account()->myself()->contactId() ) { TDEAction *actionAddContact = new TDEAction( i18n( "&Add to Your Contact List" ), TQString::fromLatin1( "add_user" ), - 0, this, TQT_SLOT( slotAddContact() ), menu, "actionAddContact" ); + 0, this, TQ_SLOT( slotAddContact() ), menu, "actionAddContact" ); actionAddContact->plug( menu ); menu->insertSeparator(); } @@ -219,15 +219,15 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager ) bool reach = account()->isConnected() && isReachable(); bool myself = (this == account()->myself()); - TDEAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQT_SLOT( sendMessage() ), menu, "actionSendMessage" ); + TDEAction *actionSendMessage = KopeteStdAction::sendMessage( this, TQ_SLOT( sendMessage() ), menu, "actionSendMessage" ); actionSendMessage->setEnabled( reach && !myself ); actionSendMessage->plug( menu ); - TDEAction *actionChat = KopeteStdAction::chat( this, TQT_SLOT( startChat() ), menu, "actionChat" ); + TDEAction *actionChat = KopeteStdAction::chat( this, TQ_SLOT( startChat() ), menu, "actionChat" ); actionChat->setEnabled( reach && !myself ); actionChat->plug( menu ); - TDEAction *actionSendFile = KopeteStdAction::sendFile( this, TQT_SLOT( sendFile() ), menu, "actionSendFile" ); + TDEAction *actionSendFile = KopeteStdAction::sendFile( this, TQ_SLOT( sendFile() ), menu, "actionSendFile" ); actionSendFile->setEnabled( reach && d->fileCapable && !myself ); actionSendFile->plug( menu ); @@ -248,19 +248,19 @@ TDEPopupMenu* Contact::popupMenu( ChatSession *manager ) menu->insertSeparator(); if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::changeMetaContact( this, TQT_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu ); + KopeteStdAction::changeMetaContact( this, TQ_SLOT( changeMetaContact() ), menu, "actionChangeMetaContact" )->plug( menu ); - KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu ); + KopeteStdAction::contactInfo( this, TQ_SLOT( slotUserInfo() ), menu, "actionUserInfo" )->plug( menu ); #if 0 //this is not fully implemented yet (and doesn't work). disable for now - Olivier 2005-01-11 if ( account()->isBlocked( d->contactId ) ) - KopeteStdAction::unblockContact( this, TQT_SLOT( slotUnblock() ), menu, "actionUnblockContact" )->plug( menu ); + KopeteStdAction::unblockContact( this, TQ_SLOT( slotUnblock() ), menu, "actionUnblockContact" )->plug( menu ); else - KopeteStdAction::blockContact( this, TQT_SLOT( slotBlock() ), menu, "actionBlockContact" )->plug( menu ); + KopeteStdAction::blockContact( this, TQ_SLOT( slotBlock() ), menu, "actionBlockContact" )->plug( menu ); #endif if( metaContact() && !metaContact()->isTemporary() ) - KopeteStdAction::deleteContact( this, TQT_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu ); + KopeteStdAction::deleteContact( this, TQ_SLOT( slotDelete() ), menu, "actionDeleteContact" )->plug( menu ); return menu; } @@ -279,7 +279,7 @@ void Contact::changeMetaContact() TQCheckBox *chkCreateNew = new TQCheckBox( i18n( "Create a new metacontact for this contact" ), w ); TQWhatsThis::add( chkCreateNew , i18n( "If you select this option, a new metacontact will be created in the top-level group " "with the name of this contact and the contact will be moved to it." ) ); - TQObject::connect( chkCreateNew , TQT_SIGNAL( toggled(bool) ) , selector , TQT_SLOT ( setDisabled(bool) ) ) ; + TQObject::connect( chkCreateNew , TQ_SIGNAL( toggled(bool) ) , selector , TQ_SLOT ( setDisabled(bool) ) ) ; moveDialog->setMainWidget(w); if( moveDialog->exec() == TQDialog::Accepted ) @@ -320,8 +320,8 @@ void Contact::setMetaContact( MetaContact *m ) return; } old->removeContact( this ); - disconnect( old, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), - protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); + disconnect( old, TQ_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + protocol(), TQ_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); if(result==KMessageBox::Yes) { @@ -346,8 +346,8 @@ void Contact::setMetaContact( MetaContact *m ) // between adding completely new contacts (which should be written to tdeabc) and restoring upon restart // (where no write is needed). KABCPersistence::self()->write( m ); - connect( d->metaContact, TQT_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), - protocol(), TQT_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); + connect( d->metaContact, TQ_SIGNAL( aboutToSave( Kopete::MetaContact * ) ), + protocol(), TQ_SLOT( slotMetaContactAboutToSave( Kopete::MetaContact * ) ) ); } sync(); } diff --git a/kopete/libkopete/kopetecontactlist.cpp b/kopete/libkopete/kopetecontactlist.cpp index eb2d02c3..5e919776 100644 --- a/kopete/libkopete/kopetecontactlist.cpp +++ b/kopete/libkopete/kopetecontactlist.cpp @@ -93,13 +93,13 @@ ContactList::ContactList() // automatically save on changes to the list d->saveTimer = new TQTimer( this, "saveTimer" ); - connect( d->saveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT ( save() ) ); + connect( d->saveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT ( save() ) ); - connect( this, TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), TQT_SLOT( slotSaveLater() ) ); - connect( this, TQT_SIGNAL( metaContactRemoved( Kopete::MetaContact * ) ), TQT_SLOT( slotSaveLater() ) ); - connect( this, TQT_SIGNAL( groupAdded( Kopete::Group * ) ), TQT_SLOT( slotSaveLater() ) ); - connect( this, TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), TQT_SLOT( slotSaveLater() ) ); - connect( this, TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), TQT_SLOT( slotSaveLater() ) ); + connect( this, TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), TQ_SLOT( slotSaveLater() ) ); + connect( this, TQ_SIGNAL( metaContactRemoved( Kopete::MetaContact * ) ), TQ_SLOT( slotSaveLater() ) ); + connect( this, TQ_SIGNAL( groupAdded( Kopete::Group * ) ), TQ_SLOT( slotSaveLater() ) ); + connect( this, TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), TQ_SLOT( slotSaveLater() ) ); + connect( this, TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), TQ_SLOT( slotSaveLater() ) ); } ContactList::~ContactList() @@ -224,9 +224,9 @@ void ContactList::addMetaContact( MetaContact *mc ) d->contacts.append( mc ); emit metaContactAdded( mc ); - connect( mc, TQT_SIGNAL( persistentDataChanged( ) ), TQT_SLOT( slotSaveLater() ) ); - connect( mc, TQT_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQT_SIGNAL( metaContactAddedToGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); - connect( mc, TQT_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQT_SIGNAL( metaContactRemovedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); + connect( mc, TQ_SIGNAL( persistentDataChanged( ) ), TQ_SLOT( slotSaveLater() ) ); + connect( mc, TQ_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQ_SIGNAL( metaContactAddedToGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); + connect( mc, TQ_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQ_SIGNAL( metaContactRemovedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ) ); } @@ -263,7 +263,7 @@ void ContactList::addGroup( Group * g ) { d->groups.append( g ); emit groupAdded( g ); - connect( g , TQT_SIGNAL ( displayNameChanged(Kopete::Group* , const TQString & )) , this , TQT_SIGNAL ( groupRenamed(Kopete::Group* , const TQString & )) ) ; + connect( g , TQ_SIGNAL ( displayNameChanged(Kopete::Group* , const TQString & )) , this , TQ_SIGNAL ( groupRenamed(Kopete::Group* , const TQString & )) ) ; } } @@ -304,11 +304,11 @@ void ContactList::loadGlobalIdentity() if(Kopete::Config::enableGlobalIdentity()) { // Disconnect to make sure it will not cause duplicate calls. - disconnect(myself(), TQT_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotDisplayNameChanged())); - disconnect(myself(), TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotPhotoChanged())); + disconnect(myself(), TQ_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotDisplayNameChanged())); + disconnect(myself(), TQ_SIGNAL(photoChanged()), this, TQ_SLOT(slotPhotoChanged())); - connect(myself(), TQT_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotDisplayNameChanged())); - connect(myself(), TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotPhotoChanged())); + connect(myself(), TQ_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotDisplayNameChanged())); + connect(myself(), TQ_SIGNAL(photoChanged()), this, TQ_SLOT(slotPhotoChanged())); // Ensure that the myself metaContactId is always the KABC whoAmI TDEABC::Addressee a = TDEABC::StdAddressBook::self()->whoAmI(); @@ -324,8 +324,8 @@ void ContactList::loadGlobalIdentity() } else { - disconnect(myself(), TQT_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQT_SLOT(slotDisplayNameChanged())); - disconnect(myself(), TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotPhotoChanged())); + disconnect(myself(), TQ_SIGNAL(displayNameChanged(const TQString&, const TQString&)), this, TQ_SLOT(slotDisplayNameChanged())); + disconnect(myself(), TQ_SIGNAL(photoChanged()), this, TQ_SLOT(slotPhotoChanged())); } } @@ -370,7 +370,7 @@ void ContactList::load() { loadXML(); // Apply the global identity when all the protocols plugins are loaded. - connect(PluginManager::self(), TQT_SIGNAL(allPluginsLoaded()), this, TQT_SLOT(loadGlobalIdentity())); + connect(PluginManager::self(), TQ_SIGNAL(allPluginsLoaded()), this, TQ_SLOT(loadGlobalIdentity())); } void ContactList::loadXML() diff --git a/kopete/libkopete/kopetecontactlist.h b/kopete/libkopete/kopetecontactlist.h index cc4ebd16..5099b427 100644 --- a/kopete/libkopete/kopetecontactlist.h +++ b/kopete/libkopete/kopetecontactlist.h @@ -243,7 +243,7 @@ signals: * * Connect signal in your Account constructor: * @code - * connect(Kopete::ContactList::self(), TQT_SIGNAL(globalIdentityChanged(const TQString&, const TQVariant&)), TQT_SLOT(slotglobalIdentityChanged(const TQString&, const TQVariant&))); + * connect(Kopete::ContactList::self(), TQ_SIGNAL(globalIdentityChanged(const TQString&, const TQVariant&)), TQ_SLOT(slotglobalIdentityChanged(const TQString&, const TQVariant&))); * @endcode * * Example of a typical implemented slot: diff --git a/kopete/libkopete/kopetecontactlistelement.cpp b/kopete/libkopete/kopetecontactlistelement.cpp index cfce58b6..ecba9396 100644 --- a/kopete/libkopete/kopetecontactlistelement.cpp +++ b/kopete/libkopete/kopetecontactlistelement.cpp @@ -41,7 +41,7 @@ ContactListElement::ContactListElement( TQObject *parent, const char *name ) d->useCustomIcon = false; #if 0 //TODO - connect( Kopete::Global::onlineStatusIconCache(), TQT_SIGNAL( iconsChanged() ), TQT_SIGNAL( iconAppearanceChanged() ) ); + connect( Kopete::Global::onlineStatusIconCache(), TQ_SIGNAL( iconsChanged() ), TQ_SIGNAL( iconAppearanceChanged() ) ); #endif } diff --git a/kopete/libkopete/kopetegroup.cpp b/kopete/libkopete/kopetegroup.cpp index c73194bd..be64a09c 100644 --- a/kopete/libkopete/kopetegroup.cpp +++ b/kopete/libkopete/kopetegroup.cpp @@ -279,7 +279,7 @@ void Group::sendMessage() c->sendMessage(); if( c->manager( Contact::CanCreate ) ) { - connect( c->manager(), TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), this, TQT_SLOT( sendMessage( Kopete::Message& ) )); + connect( c->manager(), TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), this, TQ_SLOT( sendMessage( Kopete::Message& ) )); } } @@ -290,7 +290,7 @@ void Group::sendMessage( Message& msg ) ChatSession *cs=msg.manager(); if( cs ) { - disconnect( cs, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), this, TQT_SLOT( sendMessage( Kopete::Message& ) ) ); + disconnect( cs, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), this, TQ_SLOT( sendMessage( Kopete::Message& ) ) ); } else return; diff --git a/kopete/libkopete/kopetemessageevent.cpp b/kopete/libkopete/kopetemessageevent.cpp index 8482205c..ba8b22b5 100644 --- a/kopete/libkopete/kopetemessageevent.cpp +++ b/kopete/libkopete/kopetemessageevent.cpp @@ -44,7 +44,7 @@ MessageEvent::MessageEvent( const Message& m, TQObject *parent, const char *name d->state = Nothing; const Contact *c=m.from(); if(c) - connect(c,TQT_SIGNAL(contactDestroyed( Kopete::Contact* )),this,TQT_SLOT(discard())); + connect(c,TQ_SIGNAL(contactDestroyed( Kopete::Contact* )),this,TQ_SLOT(discard())); } MessageEvent::~MessageEvent() diff --git a/kopete/libkopete/kopetemessagehandler.cpp b/kopete/libkopete/kopetemessagehandler.cpp index 01dd6af5..34bc9f0f 100644 --- a/kopete/libkopete/kopetemessagehandler.cpp +++ b/kopete/libkopete/kopetemessagehandler.cpp @@ -56,7 +56,7 @@ int MessageHandler::capabilities() void MessageHandler::handleMessageInternal( MessageEvent *event ) { - connect( event, TQT_SIGNAL( accepted(Kopete::MessageEvent*) ), this, TQT_SLOT( messageAccepted(Kopete::MessageEvent*) ) ); + connect( event, TQ_SIGNAL( accepted(Kopete::MessageEvent*) ), this, TQ_SLOT( messageAccepted(Kopete::MessageEvent*) ) ); handleMessage( event ); } @@ -67,7 +67,7 @@ void MessageHandler::handleMessage( MessageEvent *event ) void MessageHandler::messageAccepted( MessageEvent *event ) { - disconnect( event, TQT_SIGNAL( accepted(Kopete::MessageEvent*) ), this, TQT_SLOT( messageAccepted(Kopete::MessageEvent*) ) ); + disconnect( event, TQ_SIGNAL( accepted(Kopete::MessageEvent*) ), this, TQ_SLOT( messageAccepted(Kopete::MessageEvent*) ) ); d->next->handleMessageInternal( event ); } diff --git a/kopete/libkopete/kopetemessagehandlerchain.cpp b/kopete/libkopete/kopetemessagehandlerchain.cpp index 26def158..42ab4cc1 100644 --- a/kopete/libkopete/kopetemessagehandlerchain.cpp +++ b/kopete/libkopete/kopetemessagehandlerchain.cpp @@ -151,8 +151,8 @@ public: ProcessMessageTask::ProcessMessageTask( MessageHandlerChain::Ptr chain, MessageEvent *event ) : d( new Private(chain, event) ) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotStart() ) ); - connect( event, TQT_SIGNAL( done( Kopete::MessageEvent* ) ), this, TQT_SLOT( slotDone() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotStart() ) ); + connect( event, TQ_SIGNAL( done( Kopete::MessageEvent* ) ), this, TQ_SLOT( slotDone() ) ); event->message().manager()->ref(); } diff --git a/kopete/libkopete/kopetemetacontact.cpp b/kopete/libkopete/kopetemetacontact.cpp index 18794350..d77c79eb 100644 --- a/kopete/libkopete/kopetemetacontact.cpp +++ b/kopete/libkopete/kopetemetacontact.cpp @@ -101,18 +101,18 @@ MetaContact::MetaContact() { d = new Private; - connect( this, TQT_SIGNAL( pluginDataChanged() ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( iconChanged( Kopete::ContactListElement::IconState, const TQString & ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( useCustomIconChanged( bool ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( movedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( contactAdded( Kopete::Contact * ) ), TQT_SIGNAL( persistentDataChanged() ) ); - connect( this, TQT_SIGNAL( contactRemoved( Kopete::Contact * ) ), TQT_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( pluginDataChanged() ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( iconChanged( Kopete::ContactListElement::IconState, const TQString & ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( useCustomIconChanged( bool ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( displayNameChanged( const TQString &, const TQString & ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( movedToGroup( Kopete::MetaContact *, Kopete::Group *, Kopete::Group * ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( removedFromGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( addedToGroup( Kopete::MetaContact *, Kopete::Group * ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( contactAdded( Kopete::Contact * ) ), TQ_SIGNAL( persistentDataChanged() ) ); + connect( this, TQ_SIGNAL( contactRemoved( Kopete::Contact * ) ), TQ_SIGNAL( persistentDataChanged() ) ); // Update the KABC picture when the KDE Address book change. - connect(KABCPersistence::self()->addressBook(), TQT_SIGNAL(addressBookChanged(AddressBook *)), this, TQT_SLOT(slotUpdateAddressBookPicture())); + connect(KABCPersistence::self()->addressBook(), TQ_SIGNAL(addressBookChanged(AddressBook *)), this, TQ_SLOT(slotUpdateAddressBookPicture())); // make sure MetaContact is at least in one group addToGroup( Group::topLevel() ); @@ -135,17 +135,17 @@ void MetaContact::addContact( Contact *c ) { d->contacts.append( c ); - connect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + connect( c, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); - connect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + connect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; - connect( c, TQT_SIGNAL( contactDestroyed( Kopete::Contact * ) ), - this, TQT_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); + connect( c, TQ_SIGNAL( contactDestroyed( Kopete::Contact * ) ), + this, TQ_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); - connect( c, TQT_SIGNAL( idleStateChanged( Kopete::Contact * ) ), - this, TQT_SIGNAL( contactIdleStateChanged( Kopete::Contact * ) ) ); + connect( c, TQ_SIGNAL( idleStateChanged( Kopete::Contact * ) ), + this, TQ_SIGNAL( contactIdleStateChanged( Kopete::Contact * ) ) ); emit contactAdded(c); @@ -258,14 +258,14 @@ void MetaContact::removeContact(Contact *c, bool deleted) if(!deleted) { //If this function is tell by slotContactRemoved, c is maybe just a TQObject - disconnect( c, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); - disconnect( c, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), - this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; - disconnect( c, TQT_SIGNAL( contactDestroyed( Kopete::Contact * ) ), - this, TQT_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); - disconnect( c, TQT_SIGNAL( idleStateChanged( Kopete::Contact * ) ), - this, TQT_SIGNAL( contactIdleStateChanged( Kopete::Contact *) ) ); + disconnect( c, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + disconnect( c, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ), + this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ; + disconnect( c, TQ_SIGNAL( contactDestroyed( Kopete::Contact * ) ), + this, TQ_SLOT( slotContactDestroyed( Kopete::Contact * ) ) ); + disconnect( c, TQ_SIGNAL( idleStateChanged( Kopete::Contact * ) ), + this, TQ_SIGNAL( contactIdleStateChanged( Kopete::Contact *) ) ); kdDebug( 14010 ) << k_funcinfo << "Contact disconnected" << endl; @@ -1215,16 +1215,16 @@ bool MetaContact::fromXML( const TQDomElement& element ) } // If a plugin is loaded, load data cached - connect( Kopete::PluginManager::self(), TQT_SIGNAL( pluginLoaded(Kopete::Plugin*) ), - this, TQT_SLOT( slotPluginLoaded(Kopete::Plugin*) ) ); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( pluginLoaded(Kopete::Plugin*) ), + this, TQ_SLOT( slotPluginLoaded(Kopete::Plugin*) ) ); // All plugins are already loaded, call manually the contact setting slot. if( Kopete::PluginManager::self()->isAllPluginsLoaded() ) slotAllPluginsLoaded(); else // When all plugins are loaded, set the source contact. - connect( Kopete::PluginManager::self(), TQT_SIGNAL( allPluginsLoaded() ), - this, TQT_SLOT( slotAllPluginsLoaded() ) ); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( allPluginsLoaded() ), + this, TQ_SLOT( slotAllPluginsLoaded() ) ); // track changes only works if ONE Contact is inside the MetaContact // if (d->contacts.count() > 1) // Does NOT work as intended diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp index 515a9ec1..9c260c48 100644 --- a/kopete/libkopete/kopeteonlinestatusmanager.cpp +++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp @@ -69,7 +69,7 @@ OnlineStatusManager::OnlineStatusManager() { d->iconCache.setAutoDelete( true ); d->nullPixmap = new TQPixmap; - connect( kapp, TQT_SIGNAL( iconChanged(int) ), this, TQT_SLOT( slotIconsChanged() ) ); + connect( kapp, TQ_SIGNAL( iconChanged(int) ), this, TQ_SLOT( slotIconsChanged() ) ); } OnlineStatusManager::~OnlineStatusManager() @@ -393,14 +393,14 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , TDEActi if(options & OnlineStatusManager::HasAwayMessage) { action = new AwayAction( status, caption, status.iconFor(account), 0, account, - TQT_SLOT( setOnlineStatus( const Kopete::OnlineStatus&, const TQString& ) ), + TQ_SLOT( setOnlineStatus( const Kopete::OnlineStatus&, const TQString& ) ), account, actionName ); } else { action=new OnlineStatusAction( status, caption, status.iconFor(account) , account, actionName ); - connect(action,TQT_SIGNAL(activated(const Kopete::OnlineStatus&)) , - account, TQT_SLOT(setOnlineStatus(const Kopete::OnlineStatus&))); + connect(action,TQ_SIGNAL(activated(const Kopete::OnlineStatus&)) , + account, TQ_SLOT(setOnlineStatus(const Kopete::OnlineStatus&))); } } @@ -420,7 +420,7 @@ void OnlineStatusManager::createAccountStatusActions( Account *account , TDEActi OnlineStatusAction::OnlineStatusAction( const OnlineStatus& status, const TQString &text, const TQIconSet &pix, TQObject *parent, const char *name) : TDEAction( text, pix, TDEShortcut() , parent, name) , m_status(status) { - connect(this,TQT_SIGNAL(activated()),this,TQT_SLOT(slotActivated())); + connect(this,TQ_SIGNAL(activated()),this,TQ_SLOT(slotActivated())); } void OnlineStatusAction::slotActivated() diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 82180866..ebfddee3 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -92,7 +92,7 @@ public: void begin() { kdDebug( 14010 ) << k_funcinfo << endl; - Kopete::WalletManager::self()->openWallet( this, TQT_SLOT( walletReceived( TDEWallet::Wallet* ) ) ); + Kopete::WalletManager::self()->openWallet( this, TQ_SLOT( walletReceived( TDEWallet::Wallet* ) ) ); } void walletReceived( TDEWallet::Wallet *wallet ) @@ -198,9 +198,9 @@ public: mView->adjustSize(); passwdDialog->adjustSize(); - connect( passwdDialog, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotOkPressed() ) ); - connect( passwdDialog, TQT_SIGNAL( cancelClicked() ), TQT_SLOT( slotCancelPressed() ) ); - connect( this, TQT_SIGNAL( destroyed() ), passwdDialog, TQT_SLOT( deleteLater() ) ); + connect( passwdDialog, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotOkPressed() ) ); + connect( passwdDialog, TQ_SIGNAL( cancelClicked() ), TQ_SLOT( slotCancelPressed() ) ); + connect( this, TQ_SIGNAL( destroyed() ), passwdDialog, TQ_SLOT( deleteLater() ) ); passwdDialog->show(); } @@ -455,14 +455,14 @@ void Kopete::Password::requestWithoutPrompt( TQObject *returnObj, const char *sl { KopetePasswordRequest *request = new KopetePasswordGetRequestNoPrompt( returnObj, *this ); // call connect on returnObj so we can still connect if 'slot' is protected/private - returnObj->connect( request, TQT_SIGNAL( requestFinished( const TQString & ) ), slot ); + returnObj->connect( request, TQ_SIGNAL( requestFinished( const TQString & ) ), slot ); request->begin(); } void Kopete::Password::request( TQObject *returnObj, const char *slot, const TQPixmap &image, const TQString &prompt, Kopete::Password::PasswordSource source ) { KopetePasswordRequest *request = new KopetePasswordGetRequestPrompt( returnObj, *this, image, prompt, source ); - returnObj->connect( request, TQT_SIGNAL( requestFinished( const TQString & ) ), slot ); + returnObj->connect( request, TQ_SIGNAL( requestFinished( const TQString & ) ), slot ); request->begin(); } diff --git a/kopete/libkopete/kopetepasswordedaccount.cpp b/kopete/libkopete/kopetepasswordedaccount.cpp index 0eeca86c..fe349f90 100644 --- a/kopete/libkopete/kopetepasswordedaccount.cpp +++ b/kopete/libkopete/kopetepasswordedaccount.cpp @@ -74,7 +74,7 @@ void Kopete::PasswordedAccount::connect( const Kopete::OnlineStatus& initialStat TQString prompt = passwordPrompt(); Kopete::Password::PasswordSource src = password().isWrong() ? Kopete::Password::FromUser : Kopete::Password::FromConfigOrUser; - password().request( this, TQT_SLOT( connectWithPassword( const TQString & ) ), accountIcon( Kopete::Password::preferredImageSize() ), prompt, src ); + password().request( this, TQ_SLOT( connectWithPassword( const TQString & ) ), accountIcon( Kopete::Password::preferredImageSize() ), prompt, src ); } TQString Kopete::PasswordedAccount::passwordPrompt() diff --git a/kopete/libkopete/kopeteplugin.cpp b/kopete/libkopete/kopeteplugin.cpp index 0e83498a..99c95fba 100644 --- a/kopete/libkopete/kopeteplugin.cpp +++ b/kopete/libkopete/kopeteplugin.cpp @@ -36,7 +36,7 @@ Plugin::Plugin( TDEInstance *instance, TQObject *parent, const char *name ) : TQObject( parent, name ), KXMLGUIClient(), d(new Private) { setInstance( instance ); - KSettings::Dispatcher::self()->registerInstance( instance, this, TQT_SIGNAL( settingsChanged() ) ); + KSettings::Dispatcher::self()->registerInstance( instance, this, TQ_SIGNAL( settingsChanged() ) ); } Plugin::~Plugin() diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 986cd84e..22ea8c63 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -205,7 +205,7 @@ void PluginManager::shutdown() kdDebug(14010) << k_funcinfo << "Running under valgrind, disabling plugin unload timeout guard" << endl; else #endif - TQTimer::singleShot( 3000, this, TQT_SLOT( slotShutdownTimeout() ) ); + TQTimer::singleShot( 3000, this, TQ_SLOT( slotShutdownTimeout() ) ); } void PluginManager::slotPluginReadyForUnload() @@ -311,7 +311,7 @@ void PluginManager::loadAllPlugins() } } // Schedule the plugins to load - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } void PluginManager::slotLoadNextPlugin() @@ -334,7 +334,7 @@ void PluginManager::slotLoadNextPlugin() // allPluginsLoaded() signal's handling. This has the added benefit that // the signal is delayed one event loop, so the accounts are more likely // to be instantiated. - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); } Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mode /* = LoadSync */ ) @@ -356,7 +356,7 @@ Plugin * PluginManager::loadPlugin( const TQString &_pluginId, PluginLoadMode mo else { d->pluginsToLoad.push( pluginId ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotLoadNextPlugin() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotLoadNextPlugin() ) ); return 0L; } } @@ -384,8 +384,8 @@ Plugin *PluginManager::loadPluginInternal( const TQString &pluginId ) d->loadedPlugins.insert( info, plugin ); info->setPluginEnabled( true ); - connect( plugin, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( slotPluginDestroyed( TQObject * ) ) ); - connect( plugin, TQT_SIGNAL( readyForUnload() ), this, TQT_SLOT( slotPluginReadyForUnload() ) ); + connect( plugin, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( slotPluginDestroyed( TQObject * ) ) ); + connect( plugin, TQ_SIGNAL( readyForUnload() ), this, TQ_SLOT( slotPluginReadyForUnload() ) ); kdDebug( 14010 ) << k_funcinfo << "Successfully loaded plugin '" << pluginId << "'" << endl; @@ -454,7 +454,7 @@ void PluginManager::slotPluginDestroyed( TQObject *plugin ) { // Use a timer to make sure any pending deleteLater() calls have // been handled first - TQTimer::singleShot( 0, this, TQT_SLOT( slotShutdownDone() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotShutdownDone() ) ); } } diff --git a/kopete/libkopete/kopeteprotocol.cpp b/kopete/libkopete/kopeteprotocol.cpp index 6a2d3279..db40cced 100644 --- a/kopete/libkopete/kopeteprotocol.cpp +++ b/kopete/libkopete/kopeteprotocol.cpp @@ -99,8 +99,8 @@ void Protocol::slotAccountOnlineStatusChanged( Contact *self ) // some protocols change status several times during shutdown. We should only call deleteLater() once disconnect( self, 0, this, 0 ); - connect( self->account(), TQT_SIGNAL(accountDestroyed(const Kopete::Account* )), - this, TQT_SLOT( slotAccountDestroyed( ) ) ); + connect( self->account(), TQ_SIGNAL(accountDestroyed(const Kopete::Account* )), + this, TQ_SLOT( slotAccountDestroyed( ) ) ); self->account()->deleteLater(); } @@ -136,8 +136,8 @@ void Protocol::aboutToUnload() " is still connected, disconnecting..." << endl; TQObject::connect( it.current()->myself(), - TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT( slotAccountOnlineStatusChanged( Kopete::Contact * ) ) ); + TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT( slotAccountOnlineStatusChanged( Kopete::Contact * ) ) ); it.current()->disconnect(); } else @@ -146,8 +146,8 @@ void Protocol::aboutToUnload() kdDebug( 14010 ) << k_funcinfo << it.current()->accountId() << " is already disconnected, deleting..." << endl; - TQObject::connect( it.current(), TQT_SIGNAL( accountDestroyed( const Kopete::Account* ) ), - this, TQT_SLOT( slotAccountDestroyed( ) ) ); + TQObject::connect( it.current(), TQ_SIGNAL( accountDestroyed( const Kopete::Account* ) ), + this, TQ_SLOT( slotAccountDestroyed( ) ) ); it.current()->deleteLater(); } } diff --git a/kopete/libkopete/kopetesimplemessagehandler.cpp b/kopete/libkopete/kopetesimplemessagehandler.cpp index 57677314..0c3722ba 100644 --- a/kopete/libkopete/kopetesimplemessagehandler.cpp +++ b/kopete/libkopete/kopetesimplemessagehandler.cpp @@ -55,7 +55,7 @@ MessageHandler *SimpleMessageHandlerFactory::create( ChatSession */*manager*/, M if ( direction != d->direction ) return 0; MessageHandler *handler = new SimpleMessageHandler; - TQObject::connect( handler, TQT_SIGNAL( handle( Kopete::Message & ) ), d->target, d->slot ); + TQObject::connect( handler, TQ_SIGNAL( handle( Kopete::Message & ) ), d->target, d->slot ); return handler; } diff --git a/kopete/libkopete/kopetetask.cpp b/kopete/libkopete/kopetetask.cpp index 472fd1f1..73b75c08 100644 --- a/kopete/libkopete/kopetetask.cpp +++ b/kopete/libkopete/kopetetask.cpp @@ -72,18 +72,18 @@ void Task::abort( int flags ) void Task::addSubtask( Task *task ) { d->subtasks.append( task ); - connect( task, TQT_SIGNAL( result( Kopete::Task* ) ), - this, TQT_SLOT( slotResult( Kopete::Task* ) ) ); - connect( task, TQT_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ), - this, TQT_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ) ); + connect( task, TQ_SIGNAL( result( Kopete::Task* ) ), + this, TQ_SLOT( slotResult( Kopete::Task* ) ) ); + connect( task, TQ_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ), + this, TQ_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ) ); } void Task::removeSubtask( Task *task, RemoveSubtaskIfLast actionIfLast ) { - disconnect( task, TQT_SIGNAL( result( Kopete::Task* ) ), - this, TQT_SLOT( slotResult( Kopete::Task* ) ) ); - disconnect( task, TQT_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ), - this, TQT_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ) ); + disconnect( task, TQ_SIGNAL( result( Kopete::Task* ) ), + this, TQ_SLOT( slotResult( Kopete::Task* ) ) ); + disconnect( task, TQ_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ), + this, TQ_SIGNAL( statusMessage( Kopete::Task*, const TQString & ) ) ); d->subtasks.remove( task ); if ( d->subtasks.isEmpty() && actionIfLast == IfLastEmitResult ) emitResult( task->succeeded() ? ResultSucceeded : ResultFailed, task->errorString() ); diff --git a/kopete/libkopete/kopetetask.h b/kopete/libkopete/kopetetask.h index 34151df1..9ba9daa8 100644 --- a/kopete/libkopete/kopetetask.h +++ b/kopete/libkopete/kopetetask.h @@ -29,8 +29,8 @@ namespace Kopete * * \code * Kopete::Task *task = someobject->someoperation( some parameters ); - * connect( task, TQT_SIGNAL( result( Kopete::Task * ) ), - * this, TQT_SLOT( slotResult( Kopete::Task * ) ) ); + * connect( task, TQ_SIGNAL( result( Kopete::Task * ) ), + * this, TQ_SLOT( slotResult( Kopete::Task * ) ) ); * \endcode * (other connects, specific to the job) * diff --git a/kopete/libkopete/kopetetransfermanager.cpp b/kopete/libkopete/kopetetransfermanager.cpp index 1df5b7c7..7738664b 100644 --- a/kopete/libkopete/kopetetransfermanager.cpp +++ b/kopete/libkopete/kopetetransfermanager.cpp @@ -72,7 +72,7 @@ void Kopete::Transfer::init( const KURL &target, bool showProgressInfo ) if( showProgressInfo ) Observer::self()->slotCopying( this, sourceURL(), destinationURL() ); - connect( this, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( slotResultEmitted() ) ); + connect( this, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( slotResultEmitted() ) ); setAutoErrorHandlingEnabled( true, 0 ); } @@ -169,7 +169,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac nextID++; Kopete::FileTransferInfo info(contact, file, size, recipient,di, nextID); Kopete::Transfer *trans = new Kopete::Transfer(info, contact); - connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); + connect(trans, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(nextID, trans); return trans; } @@ -177,7 +177,7 @@ Kopete::Transfer* Kopete::TransferManager::addTransfer( Kopete::Contact *contac void Kopete::TransferManager::slotAccepted(const Kopete::FileTransferInfo& info, const TQString& filename) { Kopete::Transfer *trans = new Kopete::Transfer(info, filename); - connect(trans, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotComplete(TDEIO::Job *))); + connect(trans, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotComplete(TDEIO::Job *))); mTransfersMap.insert(info.transferId(), trans); emit accepted(trans,filename); } @@ -194,8 +194,8 @@ int Kopete::TransferManager::askIncomingTransfer( Kopete::Contact *contact, con //FIXME!!! this will not be deleted if it's still open when kopete exits KopeteFileConfirmDialog *diag= new KopeteFileConfirmDialog(info, description , 0 ) ; - connect( diag, TQT_SIGNAL( accepted(const Kopete::FileTransferInfo&, const TQString&)) , this, TQT_SLOT( slotAccepted(const Kopete::FileTransferInfo&, const TQString&) ) ); - connect( diag, TQT_SIGNAL( refused(const Kopete::FileTransferInfo&)) , this, TQT_SIGNAL( refused(const Kopete::FileTransferInfo&) ) ); + connect( diag, TQ_SIGNAL( accepted(const Kopete::FileTransferInfo&, const TQString&)) , this, TQ_SLOT( slotAccepted(const Kopete::FileTransferInfo&, const TQString&) ) ); + connect( diag, TQ_SIGNAL( refused(const Kopete::FileTransferInfo&)) , this, TQ_SIGNAL( refused(const Kopete::FileTransferInfo&) ) ); diag->show(); return nextID; } @@ -260,9 +260,9 @@ void Kopete::TransferManager::sendFile( const KURL &file, const TQString &fname, } else { - connect( this, TQT_SIGNAL(sendFile(const KURL&, const TQString&, unsigned int)), sendTo, slot ); + connect( this, TQ_SIGNAL(sendFile(const KURL&, const TQString&, unsigned int)), sendTo, slot ); emit sendFile( url, filename, size ); - disconnect( this, TQT_SIGNAL(sendFile(const KURL&, const TQString&, unsigned int)), sendTo, slot ); + disconnect( this, TQ_SIGNAL(sendFile(const KURL&, const TQString&, unsigned int)), sendTo, slot ); } } } diff --git a/kopete/libkopete/kopeteutils.cpp b/kopete/libkopete/kopeteutils.cpp index f5cd0b2e..0684d183 100644 --- a/kopete/libkopete/kopeteutils.cpp +++ b/kopete/libkopete/kopeteutils.cpp @@ -60,8 +60,8 @@ void notify( TQPixmap pic, const TQString &eventid, const TQString &caption, con info.debugInfo = debugInfo; NotifyHelper::self()->registerNotification(n, info); - TQObject::connect( n, TQT_SIGNAL(activated(unsigned int )) , NotifyHelper::self() , TQT_SLOT( slotEventActivated(unsigned int) ) ); - TQObject::connect( n, TQT_SIGNAL(closed()) , NotifyHelper::self() , TQT_SLOT( slotEventClosed() ) ); + TQObject::connect( n, TQ_SIGNAL(activated(unsigned int )) , NotifyHelper::self() , TQ_SLOT( slotEventActivated(unsigned int) ) ); + TQObject::connect( n, TQ_SIGNAL(closed()) , NotifyHelper::self() , TQ_SLOT( slotEventClosed() ) ); } void notifyConnectionLost( const Account *account, const TQString &caption, const TQString &message, const TQString &explanation, const TQString &debugInfo ) diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index 1ae97a48..679970cb 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -77,8 +77,8 @@ void Kopete::WalletManager::openWallet( TQObject *object, const char *slot ) if ( !d->signal ) d->signal = new KopeteWalletSignal; // allow connecting to protected slots by calling object->connect - connect( d->signal, TQT_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), object, slot ); - //object->connect( d->signal, TQT_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), slot ); + connect( d->signal, TQ_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), object, slot ); + //object->connect( d->signal, TQ_SIGNAL( walletOpened( TDEWallet::Wallet* ) ), slot ); openWalletInner(); } @@ -92,7 +92,7 @@ void Kopete::WalletManager::openWalletInner() if ( d->wallet->isOpen() ) { kdDebug(14010) << k_funcinfo << " wallet already open" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT( slotGiveExistingWallet() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotGiveExistingWallet() ) ); } else { @@ -107,7 +107,7 @@ void Kopete::WalletManager::openWalletInner() d->wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), mainWindowID(), TDEWallet::Wallet::Asynchronous ); - connect( d->wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( slotWalletChangedStatus() ) ); + connect( d->wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( slotWalletChangedStatus() ) ); } void Kopete::WalletManager::slotWalletChangedStatus() @@ -122,7 +122,7 @@ void Kopete::WalletManager::slotWalletChangedStatus() if ( d->wallet->setFolder( TQString::fromLatin1( "Kopete" ) ) ) { // success! - TQObject::connect( d->wallet, TQT_SIGNAL( walletClosed() ), this, TQT_SLOT( closeWallet() ) ); + TQObject::connect( d->wallet, TQ_SIGNAL( walletClosed() ), this, TQ_SLOT( closeWallet() ) ); } else { diff --git a/kopete/libkopete/managedconnectionaccount.cpp b/kopete/libkopete/managedconnectionaccount.cpp index 7d2d02f6..0e548da1 100644 --- a/kopete/libkopete/managedconnectionaccount.cpp +++ b/kopete/libkopete/managedconnectionaccount.cpp @@ -27,8 +27,8 @@ namespace Kopete ManagedConnectionAccount::ManagedConnectionAccount( Protocol *parent, const TQString &acctId, uint maxPasswordLength, const char *name ) : PasswordedAccount( parent, acctId, maxPasswordLength, name ), m_waitingForConnection( false ) { - TQObject::connect( ConnectionManager::self(), TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus ) ), - TQT_SLOT(slotConnectionStatusChanged(const TQString&, NetworkStatus::EnumStatus ) ) ); + TQObject::connect( ConnectionManager::self(), TQ_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus ) ), + TQ_SLOT(slotConnectionStatusChanged(const TQString&, NetworkStatus::EnumStatus ) ) ); } void ManagedConnectionAccount::connectWithPassword( const TQString &password ) diff --git a/kopete/libkopete/private/kopetecommand.cpp b/kopete/libkopete/private/kopetecommand.cpp index 7a21c5ed..acaca77c 100644 --- a/kopete/libkopete/private/kopetecommand.cpp +++ b/kopete/libkopete/private/kopetecommand.cpp @@ -47,11 +47,11 @@ void Kopete::Command::init( const TQString &command, const char* slot, const TQS if( m_type == Kopete::CommandHandler::Normal ) { - TQObject::connect( this, TQT_SIGNAL( handleCommand( const TQString &, Kopete::ChatSession *) ), + TQObject::connect( this, TQ_SIGNAL( handleCommand( const TQString &, Kopete::ChatSession *) ), parent(), slot ); } - TQObject::connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotAction() ) ); + TQObject::connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotAction() ) ); } void Kopete::Command::slotAction() diff --git a/kopete/libkopete/private/kopeteemoticons.cpp b/kopete/libkopete/private/kopeteemoticons.cpp index 996fb2e2..ed0bdf5d 100644 --- a/kopete/libkopete/private/kopeteemoticons.cpp +++ b/kopete/libkopete/private/kopeteemoticons.cpp @@ -278,7 +278,7 @@ Emoticons::Emoticons( const TQString &theme ) : TQObject( kapp, "KopeteEmoticons if(theme.isNull()) { initEmoticons(); - connect( KopetePrefs::prefs(), TQT_SIGNAL(saved()), this, TQT_SLOT(initEmoticons()) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL(saved()), this, TQ_SLOT(initEmoticons()) ); } else { diff --git a/kopete/libkopete/private/kopeteviewmanager.cpp b/kopete/libkopete/private/kopeteviewmanager.cpp index 1c59b9a3..966bbf38 100644 --- a/kopete/libkopete/private/kopeteviewmanager.cpp +++ b/kopete/libkopete/private/kopeteviewmanager.cpp @@ -73,13 +73,13 @@ KopeteViewManager::KopeteViewManager() d->activeView = 0L; d->foreignMessage=false; - connect( KopetePrefs::prefs(), TQT_SIGNAL( saved() ), this, TQT_SLOT( slotPrefsChanged() ) ); + connect( KopetePrefs::prefs(), TQ_SIGNAL( saved() ), this, TQ_SLOT( slotPrefsChanged() ) ); - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL( display( Kopete::Message &, Kopete::ChatSession *) ), - this, TQT_SLOT ( messageAppended( Kopete::Message &, Kopete::ChatSession *) ) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL( display( Kopete::Message &, Kopete::ChatSession *) ), + this, TQ_SLOT ( messageAppended( Kopete::Message &, Kopete::ChatSession *) ) ); - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL( readMessage() ), - this, TQT_SLOT ( nextEvent() ) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL( readMessage() ), + this, TQ_SLOT ( nextEvent() ) ); slotPrefsChanged(); } @@ -141,8 +141,8 @@ KopeteView *KopeteViewManager::view( Kopete::ChatSession* session, const TQStrin d->foreignMessage = false; d->managerMap.insert( session, newView ); - connect( session, TQT_SIGNAL( closing(Kopete::ChatSession *) ), - this, TQT_SLOT(slotChatSessionDestroyed(Kopete::ChatSession*)) ); + connect( session, TQ_SIGNAL( closing(Kopete::ChatSession *) ), + this, TQ_SLOT(slotChatSessionDestroyed(Kopete::ChatSession*)) ); return newView; } @@ -192,7 +192,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi { Kopete::MessageEvent *event=new Kopete::MessageEvent(msg,manager); d->eventList.append( event ); - connect(event, TQT_SIGNAL(done(Kopete::MessageEvent *)), this, TQT_SLOT(slotEventDeleted(Kopete::MessageEvent *))); + connect(event, TQ_SIGNAL(done(Kopete::MessageEvent *)), this, TQ_SLOT(slotEventDeleted(Kopete::MessageEvent *))); Kopete::ChatSessionManager::self()->postNewEvent(event); } } @@ -239,7 +239,7 @@ void KopeteViewManager::messageAppended( Kopete::Message &msg, Kopete::ChatSessi KNotification *notify=KNotification::event(msg.from()->metaContact() , event, body.arg( TQStyleSheet::escape(msgFrom), TQStyleSheet::escape(msgText) ), 0, /*msg.from()->metaContact(),*/ w , i18n("View") ); - connect(notify,TQT_SIGNAL(activated(unsigned int )), manager , TQT_SLOT(raiseView()) ); + connect(notify,TQ_SIGNAL(activated(unsigned int )), manager , TQ_SLOT(raiseView()) ); } } } diff --git a/kopete/libkopete/tdeabcpersistence.cpp b/kopete/libkopete/tdeabcpersistence.cpp index 1fc46098..0e23b0a6 100644 --- a/kopete/libkopete/tdeabcpersistence.cpp +++ b/kopete/libkopete/tdeabcpersistence.cpp @@ -178,7 +178,7 @@ void KABCPersistence::writeAddressBook( const TDEABC::Resource * res) if ( !s_addrBookWritePending ) { s_addrBookWritePending = true; - TQTimer::singleShot( 2000, this, TQT_SLOT( slotWriteAddressBook() ) ); + TQTimer::singleShot( 2000, this, TQ_SLOT( slotWriteAddressBook() ) ); } } diff --git a/kopete/libkopete/tests/kopetepasswordtest_program.cpp b/kopete/libkopete/tests/kopetepasswordtest_program.cpp index 42649d74..b53394b3 100644 --- a/kopete/libkopete/tests/kopetepasswordtest_program.cpp +++ b/kopete/libkopete/tests/kopetepasswordtest_program.cpp @@ -45,9 +45,9 @@ using namespace Kopete; TQString retrieve( Password &pwd, const TQPixmap &image, const TQString &prompt ) { PasswordRetriever r; - pwd.request( &r, TQT_SLOT( gotPassword( const TQString & ) ), image, prompt ); + pwd.request( &r, TQ_SLOT( gotPassword( const TQString & ) ), image, prompt ); TQTimer tmr; - r.connect( &tmr, TQT_SIGNAL( timeout() ), TQT_SLOT( timer() ) ); + r.connect( &tmr, TQ_SIGNAL( timeout() ), TQ_SLOT( timer() ) ); tmr.start( 1000 ); tqApp->exec(); return r.password; @@ -112,7 +112,7 @@ int main( int argc, char *argv[] ) // without this, setting passwords will fail since they're // set asynchronously. - TQTimer::singleShot( 0, &app, TQT_SLOT( deref() ) ); + TQTimer::singleShot( 0, &app, TQ_SLOT( deref() ) ); app.exec(); if ( setPassword ) diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index a8ea1fd8..f127ba26 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -38,7 +38,7 @@ void closeWallet() void delay() { - TQTimer::singleShot( 3000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 3000, tqApp, TQ_SLOT( quit() ) ); tqApp->exec(); } @@ -46,7 +46,7 @@ void openWalletAsync() { WalletReciever *r = new WalletReciever; _out << "[ASYNC] About to open wallet, receiver: " << r << endl; - Kopete::WalletManager::self()->openWallet( r, TQT_SLOT( gotWallet( TDEWallet::Wallet* ) ) ); + Kopete::WalletManager::self()->openWallet( r, TQ_SLOT( gotWallet( TDEWallet::Wallet* ) ) ); } void WalletReciever::gotWallet( TDEWallet::Wallet *w ) @@ -85,11 +85,11 @@ int main( int argc, char *argv[] ) WalletReciever *r = new WalletReciever; TQTimer timer; - r->connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( timer() ) ); + r->connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( timer() ) ); timer.start( 1000 ); _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) ); return tqApp->exec(); } diff --git a/kopete/libkopete/ui/accountselector.cpp b/kopete/libkopete/ui/accountselector.cpp index 8340e98b..1c40302c 100644 --- a/kopete/libkopete/ui/accountselector.cpp +++ b/kopete/libkopete/ui/accountselector.cpp @@ -119,8 +119,8 @@ void AccountSelector::initUI() } } - connect(d->lv, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem *))); + connect(d->lv, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem *))); } diff --git a/kopete/libkopete/ui/addressbooklinkwidget.cpp b/kopete/libkopete/ui/addressbooklinkwidget.cpp index 80f9fba5..638f095b 100644 --- a/kopete/libkopete/ui/addressbooklinkwidget.cpp +++ b/kopete/libkopete/ui/addressbooklinkwidget.cpp @@ -41,8 +41,8 @@ namespace UI { AddressBookLinkWidget::AddressBookLinkWidget( TQWidget * parent, const char * name ) : AddressBookLinkWidgetBase( parent, name ), mMetaContact( 0 ) { btnClear->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? TQString::fromLatin1( "locationbar_erase" ) : TQString::fromLatin1( "clear_left") ) ); - connect( btnClear, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotClearAddressee() ) ); - connect( btnSelectAddressee, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSelectAddressee() ) ); + connect( btnClear, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearAddressee() ) ); + connect( btnSelectAddressee, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSelectAddressee() ) ); } void AddressBookLinkWidget::setAddressee( const TDEABC::Addressee& addr ) diff --git a/kopete/libkopete/ui/addressbookselectordialog.cpp b/kopete/libkopete/ui/addressbookselectordialog.cpp index a63e15a2..6af9d64f 100644 --- a/kopete/libkopete/ui/addressbookselectordialog.cpp +++ b/kopete/libkopete/ui/addressbookselectordialog.cpp @@ -42,7 +42,7 @@ AddressBookSelectorDialog::AddressBookSelectorDialog(const TQString &title, cons enableButtonOK(false); //setHelp("linkaddressbook"); - connect(m_addressBookSelectorWidget, TQT_SIGNAL(addresseeListClicked( TQListViewItem * )), TQT_SLOT(slotWidgetAddresseeListClicked( TQListViewItem * ))); + connect(m_addressBookSelectorWidget, TQ_SIGNAL(addresseeListClicked( TQListViewItem * )), TQ_SLOT(slotWidgetAddresseeListClicked( TQListViewItem * ))); if ( !preSelectUid.isEmpty() ) m_addressBookSelectorWidget->selectAddressee(preSelectUid); diff --git a/kopete/libkopete/ui/addressbookselectorwidget.cpp b/kopete/libkopete/ui/addressbookselectorwidget.cpp index 4f12bfab..bb46107b 100644 --- a/kopete/libkopete/ui/addressbookselectorwidget.cpp +++ b/kopete/libkopete/ui/addressbookselectorwidget.cpp @@ -60,17 +60,17 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch m_addressBook = Kopete::KABCPersistence::self()->addressBook(); // Addressee validation connections - connect( addAddresseeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddAddresseeClicked() ) ); - connect( addAddresseeButton, TQT_SIGNAL( clicked() ), TQT_SIGNAL( addAddresseeClicked() ) ); - - connect( addresseeListView, TQT_SIGNAL( clicked(TQListViewItem * ) ), - TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); - connect( addresseeListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); - connect( addresseeListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), - TQT_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); + connect( addAddresseeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddAddresseeClicked() ) ); + connect( addAddresseeButton, TQ_SIGNAL( clicked() ), TQ_SIGNAL( addAddresseeClicked() ) ); + + connect( addresseeListView, TQ_SIGNAL( clicked(TQListViewItem * ) ), + TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); + connect( addresseeListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); + connect( addresseeListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), + TQ_SIGNAL( addresseeListClicked( TQListViewItem * ) ) ); - connect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) ); + connect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) ); //We should add a clear TDEAction here. But we can't really do that with a designer file :\ this sucks @@ -86,7 +86,7 @@ AddressBookSelectorWidget::AddressBookSelectorWidget( TQWidget *parent, const ch AddressBookSelectorWidget::~AddressBookSelectorWidget() { - disconnect( m_addressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( slotLoadAddressees() ) ); + disconnect( m_addressBook, TQ_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQ_SLOT( slotLoadAddressees() ) ); } diff --git a/kopete/libkopete/ui/contactaddednotifydialog.cpp b/kopete/libkopete/ui/contactaddednotifydialog.cpp index 642a8be3..be8ce604 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.cpp +++ b/kopete/libkopete/ui/contactaddednotifydialog.cpp @@ -102,10 +102,10 @@ ContactAddedNotifyDialog::ContactAddedNotifyDialog(const TQString& contactId, } d->widget->m_groupList->setCurrentText(TQString()); //default to top-level - connect( d->widget->widAddresseeLink, TQT_SIGNAL( addresseeChanged( const TDEABC::Addressee& ) ), this, TQT_SLOT( slotAddresseeSelected( const TDEABC::Addressee& ) ) ); - connect( d->widget->m_infoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotInfoClicked() ) ); + connect( d->widget->widAddresseeLink, TQ_SIGNAL( addresseeChanged( const TDEABC::Addressee& ) ), this, TQ_SLOT( slotAddresseeSelected( const TDEABC::Addressee& ) ) ); + connect( d->widget->m_infoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotInfoClicked() ) ); - connect( this, TQT_SIGNAL(okClicked()) , this , TQT_SLOT(slotFinished())); + connect( this, TQ_SIGNAL(okClicked()) , this , TQ_SLOT(slotFinished())); } diff --git a/kopete/libkopete/ui/contactaddednotifydialog.h b/kopete/libkopete/ui/contactaddednotifydialog.h index 139375d0..d012f022 100644 --- a/kopete/libkopete/ui/contactaddednotifydialog.h +++ b/kopete/libkopete/ui/contactaddednotifydialog.h @@ -44,8 +44,8 @@ namespace UI { Kopete::UI::ContactAddedNotifyDialog *dialog = new ContactAddedNotifyDialog(contactId, TQString(),account); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogApplied())); - TQObject::connect(dialog,TQT_SIGNAL(infoClicked(const TQString&)),this,TQT_SLOT(contactAddedDialogInfo())); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)),this,TQ_SLOT(contactAddedDialogApplied())); + TQObject::connect(dialog,TQ_SIGNAL(infoClicked(const TQString&)),this,TQ_SLOT(contactAddedDialogInfo())); dialog->show(); * @endcode diff --git a/kopete/libkopete/ui/kopetecontactaction.cpp b/kopete/libkopete/ui/kopetecontactaction.cpp index f0b86442..3bf1e5b5 100644 --- a/kopete/libkopete/ui/kopetecontactaction.cpp +++ b/kopete/libkopete/ui/kopetecontactaction.cpp @@ -28,8 +28,8 @@ KopeteContactAction::KopeteContactAction( Kopete::Contact *contact, const TQObje { m_contact = contact; - connect( this, TQT_SIGNAL( activated() ), TQT_SLOT( slotContactActionActivated() ) ); - connect( this, TQT_SIGNAL( activated( Kopete::Contact * ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), TQ_SLOT( slotContactActionActivated() ) ); + connect( this, TQ_SIGNAL( activated( Kopete::Contact * ) ), receiver, slot ); } KopeteContactAction::~KopeteContactAction() diff --git a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp index 25aa6140..81936036 100644 --- a/kopete/libkopete/ui/kopetefileconfirmdialog.cpp +++ b/kopete/libkopete/ui/kopetefileconfirmdialog.cpp @@ -52,7 +52,7 @@ KopeteFileConfirmDialog::KopeteFileConfirmDialog(const Kopete::FileTransferInfo setMainWidget(m_view); - connect(m_view->cmdBrowse, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowsePressed())); + connect(m_view->cmdBrowse, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowsePressed())); } KopeteFileConfirmDialog::~KopeteFileConfirmDialog() diff --git a/kopete/libkopete/ui/kopetelistview.cpp b/kopete/libkopete/ui/kopetelistview.cpp index 965b2d25..6d9952ad 100644 --- a/kopete/libkopete/ui/kopetelistview.cpp +++ b/kopete/libkopete/ui/kopetelistview.cpp @@ -105,16 +105,16 @@ struct ListView::Private ListView::ListView( TQWidget *parent, const char *name ) : TDEListView( parent, name ), d( new Private ) { - connect( &d->sortTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotSort() ) ); + connect( &d->sortTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotSort() ) ); // We have our own tooltips, don't use the default TQListView ones setShowToolTips( false ); d->toolTip.reset( new ToolTip( viewport(), this ) ); - connect( this, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotDoubleClicked( TQListViewItem * ) ) ); // set up flags for nicer painting clearWFlags( WStaticContents ); diff --git a/kopete/libkopete/ui/kopetelistviewitem.cpp b/kopete/libkopete/ui/kopetelistviewitem.cpp index a71b19f5..f194ecd5 100644 --- a/kopete/libkopete/ui/kopetelistviewitem.cpp +++ b/kopete/libkopete/ui/kopetelistviewitem.cpp @@ -1180,14 +1180,14 @@ public: SharedTimer( int period ) : period(period), users(0) {} void attach( TQObject *target, const char *slot ) { - connect( this, TQT_SIGNAL(timeout()), target, slot ); + connect( this, TQ_SIGNAL(timeout()), target, slot ); if( users++ == 0 ) start( period ); //kdDebug(14000) << "SharedTimer::attach: users is now " << users << "\n"; } void detach( TQObject *target, const char *slot ) { - disconnect( this, TQT_SIGNAL(timeout()), target, slot ); + disconnect( this, TQ_SIGNAL(timeout()), target, slot ); if( --users == 0 ) stop(); //kdDebug(14000) << "SharedTimer::detach: users is now " << users << "\n"; @@ -1227,9 +1227,9 @@ class Item::Private { public: Private( Item *item ) - : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQT_SLOT( slotLayoutAnimateItems() ) ) + : layoutAnimateTimer( theLayoutAnimateTimer(), item, TQ_SLOT( slotLayoutAnimateItems() ) ) , animateLayout( true ), opacity( 1.0 ) - , visibilityTimer( theVisibilityTimer(), item, TQT_SLOT( slotUpdateVisibility() ) ) + , visibilityTimer( theVisibilityTimer(), item, TQ_SLOT( slotUpdateVisibility() ) ) , visibilityLevel( 0 ), visibilityTarget( false ), searchMatch( true ) { } @@ -1305,10 +1305,10 @@ void Item::setEffects( bool animation, bool fading, bool folding ) void Item::initLVI() { - connect( listView()->header(), TQT_SIGNAL( sizeChange( int, int, int ) ), TQT_SLOT( slotColumnResized() ) ); - connect( &d->layoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutItems() ) ); - //connect( &d->layoutAnimateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotLayoutAnimateItems() ) ); - //connect( &d->visibilityTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateVisibility() ) ); + connect( listView()->header(), TQ_SIGNAL( sizeChange( int, int, int ) ), TQ_SLOT( slotColumnResized() ) ); + connect( &d->layoutTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotLayoutItems() ) ); + //connect( &d->layoutAnimateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotLayoutAnimateItems() ) ); + //connect( &d->visibilityTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateVisibility() ) ); setVisible( false ); setTargetVisibility( true ); } diff --git a/kopete/libkopete/ui/kopetepasswordwidget.cpp b/kopete/libkopete/ui/kopetepasswordwidget.cpp index 10f6117f..37c411ca 100644 --- a/kopete/libkopete/ui/kopetepasswordwidget.cpp +++ b/kopete/libkopete/ui/kopetepasswordwidget.cpp @@ -41,15 +41,15 @@ Kopete::UI::PasswordWidget::~PasswordWidget() void Kopete::UI::PasswordWidget::load( Kopete::Password *source ) { - disconnect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotRememberChanged() ) ); - disconnect( mPassword, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - disconnect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SIGNAL( changed() ) ); + disconnect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( slotRememberChanged() ) ); + disconnect( mPassword, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + disconnect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SIGNAL( changed() ) ); if ( source && source->remembered() ) { mRemembered->setTristate(); mRemembered->setNoChange(); - source->requestWithoutPrompt( this, TQT_SLOT( receivePassword( const TQString & ) ) ); + source->requestWithoutPrompt( this, TQ_SLOT( receivePassword( const TQString & ) ) ); } else { @@ -64,9 +64,9 @@ void Kopete::UI::PasswordWidget::load( Kopete::Password *source ) mPassword->setEnabled( false ); - connect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SLOT( slotRememberChanged() ) ); - connect( mPassword, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( mRemembered, TQT_SIGNAL( stateChanged( int ) ), this, TQT_SIGNAL( changed() ) ); + connect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SLOT( slotRememberChanged() ) ); + connect( mPassword, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( mRemembered, TQ_SIGNAL( stateChanged( int ) ), this, TQ_SIGNAL( changed() ) ); emit changed(); } diff --git a/kopete/libkopete/ui/kopetestdaction.cpp b/kopete/libkopete/ui/kopetestdaction.cpp index a5ba38d8..466a1c60 100644 --- a/kopete/libkopete/ui/kopetestdaction.cpp +++ b/kopete/libkopete/ui/kopetestdaction.cpp @@ -42,7 +42,7 @@ KopetePreferencesAction::KopetePreferencesAction( TDEActionCollection *parent, c TQString::fromLatin1( "configure" ) ), 0, 0, 0, parent, name ) { - connect( this, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotShowPreferences() ) ); + connect( this, TQ_SIGNAL( activated() ), this, TQ_SLOT( slotShowPreferences() ) ); } KopetePreferencesAction::~KopetePreferencesAction() diff --git a/kopete/libkopete/ui/kopeteview.h b/kopete/libkopete/ui/kopeteview.h index b1daf472..86f3233f 100644 --- a/kopete/libkopete/ui/kopeteview.h +++ b/kopete/libkopete/ui/kopeteview.h @@ -120,7 +120,7 @@ class KOPETE_EXPORT KopeteView /** * @brief Inform the view the message was sent successfully * - * This should be reimplemented as a TQT_SLOT in any derived objects + * This should be reimplemented as a TQ_SLOT in any derived objects */ virtual void messageSentSuccessfully() = 0; diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp index 8d049a5d..8e7fc61a 100644 --- a/kopete/libkopete/ui/metacontactselectorwidget.cpp +++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp @@ -73,10 +73,10 @@ MetaContactSelectorWidgetLVI::MetaContactSelectorWidgetLVI(Kopete::MetaContact * d->metaContact = mc; d->photoSize = 60; - connect( d->metaContact, TQT_SIGNAL( photoChanged() ), - TQT_SLOT( slotPhotoChanged() ) ); - connect( d->metaContact, TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), - TQT_SLOT( slotDisplayNameChanged() ) ); + connect( d->metaContact, TQ_SIGNAL( photoChanged() ), + TQ_SLOT( slotPhotoChanged() ) ); + connect( d->metaContact, TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ), + TQ_SLOT( slotDisplayNameChanged() ) ); buildVisualComponents(); } @@ -188,14 +188,14 @@ MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const ch d->widget = new MetaContactSelectorWidget_Base(this); l->addWidget(d->widget); - connect( d->widget->metaContactListView, TQT_SIGNAL( clicked(TQListViewItem * ) ), - TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); - connect( d->widget->metaContactListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); - connect( d->widget->metaContactListView, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), - TQT_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); + connect( d->widget->metaContactListView, TQ_SIGNAL( clicked(TQListViewItem * ) ), + TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); + connect( d->widget->metaContactListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); + connect( d->widget->metaContactListView, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), + TQ_SIGNAL( metaContactListClicked( TQListViewItem * ) ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQT_SLOT( slotLoadMetaContacts() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQ_SLOT( slotLoadMetaContacts() ) ); d->widget->kListViewSearchLine->setListView(d->widget->metaContactListView); d->widget->metaContactListView->setFullWidth( true ); @@ -207,7 +207,7 @@ MetaContactSelectorWidget::MetaContactSelectorWidget( TQWidget *parent, const ch MetaContactSelectorWidget::~MetaContactSelectorWidget() { - disconnect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQT_SLOT( slotLoadMetaContacts() ) ); + disconnect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactAdded( Kopete::MetaContact * ) ), this, TQ_SLOT( slotLoadMetaContacts() ) ); } diff --git a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp index 320eeb3e..2bdd7b9f 100644 --- a/kopete/plugins/addbookmarks/addbookmarksplugin.cpp +++ b/kopete/plugins/addbookmarks/addbookmarksplugin.cpp @@ -43,7 +43,7 @@ BookmarksPlugin::BookmarksPlugin(TQObject *parent, const char *name, const TQStr : Kopete::Plugin(BookmarksPluginFactory::instance(), parent, name) { //kdDebug(14501) << "plugin loading" << endl; - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, TQT_SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), this, TQ_SLOT( slotBookmarkURLsInMessage( Kopete::Message & ) ) ); } /*! @@ -133,8 +133,8 @@ void BookmarksPlugin::addKopeteBookmark( const KURL& url, const TQString& sender // make asynchronous transfer to avoid GUI freezing due to overloaded web servers transfer = TDEIO::get(url, false, false); transfer->setInteractive(false); - connect ( transfer, TQT_SIGNAL ( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT ( slotAddKopeteBookmark( TDEIO::Job *, const TQByteArray & ) ) ); + connect ( transfer, TQ_SIGNAL ( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT ( slotAddKopeteBookmark( TDEIO::Job *, const TQByteArray & ) ) ); m_map[transfer].url = url; m_map[transfer].sender = sender; } diff --git a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp index 703ec550..061466b1 100644 --- a/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp +++ b/kopete/plugins/addbookmarks/addbookmarkspreferences.cpp @@ -33,14 +33,14 @@ BookmarksPreferences::BookmarksPreferences(TQWidget *parent, const char *name, c ( new TQVBoxLayout (this) )->setAutoAdd( true ); p_dialog = new BookmarksPrefsUI( this ); load(); - connect( p_dialog->yesButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotSetStatusChanged() )); - connect( p_dialog->noButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotSetStatusChanged() )); - connect( p_dialog->onlySelectedButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotSetStatusChanged() )); - connect( p_dialog->onlyNotSelectedButton, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotSetStatusChanged() )); - connect( p_dialog->contactList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSetStatusChanged() )); + connect( p_dialog->yesButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotSetStatusChanged() )); + connect( p_dialog->noButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotSetStatusChanged() )); + connect( p_dialog->onlySelectedButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotSetStatusChanged() )); + connect( p_dialog->onlyNotSelectedButton, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotSetStatusChanged() )); + connect( p_dialog->contactList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSetStatusChanged() )); if(Kopete::PluginManager::self()->plugin("kopete_addbookmarks") ) - connect( this, TQT_SIGNAL(PreferencesChanged()), Kopete::PluginManager::self()->plugin("kopete_addbookmarks") , TQT_SLOT(slotReloadSettings())); - connect( p_dialog->m_addUntrusted, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotAddUntrustedChanged() ) ); + connect( this, TQ_SIGNAL(PreferencesChanged()), Kopete::PluginManager::self()->plugin("kopete_addbookmarks") , TQ_SLOT(slotReloadSettings())); + connect( p_dialog->m_addUntrusted, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotAddUntrustedChanged() ) ); } diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 2b81fb88..f05895b8 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -125,14 +125,14 @@ AliasPreferences::AliasPreferences( TQWidget *parent, const char *, const TQStri ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new AliasDialogBase( this ); - connect( preferencesDialog->addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotAddAlias() ) ); - connect( preferencesDialog->editButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditAlias() ) ); - connect( preferencesDialog->deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeleteAliases() ) ); - connect( Kopete::PluginManager::self(), TQT_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), - this, TQT_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); - - connect( preferencesDialog->aliasList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT( slotCheckAliasSelected() ) ); + connect( preferencesDialog->addButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotAddAlias() ) ); + connect( preferencesDialog->editButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditAlias() ) ); + connect( preferencesDialog->deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotDeleteAliases() ) ); + connect( Kopete::PluginManager::self(), TQ_SIGNAL( pluginLoaded( Kopete::Plugin * ) ), + this, TQ_SLOT( slotPluginLoaded( Kopete::Plugin * ) ) ); + + connect( preferencesDialog->aliasList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT( slotCheckAliasSelected() ) ); load(); } diff --git a/kopete/plugins/alias/editaliasdialog.cpp b/kopete/plugins/alias/editaliasdialog.cpp index 3598b352..35e69dbc 100644 --- a/kopete/plugins/alias/editaliasdialog.cpp +++ b/kopete/plugins/alias/editaliasdialog.cpp @@ -27,9 +27,9 @@ EditAliasDialog::EditAliasDialog( TQWidget* parent, const char* name ) : AliasDialog( parent, name ) { - TQObject::connect( alias, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); - TQObject::connect( command, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( checkButtonsEnabled() ) ); - TQObject::connect( protocolList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( checkButtonsEnabled() ) ); + TQObject::connect( alias, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( checkButtonsEnabled() ) ); + TQObject::connect( command, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( checkButtonsEnabled() ) ); + TQObject::connect( protocolList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( checkButtonsEnabled() ) ); checkButtonsEnabled(); } diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp index 8d928b02..db2bfcb2 100644 --- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp +++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp @@ -37,16 +37,16 @@ AutoReplacePlugin::AutoReplacePlugin( TQObject *parent, const char * name, const m_prefs = new AutoReplaceConfig; - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - this, TQT_SLOT( slotAboutToSend( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + this, TQ_SLOT( slotAboutToSend( Kopete::Message & ) ) ); // nb this connection causes the slot to be called on in- and outbound // messages which suggests something is broken in the message handler // system! m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound, - Kopete::MessageHandlerFactory::InStageToSent, this, TQT_SLOT( slotAboutToSend( Kopete::Message& ) ) ); + Kopete::MessageHandlerFactory::InStageToSent, this, TQ_SLOT( slotAboutToSend( Kopete::Message& ) ) ); - connect( this, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotSettingsChanged() ) ); + connect( this, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotSettingsChanged() ) ); } AutoReplacePlugin::~AutoReplacePlugin() diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp index 98c86d8c..08545469 100644 --- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp +++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp @@ -48,16 +48,16 @@ AutoReplacePreferences::AutoReplacePreferences( TQWidget *parent, const char * / preferencesDialog->m_list->header()->setStretchEnabled( true , 1 ); // connect SIGNALS/SLOTS - connect( preferencesDialog->m_add, TQT_SIGNAL(pressed()), - TQT_SLOT( slotAddCouple()) ); - connect( preferencesDialog->m_edit, TQT_SIGNAL(pressed()), - TQT_SLOT( slotEditCouple()) ); - connect( preferencesDialog->m_remove, TQT_SIGNAL(pressed()), - TQT_SLOT(slotRemoveCouple()) ); - connect( preferencesDialog->m_list, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) ); - connect( preferencesDialog->m_key, TQT_SIGNAL(textChanged ( const TQString & )), - TQT_SLOT( slotEnableAddEdit( const TQString & )) ); + connect( preferencesDialog->m_add, TQ_SIGNAL(pressed()), + TQ_SLOT( slotAddCouple()) ); + connect( preferencesDialog->m_edit, TQ_SIGNAL(pressed()), + TQ_SLOT( slotEditCouple()) ); + connect( preferencesDialog->m_remove, TQ_SIGNAL(pressed()), + TQ_SLOT(slotRemoveCouple()) ); + connect( preferencesDialog->m_list, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); + connect( preferencesDialog->m_key, TQ_SIGNAL(textChanged ( const TQString & )), + TQ_SLOT( slotEnableAddEdit( const TQString & )) ); m_wordListChanged = false; diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp index 095f145f..b754a34c 100644 --- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp +++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp @@ -36,7 +36,7 @@ ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *na m_process = 0L; m_timer = new TQTimer(); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotCheckStatus() ) ); m_timer->start( 60000 ); m_pluginConnected = false; @@ -73,8 +73,8 @@ void ConnectionStatusPlugin::slotCheckStatus() *m_process << "netstat" << "-r"; #endif - connect( m_process, TQT_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), this, TQT_SLOT( slotProcessStdout( TDEProcess *, char *, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess * ) ), this, TQT_SLOT( slotProcessExited( TDEProcess * ) ) ); + connect( m_process, TQ_SIGNAL( receivedStdout( TDEProcess *, char *, int ) ), this, TQ_SLOT( slotProcessStdout( TDEProcess *, char *, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess * ) ), this, TQ_SLOT( slotProcessExited( TDEProcess * ) ) ); if ( !m_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) ) { diff --git a/kopete/plugins/contactnotes/contactnotesplugin.cpp b/kopete/plugins/contactnotes/contactnotesplugin.cpp index 51977e4e..2ec866de 100644 --- a/kopete/plugins/contactnotes/contactnotesplugin.cpp +++ b/kopete/plugins/contactnotes/contactnotesplugin.cpp @@ -37,8 +37,8 @@ ContactNotesPlugin::ContactNotesPlugin( TQObject *parent, const char *name, cons else pluginStatic_ = this; - TDEAction *m_actionEdit=new TDEAction( i18n("&Notes"), "identity", 0, this, TQT_SLOT (slotEditInfo()), actionCollection() , "editContactNotes"); - connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , m_actionEdit , TQT_SLOT(setEnabled(bool))); + TDEAction *m_actionEdit=new TDEAction( i18n("&Notes"), "identity", 0, this, TQ_SLOT (slotEditInfo()), actionCollection() , "editContactNotes"); + connect ( Kopete::ContactList::self() , TQ_SIGNAL( metaContactSelected(bool)) , m_actionEdit , TQ_SLOT(setEnabled(bool))); m_actionEdit->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); setXMLFile("contactnotesui.rc"); @@ -63,8 +63,8 @@ void ContactNotesPlugin::slotEditInfo() if(!m) return; ContactNotesEdit *e=new ContactNotesEdit(m,this); - connect( e, TQT_SIGNAL( notesChanged( const TQString, Kopete::MetaContact*) ),this, - TQT_SLOT( setNotes( const TQString, Kopete::MetaContact * ) ) ); + connect( e, TQ_SIGNAL( notesChanged( const TQString, Kopete::MetaContact*) ),this, + TQ_SLOT( setNotes( const TQString, Kopete::MetaContact * ) ) ); e->show(); } diff --git a/kopete/plugins/cryptography/cryptographyguiclient.cpp b/kopete/plugins/cryptography/cryptographyguiclient.cpp index 8adf8fab..5b45231b 100644 --- a/kopete/plugins/cryptography/cryptographyguiclient.cpp +++ b/kopete/plugins/cryptography/cryptographyguiclient.cpp @@ -48,7 +48,7 @@ CryptographyGUIClient::CryptographyGUIClient(Kopete::ChatSession *parent ) setInstance( KGenericFactory<CryptographyPlugin>::instance() ); - m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQT_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); + m_action=new TDEToggleAction( i18n("Encrypt Messages" ), TQString::fromLatin1( "encrypted" ), 0, this, TQ_SLOT(slotToggled()), actionCollection() , "cryptographyToggle" ); m_action->setChecked( first->pluginData( CryptographyPlugin::plugin() , "encrypt_messages") != TQString::fromLatin1("off") ) ; setXMLFile("cryptographychatui.rc"); diff --git a/kopete/plugins/cryptography/cryptographyplugin.cpp b/kopete/plugins/cryptography/cryptographyplugin.cpp index 13756076..cd2a6b4f 100644 --- a/kopete/plugins/cryptography/cryptographyplugin.cpp +++ b/kopete/plugins/cryptography/cryptographyplugin.cpp @@ -59,24 +59,24 @@ CryptographyPlugin::CryptographyPlugin( TQObject *parent, const char *name, cons pluginStatic_=this; m_inboundHandler = new Kopete::SimpleMessageHandlerFactory( Kopete::Message::Inbound, - Kopete::MessageHandlerFactory::InStageToSent, this, TQT_SLOT( slotIncomingMessage( Kopete::Message& ) ) ); + Kopete::MessageHandlerFactory::InStageToSent, this, TQ_SLOT( slotIncomingMessage( Kopete::Message& ) ) ); connect( Kopete::ChatSessionManager::self(), - TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); + TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); m_cachedPass_timer = new TQTimer(this, "m_cachedPass_timer" ); - TQObject::connect(m_cachedPass_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotForgetCachedPass() )); + TQObject::connect(m_cachedPass_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotForgetCachedPass() )); - TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQT_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey"); - connect ( Kopete::ContactList::self() , TQT_SIGNAL( metaContactSelected(bool)) , action , TQT_SLOT(setEnabled(bool))); + TDEAction *action=new TDEAction( i18n("&Select Cryptography Public Key..."), "encrypted", 0, this, TQ_SLOT (slotSelectContactKey()), actionCollection() , "contactSelectKey"); + connect ( Kopete::ContactList::self() , TQ_SIGNAL( metaContactSelected(bool)) , action , TQ_SLOT(setEnabled(bool))); action->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count()==1 ); setXMLFile("cryptographyui.rc"); loadSettings(); - connect(this, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT( loadSettings() ) ); + connect(this, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT( loadSettings() ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); //Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining) TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions(); for (TQValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it) @@ -144,7 +144,7 @@ bool CryptographyPlugin::passphraseHandling() m_actionCollection = new TDEActionCollection(this); TDEAction *actionTranslate = new TDEAction( i18n ("Translate"), 0, - this, TQT_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" ); + this, TQ_SLOT( slotTranslateChat() ), m_actionCollection, "actionTranslate" ); m_actionCollection->insert( actionTranslate ); m_currentChatSession=KMM; @@ -314,8 +314,8 @@ void CryptographyPlugin::slotForgetCachedPass() void CryptographyPlugin::slotNewKMM(Kopete::ChatSession *KMM) { - connect(this , TQT_SIGNAL( destroyed(TQObject*)) , - new CryptographyGUIClient(KMM) , TQT_SLOT(deleteLater())); + connect(this , TQ_SIGNAL( destroyed(TQObject*)) , + new CryptographyGUIClient(KMM) , TQ_SLOT(deleteLater())); } diff --git a/kopete/plugins/cryptography/cryptographypreferences.cpp b/kopete/plugins/cryptography/cryptographypreferences.cpp index 1fe2d7ea..7b0b9d90 100644 --- a/kopete/plugins/cryptography/cryptographypreferences.cpp +++ b/kopete/plugins/cryptography/cryptographypreferences.cpp @@ -32,7 +32,7 @@ CryptographyPreferences::CryptographyPreferences(TQWidget *parent, const char* / { // Add actuall widget generated from ui file. preferencesDialog = new CryptographyPrefsUI(this); - connect (preferencesDialog->m_selectOwnKey , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotSelectPressed())); + connect (preferencesDialog->m_selectOwnKey , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotSelectPressed())); setMainWidget( preferencesDialog ,"Cryptography Plugin"); } diff --git a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp index 26551a7e..645b7543 100644 --- a/kopete/plugins/cryptography/cryptographyselectuserkey.cpp +++ b/kopete/plugins/cryptography/cryptographyselectuserkey.cpp @@ -32,8 +32,8 @@ CryptographySelectUserKey::CryptographySelectUserKey(const TQString& key ,Kopete view = new CryptographyUserKey_ui(this,"CryptographyUserKey_ui"); setMainWidget(view); - connect (view->m_selectKey , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotSelectPressed())); - connect (view->m_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(slotRemovePressed())); + connect (view->m_selectKey , TQ_SIGNAL(clicked()) , this , TQ_SLOT(slotSelectPressed())); + connect (view->m_removeButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(slotRemovePressed())); view->m_titleLabel->setText(i18n("Select public key for %1").arg(mc->displayName())); view->m_editKey->setText(key); @@ -45,7 +45,7 @@ CryptographySelectUserKey::~CryptographySelectUserKey() void CryptographySelectUserKey::slotSelectPressed() { popupPublic *dialog=new popupPublic(this, "public_keys", 0,false); - connect(dialog,TQT_SIGNAL(selectedKey(TQString &,TQString,bool,bool)),this,TQT_SLOT(keySelected(TQString &))); + connect(dialog,TQ_SIGNAL(selectedKey(TQString &,TQString,bool,bool)),this,TQ_SLOT(keySelected(TQString &))); dialog->show(); } diff --git a/kopete/plugins/cryptography/kgpgselkey.cpp b/kopete/plugins/cryptography/kgpgselkey.cpp index 403efbb7..c7750c7a 100644 --- a/kopete/plugins/cryptography/kgpgselkey.cpp +++ b/kopete/plugins/cryptography/kgpgselkey.cpp @@ -156,8 +156,8 @@ KgpgSelKey::KgpgSelKey(TQWidget *parent, const char *name,bool showlocal):KDialo pclose(fp); - TQObject::connect(keysListpr,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotpreOk())); - TQObject::connect(keysListpr,TQT_SIGNAL(clicked(TQListViewItem *)),this,TQT_SLOT(slotSelect(TQListViewItem *))); + TQObject::connect(keysListpr,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotpreOk())); + TQObject::connect(keysListpr,TQ_SIGNAL(clicked(TQListViewItem *)),this,TQ_SLOT(slotSelect(TQListViewItem *))); keysListpr->setSelected(keysListpr->firstChild(),true); diff --git a/kopete/plugins/cryptography/popuppublic.cpp b/kopete/plugins/cryptography/popuppublic.cpp index def0bd40..882b2fe5 100644 --- a/kopete/plugins/cryptography/popuppublic.cpp +++ b/kopete/plugins/cryptography/popuppublic.cpp @@ -121,7 +121,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent : "locationbar_erase")); (void) new TQLabel(i18n("Search: "),hBar); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(hBar); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); keysList = new TDEListView( page ); keysList->addColumn(i18n("Name")); @@ -144,7 +144,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent boutonboxoptions=new TQButtonGroup(5,TQt::Vertical ,page,0); TDEActionCollection *actcol=new TDEActionCollection(this); - (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQT_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); + (void) new TDEAction(i18n("&Go to Default Key"),goDefaultKey, this, TQ_SLOT(slotGotoDefaultKey()),actcol,"go_default_key"); CBarmor=new TQCheckBox(i18n("ASCII armored encryption"),boutonboxoptions); @@ -183,7 +183,7 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent TQWhatsThis::add (CBsymmetric,i18n("<b>Symmetrical encryption</b>: encryption does not use keys. You just need to give a password " "to encrypt/decrypt the file")); - TQObject::connect(CBsymmetric,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(isSymetric(bool))); + TQObject::connect(CBsymmetric,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(isSymetric(bool))); //BEGIN modified for Kopete @@ -213,11 +213,11 @@ KDialogBase( Plain, i18n("Select Public Key"), Details | Ok | Cancel, Ok, parent optiontxt->setText(customOptions); TQWhatsThis::add (optiontxt,i18n("<b>Custom option</b>: for experienced users only, allows you to enter a gpg command line option, like: '--armor'")); - TQObject::connect(optiontxt,TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(customOpts(const TQString & ))); + TQObject::connect(optiontxt,TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(customOpts(const TQString & ))); }*/ - TQObject::connect(keysList,TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQT_SLOT(slotOk())); -// TQObject::connect(this,TQT_SIGNAL(okClicked()),this,TQT_SLOT(crypte())); - TQObject::connect(CBuntrusted,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(refresh(bool))); + TQObject::connect(keysList,TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint &,int)),this,TQ_SLOT(slotOk())); +// TQObject::connect(this,TQ_SIGNAL(okClicked()),this,TQ_SLOT(crypte())); + TQObject::connect(CBuntrusted,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(refresh(bool))); char line[200]="\0"; FILE *fp2; @@ -350,8 +350,8 @@ void popupPublic::refreshkeys() KProcIO *encid=new KProcIO(); *encid << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; ///////// when process ends, update dialog infos - TQObject::connect(encid, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotpreselect())); - TQObject::connect(encid, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotprocread(KProcIO *))); + TQObject::connect(encid, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotpreselect())); + TQObject::connect(encid, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotprocread(KProcIO *))); encid->start(TDEProcess::NotifyOnExit,true); } diff --git a/kopete/plugins/highlight/highlightplugin.cpp b/kopete/plugins/highlight/highlightplugin.cpp index c076a58b..184e2adc 100644 --- a/kopete/plugins/highlight/highlightplugin.cpp +++ b/kopete/plugins/highlight/highlightplugin.cpp @@ -35,8 +35,8 @@ HighlightPlugin::HighlightPlugin( TQObject *parent, const char *name, const TQSt if( !pluginStatic_ ) pluginStatic_=this; - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), TQT_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); - connect ( this , TQT_SIGNAL( settingsChanged() ) , this , TQT_SLOT( slotSettingsChanged() ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), TQ_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); + connect ( this , TQ_SIGNAL( settingsChanged() ) , this , TQ_SLOT( slotSettingsChanged() ) ); m_config = new HighlightConfig; diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index 0d176c98..ed976977 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -47,27 +47,27 @@ HighlightPreferences::HighlightPreferences(TQWidget *parent, const char* /*name* preferencesDialog = new HighlightPrefsUI(this); m_config = new HighlightConfig; - connect(preferencesDialog->m_list , TQT_SIGNAL(selectionChanged()) , this , TQT_SLOT(slotCurrentFilterChanged())); - connect(preferencesDialog->m_list , TQT_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )) , this , TQT_SLOT(slotRenameFilter())); - connect(preferencesDialog->m_add , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotAddFilter())); - connect(preferencesDialog->m_remove , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotRemoveFilter())); - connect(preferencesDialog->m_rename , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotRenameFilter())); - connect(preferencesDialog->m_editregexp , TQT_SIGNAL(pressed()) , this , TQT_SLOT(slotEditRegExp())); + connect(preferencesDialog->m_list , TQ_SIGNAL(selectionChanged()) , this , TQ_SLOT(slotCurrentFilterChanged())); + connect(preferencesDialog->m_list , TQ_SIGNAL(doubleClicked ( TQListViewItem *, const TQPoint &, int )) , this , TQ_SLOT(slotRenameFilter())); + connect(preferencesDialog->m_add , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotAddFilter())); + connect(preferencesDialog->m_remove , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotRemoveFilter())); + connect(preferencesDialog->m_rename , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotRenameFilter())); + connect(preferencesDialog->m_editregexp , TQ_SIGNAL(pressed()) , this , TQ_SLOT(slotEditRegExp())); //Maybe here i should use a slot per widget, but i am too lazy - connect(preferencesDialog->m_case , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_regexp , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_setImportance , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_setBG , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_setFG , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_search , TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_sound , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_soundFN , TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_raise , TQT_SIGNAL(stateChanged(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_search , TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_importance , TQT_SIGNAL(activated(int)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_FG , TQT_SIGNAL(changed(const TQColor&)) , this , TQT_SLOT(slotSomethingHasChanged())); - connect(preferencesDialog->m_BG , TQT_SIGNAL(changed(const TQColor&)) , this , TQT_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_case , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_regexp , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_setImportance , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_setBG , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_setFG , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_search , TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_sound , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_soundFN , TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_raise , TQ_SIGNAL(stateChanged(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_search , TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_importance , TQ_SIGNAL(activated(int)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_FG , TQ_SIGNAL(changed(const TQColor&)) , this , TQ_SLOT(slotSomethingHasChanged())); + connect(preferencesDialog->m_BG , TQ_SIGNAL(changed(const TQColor&)) , this , TQ_SLOT(slotSomethingHasChanged())); load(); donttouch=false; diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 01bff360..4842db32 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -102,7 +102,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, TQString fontStyle; kdDebug(14310) << k_funcinfo << "called." << endl; - setWFlags(TQt::WDestructiveClose); // send TQT_SIGNAL(closing()) on quit + setWFlags(TQt::WDestructiveClose); // send TQ_SIGNAL(closing()) on quit // FIXME: Allow to show this dialog for only one contact mMetaContact = mc; @@ -161,21 +161,21 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* parent, mHtmlPart->end(); - connect(mHtmlPart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), - this, TQT_SLOT(slotOpenURLRequest(const KURL &, const KParts::URLArgs &))); - connect(mMainWidget->dateListView, TQT_SIGNAL(clicked(TQListViewItem*)), this, TQT_SLOT(dateSelected(TQListViewItem*))); - connect(mMainWidget->searchButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearch())); - connect(mMainWidget->searchLine, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotSearch())); - connect(mMainWidget->searchLine, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSearchTextChanged(const TQString&))); - connect(mMainWidget->searchErase, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchErase())); - connect(mMainWidget->contactComboBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotContactChanged(int))); - connect(mMainWidget->messageFilterBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotFilterChanged(int ))); - connect(mHtmlPart, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &))); + connect(mHtmlPart->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), + this, TQ_SLOT(slotOpenURLRequest(const KURL &, const KParts::URLArgs &))); + connect(mMainWidget->dateListView, TQ_SIGNAL(clicked(TQListViewItem*)), this, TQ_SLOT(dateSelected(TQListViewItem*))); + connect(mMainWidget->searchButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearch())); + connect(mMainWidget->searchLine, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotSearch())); + connect(mMainWidget->searchLine, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSearchTextChanged(const TQString&))); + connect(mMainWidget->searchErase, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchErase())); + connect(mMainWidget->contactComboBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotContactChanged(int))); + connect(mMainWidget->messageFilterBox, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotFilterChanged(int ))); + connect(mHtmlPart, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)), this, TQ_SLOT(slotRightClick(const TQString &, const TQPoint &))); //initActions TDEActionCollection* ac = new TDEActionCollection(this); - mCopyAct = KStdAction::copy( this, TQT_SLOT(slotCopy()), ac ); - mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), ac ); + mCopyAct = KStdAction::copy( this, TQ_SLOT(slotCopy()), ac ); + mCopyURLAct = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQ_SLOT( slotCopyURL() ), ac ); resize(650, 700); centerOnScreen(this); @@ -211,7 +211,7 @@ void HistoryDialog::init() } initProgressBar(i18n("Loading..."),mInit.dateMCList.count()); - TQTimer::singleShot(0,this,TQT_SLOT(slotLoadDays())); + TQTimer::singleShot(0,this,TQ_SLOT(slotLoadDays())); } void HistoryDialog::slotLoadDays() @@ -219,7 +219,7 @@ void HistoryDialog::slotLoadDays() if(mInit.dateMCList.isEmpty()) { if (!mMainWidget->searchLine->text().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(slotSearch())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSearch())); doneProgressBar(); return; } @@ -235,7 +235,7 @@ void HistoryDialog::slotLoadDays() new TDEListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact()); } mMainWidget->searchProgress->advance(1); - TQTimer::singleShot(0,this,TQT_SLOT(slotLoadDays())); + TQTimer::singleShot(0,this,TQ_SLOT(slotLoadDays())); } @@ -586,7 +586,7 @@ void HistoryDialog::slotRightClick(const TQString &url, const TQPoint &point) mCopyAct->setEnabled( mHtmlPart->hasSelection() ); mCopyAct->plug( chatWindowPopup ); - connect( chatWindowPopup, TQT_SIGNAL( aboutToHide() ), chatWindowPopup, TQT_SLOT( deleteLater() ) ); + connect( chatWindowPopup, TQ_SIGNAL( aboutToHide() ), chatWindowPopup, TQ_SLOT( deleteLater() ) ); chatWindowPopup->popup(point); } @@ -596,18 +596,18 @@ void HistoryDialog::slotCopy() qsSelection = mHtmlPart->selectedText(); if ( qsSelection.isEmpty() ) return; - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection())); TQApplication::clipboard()->setText(qsSelection, TQClipboard::Clipboard); TQApplication::clipboard()->setText(qsSelection, TQClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection())); } void HistoryDialog::slotCopyURL() { - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection())); TQApplication::clipboard()->setText( mURL, TQClipboard::Clipboard); TQApplication::clipboard()->setText( mURL, TQClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), mHtmlPart, TQT_SLOT(slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), mHtmlPart, TQ_SLOT(slotClearSelection())); } #include "historydialog.moc" diff --git a/kopete/plugins/history/historyguiclient.cpp b/kopete/plugins/history/historyguiclient.cpp index aa2a97ee..b7b89e9c 100644 --- a/kopete/plugins/history/historyguiclient.cpp +++ b/kopete/plugins/history/historyguiclient.cpp @@ -41,9 +41,9 @@ HistoryGUIClient::HistoryGUIClient(Kopete::ChatSession *parent, const char *name TQPtrList<Kopete::Contact> mb=m_manager->members(); m_logger=new HistoryLogger( mb.first() , this ); - actionLast=new TDEAction( i18n("History Last" ), TQString::fromLatin1( "go-last" ), 0, this, TQT_SLOT(slotLast()), actionCollection() , "historyLast" ); - actionPrev = KStdAction::back( this, TQT_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); - actionNext = KStdAction::forward( this, TQT_SLOT(slotNext()), actionCollection() , "historyNext" ); + actionLast=new TDEAction( i18n("History Last" ), TQString::fromLatin1( "go-last" ), 0, this, TQ_SLOT(slotLast()), actionCollection() , "historyLast" ); + actionPrev = KStdAction::back( this, TQ_SLOT(slotPrevious()), actionCollection() , "historyPrevious" ); + actionNext = KStdAction::forward( this, TQ_SLOT(slotNext()), actionCollection() , "historyNext" ); // we are generally at last when begining actionPrev->setEnabled(true); diff --git a/kopete/plugins/history/historylogger.cpp b/kopete/plugins/history/historylogger.cpp index 78bf25b2..c82ea7c5 100644 --- a/kopete/plugins/history/historylogger.cpp +++ b/kopete/plugins/history/historylogger.cpp @@ -49,7 +49,7 @@ HistoryLogger::HistoryLogger( Kopete::MetaContact *m, TQObject *parent, const c m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact - connect(m_metaContact , TQT_SIGNAL(destroyed(TQObject *)) , this , TQT_SLOT(slotMCDeleted())); + connect(m_metaContact , TQ_SIGNAL(destroyed(TQObject *)) , this , TQ_SLOT(slotMCDeleted())); setPositionToLast(); } @@ -67,7 +67,7 @@ HistoryLogger::HistoryLogger( Kopete::Contact *c, TQObject *parent, const char m_oldSens=Default; //the contact may be destroyed, for example, if the contact changes its metacontact - connect(m_metaContact , TQT_SIGNAL(destroyed(TQObject *)) , this , TQT_SLOT(slotMCDeleted())); + connect(m_metaContact , TQ_SIGNAL(destroyed(TQObject *)) , this , TQ_SLOT(slotMCDeleted())); setPositionToLast(); } @@ -292,7 +292,7 @@ void HistoryLogger::appendMessage( const Kopete::Message &msg , const Kopete::Co if(!m_saveTimer) { m_saveTimer=new TQTimer(this); - connect( m_saveTimer, TQT_SIGNAL( timeout() ) , this, TQT_SLOT(saveToDisk()) ); + connect( m_saveTimer, TQ_SIGNAL( timeout() ) , this, TQ_SLOT(saveToDisk()) ); } if(!m_saveTimer->isActive()) m_saveTimer->start( m_saveTimerTime, true /*singleshot*/ ); diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index fb48e79f..8404d38d 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -45,18 +45,18 @@ HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQString : Kopete::Plugin( HistoryPluginFactory::instance(), parent, name ), m_loggerFactory( this ) { TDEAction *viewMetaContactHistory = new TDEAction( i18n("View &History" ), - TQString::fromLatin1( "history" ), 0, this, TQT_SLOT(slotViewHistory()), + TQString::fromLatin1( "history" ), 0, this, TQ_SLOT(slotViewHistory()), actionCollection(), "viewMetaContactHistory" ); viewMetaContactHistory->setEnabled( Kopete::ContactList::self()->selectedMetaContacts().count() == 1 ); - connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactSelected(bool)), - viewMetaContactHistory, TQT_SLOT(setEnabled(bool))); + connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactSelected(bool)), + viewMetaContactHistory, TQ_SLOT(setEnabled(bool))); - connect(Kopete::ChatSessionManager::self(), TQT_SIGNAL(viewCreated(KopeteView*)), - this, TQT_SLOT(slotViewCreated(KopeteView*))); + connect(Kopete::ChatSessionManager::self(), TQ_SIGNAL(viewCreated(KopeteView*)), + this, TQ_SLOT(slotViewCreated(KopeteView*))); - connect(this, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(slotSettingsChanged())); + connect(this, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(slotSettingsChanged())); setXMLFile("historyui.rc"); if(detectOldHistory()) @@ -79,8 +79,8 @@ HistoryPlugin::HistoryPlugin( TQObject *parent, const char *name, const TQString if(!m_loggers.contains(*it)) { m_loggers.insert(*it, new HistoryGUIClient( *it ) ); - connect( *it, TQT_SIGNAL(closing(Kopete::ChatSession*)), - this, TQT_SLOT(slotKMMClosed(Kopete::ChatSession*))); + connect( *it, TQ_SIGNAL(closing(Kopete::ChatSession*)), + this, TQ_SLOT(slotKMMClosed(Kopete::ChatSession*))); } } } @@ -105,8 +105,8 @@ void HistoryPlugin::messageDisplayed(const Kopete::Message &m) if(!m_loggers.contains(m.manager())) { m_loggers.insert(m.manager() , new HistoryGUIClient( m.manager() ) ); - connect(m.manager(), TQT_SIGNAL(closing(Kopete::ChatSession*)), - this, TQT_SLOT(slotKMMClosed(Kopete::ChatSession*))); + connect(m.manager(), TQ_SIGNAL(closing(Kopete::ChatSession*)), + this, TQ_SLOT(slotKMMClosed(Kopete::ChatSession*))); } HistoryLogger *l=m_loggers[m.manager()]->logger(); @@ -152,8 +152,8 @@ void HistoryPlugin::slotViewCreated( KopeteView* v ) if(!m_loggers.contains(m_currentChatSession)) { m_loggers.insert(m_currentChatSession , new HistoryGUIClient( m_currentChatSession ) ); - connect( m_currentChatSession, TQT_SIGNAL(closing(Kopete::ChatSession*)), - this , TQT_SLOT(slotKMMClosed(Kopete::ChatSession*))); + connect( m_currentChatSession, TQ_SIGNAL(closing(Kopete::ChatSession*)), + this , TQ_SLOT(slotKMMClosed(Kopete::ChatSession*))); } if(!autoChatWindow || nbAutoChatWindow == 0) diff --git a/kopete/plugins/history/historypreferences.cpp b/kopete/plugins/history/historypreferences.cpp index b1bca2f6..52679290 100644 --- a/kopete/plugins/history/historypreferences.cpp +++ b/kopete/plugins/history/historypreferences.cpp @@ -36,13 +36,13 @@ HistoryPreferences::HistoryPreferences(TQWidget *parent, const char*/*name*/, co (new TQVBoxLayout(this))->setAutoAdd(true); p = new HistoryPrefsUI(this); - connect(p->chkShowPrevious, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotShowPreviousChanged(bool))); - connect(p->Number_Auto_chatwindow, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotModified())); - connect(p->Number_ChatWindow, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(slotModified())); - connect(p->History_color, TQT_SIGNAL(changed(const TQColor&)), - this, TQT_SLOT(slotModified())); + connect(p->chkShowPrevious, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotShowPreviousChanged(bool))); + connect(p->Number_Auto_chatwindow, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotModified())); + connect(p->Number_ChatWindow, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(slotModified())); + connect(p->History_color, TQ_SIGNAL(changed(const TQColor&)), + this, TQ_SLOT(slotModified())); load(); } diff --git a/kopete/plugins/latex/latexguiclient.cpp b/kopete/plugins/latex/latexguiclient.cpp index 6d734fbb..91ad3c55 100644 --- a/kopete/plugins/latex/latexguiclient.cpp +++ b/kopete/plugins/latex/latexguiclient.cpp @@ -37,11 +37,11 @@ LatexGUIClient::LatexGUIClient( Kopete::ChatSession *parent, const char *name ) : TQObject( parent, name ), KXMLGUIClient( parent ) { setInstance( LatexPlugin::plugin()->instance() ); - connect( LatexPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); + connect( LatexPlugin::plugin(), TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( deleteLater() ) ); m_manager = parent; - new TDEAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQT_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); + new TDEAction( i18n( "Preview Latex Images" ), "latex", CTRL + Key_L, this, TQ_SLOT( slotPreview() ), actionCollection(), "latexPreview" ); setXMLFile( "latexchatui.rc" ); } diff --git a/kopete/plugins/latex/latexplugin.cpp b/kopete/plugins/latex/latexplugin.cpp index 67f82058..36f652f6 100644 --- a/kopete/plugins/latex/latexplugin.cpp +++ b/kopete/plugins/latex/latexplugin.cpp @@ -49,11 +49,11 @@ LatexPlugin::LatexPlugin( TQObject *parent, const char *name, const TQStringList s_pluginStatic = this; mMagickNotFoundShown = false; - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), TQT_SLOT( slotMessageAboutToShow( Kopete::Message & ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend(Kopete::Message& ) ), this, TQT_SLOT(slotMessageAboutToSend(Kopete::Message& ) ) ); - connect ( this , TQT_SIGNAL( settingsChanged() ) , this , TQT_SLOT( slotSettingsChanged() ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), - this, TQT_SLOT( slotNewChatSession( Kopete::ChatSession * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), TQ_SLOT( slotMessageAboutToShow( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend(Kopete::Message& ) ), this, TQ_SLOT(slotMessageAboutToSend(Kopete::Message& ) ) ); + connect ( this , TQ_SIGNAL( settingsChanged() ) , this , TQ_SLOT( slotSettingsChanged() ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), + this, TQ_SLOT( slotNewChatSession( Kopete::ChatSession * ) ) ); m_convScript = TDEStandardDirs::findExe("kopete_latexconvert.sh"); slotSettingsChanged(); diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp index 3d4df47d..6dd16fac 100644 --- a/kopete/plugins/latex/latexpreferences.cpp +++ b/kopete/plugins/latex/latexpreferences.cpp @@ -39,8 +39,8 @@ LatexPreferences::LatexPreferences(TQWidget *parent, const char* /*name*/, const m_preferencesDialog->horizontalDPI->setMinValue(1); m_preferencesDialog->verticalDPI->setMinValue(1); - connect(m_preferencesDialog->horizontalDPI, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotModified())); - connect(m_preferencesDialog->verticalDPI, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotModified())); + connect(m_preferencesDialog->horizontalDPI, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotModified())); + connect(m_preferencesDialog->verticalDPI, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotModified())); load(); } diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp index fa6136ef..3b5def24 100644 --- a/kopete/plugins/motionautoaway/motionawayplugin.cpp +++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp @@ -86,8 +86,8 @@ MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQ m_captureTimer = new TQTimer(this); m_awayTimer = new TQTimer(this); - connect( m_captureTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCapture()) ); - connect( m_awayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); + connect( m_captureTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCapture()) ); + connect( m_awayTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) ); signal(SIGCHLD, SIG_IGN); @@ -124,7 +124,7 @@ MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQ m_awayTimer->start( awayTimeout * 60 * 1000 ); } loadSettings(); - connect(this, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT( loadSettings() ) ); + connect(this, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT( loadSettings() ) ); } MotionAwayPlugin::~MotionAwayPlugin() diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp index 8b282548..d7a381b4 100644 --- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp +++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp @@ -36,9 +36,9 @@ MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*nam // Add actuall widget generated from ui file. ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new motionawayPrefsUI(this); - connect(preferencesDialog->BecomeAvailableWithActivity, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotWidgetModified())); - connect(preferencesDialog->AwayTimeout, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotWidgetModified())); - connect(preferencesDialog->VideoDevice, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(slotWidgetModified())); + connect(preferencesDialog->BecomeAvailableWithActivity, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotWidgetModified())); + connect(preferencesDialog->AwayTimeout, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotWidgetModified())); + connect(preferencesDialog->VideoDevice, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(slotWidgetModified())); load(); } diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp index b161c78c..a6756608 100644 --- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp +++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp @@ -38,7 +38,7 @@ NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent, const char *n setInstance(KGenericFactory<NetMeetingPlugin>::instance()); m_manager=parent; - new TDEAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; + new TDEAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQ_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ; setXMLFile("netmeetingchatui.rc"); } diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp index b42f9e93..f1d8da6a 100644 --- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp +++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp @@ -47,7 +47,7 @@ NetMeetingInvitation::~NetMeetingInvitation() TQString NetMeetingInvitation::invitationHead() { - TQTimer::singleShot( 10*60000, this, TQT_SLOT( slotTimeout() ) ); //send TIMEOUT in 10 minute if the invitation has not been accepted/refused + TQTimer::singleShot( 10*60000, this, TQ_SLOT( slotTimeout() ) ); //send TIMEOUT in 10 minute if the invitation has not been accepted/refused return TQString( MSNInvitation::invitationHead()+ "Session-Protocol: SM1\r\n" "Session-ID: {6672F94C-45BF-11D7-B4AE-00010A1008DF}\r\n" //FIXME i don't know what is the session id @@ -89,7 +89,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg) manager->service()->sendCommand( "MSG" , "N", true, message ); oki=false; - TQTimer::singleShot( 10* 60000, this, TQT_SLOT( slotTimeout() ) ); //TIMOUT afte 10 min + TQTimer::singleShot( 10* 60000, this, TQ_SLOT( slotTimeout() ) ); //TIMOUT afte 10 min } else //No { diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp index 17dfcc0b..6e89b8aa 100644 --- a/kopete/plugins/netmeeting/netmeetingplugin.cpp +++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp @@ -41,10 +41,10 @@ NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQ if(MSNProtocol::protocol()) slotPluginLoaded(MSNProtocol::protocol()); else - connect(Kopete::PluginManager::self() , TQT_SIGNAL(pluginLoaded(Kopete::Plugin*) ), this, TQT_SLOT(slotPluginLoaded(Kopete::Plugin*))); + connect(Kopete::PluginManager::self() , TQ_SIGNAL(pluginLoaded(Kopete::Plugin*) ), this, TQ_SLOT(slotPluginLoaded(Kopete::Plugin*))); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * )) , TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); //Add GUI action to all already existing kmm (if the plugin is launched when kopete already rining) TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions(); for (TQValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it) @@ -62,8 +62,8 @@ void NetMeetingPlugin::slotPluginLoaded(Kopete::Plugin *p) { if(p->pluginId()=="MSNProtocol") { - connect( p , TQT_SIGNAL(invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* )) , - this, TQT_SLOT( slotInvitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ))); + connect( p , TQ_SIGNAL(invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* )) , + this, TQ_SLOT( slotInvitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ))); } } @@ -72,9 +72,9 @@ void NetMeetingPlugin::slotNewKMM(Kopete::ChatSession *KMM) MSNChatSession *msnMM=dynamic_cast<MSNChatSession*>(KMM); if(msnMM) { - connect(this , TQT_SIGNAL( destroyed(TQObject*)) , + connect(this , TQ_SIGNAL( destroyed(TQObject*)) , new NetMeetingGUIClient(msnMM) - , TQT_SLOT(deleteLater())); + , TQ_SLOT(deleteLater())); } } diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index dbefa97f..805ca1e7 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -45,7 +45,7 @@ NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*nam ( new TQVBoxLayout( this ) )->setAutoAdd( true ); preferencesDialog = new NetmeetingPrefsUI(this); - connect(preferencesDialog->m_app , TQT_SIGNAL(textChanged(const TQString &)) , this , TQT_SLOT(slotChanged())); + connect(preferencesDialog->m_app , TQ_SIGNAL(textChanged(const TQString &)) , this , TQ_SLOT(slotChanged())); load(); } diff --git a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp index bbc29805..3a8b51ca 100644 --- a/kopete/plugins/nowlistening/nowlisteningguiclient.cpp +++ b/kopete/plugins/nowlistening/nowlisteningguiclient.cpp @@ -32,10 +32,10 @@ NowListeningGUIClient::NowListeningGUIClient( Kopete::ChatSession *parent, NowListeningPlugin *plugin ) : TQObject(parent) , KXMLGUIClient(parent) { - connect(plugin, TQT_SIGNAL(readyForUnload()), TQT_SLOT(slotPluginUnloaded())); + connect(plugin, TQ_SIGNAL(readyForUnload()), TQ_SLOT(slotPluginUnloaded())); m_msgManager = parent; m_action = new TDEAction( i18n( "Send Media Info" ), 0, this, - TQT_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); + TQ_SLOT( slotAdvertToCurrentChat() ), actionCollection(), "actionSendAdvert" ); setXMLFile("nowlisteningchatui.rc"); } diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp index 5e00790a..0a0457c2 100644 --- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp +++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp @@ -92,15 +92,15 @@ NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, cons kdDebug(14307) << k_funcinfo << endl; // Connection for the "/media" command (always needed) - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( - chatSessionCreated( Kopete::ChatSession * )) , TQT_SLOT( slotNewKMM( + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( + chatSessionCreated( Kopete::ChatSession * )) , TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); // If autoadvertising is on... connect(Kopete::ChatSessionManager::self(), - TQT_SIGNAL(aboutToSend(Kopete::Message&)), + TQ_SIGNAL(aboutToSend(Kopete::Message&)), this, - TQT_SLOT(slotOutgoingMessage(Kopete::Message&))); + TQ_SLOT(slotOutgoingMessage(Kopete::Message&))); TQValueList<Kopete::ChatSession*> sessions = Kopete::ChatSessionManager::self()->sessions(); for (TQValueListIterator<Kopete::ChatSession*> it= sessions.begin(); it!=sessions.end() ; ++it) @@ -131,16 +131,16 @@ NowListeningPlugin::NowListeningPlugin( TQObject *parent, const char* name, cons Kopete::CommandHandler::commandHandler()->registerCommand( this, "media", - TQT_SLOT( slotMediaCommand( const TQString &, Kopete::ChatSession * ) ), + TQ_SLOT( slotMediaCommand( const TQString &, Kopete::ChatSession * ) ), i18n("USAGE: /media - Displays information on current song"), 0 ); - connect ( this , TQT_SIGNAL( settingsChanged() ) , this , TQT_SLOT( slotSettingsChanged() ) ); + connect ( this , TQ_SIGNAL( settingsChanged() ) , this , TQ_SLOT( slotSettingsChanged() ) ); // Advert the accounts with the current listened track. d->advertTimer = new TQTimer(this); - connect(d->advertTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAdvertCurrentMusic() ) ); + connect(d->advertTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAdvertCurrentMusic() ) ); d->advertTimer->start(5000); // Update every 5 seconds } @@ -523,27 +523,27 @@ void NowListeningPlugin::slotSettingsChanged() updateCurrentMediaPlayer(); disconnect(Kopete::ChatSessionManager::self(), - TQT_SIGNAL(aboutToSend(Kopete::Message&)), + TQ_SIGNAL(aboutToSend(Kopete::Message&)), this, - TQT_SLOT(slotOutgoingMessage(Kopete::Message&))); + TQ_SLOT(slotOutgoingMessage(Kopete::Message&))); d->advertTimer->stop(); - disconnect(d->advertTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAdvertCurrentMusic())); + disconnect(d->advertTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvertCurrentMusic())); if( NowListeningConfig::self()->chatAdvertising() ) { kdDebug(14307) << k_funcinfo << "Now using chat window advertising." << endl; connect(Kopete::ChatSessionManager::self(), - TQT_SIGNAL(aboutToSend(Kopete::Message&)), + TQ_SIGNAL(aboutToSend(Kopete::Message&)), this, - TQT_SLOT(slotOutgoingMessage(Kopete::Message&))); + TQ_SLOT(slotOutgoingMessage(Kopete::Message&))); } else if( NowListeningConfig::self()->statusAdvertising() || NowListeningConfig::self()->appendStatusAdvertising() ) { kdDebug(14307) << k_funcinfo << "Now using status message advertising." << endl; - connect(d->advertTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAdvertCurrentMusic())); + connect(d->advertTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAdvertCurrentMusic())); d->advertTimer->start(5000); } } diff --git a/kopete/plugins/smpppdcs/detectornetstat.cpp b/kopete/plugins/smpppdcs/detectornetstat.cpp index 6cb85d0e..9d6d8159 100644 --- a/kopete/plugins/smpppdcs/detectornetstat.cpp +++ b/kopete/plugins/smpppdcs/detectornetstat.cpp @@ -45,8 +45,8 @@ void DetectorNetstat::checkStatus() const { m_process = new TDEProcess; *m_process << "netstat" << "-r"; - connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotProcessStdout( TDEProcess *, char *, int))); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); + connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotProcessStdout( TDEProcess *, char *, int))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *))); if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout)) { kdWarning(14312) << k_funcinfo << "Unable to start netstat process!" << endl; diff --git a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp index e2b1ae19..a143e16c 100644 --- a/kopete/plugins/smpppdcs/detectornetworkstatus.cpp +++ b/kopete/plugins/smpppdcs/detectornetworkstatus.cpp @@ -26,8 +26,8 @@ DetectorNetworkStatus::DetectorNetworkStatus(IConnector* connector) : Detector(connector), m_connManager(NULL) { m_connManager = ConnectionManager::self(); - connect(m_connManager, TQT_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)), - this, TQT_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus))); + connect(m_connManager, TQ_SIGNAL(statusChanged(const TQString&, NetworkStatus::EnumStatus)), + this, TQ_SLOT(statusChanged(const TQString&, NetworkStatus::EnumStatus))); } DetectorNetworkStatus::~DetectorNetworkStatus() {} diff --git a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp index dd99d9d0..fc28f017 100644 --- a/kopete/plugins/smpppdcs/smpppdcsplugin.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsplugin.cpp @@ -56,13 +56,13 @@ m_onlineInquiry(NULL) { // we wait for the allPluginsLoaded signal, to connect // as early as possible after startup, but not before // all accounts are ready - connect(Kopete::PluginManager::self(), TQT_SIGNAL(allPluginsLoaded()), - this, TQT_SLOT(allPluginsLoaded())); + connect(Kopete::PluginManager::self(), TQ_SIGNAL(allPluginsLoaded()), + this, TQ_SLOT(allPluginsLoaded())); // if kopete was already running and the plugin // was loaded later, we check once after 15 secs // if all other plugins have been loaded - TQTimer::singleShot(15000, this, TQT_SLOT(allPluginsLoaded())); + TQTimer::singleShot(15000, this, TQ_SLOT(allPluginsLoaded())); } SMPPPDCSPlugin::~SMPPPDCSPlugin() { @@ -80,7 +80,7 @@ void SMPPPDCSPlugin::allPluginsLoaded() { if(Kopete::PluginManager::self()->isAllPluginsLoaded()) { m_timer = new TQTimer(); - connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckStatus())); if(SMPPPDCSConfig::self()->useSmpppd()) { m_timer->start(30000); diff --git a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp index e91a6cc4..338c61e0 100644 --- a/kopete/plugins/smpppdcs/smpppdcspreferences.cpp +++ b/kopete/plugins/smpppdcs/smpppdcspreferences.cpp @@ -66,15 +66,15 @@ SMPPPDCSPreferences::SMPPPDCSPreferences(TQWidget * parent, const char * /* name m_ui->accountList->insertItem(cli); } - connect(m_ui->accountList, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(listClicked(TQListViewItem *))); + connect(m_ui->accountList, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(listClicked(TQListViewItem *))); // connect for modified - connect(m_ui->useNetstat, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModified())); - connect(m_ui->useSmpppd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotModified())); + connect(m_ui->useNetstat, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModified())); + connect(m_ui->useSmpppd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotModified())); - connect(m_ui->SMPPPDLocation->server, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotModified())); - connect(m_ui->SMPPPDLocation->port, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotModified())); - connect(m_ui->SMPPPDLocation->Password, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotModified())); + connect(m_ui->SMPPPDLocation->server, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotModified())); + connect(m_ui->SMPPPDLocation->port, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotModified())); + connect(m_ui->SMPPPDLocation->Password, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotModified())); load(); } diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp index 2902b350..ca4462e8 100644 --- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp +++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp @@ -46,13 +46,13 @@ SMPPPDCSPrefs::SMPPPDCSPrefs(TQWidget* parent, const char* name, WFlags fl) } // signals and slots connections - connect(useNetstat, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(disableSMPPPDSettings())); - connect(useSmpppd, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableSMPPPDSettings())); - connect(autoCSTest, TQT_SIGNAL(clicked()), this, TQT_SLOT(determineCSType())); + connect(useNetstat, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(disableSMPPPDSettings())); + connect(useSmpppd, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableSMPPPDSettings())); + connect(autoCSTest, TQ_SIGNAL(clicked()), this, TQ_SLOT(determineCSType())); if(m_plugin) { - connect((TQObject *)SMPPPDLocation->server, TQT_SIGNAL(textChanged(const TQString&)), - m_plugin, TQT_SLOT(smpppdServerChanged(const TQString&))); + connect((TQObject *)SMPPPDLocation->server, TQ_SIGNAL(textChanged(const TQString&)), + m_plugin, TQ_SLOT(smpppdServerChanged(const TQString&))); } // if netstat is NOT available, disable the option and set to SMPPPD @@ -80,11 +80,11 @@ void SMPPPDCSPrefs::determineCSType() { SMPPPDSearcher searcher; m_curSearcher = &searcher; - connect(&searcher, TQT_SIGNAL(smpppdFound(const TQString&)), this, TQT_SLOT(smpppdFound(const TQString&))); - connect(&searcher, TQT_SIGNAL(smpppdNotFound()), this, TQT_SLOT(smpppdNotFound())); - connect(&searcher, TQT_SIGNAL(scanStarted(uint)), this, TQT_SLOT(scanStarted(uint))); - connect(&searcher, TQT_SIGNAL(scanProgress(uint)), this, TQT_SLOT(scanProgress(uint))); - connect(&searcher, TQT_SIGNAL(scanFinished()), this, TQT_SLOT(scanFinished())); + connect(&searcher, TQ_SIGNAL(smpppdFound(const TQString&)), this, TQ_SLOT(smpppdFound(const TQString&))); + connect(&searcher, TQ_SIGNAL(smpppdNotFound()), this, TQ_SLOT(smpppdNotFound())); + connect(&searcher, TQ_SIGNAL(scanStarted(uint)), this, TQ_SLOT(scanStarted(uint))); + connect(&searcher, TQ_SIGNAL(scanProgress(uint)), this, TQ_SLOT(scanProgress(uint))); + connect(&searcher, TQ_SIGNAL(scanFinished()), this, TQ_SLOT(scanFinished())); searcher.searchNetwork(); m_curSearcher = NULL; @@ -100,7 +100,7 @@ void SMPPPDCSPrefs::scanStarted(uint total) { m_scanProgressDlg->setAllowCancel(TRUE); m_scanProgressDlg->setMinimumDuration(2000); - connect(m_scanProgressDlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(cancelScanning())); + connect(m_scanProgressDlg, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(cancelScanning())); } m_scanProgressDlg->progressBar()->setTotalSteps(total); m_scanProgressDlg->progressBar()->setProgress(0); diff --git a/kopete/plugins/smpppdcs/smpppdsearcher.cpp b/kopete/plugins/smpppdcs/smpppdsearcher.cpp index 8f4c92de..d121292b 100644 --- a/kopete/plugins/smpppdcs/smpppdsearcher.cpp +++ b/kopete/plugins/smpppdcs/smpppdsearcher.cpp @@ -46,7 +46,7 @@ void SMPPPDSearcher::searchNetwork() { m_procNetstat->setEnvironment("LANG", "C"); // we want to force english output *m_procNetstat << "/bin/netstat" << "-rn"; - connect(m_procNetstat, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedNetstat(TDEProcess *,char *,int))); + connect(m_procNetstat, TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQ_SLOT(slotStdoutReceivedNetstat(TDEProcess *,char *,int))); if(!m_procNetstat->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/netstat -rn" << endl << "Perhaps the package net-tools isn't installed." << endl; @@ -90,7 +90,7 @@ void SMPPPDSearcher::slotStdoutReceivedNetstat(TDEProcess * /* proc */, char * b m_procIfconfig->setEnvironment("LANG", "C"); // we want to force english output *m_procIfconfig << "/sbin/ifconfig"; - connect(m_procIfconfig, TQT_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQT_SLOT(slotStdoutReceivedIfconfig(TDEProcess *,char *,int))); + connect(m_procIfconfig, TQ_SIGNAL(receivedStdout(TDEProcess *,char *,int)), this, TQ_SLOT(slotStdoutReceivedIfconfig(TDEProcess *,char *,int))); if(!m_procIfconfig->start(TDEProcess::Block, TDEProcess::Stdout)) { kdDebug(14312) << k_funcinfo << "Couldn't execute /sbin/ifconfig" << endl << "Perhaps the package net-tools isn't installed." << endl; diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index a696c9df..dd333b3a 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -55,8 +55,8 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, generalHTMLPart = new TDEHTMLPart(hbox); generalHTMLPart->setOnlyLocalReferences(true); - connect ( generalHTMLPart->browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect ( generalHTMLPart->browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); mainWidget->tabWidget->insertTab(hbox, i18n("General"), 0); @@ -64,7 +64,7 @@ StatisticsDialog::StatisticsDialog(StatisticsContact *contact, StatisticsDB *db, mainWidget->timePicker->setTime(TQTime::currentTime()); mainWidget->datePicker->setDate(TQDate::currentDate()); - connect(mainWidget->askButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAskButtonClicked())); + connect(mainWidget->askButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAskButtonClicked())); setFocus(); setEscapeButton(Close); diff --git a/kopete/plugins/statistics/statisticsplugin.cpp b/kopete/plugins/statistics/statisticsplugin.cpp index c5eb2b5c..04aeee06 100644 --- a/kopete/plugins/statistics/statisticsplugin.cpp +++ b/kopete/plugins/statistics/statisticsplugin.cpp @@ -53,27 +53,27 @@ StatisticsPlugin::StatisticsPlugin( TQObject *parent, const char *name, const TQ { TDEAction *viewMetaContactStatistics = new TDEAction( i18n("View &Statistics" ), - TQString::fromLatin1( "text-x-log" ), 0, this, TQT_SLOT(slotViewStatistics()), + TQString::fromLatin1( "text-x-log" ), 0, this, TQ_SLOT(slotViewStatistics()), actionCollection(), "viewMetaContactStatistics" ); viewMetaContactStatistics->setEnabled(Kopete::ContactList::self()->selectedMetaContacts().count() == 1); - connect(Kopete::ChatSessionManager::self(),TQT_SIGNAL(chatSessionCreated(Kopete::ChatSession*)), - this, TQT_SLOT(slotViewCreated(Kopete::ChatSession*))); - connect(Kopete::ChatSessionManager::self(),TQT_SIGNAL(aboutToReceive(Kopete::Message&)), - this, TQT_SLOT(slotAboutToReceive(Kopete::Message&))); + connect(Kopete::ChatSessionManager::self(),TQ_SIGNAL(chatSessionCreated(Kopete::ChatSession*)), + this, TQ_SLOT(slotViewCreated(Kopete::ChatSession*))); + connect(Kopete::ChatSessionManager::self(),TQ_SIGNAL(aboutToReceive(Kopete::Message&)), + this, TQ_SLOT(slotAboutToReceive(Kopete::Message&))); - connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactSelected(bool)), - viewMetaContactStatistics, TQT_SLOT(setEnabled(bool))); - connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactAdded(Kopete::MetaContact*)), - this, TQT_SLOT(slotMetaContactAdded(Kopete::MetaContact*))); - connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactRemoved(Kopete::MetaContact*)), - this, TQT_SLOT(slotMetaContactRemoved(Kopete::MetaContact*))); + connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactSelected(bool)), + viewMetaContactStatistics, TQ_SLOT(setEnabled(bool))); + connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactAdded(Kopete::MetaContact*)), + this, TQ_SLOT(slotMetaContactAdded(Kopete::MetaContact*))); + connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactRemoved(Kopete::MetaContact*)), + this, TQ_SLOT(slotMetaContactRemoved(Kopete::MetaContact*))); setXMLFile("statisticsui.rc"); /* Initialization reads the database, so it could be a bit time-consuming due to disk access. This should overcome the problem and makes it non-blocking. */ - TQTimer::singleShot(0, this, TQT_SLOT(slotInitialize())); + TQTimer::singleShot(0, this, TQ_SLOT(slotInitialize())); } void StatisticsPlugin::slotInitialize() @@ -107,7 +107,7 @@ void StatisticsPlugin::slotAboutToReceive(Kopete::Message& m) void StatisticsPlugin::slotViewCreated(Kopete::ChatSession* session) { - connect(session, TQT_SIGNAL(closing(Kopete::ChatSession*)), this, TQT_SLOT(slotViewClosed(Kopete::ChatSession*))); + connect(session, TQ_SIGNAL(closing(Kopete::ChatSession*)), this, TQ_SLOT(slotViewClosed(Kopete::ChatSession*))); } void StatisticsPlugin::slotViewClosed(Kopete::ChatSession* session) @@ -154,12 +154,12 @@ void StatisticsPlugin::slotMetaContactAdded(Kopete::MetaContact *mc) this->slotContactAdded(contact); } - connect(mc, TQT_SIGNAL(onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType)), this, - TQT_SLOT(slotOnlineStatusChanged(Kopete::MetaContact*, Kopete::OnlineStatus::StatusType))); - connect(mc, TQT_SIGNAL(contactAdded( Kopete::Contact *)), this, - TQT_SLOT(slotContactAdded( Kopete::Contact *))); - connect(mc, TQT_SIGNAL(contactRemoved( Kopete::Contact *)), this, - TQT_SLOT(slotContactRemoved( Kopete::Contact *))); + connect(mc, TQ_SIGNAL(onlineStatusChanged( Kopete::MetaContact *, Kopete::OnlineStatus::StatusType)), this, + TQ_SLOT(slotOnlineStatusChanged(Kopete::MetaContact*, Kopete::OnlineStatus::StatusType))); + connect(mc, TQ_SIGNAL(contactAdded( Kopete::Contact *)), this, + TQ_SLOT(slotContactAdded( Kopete::Contact *))); + connect(mc, TQ_SIGNAL(contactRemoved( Kopete::Contact *)), this, + TQ_SLOT(slotContactRemoved( Kopete::Contact *))); } void StatisticsPlugin::slotMetaContactRemoved(Kopete::MetaContact *mc) diff --git a/kopete/plugins/texteffect/texteffectplugin.cpp b/kopete/plugins/texteffect/texteffectplugin.cpp index 47bdbc14..d1e6dc29 100644 --- a/kopete/plugins/texteffect/texteffectplugin.cpp +++ b/kopete/plugins/texteffect/texteffectplugin.cpp @@ -36,11 +36,11 @@ TextEffectPlugin::TextEffectPlugin( TQObject *parent, const char *name, const TQ m_config = new TextEffectConfig; - connect ( this , TQT_SIGNAL( settingsChanged() ) , this , TQT_SLOT( slotSettingsChanged() ) ); + connect ( this , TQ_SIGNAL( settingsChanged() ) , this , TQ_SLOT( slotSettingsChanged() ) ); connect( Kopete::ChatSessionManager::self(), - TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); + TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); last_color=0; } diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp index b178aaf1..4560dd39 100644 --- a/kopete/plugins/texteffect/texteffectpreferences.cpp +++ b/kopete/plugins/texteffect/texteffectpreferences.cpp @@ -52,32 +52,32 @@ TextEffectPreferences::TextEffectPreferences(TQWidget *parent, kdDebug( 14310 ) << "Setting up connections" << endl; - connect(preferencesDialog->mColorsAdd , TQT_SIGNAL(pressed()) , - this , TQT_SLOT(slotAddPressed())); + connect(preferencesDialog->mColorsAdd , TQ_SIGNAL(pressed()) , + this , TQ_SLOT(slotAddPressed())); - connect(preferencesDialog->mColorsRemove , TQT_SIGNAL(pressed()) , - this , TQT_SLOT(slotRemovePressed())); + connect(preferencesDialog->mColorsRemove , TQ_SIGNAL(pressed()) , + this , TQ_SLOT(slotRemovePressed())); - connect(preferencesDialog->mColorsUp , TQT_SIGNAL(pressed()) , - this , TQT_SLOT(slotUpPressed())); + connect(preferencesDialog->mColorsUp , TQ_SIGNAL(pressed()) , + this , TQ_SLOT(slotUpPressed())); - connect(preferencesDialog->mColorsDown , TQT_SIGNAL(pressed()) , - this , TQT_SLOT(slotDownPressed())); + connect(preferencesDialog->mColorsDown , TQ_SIGNAL(pressed()) , + this , TQ_SLOT(slotDownPressed())); // Connect up all the check boxes - connect( preferencesDialog->m_lamer, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); - connect( preferencesDialog->m_casewaves, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); - - connect( preferencesDialog->m_colorRandom, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); - connect( preferencesDialog->m_fg, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); - connect( preferencesDialog->m_char, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); - connect( preferencesDialog->m_words, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotSettingChanged() ) ); + connect( preferencesDialog->m_lamer, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); + connect( preferencesDialog->m_casewaves, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); + + connect( preferencesDialog->m_colorRandom, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); + connect( preferencesDialog->m_fg, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); + connect( preferencesDialog->m_char, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); + connect( preferencesDialog->m_words, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotSettingChanged() ) ); //setMainWidget( preferencesDialog, "Text Effect Plugin" ); diff --git a/kopete/plugins/translator/translatorguiclient.cpp b/kopete/plugins/translator/translatorguiclient.cpp index 70f1266f..8f9278da 100644 --- a/kopete/plugins/translator/translatorguiclient.cpp +++ b/kopete/plugins/translator/translatorguiclient.cpp @@ -37,11 +37,11 @@ TranslatorGUIClient::TranslatorGUIClient( Kopete::ChatSession *parent, const cha : TQObject( parent, name ), KXMLGUIClient( parent ) { setInstance( TranslatorPlugin::plugin()->instance() ); - connect( TranslatorPlugin::plugin(), TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( deleteLater() ) ); + connect( TranslatorPlugin::plugin(), TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( deleteLater() ) ); m_manager = parent; - new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQT_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); + new TDEAction( i18n( "Translate" ), "locale", CTRL + Key_T, this, TQ_SLOT( slotTranslateChat() ), actionCollection(), "translateCurrentMessage" ); setXMLFile( "translatorchatui.rc" ); } @@ -73,7 +73,7 @@ void TranslatorGUIClient::slotTranslateChat() } // We search for src_dst - TranslatorPlugin::plugin()->translateMessage( body, src_lang, dst_lang, this, TQT_SLOT( messageTranslated( const TQVariant & ) ) ); + TranslatorPlugin::plugin()->translateMessage( body, src_lang, dst_lang, this, TQ_SLOT( messageTranslated( const TQVariant & ) ) ); } void TranslatorGUIClient::messageTranslated( const TQVariant &result ) diff --git a/kopete/plugins/translator/translatorplugin.cpp b/kopete/plugins/translator/translatorplugin.cpp index d87830fe..dc94304d 100644 --- a/kopete/plugins/translator/translatorplugin.cpp +++ b/kopete/plugins/translator/translatorplugin.cpp @@ -64,12 +64,12 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ m_languages = new TranslatorLanguages; - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToDisplay( Kopete::Message & ) ), - this, TQT_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( aboutToSend( Kopete::Message & ) ), - this, TQT_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); - connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), - this, TQT_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToDisplay( Kopete::Message & ) ), + this, TQ_SLOT( slotIncomingMessage( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( aboutToSend( Kopete::Message & ) ), + this, TQ_SLOT( slotOutgoingMessage( Kopete::Message & ) ) ); + connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( chatSessionCreated( Kopete::ChatSession * ) ), + this, TQ_SLOT( slotNewKMM( Kopete::ChatSession * ) ) ); TQStringList keys; TQMap<TQString, TQString> m = m_languages->languagesMap(); @@ -78,8 +78,8 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ m_actionLanguage = new TDESelectAction( i18n( "Set &Language" ), "locale", 0, actionCollection(), "contactLanguage" ); m_actionLanguage->setItems( keys ); - connect( m_actionLanguage, TQT_SIGNAL( activated() ), this, TQT_SLOT(slotSetLanguage() ) ); - connect( Kopete::ContactList::self(), TQT_SIGNAL( metaContactSelected( bool ) ), this, TQT_SLOT( slotSelectionChanged( bool ) ) ); + connect( m_actionLanguage, TQ_SIGNAL( activated() ), this, TQ_SLOT(slotSetLanguage() ) ); + connect( Kopete::ContactList::self(), TQ_SIGNAL( metaContactSelected( bool ) ), this, TQ_SLOT( slotSelectionChanged( bool ) ) ); setXMLFile( "translatorui.rc" ); @@ -89,7 +89,7 @@ TranslatorPlugin::TranslatorPlugin( TQObject *parent, const char *name, const TQ slotNewKMM( *it ); loadSettings(); - connect( this, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( loadSettings() ) ); + connect( this, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( loadSettings() ) ); } TranslatorPlugin::~TranslatorPlugin() @@ -275,8 +275,8 @@ TQString TranslatorPlugin::googleTranslateMessage( const TQString &msg, const TQ //job->addMetaData( "content-type", "application/x-www-form-urlencoded" ); //job->addMetaData( "referrer", "http://www.google.com" ); - TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); + TQObject::connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) ); // TDEIO is async and we use a sync API, so use the processEvents hack to work around that // FIXME: We need to make the libkopete API async to get rid of this processEvents. @@ -311,8 +311,8 @@ TQString TranslatorPlugin::babelTranslateMessage( const TQString &msg, const TQS TDEIO::TransferJob *job = TDEIO::get( geturl, false, true ); - TQObject::connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); - TQObject::connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); + TQObject::connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) ); // TDEIO is async and we use a sync API, so use the processEvents hack to work around that // FIXME: We need to make the libkopete API async to get rid of this processEvents. @@ -389,8 +389,8 @@ void TranslatorPlugin::slotDataReceived ( TDEIO::Job *job, const TQByteArray &da void TranslatorPlugin::slotJobDone ( TDEIO::Job *job ) { m_completed[ job ] = true; - TQObject::disconnect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); - TQObject::disconnect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobDone( TDEIO::Job * ) ) ); + TQObject::disconnect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotDataReceived( TDEIO::Job *, const TQByteArray & ) ) ); + TQObject::disconnect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobDone( TDEIO::Job * ) ) ); } void TranslatorPlugin::slotSetLanguage() diff --git a/kopete/plugins/webpresence/webpresenceplugin.cpp b/kopete/plugins/webpresence/webpresenceplugin.cpp index 9ebcb3be..638bd767 100644 --- a/kopete/plugins/webpresence/webpresenceplugin.cpp +++ b/kopete/plugins/webpresence/webpresenceplugin.cpp @@ -56,13 +56,13 @@ WebPresencePlugin::WebPresencePlugin( TQObject *parent, const char *name, const shuttingDown( false ), resultFormatting( WEB_HTML ) { m_writeScheduler = new TQTimer( this ); - connect ( m_writeScheduler, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotWriteFile() ) ); - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountRegistered(Kopete::Account*)), - this, TQT_SLOT( listenToAllAccounts() ) ); - connect( Kopete::AccountManager::self(), TQT_SIGNAL(accountUnregistered(Kopete::Account*)), - this, TQT_SLOT( listenToAllAccounts() ) ); + connect ( m_writeScheduler, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotWriteFile() ) ); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountRegistered(Kopete::Account*)), + this, TQ_SLOT( listenToAllAccounts() ) ); + connect( Kopete::AccountManager::self(), TQ_SIGNAL(accountUnregistered(Kopete::Account*)), + this, TQ_SLOT( listenToAllAccounts() ) ); - connect(this, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT( loadSettings() ) ); + connect(this, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT( loadSettings() ) ); loadSettings(); listenToAllAccounts(); } @@ -131,17 +131,17 @@ void WebPresencePlugin::listenToAccount( Kopete::Account* account ) // Connect to the account's status changed signal // because we can't know if the account has already connected TQObject::disconnect( account->myself(), - TQT_SIGNAL(onlineStatusChanged( Kopete::Contact *, + TQ_SIGNAL(onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, - TQT_SLOT( slotWaitMoreStatusChanges() ) ) ; + TQ_SLOT( slotWaitMoreStatusChanges() ) ) ; TQObject::connect( account->myself(), - TQT_SIGNAL(onlineStatusChanged( Kopete::Contact *, + TQ_SIGNAL(onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), this, - TQT_SLOT( slotWaitMoreStatusChanges() ) ); + TQ_SLOT( slotWaitMoreStatusChanges() ) ); } } @@ -197,8 +197,8 @@ void WebPresencePlugin::slotWriteFile() // upload it to the specified URL KURL src( m_output->name() ); TDEIO::FileCopyJob *job = TDEIO::file_move( src, dest, -1, true, false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadJobResult( TDEIO::Job * ) ) ); } void WebPresencePlugin::slotUploadJobResult( TDEIO::Job *job ) diff --git a/kopete/plugins/webpresence/webpresencepreferences.cpp b/kopete/plugins/webpresence/webpresencepreferences.cpp index 209bc0bc..ccdd4a61 100644 --- a/kopete/plugins/webpresence/webpresencepreferences.cpp +++ b/kopete/plugins/webpresence/webpresencepreferences.cpp @@ -38,8 +38,8 @@ WebPresencePreferences::WebPresencePreferences(TQWidget *parent, const char* /*n // KAutoConfig stuff kautoconfig = new KAutoConfig(TDEGlobal::config(), this, "kautoconfig"); - connect(kautoconfig, TQT_SIGNAL(widgetModified()), TQT_SLOT(widgetModified())); - connect(kautoconfig, TQT_SIGNAL(settingsChanged()), TQT_SLOT(widgetModified())); + connect(kautoconfig, TQ_SIGNAL(widgetModified()), TQ_SLOT(widgetModified())); + connect(kautoconfig, TQ_SIGNAL(settingsChanged()), TQ_SLOT(widgetModified())); kautoconfig->addWidget(preferencesDialog, "Web Presence Plugin"); kautoconfig->retrieveSettings(true); } diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 2c952c6a..208e6421 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -183,15 +183,15 @@ void GaduAccount::initActions() { p->searchAction = new TDEAction( i18n( "&Search for Friends" ), "", 0, - this, TQT_SLOT( slotSearch() ), this, "actionSearch" ); + this, TQ_SLOT( slotSearch() ), this, "actionSearch" ); p->listputAction = new TDEAction( i18n( "Export Contacts to Server" ), "", 0, - this, TQT_SLOT( slotExportContactsList() ), this, "actionListput" ); + this, TQ_SLOT( slotExportContactsList() ), this, "actionListput" ); p->listToFileAction = new TDEAction( i18n( "Export Contacts to File..." ), "", 0, - this, TQT_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); + this, TQ_SLOT( slotExportContactsListToFile() ), this, "actionListputFile" ); p->listFromFileAction = new TDEAction( i18n( "Import Contacts From File..." ), "", 0, - this, TQT_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); + this, TQ_SLOT( slotImportContactsFromFile() ), this, "actionListgetFile" ); p->friendsModeAction = new TDEToggleAction( i18n( "Only for Friends" ), "", 0, - this, TQT_SLOT( slotFriendsMode() ), this, + this, TQ_SLOT( slotFriendsMode() ), this, "actionFriendsMode" ); static_cast<TDEToggleAction*>(p->friendsModeAction)->setChecked( p->forFriends ); @@ -200,34 +200,34 @@ GaduAccount::initActions() void GaduAccount::initConnections() { - TQObject::connect( p->session_, TQT_SIGNAL( error( const TQString&, const TQString& ) ), - TQT_SLOT( error( const TQString&, const TQString& ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( messageReceived( KGaduMessage* ) ), - TQT_SLOT( messageReceived( KGaduMessage* ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( contactStatusChanged( KGaduNotify* ) ), - TQT_SLOT( contactStatusChanged( KGaduNotify* ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( connectionFailed( gg_failure_t )), - TQT_SLOT( connectionFailed( gg_failure_t ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( connectionSucceed( ) ), - TQT_SLOT( connectionSucceed( ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ), - TQT_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( ackReceived( unsigned int ) ), - TQT_SLOT( ackReceived( unsigned int ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( userListExported() ), - TQT_SLOT( userListExportDone() ) ); - TQObject::connect( p->session_, TQT_SIGNAL( userListRecieved( const TQString& ) ), - TQT_SLOT( userlist( const TQString& ) ) ); - TQObject::connect( p->session_, TQT_SIGNAL( incomingCtcp( unsigned int ) ), - TQT_SLOT( slotIncomingDcc( unsigned int ) ) ); - - TQObject::connect( p->pingTimer_, TQT_SIGNAL( timeout() ), - TQT_SLOT( pingServer() ) ); - - TQObject::connect( p->exportTimer_, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUserlistSynch() ) ); + TQObject::connect( p->session_, TQ_SIGNAL( error( const TQString&, const TQString& ) ), + TQ_SLOT( error( const TQString&, const TQString& ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( messageReceived( KGaduMessage* ) ), + TQ_SLOT( messageReceived( KGaduMessage* ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( contactStatusChanged( KGaduNotify* ) ), + TQ_SLOT( contactStatusChanged( KGaduNotify* ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( connectionFailed( gg_failure_t )), + TQ_SLOT( connectionFailed( gg_failure_t ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( connectionSucceed( ) ), + TQ_SLOT( connectionSucceed( ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( disconnect( Kopete::Account::DisconnectReason ) ), + TQ_SLOT( slotSessionDisconnect( Kopete::Account::DisconnectReason ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( ackReceived( unsigned int ) ), + TQ_SLOT( ackReceived( unsigned int ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( userListExported() ), + TQ_SLOT( userListExportDone() ) ); + TQObject::connect( p->session_, TQ_SIGNAL( userListRecieved( const TQString& ) ), + TQ_SLOT( userlist( const TQString& ) ) ); + TQObject::connect( p->session_, TQ_SIGNAL( incomingCtcp( unsigned int ) ), + TQ_SLOT( slotIncomingDcc( unsigned int ) ) ); + + TQObject::connect( p->pingTimer_, TQ_SIGNAL( timeout() ), + TQ_SLOT( pingServer() ) ); + + TQObject::connect( p->exportTimer_, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUserlistSynch() ) ); } void @@ -287,22 +287,22 @@ GaduAccount::actionMenu() } p->actionMenu_->insert( new TDEAction( i18n( "Go O&nline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_AVAIL ).iconFor( this ), - 0, this, TQT_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoOnline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Busy" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_BUSY ).iconFor( this ), - 0, this, TQT_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoBusy() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Invisible" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_INVISIBLE ).iconFor( this ), - 0, this, TQT_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoInvisible() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Go &Offline" ), GaduProtocol::protocol()->convertStatus( GG_STATUS_NOT_AVAIL ).iconFor( this ), - 0, this, TQT_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); + 0, this, TQ_SLOT( slotGoOffline() ), this, "actionGaduConnect" ) ); p->actionMenu_->insert( new TDEAction( i18n( "Set &Description..." ), "application-vnd.tde.info", - 0, this, TQT_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); + 0, this, TQ_SLOT( slotDescription() ), this, "actionGaduDescription" ) ); p->actionMenu_->insert( p->friendsModeAction ); diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 26bece4e..d42272ca 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -48,7 +48,7 @@ GaduAddContactPage::GaduAddContactPage( GaduAccount* owner, TQWidget* parent, co account_ = owner; ( new TQVBoxLayout( this ) )->setAutoAdd( true ); addUI_ = new GaduAddUI( this ); - connect( addUI_->addEdit_, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotUinChanged( const TQString & ) ) ); + connect( addUI_->addEdit_, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotUinChanged( const TQString & ) ) ); addUI_->addEdit_->setValidChars( "1234567890" ); addUI_->addEdit_->setText( "" ); addUI_->groups->setDisabled( TRUE ); diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index 592c545e..d56fc124 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -58,7 +58,7 @@ GaduAway::GaduAway( GaduAccount* account, TQWidget* parent, const char* name ) } ui_->textEdit_->setText( account->myself()->property( "awayMessage" ).value().toString() ); - connect( this, TQT_SIGNAL( applyClicked() ), TQT_SLOT( slotApply() ) ); + connect( this, TQ_SIGNAL( applyClicked() ), TQ_SLOT( slotApply() ) ); } int diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 0b4bc18b..18473c00 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -58,11 +58,11 @@ GaduCommand::checkSocket( int fd, int checkWhat ) { read_ = new TQSocketNotifier( fd, TQSocketNotifier::Read, this ); read_->setEnabled( false ); - TQObject::connect( read_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) ); write_ = new TQSocketNotifier( fd, TQSocketNotifier::Write, this ); write_->setEnabled( false ); - TQObject::connect( write_, TQT_SIGNAL( activated(int) ), TQT_SLOT( forwarder() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated(int) ), TQ_SLOT( forwarder() ) ); enableNotifiers( checkWhat ); } @@ -147,7 +147,7 @@ RegisterCommand::requestToken() return; } - connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) ); + connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) ); checkSocket( session_->fd, session_->check ); return; @@ -183,7 +183,7 @@ RegisterCommand::execute() return; } state = RegisterStateWaitingForNumber; - connect( this, TQT_SIGNAL( socketReady() ), TQT_SLOT( watcher() ) ); + connect( this, TQ_SIGNAL( socketReady() ), TQ_SLOT( watcher() ) ); checkSocket( session_->fd, session_->check ); } @@ -236,7 +236,7 @@ void RegisterCommand::watcher() } gg_token_free( session_ ); session_ = NULL; - disconnect( this, TQT_SLOT( watcher() ) ); + disconnect( this, TQ_SLOT( watcher() ) ); return; break; } @@ -282,7 +282,7 @@ void RegisterCommand::watcher() } gg_free_register( session_ ); session_ = NULL; - disconnect( this, TQT_SLOT( watcher() ) ); + disconnect( this, TQ_SLOT( watcher() ) ); deleteLater(); return; break; diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index 5ae08d1f..5e7d8a1a 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -145,9 +145,9 @@ GaduContact::manager( Kopete::Contact::CanCreateFlags canCreate ) { if ( !msgManager_ && canCreate ) { msgManager_ = Kopete::ChatSessionManager::self()->create( account_->myself(), thisContact_, GaduProtocol::protocol() ); - connect( msgManager_, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ), - this, TQT_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) ); - connect( msgManager_, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotChatSessionDestroyed() ) ); + connect( msgManager_, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession*) ), + this, TQ_SLOT( messageSend( Kopete::Message&, Kopete::ChatSession*) ) ); + connect( msgManager_, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotChatSessionDestroyed() ) ); } kdDebug(14100) << "GaduContact::manager returning: " << msgManager_ << endl; @@ -163,8 +163,8 @@ GaduContact::slotChatSessionDestroyed() void GaduContact::initActions() { - actionSendMessage_ = KopeteStdAction::sendMessage( this, TQT_SLOT( execute() ), this, "actionMessage" ); - actionInfo_ = KopeteStdAction::contactInfo( this, TQT_SLOT( slotUserInfo() ), this, "actionInfo" ); + actionSendMessage_ = KopeteStdAction::sendMessage( this, TQ_SLOT( execute() ), this, "actionMessage" ); + actionInfo_ = KopeteStdAction::contactInfo( this, TQ_SLOT( slotUserInfo() ), this, "actionInfo" ); } void @@ -195,13 +195,13 @@ GaduContact::customContextMenuActions() TQPtrList<TDEAction> *fakeCollection = new TQPtrList<TDEAction>(); //show profile TDEAction* actionShowProfile = new TDEAction( i18n("Show Profile") , "application-vnd.tde.info", 0, - this, TQT_SLOT( slotShowPublicProfile() ), + this, TQ_SLOT( slotShowPublicProfile() ), this, "actionShowPublicProfile" ); fakeCollection->append( actionShowProfile ); TDEAction* actionEditContact = new TDEAction( i18n("Edit...") , "edit", 0, - this, TQT_SLOT( slotEditContact() ), + this, TQ_SLOT( slotEditContact() ), this, "actionEditContact" ); fakeCollection->append( actionEditContact ); diff --git a/kopete/protocols/gadu/gadudcc.cpp b/kopete/protocols/gadu/gadudcc.cpp index bd861032..f198377a 100644 --- a/kopete/protocols/gadu/gadudcc.cpp +++ b/kopete/protocols/gadu/gadudcc.cpp @@ -134,7 +134,7 @@ GaduDCC::registerAccount( GaduAccount* account ) dccServer = new GaduDCCServer(); } - connect( dccServer, TQT_SIGNAL( incoming( gg_dcc*, bool& ) ), TQT_SLOT( slotIncoming( gg_dcc*, bool& ) ) ); + connect( dccServer, TQ_SIGNAL( incoming( gg_dcc*, bool& ) ), TQ_SLOT( slotIncoming( gg_dcc*, bool& ) ) ); initmutex.unlock(); diff --git a/kopete/protocols/gadu/gadudccserver.cpp b/kopete/protocols/gadu/gadudccserver.cpp index 8994c8b0..0e00245b 100644 --- a/kopete/protocols/gadu/gadudccserver.cpp +++ b/kopete/protocols/gadu/gadudccserver.cpp @@ -121,8 +121,8 @@ GaduDCCServer::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); } } diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index d7ce3ae3..6367e5cb 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -143,10 +143,10 @@ GaduDCCTransaction::setupIncoming( gg_dcc* dccS ) peer = dccS->uin; - connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ), - this, TQT_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); - connect ( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), - this, TQT_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) ); + connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString & ) ), + this, TQ_SLOT( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); + connect ( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), + this, TQ_SLOT( slotTransferRefused( const Kopete::FileTransferInfo & ) ) ); incoming = true; createNotifiers( true ); @@ -195,8 +195,8 @@ GaduDCCTransaction::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( watcher() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( watcher() ) ); } } @@ -279,7 +279,7 @@ GaduDCCTransaction::slotIncomingTransferAccepted ( Kopete::Transfer* transfer, c dccSock_->file_fd = localFile_.handle(); } - connect ( transfer, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotTransferResult() ) ); + connect ( transfer, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotTransferResult() ) ); // reenable notifiers enableNotifiers( dccSock_->check ); diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 30411c4b..ff4a5aca 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -81,14 +81,14 @@ GaduEditAccount::GaduEditAccount( GaduProtocol* proto, Kopete::Account* ident, T useTls_->setCurrentItem( isSsl ? ( account_->useTls() ) : 2 ); ignoreCheck_->setChecked( account_->ignoreAnons() ); - connect( account(), TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + connect( account(), TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); connectLabel->setText( i18n( "personal information being fetched from server", "<p align=\"center\">Fetching from server</p>" ) ); seqNr = account_->getPersonalInformation(); } - connect( registerNew, TQT_SIGNAL( clicked( ) ), TQT_SLOT( registerNewAccount( ) ) ); + connect( registerNew, TQ_SIGNAL( clicked( ) ), TQ_SLOT( registerNewAccount( ) ) ); TQWidget::setTabOrder( loginEdit_, passwordWidget_->mRemembered ); TQWidget::setTabOrder( passwordWidget_->mRemembered, passwordWidget_->mPassword ); @@ -157,7 +157,7 @@ GaduEditAccount::slotSearchResult( const SearchResult& result, unsigned int seq enableUserInfo( true ); - disconnect( TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + disconnect( TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); } void @@ -179,7 +179,7 @@ GaduEditAccount::registerNewAccount() { registerNew->setDisabled( true ); regDialog = new GaduRegisterAccount( NULL , "Register account dialog" ); - connect( regDialog, TQT_SIGNAL( registeredNumber( unsigned int, TQString ) ), TQT_SLOT( newUin( unsigned int, TQString ) ) ); + connect( regDialog, TQ_SIGNAL( registeredNumber( unsigned int, TQString ) ), TQ_SLOT( newUin( unsigned int, TQString ) ) ); if ( regDialog->exec() != TQDialog::Accepted ) { loginEdit_->setText( "" ); return; diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index ea102227..c067397a 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -117,8 +117,8 @@ GaduEditContact::init() // fill values from cl into proper fields on widget show(); - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotApply() ) ); - connect( ui_->groups, TQT_SIGNAL( clicked( TQListViewItem * ) ), TQT_SLOT( listClicked( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotApply() ) ); + connect( ui_->groups, TQ_SIGNAL( clicked( TQListViewItem * ) ), TQ_SLOT( listClicked( TQListViewItem * ) ) ); } void diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 00ba18ed..6072c63f 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -146,24 +146,24 @@ GaduPublicDir::slotListSelected( ) void GaduPublicDir::initConnections() { - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( slotSearch() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotNewSearch() ) ); - connect( this, TQT_SIGNAL( user3Clicked() ), TQT_SLOT( slotAddContact() ) ); - - connect( mAccount, TQT_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), - TQT_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); - - connect( mMainWidget->nameS, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->surname, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->nick, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->UIN, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->cityS, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->gender, TQT_SIGNAL( activated( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->ageFrom, TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->ageTo, TQT_SIGNAL( valueChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( mMainWidget->radioByData, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( inputChanged( bool ) ) ); - - connect( mMainWidget->listFound, TQT_SIGNAL( selectionChanged () ), TQT_SLOT( slotListSelected() ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( slotSearch() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotNewSearch() ) ); + connect( this, TQ_SIGNAL( user3Clicked() ), TQ_SLOT( slotAddContact() ) ); + + connect( mAccount, TQ_SIGNAL( pubDirSearchResult( const SearchResult&, unsigned int ) ), + TQ_SLOT( slotSearchResult( const SearchResult&, unsigned int ) ) ); + + connect( mMainWidget->nameS, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->surname, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->nick, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->UIN, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->cityS, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->gender, TQ_SIGNAL( activated( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->ageFrom, TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->ageTo, TQ_SIGNAL( valueChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( mMainWidget->radioByData, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( inputChanged( bool ) ) ); + + connect( mMainWidget->listFound, TQ_SIGNAL( selectionChanged () ), TQ_SLOT( slotListSelected() ) ); } diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 497f58b0..fb1506c2 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -50,18 +50,18 @@ GaduRegisterAccount::GaduRegisterAccount( TQWidget* parent, const char* name ) emailRegexp = new TQRegExp( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "gadu_protocol", TDEIcon::Small ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( doRegister() ) ); - connect( this, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotClose() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( doRegister() ) ); + connect( this, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotClose() ) ); - connect( ui->valueEmailAddress, TQT_SIGNAL( textChanged( const TQString &) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valuePassword, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valuePasswordVerify, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); - connect( ui->valueVerificationSequence, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valueEmailAddress, TQ_SIGNAL( textChanged( const TQString &) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valuePassword, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valuePasswordVerify, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); + connect( ui->valueVerificationSequence, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( inputChanged( const TQString & ) ) ); - connect( cRegister, TQT_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); - connect( cRegister, TQT_SIGNAL( done( const TQString&, const TQString& ) ), TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( error( const TQString&, const TQString& ) ), TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - connect( cRegister, TQT_SIGNAL( operationStatus( const TQString ) ), TQT_SLOT( updateStatus( const TQString ) ) ); + connect( cRegister, TQ_SIGNAL( tokenRecieved( TQPixmap, TQString ) ), TQ_SLOT( displayToken( TQPixmap, TQString ) ) ); + connect( cRegister, TQ_SIGNAL( done( const TQString&, const TQString& ) ), TQ_SLOT( registrationDone( const TQString&, const TQString& ) ) ); + connect( cRegister, TQ_SIGNAL( error( const TQString&, const TQString& ) ), TQ_SLOT( registrationError( const TQString&, const TQString& ) ) ); + connect( cRegister, TQ_SIGNAL( operationStatus( const TQString ) ), TQ_SLOT( updateStatus( const TQString ) ) ); updateStatus( i18n( "Retrieving token" ) ); cRegister->requestToken(); @@ -166,10 +166,10 @@ GaduRegisterAccount::registrationError( const TQString& title, const TQString& updateStatus( i18n( "Registration failed: %1" ).arg( what ) ); KMessageBox::sorry( this, "Registration was unsucessful, please try again.", title ); - disconnect( this, TQT_SLOT( displayToken( TQPixmap, TQString ) ) ); - disconnect( this, TQT_SLOT( registrationDone( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( registrationError( const TQString&, const TQString& ) ) ); - disconnect( this, TQT_SLOT( updateStatus( const TQString ) ) ); + disconnect( this, TQ_SLOT( displayToken( TQPixmap, TQString ) ) ); + disconnect( this, TQ_SLOT( registrationDone( const TQString&, const TQString& ) ) ); + disconnect( this, TQ_SLOT( registrationError( const TQString&, const TQString& ) ) ); + disconnect( this, TQ_SLOT( updateStatus( const TQString ) ) ); ui->valueVerificationSequence->setDisabled( true ); ui->valueVerificationSequence->setText( "" ); diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index f1660ffd..ec123fe7 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -120,8 +120,8 @@ GaduSession::createNotifiers( bool connect ) write_->setEnabled( false ); if ( connect ) { - TQObject::connect( read_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) ); - TQObject::connect( write_, TQT_SIGNAL( activated( int ) ), TQT_SLOT( checkDescriptor() ) ); + TQObject::connect( read_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) ); + TQObject::connect( write_, TQ_SIGNAL( activated( int ) ), TQ_SLOT( checkDescriptor() ) ); } } diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index e5d016de..14489141 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -74,17 +74,17 @@ GroupWiseAccount::GroupWiseAccount( GroupWiseProtocol *parent, const TQString& a myself()->setOnlineStatus( GroupWiseProtocol::protocol()->groupwiseOffline ); // Contact list management - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), - TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), - TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), + TQ_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), + TQ_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); m_actionAutoReply = new TDEAction ( i18n( "&Set Auto-Reply..." ), TQString(), 0, this, - TQT_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); + TQ_SLOT( slotSetAutoReply() ), this, "actionSetAutoReply"); m_actionJoinChatRoom = new TDEAction ( i18n( "&Join Channel..." ), TQString(), 0, this, - TQT_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); + TQ_SLOT( slotJoinChatRoom() ), this, "actionJoinChatRoom"); m_actionManagePrivacy = new TDEAction ( i18n( "&Manage Privacy..." ), TQString(), 0, this, - TQT_SLOT( slotPrivacy() ), this, "actionPrivacy"); + TQ_SLOT( slotPrivacy() ), this, "actionPrivacy"); m_connector = 0; m_TQCATLS = 0; @@ -113,7 +113,7 @@ TDEActionMenu* GroupWiseAccount::actionMenu() /* Used for debugging */ /* theActionMenu->insert( new TDEAction ( "Test rtfize()", TQString(), 0, this, - TQT_SLOT( slotTestRTFize() ), this, + TQ_SLOT( slotTestRTFize() ), this, "actionTestRTFize") ); */ return m_actionMenu; @@ -178,8 +178,8 @@ GroupWiseChatSession * GroupWiseAccount::chatSession( Kopete::ContactPtrList oth m_chatSessions.append( chatSession ); // listen for the message manager telling us that the user //has left the conference so we remove it from our map - TQObject::connect( chatSession, TQT_SIGNAL( leavingConference( GroupWiseChatSession * ) ), - TQT_SLOT( slotLeavingConference( GroupWiseChatSession * ) ) ); + TQObject::connect( chatSession, TQ_SIGNAL( leavingConference( GroupWiseChatSession * ) ), + TQ_SLOT( slotLeavingConference( GroupWiseChatSession * ) ) ); break; } //kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << @@ -268,80 +268,80 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) m_tlsHandler = new TQCATLSHandler( m_TQCATLS ); m_clientStream = new ClientStream( m_connector, m_tlsHandler, 0); - TQObject::connect( m_connector, TQT_SIGNAL( error() ), this, TQT_SLOT( slotConnError() ) ); - TQObject::connect( m_connector, TQT_SIGNAL( connected() ), this, TQT_SLOT( slotConnConnected() ) ); + TQObject::connect( m_connector, TQ_SIGNAL( error() ), this, TQ_SLOT( slotConnError() ) ); + TQObject::connect( m_connector, TQ_SIGNAL( connected() ), this, TQ_SLOT( slotConnConnected() ) ); - TQObject::connect (m_clientStream, TQT_SIGNAL (connectionClosed()), - this, TQT_SLOT (slotCSDisconnected())); - TQObject::connect (m_clientStream, TQT_SIGNAL (delayedCloseFinished()), - this, TQT_SLOT (slotCSDisconnected())); + TQObject::connect (m_clientStream, TQ_SIGNAL (connectionClosed()), + this, TQ_SLOT (slotCSDisconnected())); + TQObject::connect (m_clientStream, TQ_SIGNAL (delayedCloseFinished()), + this, TQ_SLOT (slotCSDisconnected())); // Notify us when the transport layer is connected - TQObject::connect( m_clientStream, TQT_SIGNAL( connected() ), TQT_SLOT( slotCSConnected() ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( connected() ), TQ_SLOT( slotCSConnected() ) ); // it's necessary to catch this signal and tell the TLS handler to proceed // even if we don't check cert validity - TQObject::connect( m_tlsHandler, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT( slotTLSHandshaken()) ); + TQObject::connect( m_tlsHandler, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT( slotTLSHandshaken()) ); // starts the client once the security layer is up, but see below - TQObject::connect( m_clientStream, TQT_SIGNAL( securityLayerActivated(int) ), TQT_SLOT( slotTLSReady(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( securityLayerActivated(int) ), TQ_SLOT( slotTLSReady(int) ) ); // we could handle login etc in start(), in which case we would emit this signal after that - //TQObject::connect (jabberClientStream, TQT_SIGNAL (authenticated()), - // this, TQT_SLOT (slotCSAuthenticated ())); + //TQObject::connect (jabberClientStream, TQ_SIGNAL (authenticated()), + // this, TQ_SLOT (slotCSAuthenticated ())); // we could also get do the actual login in response to this.. - //TQObject::connect (m_clientStream, TQT_SIGNAL (needAuthParams(bool, bool, bool)), - // this, TQT_SLOT (slotCSNeedAuthParams (bool, bool, bool))); + //TQObject::connect (m_clientStream, TQ_SIGNAL (needAuthParams(bool, bool, bool)), + // this, TQ_SLOT (slotCSNeedAuthParams (bool, bool, bool))); // not implemented: warning - TQObject::connect( m_clientStream, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotCSWarning(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotCSWarning(int) ) ); // not implemented: error - TQObject::connect( m_clientStream, TQT_SIGNAL( error(int) ), TQT_SLOT( slotCSError(int) ) ); + TQObject::connect( m_clientStream, TQ_SIGNAL( error(int) ), TQ_SLOT( slotCSError(int) ) ); m_client = new Client( 0, CMSGPRES_GW_6_5 ); // NB these are prefixed with TQObject:: to avoid any chance of a clash with our connect() methods. // we connected successfully - TQObject::connect( m_client, TQT_SIGNAL( loggedIn() ), TQT_SLOT( slotLoggedIn() ) ); + TQObject::connect( m_client, TQ_SIGNAL( loggedIn() ), TQ_SLOT( slotLoggedIn() ) ); // or connection failed - TQObject::connect( m_client, TQT_SIGNAL( loginFailed() ), TQT_SLOT( slotLoginFailed() ) ); + TQObject::connect( m_client, TQ_SIGNAL( loginFailed() ), TQ_SLOT( slotLoginFailed() ) ); // folder listed - TQObject::connect( m_client, TQT_SIGNAL( folderReceived( const FolderItem & ) ), TQT_SLOT( receiveFolder( const FolderItem & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( folderReceived( const FolderItem & ) ), TQ_SLOT( receiveFolder( const FolderItem & ) ) ); // contact listed - TQObject::connect( m_client, TQT_SIGNAL( contactReceived( const ContactItem & ) ), TQT_SLOT( receiveContact( const ContactItem & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactReceived( const ContactItem & ) ), TQ_SLOT( receiveContact( const ContactItem & ) ) ); // contact details listed - TQObject::connect( m_client, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQT_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ), TQ_SLOT( receiveContactUserDetails( const GroupWise::ContactDetails & ) ) ); // contact status changed - TQObject::connect( m_client, TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SLOT( receiveStatus( const TQString &, TQ_UINT16 , const TQString & ) ) ); // incoming message - TQObject::connect( m_client, TQT_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( messageReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); // auto reply to one of our messages because the recipient is away - TQObject::connect( m_client, TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQT_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( ourStatusChanged( GroupWise::Status, const TQString &, const TQString & ) ), TQ_SLOT( changeOurStatus( GroupWise::Status, const TQString &, const TQString & ) ) ); // conference events TQObject::connect( m_client, - TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), - TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( invitationReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveInvitation( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceLeft( const ConferenceEvent & ) ), TQT_SLOT( receiveConferenceLeft( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveConferenceJoinNotify( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ), TQT_SLOT( receiveInviteNotify( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQT_SLOT( receiveInviteDeclined( const ConferenceEvent & ) ) ); + TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), + TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( invitationReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveInvitation( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceLeft( const ConferenceEvent & ) ), TQ_SLOT( receiveConferenceLeft( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveConferenceJoinNotify( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ), TQ_SLOT( receiveInviteNotify( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQ_SLOT( receiveInviteDeclined( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( conferenceJoined( const GroupWise::ConferenceGuid &, const TQStringList &, const TQStringList & ) ), TQT_SLOT( receiveConferenceJoin( const GroupWise::ConferenceGuid &, const TQStringList & , const TQStringList & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( conferenceJoined( const GroupWise::ConferenceGuid &, const TQStringList &, const TQStringList & ) ), TQ_SLOT( receiveConferenceJoin( const GroupWise::ConferenceGuid &, const TQStringList & , const TQStringList & ) ) ); // typing events - TQObject::connect( m_client, TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ), - TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), - TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ), + TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), + TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); // misc - TQObject::connect( m_client, TQT_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails &) ), TQT_SLOT( receiveAccountDetails( const GroupWise::ContactDetails & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( connectedElsewhere() ), TQT_SLOT( slotConnectedElsewhere() ) ); + TQObject::connect( m_client, TQ_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails &) ), TQ_SLOT( receiveAccountDetails( const GroupWise::ContactDetails & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( connectedElsewhere() ), TQ_SLOT( slotConnectedElsewhere() ) ); // privacy - contacts can't connect directly to this signal because myself() is initialised before m_client - TQObject::connect( m_client->privacyManager(), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ) ); + TQObject::connect( m_client->privacyManager(), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ) ); // GW7 - TQObject::connect( m_client, TQT_SIGNAL( broadcastReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); - TQObject::connect( m_client, TQT_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ), TQT_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( broadcastReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); + TQObject::connect( m_client, TQ_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ), TQ_SLOT( handleIncomingMessage( const ConferenceEvent & ) ) ); struct utsname utsBuf; uname (&utsBuf); @@ -358,7 +358,7 @@ void GroupWiseAccount::performConnectWithPassword( const TQString &password ) myself()->setOnlineStatus( protocol()->groupwiseConnecting ); m_client->connectToServer( m_clientStream, dn, true ); - TQObject::connect( m_client, TQT_SIGNAL( messageSendingFailed() ), TQT_SLOT( slotMessageSendingFailed() ) ); + TQObject::connect( m_client, TQ_SIGNAL( messageSendingFailed() ), TQ_SLOT( slotMessageSendingFailed() ) ); } void GroupWiseAccount::slotMessageSendingFailed() @@ -940,7 +940,7 @@ void GroupWiseAccount::receiveContact( const ContactItem & contact ) kdDebug( GROUPWISE_DEBUG_GLOBAL ) << " - ERROR - contact's folder doesn't exist on server" << endl; DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( contact.parentId, contact.id ); -// TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); +// TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); return; } @@ -1165,7 +1165,7 @@ bool GroupWiseAccount::createContact( const TQString& contactId, Kopete::MetaCon // get the contact's full name to use as the display name of the created contact CreateContactTask * cct = new CreateContactTask( client()->rootTask() ); cct->contactFromUserId( contactId, parentContact->displayName(), highestFreeSequence, folders, topLevel ); - TQObject::connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( receiveContactCreated() ) ); + TQObject::connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( receiveContactCreated() ) ); cct->go( true ); return true; } @@ -1228,7 +1228,7 @@ void GroupWiseAccount::deleteContact( GroupWiseContact * contact ) { DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( ::tqt_cast<GWFolder*>( (*it)->parent() )->id, (*it)->id ); - TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); } } @@ -1541,21 +1541,21 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); mit->moveContact( instance, destinationFolder->id ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); mit->go(); } else if ( *candidateGrp == Kopete::Group::topLevel() ) { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); mit->moveContact( instance, 0 ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); mit->go(); } else { MoveContactTask * mit = new MoveContactTask( client()->rootTask() ); - TQObject::connect( mit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), - TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( mit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), + TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); // discover the next free sequence number and add the group using that mit->moveContactToNewFolder( instance, nextFreeSequence++, ( *candidateGrp )->displayName() ); @@ -1609,7 +1609,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) DeleteItemTask * dit = new DeleteItemTask( client()->rootTask() ); dit->item( folder->id, (*candidateInst)->id ); - TQObject::connect( dit, TQT_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQT_SLOT( receiveContactDeleted( const ContactItem & ) ) ); + TQObject::connect( dit, TQ_SIGNAL( gotContactDeleted( const ContactItem & ) ), TQ_SLOT( receiveContactDeleted( const ContactItem & ) ) ); dit->go( true ); instances.remove( candidateInst ); @@ -1636,7 +1636,7 @@ void GroupWiseAccount::syncContact( GroupWiseContact * contact ) UpdateContactTask * uct = new UpdateContactTask( client()->rootTask() ); uct->renameContact( contact->metaContact()->displayName(), instancesToChange ); - TQObject::connect ( uct, TQT_SIGNAL( finished() ), contact, TQT_SLOT( renamedOnServer() ) ); + TQObject::connect ( uct, TQ_SIGNAL( finished() ), contact, TQ_SLOT( renamedOnServer() ) ); uct->go( true ); } } diff --git a/kopete/protocols/groupwise/gwbytestream.cpp b/kopete/protocols/groupwise/gwbytestream.cpp index 62bd272a..03cb46be 100644 --- a/kopete/protocols/groupwise/gwbytestream.cpp +++ b/kopete/protocols/groupwise/gwbytestream.cpp @@ -39,11 +39,11 @@ KNetworkByteStream::KNetworkByteStream ( TQObject *parent, const char */*name*/ mSocket->enableRead ( true ); // connect signals and slots - TQObject::connect ( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) ); } diff --git a/kopete/protocols/groupwise/gwconnector.cpp b/kopete/protocols/groupwise/gwconnector.cpp index c5a073e3..8839762d 100644 --- a/kopete/protocols/groupwise/gwconnector.cpp +++ b/kopete/protocols/groupwise/gwconnector.cpp @@ -34,8 +34,8 @@ KNetworkConnector::KNetworkConnector ( TQObject *parent, const char */*name*/ ) mByteStream = new KNetworkByteStream ( this ); - connect ( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect ( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); + connect ( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect ( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); mPort = 0; } diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 0c70b04c..fdea9eb2 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -56,8 +56,8 @@ GroupWiseContact::GroupWiseContact( Kopete::Account* account, const TQString &dn { m_dn = dn; } - connect( static_cast< GroupWiseAccount *>( account ), TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), - TQT_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); + connect( static_cast< GroupWiseAccount *>( account ), TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), + TQ_SLOT( receivePrivacyChanged( const TQString &, bool ) ) ); setOnlineStatus( ( parent && parent->isTemporary() ) ? protocol()->groupwiseUnknown : protocol()->groupwiseOffline ); } @@ -166,7 +166,7 @@ TQPtrList<TDEAction> *GroupWiseContact::customContextMenuActions() TQString label = account()->isContactBlocked( m_dn ) ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !m_actionBlock ) { - m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlock() ), + m_actionBlock = new TDEAction( label, "msn_blocked",0, this, TQ_SLOT( slotBlock() ), this, "actionBlock" ); } else diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index cf0c3225..de9151ed 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -53,22 +53,22 @@ GroupWiseChatSession::GroupWiseChatSession(const Kopete::Contact* user, Kopete:: // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); - connect( this, TQT_SIGNAL( myselfTyping ( bool ) ), TQT_SLOT( slotSendTypingNotification ( bool ) ) ); - connect( account(), TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ), - TQT_SLOT( slotGotTypingNotification( const ConferenceEvent & ) ) ); - connect( account(), TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), - TQT_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); + connect ( this, TQ_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect( this, TQ_SIGNAL( myselfTyping ( bool ) ), TQ_SLOT( slotSendTypingNotification ( bool ) ) ); + connect( account(), TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ), + TQ_SLOT( slotGotTypingNotification( const ConferenceEvent & ) ) ); + connect( account(), TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ), + TQ_SLOT( slotGotNotTypingNotification( const ConferenceEvent & ) ) ); // Set up the Invite menu m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), actionCollection() , "gwInvite" ); - connect( m_actionInvite->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT(slotActionInviteAboutToShow() ) ) ; + connect( m_actionInvite->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT(slotActionInviteAboutToShow() ) ) ; - m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQT_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); + m_secure = new TDEAction( i18n( "Security Status" ), "encrypted", TDEShortcut(), this, TQ_SLOT( slotShowSecurity() ), actionCollection(), "gwSecureChat" ); m_secure->setToolTip( i18n( "Conversation is secure" ) ); - m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQT_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); + m_logging = new TDEAction( i18n( "Archiving Status" ), "logchat", TDEShortcut(), this, TQ_SLOT( slotShowArchiving() ), actionCollection(), "gwLoggingChat" ); updateArchiving(); setXMLFile("gwchatui.rc"); @@ -154,8 +154,8 @@ void GroupWiseChatSession::createConference() invitees.append( static_cast< GroupWiseContact * >( contact )->dn() ); } // this is where we will set the GUID and send any pending messages - connect( account(), TQT_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), TQT_SLOT( receiveGuid( const int, const GroupWise::ConferenceGuid & ) ) ); - connect( account(), TQT_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQT_SLOT( slotCreationFailed( const int, const int ) ) ); + connect( account(), TQ_SIGNAL( conferenceCreated( const int, const GroupWise::ConferenceGuid & ) ), TQ_SLOT( receiveGuid( const int, const GroupWise::ConferenceGuid & ) ) ); + connect( account(), TQ_SIGNAL( conferenceCreationFailed( const int, const int ) ), TQ_SLOT( slotCreationFailed( const int, const int ) ) ); // create the conference account()->createConference( mmId(), invitees ); @@ -310,13 +310,13 @@ void GroupWiseChatSession::slotActionInviteAboutToShow() if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { TDEAction *a=new KopeteContactAction( it.current(), this, - TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); + TQ_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteActions.append( a ) ; } } // Invite someone off-list - TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("&Other..."), 0, this, TQ_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteActions.append( b ) ; } @@ -363,7 +363,7 @@ void GroupWiseChatSession::slotInviteOtherContact() m_searchDlg = new KDialogBase( w, "invitesearchdialog", false, i18n( "Search for Contact to Invite" ), KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( account(), TQListView::Single, true, m_searchDlg, "invitesearchwidget" ); m_searchDlg->setMainWidget( m_search ); - connect( m_search, TQT_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( m_search, TQ_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQ_SLOT( enableButtonOK( bool ) ) ); m_searchDlg->enableButtonOK( false ); } m_searchDlg->show(); diff --git a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp index 3ee9b947..bedf8d64 100644 --- a/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/chatroommanager.cpp @@ -52,7 +52,7 @@ void ChatroomManager::getChatrooms( bool refresh ) m_replace = !refresh; SearchChatTask * sct = new SearchChatTask( m_client->rootTask() ); sct->search( ( refresh ? SearchChatTask::SinceLastSearch : SearchChatTask::FetchAll ) ); - connect( sct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatroomList() ) ); + connect( sct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatroomList() ) ); sct->go( true ); } @@ -80,7 +80,7 @@ void ChatroomManager::slotGotChatroomList() void ChatroomManager::updateCounts() { ChatCountsTask * cct = new ChatCountsTask( m_client->rootTask() ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatCounts() ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatCounts() ) ); cct->go( true ); } @@ -108,7 +108,7 @@ void ChatroomManager::requestProperties( const TQString & displayName ) { ChatPropertiesTask * cpt = new ChatPropertiesTask( m_client->rootTask() ); cpt->setChat( displayName ); - connect ( cpt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotChatProperties() ) ); + connect ( cpt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotChatProperties() ) ); cpt->go( true ); } } diff --git a/kopete/protocols/groupwise/libgroupwise/client.cpp b/kopete/protocols/groupwise/libgroupwise/client.cpp index 21c1b1d0..d9b5b385 100644 --- a/kopete/protocols/groupwise/libgroupwise/client.cpp +++ b/kopete/protocols/groupwise/libgroupwise/client.cpp @@ -86,7 +86,7 @@ Client::Client(TQObject *par, uint protocolVersion ) d->protocolVersion = protocolVersion; // Sends regular keepalives so the server knows we are still running d->keepAliveTimer = new TQTimer( this ); - connect( d->keepAliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( sendKeepAlive() ) ); + connect( d->keepAliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( sendKeepAlive() ) ); } Client::~Client() @@ -100,12 +100,12 @@ Client::~Client() void Client::connectToServer( ClientStream *s, const NovellDN &server, bool auth ) { d->stream = s; - //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); - //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); - connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); - connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); - //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); + //connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected())); + //connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken())); + connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int))); + //connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &))); + connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead())); + //connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished())); d->stream->connectToServer(server, auth); } @@ -136,27 +136,27 @@ void Client::start( const TQString &host, const uint port, const TQString &userI LoginTask * login = new LoginTask( d->root ); - connect( login, TQT_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) ); + connect( login, TQ_SIGNAL( gotMyself( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( accountDetailsReceived( const GroupWise::ContactDetails & ) ) ); - connect( login, TQT_SIGNAL( gotFolder( const FolderItem & ) ), - this, TQT_SIGNAL( folderReceived( const FolderItem & ) ) ); + connect( login, TQ_SIGNAL( gotFolder( const FolderItem & ) ), + this, TQ_SIGNAL( folderReceived( const FolderItem & ) ) ); - connect( login, TQT_SIGNAL( gotContact( const ContactItem & ) ), - this, TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( login, TQ_SIGNAL( gotContact( const ContactItem & ) ), + this, TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); - connect( login, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ; + connect( login, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ) ; - connect( login, TQT_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), - privacyManager(), TQT_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); + connect( login, TQ_SIGNAL( gotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ), + privacyManager(), TQ_SLOT( slotGotPrivacySettings( bool, bool, const TQStringList &, const TQStringList & ) ) ); - connect( login, TQT_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), - TQT_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); + connect( login, TQ_SIGNAL( gotCustomStatus( const GroupWise::CustomStatus & ) ), + TQ_SLOT( lt_gotCustomStatus( const GroupWise::CustomStatus & ) ) ); - connect( login, TQT_SIGNAL( gotKeepalivePeriod( int ) ), TQT_SLOT( lt_gotKeepalivePeriod( int ) ) ); + connect( login, TQ_SIGNAL( gotKeepalivePeriod( int ) ), TQ_SLOT( lt_gotKeepalivePeriod( int ) ) ); - connect( login, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + connect( login, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); login->initialise(); login->go( true ); @@ -194,26 +194,26 @@ void Client::initialiseEventTasks() { // The StatusTask handles incoming status changes StatusTask * st = new StatusTask( d->root ); // FIXME - add an additional EventRoot? - connect( st, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( st, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); // The ConferenceTask handles incoming conference events, messages, joins, leaves, etc ConferenceTask * ct = new ConferenceTask( d->root ); - connect( ct, TQT_SIGNAL( message( const ConferenceEvent & ) ), TQT_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( typing( const ConferenceEvent & ) ), TQT_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( notTyping( const ConferenceEvent & ) ), TQT_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( joined( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( left( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( invited( const ConferenceEvent & ) ), TQT_SIGNAL( invitationReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQT_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQT_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( closed( const ConferenceEvent & ) ), TQT_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( autoReply( const ConferenceEvent & ) ), TQT_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( broadcast( const ConferenceEvent & ) ), TQT_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) ); - connect( ct, TQT_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQT_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( message( const ConferenceEvent & ) ), TQ_SLOT( ct_messageReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( typing( const ConferenceEvent & ) ), TQ_SIGNAL( contactTyping( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( notTyping( const ConferenceEvent & ) ), TQ_SIGNAL( contactNotTyping( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( joined( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceJoinNotifyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( left( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceLeft( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( invited( const ConferenceEvent & ) ), TQ_SIGNAL( invitationReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( otherInvited( const ConferenceEvent & ) ), TQ_SIGNAL( inviteNotifyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ), TQ_SIGNAL( invitationDeclined( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( closed( const ConferenceEvent & ) ), TQ_SIGNAL( conferenceClosed( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( autoReply( const ConferenceEvent & ) ), TQ_SIGNAL( autoReplyReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( broadcast( const ConferenceEvent & ) ), TQ_SIGNAL( broadcastReceived( const ConferenceEvent & ) ) ); + connect( ct, TQ_SIGNAL( systemBroadcast( const ConferenceEvent & ) ), TQ_SIGNAL( systemBroadcastReceived( const ConferenceEvent & ) ) ); // The ConnectionTask handles incoming connection events ConnectionTask* cont = new ConnectionTask( d->root ); - connect( cont, TQT_SIGNAL( connectedElsewhere() ), TQT_SIGNAL( connectedElsewhere() ) ); + connect( cont, TQ_SIGNAL( connectedElsewhere() ), TQ_SIGNAL( connectedElsewhere() ) ); } void Client::setStatus( GroupWise::Status status, const TQString & reason, const TQString & autoReply ) @@ -221,7 +221,7 @@ void Client::setStatus( GroupWise::Status status, const TQString & reason, const debug( TQString("Setting status to %1").arg( status ) );; SetStatusTask * sst = new SetStatusTask( d->root ); sst->status( status, reason, autoReply ); - connect( sst, TQT_SIGNAL( finished() ), this, TQT_SLOT( sst_statusChanged() ) ); + connect( sst, TQ_SIGNAL( finished() ), this, TQ_SLOT( sst_statusChanged() ) ); sst->go( true ); // TODO: set status change in progress flag } @@ -230,7 +230,7 @@ void Client::requestStatus( const TQString & userDN ) { GetStatusTask * gst = new GetStatusTask( d->root ); gst->userDN( userDN ); - connect( gst, TQT_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQT_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); + connect( gst, TQ_SIGNAL( gotStatus( const TQString &, TQ_UINT16, const TQString & ) ), TQ_SIGNAL( statusReceived( const TQString &, TQ_UINT16, const TQString & ) ) ); gst->go( true ); } @@ -238,7 +238,7 @@ void Client::sendMessage( const TQStringList & addresseeDNs, const OutgoingMessa { SendMessageTask * smt = new SendMessageTask( d->root ); smt->message( addresseeDNs, message ); - connect( smt, TQT_SIGNAL( finished() ), TQT_SLOT( smt_messageSent() ) ); + connect( smt, TQ_SIGNAL( finished() ), TQ_SLOT( smt_messageSent() ) ); smt->go( true ); } @@ -259,15 +259,15 @@ void Client::createConference( const int clientId, const TQStringList & particip { CreateConferenceTask * cct = new CreateConferenceTask( d->root ); cct->conference( clientId, participants ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( cct_conferenceCreated() ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( cct_conferenceCreated() ) ); cct->go( true ); } void Client::requestDetails( const TQStringList & userDNs ) { GetDetailsTask * gdt = new GetDetailsTask( d->root ); gdt->userDNs( userDNs ); - connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - this, TQT_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ); + connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + this, TQ_SIGNAL( contactUserDetailsReceived( const GroupWise::ContactDetails & ) ) ); gdt->go( true ); } @@ -275,7 +275,7 @@ void Client::joinConference( const GroupWise::ConferenceGuid & guid ) { JoinConferenceTask * jct = new JoinConferenceTask( d->root ); jct->join( guid ); - connect( jct, TQT_SIGNAL( finished() ), TQT_SLOT( jct_joinConfCompleted() ) ); + connect( jct, TQ_SIGNAL( finished() ), TQ_SLOT( jct_joinConfCompleted() ) ); jct->go( true ); } @@ -291,7 +291,7 @@ void Client::leaveConference( const GroupWise::ConferenceGuid & guid ) { LeaveConferenceTask * lct = new LeaveConferenceTask( d->root ); lct->leave( guid ); - //connect( lct, TQT_SIGNAL( finished() ), TQT_SLOT( lct_leftConference() ) ); + //connect( lct, TQ_SIGNAL( finished() ), TQ_SLOT( lct_leftConference() ) ); lct->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp index 0c395159..5dce23a6 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwclientstream.cpp @@ -149,13 +149,13 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d = new Private; d->mode = Client; d->conn = conn; - connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) ); - connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) ); - connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); - connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) ); + connect( d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()) ); + connect( d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()) ); + connect( &d->client, TQ_SIGNAL( outgoingData( const TQByteArray& ) ), TQ_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); + connect( &d->client, TQ_SIGNAL( incomingData() ), TQ_SLOT ( cp_incomingData() ) ); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); d->tlsHandler = tlsHandler; // all the extra stuff happening in the larger ctor happens at connect time :) } @@ -446,17 +446,17 @@ void ClientStream::cp_incomingData() void ClientStream::cr_connected() { d->bs = d->conn->stream(); - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); //d->client.startDialbackOut("andbit.net", "im.pyxa.org"); //d->client.startServerOut(d->server); @@ -585,7 +585,7 @@ void ClientStream::processNext() { if( !d->in.isEmpty() ) { //d->in_rrsig = true; - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } } diff --git a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp index 4960310a..7d81b7ea 100644 --- a/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/privacymanager.cpp @@ -97,7 +97,7 @@ void PrivacyManager::setDefaultAllow( bool allow ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->defaultPolicy( !allow ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) ); pit->go( true ); } @@ -105,7 +105,7 @@ void PrivacyManager::setDefaultDeny( bool deny ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->defaultPolicy( deny); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDefaultPolicyChanged() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDefaultPolicyChanged() ) ); pit->go( true ); } @@ -114,7 +114,7 @@ void PrivacyManager::addAllow( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->allow( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowAdded() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowAdded() ) ); pit->go( true ); } @@ -123,7 +123,7 @@ void PrivacyManager::addDeny( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->deny( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyAdded() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyAdded() ) ); pit->go( true ); } @@ -131,7 +131,7 @@ void PrivacyManager::removeAllow( const TQString & dn ) { PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->removeAllow( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotAllowRemoved() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotAllowRemoved() ) ); pit->go( true ); } @@ -140,7 +140,7 @@ void PrivacyManager::removeDeny( const TQString & dn ) // start off a CreatePrivacyItemTask PrivacyItemTask * pit = new PrivacyItemTask( m_client->rootTask() ); pit->removeDeny( dn ); - connect( pit, TQT_SIGNAL( finished() ), TQT_SLOT( slotDenyRemoved() ) ); + connect( pit, TQ_SIGNAL( finished() ), TQ_SLOT( slotDenyRemoved() ) ); pit->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp index 372d7d9a..d5d7aaa6 100644 --- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp +++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.cpp @@ -35,11 +35,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent) { d = new Private; d->tls = parent; - connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); d->state = 0; d->err = -1; } @@ -70,7 +70,7 @@ void TQCATLSHandler::startClient(const TQString &host) d->state = 0; d->err = -1; if(!d->tls->startClient(host)) - TQTimer::singleShot(0, this, TQT_SIGNAL(fail())); + TQTimer::singleShot(0, this, TQ_SIGNAL(fail())); } void TQCATLSHandler::write(const TQByteArray &a) diff --git a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp index 9de147f0..2b466e68 100644 --- a/kopete/protocols/groupwise/libgroupwise/safedelete.cpp +++ b/kopete/protocols/groupwise/libgroupwise/safedelete.cpp @@ -110,7 +110,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/groupwise/libgroupwise/securestream.cpp b/kopete/protocols/groupwise/libgroupwise/securestream.cpp index 656f7e43..10784d1c 100644 --- a/kopete/protocols/groupwise/libgroupwise/securestream.cpp +++ b/kopete/protocols/groupwise/libgroupwise/securestream.cpp @@ -91,11 +91,11 @@ SecureLayer::SecureLayer(TQCA::TLS *t) type = TLS; p.tls = t; init(); - connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); } SecureLayer::SecureLayer(TQCA::SASL *s) @@ -103,9 +103,9 @@ SecureLayer::SecureLayer(TQCA::SASL *s) type = SASL; p.sasl = s; init(); - connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead())); - connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int))); - connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead())); + connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int))); + connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); } #ifdef USE_TLSHANDLER @@ -114,11 +114,11 @@ SecureLayer::SecureLayer(TLSHandler *t) type = TLSH; p.tlsHandler = t; init(); - connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success())); - connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail())); - connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed())); - connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &))); - connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); + connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success())); + connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail())); + connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed())); + connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &))); + connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); } #endif @@ -297,8 +297,8 @@ SecureStream::SecureStream(ByteStream *s) d = new Private; d->bs = s; - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); d->layers.setAutoDelete(true); d->pending = 0; @@ -313,11 +313,11 @@ SecureStream::~SecureStream() void SecureStream::linkLayer(TQObject *s) { - connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken())); - connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &))); - connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &))); - connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &))); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int))); + connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken())); + connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &))); + connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &))); + connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &))); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int))); } int SecureStream::calcPrebytes() const diff --git a/kopete/protocols/groupwise/libgroupwise/task.cpp b/kopete/protocols/groupwise/libgroupwise/task.cpp index 547844d9..f206b6bb 100644 --- a/kopete/protocols/groupwise/libgroupwise/task.cpp +++ b/kopete/protocols/groupwise/libgroupwise/task.cpp @@ -48,7 +48,7 @@ Task::Task(Task *parent) d->transfer = 0; d->client = parent->client(); d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -57,7 +57,7 @@ Task::Task(Client *parent, bool) init(); d->client = parent; - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::~Task() @@ -173,7 +173,7 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - TQTimer::singleShot(0, this, TQT_SLOT(done())); + TQTimer::singleShot(0, this, TQ_SLOT(done())); } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp index c88e22b4..496af2cc 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/conferencetask.cpp @@ -42,8 +42,8 @@ ConferenceTask::ConferenceTask( Task* parent ) registerEvent( GroupWise::ReceivedSystemBroadcast ); // listen to the UserDetailsManager telling us that user details are available - connect( client()->userDetailsManager(), TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); + connect( client()->userDetailsManager(), TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp index d41db4a9..31c077f7 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontactinstancetask.cpp @@ -24,7 +24,7 @@ CreateContactInstanceTask::CreateContactInstanceTask(Task* parent) : NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact - connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); } CreateContactInstanceTask::~CreateContactInstanceTask() diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp index 0d167236..2c3daf55 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/createcontacttask.cpp @@ -76,8 +76,8 @@ void CreateContactTask::onGo() // the add contact action may cause other contacts' sequence numbers to change // CreateContactInstanceTask signals these changes, so we propagate the signal via the Client, to the GroupWiseAccount // This updates our local versions of those contacts using the same mechanism by which they are updated at login. - connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) ); - connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) ); + connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) ); + connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) ); if ( (*it).id == 0 ) // caller asserts that this isn't on the server... { ccit->contactFromDNAndFolder( m_userId, m_displayName, m_firstSequenceNumber++, ( *it ).name ); @@ -92,8 +92,8 @@ void CreateContactTask::onGo() { client()->debug( " - contact is in top level folder " ); CreateContactInstanceTask * ccit = new CreateContactInstanceTask( client()->rootTask() ); - connect( ccit, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), TQT_SLOT( slotContactAdded( const ContactItem & ) ) ); - connect( ccit, TQT_SIGNAL( finished() ), TQT_SLOT( slotCheckContactInstanceCreated() ) ); + connect( ccit, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), TQ_SLOT( slotContactAdded( const ContactItem & ) ) ); + connect( ccit, TQ_SIGNAL( finished() ), TQ_SLOT( slotCheckContactInstanceCreated() ) ); ccit->contactFromDN( m_userId, m_displayName, 0 ); ccit->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp index b7b1f1cc..a606008e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/joinconferencetask.cpp @@ -113,8 +113,8 @@ bool JoinConferenceTask::take( Transfer * transfer ) { client()->debug( "JoinConferenceTask::slotReceiveUserDetails(), requesting details" ); connect( client()->userDetailsManager(), - TQT_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); + TQ_SIGNAL( gotContactDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveUserDetails( const GroupWise::ContactDetails & ) ) ); client()->userDetailsManager()->requestDetails( m_unknowns ); } } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp index 4a24f44f..c70eb37e 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/movecontacttask.cpp @@ -25,7 +25,7 @@ MoveContactTask::MoveContactTask(Task* parent): NeedFolderTask(parent) { // make the client tell the client app (Kopete) when we receive a contact - connect( this, TQT_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQT_SIGNAL( contactReceived( const ContactItem & ) ) ); + connect( this, TQ_SIGNAL( gotContactAdded( const ContactItem & ) ), client(), TQ_SIGNAL( contactReceived( const ContactItem & ) ) ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp index 12c7382a..c1cb696c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/needfoldertask.cpp @@ -27,9 +27,9 @@ void NeedFolderTask::createFolder() { CreateFolderTask * cct = new CreateFolderTask( client()->rootTask() ); cct->folder( 0, m_folderSequence, m_folderDisplayName ); - connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQT_SIGNAL( folderReceived( const FolderItem & ) ) ); - connect( cct, TQT_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQT_SLOT( slotFolderAdded( const FolderItem & ) ) ); - connect( cct, TQT_SIGNAL( finished() ), TQT_SLOT( slotFolderTaskFinished() ) ); + connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), client(), TQ_SIGNAL( folderReceived( const FolderItem & ) ) ); + connect( cct, TQ_SIGNAL( gotFolderAdded( const FolderItem & ) ), TQ_SLOT( slotFolderAdded( const FolderItem & ) ) ); + connect( cct, TQ_SIGNAL( finished() ), TQ_SLOT( slotFolderTaskFinished() ) ); cct->go( true ); } diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp index 87694eb4..10a1ba82 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchchattask.cpp @@ -75,7 +75,7 @@ bool SearchChatTask::take( Transfer * transfer ) m_objectId = sf->value().toInt(); // now start the results poll timer - TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) ); return true; } @@ -84,7 +84,7 @@ void SearchChatTask::slotPollForResults() //create a PollSearchResultsTask GetChatSearchResultsTask * gcsrt = new GetChatSearchResultsTask( client()->rootTask() ); gcsrt->poll( m_objectId ); - connect( gcsrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) ); + connect( gcsrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) ); gcsrt->go( true ); } @@ -97,14 +97,14 @@ void SearchChatTask::slotGotPollResults() { case GetChatSearchResultsTask::GettingData: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer - TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) ); else setSuccess( gcsrt->statusCode() ); break; case GetChatSearchResultsTask::DataRetrieved: // got some results, there may be more. m_results += gcsrt->results(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPollForResults() ) ); break; case GetChatSearchResultsTask::Completed: m_results += gcsrt->results(); diff --git a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp index 1b64c47d..e968c75c 100644 --- a/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tasks/searchusertask.cpp @@ -86,7 +86,7 @@ bool SearchUserTask::take( Transfer * transfer ) return true; } // now start the results poll timer - TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_INITIAL_DELAY, this, TQ_SLOT( slotPollForResults() ) ); return true; } @@ -95,7 +95,7 @@ void SearchUserTask::slotPollForResults() //create a PollSearchResultsTask PollSearchResultsTask * psrt = new PollSearchResultsTask( client()->rootTask() ); psrt->poll( m_queryHandle ); - connect( psrt, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotPollResults() ) ); + connect( psrt, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotPollResults() ) ); psrt->go( true ); } @@ -109,7 +109,7 @@ void SearchUserTask::slotGotPollResults() case PollSearchResultsTask::Pending: case PollSearchResultsTask::InProgess: if ( m_polls < GW_POLL_MAXIMUM ) // restart timer - TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQT_SLOT( slotPollForResults() ) ); + TQTimer::singleShot( GW_POLL_FREQUENCY_MS, this, TQ_SLOT( slotPollForResults() ) ); else setSuccess( psrt->statusCode() ); break; diff --git a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp index aae0205c..0bb0ed1a 100644 --- a/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp +++ b/kopete/protocols/groupwise/libgroupwise/tests/clientstream_test.cpp @@ -12,15 +12,15 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myTLSHandler = new TQCATLSHandler( myTLS ); myTestObject = new ClientStream( myConnector, myTLSHandler, 0); // notify when the transport layer is connected - connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); // it's necessary to catch this signal and tell the TLS handler to proceed, even if we don't check cert validity - connect( myTLSHandler, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(slotTLSHandshaken()) ); + connect( myTLSHandler, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(slotTLSHandshaken()) ); // notify and start sending - connect( myTestObject, TQT_SIGNAL( securityLayerActivated(int) ), TQT_SLOT( slotSend(int) ) ); - connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) ); + connect( myTestObject, TQ_SIGNAL( securityLayerActivated(int) ), TQ_SLOT( slotSend(int) ) ); + connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); } ClientStreamTest::~ClientStreamTest() diff --git a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp index d0605239..ae52ca84 100644 --- a/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp +++ b/kopete/protocols/groupwise/libgroupwise/userdetailsmanager.cpp @@ -97,8 +97,8 @@ void UserDetailsManager::requestDetails( const TQStringList & dnList, bool onlyU { GetDetailsTask * gdt = new GetDetailsTask( m_client->rootTask() ); gdt->userDNs( requestList ); - connect( gdt, TQT_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), - TQT_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) ); + connect( gdt, TQ_SIGNAL( gotContactUserDetails( const GroupWise::ContactDetails & ) ), + TQ_SLOT( slotReceiveContactDetails( const GroupWise::ContactDetails & ) ) ); // TODO: connect to gdt's finished() signal, check for failures, expand gdt to maintain a list of not found DNs? gdt->go( true ); } diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 45dd9ec2..c7aa4b3c 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -82,18 +82,18 @@ void GroupWiseChatPropsDialog::initialise() { kdDebug( GROUPWISE_DEBUG_GLOBAL ) << k_funcinfo << endl; m_widget = new GroupWiseChatPropsWidget( this ); - connect( m_widget->m_topic, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_owner, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_createdOn, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_creator, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_description, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_disclaimer, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_query, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_archive, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_maxUsers, TQT_SIGNAL( textChanged( const TQString & ) ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnAddAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnEditAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); - connect( m_widget->m_btnDeleteAcl, TQT_SIGNAL( clicked() ), TQT_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_topic, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_owner, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_createdOn, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_creator, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_description, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_disclaimer, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_query, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_archive, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_maxUsers, TQ_SIGNAL( textChanged( const TQString & ) ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnAddAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnEditAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); + connect( m_widget->m_btnDeleteAcl, TQ_SIGNAL( clicked() ), TQ_SLOT( slotWidgetChanged() ) ); setMainWidget( m_widget ); show(); } diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index 3cf58e7d..885c8340 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -44,12 +44,12 @@ GroupWiseChatSearchDialog::GroupWiseChatSearchDialog( GroupWiseAccount * account m_manager = m_account->client()->chatroomManager(); - connect ( m_manager, TQT_SIGNAL( updated() ), TQT_SLOT( slotManagerUpdated() ) ); - connect ( m_manager, TQT_SIGNAL( gotProperties( const GroupWise::Chatroom & ) ), - TQT_SLOT( slotGotProperties( const GroupWise::Chatroom & ) ) ); + connect ( m_manager, TQ_SIGNAL( updated() ), TQ_SLOT( slotManagerUpdated() ) ); + connect ( m_manager, TQ_SIGNAL( gotProperties( const GroupWise::Chatroom & ) ), + TQ_SLOT( slotGotProperties( const GroupWise::Chatroom & ) ) ); - connect( m_widget->m_btnRefresh, TQT_SIGNAL( clicked() ), TQT_SLOT( slotUpdateClicked() ) ); - connect( m_widget->m_btnProperties, TQT_SIGNAL( clicked() ), TQT_SLOT( slotPropertiesClicked() ) ); + connect( m_widget->m_btnRefresh, TQ_SIGNAL( clicked() ), TQ_SLOT( slotUpdateClicked() ) ); + connect( m_widget->m_btnProperties, TQ_SIGNAL( clicked() ), TQ_SLOT( slotPropertiesClicked() ) ); m_manager->updateRooms(); show(); diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 4d13b5b9..a9336845 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -81,10 +81,10 @@ void GroupWiseContactProperties::init() m_dialog = new KDialogBase( ::tqt_cast<TQWidget*>( parent() ), "gwcontactpropsdialog", false, i18n( "Contact Properties" ), KDialogBase::Ok ); m_propsWidget = new GroupWiseContactPropsWidget( m_dialog ); // set up the context menu and copy action - m_copyAction = KStdAction::copy( this, TQT_SLOT( slotCopy() ), 0 ); + m_copyAction = KStdAction::copy( this, TQ_SLOT( slotCopy() ), 0 ); connect( m_propsWidget->m_propsView, - TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), - TQT_SLOT( slotShowContextMenu( TQListViewItem *, const TQPoint & ) ) ); + TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint & , int) ), + TQ_SLOT( slotShowContextMenu( TQListViewItem *, const TQPoint & ) ) ); // insert the props widget into the dialog m_dialog->setMainWidget( m_propsWidget ); diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 37a1f26e..64c638d9 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -47,9 +47,9 @@ GroupWiseEditAccountWidget::GroupWiseEditAccountWidget( TQWidget* parent, Kopete m_layout = new TQVBoxLayout( this ); m_preferencesDialog = new GroupWiseAccountPreferences( this ); m_layout->addWidget( m_preferencesDialog ); - connect( m_preferencesDialog->m_password, TQT_SIGNAL( changed() ), this, TQT_SLOT( configChanged() ) ); - connect( m_preferencesDialog->m_server, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( configChanged() ) ); - connect( m_preferencesDialog->m_port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_password, TQ_SIGNAL( changed() ), this, TQ_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_server, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( configChanged() ) ); + connect( m_preferencesDialog->m_port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( configChanged() ) ); if ( account() ) reOpen(); else diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index 208e99fb..aec2b29d 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -68,13 +68,13 @@ GroupWisePrivacyDialog::GroupWisePrivacyDialog( GroupWiseAccount * account, TQWi m_privacy->m_allowList->setSelectionMode( TQListBox::Extended ); m_privacy->m_denyList->setSelectionMode( TQListBox::Extended ); - connect( m_privacy->m_btnAllow, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAllowClicked() ) ); - connect( m_privacy->m_btnBlock, TQT_SIGNAL( clicked() ), TQT_SLOT( slotBlockClicked() ) ); - connect( m_privacy->m_btnAdd, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddClicked() ) ); - connect( m_privacy->m_btnRemove, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemoveClicked() ) ); - connect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotAllowListClicked() ) ); - connect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotDenyListClicked() ) ); - connect( mgr, TQT_SIGNAL( privacyChanged( const TQString &, bool ) ), TQT_SLOT( slotPrivacyChanged() ) ); + connect( m_privacy->m_btnAllow, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAllowClicked() ) ); + connect( m_privacy->m_btnBlock, TQ_SIGNAL( clicked() ), TQ_SLOT( slotBlockClicked() ) ); + connect( m_privacy->m_btnAdd, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddClicked() ) ); + connect( m_privacy->m_btnRemove, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemoveClicked() ) ); + connect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotAllowListClicked() ) ); + connect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotDenyListClicked() ) ); + connect( mgr, TQ_SIGNAL( privacyChanged( const TQString &, bool ) ), TQ_SLOT( slotPrivacyChanged() ) ); m_privacy->m_btnAdd->setEnabled( true ); m_privacy->m_btnAllow->setEnabled( false ); m_privacy->m_btnBlock->setEnabled( false ); @@ -181,8 +181,8 @@ void GroupWisePrivacyDialog::slotAddClicked() KDialogBase::Ok|KDialogBase::Cancel ); m_search = new GroupWiseContactSearch( m_account, TQListView::Multi, false, m_searchDlg, "privacysearchwidget" ); m_searchDlg->setMainWidget( m_search ); - connect( m_searchDlg, TQT_SIGNAL( okClicked() ), TQT_SLOT( slotSearchedForUsers() ) ); - connect( m_search, TQT_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( m_searchDlg, TQ_SIGNAL( okClicked() ), TQ_SLOT( slotSearchedForUsers() ) ); + connect( m_search, TQ_SIGNAL( selectionValidates( bool ) ), m_searchDlg, TQ_SLOT( enableButtonOK( bool ) ) ); m_searchDlg->enableButtonOK( false ); } m_searchDlg->show(); @@ -238,9 +238,9 @@ void GroupWisePrivacyDialog::slotRemoveClicked() void GroupWisePrivacyDialog::slotAllowListClicked() { // don't get into feedback - disconnect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotDenyListClicked() ) ); + disconnect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotDenyListClicked() ) ); m_privacy->m_denyList->clearSelection(); - connect( m_privacy->m_denyList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotDenyListClicked() ) ); + connect( m_privacy->m_denyList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotDenyListClicked() ) ); bool selected = false; for( int i = m_privacy->m_allowList->count() - 1; i >= 0 ; --i ) { @@ -258,9 +258,9 @@ void GroupWisePrivacyDialog::slotAllowListClicked() void GroupWisePrivacyDialog::slotDenyListClicked() { // don't get into feedback - disconnect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotAllowListClicked() ) ); + disconnect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotAllowListClicked() ) ); m_privacy->m_allowList->clearSelection(); - connect( m_privacy->m_allowList, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotAllowListClicked() ) ); + connect( m_privacy->m_allowList, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotAllowListClicked() ) ); bool selected = false; for( int i = m_privacy->m_denyList->count() - 1; i >= 0 ; --i ) { diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 4dbbe45b..b5f4d9a5 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -38,8 +38,8 @@ ReceiveInvitationDialog::ReceiveInvitationDialog( GroupWiseAccount * account, co { m_account = account; m_guid = event.guid; - connect( this, TQT_SIGNAL( yesClicked() ), TQT_SLOT( slotYesClicked() ) ); - connect( this, TQT_SIGNAL( noClicked() ), TQT_SLOT( slotNoClicked() ) ); + connect( this, TQ_SIGNAL( yesClicked() ), TQ_SLOT( slotYesClicked() ) ); + connect( this, TQ_SIGNAL( noClicked() ), TQ_SLOT( slotNoClicked() ) ); GroupWiseContact * c = account->contactForDN( event.user ); diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index addb54cd..6bc26f0d 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -61,10 +61,10 @@ GroupWiseContactSearch::GroupWiseContactSearch( GroupWiseAccount * account, TQLi { m_results->setSelectionMode( mode ); m_results->setAllColumnsShowFocus( true ); - connect( m_details, TQT_SIGNAL( clicked() ), TQT_SLOT( slotShowDetails() ) ); - connect( m_results, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotValidateSelection() ) ); - connect( m_search, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDoSearch() ) ); - connect( m_clear, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( m_details, TQ_SIGNAL( clicked() ), TQ_SLOT( slotShowDetails() ) ); + connect( m_results, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotValidateSelection() ) ); + connect( m_search, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDoSearch() ) ); + connect( m_clear, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); } @@ -130,7 +130,7 @@ void GroupWiseContactSearch::slotDoSearch() // start a search task SearchUserTask * st = new SearchUserTask( m_account->client()->rootTask() ); st->search( searchTerms ); - connect( st, TQT_SIGNAL( finished() ), TQT_SLOT( slotGotSearchResults() ) ); + connect( st, TQ_SIGNAL( finished() ), TQ_SLOT( slotGotSearchResults() ) ); st->go( true ); m_matchCount->setText( i18n( "Searching" ) ); } diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index ab7ba892..5175865a 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -82,36 +82,36 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T TQString version=i18n("Kopete IRC Plugin %1 [http://trinitydesktop.org]").arg(kapp->aboutData()->version()); m_engine->setVersionString( version ); - TQObject::connect(m_engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT(successfullyChangedNick(const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT(successfullyChangedNick(const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingFailedServerPassword()), - this, TQT_SLOT(slotFailedServerPassword())); + TQObject::connect(m_engine, TQ_SIGNAL(incomingFailedServerPassword()), + this, TQ_SLOT(slotFailedServerPassword())); - TQObject::connect(m_engine, TQT_SIGNAL(incomingNickInUse(const TQString &)), - this, TQT_SLOT(slotNickInUseAlert( const TQString &)) ); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNickInUse(const TQString &)), + this, TQ_SLOT(slotNickInUseAlert( const TQString &)) ); - TQObject::connect(m_engine, TQT_SIGNAL(incomingFailedNickOnLogin(const TQString &)), - this, TQT_SLOT(slotNickInUse( const TQString &)) ); + TQObject::connect(m_engine, TQ_SIGNAL(incomingFailedNickOnLogin(const TQString &)), + this, TQ_SLOT(slotNickInUse( const TQString &)) ); - TQObject::connect(m_engine, TQT_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), - this, TQT_SLOT(slotJoinedUnknownChannel(const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), + this, TQ_SLOT(slotJoinedUnknownChannel(const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingCtcpReply(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT( slotNewCtcpReply(const TQString&, const TQString &, const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), - this, TQT_SLOT(engineStatusChanged(KIRC::Engine::Status))); + TQObject::connect(m_engine, TQ_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQ_SLOT(engineStatusChanged(KIRC::Engine::Status))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingServerLoadTooHigh()), - this, TQT_SLOT(slotServerBusy())); + TQObject::connect(m_engine, TQ_SIGNAL(incomingServerLoadTooHigh()), + this, TQ_SLOT(slotServerBusy())); - TQObject::connect(m_engine, TQT_SIGNAL(incomingNoSuchNickname(const TQString &)), - this, TQT_SLOT(slotNoSuchNickname(const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNoSuchNickname(const TQString &)), + this, TQ_SLOT(slotNoSuchNickname(const TQString &))); mAwayAction = new Kopete::AwayAction ( i18n("Set Away"), m_protocol->m_UserStatusAway.iconFor( this ), 0, this, - TQT_SLOT(slotGoAway( const TQString & )), this ); + TQ_SLOT(slotGoAway( const TQString & )), this ); currentHost = 0; @@ -208,9 +208,9 @@ IRCAccount::IRCAccount(IRCProtocol *protocol, const TQString &accountId, const T m_myServer = m_contactManager->myServer(); m_joinChannelAction = new TDEAction ( i18n("Join Channel..."), TQString(), 0, this, - TQT_SLOT(slotJoinChannel()), this); + TQ_SLOT(slotJoinChannel()), this); m_searchChannelAction = new TDEAction ( i18n("Search Channels..."), TQString(), 0, this, - TQT_SLOT(slotSearchChannels()), this); + TQ_SLOT(slotSearchChannels()), this); } IRCAccount::~IRCAccount() @@ -426,12 +426,12 @@ TDEActionMenu *IRCAccount::actionMenu() mActionMenu->popupMenu()->insertSeparator(); mActionMenu->insert(m_joinChannelAction); mActionMenu->insert(m_searchChannelAction); - mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQT_SLOT(slotShowServerWindow()), mActionMenu ) ); + mActionMenu->insert( new TDEAction ( i18n("Show Server Window"), TQString(), 0, this, TQ_SLOT(slotShowServerWindow()), mActionMenu ) ); if( m_engine->isConnected() && m_engine->useSSL() ) { mActionMenu->insert( new TDEAction ( i18n("Show Security Information"), "", 0, m_engine, - TQT_SLOT(showInfoDialog()), mActionMenu ) ); + TQ_SLOT(showInfoDialog()), mActionMenu ) ); } return mActionMenu; @@ -534,7 +534,7 @@ void IRCAccount::engineStatusChanged(KIRC::Engine::Status newStatus) // after the 001 is sent, you need to wait until all the init junk is done. // Unfortunatly, there is no way for us to know when it is done (it could be // spewing out any number of replies), so just try delaying it - TQTimer::singleShot( 250, this, TQT_SLOT( slotPerformOnConnectCommands() ) ); + TQTimer::singleShot( 250, this, TQ_SLOT( slotPerformOnConnectCommands() ) ); } break; case KIRC::Engine::Closing: @@ -598,7 +598,7 @@ void IRCAccount::slotSearchChannels() { m_channelList = new ChannelListDialog( m_engine, i18n("Channel List for %1").arg( m_engine->currentHost() ), this, - TQT_SLOT( slotJoinNamedChannel( const TQString & ) ) ); + TQ_SLOT( slotJoinNamedChannel( const TQString & ) ) ); } else m_channelList->clear(); @@ -889,7 +889,7 @@ IRCContact *IRCAccount::getContact(KIRC::EntityPtr entity, Kopete::MetaContact * m_contacts.append(contact); } - TQObject::connect(contact, TQT_SIGNAL(destroyed(IRCContact *)), TQT_SLOT(destroyed(IRCContact *))); + TQObject::connect(contact, TQ_SIGNAL(destroyed(IRCContact *)), TQ_SLOT(destroyed(IRCContact *))); return contact; } diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp index ec8f61e3..44e20c33 100644 --- a/kopete/protocols/irc/ircaddcontactpage.cpp +++ b/kopete/protocols/irc/ircaddcontactpage.cpp @@ -38,11 +38,11 @@ IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddCon mSearch = new ChannelList( (TQWidget*)ircdata->hbox, a->engine() ); mAccount = a; - connect( mSearch, TQT_SIGNAL( channelSelected( const TQString & ) ), - this, TQT_SLOT( slotChannelSelected( const TQString & ) ) ); + connect( mSearch, TQ_SIGNAL( channelSelected( const TQString & ) ), + this, TQ_SLOT( slotChannelSelected( const TQString & ) ) ); - connect( mSearch, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), - this, TQT_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); + connect( mSearch, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), + this, TQ_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); } IRCAddContactPage::~IRCAddContactPage() diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index c11aec03..1ac0a4b8 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -50,20 +50,20 @@ IRCChannelContact::IRCChannelContact(IRCContactManager *contactManager, const TQ KIRC::Engine *engine = kircEngine(); mInfoTimer = new TQTimer( this ); - TQObject::connect(mInfoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotUpdateInfo() ) ); + TQObject::connect(mInfoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotUpdateInfo() ) ); - TQObject::connect(engine, TQT_SIGNAL(incomingUserIsAway(const TQString &, const TQString &)), - this, TQT_SLOT(slotIncomingUserIsAway(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingUserIsAway(const TQString &, const TQString &)), + this, TQ_SLOT(slotIncomingUserIsAway(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingListedChan(const TQString &, uint, const TQString &)), - this, TQT_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingListedChan(const TQString &, uint, const TQString &)), + this, TQ_SLOT(slotChannelListed(const TQString &, uint, const TQString &))); actionJoin = 0L; - actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQT_SLOT(slotModeChanged()), this ); - actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQT_SLOT(slotModeChanged()), this ); + actionModeT = new TDEToggleAction(i18n("Only Operators Can Change &Topic"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeN = new TDEToggleAction(i18n("&No Outside Messages"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeS = new TDEToggleAction(i18n("&Secret"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeM = new TDEToggleAction(i18n("&Moderated"), 0, this, TQ_SLOT(slotModeChanged()), this ); + actionModeI = new TDEToggleAction(i18n("&Invite Only"), 0, this, TQ_SLOT(slotModeChanged()), this ); actionHomePage = 0L; updateStatus(); @@ -261,7 +261,7 @@ void IRCChannelContact::slotAddNicknames() mJoinedNicks.pop_front(); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotAddNicknames() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAddNicknames() ) ); } void IRCChannelContact::channelTopic(const TQString &topic) @@ -303,9 +303,9 @@ void IRCChannelContact::join() if (manager()) { connect(manager(), - TQT_SIGNAL(onlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, + TQ_SIGNAL(onlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &)), - TQT_SLOT(slotOnlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, + TQ_SLOT(slotOnlineStatusChanged(Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &))); } } @@ -658,15 +658,15 @@ TQPtrList<TDEAction> *IRCChannelContact::customContextMenuActions() TQPtrList<TDEAction> *mCustomActions = new TQPtrList<TDEAction>(); if( !actionJoin ) { - actionJoin = new TDEAction(i18n("&Join"), 0, this, TQT_SLOT(join()), this, "actionJoin"); - actionPart = new TDEAction(i18n("&Part"), 0, this, TQT_SLOT(partAction()), this, "actionPart"); - actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQT_SLOT(setTopic()), this, "actionTopic"); + actionJoin = new TDEAction(i18n("&Join"), 0, this, TQ_SLOT(join()), this, "actionJoin"); + actionPart = new TDEAction(i18n("&Part"), 0, this, TQ_SLOT(partAction()), this, "actionPart"); + actionTopic = new TDEAction(i18n("Change &Topic..."), 0, this, TQ_SLOT(setTopic()), this, "actionTopic"); actionModeMenu = new TDEActionMenu(i18n("Channel Modes"), 0, this, "actionModeMenu"); if( !property(m_protocol->propHomepage).value().isNull() ) { actionHomePage = new TDEAction( i18n("Visit &Homepage"), 0, this, - TQT_SLOT(slotHomepage()), this, "actionHomepage"); + TQ_SLOT(slotHomepage()), this, "actionHomepage"); } else if( actionHomePage ) { @@ -681,8 +681,8 @@ TQPtrList<TDEAction> *IRCChannelContact::customContextMenuActions() actionModeMenu->setEnabled( true ); codecAction = new KCodecAction( i18n("&Encoding"), 0, this, "selectcharset" ); - connect( codecAction, TQT_SIGNAL( activated( const TQTextCodec * ) ), - this, TQT_SLOT( setCodec( const TQTextCodec *) ) ); + connect( codecAction, TQ_SIGNAL( activated( const TQTextCodec * ) ), + this, TQ_SLOT( setCodec( const TQTextCodec *) ) ); codecAction->setCodec( codec() ); } diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index 1df631f9..3532cb4c 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -53,22 +53,22 @@ IRCContact::IRCContact(IRCContactManager *contactManager, const TQString &nick, setProperty( Kopete::Global::Properties::self()->nickName(), m_nickName ); // IRCContactManager stuff - TQObject::connect(contactManager, TQT_SIGNAL(privateMessage(IRCContact *, IRCContact *, const TQString &)), - this, TQT_SLOT(privateMessage(IRCContact *, IRCContact *, const TQString &))); + TQObject::connect(contactManager, TQ_SIGNAL(privateMessage(IRCContact *, IRCContact *, const TQString &)), + this, TQ_SLOT(privateMessage(IRCContact *, IRCContact *, const TQString &))); // Kopete::ChatSessionManager stuff mMyself.append( static_cast<Kopete::Contact*>( this ) ); // KIRC stuff - TQObject::connect(engine, TQT_SIGNAL(incomingNickChange(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString&, const TQString&))); - TQObject::connect(engine, TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT(slotNewNickChange(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)), - this, TQT_SLOT( slotUserDisconnected(const TQString&, const TQString&))); + TQObject::connect(engine, TQ_SIGNAL(incomingNickChange(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString&, const TQString&))); + TQObject::connect(engine, TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT(slotNewNickChange(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingQuitIRC(const TQString &, const TQString &)), + this, TQ_SLOT( slotUserDisconnected(const TQString&, const TQString&))); - TQObject::connect(engine, TQT_SIGNAL(statusChanged(KIRC::Engine::Status)), - this, TQT_SLOT(updateStatus())); + TQObject::connect(engine, TQ_SIGNAL(statusChanged(KIRC::Engine::Status)), + this, TQ_SLOT(updateStatus())); engine->setCodec( m_nickName, codec() ); } @@ -159,10 +159,10 @@ Kopete::ChatSession *IRCContact::manager(Kopete::Contact::CanCreateFlags canCrea m_chatSession = Kopete::ChatSessionManager::self()->create(account->myself(), mMyself, account->protocol()); m_chatSession->setDisplayName(caption()); - TQObject::connect(m_chatSession, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession *)), - this, TQT_SLOT(slotSendMsg(Kopete::Message&, Kopete::ChatSession *))); - TQObject::connect(m_chatSession, TQT_SIGNAL(closing(Kopete::ChatSession *)), - this, TQT_SLOT(chatSessionDestroyed())); + TQObject::connect(m_chatSession, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession *)), + this, TQ_SLOT(slotSendMsg(Kopete::Message&, Kopete::ChatSession *))); + TQObject::connect(m_chatSession, TQ_SIGNAL(closing(Kopete::ChatSession *)), + this, TQ_SLOT(chatSessionDestroyed())); initConversation(); } diff --git a/kopete/protocols/irc/irccontactmanager.cpp b/kopete/protocols/irc/irccontactmanager.cpp index 10ae8a69..7f6c5625 100644 --- a/kopete/protocols/irc/irccontactmanager.cpp +++ b/kopete/protocols/irc/irccontactmanager.cpp @@ -48,23 +48,23 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou // m->setTemporary( true ); m_myServer = new IRCServerContact(this, account->networkName(), m); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingMessage(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotNewMessage(const TQString &, const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingMessage(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotNewMessage(const TQString &, const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingPrivMessage(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotNewPrivMessage(const TQString &, const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingPrivMessage(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotNewPrivMessage(const TQString &, const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingNickChange(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString&, const TQString&))); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingNickChange(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString&, const TQString&))); - TQObject::connect(account->engine(), TQT_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), - this, TQT_SLOT( slotNewNickChange(const TQString &, const TQString &))); + TQObject::connect(account->engine(), TQ_SIGNAL(successfullyChangedNick(const TQString &, const TQString &)), + this, TQ_SLOT( slotNewNickChange(const TQString &, const TQString &))); - TQObject::connect(account->engine(), TQT_SIGNAL(incomingUserOnline(const TQString &)), - this, TQT_SLOT( slotIsonRecieved())); + TQObject::connect(account->engine(), TQ_SIGNAL(incomingUserOnline(const TQString &)), + this, TQ_SLOT( slotIsonRecieved())); - TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL(metaContactAdded( Kopete::MetaContact * )), - this, TQT_SLOT( slotContactAdded( Kopete::MetaContact* ))); + TQObject::connect(Kopete::ContactList::self(), TQ_SIGNAL(metaContactAdded( Kopete::MetaContact * )), + this, TQ_SLOT( slotContactAdded( Kopete::MetaContact* ))); socketTimeout = 15000; TQString timeoutPath = locate( "config", "tdeioslaverc" ); @@ -75,8 +75,8 @@ IRCContactManager::IRCContactManager(const TQString &nickName, IRCAccount *accou } m_NotifyTimer = new TQTimer(this); - TQObject::connect(m_NotifyTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(checkOnlineNotifyList())); + TQObject::connect(m_NotifyTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(checkOnlineNotifyList())); m_NotifyTimer->start(30000); // check online every 30sec new IRCSignalHandler(this); @@ -155,8 +155,8 @@ IRCChannelContact *IRCContactManager::findChannel(const TQString &name, Kopete:: channel = new IRCChannelContact(this, name, m); m_channels.insert( name, channel ); - TQObject::connect(channel, TQT_SIGNAL(contactDestroyed(Kopete::Contact *)), - this, TQT_SLOT(unregister(Kopete::Contact *))); + TQObject::connect(channel, TQ_SIGNAL(contactDestroyed(Kopete::Contact *)), + this, TQ_SLOT(unregister(Kopete::Contact *))); } return channel; @@ -193,8 +193,8 @@ IRCUserContact *IRCContactManager::findUser(const TQString &name, Kopete::MetaCo user = new IRCUserContact(this, name, m); m_users.insert( name, user ); - TQObject::connect(user, TQT_SIGNAL(contactDestroyed(Kopete::Contact *)), - this, TQT_SLOT(unregister(Kopete::Contact *))); + TQObject::connect(user, TQ_SIGNAL(contactDestroyed(Kopete::Contact *)), + this, TQ_SLOT(unregister(Kopete::Contact *))); } return user; @@ -279,7 +279,7 @@ void IRCContactManager::checkOnlineNotifyList() { isonRecieved = false; m_account->engine()->ison( m_NotifyList ); - //TQTimer::singleShot( socketTimeout, this, TQT_SLOT( slotIsonTimeout() ) ); + //TQTimer::singleShot( socketTimeout, this, TQ_SLOT( slotIsonTimeout() ) ); } } diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 6229a294..a74ae8d4 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -169,77 +169,77 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList addAddressBookField("messaging/irc", Kopete::Plugin::MakeIndexField); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("raw"), - TQT_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotRawCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /raw <text> - Sends the text in raw form to the server."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quote"), - TQT_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQuoteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quote <text> - Sends the text in quoted form to the server."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ctcp"), - TQT_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotCtcpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ctcp <nick> <message> - Send the CTCP message to nick<action>."), 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ping"), - TQT_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotPingCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ping <nickname> - Alias for /CTCP <nickname> PING."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("motd"), - TQT_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotMotdCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /motd [<server>] - Shows the message of the day for the current or the given server.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("list"), - TQT_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotListCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /list - List the public channels on the server.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("join"), - TQT_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotJoinCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /join <#channel 1> [<password>] - Joins the specified channel."), 1, 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("topic"), - TQT_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotTopicCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /topic [<topic>] - Sets and/or displays the topic for the active channel.") ); //FIXME: Update help text Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whois"), - TQT_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoisCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whois <nickname> - Display whois info on this user."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("whowas"), - TQT_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoWasCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /whowas <nickname> - Display whowas info on this user."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("who"), - TQT_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotWhoCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /who <nickname|channel> - Display who info on this user/channel."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("query"), - TQT_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQueryCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /query <nickname> [<message>] - Open a private chat with this user."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("mode"), - TQT_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotModeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /mode <channel> <modes> - Set modes on the given channel."), 2 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("nick"), - TQT_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotNickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /nick <nickname> - Change your nickname to the given one."), 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("me"), - TQT_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /me <action> - Do something."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ame"), - TQT_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotAllMeCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ame <action> - Do something in every open chat."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("kick"), - TQT_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotKickCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /kick <nickname> [<reason>] - Kick someone from the channel (requires operator status).") , 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("ban"), - TQT_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotBanCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /ban <mask> - Add someone to this channel's ban list. (requires operator status)."), 1, 1 ); @@ -248,33 +248,33 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList i18n("USAGE: /bannick <nickname> - Add someone to this channel's ban list. Uses the hostmask nickname!*@* (requires operator status)."), Kopete::CommandHandler::SystemAlias, 1, 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("op"), - TQT_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotOpCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /op <nickname 1> [<nickname 2> <...>] - Give channel operator status to someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("deop"), - TQT_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotDeopCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /deop <nickname> [<nickname 2> <...>]- Remove channel operator status from someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("voice"), - TQT_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotVoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /voice <nickname> [<nickname 2> <...>]- Give channel voice status to someone (requires operator status)."), 1); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("devoice"), - TQT_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotDevoiceCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /devoice <nickname> [<nickname 2> <...>]- Remove channel voice status from someone (requires operator status)."), 1 ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("quit"), - TQT_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotQuitCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /quit [<reason>] - Disconnect from IRC, optionally leaving a message.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("part"), - TQT_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotPartCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /part [<reason>] - Part from a channel, optionally leaving a message.") ); Kopete::CommandHandler::commandHandler()->registerCommand( this, TQString::fromLatin1("invite"), - TQT_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), + TQ_SLOT( slotInviteCommand( const TQString &, Kopete::ChatSession*) ), i18n("USAGE: /invite <nickname> [<channel>] - Invite a user to join a channel."), 1 ); Kopete::CommandHandler::commandHandler()->registerAlias( this, TQString::fromLatin1("j"), @@ -286,11 +286,11 @@ IRCProtocol::IRCProtocol( TQObject *parent, const char *name, const TQStringList TQString::fromLatin1("query %s"), i18n("USAGE: /msg <nickname> [<message>] - Alias for QUERY <nickname> <message>."), Kopete::CommandHandler::SystemAlias, 1 ); - TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL(aboutToDisplay(Kopete::Message &)), - this, TQT_SLOT(slotMessageFilter(Kopete::Message &)) ); + TQObject::connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL(aboutToDisplay(Kopete::Message &)), + this, TQ_SLOT(slotMessageFilter(Kopete::Message &)) ); - TQObject::connect( Kopete::ChatSessionManager::self(), TQT_SIGNAL( viewCreated( KopeteView* ) ), - this, TQT_SLOT( slotViewCreated( KopeteView* ) ) ); + TQObject::connect( Kopete::ChatSessionManager::self(), TQ_SIGNAL( viewCreated( KopeteView* ) ), + this, TQ_SLOT( slotViewCreated( KopeteView* ) ) ); setCapabilities( Kopete::Protocol::RichBFormatting | Kopete::Protocol::RichUFormatting | Kopete::Protocol::RichColor ); @@ -774,24 +774,24 @@ void IRCProtocol::editNetworks( const TQString &networkName ) netConf->upButton->setIconSet( SmallIconSet( "go-up" ) ); netConf->downButton->setIconSet( SmallIconSet( "go-down" ) ); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); - connect( netConf, TQT_SIGNAL( accepted() ), this, TQT_SLOT( slotSaveNetworkConfig() ) ); - connect( netConf, TQT_SIGNAL( rejected() ), this, TQT_SLOT( slotReadNetworks() ) ); - connect( netConf->upButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveServerUp() ) ); - connect( netConf->downButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMoveServerDown() ) ); - connect( netConf->removeNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeleteNetwork() ) ); - connect( netConf->removeHost, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDeleteHost() ) ); - connect( netConf->newHost, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNewHost() ) ); - connect( netConf->newNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotNewNetwork() ) ); - connect( netConf->renameNetwork, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotRenameNetwork() ) ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); - connect( netConf->networkList, TQT_SIGNAL( doubleClicked ( TQListBoxItem * )), TQT_SLOT(slotRenameNetwork())); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf, TQ_SIGNAL( accepted() ), this, TQ_SLOT( slotSaveNetworkConfig() ) ); + connect( netConf, TQ_SIGNAL( rejected() ), this, TQ_SLOT( slotReadNetworks() ) ); + connect( netConf->upButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveServerUp() ) ); + connect( netConf->downButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveServerDown() ) ); + connect( netConf->removeNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteNetwork() ) ); + connect( netConf->removeHost, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDeleteHost() ) ); + connect( netConf->newHost, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewHost() ) ); + connect( netConf->newNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotNewNetwork() ) ); + connect( netConf->renameNetwork, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRenameNetwork() ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->networkList, TQ_SIGNAL( doubleClicked ( TQListBoxItem * )), TQ_SLOT(slotRenameNetwork())); } - disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->networkList->clear(); @@ -803,8 +803,8 @@ void IRCProtocol::editNetworks( const TQString &networkName ) netConf->networkList->sort(); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); if( !networkName.isEmpty() ) netConf->networkList->setSelected( netConf->networkList->findItem( networkName ), true ); @@ -830,10 +830,10 @@ void IRCProtocol::slotUpdateNetworkConfig() netConf->hostList->insertItem( (*it)->host + TQString::fromLatin1(":") + TQString::number((*it)->port) ); // prevent nested event loop crash - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->hostList->setSelected( 0, true ); slotUpdateNetworkHostConfig(); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); } // record the current selection @@ -873,9 +873,9 @@ void IRCProtocol::slotHostPortChanged( int value ) { TQString entryText = m_uiCurrentHostSelection + TQString::fromLatin1(":") + TQString::number( value ); // changeItem causes a take() and insert, and we don't want a selectionChanged() signal that sets all this off again. - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); netConf->hostList->changeItem( entryText, netConf->hostList->currentItem() ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); } void IRCProtocol::slotUpdateNetworkHostConfig() @@ -891,9 +891,9 @@ void IRCProtocol::slotUpdateNetworkHostConfig() { netConf->host->setText( host->host ); netConf->password->setText( host->password ); - disconnect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + disconnect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->port->setValue( host->port ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->useSSL->setChecked( host->ssl ); netConf->upButton->setEnabled( netConf->hostList->currentItem() > 0 ); @@ -903,12 +903,12 @@ void IRCProtocol::slotUpdateNetworkHostConfig() else { m_uiCurrentHostSelection = TQString(); - disconnect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + disconnect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); netConf->host->clear(); netConf->password->clear(); netConf->port->setValue( 6667 ); netConf->useSSL->setChecked( false ); - connect( netConf->port, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( slotHostPortChanged( int ) ) ); + connect( netConf->port, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotHostPortChanged( int ) ) ); } } @@ -921,8 +921,8 @@ void IRCProtocol::slotDeleteNetwork() .arg(network), i18n("Deleting Network"), KGuiItem(i18n("&Delete Network"),"edit-delete"), TQString::fromLatin1("AskIRCDeleteNetwork") ) == KMessageBox::Continue ) { - disconnect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); IRCNetwork *net = m_networks[ network ]; for( TQValueList<IRCHost*>::iterator it = net->hosts.begin(); it != net->hosts.end(); ++it ) { @@ -932,8 +932,8 @@ void IRCProtocol::slotDeleteNetwork() m_networks.remove( network ); delete net; netConf->networkList->removeItem( netConf->networkList->currentItem() ); - connect( netConf->networkList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkConfig() ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->networkList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); slotUpdateNetworkHostConfig(); } @@ -950,11 +950,11 @@ void IRCProtocol::slotDeleteHost() IRCHost *host = m_hosts[ hostName ]; if ( host ) { - disconnect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + disconnect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); TQString entryText = host->host + TQString::fromLatin1(":") + TQString::number(host->port); TQListBoxItem * justAdded = netConf->hostList->findItem( entryText ); netConf->hostList->removeItem( netConf->hostList->index( justAdded ) ); - connect( netConf->hostList, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotUpdateNetworkHostConfig() ) ); + connect( netConf->hostList, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotUpdateNetworkHostConfig() ) ); // remove from network as well IRCNetwork *net = m_networks[ m_uiCurrentNetworkSelection ]; diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index 7c7a9d50..0f9189f0 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -35,33 +35,33 @@ IRCServerContact::IRCServerContact(IRCContactManager *contactManager, const TQSt { KIRC::Engine *engine = kircEngine(); - TQObject::connect(engine, TQT_SIGNAL(internalError(KIRC::Engine::Error, KIRC::Message &)), - this, TQT_SLOT(engineInternalError(KIRC::Engine::Error, KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(internalError(KIRC::Engine::Error, KIRC::Message &)), + this, TQ_SLOT(engineInternalError(KIRC::Engine::Error, KIRC::Message &))); /* //FIXME: Have some kind of a debug option for raw input/ouput display?? - TQObject::connect(engine, TQT_SIGNAL(sentMessage(KIRC::Message &)), - this, TQT_SLOT(engineSentMessage(KIRC::Message &))); - TQObject::connect(engine, TQT_SIGNAL(receivedMessage(KIRC::Message &)), - this, TQT_SLOT(engineReceivedMessage(KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(sentMessage(KIRC::Message &)), + this, TQ_SLOT(engineSentMessage(KIRC::Message &))); + TQObject::connect(engine, TQ_SIGNAL(receivedMessage(KIRC::Message &)), + this, TQ_SLOT(engineReceivedMessage(KIRC::Message &))); */ - TQObject::connect(engine, TQT_SIGNAL(incomingNotice(const TQString &, const TQString &)), - this, TQT_SLOT(slotIncomingNotice(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingNotice(const TQString &, const TQString &)), + this, TQ_SLOT(slotIncomingNotice(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingCannotSendToChannel(const TQString &, const TQString &)), - this, TQT_SLOT(slotCannotSendToChannel(const TQString &, const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingCannotSendToChannel(const TQString &, const TQString &)), + this, TQ_SLOT(slotCannotSendToChannel(const TQString &, const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingUnknown(const TQString &)), - this, TQT_SLOT(slotIncomingUnknown(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingUnknown(const TQString &)), + this, TQ_SLOT(slotIncomingUnknown(const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingConnectString(const TQString &)), - this, TQT_SLOT(slotIncomingConnect(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingConnectString(const TQString &)), + this, TQ_SLOT(slotIncomingConnect(const TQString &))); - TQObject::connect(engine, TQT_SIGNAL(incomingMotd(const TQString &)), - this, TQT_SLOT(slotIncomingMotd(const TQString &))); + TQObject::connect(engine, TQ_SIGNAL(incomingMotd(const TQString &)), + this, TQ_SLOT(slotIncomingMotd(const TQString &))); - TQObject::connect(Kopete::ChatSessionManager::self(), TQT_SIGNAL(viewCreated(KopeteView*)), - this, TQT_SLOT(slotViewCreated(KopeteView*)) ); + TQObject::connect(Kopete::ChatSessionManager::self(), TQ_SIGNAL(viewCreated(KopeteView*)), + this, TQ_SLOT(slotViewCreated(KopeteView*)) ); updateStatus(); } @@ -206,7 +206,7 @@ void IRCServerContact::slotDumpMessages() { manager()->appendMessage( mMsgBuffer.front() ); mMsgBuffer.pop_front(); - TQTimer::singleShot( 0, this, TQT_SLOT( slotDumpMessages() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDumpMessages() ) ); } } @@ -214,7 +214,7 @@ void IRCServerContact::slotViewCreated( KopeteView *v ) { kdDebug(14121) << k_funcinfo << "Created: " << v << ", mgr: " << v->msgManager() << ", Mine: " << m_chatSession << endl; if (m_chatSession && v->msgManager() == m_chatSession) - TQTimer::singleShot(500, this, TQT_SLOT(slotDumpMessages())); + TQTimer::singleShot(500, this, TQ_SLOT(slotDumpMessages())); } #include "ircservercontact.moc" diff --git a/kopete/protocols/irc/ircsignalhandler.cpp b/kopete/protocols/irc/ircsignalhandler.cpp index db0acec2..cdc73665 100644 --- a/kopete/protocols/irc/ircsignalhandler.cpp +++ b/kopete/protocols/irc/ircsignalhandler.cpp @@ -29,101 +29,101 @@ IRCSignalHandler::IRCSignalHandler(IRCContactManager *m) KIRC::Engine *m_engine = static_cast<IRCAccount*>( manager->mySelf()->account() )->engine(); //Channel Connections to ourself - TQObject::connect(m_engine, TQT_SIGNAL(incomingNamesList(const TQString &, const TQStringList &)), - this, TQT_SLOT(slotNamesList(const TQString &, const TQStringList &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingNamesList(const TQString &, const TQStringList &)), + this, TQ_SLOT(slotNamesList(const TQString &, const TQStringList &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingEndOfNames(const TQString &)), - this, TQT_SLOT(slotEndOfNames(const TQString &))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingEndOfNames(const TQString &)), + this, TQ_SLOT(slotEndOfNames(const TQString &))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingTopicUser(const TQString &, const TQString &, const TQDateTime &)), - this, TQT_SLOT(slotTopicUser(const TQString&,const TQString&,const TQDateTime&))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingTopicUser(const TQString &, const TQString &, const TQDateTime &)), + this, TQ_SLOT(slotTopicUser(const TQString&,const TQString&,const TQDateTime&))); //Channel String mappings - map<IRCChannelContact>( m, TQT_SIGNAL(incomingFailedChankey(const TQString &)), + map<IRCChannelContact>( m, TQ_SIGNAL(incomingFailedChankey(const TQString &)), &IRCChannelContact::failedChankey ); - map<IRCChannelContact>( m, TQT_SIGNAL(incomingFailedChanFull(const TQString &)), + map<IRCChannelContact>( m, TQ_SIGNAL(incomingFailedChanFull(const TQString &)), &IRCChannelContact::failedChanInvite ); - map<IRCChannelContact>( m, TQT_SIGNAL(incomingFailedChanInvite(const TQString &)), + map<IRCChannelContact>( m, TQ_SIGNAL(incomingFailedChanInvite(const TQString &)), &IRCChannelContact::failedChanInvite ); - map<IRCChannelContact>( m, TQT_SIGNAL(incomingFailedChanBanned(const TQString &)), + map<IRCChannelContact>( m, TQ_SIGNAL(incomingFailedChanBanned(const TQString &)), &IRCChannelContact::failedChanBanned ); - mapSingle<IRCChannelContact>( m, TQT_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), + mapSingle<IRCChannelContact>( m, TQ_SIGNAL(incomingJoinedChannel(const TQString &, const TQString &)), &IRCChannelContact::userJoinedChannel ); - mapSingle<IRCChannelContact>( m, TQT_SIGNAL(incomingExistingTopic(const TQString &, const TQString &)), + mapSingle<IRCChannelContact>( m, TQ_SIGNAL(incomingExistingTopic(const TQString &, const TQString &)), &IRCChannelContact::channelTopic ); - mapSingle<IRCChannelContact>( m, TQT_SIGNAL(incomingChannelHomePage(const TQString &, const TQString &)), + mapSingle<IRCChannelContact>( m, TQ_SIGNAL(incomingChannelHomePage(const TQString &, const TQString &)), &IRCChannelContact::channelHomePage ); mapDouble<IRCChannelContact>( m, - TQT_SIGNAL(incomingPartedChannel(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingPartedChannel(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::userPartedChannel ); mapDouble<IRCChannelContact>( m, - TQT_SIGNAL(incomingTopicChange(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingTopicChange(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::topicChanged ); mapDouble<IRCChannelContact>( m, - TQT_SIGNAL(incomingChannelModeChange(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingChannelModeChange(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::incomingModeChange ); mapDouble<IRCChannelContact>( m, - TQT_SIGNAL(incomingChannelMode(const TQString &, const TQString &,const TQString &)), + TQ_SIGNAL(incomingChannelMode(const TQString &, const TQString &,const TQString &)), &IRCChannelContact::incomingChannelMode ); mapTriple<IRCChannelContact>( m, - TQT_SIGNAL(incomingKick(const TQString &, const TQString &,const TQString &,const TQString &)), + TQ_SIGNAL(incomingKick(const TQString &, const TQString &,const TQString &,const TQString &)), &IRCChannelContact::userKicked ); //User connections to ourself - TQObject::connect(m_engine, TQT_SIGNAL(incomingWhoIsIdle(const TQString &, unsigned long )), - this, TQT_SLOT(slotNewWhoIsIdle(const TQString &, unsigned long ))); + TQObject::connect(m_engine, TQ_SIGNAL(incomingWhoIsIdle(const TQString &, unsigned long )), + this, TQ_SLOT(slotNewWhoIsIdle(const TQString &, unsigned long ))); - TQObject::connect(m_engine, TQT_SIGNAL(incomingWhoReply(const TQString &, const TQString &, const TQString &, + TQObject::connect(m_engine, TQ_SIGNAL(incomingWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, bool, const TQString &, uint, const TQString & )), - this, TQT_SLOT( slotNewWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, + this, TQ_SLOT( slotNewWhoReply(const TQString &, const TQString &, const TQString &, const TQString &, const TQString &, bool, const TQString &, uint, const TQString &))); //User signal mappings - map<IRCUserContact>( m, TQT_SIGNAL(incomingUserOnline( const TQString & )), &IRCUserContact::userOnline ); + map<IRCUserContact>( m, TQ_SIGNAL(incomingUserOnline( const TQString & )), &IRCUserContact::userOnline ); - map<IRCUserContact>( m, TQT_SIGNAL(incomingWhoIsOperator( const TQString & )), &IRCUserContact::newWhoIsOperator ); + map<IRCUserContact>( m, TQ_SIGNAL(incomingWhoIsOperator( const TQString & )), &IRCUserContact::newWhoIsOperator ); - map<IRCUserContact>( m, TQT_SIGNAL(incomingWhoIsIdentified( const TQString & )), &IRCUserContact::newWhoIsIdentified ); + map<IRCUserContact>( m, TQ_SIGNAL(incomingWhoIsIdentified( const TQString & )), &IRCUserContact::newWhoIsIdentified ); - map<IRCUserContact>( m, TQT_SIGNAL(incomingEndOfWhois( const TQString & )), &IRCUserContact::whoIsComplete ); + map<IRCUserContact>( m, TQ_SIGNAL(incomingEndOfWhois( const TQString & )), &IRCUserContact::whoIsComplete ); - map<IRCUserContact>( m, TQT_SIGNAL(incomingEndOfWhoWas( const TQString & )), &IRCUserContact::whoWasComplete ); + map<IRCUserContact>( m, TQ_SIGNAL(incomingEndOfWhoWas( const TQString & )), &IRCUserContact::whoWasComplete ); - mapSingle<IRCUserContact>( m, TQT_SIGNAL(incomingUserIsAway( const TQString &, const TQString & )), + mapSingle<IRCUserContact>( m, TQ_SIGNAL(incomingUserIsAway( const TQString &, const TQString & )), &IRCUserContact::incomingUserIsAway ); - mapSingle<IRCUserContact>( m, TQT_SIGNAL(incomingWhoIsChannels( const TQString &, const TQString & )), + mapSingle<IRCUserContact>( m, TQ_SIGNAL(incomingWhoIsChannels( const TQString &, const TQString & )), &IRCUserContact::newWhoIsChannels ); mapDouble<IRCUserContact>( m, - TQT_SIGNAL(incomingWhoIsServer(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoIsServer(const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsServer ); mapDouble<IRCUserContact>( m, - TQT_SIGNAL(incomingPrivAction(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingPrivAction(const TQString &, const TQString &, const TQString &)), &IRCUserContact::newAction ); mapDouble<IRCChannelContact>( m, - TQT_SIGNAL(incomingAction(const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingAction(const TQString &, const TQString &, const TQString &)), &IRCChannelContact::newAction ); mapTriple<IRCUserContact>( m, - TQT_SIGNAL(incomingWhoIsUser(const TQString &, const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoIsUser(const TQString &, const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsUser ); mapTriple<IRCUserContact>( m, - TQT_SIGNAL(incomingWhoWasUser(const TQString &, const TQString &, const TQString &, const TQString &)), + TQ_SIGNAL(incomingWhoWasUser(const TQString &, const TQString &, const TQString &, const TQString &)), &IRCUserContact::newWhoIsUser ); } diff --git a/kopete/protocols/irc/ircsignalhandler.h b/kopete/protocols/irc/ircsignalhandler.h index 50331f70..f975c2b7 100644 --- a/kopete/protocols/irc/ircsignalhandler.h +++ b/kopete/protocols/irc/ircsignalhandler.h @@ -294,7 +294,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast<IRCAccount*>( m->mySelf()->account() )->engine(), signal, new QMember( mapping, this), - TQT_SLOT( slotEmit( const TQString &) ) + TQ_SLOT( slotEmit( const TQString &) ) ); } @@ -306,7 +306,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast<IRCAccount*>( m->mySelf()->account() )->engine(), signal, new QMemberSingle( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &) ) ); } @@ -318,7 +318,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast<IRCAccount*>( m->mySelf()->account() )->engine(), signal, new QMemberDouble( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &,const TQString &) ) ); } @@ -331,7 +331,7 @@ class IRCSignalHandler : public TQObject mappings.append(mapping); TQObject::connect( static_cast<IRCAccount*>( m->mySelf()->account() )->engine(), signal, new QMemberTriple( mapping, this), - TQT_SLOT( slotEmit( const TQString &, const TQString &,const TQString &,const TQString &) ) + TQ_SLOT( slotEmit( const TQString &, const TQString &,const TQString &,const TQString &) ) ); } }; diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index fd004985..6846bea1 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -41,13 +41,13 @@ KIRC::TransferHandler *IRCTransferHandler::handler() IRCTransferHandler::IRCTransferHandler() { - connect(handler(), TQT_SIGNAL(transferCreated(KIRC::Transfer *)), - this, TQT_SLOT(transferCreated(KIRC::Transfer *))); + connect(handler(), TQ_SIGNAL(transferCreated(KIRC::Transfer *)), + this, TQ_SLOT(transferCreated(KIRC::Transfer *))); - connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(accepted(Kopete::Transfer *, const TQString &)), - this, TQT_SLOT(transferAccepted(Kopete::Transfer *, const TQString&))); - connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo &)), - this, TQT_SLOT(transferRefused(const Kopete::FileTransferInfo &))); + connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(accepted(Kopete::Transfer *, const TQString &)), + this, TQ_SLOT(transferAccepted(Kopete::Transfer *, const TQString&))); + connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL(refused(const Kopete::FileTransferInfo &)), + this, TQ_SLOT(transferRefused(const Kopete::FileTransferInfo &))); } void IRCTransferHandler::transferCreated(KIRC::Transfer *t) @@ -121,8 +121,8 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans // case KIRC::Transfer::Chat: case KIRC::Transfer::FileOutgoing: case KIRC::Transfer::FileIncoming: - connect(t , TQT_SIGNAL(fileSizeAcknowledge(unsigned int)), - kt, TQT_SLOT(slotProcessed(unsigned int))); + connect(t , TQ_SIGNAL(fileSizeAcknowledge(unsigned int)), + kt, TQ_SLOT(slotProcessed(unsigned int))); break; default: kdDebug(14120) << k_funcinfo << "Unknown transfer connections for type" << endl; @@ -130,16 +130,16 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans return; } - connect(t , TQT_SIGNAL(complete()), - kt, TQT_SLOT(slotComplete())); + connect(t , TQ_SIGNAL(complete()), + kt, TQ_SLOT(slotComplete())); -// connect(kt , TQT_SIGNAL(transferCanceled()), -// t, TQT_SLOT(abort())); -// connect(kt, TQT_SIGNAL(destroyed()), -// t, TQT_SLOT(slotKopeteTransferDestroyed())); +// connect(kt , TQ_SIGNAL(transferCanceled()), +// t, TQ_SLOT(abort())); +// connect(kt, TQ_SIGNAL(destroyed()), +// t, TQ_SLOT(slotKopeteTransferDestroyed())); - connect(kt, TQT_SIGNAL(result(TDEIO::Job *)), - this , TQT_SLOT(tdeioresult(TDEIO::Job *))); + connect(kt, TQ_SIGNAL(result(TDEIO::Job *)), + this , TQ_SLOT(tdeioresult(TDEIO::Job *))); t->initiate(); } diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 1254b9d9..0e7f8760 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -41,10 +41,10 @@ IRCUserContact::IRCUserContact(IRCContactManager *contactManager, const TQString mOnlineTimer = new TQTimer( this ); - TQObject::connect(mOnlineTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( slotUserOffline() ) ); + TQObject::connect(mOnlineTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( slotUserOffline() ) ); - TQObject::connect(kircEngine(), TQT_SIGNAL(incomingChannelModeChange(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotIncomingModeChange(const TQString&,const TQString&, const TQString&))); + TQObject::connect(kircEngine(), TQ_SIGNAL(incomingChannelModeChange(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotIncomingModeChange(const TQString&,const TQString&, const TQString&))); mInfo.isOperator = false; mInfo.isIdentified = false; @@ -246,7 +246,7 @@ void IRCUserContact::slotBanHost() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanHostOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanHostOnce() ) ); } } else { slotBanHostOnce(); @@ -270,7 +270,7 @@ void IRCUserContact::slotBanUserHost() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanUserHostOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanUserHostOnce() ) ); } } else { slotBanUserHostOnce(); @@ -294,7 +294,7 @@ void IRCUserContact::slotBanDomain() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanDomainOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanDomainOnce() ) ); } } else { slotBanDomainOnce(); @@ -320,7 +320,7 @@ void IRCUserContact::slotBanUserDomain() if (mInfo.hostName.isEmpty()) { if (kircEngine()->isConnected()) { kircEngine()->whois(m_nickName); - TQTimer::singleShot( 750, this, TQT_SLOT( slotBanUserDomainOnce() ) ); + TQTimer::singleShot( 750, this, TQ_SLOT( slotBanUserDomainOnce() ) ); } } else { slotBanUserDomainOnce(); @@ -537,38 +537,38 @@ TQPtrList<TDEAction> *IRCUserContact::customContextMenuActions( Kopete::ChatSess { actionCtcpMenu = new TDEActionMenu(i18n("C&TCP"), 0, this ); actionCtcpMenu->insert( new TDEAction(i18n("&Version"), 0, this, - TQT_SLOT(slotCtcpVersion()), actionCtcpMenu) ); + TQ_SLOT(slotCtcpVersion()), actionCtcpMenu) ); actionCtcpMenu->insert( new TDEAction(i18n("&Ping"), 0, this, - TQT_SLOT(slotCtcpPing()), actionCtcpMenu) ); + TQ_SLOT(slotCtcpPing()), actionCtcpMenu) ); actionModeMenu = new TDEActionMenu(i18n("&Modes"), 0, this, "actionModeMenu"); actionModeMenu->insert( new TDEAction(i18n("&Op"), 0, this, - TQT_SLOT(slotOp()), actionModeMenu, "actionOp") ); + TQ_SLOT(slotOp()), actionModeMenu, "actionOp") ); actionModeMenu->insert( new TDEAction(i18n("&Deop"), 0, this, - TQT_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); + TQ_SLOT(slotDeop()), actionModeMenu, "actionDeop") ); actionModeMenu->insert( new TDEAction(i18n("&Voice"), 0, this, - TQT_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); + TQ_SLOT(slotVoice()), actionModeMenu, "actionVoice") ); actionModeMenu->insert( new TDEAction(i18n("Devoice"), 0, this, - TQT_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); + TQ_SLOT(slotDevoice()), actionModeMenu, "actionDevoice") ); actionModeMenu->setEnabled( false ); - actionKick = new TDEAction(i18n("&Kick"), 0, this, TQT_SLOT(slotKick()), this); + actionKick = new TDEAction(i18n("&Kick"), 0, this, TQ_SLOT(slotKick()), this); actionKick->setEnabled( false ); actionBanMenu = new TDEActionMenu(i18n("&Ban"), 0, this, "actionBanMenu"); actionBanMenu->insert( new TDEAction(i18n("Host (*!*@host.domain.net)"), 0, this, - TQT_SLOT(slotBanHost()), actionBanMenu ) ); + TQ_SLOT(slotBanHost()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("Domain (*!*@*.domain.net)"), 0, this, - TQT_SLOT(slotBanDomain()), actionBanMenu ) ); + TQ_SLOT(slotBanDomain()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("User@Host (*!*user@host.domain.net)"), 0, this, - TQT_SLOT(slotBanUserHost()), actionBanMenu ) ); + TQ_SLOT(slotBanUserHost()), actionBanMenu ) ); actionBanMenu->insert( new TDEAction(i18n("User@Domain (*!*user@*.domain.net)"), 0, this, - TQT_SLOT(slotBanUserDomain()), actionBanMenu ) ); + TQ_SLOT(slotBanUserDomain()), actionBanMenu ) ); actionBanMenu->setEnabled( false ); codecAction = new KCodecAction( i18n("&Encoding"), 0, this, "selectcharset" ); - connect( codecAction, TQT_SIGNAL( activated( const TQTextCodec * ) ), - this, TQT_SLOT( setCodec( const TQTextCodec *) ) ); + connect( codecAction, TQ_SIGNAL( activated( const TQTextCodec * ) ), + this, TQ_SLOT( setCodec( const TQTextCodec *) ) ); codecAction->setCodec( codec() ); } diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 8d864078..71cffe43 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -23,8 +23,8 @@ KCodecAction::KCodecAction( const TQString &text, const TDEShortcut &cut, TQObject *parent, const char *name ) : TDESelectAction( text, "", cut, parent, name ) { - TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotActivated( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotActivated( const TQString & ) ) ); setItems( KCodecAction::supportedEncodings() ); } diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index d2f35f72..464e8883 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -110,9 +110,9 @@ void Engine::setUseSSL( bool useSSL ) m_sock = new KSSLSocket; m_sock->setSocketFlags( KExtendedSocket::inetSocket ); - connect(m_sock, TQT_SIGNAL(certificateAccepted()), TQT_SLOT(slotConnected())); - connect(m_sock, TQT_SIGNAL(certificateRejected()), TQT_SLOT(slotConnectionClosed())); - connect(m_sock, TQT_SIGNAL(sslFailure()), TQT_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(certificateAccepted()), TQ_SLOT(slotConnected())); + connect(m_sock, TQ_SIGNAL(certificateRejected()), TQ_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(sslFailure()), TQ_SLOT(slotConnectionClosed())); } else #else @@ -124,12 +124,12 @@ void Engine::setUseSSL( bool useSSL ) m_sock = new KExtendedSocket; m_sock->setSocketFlags( KExtendedSocket::inputBufferedSocket | KExtendedSocket::inetSocket ); - connect(m_sock, TQT_SIGNAL(connectionSuccess()), TQT_SLOT(slotConnected())); - connect(m_sock, TQT_SIGNAL(connectionFailed(int)), TQT_SLOT(error(int))); + connect(m_sock, TQ_SIGNAL(connectionSuccess()), TQ_SLOT(slotConnected())); + connect(m_sock, TQ_SIGNAL(connectionFailed(int)), TQ_SLOT(error(int))); } - connect(m_sock, TQT_SIGNAL(closed(int)), TQT_SLOT(slotConnectionClosed())); - connect(m_sock, TQT_SIGNAL(readyRead()), TQT_SLOT(slotReadyRead())); + connect(m_sock, TQ_SIGNAL(closed(int)), TQ_SLOT(slotConnectionClosed())); + connect(m_sock, TQ_SIGNAL(readyRead()), TQ_SLOT(slotReadyRead())); } } @@ -393,7 +393,7 @@ void Engine::slotReadyRead() emit internalError(ParsingFailed, msg); } - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadyRead() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadyRead() ) ); } if(m_sock->socketStatus() != KExtendedSocket::connected) @@ -474,7 +474,7 @@ EntityPtr Engine::getEntity(const TQString &name) m_entities.append(entity); } - connect(entity, TQT_SIGNAL(destroyed(KIRC::Entity *)), TQT_SLOT(destroyed(KIRC::Entity *))); + connect(entity, TQ_SIGNAL(destroyed(KIRC::Entity *)), TQ_SLOT(destroyed(KIRC::Entity *))); return EntityPtr(entity); } diff --git a/kopete/protocols/irc/libkirc/kircengine_commands.cpp b/kopete/protocols/irc/libkirc/kircengine_commands.cpp index 8aa5916e..7044bebc 100644 --- a/kopete/protocols/irc/libkirc/kircengine_commands.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_commands.cpp @@ -27,19 +27,19 @@ using namespace KIRC; void Engine::bindCommands() { - bind("ERROR", this, TQT_SLOT(error(KIRC::Message &)), 0, 0); - bind("JOIN", this, TQT_SLOT(join(KIRC::Message &)), 0, 1); - bind("KICK", this, TQT_SLOT(kick(KIRC::Message &)), 2, 2); - bind("NICK", this, TQT_SLOT(nick(KIRC::Message &)), 0, 0); - bind("MODE", this, TQT_SLOT(mode(KIRC::Message &)), 1, 1); - bind("NOTICE", this, TQT_SLOT(notice(KIRC::Message &)), 1, 1); - bind("PART", this, TQT_SLOT(part(KIRC::Message &)), 1, 1); - bind("PING", this, TQT_SLOT(ping(KIRC::Message &)), 0, 0); - bind("PONG", this, TQT_SLOT(pong(KIRC::Message &)), 0, 0); - bind("PRIVMSG", this, TQT_SLOT(privmsg(KIRC::Message &)), 1, 1); - bind("QUIT", this, TQT_SLOT(quit(KIRC::Message &)), 0, 0); -// bind("SQUIT", this, TQT_SLOT(squit(KIRC::Message &)), 1, 1); - bind("TOPIC", this, TQT_SLOT(topic(KIRC::Message &)), 1, 1); + bind("ERROR", this, TQ_SLOT(error(KIRC::Message &)), 0, 0); + bind("JOIN", this, TQ_SLOT(join(KIRC::Message &)), 0, 1); + bind("KICK", this, TQ_SLOT(kick(KIRC::Message &)), 2, 2); + bind("NICK", this, TQ_SLOT(nick(KIRC::Message &)), 0, 0); + bind("MODE", this, TQ_SLOT(mode(KIRC::Message &)), 1, 1); + bind("NOTICE", this, TQ_SLOT(notice(KIRC::Message &)), 1, 1); + bind("PART", this, TQ_SLOT(part(KIRC::Message &)), 1, 1); + bind("PING", this, TQ_SLOT(ping(KIRC::Message &)), 0, 0); + bind("PONG", this, TQ_SLOT(pong(KIRC::Message &)), 0, 0); + bind("PRIVMSG", this, TQ_SLOT(privmsg(KIRC::Message &)), 1, 1); + bind("QUIT", this, TQ_SLOT(quit(KIRC::Message &)), 0, 0); +// bind("SQUIT", this, TQ_SLOT(squit(KIRC::Message &)), 1, 1); + bind("TOPIC", this, TQ_SLOT(topic(KIRC::Message &)), 1, 1); } void Engine::away(bool isAway, const TQString &awayMessage) diff --git a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp index 0159f790..14462f1b 100644 --- a/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_ctcp.cpp @@ -35,30 +35,30 @@ using namespace KIRC; void Engine::bindCtcp() { - bindCtcpQuery("ACTION", this, TQT_SLOT(CtcpQuery_action(KIRC::Message &)), + bindCtcpQuery("ACTION", this, TQ_SLOT(CtcpQuery_action(KIRC::Message &)), -1, -1); - bindCtcpQuery("CLIENTINFO", this, TQT_SLOT(CtcpQuery_clientinfo(KIRC::Message &)), + bindCtcpQuery("CLIENTINFO", this, TQ_SLOT(CtcpQuery_clientinfo(KIRC::Message &)), -1, 1); - bindCtcpQuery("DCC", this, TQT_SLOT(CtcpQuery_dcc(KIRC::Message &)), + bindCtcpQuery("DCC", this, TQ_SLOT(CtcpQuery_dcc(KIRC::Message &)), 4, 5); - bindCtcpQuery("FINGER", this, TQT_SLOT(CtcpQuery_finger(KIRC::Message &)), + bindCtcpQuery("FINGER", this, TQ_SLOT(CtcpQuery_finger(KIRC::Message &)), -1, 0); - bindCtcpQuery("PING", this, TQT_SLOT(CtcpQuery_ping(KIRC::Message &)), + bindCtcpQuery("PING", this, TQ_SLOT(CtcpQuery_ping(KIRC::Message &)), 1, 1); - bindCtcpQuery("SOURCE", this, TQT_SLOT(CtcpQuery_source(KIRC::Message &)), + bindCtcpQuery("SOURCE", this, TQ_SLOT(CtcpQuery_source(KIRC::Message &)), -1, 0); - bindCtcpQuery("TIME", this, TQT_SLOT(CtcpQuery_time(KIRC::Message &)), + bindCtcpQuery("TIME", this, TQ_SLOT(CtcpQuery_time(KIRC::Message &)), -1, 0); - bindCtcpQuery("USERINFO", this, TQT_SLOT(CtcpQuery_userinfo(KIRC::Message &)), + bindCtcpQuery("USERINFO", this, TQ_SLOT(CtcpQuery_userinfo(KIRC::Message &)), -1, 0); - bindCtcpQuery("VERSION", this, TQT_SLOT(CtcpQuery_version(KIRC::Message &)), + bindCtcpQuery("VERSION", this, TQ_SLOT(CtcpQuery_version(KIRC::Message &)), -1, 0); - bindCtcpReply("ERRMSG", this, TQT_SLOT(CtcpReply_errmsg(KIRC::Message &)), + bindCtcpReply("ERRMSG", this, TQ_SLOT(CtcpReply_errmsg(KIRC::Message &)), 1, -1); - bindCtcpReply("PING", this, TQT_SLOT(CtcpReply_ping(KIRC::Message &)), + bindCtcpReply("PING", this, TQ_SLOT(CtcpReply_ping(KIRC::Message &)), 1, 1, ""); - bindCtcpReply("VERSION", this, TQT_SLOT(CtcpReply_version(KIRC::Message &)), + bindCtcpReply("VERSION", this, TQ_SLOT(CtcpReply_version(KIRC::Message &)), -1, -1, ""); } diff --git a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp index 67d3a842..4118fe23 100644 --- a/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp +++ b/kopete/protocols/irc/libkirc/kircengine_numericreplies.cpp @@ -31,69 +31,69 @@ using namespace KIRC; void Engine::bindNumericReplies() { - bind(1, this, TQT_SLOT(numericReply_001(KIRC::Message &)), 1, 1); - bind(2, this, TQT_SLOT(numericReply_002(KIRC::Message &)), 1, 1); - bind(3, this, TQT_SLOT(numericReply_003(KIRC::Message &)), 1, 1); - bind(4, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 5, 5); - bind(5, this, TQT_SLOT(numericReply_004(KIRC::Message &)), 1, 1); - - bind(250, this, TQT_SLOT(numericReply_250(KIRC::Message &))); - bind(251, this, TQT_SLOT(numericReply_251(KIRC::Message &))); - bind(252, this, TQT_SLOT(numericReply_252(KIRC::Message &)), 2, 2); - bind(253, this, TQT_SLOT(numericReply_253(KIRC::Message &)), 2, 2); - bind(254, this, TQT_SLOT(numericReply_254(KIRC::Message &)), 2, 2); - bind(255, this, TQT_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString - - bind(263, this, TQT_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh - bind(265, this, TQT_SLOT(numericReply_265(KIRC::Message &))); - bind(266, this, TQT_SLOT(numericReply_266(KIRC::Message &))); - - bind(301, this, TQT_SLOT(numericReply_301(KIRC::Message &)), 2, 2); - bind(303, this, TQT_SLOT(numericReply_303(KIRC::Message &)), 1, 1); - bind(305, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away - bind(306, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away - bind(307, this, TQT_SLOT(numericReply_307(KIRC::Message &)), 1, 1); - bind(311, this, TQT_SLOT(numericReply_311(KIRC::Message &)), 5, 5); - bind(312, this, TQT_SLOT(numericReply_312(KIRC::Message &)), 3, 3); - bind(313, this, TQT_SLOT(numericReply_313(KIRC::Message &)), 2, 2); - bind(314, this, TQT_SLOT(numericReply_314(KIRC::Message &)), 5, 5); - bind(315, this, TQT_SLOT(numericReply_315(KIRC::Message &)), 2, 2); - bind(317, this, TQT_SLOT(numericReply_317(KIRC::Message &)), 3, 4); - bind(318, this, TQT_SLOT(numericReply_318(KIRC::Message &)), 2, 2); - bind(319, this, TQT_SLOT(numericReply_319(KIRC::Message &)), 2, 2); - bind(320, this, TQT_SLOT(numericReply_320(KIRC::Message &)), 2, 2); - bind(321, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); - bind(322, this, TQT_SLOT(numericReply_322(KIRC::Message &)), 3, 3); - bind(323, this, TQT_SLOT(numericReply_323(KIRC::Message &)), 1, 1); - bind(324, this, TQT_SLOT(numericReply_324(KIRC::Message &)), 2, 4); - bind(328, this, TQT_SLOT(numericReply_328(KIRC::Message &)), 2, 2); - bind(329, this, TQT_SLOT(numericReply_329(KIRC::Message &)), 3, 3); - bind(330, this, TQT_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ??? - bind(331, this, TQT_SLOT(numericReply_331(KIRC::Message &)), 2, 2); - bind(332, this, TQT_SLOT(numericReply_332(KIRC::Message &)), 2, 2); - bind(333, this, TQT_SLOT(numericReply_333(KIRC::Message &)), 4, 4); - bind(352, this, TQT_SLOT(numericReply_352(KIRC::Message &)), 5, 10); - bind(353, this, TQT_SLOT(numericReply_353(KIRC::Message &)), 3, 3); - bind(366, this, TQT_SLOT(numericReply_366(KIRC::Message &)), 2, 2); - bind(369, this, TQT_SLOT(numericReply_369(KIRC::Message &)), 2, 2); - bind(372, this, TQT_SLOT(numericReply_372(KIRC::Message &)), 1, 1); - bind(375, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); - bind(376, this, TQT_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); - - bind(401, this, TQT_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan -// bind(404, this, TQT_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel - bind(406, this, TQT_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick - bind(422, this, TQT_SLOT(numericReply_422(KIRC::Message &)), 1, 1); - bind(433, this, TQT_SLOT(numericReply_433(KIRC::Message &)), 2, 2); -// bind(442, this, TQT_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel - bind(464, this, TQT_SLOT(numericReply_464(KIRC::Message &)), 1, 1); - bind(471, this, TQT_SLOT(numericReply_471(KIRC::Message &)), 2, 2); - bind(473, this, TQT_SLOT(numericReply_473(KIRC::Message &)), 2, 2); - bind(474, this, TQT_SLOT(numericReply_474(KIRC::Message &)), 2, 2); - bind(475, this, TQT_SLOT(numericReply_475(KIRC::Message &)), 2, 2); + bind(1, this, TQ_SLOT(numericReply_001(KIRC::Message &)), 1, 1); + bind(2, this, TQ_SLOT(numericReply_002(KIRC::Message &)), 1, 1); + bind(3, this, TQ_SLOT(numericReply_003(KIRC::Message &)), 1, 1); + bind(4, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 5, 5); + bind(5, this, TQ_SLOT(numericReply_004(KIRC::Message &)), 1, 1); + + bind(250, this, TQ_SLOT(numericReply_250(KIRC::Message &))); + bind(251, this, TQ_SLOT(numericReply_251(KIRC::Message &))); + bind(252, this, TQ_SLOT(numericReply_252(KIRC::Message &)), 2, 2); + bind(253, this, TQ_SLOT(numericReply_253(KIRC::Message &)), 2, 2); + bind(254, this, TQ_SLOT(numericReply_254(KIRC::Message &)), 2, 2); + bind(255, this, TQ_SLOT(numericReply_255(KIRC::Message &)), 1, 1); // incomingConnectString + + bind(263, this, TQ_SLOT(numericReply_263(KIRC::Message &))); // incomingServerLoadTooHigh + bind(265, this, TQ_SLOT(numericReply_265(KIRC::Message &))); + bind(266, this, TQ_SLOT(numericReply_266(KIRC::Message &))); + + bind(301, this, TQ_SLOT(numericReply_301(KIRC::Message &)), 2, 2); + bind(303, this, TQ_SLOT(numericReply_303(KIRC::Message &)), 1, 1); + bind(305, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are no longer marked as away + bind(306, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); // You are marked as away + bind(307, this, TQ_SLOT(numericReply_307(KIRC::Message &)), 1, 1); + bind(311, this, TQ_SLOT(numericReply_311(KIRC::Message &)), 5, 5); + bind(312, this, TQ_SLOT(numericReply_312(KIRC::Message &)), 3, 3); + bind(313, this, TQ_SLOT(numericReply_313(KIRC::Message &)), 2, 2); + bind(314, this, TQ_SLOT(numericReply_314(KIRC::Message &)), 5, 5); + bind(315, this, TQ_SLOT(numericReply_315(KIRC::Message &)), 2, 2); + bind(317, this, TQ_SLOT(numericReply_317(KIRC::Message &)), 3, 4); + bind(318, this, TQ_SLOT(numericReply_318(KIRC::Message &)), 2, 2); + bind(319, this, TQ_SLOT(numericReply_319(KIRC::Message &)), 2, 2); + bind(320, this, TQ_SLOT(numericReply_320(KIRC::Message &)), 2, 2); + bind(321, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0 ); + bind(322, this, TQ_SLOT(numericReply_322(KIRC::Message &)), 3, 3); + bind(323, this, TQ_SLOT(numericReply_323(KIRC::Message &)), 1, 1); + bind(324, this, TQ_SLOT(numericReply_324(KIRC::Message &)), 2, 4); + bind(328, this, TQ_SLOT(numericReply_328(KIRC::Message &)), 2, 2); + bind(329, this, TQ_SLOT(numericReply_329(KIRC::Message &)), 3, 3); + bind(330, this, TQ_SLOT(ignoreMessage(KIRC::Message &)), 0, 0); // ??? + bind(331, this, TQ_SLOT(numericReply_331(KIRC::Message &)), 2, 2); + bind(332, this, TQ_SLOT(numericReply_332(KIRC::Message &)), 2, 2); + bind(333, this, TQ_SLOT(numericReply_333(KIRC::Message &)), 4, 4); + bind(352, this, TQ_SLOT(numericReply_352(KIRC::Message &)), 5, 10); + bind(353, this, TQ_SLOT(numericReply_353(KIRC::Message &)), 3, 3); + bind(366, this, TQ_SLOT(numericReply_366(KIRC::Message &)), 2, 2); + bind(369, this, TQ_SLOT(numericReply_369(KIRC::Message &)), 2, 2); + bind(372, this, TQ_SLOT(numericReply_372(KIRC::Message &)), 1, 1); + bind(375, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); + bind(376, this, TQ_SLOT(ignoreMessage(KIRC::Message&)), 0, 0 ); + + bind(401, this, TQ_SLOT(numericReply_401(KIRC::Message &)), 2, 2); // incomingNoNickChan +// bind(404, this, TQ_SLOT(numericReply_404(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel + bind(406, this, TQ_SLOT(numericReply_406(KIRC::Message &)), 2, 2); // incomingWasNoNick + bind(422, this, TQ_SLOT(numericReply_422(KIRC::Message &)), 1, 1); + bind(433, this, TQ_SLOT(numericReply_433(KIRC::Message &)), 2, 2); +// bind(442, this, TQ_SLOT(numericReply_442(KIRC::Message &)), 2, 2); // incomingCannotSendToChannel + bind(464, this, TQ_SLOT(numericReply_464(KIRC::Message &)), 1, 1); + bind(471, this, TQ_SLOT(numericReply_471(KIRC::Message &)), 2, 2); + bind(473, this, TQ_SLOT(numericReply_473(KIRC::Message &)), 2, 2); + bind(474, this, TQ_SLOT(numericReply_474(KIRC::Message &)), 2, 2); + bind(475, this, TQ_SLOT(numericReply_475(KIRC::Message &)), 2, 2); //Freenode seems to use this for a non-RFC compliant purpose, as does Unreal - bind(477, this, TQT_SLOT(emitSuffix(KIRC::Message&)),0,0); + bind(477, this, TQ_SLOT(emitSuffix(KIRC::Message&)),0,0); } /* 001: "Welcome to the Internet Relay Network <nick>!<user>@<host>" diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp index 2e1d0b4c..4eecdd6c 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.cpp +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.cpp @@ -32,7 +32,7 @@ MessageRedirector::MessageRedirector(KIRC::Engine *engine, bool MessageRedirector::connect(TQObject *object, const char *member) { - return TQObject::connect(this, TQT_SIGNAL(redirect(KIRC::Message &)), + return TQObject::connect(this, TQ_SIGNAL(redirect(KIRC::Message &)), object, member); } diff --git a/kopete/protocols/irc/libkirc/kircmessageredirector.h b/kopete/protocols/irc/libkirc/kircmessageredirector.h index 2c3f9e37..489ab412 100644 --- a/kopete/protocols/irc/libkirc/kircmessageredirector.h +++ b/kopete/protocols/irc/libkirc/kircmessageredirector.h @@ -48,9 +48,9 @@ public: /** * Connects the given object member signal/slot to this message redirector. * The member signal slot should be looking like: - * TQT_SIGNAL(mysignal(KIRC::Message &msg)) + * TQ_SIGNAL(mysignal(KIRC::Message &msg)) * or - * TQT_SIGNAL(myslot(KIRC::Message &msg)) + * TQ_SIGNAL(myslot(KIRC::Message &msg)) */ bool connect(TQObject *object, const char *member); diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index cbcb6682..50e96ce8 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -81,11 +81,11 @@ Transfer::Transfer( Engine *engine, TQString nick,// TQString nick_peer_adress else if(!properites["hostAddress"].isNull() && !properites["hostPort"].isNull()) setSocket(new KExtendedSocket(properites["hostAddress"], properites["hostPort"])); - connect(this, TQT_SIGNAL(complete()), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(complete()), + this, TQ_SLOT(closeSocket())); - connect(this, TQT_SIGNAL(abort(TQString)), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(abort(TQString)), + this, TQ_SLOT(closeSocket())); } */ Transfer::~Transfer() @@ -134,39 +134,39 @@ bool Transfer::initiate() m_file.setName(m_fileName); - connect(this, TQT_SIGNAL(complete()), - this, TQT_SLOT(closeSocket())); - connect(this, TQT_SIGNAL(abort(TQString)), - this, TQT_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(complete()), + this, TQ_SLOT(closeSocket())); + connect(this, TQ_SIGNAL(abort(TQString)), + this, TQ_SLOT(closeSocket())); -// connect(m_socket, TQT_SIGNAL(connectionClosed()), -// this, TQT_SLOT(slotConnectionClosed())); -// connect(m_socket, TQT_SIGNAL(delayedCloseFinished()), -// this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int) - this, TQT_SLOT(slotError(int))); +// connect(m_socket, TQ_SIGNAL(connectionClosed()), +// this, TQ_SLOT(slotConnectionClosed())); +// connect(m_socket, TQ_SIGNAL(delayedCloseFinished()), +// this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(error(int)), // FIXME: connection failed: No such signal KExtendedSocket::error(int) + this, TQ_SLOT(slotError(int))); switch( m_type ) { case Chat: kdDebug(14121) << k_funcinfo << "Stting up a chat." << endl; - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileIncoming())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileIncoming())); break; case FileIncoming: kdDebug(14121) << k_funcinfo << "Stting up an incoming file transfer." << endl; m_file.open(IO_WriteOnly); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileIncoming())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileIncoming())); break; case FileOutgoing: kdDebug(14121) << k_funcinfo << "Stting up an outgoing file transfer." << endl; m_file.open(IO_ReadOnly); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileOutgoing())); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileOutgoing())); // timer = new TQTimer(this); -// connect(timer, TQT_SIGNAL(timeout()), -// this, TQT_SLOT(writeFileOutgoing())); +// connect(timer, TQ_SIGNAL(timeout()), +// this, TQ_SLOT(writeFileOutgoing())); // timer->start(1000, false); writeFileOutgoing(); // send a first packet. break; @@ -190,8 +190,8 @@ bool Transfer::initiate() // As far as I understand, buffer (socket buffer at least) should be flushed while event-looping. // But I'm not really sure of this, so I force the flush. timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(flush())); + connect(timer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(flush())); timer->start(1000, FALSE); // flush the streams at every seconds return true; diff --git a/kopete/protocols/irc/libkirc/kirctransferserver.cpp b/kopete/protocols/irc/libkirc/kirctransferserver.cpp index 25b41ff9..b7c0917d 100644 --- a/kopete/protocols/irc/libkirc/kirctransferserver.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferserver.cpp @@ -68,8 +68,8 @@ bool TransferServer::initServer() { if (!m_socket) { - TQObject::connect(this, TQT_SIGNAL(incomingNewTransfer(Transfer *)), - TransferHandler::self(), TQT_SIGNAL(transferCreated(Transfer *))); + TQObject::connect(this, TQ_SIGNAL(incomingNewTransfer(Transfer *)), + TransferHandler::self(), TQ_SIGNAL(transferCreated(Transfer *))); m_socket = new KExtendedSocket(); @@ -83,10 +83,10 @@ bool TransferServer::initServer() if (!m_socket->setTimeout(2*60)) // FIXME: allow configuration of this. kdDebug(14120) << k_funcinfo << "Failed to set timeout." << endl; - TQObject::connect(m_socket, TQT_SIGNAL(readyAccept()), - this, TQT_SLOT(readyAccept())); - TQObject::connect(m_socket, TQT_SIGNAL(connectionFailed(int)), - this, TQT_SLOT(connectionFailed(int))); + TQObject::connect(m_socket, TQ_SIGNAL(readyAccept()), + this, TQ_SLOT(readyAccept())); + TQObject::connect(m_socket, TQ_SIGNAL(connectionFailed(int)), + this, TQ_SLOT(connectionFailed(int))); m_socket->listen(m_backlog); m_socket->setBlockingMode(true); @@ -137,14 +137,14 @@ void Transfer::initClient() { if(!m_socket) { - connect(m_socket, TQT_SIGNAL(connectionClosed()), - this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(delayedCloseFinished()), - this, TQT_SLOT(slotConnectionClosed())); - connect(m_socket, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); - connect(m_socket, TQT_SIGNAL(readyRead()), - this, TQT_SLOT(readyReadFileOut)); + connect(m_socket, TQ_SIGNAL(connectionClosed()), + this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(delayedCloseFinished()), + this, TQ_SLOT(slotConnectionClosed())); + connect(m_socket, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); + connect(m_socket, TQ_SIGNAL(readyRead()), + this, TQ_SLOT(readyReadFileOut)); m_socket->enableRead( true ); m_socket->enableWrite( true ); diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index a1781c24..82440bbb 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -52,9 +52,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket() setBlockingMode(false); //Connect internal slots - TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) ); - TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) ); - TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected())); + TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) ); + TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) ); + TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected())); } KSSLSocket::~KSSLSocket() @@ -148,11 +148,11 @@ void KSSLSocket::slotConnected() } //Disconnect the KExtSocket notifier slot, we use our own - TQObject::disconnect( readNotifier(), TQT_SIGNAL(activated( int )), - this, TQT_SLOT(socketActivityRead()) ); + TQObject::disconnect( readNotifier(), TQ_SIGNAL(activated( int )), + this, TQ_SLOT(socketActivityRead()) ); - TQObject::connect( readNotifier(), TQT_SIGNAL(activated( int )), - this, TQT_SLOT(slotReadData()) ); + TQObject::connect( readNotifier(), TQ_SIGNAL(activated( int )), + this, TQ_SLOT(slotReadData()) ); readNotifier()->setEnabled(true); diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 9ee7bbcb..fdff5512 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -213,21 +213,21 @@ ChannelList::ChannelList( TQWidget* parent, KIRC::Engine *engine ) mChannelList->header()->setLabel( 2, i18n( "Topic" ) ); // signals and slots connections - connect( mChannelList, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotItemDoubleClicked(TQListViewItem*) ) ); + connect( mChannelList, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotItemDoubleClicked(TQListViewItem*) ) ); - connect( mSearchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( search() ) ); + connect( mSearchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( search() ) ); - connect( mChannelList, TQT_SIGNAL( selectionChanged( TQListViewItem*) ), this, - TQT_SLOT( slotItemSelected( TQListViewItem *) ) ); + connect( mChannelList, TQ_SIGNAL( selectionChanged( TQListViewItem*) ), this, + TQ_SLOT( slotItemSelected( TQListViewItem *) ) ); - connect( m_engine, TQT_SIGNAL( incomingListedChan( const TQString &, uint, const TQString & ) ), - this, TQT_SLOT( slotChannelListed( const TQString &, uint, const TQString & ) ) ); + connect( m_engine, TQ_SIGNAL( incomingListedChan( const TQString &, uint, const TQString & ) ), + this, TQ_SLOT( slotChannelListed( const TQString &, uint, const TQString & ) ) ); - connect( m_engine, TQT_SIGNAL( incomingEndOfList() ), this, TQT_SLOT( slotListEnd() ) ); + connect( m_engine, TQ_SIGNAL( incomingEndOfList() ), this, TQ_SLOT( slotListEnd() ) ); - connect( m_engine, TQT_SIGNAL( statusChanged(KIRC::Engine::Status) ), - this, TQT_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); + connect( m_engine, TQ_SIGNAL( statusChanged(KIRC::Engine::Status) ), + this, TQ_SLOT( slotStatusChanged(KIRC::Engine::Status) ) ); show(); } @@ -328,7 +328,7 @@ void ChannelList::slotSearchCache() { checkSearchResult( cacheIterator.key(), cacheIterator.data().first, cacheIterator.data().second ); ++cacheIterator; - TQTimer::singleShot( 0, this, TQT_SLOT( slotSearchCache() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotSearchCache() ) ); } else { diff --git a/kopete/protocols/irc/ui/channellistdialog.cpp b/kopete/protocols/irc/ui/channellistdialog.cpp index e344d227..cd127147 100644 --- a/kopete/protocols/irc/ui/channellistdialog.cpp +++ b/kopete/protocols/irc/ui/channellistdialog.cpp @@ -30,11 +30,11 @@ ChannelListDialog::ChannelListDialog(KIRC::Engine *engine, const TQString &capti m_engine = engine; m_list = new ChannelList( this, engine ); - connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), + connect( m_list, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), target, slotJoinChan ); - connect( m_list, TQT_SIGNAL( channelDoubleClicked( const TQString & ) ), - this, TQT_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); + connect( m_list, TQ_SIGNAL( channelDoubleClicked( const TQString & ) ), + this, TQ_SLOT( slotChannelDoubleClicked( const TQString & ) ) ); new TQHBoxLayout( m_list, 0, spacingHint() ); diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 2304bcd5..db0443f2 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -106,21 +106,21 @@ IRCEditAccountWidget::IRCEditAccountWidget(IRCProtocol *proto, IRCAccount *ident } } - connect( commandList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( commandList, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotCommandContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( ctcpList, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); + connect( ctcpList, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ), + this, TQ_SLOT( slotCtcpContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ) ) ); - connect( addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCommand() ) ); - connect( editButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT(slotEditNetworks() ) ); - connect( addReply, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddCtcp() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCommand() ) ); + connect( editButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT(slotEditNetworks() ) ); + connect( addReply, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCtcp() ) ); - connect( network, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( slotUpdateNetworkDescription( const TQString &) ) ); + connect( network, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( slotUpdateNetworkDescription( const TQString &) ) ); - connect( IRCProtocol::protocol(), TQT_SIGNAL( networkConfigUpdated( const TQString & ) ), - this, TQT_SLOT( slotUpdateNetworks( const TQString & ) ) ); + connect( IRCProtocol::protocol(), TQ_SIGNAL( networkConfigUpdated( const TQString & ) ), + this, TQ_SLOT( slotUpdateNetworks( const TQString & ) ) ); slotUpdateNetworks( TQString() ); } diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 5eb071a2..4117bb3c 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -109,7 +109,7 @@ JabberAccount::JabberAccount (JabberProtocol * parent, const TQString & accountI JabberContact *myContact = contactPool()->addContact ( XMPP::RosterItem ( accountId ), Kopete::ContactList::self()->myself(), false ); setMyself( myContact ); - TQObject::connect(Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); + TQObject::connect(Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQ_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) ) ); m_initialPresence = XMPP::Status ( "", "", 5, true ); @@ -178,7 +178,7 @@ TDEActionMenu *JabberAccount::actionMenu () TDEAction *action; - action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); + action = new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat"); m_actionMenu->insert(action); action->setEnabled( isConnected() ); @@ -190,17 +190,17 @@ TDEActionMenu *JabberAccount::actionMenu () m_actionMenu->popupMenu()->insertSeparator(); action = new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, - this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices"); + this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices"); action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); action = new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0, - this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; + this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); action = new TDEAction ( i18n ("Edit User Info..."), "identity", 0, - this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; + this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") ; action->setEnabled( isConnected() ); m_actionMenu->insert ( action ); @@ -295,40 +295,40 @@ void JabberAccount::connectWithPassword ( const TQString &password ) { m_jabberClient = new JabberClient; - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ), - this, TQT_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool ) ), - this, TQT_SLOT ( slotRosterRequestFinished ( bool ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( newContact ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ), - this, TQT_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ), - this, TQT_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ), - this, TQT_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( messageReceived ( const XMPP::Message & ) ), - this, TQT_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( incomingFileTransfer () ), - this, TQT_SLOT ( slotIncomingFileTransfer () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ), - this, TQT_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), - this, TQT_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), - this, TQT_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), - this, TQT_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( subscription ( const XMPP::Jid &, const TQString & ) ), + this, TQ_SLOT ( slotSubscription ( const XMPP::Jid &, const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool ) ), + this, TQ_SLOT ( slotRosterRequestFinished ( bool ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( newContact ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactUpdated ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactUpdated ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( contactDeleted ( const XMPP::RosterItem & ) ), + this, TQ_SLOT ( slotContactDeleted ( const XMPP::RosterItem & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ), + this, TQ_SLOT ( slotResourceAvailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( resourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ), + this, TQ_SLOT ( slotResourceUnavailable ( const XMPP::Jid &, const XMPP::Resource & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( messageReceived ( const XMPP::Message & ) ), + this, TQ_SLOT ( slotReceivedMessage ( const XMPP::Message & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( incomingFileTransfer () ), + this, TQ_SLOT ( slotIncomingFileTransfer () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatJoined ( const XMPP::Jid & ) ), + this, TQ_SLOT ( slotGroupChatJoined ( const XMPP::Jid & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatLeft ( const XMPP::Jid & ) ), + this, TQ_SLOT ( slotGroupChatLeft ( const XMPP::Jid & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ), + this, TQ_SLOT ( slotGroupChatPresence ( const XMPP::Jid &, const XMPP::Status & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( groupChatError ( const XMPP::Jid &, int, const TQString & ) ), + this, TQ_SLOT ( slotGroupChatError ( const XMPP::Jid &, int, const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); } else { @@ -560,7 +560,7 @@ void JabberAccount::slotConnected () { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Voice caller..." << endl; m_voiceCaller = new JingleVoiceCaller( this ); - TQObject::connect(m_voiceCaller,TQT_SIGNAL(incoming(const Jid&)),this,TQT_SLOT(slotIncomingVoiceCall( const Jid& ))); + TQObject::connect(m_voiceCaller,TQ_SIGNAL(incoming(const Jid&)),this,TQ_SLOT(slotIncomingVoiceCall( const Jid& ))); m_voiceCaller->initialize(); } @@ -571,7 +571,7 @@ void JabberAccount::slotConnected () { kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "Creating Jingle Session Manager..." << endl; m_jingleSessionManager = new JingleSessionManager( this ); - TQObject::connect(m_jingleSessionManager, TQT_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQT_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *))); + TQObject::connect(m_jingleSessionManager, TQ_SIGNAL(incomingSession(const TQString &, JingleSession *)), this, TQ_SLOT(slotIncomingJingleSession(const TQString &, JingleSession *))); } #endif @@ -1108,8 +1108,8 @@ void JabberAccount::slotSubscription (const XMPP::Jid & jid, const TQString & ty Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( jid.full() ,TQString(),this, hideFlags ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } else if (type == "unsubscribed") @@ -1709,13 +1709,13 @@ bool JabberAccount::removeAccount( ) } XMPP::JT_Register *task = new XMPP::JT_Register ( client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotUnregisterFinished ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotUnregisterFinished ) ); task->unreg (); task->go ( true ); m_removing=true; // from my experiment, not all server reply us with a response. it simply dosconnect // so after one seconde, we will force to remove the account - TQTimer::singleShot(1111, this, TQT_SLOT(slotUnregisterFinished())); + TQTimer::singleShot(1111, this, TQ_SLOT(slotUnregisterFinished())); return false; //the account will be removed when the task will be finished } diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index 54d4e427..f13c28a7 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -217,7 +217,7 @@ void JabberBaseContact::updateContact ( const XMPP::RosterItem & item ) setDontSync ( false ); //can't do it now because it's called from contructor at a point some virtual function are not available - TQTimer::singleShot(0, this, TQT_SLOT(reevaluateStatus())); + TQTimer::singleShot(0, this, TQ_SLOT(reevaluateStatus())); } diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index ba8d1779..875bc5b6 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -28,7 +28,7 @@ JabberBookmarks::JabberBookmarks(JabberAccount *parent) : TQObject(parent) , m_account(parent) { - connect( m_account , TQT_SIGNAL( isConnectedChanged() ) , this , TQT_SLOT( accountConnected() ) ); + connect( m_account , TQ_SIGNAL( isConnectedChanged() ) , this , TQ_SLOT( accountConnected() ) ); } void JabberBookmarks::accountConnected() @@ -38,7 +38,7 @@ void JabberBookmarks::accountConnected() XMPP::JT_PrivateStorage * task = new XMPP::JT_PrivateStorage ( m_account->client()->rootTask ()); task->get( "storage" , "storage:bookmarks" ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotReceivedBookmarks() ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotReceivedBookmarks() ) ); task->go ( true ); } @@ -131,7 +131,7 @@ TDEAction * JabberBookmarks::bookmarksAction(TQObject *parent) { TDESelectAction *groupchatBM = new TDESelectAction( i18n("Groupchat bookmark") , "jabber_group" , 0 , parent , "actionBookMark" ); groupchatBM->setItems(m_conferencesJID); - TQObject::connect(groupchatBM, TQT_SIGNAL(activated (const TQString&)) , this, TQT_SLOT(slotJoinChatBookmark(const TQString&))); + TQObject::connect(groupchatBM, TQ_SIGNAL(activated (const TQString&)) , this, TQ_SLOT(slotJoinChatBookmark(const TQString&))); return groupchatBM; } diff --git a/kopete/protocols/jabber/jabberbytestream.cpp b/kopete/protocols/jabber/jabberbytestream.cpp index f04518a6..2f711bcb 100644 --- a/kopete/protocols/jabber/jabberbytestream.cpp +++ b/kopete/protocols/jabber/jabberbytestream.cpp @@ -38,11 +38,11 @@ JabberByteStream::JabberByteStream ( TQObject *parent, const char */*name*/ ) mSocket->enableRead ( true ); // connect signals and slots - TQObject::connect ( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) ); - TQObject::connect ( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) ); + TQObject::connect ( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) ); } diff --git a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp index 57292ad3..b4aeb5ad 100644 --- a/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp +++ b/kopete/protocols/jabber/jabbercapabilitiesmanager.cpp @@ -433,7 +433,7 @@ void JabberCapabilitiesManager::requestDiscoInfo(JabberAccount *account, const J return; JT_DiscoInfo *discoInfo = new JT_DiscoInfo(account->client()->rootTask()); - connect(discoInfo, TQT_SIGNAL(finished()), TQT_SLOT(discoRequestFinished())); + connect(discoInfo, TQ_SIGNAL(finished()), TQ_SLOT(discoRequestFinished())); discoInfo->get(jid, node); //pending_++; //timer_.start(REQUEST_TIMEOUT,true); diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 3ff2680c..f83774c2 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -50,12 +50,12 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); - connect ( this, TQT_SIGNAL ( myselfTyping ( bool ) ), this, TQT_SLOT ( slotSendTypingNotification ( bool ) ) ); + connect ( this, TQ_SIGNAL ( myselfTyping ( bool ) ), this, TQ_SLOT ( slotSendTypingNotification ( bool ) ) ); - connect ( this, TQT_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQT_SLOT ( slotUpdateDisplayName () ) ); + connect ( this, TQ_SIGNAL ( onlineStatusChanged(Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ), this, TQ_SLOT ( slotUpdateDisplayName () ) ); // check if the user ID contains a hardwired resource, // we'll have to use that one in that case @@ -65,7 +65,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas slotUpdateDisplayName (); #ifdef SUPPORT_JINGLE - TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQT_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); + TDEAction *jabber_voicecall = new TDEAction( i18n("Voice call" ), "voicecall", 0, members().getFirst(), TQ_SLOT(voiceCall ()), actionCollection(), "jabber_voicecall" ); setInstance(protocol->instance()); jabber_voicecall->setEnabled( false ); @@ -85,7 +85,7 @@ JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBas #endif - new TDEAction( i18n( "Send File" ), "attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); + new TDEAction( i18n( "Send File" ), "attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "jabberSendFile" ); setXMLFile("jabberchatui.rc"); diff --git a/kopete/protocols/jabber/jabberclient.cpp b/kopete/protocols/jabber/jabberclient.cpp index 0bcdaebd..458ee605 100644 --- a/kopete/protocols/jabber/jabberclient.cpp +++ b/kopete/protocols/jabber/jabberclient.cpp @@ -126,7 +126,7 @@ JabberClient::JabberClient () cleanUp (); // initiate penalty timer - TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) ); + TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) ); } @@ -189,7 +189,7 @@ void JabberClient::slotUpdatePenaltyTime () else d->currentPenaltyTime = 0; - TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQT_SLOT ( slotUpdatePenaltyTime () ) ); + TQTimer::singleShot ( JABBER_PENALTY_TIME * 1000, this, TQ_SLOT ( slotUpdatePenaltyTime () ) ); } @@ -234,7 +234,7 @@ XMPP::S5BServer *JabberClient::s5bServer () if ( !d->s5bServer ) { d->s5bServer = new XMPP::S5BServer (); - TQObject::connect ( d->s5bServer, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotS5BServerGone () ) ); + TQObject::connect ( d->s5bServer, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotS5BServerGone () ) ); /* * Try to start the server at the default port here. @@ -638,7 +638,7 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberTLSHandler, TQT_SIGNAL ( tlsHandshaken() ), this, TQT_SLOT ( slotTLSHandshaken () ) ); + TQObject::connect ( d->jabberTLSHandler, TQ_SIGNAL ( tlsHandshaken() ), this, TQ_SLOT ( slotTLSHandshaken () ) ); } TQPtrList<TQCA::Cert> certStore; @@ -653,18 +653,18 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( needAuthParams(bool, bool, bool) ), - this, TQT_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( authenticated () ), - this, TQT_SLOT ( slotCSAuthenticated () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( connectionClosed () ), - this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( delayedCloseFinished () ), - this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( warning (int) ), - this, TQT_SLOT ( slotCSWarning (int) ) ); - TQObject::connect ( d->jabberClientStream, TQT_SIGNAL ( error (int) ), - this, TQT_SLOT ( slotCSError (int) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( needAuthParams(bool, bool, bool) ), + this, TQ_SLOT ( slotCSNeedAuthParams (bool, bool, bool) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( authenticated () ), + this, TQ_SLOT ( slotCSAuthenticated () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( connectionClosed () ), + this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( delayedCloseFinished () ), + this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( warning (int) ), + this, TQ_SLOT ( slotCSWarning (int) ) ); + TQObject::connect ( d->jabberClientStream, TQ_SIGNAL ( error (int) ), + this, TQ_SLOT ( slotCSError (int) ) ); } d->jabberClientStream->setOldOnly ( useXMPP09 () ); @@ -694,8 +694,8 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt { using namespace XMPP; - TQObject::connect ( d->jabberClient->fileTransferManager(), TQT_SIGNAL ( incomingReady() ), - this, TQT_SLOT ( slotIncomingFileTransfer () ) ); + TQObject::connect ( d->jabberClient->fileTransferManager(), TQ_SIGNAL ( incomingReady() ), + this, TQ_SLOT ( slotIncomingFileTransfer () ) ); } } @@ -704,36 +704,36 @@ JabberClient::ErrorCode JabberClient::connect ( const XMPP::Jid &jid, const TQSt */ { using namespace XMPP; - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( subscription (const Jid &, const TQString &) ), - this, TQT_SLOT ( slotSubscription (const Jid &, const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ), - this, TQT_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemAdded (const RosterItem &) ), - this, TQT_SLOT ( slotNewContact (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemUpdated (const RosterItem &) ), - this, TQT_SLOT ( slotContactUpdated (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( rosterItemRemoved (const RosterItem &) ), - this, TQT_SLOT ( slotContactDeleted (const RosterItem &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ), - this, TQT_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ), - this, TQT_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( messageReceived (const Message &) ), - this, TQT_SLOT ( slotReceivedMessage (const Message &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatJoined (const Jid &) ), - this, TQT_SLOT ( slotGroupChatJoined (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatLeft (const Jid &) ), - this, TQT_SLOT ( slotGroupChatLeft (const Jid &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), - this, TQT_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), - this, TQT_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); - //TQObject::connect ( d->jabberClient, TQT_SIGNAL (debugText (const TQString &) ), - // this, TQT_SLOT ( slotPsiDebug (const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlIncoming(const TQString& ) ), - this, TQT_SLOT ( slotIncomingXML (const TQString &) ) ); - TQObject::connect ( d->jabberClient, TQT_SIGNAL ( xmlOutgoing(const TQString& ) ), - this, TQT_SLOT ( slotOutgoingXML (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( subscription (const Jid &, const TQString &) ), + this, TQ_SLOT ( slotSubscription (const Jid &, const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterRequestFinished ( bool, int, const TQString & ) ), + this, TQ_SLOT ( slotRosterRequestFinished ( bool, int, const TQString & ) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemAdded (const RosterItem &) ), + this, TQ_SLOT ( slotNewContact (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemUpdated (const RosterItem &) ), + this, TQ_SLOT ( slotContactUpdated (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( rosterItemRemoved (const RosterItem &) ), + this, TQ_SLOT ( slotContactDeleted (const RosterItem &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceAvailable (const Jid &, const Resource &) ), + this, TQ_SLOT ( slotResourceAvailable (const Jid &, const Resource &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( resourceUnavailable (const Jid &, const Resource &) ), + this, TQ_SLOT ( slotResourceUnavailable (const Jid &, const Resource &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( messageReceived (const Message &) ), + this, TQ_SLOT ( slotReceivedMessage (const Message &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatJoined (const Jid &) ), + this, TQ_SLOT ( slotGroupChatJoined (const Jid &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatLeft (const Jid &) ), + this, TQ_SLOT ( slotGroupChatLeft (const Jid &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatPresence (const Jid &, const Status &) ), + this, TQ_SLOT ( slotGroupChatPresence (const Jid &, const Status &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( groupChatError (const Jid &, int, const TQString &) ), + this, TQ_SLOT ( slotGroupChatError (const Jid &, int, const TQString &) ) ); + //TQObject::connect ( d->jabberClient, TQ_SIGNAL (debugText (const TQString &) ), + // this, TQ_SLOT ( slotPsiDebug (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlIncoming(const TQString& ) ), + this, TQ_SLOT ( slotIncomingXML (const TQString &) ) ); + TQObject::connect ( d->jabberClient, TQ_SIGNAL ( xmlOutgoing(const TQString& ) ), + this, TQ_SLOT ( slotOutgoingXML (const TQString &) ) ); } d->jabberClient->setClientName ( clientName () ); diff --git a/kopete/protocols/jabber/jabberconnector.cpp b/kopete/protocols/jabber/jabberconnector.cpp index d08db42e..aa1e7921 100644 --- a/kopete/protocols/jabber/jabberconnector.cpp +++ b/kopete/protocols/jabber/jabberconnector.cpp @@ -32,9 +32,9 @@ JabberConnector::JabberConnector ( TQObject *parent, const char */*name*/ ) mByteStream = new JabberByteStream ( this ); mSrvResolver = new SrvResolver; - connect ( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect ( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - connect ( mSrvResolver, TQT_SIGNAL( resultsReady() ), this, TQT_SLOT( slotSrvLookup() ) ); + connect ( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect ( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + connect ( mSrvResolver, TQ_SIGNAL( resultsReady() ), this, TQ_SLOT( slotSrvLookup() ) ); } JabberConnector::~JabberConnector () diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index 7d8035f9..79b09508 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -89,19 +89,19 @@ JabberContact::JabberContact (const XMPP::RosterItem &rosterItem, Kopete::Accoun { // this contact is a regular contact connect ( this, - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckVCard () ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckVCard () ) ); } else { // this contact is the myself instance connect ( account()->myself (), - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckVCard () ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckVCard () ) ); connect ( account()->myself (), - TQT_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), - this, TQT_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); + TQ_SIGNAL ( onlineStatusChanged ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ), + this, TQ_SLOT ( slotCheckLastActivity ( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) ); /* * Trigger update once if we're already connected for contacts @@ -137,34 +137,34 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions () TDEAction *resendAuthAction, *requestAuthAction, *removeAuthAction; resendAuthAction = new TDEAction (i18n ("(Re)send Authorization To"), "mail-forward", 0, - this, TQT_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); + this, TQ_SLOT (slotSendAuth ()), actionAuthorization, "actionSendAuth"); resendAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::To || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(resendAuthAction); requestAuthAction = new TDEAction (i18n ("(Re)request Authorization From"), "mail-reply-sender", 0, - this, TQT_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); + this, TQ_SLOT (slotRequestAuth ()), actionAuthorization, "actionRequestAuth"); requestAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::From || mRosterItem.subscription().type() == XMPP::Subscription::None ); actionAuthorization->insert(requestAuthAction); removeAuthAction = new TDEAction (i18n ("Remove Authorization From"), "mail_delete", 0, - this, TQT_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); + this, TQ_SLOT (slotRemoveAuth ()), actionAuthorization, "actionRemoveAuth"); removeAuthAction->setEnabled( mRosterItem.subscription().type() == XMPP::Subscription::Both || mRosterItem.subscription().type() == XMPP::Subscription::From ); actionAuthorization->insert(removeAuthAction); TDEActionMenu *actionSetAvailability = new TDEActionMenu (i18n ("Set Availability"), "kopeteavailable", this, "jabber_online"); actionSetAvailability->insert(new TDEAction (i18n ("Online"), protocol()->JabberKOSOnline.iconFor(this), - 0, this, TQT_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); + 0, this, TQ_SLOT (slotStatusOnline ()), actionSetAvailability, "actionOnline")); actionSetAvailability->insert(new TDEAction (i18n ("Free to Chat"), protocol()->JabberKOSChatty.iconFor(this), - 0, this, TQT_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); + 0, this, TQ_SLOT (slotStatusChatty ()), actionSetAvailability, "actionChatty")); actionSetAvailability->insert(new TDEAction (i18n ("Away"), protocol()->JabberKOSAway.iconFor(this), - 0, this, TQT_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); + 0, this, TQ_SLOT (slotStatusAway ()), actionSetAvailability, "actionAway")); actionSetAvailability->insert(new TDEAction (i18n ("Extended Away"), protocol()->JabberKOSXA.iconFor(this), - 0, this, TQT_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); + 0, this, TQ_SLOT (slotStatusXA ()), actionSetAvailability, "actionXA")); actionSetAvailability->insert(new TDEAction (i18n ("Do Not Disturb"), protocol()->JabberKOSDND.iconFor(this), - 0, this, TQT_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); + 0, this, TQ_SLOT (slotStatusDND ()), actionSetAvailability, "actionDND")); actionSetAvailability->insert(new TDEAction (i18n ("Invisible"), protocol()->JabberKOSInvisible.iconFor(this), - 0, this, TQT_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); + 0, this, TQ_SLOT (slotStatusInvisible ()), actionSetAvailability, "actionInvisible")); TDEActionMenu *actionSelectResource = new TDEActionMenu (i18n ("Select Resource"), "connect_no", this, "actionSelectResource"); @@ -203,7 +203,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions () { if( i == activeItem ) { - actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), "button_ok", 0, this, TQ_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } else @@ -215,7 +215,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions () TQIconSet iconSet ( !i ? protocol()->resourceToKOS ( account()->resourcePool()->bestResource ( mRosterItem.jid(), false ) ).iconFor ( account () ) : protocol()->resourceToKOS ( *availableResources.find(*it) ).iconFor ( account () )); - actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQT_SLOT( slotSelectResource() ), + actionSelectResource->insert ( new TDEAction( ( *it ), iconSet, 0, this, TQ_SLOT( slotSelectResource() ), actionSelectResource, TQString::number( i ).latin1() ) ); } @@ -230,7 +230,7 @@ TQPtrList<TDEAction> *JabberContact::customContextMenuActions () #ifdef SUPPORT_JINGLE - TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQT_SLOT (voiceCall ()), this, "jabber_voicecall"); + TDEAction *actionVoiceCall = new TDEAction (i18n ("Voice call"), "voicecall", 0, this, TQ_SLOT (voiceCall ()), this, "jabber_voicecall"); actionVoiceCall->setEnabled( false ); actionCollection->append( actionVoiceCall ); @@ -431,7 +431,7 @@ void JabberContact::slotCheckVCard () mDiscoDone = true; //or it will happen twice, we don't want that. //disco to see if it's not a transport XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask()); - TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(rosterItem().jid(), TQString()); jt->go(true); } @@ -453,7 +453,7 @@ void JabberContact::slotCheckVCard () mVCardUpdateInProgress = true; // current data is older than 24 hours, request a new one - TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedVCard () ) ); + TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedVCard () ) ); } } @@ -479,7 +479,7 @@ void JabberContact::slotGetTimedVCard () { //disco to see if it's not a transport XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account()->client()->rootTask()); - TQObject::connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + TQObject::connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(rosterItem().jid(), TQString()); jt->go(true); } @@ -492,7 +492,7 @@ void JabberContact::slotGetTimedVCard () // request vCard XMPP::JT_VCard *task = new XMPP::JT_VCard ( account()->client()->rootTask () ); // signal to ourselves when the vCard data arrived - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) ); task->get ( mRosterItem.jid () ); task->go ( true ); @@ -551,7 +551,7 @@ void JabberContact::slotCheckLastActivity ( Kopete::Contact *, const Kopete::Onl { kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Scheduling request for last activity for " << mRosterItem.jid().bare () << endl; - TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedLastActivity () ) ); + TQTimer::singleShot ( account()->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedLastActivity () ) ); } } @@ -578,7 +578,7 @@ void JabberContact::slotGetTimedLastActivity () kdDebug ( JABBER_DEBUG_GLOBAL ) << k_funcinfo << "Requesting last activity from timer for " << mRosterItem.jid().bare () << endl; XMPP::JT_GetLastActivity *task = new XMPP::JT_GetLastActivity ( account()->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotLastActivity () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotLastActivity () ) ); task->get ( mRosterItem.jid () ); task->go ( true ); } @@ -717,7 +717,7 @@ void JabberContact::slotSendVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard (account()->client()->rootTask ()); // signal to ourselves when the vCard data arrived - TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentVCard ())); + TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentVCard ())); task->set (vCard); task->go (true); } @@ -826,7 +826,7 @@ JabberChatSession *JabberContact::manager ( Kopete::ContactPtrList chatMembers, kdDebug(JABBER_DEBUG_GLOBAL) << k_funcinfo << "No manager found, creating a new one with resource '" << jid.resource () << "'" << endl; manager = new JabberChatSession ( protocol(), static_cast<JabberBaseContact *>(account()->myself()), chatMembers, jid.resource () ); - connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); + connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); mManagers.append ( manager ); } @@ -880,7 +880,7 @@ JabberChatSession *JabberContact::manager ( const TQString &resource, Kopete::Co JabberChatSession *manager = new JabberChatSession ( protocol(), static_cast<JabberBaseContact *>(account()->myself()), chatmembers, resource ); - connect ( manager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); + connect ( manager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted ( TQObject * ) ) ); mManagers.append ( manager ); return manager; @@ -955,7 +955,7 @@ void JabberContact::sync ( unsigned int ) if(!m_syncTimer) { m_syncTimer=new TQTimer(this); - connect(m_syncTimer, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotDelayedSync())); + connect(m_syncTimer, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotDelayedSync())); } m_syncTimer->start(2*1000,true); /* diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 2d580957..16463c8c 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -102,7 +102,7 @@ JabberContact *JabberContactPool::addContact ( const XMPP::RosterItem &contact, // create new contact instance and add it to the dictionary JabberContact *newContact = new JabberContact ( contact, transport ? (Kopete::Account*)transport : (Kopete::Account*)mAccount, metaContact , legacyId ); JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact ); - connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); + connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); newContactItem->setDirty ( dirty ); mPool.append ( newContactItem ); @@ -161,7 +161,7 @@ JabberBaseContact *JabberContactPool::addGroupContact ( const XMPP::RosterItem & JabberContactPoolItem *newContactItem = new JabberContactPoolItem ( newContact ); - connect ( newContact, TQT_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQT_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); + connect ( newContact, TQ_SIGNAL ( contactDestroyed ( Kopete::Contact * ) ), this, TQ_SLOT ( slotContactDestroyed ( Kopete::Contact * ) ) ); newContactItem->setDirty ( dirty ); mPool.append ( newContactItem ); diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index c172b30f..f8303855 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -62,10 +62,10 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, XMPP::FileTrans Kopete::ContactList::self ()->addMetaContact ( metaContact ); } - connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ), - this, TQT_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); - connect ( Kopete::TransferManager::transferManager (), TQT_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ), - this, TQT_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) ); + connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( accepted ( Kopete::Transfer *, const TQString & ) ), + this, TQ_SLOT ( slotIncomingTransferAccepted ( Kopete::Transfer *, const TQString & ) ) ); + connect ( Kopete::TransferManager::transferManager (), TQ_SIGNAL ( refused ( const Kopete::FileTransferInfo & ) ), + this, TQ_SLOT ( slotTransferRefused ( const Kopete::FileTransferInfo & ) ) ); initializeVariables (); @@ -90,15 +90,15 @@ JabberFileTransfer::JabberFileTransfer ( JabberAccount *account, JabberBaseConta contact->contactId (), Kopete::FileTransferInfo::Outgoing ); - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); + connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) ); mXMPPTransfer = mAccount->client()->fileTransferManager()->createTransfer (); initializeVariables (); - connect ( mXMPPTransfer, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotOutgoingConnected () ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotOutgoingBytesWritten ( int ) ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotOutgoingConnected () ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotOutgoingBytesWritten ( int ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) ); mXMPPTransfer->sendFile ( XMPP::Jid ( contact->fullAddress () ), KURL(file).fileName (), mLocalFile.size (), "" ); @@ -188,9 +188,9 @@ void JabberFileTransfer::slotIncomingTransferAccepted ( Kopete::Transfer *transf } else { - connect ( mKopeteTransfer, TQT_SIGNAL ( result ( TDEIO::Job * ) ), this, TQT_SLOT ( slotTransferResult () ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQT_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) ); - connect ( mXMPPTransfer, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotTransferError ( int ) ) ); + connect ( mKopeteTransfer, TQ_SIGNAL ( result ( TDEIO::Job * ) ), this, TQ_SLOT ( slotTransferResult () ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( readyRead ( const TQByteArray& ) ), this, TQ_SLOT ( slotIncomingDataReady ( const TQByteArray & ) ) ); + connect ( mXMPPTransfer, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotTransferError ( int ) ) ); mXMPPTransfer->accept ( offset, length ); } diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp index 3344f802..4d88fb17 100644 --- a/kopete/protocols/jabber/jabberformtranslator.cpp +++ b/kopete/protocols/jabber/jabberformtranslator.cpp @@ -67,7 +67,7 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget * formLayout->addWidget (edit, row, 1); edit->show (); - connect (this, TQT_SIGNAL (gatherData (XMPP::Form &)), edit, TQT_SLOT (slotGatherData (XMPP::Form &))); + connect (this, TQ_SIGNAL (gatherData (XMPP::Form &)), edit, TQ_SLOT (slotGatherData (XMPP::Form &))); } innerLayout->addStretch (); diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index 3687f835..e15d01b3 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -40,8 +40,8 @@ JabberGroupChatManager::JabberGroupChatManager ( JabberProtocol *protocol, const // make sure Kopete knows about this instance Kopete::ChatSessionManager::self()->registerChatSession ( this ); - connect ( this, TQT_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - this, TQT_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL ( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + this, TQ_SLOT ( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); updateDisplayName (); } diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index fde5e300..9aa068eb 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -58,10 +58,10 @@ JabberGroupContact::JabberGroupContact (const XMPP::RosterItem &rosterItem, Jabb mManager = new JabberGroupChatManager ( protocol (), mSelfContact, Kopete::ContactPtrList (), XMPP::Jid ( rosterItem.jid().userHost () ) ); - connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); - connect ( account->myself() , TQT_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) , - this , TQT_SLOT(slotStatusChanged() ) ) ; + connect ( account->myself() , TQ_SIGNAL(onlineStatusChanged( Kopete::Contact*, const Kopete::OnlineStatus&, const Kopete::OnlineStatus& ) ) , + this , TQ_SLOT(slotStatusChanged() ) ) ; /** * FIXME: The first contact in the list of the message manager @@ -113,7 +113,7 @@ TQPtrList<TDEAction> *JabberGroupContact::customContextMenuActions () { TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); - TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQT_SLOT (slotChangeNick()), this, "jabber_changenick"); + TDEAction *actionSetNick = new TDEAction (i18n ("Change nick name"), 0, 0, this, TQ_SLOT (slotChangeNick()), this, "jabber_changenick"); actionCollection->append( actionSetNick ); return actionCollection; @@ -129,7 +129,7 @@ Kopete::ChatSession *JabberGroupContact::manager ( Kopete::Contact::CanCreateFla mManager->addContact ( this ); - connect ( mManager, TQT_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( closing ( Kopete::ChatSession* ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); //if we have to recreate the manager, we probably have to connect again to the chat. slotStatusChanged(); @@ -238,7 +238,7 @@ JabberBaseContact *JabberGroupContact::addSubContact ( const XMPP::RosterItem &r // now, add the contact also to our own list mContactList.append ( subContact ); - connect(subContact , TQT_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQT_SLOT(slotSubContactDestroyed(Kopete::Contact*))); + connect(subContact , TQ_SIGNAL(contactDestroyed(Kopete::Contact*)) , this , TQ_SLOT(slotSubContactDestroyed(Kopete::Contact*))); return subContact; diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index 35b06c09..66b4d229 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -80,7 +80,7 @@ Kopete::ChatSession *JabberGroupMemberContact::manager ( Kopete::Contact::CanCre * the global myself() instance for a correct representation. */ mManager = new JabberChatSession ( protocol(), static_cast<JabberBaseContact *>(account()->myself()), chatMembers ); - connect ( mManager, TQT_SIGNAL ( destroyed ( TQObject * ) ), this, TQT_SLOT ( slotChatSessionDeleted () ) ); + connect ( mManager, TQ_SIGNAL ( destroyed ( TQObject * ) ), this, TQ_SLOT ( slotChatSessionDeleted () ) ); return mManager; diff --git a/kopete/protocols/jabber/jabberresource.cpp b/kopete/protocols/jabber/jabberresource.cpp index a971e1c8..f351e30e 100644 --- a/kopete/protocols/jabber/jabberresource.cpp +++ b/kopete/protocols/jabber/jabberresource.cpp @@ -59,10 +59,10 @@ JabberResource::JabberResource ( JabberAccount *account, const XMPP::Jid &jid, c if ( account->isConnected () ) { - TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetTimedClientVersion () ) ); + TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetTimedClientVersion () ) ); if(!d->capsEnabled) { - TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQT_SLOT ( slotGetDiscoCapabilties () ) ); + TQTimer::singleShot ( account->client()->getPenaltyTime () * 1000, this, TQ_SLOT ( slotGetDiscoCapabilties () ) ); } } } @@ -123,7 +123,7 @@ void JabberResource::slotGetTimedClientVersion () // request client version XMPP::JT_ClientVersion *task = new XMPP::JT_ClientVersion ( d->account->client()->rootTask () ); // signal to ourselves when the vCard data arrived - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotClientVersion () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotClientVersion () ) ); task->get ( d->jid ); task->go ( true ); } @@ -150,7 +150,7 @@ void JabberResource:: slotGetDiscoCapabilties () XMPP:: JT_DiscoInfo *task = new XMPP::JT_DiscoInfo ( d->account->client()->rootTask () ); // Retrive features when service discovery is done. - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT (slotGotDiscoCapabilities () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT (slotGotDiscoCapabilities () ) ); task->get ( d->jid); task->go ( true ); } diff --git a/kopete/protocols/jabber/jabberresourcepool.cpp b/kopete/protocols/jabber/jabberresourcepool.cpp index 19492790..cbe91f1e 100644 --- a/kopete/protocols/jabber/jabberresourcepool.cpp +++ b/kopete/protocols/jabber/jabberresourcepool.cpp @@ -133,8 +133,8 @@ void JabberResourcePool::addResource ( const XMPP::Jid &jid, const XMPP::Resourc // create new resource instance and add it to the dictionary JabberResource *newResource = new JabberResource(d->account, jid, resource); - connect ( newResource, TQT_SIGNAL ( destroyed (TQObject *) ), this, TQT_SLOT ( slotResourceDestroyed (TQObject *) ) ); - connect ( newResource, TQT_SIGNAL ( updated (JabberResource *) ), this, TQT_SLOT ( slotResourceUpdated (JabberResource *) ) ); + connect ( newResource, TQ_SIGNAL ( destroyed (TQObject *) ), this, TQ_SLOT ( slotResourceDestroyed (TQObject *) ) ); + connect ( newResource, TQ_SIGNAL ( updated (JabberResource *) ), this, TQ_SLOT ( slotResourceUpdated (JabberResource *) ) ); d->pool.append ( newResource ); // send notifications out to the relevant contacts that diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 6c1d0411..e57363d0 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -83,7 +83,7 @@ JabberTransport::JabberTransport (JabberAccount * parentAccount, const XMPP::Ros configGroup()->writeEntry("GatewayJID" , item.jid().full() ); - TQTimer::singleShot(0, this, TQT_SLOT(eatContacts())); + TQTimer::singleShot(0, this, TQ_SLOT(eatContacts())); m_status=Normal; } @@ -147,18 +147,18 @@ TDEActionMenu *JabberTransport::actionMenu () m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert(new TDEAction (i18n ("Join Groupchat..."), "jabber_group", 0, - this, TQT_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); + this, TQ_SLOT (slotJoinNewChat ()), this, "actionJoinChat")); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert ( new TDEAction ( i18n ("Services..."), "jabber_serv_on", 0, - this, TQT_SLOT ( slotGetServices () ), this, "actionJabberServices") ); + this, TQ_SLOT ( slotGetServices () ), this, "actionJabberServices") ); m_actionMenu->insert ( new TDEAction ( i18n ("Send Raw Packet to Server..."), "mail-message-new", 0, - this, TQT_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); + this, TQ_SLOT ( slotSendRaw () ), this, "actionJabberSendRaw") ); m_actionMenu->insert ( new TDEAction ( i18n ("Edit User Info..."), "identity", 0, - this, TQT_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); + this, TQ_SLOT ( slotEditVCard () ), this, "actionEditVCard") ); return m_actionMenu;*/ } @@ -263,7 +263,7 @@ bool JabberTransport::removeAccount( ) m_status = Removing; XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( removeAllContacts() ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( removeAllContacts() ) ); //JabberContact *my=static_cast<JabberContact*>(myself()); task->unreg ( myself()->contactId() ); diff --git a/kopete/protocols/jabber/jingle/DESIGN b/kopete/protocols/jabber/jingle/DESIGN index 3a3a9636..bfd1cd6c 100644 --- a/kopete/protocols/jabber/jingle/DESIGN +++ b/kopete/protocols/jabber/jingle/DESIGN @@ -102,7 +102,7 @@ JingleVoiceSession : public JingleSession Define a VoIP voice session between two peers(for the moment). Hold the PhoneSessionClient object. -connect(account()->client(),SIGNAL(xmlIncoming(const TQString&)),SLOT(receiveStanza(const TQString&))); +connect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&))); private Q_SLOTS: diff --git a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp index c9979411..66470f09 100644 --- a/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp +++ b/kopete/protocols/jabber/jingle/jinglesessionmanager.cpp @@ -108,7 +108,7 @@ JingleSessionManager::JingleSessionManager(JabberAccount *account) // Create watch incoming session task. d->watchSessionTask = new JingleWatchSessionTask(account->client()->rootTask()); - connect(d->watchSessionTask, TQT_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQT_SLOT(slotIncomingSession(const TQString &, const TQString &))); + connect(d->watchSessionTask, TQ_SIGNAL(watchSession(const TQString &, const TQString &)), this, TQ_SLOT(slotIncomingSession(const TQString &, const TQString &))); // Create global cricket variables common to all sessions. // Seed random generation with the JID of the account. diff --git a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp index e25c7c3c..cc417279 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicecaller.cpp @@ -233,7 +233,7 @@ void JingleVoiceCaller::initialize() new JingleITQResponder(account()->client()->rootTask()); // Listen to incoming packets - connect(account()->client()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),TQT_SLOT(receiveStanza(const TQString&))); + connect(account()->client()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),TQ_SLOT(receiveStanza(const TQString&))); initialized_ = true; } @@ -245,7 +245,7 @@ void JingleVoiceCaller::deinitialize() return; // Stop listening to incoming packets - disconnect(account()->client(),TQT_SIGNAL(xmlIncoming(const TQString&)),this,TQT_SLOT(receiveStanza(const TQString&))); + disconnect(account()->client(),TQ_SIGNAL(xmlIncoming(const TQString&)),this,TQ_SLOT(receiveStanza(const TQString&))); // Disconnect signals (is this needed) //phone_client_->SignalCallCreate.disconnect(slots_); diff --git a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp index 8a6331d6..a27aac10 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesession.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesession.cpp @@ -224,7 +224,7 @@ JingleVoiceSession::JingleVoiceSession(JabberAccount *account, const JidList &pe d->phoneSessionClient->SignalCallCreate.connect(slotsProxy, &JingleVoiceSession::SlotsProxy::OnCallCreated); // Listen to incoming packets - connect(account->client()->client(), TQT_SIGNAL(xmlIncoming(const TQString&)), this, TQT_SLOT(receiveStanza(const TQString&))); + connect(account->client()->client(), TQ_SIGNAL(xmlIncoming(const TQString&)), this, TQ_SLOT(receiveStanza(const TQString&))); new JingleITQResponder(account->client()->rootTask()); } diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index dc2b2c8d..8a55c499 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -46,21 +46,21 @@ JingleVoiceSessionDialog::JingleVoiceSessionDialog(const Jid &peerJid, VoiceCall TQString contactJid = m_peerJid.full(); setCaption( i18n("Voice session with %1").arg(contactJid) ); - connect(buttonAccept, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAcceptClicked())); - connect(buttonDecline, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeclineClicked())); - connect(buttonTerminate, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotTerminateClicked())); + connect(buttonAccept, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAcceptClicked())); + connect(buttonDecline, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeclineClicked())); + connect(buttonTerminate, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotTerminateClicked())); // NOTE: Disabled for 0.12 #if 0 - connect(m_session, TQT_SIGNAL(sessionStarted()), this, TQT_SLOT(sessionStarted())); - connect(m_session, TQT_SIGNAL(accepted()), this, TQT_SLOT(sessionAccepted())); - connect(m_session, TQT_SIGNAL(declined()), this, TQT_SLOT(sessionDeclined())); - connect(m_session, TQT_SIGNAL(terminated()), this, TQT_SLOT(sessionTerminated())); + connect(m_session, TQ_SIGNAL(sessionStarted()), this, TQ_SLOT(sessionStarted())); + connect(m_session, TQ_SIGNAL(accepted()), this, TQ_SLOT(sessionAccepted())); + connect(m_session, TQ_SIGNAL(declined()), this, TQ_SLOT(sessionDeclined())); + connect(m_session, TQ_SIGNAL(terminated()), this, TQ_SLOT(sessionTerminated())); #endif - connect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); - connect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); - connect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); - connect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); + connect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) )); + connect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) )); + connect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) )); + connect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) )); // Find JabberContact for the peer and fill this dialog with contact information. JabberContact *peerContact = static_cast<JabberContact*>( m_session->account()->contactPool()->findRelevantRecipient( m_peerJid ) ); @@ -199,10 +199,10 @@ void JingleVoiceSessionDialog::reject() void JingleVoiceSessionDialog::finalize() { - disconnect(m_session, TQT_SIGNAL(accepted( const Jid & )), this, TQT_SLOT( sessionAccepted(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(in_progress( const Jid & )), this, TQT_SLOT( sessionStarted(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(rejected( const Jid& )), this, TQT_SLOT( sessionDeclined(const Jid &) )); - disconnect(m_session, TQT_SIGNAL(terminated( const Jid& )), this, TQT_SLOT( sessionTerminated(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(accepted( const Jid & )), this, TQ_SLOT( sessionAccepted(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(in_progress( const Jid & )), this, TQ_SLOT( sessionStarted(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(rejected( const Jid& )), this, TQ_SLOT( sessionDeclined(const Jid &) )); + disconnect(m_session, TQ_SIGNAL(terminated( const Jid& )), this, TQ_SLOT( sessionTerminated(const Jid &) )); } #include "jinglevoicesessiondialog.moc" diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp index cabd62b3..96843678 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/bsocket.cpp @@ -63,9 +63,9 @@ BSocket::BSocket(TQObject *parent) { d = new Private; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done())); + connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done())); reset(); } @@ -110,13 +110,13 @@ void BSocket::ensureSocket() if(!d->qsock) { d->qsock = new TQSocket; d->qsock->setReadBufferSize(READBUFSIZE); - connect(d->qsock, TQT_SIGNAL(hostFound()), TQT_SLOT(qs_hostFound())); - connect(d->qsock, TQT_SIGNAL(connected()), TQT_SLOT(qs_connected())); - connect(d->qsock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(qs_connectionClosed())); - connect(d->qsock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(qs_delayedCloseFinished())); - connect(d->qsock, TQT_SIGNAL(readyRead()), TQT_SLOT(qs_readyRead())); - connect(d->qsock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(qs_bytesWritten(int))); - connect(d->qsock, TQT_SIGNAL(error(int)), TQT_SLOT(qs_error(int))); + connect(d->qsock, TQ_SIGNAL(hostFound()), TQ_SLOT(qs_hostFound())); + connect(d->qsock, TQ_SIGNAL(connected()), TQ_SLOT(qs_connected())); + connect(d->qsock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(qs_connectionClosed())); + connect(d->qsock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(qs_delayedCloseFinished())); + connect(d->qsock, TQ_SIGNAL(readyRead()), TQ_SLOT(qs_readyRead())); + connect(d->qsock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(qs_bytesWritten(int))); + connect(d->qsock, TQ_SIGNAL(error(int)), TQ_SLOT(qs_error(int))); } } @@ -283,7 +283,7 @@ void BSocket::srv_done() d->host = d->srv.resultAddress().toString(); d->port = d->srv.resultPort(); do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } @@ -294,7 +294,7 @@ void BSocket::ndns_done() d->host = d->ndns.resultString(); d->state = Connecting; do_connect(); - //TQTimer::singleShot(0, this, TQT_SLOT(do_connect())); + //TQTimer::singleShot(0, this, TQ_SLOT(do_connect())); //hostFound(); } else { diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp index e9cc5781..3c6273d6 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httpconnect.cpp @@ -100,12 +100,12 @@ HttpConnect::HttpConnect(TQObject *parent) :ByteStream(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp index ed211ac5..c5192472 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/httppoll.cpp @@ -89,10 +89,10 @@ HttpPoll::HttpPoll(TQObject *parent) d->polltime = 30; d->t = new TQTimer; - connect(d->t, TQT_SIGNAL(timeout()), TQT_SLOT(do_sync())); + connect(d->t, TQ_SIGNAL(timeout()), TQ_SLOT(do_sync())); - connect(&d->http, TQT_SIGNAL(result()), TQT_SLOT(http_result())); - connect(&d->http, TQT_SIGNAL(error(int)), TQT_SLOT(http_error(int))); + connect(&d->http, TQ_SIGNAL(result()), TQ_SLOT(http_result())); + connect(&d->http, TQ_SIGNAL(error(int)), TQ_SLOT(http_error(int))); reset(true); } @@ -442,10 +442,10 @@ HttpProxyPost::HttpProxyPost(TQObject *parent) :TQObject(parent) { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp index d36b1fd0..e3527855 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/ndns.cpp @@ -157,7 +157,7 @@ NDnsManager::NDnsManager() d = new Private; d->list.setAutoDelete(true); - connect(tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(app_aboutToQuit())); + connect(tqApp, TQ_SIGNAL(aboutToQuit()), TQ_SLOT(app_aboutToQuit())); } NDnsManager::~NDnsManager() diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp index 9ee26ee5..ce41d7ca 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/servsock.cpp @@ -61,7 +61,7 @@ bool ServSock::listen(TQ_UINT16 port) d->serv = 0; return false; } - connect(d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(sss_connectionReady(int))); + connect(d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(sss_connectionReady(int))); return true; } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp index f314e23e..750abdcb 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/socks.cpp @@ -169,7 +169,7 @@ SocksUDP::SocksUDP(SocksClient *sc, const TQString &host, int port, const TQHost d->sd = new TQSocketDevice(TQSocketDevice::Datagram); d->sd->setBlocking(false); d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); d->host = host; d->port = port; d->routeAddr = routeAddr; @@ -548,12 +548,12 @@ SocksClient::SocksClient(int s, TQObject *parent) void SocksClient::init() { d = new Private; - connect(&d->sock, TQT_SIGNAL(connected()), TQT_SLOT(sock_connected())); - connect(&d->sock, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sock_connectionClosed())); - connect(&d->sock, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sock_delayedCloseFinished())); - connect(&d->sock, TQT_SIGNAL(readyRead()), TQT_SLOT(sock_readyRead())); - connect(&d->sock, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sock_bytesWritten(int))); - connect(&d->sock, TQT_SIGNAL(error(int)), TQT_SLOT(sock_error(int))); + connect(&d->sock, TQ_SIGNAL(connected()), TQ_SLOT(sock_connected())); + connect(&d->sock, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sock_connectionClosed())); + connect(&d->sock, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sock_delayedCloseFinished())); + connect(&d->sock, TQ_SIGNAL(readyRead()), TQ_SLOT(sock_readyRead())); + connect(&d->sock, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sock_bytesWritten(int))); + connect(&d->sock, TQ_SIGNAL(error(int)), TQ_SLOT(sock_error(int))); reset(true); } @@ -1108,7 +1108,7 @@ SocksServer::SocksServer(TQObject *parent) d = new Private; d->sd = 0; d->sn = 0; - connect(&d->serv, TQT_SIGNAL(connectionReady(int)), TQT_SLOT(connectionReady(int))); + connect(&d->serv, TQ_SIGNAL(connectionReady(int)), TQ_SLOT(connectionReady(int))); } SocksServer::~SocksServer() @@ -1139,7 +1139,7 @@ bool SocksServer::listen(TQ_UINT16 port, bool udp) return false; } d->sn = new TQSocketNotifier(d->sd->socket(), TQSocketNotifier::Read); - connect(d->sn, TQT_SIGNAL(activated(int)), TQT_SLOT(sn_activated(int))); + connect(d->sn, TQ_SIGNAL(activated(int)), TQ_SLOT(sn_activated(int))); } return true; } @@ -1172,10 +1172,10 @@ SocksClient *SocksServer::takeIncoming() d->incomingConns.removeRef(c); // we don't care about errors anymore - disconnect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + disconnect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); // don't serve the connection until the event loop, to give the caller a chance to map signals - TQTimer::singleShot(0, c, TQT_SLOT(serve())); + TQTimer::singleShot(0, c, TQ_SLOT(serve())); return c; } @@ -1192,7 +1192,7 @@ void SocksServer::writeUDP(const TQHostAddress &addr, int port, const TQByteArra void SocksServer::connectionReady(int s) { SocksClient *c = new SocksClient(s, this); - connect(c, TQT_SIGNAL(error(int)), this, TQT_SLOT(connectionError())); + connect(c, TQ_SIGNAL(error(int)), this, TQ_SLOT(connectionError())); d->incomingConns.append(c); incomingReady(); } diff --git a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp index 873d6c11..93b5cbfa 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/network/srvresolver.cpp @@ -85,9 +85,9 @@ SrvResolver::SrvResolver(TQObject *parent) d->qdns = 0; #ifndef NO_NDNS - connect(&d->ndns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(&d->ndns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); #endif - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); stop(); } @@ -106,7 +106,7 @@ void SrvResolver::resolve(const TQString &server, const TQString &type, const TQ d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -120,7 +120,7 @@ void SrvResolver::resolveSrvOnly(const TQString &server, const TQString &type, c d->srv = TQString("_") + type + "._" + proto + '.' + server; d->t.start(15000, true); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(qdns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(qdns_done())); d->qdns->setRecordType(TQDns::Srv); d->qdns->setLabel(d->srv); } @@ -191,7 +191,7 @@ void SrvResolver::tryNext() d->ndns.resolve(d->servers.first().name); #else d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(ndns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(ndns_done())); if(d->aaaa) d->qdns->setRecordType(TQDns::Aaaa); // IPv6 else diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp index 7f5dc901..ad9a7381 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/safedelete.cpp @@ -91,7 +91,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp index 7dbb0dd3..9c099ae0 100644 --- a/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp +++ b/kopete/protocols/jabber/libiris/cutestuff/util/showtextdlg.cpp @@ -51,7 +51,7 @@ ShowTextDlg::ShowTextDlg(const TQString &fname, bool rich, TQWidget *parent, con TQHBoxLayout *hb1 = new TQHBoxLayout(vb1); hb1->addStretch(1); TQPushButton *pb = new TQPushButton(tr("&OK"), this); - connect(pb, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(pb, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); hb1->addWidget(pb); hb1->addStretch(1); diff --git a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp index 107d082b..4b0e35ad 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/filetransfer.cpp @@ -115,7 +115,7 @@ void FileTransfer::sendFile(const Jid &to, const TQString &fname, TQ_LLONG size, d->id = d->m->link(this); d->ft = new JT_FT(d->m->client()->rootTask()); - connect(d->ft, TQT_SIGNAL(finished()), TQT_SLOT(ft_finished())); + connect(d->ft, TQ_SIGNAL(finished()), TQ_SLOT(ft_finished())); TQStringList list; list += "http://jabber.org/protocol/bytestreams"; d->ft->request(to, d->id, fname, size, desc, list); @@ -228,10 +228,10 @@ void FileTransfer::ft_finished() d->length = d->size - d->rangeOffset; d->streamType = ft->streamType(); d->c = d->m->client()->s5bManager()->createConnection(); - connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected())); - connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed())); - connect(d->c, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(s5b_bytesWritten(int))); - connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int))); + connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected())); + connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed())); + connect(d->c, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(s5b_bytesWritten(int))); + connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int))); if(d->proxy.isValid()) d->c->setProxy(d->proxy); @@ -250,14 +250,14 @@ void FileTransfer::ft_finished() void FileTransfer::takeConnection(S5BConnection *c) { d->c = c; - connect(d->c, TQT_SIGNAL(connected()), TQT_SLOT(s5b_connected())); - connect(d->c, TQT_SIGNAL(connectionClosed()), TQT_SLOT(s5b_connectionClosed())); - connect(d->c, TQT_SIGNAL(readyRead()), TQT_SLOT(s5b_readyRead())); - connect(d->c, TQT_SIGNAL(error(int)), TQT_SLOT(s5b_error(int))); + connect(d->c, TQ_SIGNAL(connected()), TQ_SLOT(s5b_connected())); + connect(d->c, TQ_SIGNAL(connectionClosed()), TQ_SLOT(s5b_connectionClosed())); + connect(d->c, TQ_SIGNAL(readyRead()), TQ_SLOT(s5b_readyRead())); + connect(d->c, TQ_SIGNAL(error(int)), TQ_SLOT(s5b_error(int))); if(d->proxy.isValid()) d->c->setProxy(d->proxy); accepted(); - TQTimer::singleShot(0, this, TQT_SLOT(doAccept())); + TQTimer::singleShot(0, this, TQ_SLOT(doAccept())); } void FileTransfer::s5b_connected() @@ -338,7 +338,7 @@ FileTransferManager::FileTransferManager(Client *client) d->client = client; d->pft = new JT_PushFT(d->client->rootTask()); - connect(d->pft, TQT_SIGNAL(incoming(const FTRequest &)), TQT_SLOT(pft_incoming(const FTRequest &))); + connect(d->pft, TQ_SIGNAL(incoming(const FTRequest &)), TQ_SLOT(pft_incoming(const FTRequest &))); } FileTransferManager::~FileTransferManager() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp index 8f2e01b6..971af3a4 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/s5b.cpp @@ -394,15 +394,15 @@ void S5BConnection::man_waitForAccept(const S5BRequest &r) void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp) { d->sc = sc; - connect(d->sc, TQT_SIGNAL(connectionClosed()), TQT_SLOT(sc_connectionClosed())); - connect(d->sc, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(sc_delayedCloseFinished())); - connect(d->sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(d->sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(d->sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(d->sc, TQ_SIGNAL(connectionClosed()), TQ_SLOT(sc_connectionClosed())); + connect(d->sc, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(sc_delayedCloseFinished())); + connect(d->sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(d->sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(d->sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); if(sc_udp) { d->su = sc_udp; - connect(d->su, TQT_SIGNAL(packetReady(const TQByteArray &)), TQT_SLOT(su_packetReady(const TQByteArray &))); + connect(d->su, TQ_SIGNAL(packetReady(const TQByteArray &)), TQ_SLOT(su_packetReady(const TQByteArray &))); } d->state = Active; @@ -425,7 +425,7 @@ void S5BConnection::man_clientReady(SocksClient *sc, SocksUDP *sc_udp) d->notifyClose = true; } if(d->notifyRead || d->notifyClose) - TQTimer::singleShot(0, this, TQT_SLOT(doPending())); + TQTimer::singleShot(0, this, TQ_SLOT(doPending())); connected(); } @@ -433,7 +433,7 @@ void S5BConnection::doPending() { if(d->notifyRead) { if(d->notifyClose) - TQTimer::singleShot(0, this, TQT_SLOT(doPending())); + TQTimer::singleShot(0, this, TQ_SLOT(doPending())); sc_readyRead(); } else if(d->notifyClose) @@ -588,9 +588,9 @@ S5BManager::S5BManager(Client *parent) d->activeList.setAutoDelete(true); d->ps = new JT_PushS5B(d->client->rootTask()); - connect(d->ps, TQT_SIGNAL(incoming(const S5BRequest &)), TQT_SLOT(ps_incoming(const S5BRequest &))); - connect(d->ps, TQT_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQT_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &))); - connect(d->ps, TQT_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQT_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &))); + connect(d->ps, TQ_SIGNAL(incoming(const S5BRequest &)), TQ_SLOT(ps_incoming(const S5BRequest &))); + connect(d->ps, TQ_SIGNAL(incomingUDPSuccess(const Jid &, const TQString &)), TQ_SLOT(ps_incomingUDPSuccess(const Jid &, const TQString &))); + connect(d->ps, TQ_SIGNAL(incomingActivate(const Jid &, const TQString &, const Jid &)), TQ_SLOT(ps_incomingActivate(const Jid &, const TQString &, const Jid &))); } S5BManager::~S5BManager() @@ -1008,12 +1008,12 @@ void S5BManager::entryContinue(Entry *e) e->i = new Item(this); e->i->proxy = e->proxyInfo; - connect(e->i, TQT_SIGNAL(accepted()), TQT_SLOT(item_accepted())); - connect(e->i, TQT_SIGNAL(tryingHosts(const StreamHostList &)), TQT_SLOT(item_tryingHosts(const StreamHostList &))); - connect(e->i, TQT_SIGNAL(proxyConnect()), TQT_SLOT(item_proxyConnect())); - connect(e->i, TQT_SIGNAL(waitingForActivation()), TQT_SLOT(item_waitingForActivation())); - connect(e->i, TQT_SIGNAL(connected()), TQT_SLOT(item_connected())); - connect(e->i, TQT_SIGNAL(error(int)), TQT_SLOT(item_error(int))); + connect(e->i, TQ_SIGNAL(accepted()), TQ_SLOT(item_accepted())); + connect(e->i, TQ_SIGNAL(tryingHosts(const StreamHostList &)), TQ_SLOT(item_tryingHosts(const StreamHostList &))); + connect(e->i, TQ_SIGNAL(proxyConnect()), TQ_SLOT(item_proxyConnect())); + connect(e->i, TQ_SIGNAL(waitingForActivation()), TQ_SLOT(item_waitingForActivation())); + connect(e->i, TQ_SIGNAL(connected()), TQ_SLOT(item_connected())); + connect(e->i, TQ_SIGNAL(error(int)), TQ_SLOT(item_error(int))); if(e->c->isRemote()) { const S5BRequest &req = e->c->d->req; @@ -1036,7 +1036,7 @@ void S5BManager::queryProxy(Entry *e) printf("querying proxy: [%s]\n", e->c->d->proxy.full().latin1()); #endif e->query = new JT_S5B(d->client->rootTask()); - connect(e->query, TQT_SIGNAL(finished()), TQT_SLOT(query_finished())); + connect(e->query, TQ_SIGNAL(finished()), TQ_SLOT(query_finished())); e->query->requestProxyInfo(e->c->d->proxy); e->query->go(true); } @@ -1246,7 +1246,7 @@ void S5BManager::Item::doOutgoing() allowIncoming = true; task = new JT_S5B(m->client()->rootTask()); - connect(task, TQT_SIGNAL(finished()), TQT_SLOT(jt_finished())); + connect(task, TQ_SIGNAL(finished()), TQ_SLOT(jt_finished())); task->request(peer, sid, hosts, state == Initiator ? wantFast : false, udp); out_id = task->id(); task->go(true); @@ -1292,7 +1292,7 @@ void S5BManager::Item::doIncoming() } conn = new S5BConnector; - connect(conn, TQT_SIGNAL(result(bool)), TQT_SLOT(conn_result(bool))); + connect(conn, TQ_SIGNAL(result(bool)), TQ_SLOT(conn_result(bool))); TQGuardedPtr<TQObject> self = this; tryingHosts(list); @@ -1308,9 +1308,9 @@ void S5BManager::Item::setIncomingClient(SocksClient *sc) printf("S5BManager::Item: %s [%s] successful incoming connection\n", peer.full().latin1(), sid.latin1()); #endif - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); client = sc; allowIncoming = false; @@ -1388,7 +1388,7 @@ void S5BManager::Item::jt_finished() #endif // connect to the proxy proxy_conn = new S5BConnector; - connect(proxy_conn, TQT_SIGNAL(result(bool)), TQT_SLOT(proxy_result(bool))); + connect(proxy_conn, TQ_SIGNAL(result(bool)), TQ_SLOT(proxy_result(bool))); StreamHostList list; list += proxy; @@ -1442,9 +1442,9 @@ void S5BManager::Item::conn_result(bool b) printf("S5BManager::Item: %s [%s] successful outgoing connection\n", peer.full().latin1(), sid.latin1()); #endif - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); m->doSuccess(peer, in_id, h.jid()); @@ -1493,9 +1493,9 @@ void S5BManager::Item::proxy_result(bool b) delete proxy_conn; proxy_conn = 0; - connect(sc, TQT_SIGNAL(readyRead()), TQT_SLOT(sc_readyRead())); - connect(sc, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(sc_bytesWritten(int))); - connect(sc, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(sc, TQ_SIGNAL(readyRead()), TQ_SLOT(sc_readyRead())); + connect(sc, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(sc_bytesWritten(int))); + connect(sc, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); client = sc; client_udp = sc_udp; @@ -1505,7 +1505,7 @@ void S5BManager::Item::proxy_result(bool b) printf("activating proxy stream\n"); #endif proxy_task = new JT_S5B(m->client()->rootTask()); - connect(proxy_task, TQT_SIGNAL(finished()), TQT_SLOT(proxy_finished())); + connect(proxy_task, TQ_SIGNAL(finished()), TQ_SLOT(proxy_finished())); proxy_task->requestActivation(proxy.jid(), sid, peer); proxy_task->go(true); } @@ -1768,9 +1768,9 @@ public: udp = _udp; client = new SocksClient; client_udp = 0; - connect(client, TQT_SIGNAL(connected()), TQT_SLOT(sc_connected())); - connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); - connect(&t, TQT_SIGNAL(timeout()), TQT_SLOT(trySendUDP())); + connect(client, TQ_SIGNAL(connected()), TQ_SLOT(sc_connected())); + connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); + connect(&t, TQ_SIGNAL(timeout()), TQ_SLOT(trySendUDP())); } ~Item() @@ -1872,7 +1872,7 @@ S5BConnector::S5BConnector(TQObject *parent) d->active = 0; d->active_udp = 0; d->itemList.setAutoDelete(true); - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); } S5BConnector::~S5BConnector() @@ -1900,7 +1900,7 @@ void S5BConnector::start(const Jid &self, const StreamHostList &hosts, const TQS #endif for(StreamHostList::ConstIterator it = hosts.begin(); it != hosts.end(); ++it) { Item *i = new Item(self, *it, key, udp); - connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool))); + connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool))); d->itemList.append(i); i->start(); } @@ -1990,11 +1990,11 @@ public: Item(SocksClient *c) : TQObject(0) { client = c; - connect(client, TQT_SIGNAL(incomingMethods(int)), TQT_SLOT(sc_incomingMethods(int))); - connect(client, TQT_SIGNAL(incomingConnectRequest(const TQString &, int)), TQT_SLOT(sc_incomingConnectRequest(const TQString &, int))); - connect(client, TQT_SIGNAL(error(int)), TQT_SLOT(sc_error(int))); + connect(client, TQ_SIGNAL(incomingMethods(int)), TQ_SLOT(sc_incomingMethods(int))); + connect(client, TQ_SIGNAL(incomingConnectRequest(const TQString &, int)), TQ_SLOT(sc_incomingConnectRequest(const TQString &, int))); + connect(client, TQ_SIGNAL(error(int)), TQ_SLOT(sc_error(int))); - connect(&expire, TQT_SIGNAL(timeout()), TQT_SLOT(doError())); + connect(&expire, TQ_SIGNAL(timeout()), TQ_SLOT(doError())); resetExpiration(); } @@ -2059,8 +2059,8 @@ S5BServer::S5BServer(TQObject *parent) { d = new Private; d->itemList.setAutoDelete(true); - connect(&d->serv, TQT_SIGNAL(incomingReady()), TQT_SLOT(ss_incomingReady())); - connect(&d->serv, TQT_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQT_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &))); + connect(&d->serv, TQ_SIGNAL(incomingReady()), TQ_SLOT(ss_incomingReady())); + connect(&d->serv, TQ_SIGNAL(incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &)), TQ_SLOT(ss_incomingUDP(const TQString &, int, const TQHostAddress &, int, const TQByteArray &))); } S5BServer::~S5BServer() @@ -2106,7 +2106,7 @@ void S5BServer::ss_incomingReady() #ifdef S5B_DEBUG printf("S5BServer: incoming connection from %s:%d\n", i->client->peerAddress().toString().latin1(), i->client->peerPort()); #endif - connect(i, TQT_SIGNAL(result(bool)), TQT_SLOT(item_result(bool))); + connect(i, TQ_SIGNAL(result(bool)), TQ_SLOT(item_result(bool))); d->itemList.append(i); } @@ -2200,7 +2200,7 @@ JT_S5B::JT_S5B(Task *parent) { d = new Private; d->mode = -1; - connect(&d->t, TQT_SIGNAL(timeout()), TQT_SLOT(t_timeout())); + connect(&d->t, TQ_SIGNAL(timeout()), TQ_SLOT(t_timeout())); } JT_S5B::~JT_S5B() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp index aaf3e4cd..ed6c44c7 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_ibb.cpp @@ -110,7 +110,7 @@ void IBBConnection::connectToJid(const Jid &peer, const TQDomElement &comment) d->m->client()->debug(dstr); d->j = new JT_IBB(d->m->client()->rootTask()); - connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished())); + connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished())); d->j->request(d->peer, comment); d->j->go(true); } @@ -270,7 +270,7 @@ void IBBConnection::ibb_finished() } if(!d->sendbuf.isEmpty() || d->closePending) - TQTimer::singleShot(IBB_PACKET_DELAY, this, TQT_SLOT(trySend())); + TQTimer::singleShot(IBB_PACKET_DELAY, this, TQ_SLOT(trySend())); } } else { @@ -326,7 +326,7 @@ void IBBConnection::trySend() d->blockSize = a.size(); d->j = new JT_IBB(d->m->client()->rootTask()); - connect(d->j, TQT_SIGNAL(finished()), TQT_SLOT(ibb_finished())); + connect(d->j, TQ_SIGNAL(finished()), TQ_SLOT(ibb_finished())); d->j->sendData(d->peer, d->sid, a, doClose); d->j->go(true); } @@ -353,8 +353,8 @@ IBBManager::IBBManager(Client *parent) d->client = parent; d->ibb = new JT_IBB(d->client->rootTask(), true); - connect(d->ibb, TQT_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQT_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); - connect(d->ibb, TQT_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQT_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool))); + connect(d->ibb, TQ_SIGNAL(incomingRequest(const Jid &, const TQString &, const TQDomElement &)), TQ_SLOT(ibb_incomingRequest(const Jid &, const TQString &, const TQDomElement &))); + connect(d->ibb, TQ_SIGNAL(incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool)), TQ_SLOT(ibb_incomingData(const Jid &, const TQString &, const TQString &, const TQByteArray &, bool))); } IBBManager::~IBBManager() diff --git a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp index 5139dffd..7cfecda0 100644 --- a/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp +++ b/kopete/protocols/jabber/libiris/iris/jabber/xmpp_jidlink.cpp @@ -105,18 +105,18 @@ void JidLink::link() { if(d->type == DTCP) { S5BConnection *c = (S5BConnection *)d->bs; - connect(c, TQT_SIGNAL(connected()), TQT_SLOT(dtcp_connected())); - connect(c, TQT_SIGNAL(accepted()), TQT_SLOT(dtcp_accepted())); + connect(c, TQ_SIGNAL(connected()), TQ_SLOT(dtcp_connected())); + connect(c, TQ_SIGNAL(accepted()), TQ_SLOT(dtcp_accepted())); } else { IBBConnection *c = (IBBConnection *)d->bs; - connect(c, TQT_SIGNAL(connected()), TQT_SLOT(ibb_connected())); + connect(c, TQ_SIGNAL(connected()), TQ_SLOT(ibb_connected())); } - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); } void JidLink::unlink() @@ -129,7 +129,7 @@ void JidLink::accept() if(d->state != WaitingForAccept) return; - TQTimer::singleShot(0, this, TQT_SLOT(doRealAccept())); + TQTimer::singleShot(0, this, TQ_SLOT(doRealAccept())); } void JidLink::doRealAccept() diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp index a27811ec..493d887d 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/connector.cpp @@ -231,9 +231,9 @@ AdvancedConnector::AdvancedConnector(TQObject *parent) #ifdef NO_NDNS d->qdns = 0; #else - connect(&d->dns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done())); + connect(&d->dns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done())); #endif - connect(&d->srv, TQT_SIGNAL(resultsReady()), TQT_SLOT(srv_done())); + connect(&d->srv, TQ_SIGNAL(resultsReady()), TQ_SLOT(srv_done())); d->opt_probe = false; d->opt_ssl = false; cleanup(); @@ -326,10 +326,10 @@ void AdvancedConnector::connectToServer(const TQString &server) HttpPoll *s = new HttpPoll; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(syncStarted()), TQT_SLOT(http_syncStarted())); - connect(s, TQT_SIGNAL(syncFinished()), TQT_SLOT(http_syncFinished())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(syncStarted()), TQ_SLOT(http_syncStarted())); + connect(s, TQ_SIGNAL(syncFinished()), TQ_SLOT(http_syncFinished())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->setPollInterval(d->proxy.pollInterval()); @@ -389,7 +389,7 @@ void AdvancedConnector::do_resolve() #ifdef NO_NDNS printf("resolving (aaaa=%d)\n", d->aaaa); d->qdns = new TQDns; - connect(d->qdns, TQT_SIGNAL(resultsReady()), TQT_SLOT(dns_done())); + connect(d->qdns, TQ_SIGNAL(resultsReady()), TQ_SLOT(dns_done())); if(d->aaaa) d->qdns->setRecordType(TQDns::Aaaa); // IPv6 else @@ -502,8 +502,8 @@ void AdvancedConnector::do_connect() #endif BSocket *s = new BSocket; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); s->connectToHost(d->host, d->port); } else if(t == Proxy::HttpConnect) { @@ -512,8 +512,8 @@ void AdvancedConnector::do_connect() #endif HttpConnect *s = new HttpConnect; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port); @@ -524,8 +524,8 @@ void AdvancedConnector::do_connect() #endif SocksClient *s = new SocksClient; d->bs = s; - connect(s, TQT_SIGNAL(connected()), TQT_SLOT(bs_connected())); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(s, TQ_SIGNAL(connected()), TQ_SLOT(bs_connected())); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); if(!d->proxy.user().isEmpty()) s->setAuth(d->proxy.user(), d->proxy.pass()); s->connectToHost(d->proxy.host(), d->proxy.port(), d->host, d->port); diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp index 84b387e8..14ff7019 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/securestream.cpp @@ -132,11 +132,11 @@ public: type = TLS; p.tls = t; init(); - connect(p.tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(p.tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(p.tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(p.tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(p.tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(p.tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(p.tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(p.tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(p.tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(p.tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); } SecureLayer(TQCA::SASL *s) @@ -144,9 +144,9 @@ public: type = SASL; p.sasl = s; init(); - connect(p.sasl, TQT_SIGNAL(readyRead()), TQT_SLOT(sasl_readyRead())); - connect(p.sasl, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(sasl_readyReadOutgoing(int))); - connect(p.sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(p.sasl, TQ_SIGNAL(readyRead()), TQ_SLOT(sasl_readyRead())); + connect(p.sasl, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(sasl_readyReadOutgoing(int))); + connect(p.sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); } #ifdef USE_TLSHANDLER @@ -155,11 +155,11 @@ public: type = TLSH; p.tlsHandler = t; init(); - connect(p.tlsHandler, TQT_SIGNAL(success()), TQT_SLOT(tlsHandler_success())); - connect(p.tlsHandler, TQT_SIGNAL(fail()), TQT_SLOT(tlsHandler_fail())); - connect(p.tlsHandler, TQT_SIGNAL(closed()), TQT_SLOT(tlsHandler_closed())); - connect(p.tlsHandler, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(tlsHandler_readyRead(const TQByteArray &))); - connect(p.tlsHandler, TQT_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQT_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); + connect(p.tlsHandler, TQ_SIGNAL(success()), TQ_SLOT(tlsHandler_success())); + connect(p.tlsHandler, TQ_SIGNAL(fail()), TQ_SLOT(tlsHandler_fail())); + connect(p.tlsHandler, TQ_SIGNAL(closed()), TQ_SLOT(tlsHandler_closed())); + connect(p.tlsHandler, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(tlsHandler_readyRead(const TQByteArray &))); + connect(p.tlsHandler, TQ_SIGNAL(readyReadOutgoing(const TQByteArray &, int)), TQ_SLOT(tlsHandler_readyReadOutgoing(const TQByteArray &, int))); } #endif @@ -349,8 +349,8 @@ SecureStream::SecureStream(ByteStream *s) d = new Private; d->bs = s; - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); d->layers.setAutoDelete(true); d->pending = 0; @@ -365,11 +365,11 @@ SecureStream::~SecureStream() void SecureStream::linkLayer(TQObject *s) { - connect(s, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(layer_tlsHandshaken())); - connect(s, TQT_SIGNAL(tlsClosed(const TQByteArray &)), TQT_SLOT(layer_tlsClosed(const TQByteArray &))); - connect(s, TQT_SIGNAL(readyRead(const TQByteArray &)), TQT_SLOT(layer_readyRead(const TQByteArray &))); - connect(s, TQT_SIGNAL(needWrite(const TQByteArray &)), TQT_SLOT(layer_needWrite(const TQByteArray &))); - connect(s, TQT_SIGNAL(error(int)), TQT_SLOT(layer_error(int))); + connect(s, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(layer_tlsHandshaken())); + connect(s, TQ_SIGNAL(tlsClosed(const TQByteArray &)), TQ_SLOT(layer_tlsClosed(const TQByteArray &))); + connect(s, TQ_SIGNAL(readyRead(const TQByteArray &)), TQ_SLOT(layer_readyRead(const TQByteArray &))); + connect(s, TQ_SIGNAL(needWrite(const TQByteArray &)), TQ_SLOT(layer_needWrite(const TQByteArray &))); + connect(s, TQ_SIGNAL(error(int)), TQ_SLOT(layer_error(int))); } int SecureStream::calcPrebytes() const diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp index e0d09d8e..18b19688 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp @@ -618,11 +618,11 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa d = new Private; d->mode = Client; d->conn = conn; - connect(d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected())); - connect(d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error())); + connect(d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected())); + connect(d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error())); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); d->tlsHandler = tlsHandler; } @@ -633,18 +633,18 @@ ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteS d = new Private; d->mode = Server; d->bs = bs; - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); d->server = host; d->defRealm = defRealm; @@ -940,17 +940,17 @@ void ClientStream::write(const Stanza &s) void ClientStream::cr_connected() { d->bs = d->conn->stream(); - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); TQByteArray spare = d->bs->read(); d->ss = new SecureStream(d->bs); - connect(d->ss, TQT_SIGNAL(readyRead()), TQT_SLOT(ss_readyRead())); - connect(d->ss, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(ss_bytesWritten(int))); - connect(d->ss, TQT_SIGNAL(tlsHandshaken()), TQT_SLOT(ss_tlsHandshaken())); - connect(d->ss, TQT_SIGNAL(tlsClosed()), TQT_SLOT(ss_tlsClosed())); - connect(d->ss, TQT_SIGNAL(error(int)), TQT_SLOT(ss_error(int))); + connect(d->ss, TQ_SIGNAL(readyRead()), TQ_SLOT(ss_readyRead())); + connect(d->ss, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(ss_bytesWritten(int))); + connect(d->ss, TQ_SIGNAL(tlsHandshaken()), TQ_SLOT(ss_tlsHandshaken())); + connect(d->ss, TQ_SIGNAL(tlsClosed()), TQ_SLOT(ss_tlsClosed())); + connect(d->ss, TQ_SIGNAL(error(int)), TQ_SLOT(ss_error(int))); //d->client.startDialbackOut("andbit.net", "im.pyxa.org"); //d->client.startServerOut(d->server); @@ -1163,10 +1163,10 @@ void ClientStream::srvProcessNext() else if(need == CoreProtocol::NSASLMechs) { if(!d->sasl) { d->sasl = new TQCA::SASL; - connect(d->sasl, TQT_SIGNAL(authCheck(const TQString &, const TQString &)), TQT_SLOT(sasl_authCheck(const TQString &, const TQString &))); - connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &))); - connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated())); - connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(d->sasl, TQ_SIGNAL(authCheck(const TQString &, const TQString &)), TQ_SLOT(sasl_authCheck(const TQString &, const TQString &))); + connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &))); + connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated())); + connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); //d->sasl->setAllowAnonymous(false); //d->sasl->setRequirePassCredentials(true); @@ -1258,7 +1258,7 @@ void ClientStream::srvProcessNext() } case CoreProtocol::ESASLSuccess: { printf("Break SASL Success\n"); - disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int))); + disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int))); TQByteArray a = d->srv.spare; d->ss->setLayerSASL(d->sasl, a); break; @@ -1324,7 +1324,7 @@ void ClientStream::processNext() //if(!d->in_rrsig && !d->in.isEmpty()) { if(!d->in.isEmpty()) { //d->in_rrsig = true; - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } if(cont) @@ -1480,11 +1480,11 @@ bool ClientStream::handleNeed() } d->sasl = new TQCA::SASL; - connect(d->sasl, TQT_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQT_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *))); - connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &))); - connect(d->sasl, TQT_SIGNAL(needParams(bool, bool, bool, bool)), TQT_SLOT(sasl_needParams(bool, bool, bool, bool))); - connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated())); - connect(d->sasl, TQT_SIGNAL(error(int)), TQT_SLOT(sasl_error(int))); + connect(d->sasl, TQ_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQ_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *))); + connect(d->sasl, TQ_SIGNAL(nextStep(const TQByteArray &)), TQ_SLOT(sasl_nextStep(const TQByteArray &))); + connect(d->sasl, TQ_SIGNAL(needParams(bool, bool, bool, bool)), TQ_SLOT(sasl_needParams(bool, bool, bool, bool))); + connect(d->sasl, TQ_SIGNAL(authenticated()), TQ_SLOT(sasl_authenticated())); + connect(d->sasl, TQ_SIGNAL(error(int)), TQ_SLOT(sasl_error(int))); if(d->haveLocalAddr) d->sasl->setLocalAddr(d->localAddr, d->localPort); @@ -1531,7 +1531,7 @@ bool ClientStream::handleNeed() } case CoreProtocol::NSASLLayer: { // SecureStream will handle the errors from this point - disconnect(d->sasl, TQT_SIGNAL(error(int)), this, TQT_SLOT(sasl_error(int))); + disconnect(d->sasl, TQ_SIGNAL(error(int)), this, TQ_SLOT(sasl_error(int))); d->ss->setLayerSASL(d->sasl, d->client.spare); if(d->sasl_ssf > 0) { TQGuardedPtr<TQObject> self = this; diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp index 86092bad..51e75bbf 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/tlshandler.cpp @@ -53,11 +53,11 @@ TQCATLSHandler::TQCATLSHandler(TQCA::TLS *parent) { d = new Private; d->tls = parent; - connect(d->tls, TQT_SIGNAL(handshaken()), TQT_SLOT(tls_handshaken())); - connect(d->tls, TQT_SIGNAL(readyRead()), TQT_SLOT(tls_readyRead())); - connect(d->tls, TQT_SIGNAL(readyReadOutgoing(int)), TQT_SLOT(tls_readyReadOutgoing(int))); - connect(d->tls, TQT_SIGNAL(closed()), TQT_SLOT(tls_closed())); - connect(d->tls, TQT_SIGNAL(error(int)), TQT_SLOT(tls_error(int))); + connect(d->tls, TQ_SIGNAL(handshaken()), TQ_SLOT(tls_handshaken())); + connect(d->tls, TQ_SIGNAL(readyRead()), TQ_SLOT(tls_readyRead())); + connect(d->tls, TQ_SIGNAL(readyReadOutgoing(int)), TQ_SLOT(tls_readyReadOutgoing(int))); + connect(d->tls, TQ_SIGNAL(closed()), TQ_SLOT(tls_closed())); + connect(d->tls, TQ_SIGNAL(error(int)), TQ_SLOT(tls_error(int))); d->state = 0; d->err = -1; } @@ -88,7 +88,7 @@ void TQCATLSHandler::startClient(const TQString &host) d->state = 0; d->err = -1; if(!d->tls->startClient(host)) - TQTimer::singleShot(0, this, TQT_SIGNAL(fail())); + TQTimer::singleShot(0, this, TQ_SIGNAL(fail())); } void TQCATLSHandler::write(const TQByteArray &a) diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp index 08c5c415..f03ab71b 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/client.cpp @@ -50,8 +50,8 @@ //! Session::Session() //! { //! client = new Client; -//! connect(client, TQT_SIGNAL(handshaken()), TQT_SLOT(clientHandshaken())); -//! connect(client, TQT_SIGNAL(authFinished(bool, int, const TQString &)), TQT_SLOT(authFinished(bool, int, const TQString &))); +//! connect(client, TQ_SIGNAL(handshaken()), TQ_SLOT(clientHandshaken())); +//! connect(client, TQ_SIGNAL(authFinished(bool, int, const TQString &)), TQ_SLOT(authFinished(bool, int, const TQString &))); //! client->connectToHost("jabber.org"); //! } //! @@ -162,10 +162,10 @@ Client::Client(TQObject *par) d->stream = 0; d->s5bman = new S5BManager(this); - connect(d->s5bman, TQT_SIGNAL(incomingReady()), TQT_SLOT(s5b_incomingReady())); + connect(d->s5bman, TQ_SIGNAL(incomingReady()), TQ_SLOT(s5b_incomingReady())); d->ibbman = new IBBManager(this); - connect(d->ibbman, TQT_SIGNAL(incomingReady()), TQT_SLOT(ibb_incomingReady())); + connect(d->ibbman, TQ_SIGNAL(incomingReady()), TQ_SLOT(ibb_incomingReady())); d->jlman = new JidLinkManager(this); @@ -188,14 +188,14 @@ Client::~Client() void Client::connectToServer(ClientStream *s, const Jid &j, bool auth) { d->stream = s; - //connect(d->stream, TQT_SIGNAL(connected()), TQT_SLOT(streamConnected())); - //connect(d->stream, TQT_SIGNAL(handshaken()), TQT_SLOT(streamHandshaken())); - connect(d->stream, TQT_SIGNAL(error(int)), TQT_SLOT(streamError(int))); - //connect(d->stream, TQT_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQT_SLOT(streamSSLCertificateReady(const TQSSLCert &))); - connect(d->stream, TQT_SIGNAL(readyRead()), TQT_SLOT(streamReadyRead())); - //connect(d->stream, TQT_SIGNAL(closeFinished()), TQT_SLOT(streamCloseFinished())); - connect(d->stream, TQT_SIGNAL(incomingXml(const TQString &)), TQT_SLOT(streamIncomingXml(const TQString &))); - connect(d->stream, TQT_SIGNAL(outgoingXml(const TQString &)), TQT_SLOT(streamOutgoingXml(const TQString &))); + //connect(d->stream, TQ_SIGNAL(connected()), TQ_SLOT(streamConnected())); + //connect(d->stream, TQ_SIGNAL(handshaken()), TQ_SLOT(streamHandshaken())); + connect(d->stream, TQ_SIGNAL(error(int)), TQ_SLOT(streamError(int))); + //connect(d->stream, TQ_SIGNAL(sslCertificateReady(const TQSSLCert &)), TQ_SLOT(streamSSLCertificateReady(const TQSSLCert &))); + connect(d->stream, TQ_SIGNAL(readyRead()), TQ_SLOT(streamReadyRead())); + //connect(d->stream, TQ_SIGNAL(closeFinished()), TQ_SLOT(streamCloseFinished())); + connect(d->stream, TQ_SIGNAL(incomingXml(const TQString &)), TQ_SLOT(streamIncomingXml(const TQString &))); + connect(d->stream, TQ_SIGNAL(outgoingXml(const TQString &)), TQ_SLOT(streamOutgoingXml(const TQString &))); d->stream->connectToServer(j, auth); } @@ -213,14 +213,14 @@ void Client::start(const TQString &host, const TQString &user, const TQString &p d->resourceList += Resource(resource(), stat); JT_PushPresence *pp = new JT_PushPresence(rootTask()); - connect(pp, TQT_SIGNAL(subscription(const Jid &, const TQString &)), TQT_SLOT(ppSubscription(const Jid &, const TQString &))); - connect(pp, TQT_SIGNAL(presence(const Jid &, const Status &)), TQT_SLOT(ppPresence(const Jid &, const Status &))); + connect(pp, TQ_SIGNAL(subscription(const Jid &, const TQString &)), TQ_SLOT(ppSubscription(const Jid &, const TQString &))); + connect(pp, TQ_SIGNAL(presence(const Jid &, const Status &)), TQ_SLOT(ppPresence(const Jid &, const Status &))); JT_PushMessage *pm = new JT_PushMessage(rootTask()); - connect(pm, TQT_SIGNAL(message(const Message &)), TQT_SLOT(pmMessage(const Message &))); + connect(pm, TQ_SIGNAL(message(const Message &)), TQ_SLOT(pmMessage(const Message &))); JT_PushRoster *pr = new JT_PushRoster(rootTask()); - connect(pr, TQT_SIGNAL(roster(const Roster &)), TQT_SLOT(prRoster(const Roster &))); + connect(pr, TQ_SIGNAL(roster(const Roster &)), TQ_SLOT(prRoster(const Roster &))); new JT_ServInfo(rootTask()); new PongServer(rootTask()); @@ -884,7 +884,7 @@ void Client::rosterRequest() return; JT_Roster *r = new JT_Roster(rootTask()); - connect(r, TQT_SIGNAL(finished()), TQT_SLOT(slotRosterRequestFinished())); + connect(r, TQ_SIGNAL(finished()), TQ_SLOT(slotRosterRequestFinished())); r->get(); d->roster.flagAllForDelete(); // mod_groups patch r->go(true); @@ -1163,7 +1163,7 @@ Task::Task(Task *parent) d->client = parent->client(); d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -1172,7 +1172,7 @@ Task::Task(Client *parent, bool) init(); d->client = parent; - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::~Task() @@ -1276,7 +1276,7 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - TQTimer::singleShot(0, this, TQT_SLOT(done())); + TQTimer::singleShot(0, this, TQ_SLOT(done())); } } diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp index c331e123..e7e929ab 100644 --- a/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp +++ b/kopete/protocols/jabber/libiris/iris/xmpp-im/xmpp_tasks.cpp @@ -270,7 +270,7 @@ void JT_UnRegister::onGo() d->jt_reg = new JT_Register(this); d->jt_reg->getForm(d->j); - connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(getFormFinished())); + connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(getFormFinished())); d->jt_reg->go(false); } @@ -279,7 +279,7 @@ void JT_UnRegister::getFormFinished() disconnect(d->jt_reg, 0, this, 0); d->jt_reg->unreg(d->j); - connect(d->jt_reg, TQT_SIGNAL(finished()), TQT_SLOT(unregFinished())); + connect(d->jt_reg, TQ_SIGNAL(finished()), TQ_SLOT(unregFinished())); d->jt_reg->go(false); } diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp index 470a9f2e..709255a7 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -76,14 +76,14 @@ void JabberDiscoProtocol::openConnection () { m_jabberClient = new JabberClient; - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csDisconnected () ), this, TQT_SLOT ( slotCSDisconnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQT_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); - - TQObject::connect ( m_jabberClient, TQT_SIGNAL ( debugMessage ( const TQString & ) ), - this, TQT_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csDisconnected () ), this, TQ_SLOT ( slotCSDisconnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( error ( JabberClient::ErrorCode ) ), this, TQ_SLOT ( slotClientError ( JabberClient::ErrorCode ) ) ); + + TQObject::connect ( m_jabberClient, TQ_SIGNAL ( debugMessage ( const TQString & ) ), + this, TQ_SLOT ( slotClientDebugMessage ( const TQString & ) ) ); } else { @@ -232,7 +232,7 @@ void JabberDiscoProtocol::slotConnected () case ListDir: // list a directory kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Listing directory..." << endl; discoTask = new XMPP::JT_DiscoItems ( m_jabberClient->rootTask () ); - connect ( discoTask, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotQueryFinished () ) ); + connect ( discoTask, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotQueryFinished () ) ); discoTask->get ( m_host ); discoTask->go ( true ); break; diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index 10c11b0f..64970573 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -45,7 +45,7 @@ dlgJabberBrowse::dlgJabberBrowse (JabberAccount *account, const XMPP::Jid & jid, XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ())); task->get (jid); task->go (true); @@ -83,7 +83,7 @@ void dlgJabberBrowse::slotGotForm () tblResults->setColumnStretchable (i, true); } - connect (btnSearch, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); + connect (btnSearch, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ())); } @@ -92,7 +92,7 @@ void dlgJabberBrowse::slotSendForm () XMPP::JT_Search * task = new XMPP::JT_Search (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ())); task->set (translator->resultData ()); task->go (true); diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index c890b158..dd2ffd62 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -80,7 +80,7 @@ void DlgJabberChangePassword::slotOk () i18n ( "Your account needs to be connected before the password can be changed. Do you want to try to connect now?" ), i18n ( "Jabber Password Change" ), i18n("Connect"), i18n("Stay Offline") ) == KMessageBox::Yes ) { - connect ( m_account, TQT_SIGNAL ( isConnectedChanged () ), this, TQT_SLOT ( slotChangePassword () ) ); + connect ( m_account, TQ_SIGNAL ( isConnectedChanged () ), this, TQ_SLOT ( slotChangePassword () ) ); m_account->connect (); } } @@ -102,7 +102,7 @@ void DlgJabberChangePassword::slotChangePassword () { XMPP::JT_Register *task = new XMPP::JT_Register ( m_account->client()->rootTask () ); - TQObject::connect ( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotChangePasswordDone () ) ); + TQObject::connect ( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotChangePasswordDone () ) ); task->changepw ( m_mainWidget->peNewPassword1->password () ); task->go ( true ); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index 46071122..5988c712 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -77,7 +77,7 @@ void dlgJabberChatJoin::slotBowse() void dlgJabberChatJoin::checkDefaultChatroomServer() { XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices(m_account->client()->rootTask()); - connect(serviceTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotQueryFinished())); + connect(serviceTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotQueryFinished())); serviceTask->get(m_account->server()); serviceTask->go(true); @@ -97,7 +97,7 @@ void dlgJabberChatJoin::slotQueryFinished() for (XMPP::AgentList::const_iterator it = task->agents().begin(); it != task->agents().end(); ++it) { XMPP::JT_DiscoInfo *discoTask = new XMPP::JT_DiscoInfo(m_account->client()->rootTask()); - connect(discoTask, TQT_SIGNAL (finished()), this, TQT_SLOT (slotDiscoFinished())); + connect(discoTask, TQ_SIGNAL (finished()), this, TQ_SLOT (slotDiscoFinished())); discoTask->get((*it).jid().full()); discoTask->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 3afea298..4fec5b7f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -74,7 +74,7 @@ void dlgJabberChatRoomsList::slotQuery() tblChatRoomsList->setNumRows(0); XMPP::JT_DiscoItems *discoTask = new XMPP::JT_DiscoItems(m_account->client()->rootTask()); - connect (discoTask, TQT_SIGNAL(finished()), this, TQT_SLOT(slotQueryFinished())); + connect (discoTask, TQ_SIGNAL(finished()), this, TQ_SLOT(slotQueryFinished())); m_chatServer = leServer->text(); discoTask->get(leServer->text()); diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index 0f6f55f4..5d46695b 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -32,7 +32,7 @@ dlgJabberRegister::dlgJabberRegister (JabberAccount *account, const XMPP::Jid & XMPP::JT_Register * task = new XMPP::JT_Register(m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotGotForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotGotForm ())); task->getForm (jid); task->go (true); @@ -66,7 +66,7 @@ void dlgJabberRegister::slotGotForm () // enable the send button btnRegister->setEnabled (true); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSendForm ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSendForm ())); } @@ -76,7 +76,7 @@ void dlgJabberRegister::slotSendForm () return; XMPP::JT_Register * task = new XMPP::JT_Register (m_account->client()->rootTask ()); - connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotSentForm ())); + connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotSentForm ())); task->setForm (translator->resultData ()); task->go (true); diff --git a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp index 499eb2b7..c665847c 100644 --- a/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbersendraw.cpp @@ -28,10 +28,10 @@ dlgJabberSendRaw::dlgJabberSendRaw ( JabberClient *client, TQWidget *parent, con : DlgSendRaw (parent, name) { // Connect the GUI elements to things that do stuff - connect (btnSend, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotSend ())); - connect (btnClose, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotCancel ())); - connect (btnClear, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotClear ())); - connect (inputWidget, TQT_SIGNAL (activated (int)), this, TQT_SLOT (slotCreateMessage (int))); + connect (btnSend, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotSend ())); + connect (btnClose, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotCancel ())); + connect (btnClear, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotClear ())); + connect (inputWidget, TQ_SIGNAL (activated (int)), this, TQ_SLOT (slotCreateMessage (int))); m_client = client; diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index bf0eaa27..11839b79 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -63,12 +63,12 @@ dlgJabberServices::dlgJabberServices (JabberAccount *account, TQWidget *parent, //tblServices->horizontalHeader ()->setLabel (0, i18n ("Name")); //tblServices->horizontalHeader ()->setLabel (1, i18n ("Address")); - connect (btnQuery, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotDisco ())); - //connect (tblServices, TQT_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQT_SLOT (slotSetSelection (int, int, int, const TQPoint &))); - connect (lvServices, TQT_SIGNAL (selectionChanged (TQListViewItem *)), this, TQT_SLOT (slotSetSelection (TQListViewItem *))); + connect (btnQuery, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotDisco ())); + //connect (tblServices, TQ_SIGNAL (clicked (int, int, int, const TQPoint &)), this, TQ_SLOT (slotSetSelection (int, int, int, const TQPoint &))); + connect (lvServices, TQ_SIGNAL (selectionChanged (TQListViewItem *)), this, TQ_SLOT (slotSetSelection (TQListViewItem *))); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotRegister ())); - connect (btnBrowse, TQT_SIGNAL (clicked ()), this, TQT_SLOT (slotBrowse ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotRegister ())); + connect (btnBrowse, TQ_SIGNAL (clicked ()), this, TQ_SLOT (slotBrowse ())); } @@ -99,7 +99,7 @@ void dlgJabberServices::slotService () } XMPP::JT_GetServices *serviceTask = new XMPP::JT_GetServices (m_account->client()->rootTask ()); - connect (serviceTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotServiceFinished ())); + connect (serviceTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotServiceFinished ())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) @@ -148,7 +148,7 @@ void dlgJabberServices::slotDisco() } JT_DiscoItems *jt = new JT_DiscoItems(m_account->client()->rootTask()); - connect(jt, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDiscoFinished())); + connect(jt, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDiscoFinished())); /* populate server field if it is empty */ if(leServer->text().isEmpty()) @@ -214,7 +214,7 @@ dlgJabberServices::~dlgJabberServices () void dlgJabberServies_item::updateInfo( const XMPP::Jid & jid , const TQString & node , JabberAccount *account ) { XMPP::JT_DiscoInfo *jt = new XMPP::JT_DiscoInfo(account->client()->rootTask()); - connect(jt, TQT_SIGNAL(finished()),this, TQT_SLOT(slotDiscoFinished())); + connect(jt, TQ_SIGNAL(finished()),this, TQ_SLOT(slotDiscoFinished())); jt->get(jid, node); jt->go(true); diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 3f12b2f5..6dbc4456 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -70,14 +70,14 @@ dlgJabberVCard::dlgJabberVCard (JabberAccount *account, JabberBaseContact *conta m_mainWidget = new dlgVCard(this); setMainWidget(m_mainWidget); - connect (this, TQT_SIGNAL (user1Clicked()), this, TQT_SLOT (slotSaveVCard ())); - connect (this, TQT_SIGNAL( user2Clicked()), this, TQT_SLOT (slotGetVCard ())); + connect (this, TQ_SIGNAL (user1Clicked()), this, TQ_SLOT (slotSaveVCard ())); + connect (this, TQ_SIGNAL( user2Clicked()), this, TQ_SLOT (slotGetVCard ())); - connect (m_mainWidget->btnSelectPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotSelectPhoto())); - connect (m_mainWidget->btnClearPhoto, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotClearPhoto())); - connect (m_mainWidget->urlHomeEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); - connect (m_mainWidget->urlWorkEmail, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); - connect (m_mainWidget->urlHomepage, TQT_SIGNAL (leftClickedURL(const TQString &)), this, TQT_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->btnSelectPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotSelectPhoto())); + connect (m_mainWidget->btnClearPhoto, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotClearPhoto())); + connect (m_mainWidget->urlHomeEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlWorkEmail, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); + connect (m_mainWidget->urlHomepage, TQ_SIGNAL (leftClickedURL(const TQString &)), this, TQ_SLOT (slotOpenURL (const TQString &))); assignContactProperties(); @@ -407,7 +407,7 @@ void dlgJabberVCard::slotSaveVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - TQObject::connect(task, TQT_SIGNAL(finished()), this, TQT_SLOT(slotVCardSaved())); + TQObject::connect(task, TQ_SIGNAL(finished()), this, TQ_SLOT(slotVCardSaved())); task->set(vCard); task->go(true); } @@ -438,7 +438,7 @@ void dlgJabberVCard::slotGetVCard() XMPP::JT_VCard *task = new XMPP::JT_VCard ( m_account->client()->rootTask() ); // signal to ourselves when the vCard data arrived - TQObject::connect( task, TQT_SIGNAL ( finished () ), this, TQT_SLOT ( slotGotVCard () ) ); + TQObject::connect( task, TQ_SIGNAL ( finished () ), this, TQ_SLOT ( slotGotVCard () ) ); task->get ( m_contact->rosterItem().jid().full() ); task->go ( true ); } diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 0fc940c9..2379f261 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -51,7 +51,7 @@ JabberAddContactPage::JabberAddContactPage (Kopete::Account * owner, TQWidget * { jabData->textLabel1->setText( i18n("Loading instruction from gateway...") ); XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); - TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotPromtReceived())); + TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotPromtReceived())); gatewayTask->get ( transport->myself()->contactId() ); gatewayTask->go ( true ); } @@ -91,7 +91,7 @@ bool JabberAddContactPage::apply ( Kopete::Account *account, Kopete::MetaContact XMPP::JT_Gateway * gatewayTask = new XMPP::JT_Gateway ( jaccount->client()->rootTask () ); JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND *workaround = new JabberAddContactPage_there_is_no_possibility_to_add_assync_WORKAROUND( transport , parentContact , gatewayTask ); - TQObject::connect (gatewayTask, TQT_SIGNAL (finished ()), workaround, TQT_SLOT (slotJidReceived())); + TQObject::connect (gatewayTask, TQ_SIGNAL (finished ()), workaround, TQ_SLOT (slotJidReceived())); gatewayTask->set ( transport->myself()->contactId() , contactId ); gatewayTask->go ( true ); return true; diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 9221b2c4..47721e55 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -48,11 +48,11 @@ JabberChooseServer::JabberChooseServer ( JabberRegisterAccount *parent, const ch // retrieve server list mTransferJob = TDEIO::get ( "http://www.jabber.org/servers.xml" ); - connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( result ( TDEIO::Job* ) ), this, TQ_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); - connect ( mMainWidget->listServers, TQT_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotSetSelection ( int ) ) ); - connect ( mMainWidget->listServers, TQT_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQT_SLOT ( slotOk () ) ); + connect ( mMainWidget->listServers, TQ_SIGNAL ( pressed ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotSetSelection ( int ) ) ); + connect ( mMainWidget->listServers, TQ_SIGNAL ( doubleClicked ( int, int, int, const TQPoint & ) ), this, TQ_SLOT ( slotOk () ) ); enableButtonOK ( false ); diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index 6db53bff..e951b0ac 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -46,12 +46,12 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber m_protocol = proto; - connect (mID, TQT_SIGNAL (textChanged (const TQString &)), this, TQT_SLOT (updateServerField ())); - connect (cbCustomServer, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (updateServerField ())); + connect (mID, TQ_SIGNAL (textChanged (const TQString &)), this, TQ_SLOT (updateServerField ())); + connect (cbCustomServer, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (updateServerField ())); - connect (cbUseSSL, TQT_SIGNAL (toggled (bool)), this, TQT_SLOT (sslToggled (bool))); + connect (cbUseSSL, TQ_SIGNAL (toggled (bool)), this, TQ_SLOT (sslToggled (bool))); - connect (btnChangePassword, TQT_SIGNAL ( clicked() ), this, TQT_SLOT ( slotChangePasswordClicked () )); + connect (btnChangePassword, TQ_SIGNAL ( clicked() ), this, TQ_SLOT ( slotChangePasswordClicked () )); if (account()) { @@ -63,7 +63,7 @@ JabberEditAccountWidget::JabberEditAccountWidget (JabberProtocol * proto, Jabber { // this is a new account btnChangePassword->setEnabled ( false ); - connect (btnRegister, TQT_SIGNAL (clicked ()), this, TQT_SLOT (registerClicked ())); + connect (btnRegister, TQ_SIGNAL (clicked ()), this, TQ_SLOT (registerClicked ())); } } @@ -264,7 +264,7 @@ void JabberEditAccountWidget::slotChangePasswordClicked () DlgJabberChangePassword *passwordDlg = new DlgJabberChangePassword ( account (), this ); - connect ( passwordDlg, TQT_SIGNAL ( destroyed () ), this, TQT_SLOT ( slotChangePasswordFinished () ) ); + connect ( passwordDlg, TQ_SIGNAL ( destroyed () ), this, TQ_SLOT ( slotChangePasswordFinished () ) ); passwordDlg->show (); diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index a75e206e..ca7f0723 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -68,9 +68,9 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, // clear variables jabberClient = new JabberClient (); - connect ( jabberClient, TQT_SIGNAL ( csError ( int ) ), this, TQT_SLOT ( slotCSError ( int ) ) ); - connect ( jabberClient, TQT_SIGNAL ( tlsWarning ( int ) ), this, TQT_SLOT ( slotHandleTLSWarning ( int ) ) ); - connect ( jabberClient, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); + connect ( jabberClient, TQ_SIGNAL ( csError ( int ) ), this, TQ_SLOT ( slotCSError ( int ) ) ); + connect ( jabberClient, TQ_SIGNAL ( tlsWarning ( int ) ), this, TQ_SLOT ( slotHandleTLSWarning ( int ) ) ); + connect ( jabberClient, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); jidRegExp.setPattern ( "[\\w\\d.+_-]{1,}@[\\w\\d.-]{1,}" ); hintPixmap = TDEGlobal::iconLoader()->loadIcon ( "jabber_online", TDEIcon::Small ); @@ -86,16 +86,16 @@ JabberRegisterAccount::JabberRegisterAccount ( JabberEditAccountWidget *parent, mMainWidget->cbUseSSL->setChecked ( parent->cbUseSSL->isChecked () ); // connect buttons to slots, ok is already connected by default - connect ( this, TQT_SIGNAL ( cancelClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); - connect ( mMainWidget->btnChooseServer, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotChooseServer () ) ); - connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( slotJIDInformation () ) ); - connect ( mMainWidget->cbUseSSL, TQT_SIGNAL ( toggled ( bool ) ), this, TQT_SLOT ( slotSSLToggled () ) ); + connect ( this, TQ_SIGNAL ( cancelClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) ); + connect ( mMainWidget->btnChooseServer, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( slotChooseServer () ) ); + connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( slotJIDInformation () ) ); + connect ( mMainWidget->cbUseSSL, TQ_SIGNAL ( toggled ( bool ) ), this, TQ_SLOT ( slotSSLToggled () ) ); - connect ( mMainWidget->leServer, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->leJID, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->lePassword, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); - connect ( mMainWidget->lePasswordVerify, TQT_SIGNAL ( textChanged ( const TQString & ) ), this, TQT_SLOT ( validateData () ) ); + connect ( mMainWidget->leServer, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->leJID, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->lePassword, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); + connect ( mMainWidget->lePasswordVerify, TQ_SIGNAL ( textChanged ( const TQString & ) ), this, TQ_SLOT ( validateData () ) ); // display JID info now slotJIDInformation (); @@ -329,7 +329,7 @@ void JabberRegisterAccount::slotConnected () mMainWidget->lblStatusMessage->setText ( i18n ( "Connected successfully, registering new account..." ) ); XMPP::JT_Register * task = new XMPP::JT_Register (jabberClient->rootTask ()); - TQObject::connect (task, TQT_SIGNAL (finished ()), this, TQT_SLOT (slotRegisterUserDone ())); + TQObject::connect (task, TQ_SIGNAL (finished ()), this, TQ_SLOT (slotRegisterUserDone ())); task->reg (mMainWidget->leJID->text().section("@", 0, 0), mMainWidget->lePassword->password ()); task->go (true); @@ -371,7 +371,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // rewire buttons enableButtonOK ( false ); setButtonCancel ( KStdGuiItem::close () ); - connect ( this, TQT_SIGNAL ( closeClicked () ), this, TQT_SLOT ( slotDeleteDialog () ) ); + connect ( this, TQ_SIGNAL ( closeClicked () ), this, TQ_SLOT ( slotDeleteDialog () ) ); } else { @@ -384,7 +384,7 @@ void JabberRegisterAccount::slotRegisterUserDone () // FIXME: this is required because Iris crashes if we try // to disconnect here. Hopefully Justin can fix this. - TQTimer::singleShot(0, this, TQT_SLOT(disconnect ())); + TQTimer::singleShot(0, this, TQ_SLOT(disconnect ())); } diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index d38f0df5..5e5b7c77 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -93,11 +93,11 @@ void MeanwhileAccount::connectWithPassword(const TQString &password) } TQObject::connect(m_session, - TQT_SIGNAL(sessionStateChange(Kopete::OnlineStatus)), - this, TQT_SLOT(slotSessionStateChange(Kopete::OnlineStatus))); + TQ_SIGNAL(sessionStateChange(Kopete::OnlineStatus)), + this, TQ_SLOT(slotSessionStateChange(Kopete::OnlineStatus))); TQObject::connect(m_session, - TQT_SIGNAL(serverNotification(const TQString &)), - this, TQT_SLOT(slotServerNotification(const TQString&))); + TQ_SIGNAL(serverNotification(const TQString &)), + this, TQ_SLOT(slotServerNotification(const TQString&))); } @@ -139,7 +139,7 @@ TDEActionMenu * MeanwhileAccount::actionMenu() #if 0 menu->insert(new TDEAction(i18n("&Change Status Message"), TQString(), 0, - this, TQT_SLOT(meanwhileChangeStatus()), this, + this, TQ_SLOT(meanwhileChangeStatus()), this, "meanwhileChangeStatus")); //infoPlugin->addCustomMenus(theMenu); #endif diff --git a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp index 44b10bbc..e1b29d69 100644 --- a/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp +++ b/kopete/protocols/meanwhile/meanwhileaddcontactpage.cpp @@ -37,8 +37,8 @@ MeanwhileAddContactPage::MeanwhileAddContactPage( static_cast<MeanwhileAccount *>(_account); if (account->infoPlugin->canProvideMeanwhileId()) { - TQObject::connect(theDialog->btnFindUser, TQT_SIGNAL(clicked()), - TQT_SLOT(slotFindUser())); + TQObject::connect(theDialog->btnFindUser, TQ_SIGNAL(clicked()), + TQ_SLOT(slotFindUser())); } else theDialog->btnFindUser->setDisabled(true); diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index c6505493..de18d58b 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -76,14 +76,14 @@ Kopete::ChatSession* MeanwhileContact::manager(CanCreateFlags canCreate) create(account()->myself(), contacts, protocol()); connect(m_msgManager, - TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - this, TQT_SLOT(sendMessage(Kopete::Message&))); + TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + this, TQ_SLOT(sendMessage(Kopete::Message&))); - connect(m_msgManager, TQT_SIGNAL(myselfTyping(bool)), - this, TQT_SLOT(slotSendTyping(bool))); + connect(m_msgManager, TQ_SIGNAL(myselfTyping(bool)), + this, TQ_SLOT(slotSendTyping(bool))); - connect(m_msgManager, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 4e2c90ee..86650563 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -106,8 +106,8 @@ MeanwhileEditAccountWidget::MeanwhileEditAccountWidget( slotSetServer2Default(); } - TQObject::connect(btnServerDefaults, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSetServer2Default())); + TQObject::connect(btnServerDefaults, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSetServer2Default())); show(); } diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index bacf49c6..2003957e 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -207,10 +207,10 @@ void MeanwhileSession::connect(TQString password) socket = sock; /* we want to receive signals when there is data to read */ sock->enableRead(true); - TQObject::connect(sock, TQT_SIGNAL(readyRead()), this, - TQT_SLOT(slotSocketDataAvailable())); - TQObject::connect(sock, TQT_SIGNAL(closed(int)), this, - TQT_SLOT(slotSocketClosed(int))); + TQObject::connect(sock, TQ_SIGNAL(readyRead()), this, + TQ_SLOT(slotSocketDataAvailable())); + TQObject::connect(sock, TQ_SIGNAL(closed(int)), this, + TQ_SLOT(slotSocketClosed(int))); /* set login details */ mwSession_setProperty(session, mwSession_AUTH_USER_ID, @@ -694,8 +694,8 @@ void MeanwhileSession::handleSessionIOClose() if (socket == 0L) return; - TQObject::disconnect(socket, TQT_SIGNAL(closed(int)), - this, TQT_SLOT(slotSocketClosed(int))); + TQObject::disconnect(socket, TQ_SIGNAL(closed(int)), + this, TQ_SLOT(slotSocketClosed(int))); socket->flush(); socket->closeNow(); diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index 70d43a14..4c352de2 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -493,8 +493,8 @@ void Dispatcher::dispatch(const P2P::Message& message) transfer->m_ackSessionIdentifier = message.header.identifier; transfer->m_ackUniqueIdentifier = message.header.ackSessionIdentifier; - TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQT_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&))); - TQObject::connect(Kopete::TransferManager::transferManager(), TQT_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQT_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&))); + TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(accepted(Kopete::Transfer*, const TQString&)), transfer, TQ_SLOT(slotTransferAccepted(Kopete::Transfer*, const TQString&))); + TQObject::connect(Kopete::TransferManager::transferManager(), TQ_SIGNAL(refused(const Kopete::FileTransferInfo&)), transfer, TQ_SLOT(slotTransferRefused(const Kopete::FileTransferInfo&))); // Show the file transfer accept/decline dialog. Kopete::TransferManager::transferManager()->askIncomingTransfer(contact, fileName, fileSize, TQString(), sessionId); @@ -542,7 +542,7 @@ void Dispatcher::dispatch(const P2P::Message& message) m_sessions.insert(sessionId.toUInt(), current); // Acknowledge the session request. current->acknowledge(message); - TQTimer::singleShot(0,current, TQT_SLOT(askIncommingInvitation()) ); + TQTimer::singleShot(0,current, TQ_SLOT(askIncommingInvitation()) ); #endif } } diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index 0da4a04c..ed5377f2 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -65,7 +65,7 @@ void IncomingTransfer::slotTransferAccepted(Kopete::Transfer* transfer, const TQ if(sessionId!=m_sessionId) return; - TQObject::connect(transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); + TQObject::connect(transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort())); m_transfer = transfer; TQString content = TQString("SessionID: %1\r\n\r\n").arg(sessionId); @@ -243,8 +243,8 @@ void IncomingTransfer::processMessage(const Message& message) m_listener = new TDEServerSocket("", ""); m_listener->setResolutionEnabled(true); // Create the callback that will try to accept incoming connections. - TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), TQT_SLOT(slotAccept())); - TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int))); + TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), TQ_SLOT(slotAccept())); + TQObject::connect(m_listener, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotListenError(int))); // Listen for incoming connections. bool isListening = m_listener->listen(1); kdDebug(14140) << k_funcinfo << (isListening ? "listening" : "not listening") << endl; @@ -349,11 +349,11 @@ void IncomingTransfer::slotAccept() m_socket->enableWrite(false); // Create the callback that will try to read bytes from the accepted socket. - TQObject::connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketRead())); + TQObject::connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketRead())); // Create the callback that will try to handle the socket close event. - TQObject::connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Create the callback that will try to handle the socket error event. - TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); } void IncomingTransfer::slotSocketRead() diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 444c2710..8ff345f6 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -73,16 +73,16 @@ MSNAccount::MSNAccount( MSNProtocol *parent, const TQString& AccountID, const ch setMyself( new MSNContact( this, accountId(), Kopete::ContactList::self()->myself() ) ); //myself()->setOnlineStatus( MSNProtocol::protocol()->FLN ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), - TQT_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( groupRemoved( Kopete::Group * ) ), - TQT_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRenamed( Kopete::Group *, const TQString & ) ), + TQ_SLOT( slotKopeteGroupRenamed( Kopete::Group * ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( groupRemoved( Kopete::Group * ) ), + TQ_SLOT( slotKopeteGroupRemoved( Kopete::Group * ) ) ); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQT_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged(const TQString&, const TQVariant& ) ), TQ_SLOT( slotGlobalIdentityChanged(const TQString&, const TQVariant& ) )); - m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQT_SLOT( slotChangePublicName() ), this, "renameAction" ); - m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQT_SLOT( slotStartChat() ), this, "startChatAction" ); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQ_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_changeDNAction = new TDEAction( i18n( "&Change Display Name..." ), TQString(), 0, this, TQ_SLOT( slotChangePublicName() ), this, "renameAction" ); + m_startChatAction = new TDEAction( i18n( "&Start Chat..." ), "mail_generic", 0, this, TQ_SLOT( slotStartChat() ), this, "startChatAction" ); TDEConfigGroup *config=configGroup(); @@ -200,36 +200,36 @@ void MSNAccount::createNotificationServer( const TQString &host, uint port ) m_notifySocket = new MSNNotifySocket( this, accountId() , m_password); m_notifySocket->setUseHttpMethod( useHttpMethod() ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupAdded( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRenamed( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupListed( const TQString&, const TQString& ) ), - TQT_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( groupRemoved( const TQString& ) ), - TQT_SLOT( slotGroupRemoved( const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ), - TQT_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), - TQT_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( startChat( const TQString&, const TQString& ) ), - TQT_SLOT( slotCreateChat( const TQString&, const TQString& ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( socketClosed() ), - TQT_SLOT( slotNotifySocketClosed() ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( newContactList() ), - TQT_SLOT( slotNewContactList() ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( receivedNotificationServer(const TQString&, uint ) ), - TQT_SLOT(createNotificationServer(const TQString&, uint ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( hotmailSeted( bool ) ), - m_openInboxAction, TQT_SLOT( setEnabled( bool ) ) ); - TQObject::connect( m_notifySocket, TQT_SIGNAL( errorMessage(int, const TQString& ) ), - TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupAdded( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRenamed( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupRenamed( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupListed( const TQString&, const TQString& ) ), + TQ_SLOT( slotGroupAdded( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( groupRemoved( const TQString& ) ), + TQ_SLOT( slotGroupRemoved( const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( contactList(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ), + TQ_SLOT( slotContactListed(const TQString&, const TQString&, const TQString&, uint, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL(contactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotContactAdded(const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( contactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotContactRemoved(const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( statusChanged( const Kopete::OnlineStatus & ) ), + TQ_SLOT( slotStatusChanged( const Kopete::OnlineStatus & ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( invitedToChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotCreateChat( const TQString&, const TQString&, const TQString&, const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( startChat( const TQString&, const TQString& ) ), + TQ_SLOT( slotCreateChat( const TQString&, const TQString& ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( socketClosed() ), + TQ_SLOT( slotNotifySocketClosed() ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( newContactList() ), + TQ_SLOT( slotNewContactList() ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( receivedNotificationServer(const TQString&, uint ) ), + TQ_SLOT(createNotificationServer(const TQString&, uint ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( hotmailSeted( bool ) ), + m_openInboxAction, TQ_SLOT( setEnabled( bool ) ) ); + TQObject::connect( m_notifySocket, TQ_SIGNAL( errorMessage(int, const TQString& ) ), + TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); m_notifySocket->setStatus( m_connectstatus ); m_notifySocket->connect(host, port); @@ -269,7 +269,7 @@ TDEActionMenu * MSNAccount::actionMenu() #if !defined NDEBUG TDEActionMenu *debugMenu = new TDEActionMenu( "Debug", m_actionMenu ); debugMenu->insert( new TDEAction( i18n( "Send Raw C&ommand..." ), 0, - this, TQT_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); + this, TQ_SLOT( slotDebugRawCommand() ), debugMenu, "m_debugRawCommand" ) ); m_actionMenu->popupMenu()->insertSeparator(); m_actionMenu->insert( debugMenu ); #endif @@ -1012,8 +1012,8 @@ void MSNAccount::slotContactAdded( const TQString& handle, const TQString& list, Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( handle,nick,this, Kopete::UI::ContactAddedNotifyDialog::InfoButton ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } } diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 794c4562..2dd5c219 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -66,43 +66,43 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac setInstance(protocol->instance()); - connect( this, TQT_SIGNAL( messageSent( Kopete::Message&, + connect( this, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), - this, TQT_SLOT( slotMessageSent( Kopete::Message&, + this, TQ_SLOT( slotMessageSent( Kopete::Message&, Kopete::ChatSession* ) ) ); - connect( this, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) , - protocol, TQT_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); + connect( this, TQ_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) , + protocol, TQ_SIGNAL( invitation(MSNInvitation*& , const TQString & , long unsigned int , MSNChatSession* , MSNContact* ) ) ); m_actionInvite = new TDEActionMenu( i18n( "&Invite" ), "kontact_contacts", actionCollection(), "msnInvite" ); - connect ( m_actionInvite->popupMenu() , TQT_SIGNAL( aboutToShow() ) , this , TQT_SLOT(slotActionInviteAboutToShow() ) ) ; + connect ( m_actionInvite->popupMenu() , TQ_SIGNAL( aboutToShow() ) , this , TQ_SLOT(slotActionInviteAboutToShow() ) ) ; #if !defined NDEBUG - new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQT_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; + new TDEAction( i18n( "Send Raw C&ommand..." ), 0, this, TQ_SLOT( slotDebugRawCommand() ), actionCollection(), "msnDebugRawCommand" ) ; #endif - m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQT_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; + m_actionNudge=new TDEAction( i18n( "Send Nudge" ), "bell", 0, this, TQ_SLOT(slotSendNudge() ), actionCollection(), "msnSendNudge" ) ; #if MSN_WEBCAM // Invite to receive webcam action - m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; + m_actionWebcamReceive=new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQ_SLOT(slotWebcamReceive()), actionCollection(), "msnWebcamReceive" ) ; //Send webcam action - m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; + m_actionWebcamSend=new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQ_SLOT(slotWebcamSend()), actionCollection(), "msnWebcamSend" ) ; #endif - new TDEAction( i18n( "Send File" ),"attach", 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); + new TDEAction( i18n( "Send File" ),"attach", 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "msnSendFile" ); MSNContact *c = static_cast<MSNContact*>( others.first() ); - (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); + (new TDEAction( i18n( "Request Display Picture" ), "image", 0, this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnRequestDisplayPicture" ))->setEnabled(!c->object().isEmpty()); if ( !c->object().isEmpty() ) { - connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); + connect( c, TQ_SIGNAL( displayPictureChanged() ), this, TQ_SLOT( slotDisplayPictureChanged() ) ); m_image = new TQLabel( 0L, "kde toolbar widget" ); - new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQT_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" ); + new KWidgetAction( m_image, i18n( "MSN Display Picture" ), 0, this, TQ_SLOT( slotRequestPicture() ), actionCollection(), "msnDisplayPicture" ); if(c->hasProperty(Kopete::Global::Properties::self()->photo().key()) ) { //if the view doesn't exist yet, we will be unable to get the size of the toolbar @@ -110,7 +110,7 @@ MSNChatSession::MSNChatSession( Kopete::Protocol *protocol, const Kopete::Contac //How to know when a our view is created? We can't. // but chances are the next created view will be for this KMM // And if it is not? never mind. the icon will just be sized 22x22 - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); //it's viewActivated and not viewCreated because the view get his mainwindow only when it is shown. } } @@ -163,35 +163,35 @@ void MSNChatSession::createChat( const TQString &handle, m_chatService->setMsgHandle( handle ); m_chatService->connectToSwitchBoard( ID, address, auth ); - connect( m_chatService, TQT_SIGNAL( userJoined(const TQString&,const TQString&,bool)), - this, TQT_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) ); - connect( m_chatService, TQT_SIGNAL( userLeft(const TQString&,const TQString&)), - this, TQT_SLOT( slotUserLeft(const TQString&,const TQString&) ) ); - connect( m_chatService, TQT_SIGNAL( msgReceived( Kopete::Message & ) ), - this, TQT_SLOT( slotMessageReceived( Kopete::Message & ) ) ); - connect( m_chatService, TQT_SIGNAL( switchBoardClosed() ), - this, TQT_SLOT( slotSwitchBoardClosed() ) ); - connect( m_chatService, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), - this, TQT_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); + connect( m_chatService, TQ_SIGNAL( userJoined(const TQString&,const TQString&,bool)), + this, TQ_SLOT( slotUserJoined(const TQString&,const TQString&,bool) ) ); + connect( m_chatService, TQ_SIGNAL( userLeft(const TQString&,const TQString&)), + this, TQ_SLOT( slotUserLeft(const TQString&,const TQString&) ) ); + connect( m_chatService, TQ_SIGNAL( msgReceived( Kopete::Message & ) ), + this, TQ_SLOT( slotMessageReceived( Kopete::Message & ) ) ); + connect( m_chatService, TQ_SIGNAL( switchBoardClosed() ), + this, TQ_SLOT( slotSwitchBoardClosed() ) ); + connect( m_chatService, TQ_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), + this, TQ_SLOT( receivedTypingMsg( const TQString &, bool ) ) ); TDEConfig *config = TDEGlobal::config(); config->setGroup( "MSN" ); if(config->readBoolEntry( "SendTypingNotification" , true) ) { - connect( this, TQT_SIGNAL( myselfTyping( bool ) ), - m_chatService, TQT_SLOT( sendTypingMsg( bool ) ) ); + connect( this, TQ_SIGNAL( myselfTyping( bool ) ), + m_chatService, TQ_SLOT( sendTypingMsg( bool ) ) ); } - connect( m_chatService, TQT_SIGNAL( msgAcknowledgement(unsigned int, bool) ), - this, TQT_SLOT( slotAcknowledgement(unsigned int, bool) ) ); - connect( m_chatService, TQT_SIGNAL( invitation( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotInvitation( const TQString&, const TQString& ) ) ); - connect( m_chatService, TQT_SIGNAL( nudgeReceived(const TQString&) ), - this, TQT_SLOT( slotNudgeReceived(const TQString&) ) ); - connect( m_chatService, TQT_SIGNAL( errorMessage(int, const TQString& ) ), static_cast<MSNAccount *>(myself()->account()), TQT_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); + connect( m_chatService, TQ_SIGNAL( msgAcknowledgement(unsigned int, bool) ), + this, TQ_SLOT( slotAcknowledgement(unsigned int, bool) ) ); + connect( m_chatService, TQ_SIGNAL( invitation( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotInvitation( const TQString&, const TQString& ) ) ); + connect( m_chatService, TQ_SIGNAL( nudgeReceived(const TQString&) ), + this, TQ_SLOT( slotNudgeReceived(const TQString&) ) ); + connect( m_chatService, TQ_SIGNAL( errorMessage(int, const TQString& ) ), static_cast<MSNAccount *>(myself()->account()), TQ_SLOT( slotErrorMessageReceived(int, const TQString& ) ) ); if(!m_timeoutTimer) { m_timeoutTimer=new TQTimer(this); - connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) ); + connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) ); } m_timeoutTimer->start(20000,true); } @@ -319,12 +319,12 @@ void MSNChatSession::slotActionInviteAboutToShow() if( !members().contains( it.current() ) && it.current()->isOnline() && it.current() != myself() ) { TDEAction *a=new KopeteContactAction( it.current(), this, - TQT_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); + TQ_SLOT( slotInviteContact( Kopete::Contact * ) ), m_actionInvite ); m_actionInvite->insert( a ); m_inviteactions.append( a ) ; } } - TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQT_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); + TDEAction *b=new TDEAction( i18n ("Other..."), 0, this, TQ_SLOT( slotInviteOtherContact() ), m_actionInvite, "actionOther" ); m_actionInvite->insert( b ); m_inviteactions.append( b ) ; } @@ -443,7 +443,7 @@ void MSNChatSession::slotInvitation(const TQString &handle, const TQString &msg) if( msg.contains(MSNFileTransferSocket::applicationID()) ) { MSNFileTransferSocket *MFTS=new MSNFileTransferSocket(myself()->account()->accountId(),c,true,this); - connect(MFTS, TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); + connect(MFTS, TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) )); m_invitations.insert( cookie , MFTS); MFTS->parseInvitation(msg); setCanBeDeleted(false); @@ -499,7 +499,7 @@ void MSNChatSession::sendFile(const TQString &fileLocation, const TQString &/*fi void MSNChatSession::initInvitation(MSNInvitation* invitation) { - connect(invitation->object(), TQT_SIGNAL( done(MSNInvitation*) ) , this , TQT_SLOT( invitationDone(MSNInvitation*) )); + connect(invitation->object(), TQ_SIGNAL( done(MSNInvitation*) ) , this , TQ_SLOT( invitationDone(MSNInvitation*) )); m_invitations.insert( invitation->cookie() , invitation); if(m_chatService) @@ -552,7 +552,7 @@ void MSNChatSession::slotDisplayPictureChanged() if(w) { //We connected that in the constructor. we don't need to keep this slot active. - disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + disconnect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ; TDEAction *imgAction=actionCollection()->action("msnDisplayPicture"); @@ -563,8 +563,8 @@ void MSNChatSession::slotDisplayPictureChanged() { sz=tb->iconSize(); //ipdate if the size of the toolbar change. - disconnect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); - connect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); + disconnect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); + connect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); break; } ++it; @@ -693,7 +693,7 @@ void MSNChatSession::startChatSession() if(!m_timeoutTimer) { m_timeoutTimer=new TQTimer(this); - connect( m_timeoutTimer , TQT_SIGNAL(timeout()), this , TQT_SLOT(slotConnectionTimeout() ) ); + connect( m_timeoutTimer , TQ_SIGNAL(timeout()), this , TQ_SLOT(slotConnectionTimeout() ) ); } m_timeoutTimer->start(20000, true); } diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 6867cf6c..54230558 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -133,22 +133,22 @@ TQPtrList<TDEAction> *MSNContact::customContextMenuActions() TQString label = isBlocked() ? i18n( "Unblock User" ) : i18n( "Block User" ); if( !actionBlock ) { - actionBlock = new TDEAction( label, "msn_blocked",0, this, TQT_SLOT( slotBlockUser() ), + actionBlock = new TDEAction( label, "msn_blocked",0, this, TQ_SLOT( slotBlockUser() ), this, "actionBlock" ); //show profile - actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQT_SLOT( slotShowProfile() ), + actionShowProfile = new TDEAction( i18n("Show Profile") , 0, this, TQ_SLOT( slotShowProfile() ), this, "actionShowProfile" ); // Send mail (only available if it is an hotmail account) - actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQT_SLOT( slotSendMail() ), + actionSendMail = new TDEAction( i18n("Send Email...") , "mail_generic",0, this, TQ_SLOT( slotSendMail() ), this, "actionSendMail" ); // Invite to receive webcam - actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQT_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; + actionWebcamReceive = new TDEAction( i18n( "View Contact's Webcam" ), "webcamreceive", 0, this, TQ_SLOT(slotWebcamReceive() ), this, "msnWebcamReceive" ) ; //Send webcam action - actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQT_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; + actionWebcamSend = new TDEAction( i18n( "Send Webcam" ), "webcamsend", 0, this, TQ_SLOT(slotWebcamSend() ), this, "msnWebcamSend" ) ; } else actionBlock->setText( label ); @@ -203,7 +203,7 @@ void MSNContact::slotUserInfo() info->m_phm->setText(m_phoneMobile); info->m_reversed->setChecked(m_reversed); - connect( info->m_reversed, TQT_SIGNAL(toggled(bool)) , this, TQT_SLOT(slotUserInfoDialogReversedToggled())); + connect( info->m_reversed, TQ_SIGNAL(toggled(bool)) , this, TQ_SLOT(slotUserInfoDialogReversedToggled())); infoDialog->setMainWidget(info); infoDialog->setCaption(nick); @@ -680,7 +680,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) delete f; //let the time to TDEIO to copy the file - connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() )); + connect(j, TQ_SIGNAL(result(TDEIO::Job *)) , this, TQ_SLOT(slotEmitDisplayPictureChanged() )); } void MSNContact::slotEmitDisplayPictureChanged() diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index b7121c30..d010b723 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -50,8 +50,8 @@ MSNFileTransferSocket::MSNFileTransferSocket(const TQString &handle, Kopete::Con m_contact=c; ready=true; - TQObject::connect( this, TQT_SIGNAL( socketClosed() ), this, TQT_SLOT( slotSocketClosed() ) ); - TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), this, TQT_SLOT(slotReadBlock( const TQByteArray & ) ) ); + TQObject::connect( this, TQ_SIGNAL( socketClosed() ), this, TQ_SLOT( slotSocketClosed() ) ); + TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), this, TQ_SLOT(slotReadBlock( const TQByteArray & ) ) ); } MSNFileTransferSocket::~MSNFileTransferSocket() @@ -112,7 +112,7 @@ void MSNFileTransferSocket::parseCommand(const TQString & cmd, uint id, const TQ { m_downsize=0; ready=true; - TQTimer::singleShot( 0, this, TQT_SLOT(slotSendFile()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(slotSendFile()) ); } else if( cmd == "CCL" ) { @@ -136,7 +136,7 @@ void MSNFileTransferSocket::bytesReceived(const TQByteArray & head) if(head[0]!='\0') { kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: transfer aborted" <<endl; - TQTimer::singleShot(0,this,TQT_SLOT(disconnect())); + TQTimer::singleShot(0,this,TQ_SLOT(disconnect())); } unsigned int sz=(int)((unsigned char)head.data()[2])*256+(int)((unsigned char)head.data()[1]); // kdDebug(14140) << "MSNFileTransferSocket::bytesReceived: " << sz <<endl; @@ -175,7 +175,7 @@ void MSNFileTransferSocket::slotReadBlock(const TQByteArray &block) //the transfer seems to be finished. sendCommand( "BYE" ,"16777989",false); // if we are not already disconected in 30 seconds, do it. - TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) ); + TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) ); } } @@ -185,8 +185,8 @@ void MSNFileTransferSocket::setKopeteTransfer(Kopete::Transfer *kt) m_kopeteTransfer=kt; if(kt) { - TQObject::connect(kt , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); - TQObject::connect(kt, TQT_SIGNAL(destroyed()) , this , TQT_SLOT(slotKopeteTransferDestroyed())); + TQObject::connect(kt , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort())); + TQObject::connect(kt, TQ_SIGNAL(destroyed()) , this , TQ_SLOT(slotKopeteTransferDestroyed())); } } @@ -194,13 +194,13 @@ void MSNFileTransferSocket::listen(int port) { m_server = new TDEServerSocket(); - TQObject::connect( m_server, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAcceptConnection())); + TQObject::connect( m_server, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotAcceptConnection())); m_server->setAddress(TQString::number(port)); kdDebug(14140) << "MSNFileTransferSocket::listen: about to listen"<<endl; bool listenResult = m_server->listen(1); kdDebug(14140) << "MSNFileTransferSocket::listen: result: "<< listenResult <<endl; - TQTimer::singleShot( 60000, this, TQT_SLOT(slotTimer()) ); + TQTimer::singleShot( 60000, this, TQ_SLOT(slotTimer()) ); kdDebug(14140) << "MSNFileTransferSocket::listen done" <<endl; } @@ -249,7 +249,7 @@ void MSNFileTransferSocket::abort() } //the timer wait one second, the time to send the CCL or the binary header //retarding the disconnection keep away from a crash. (in TDEIO::Job::emitResult when `delete this`) - TQTimer::singleShot( 1000, this, TQT_SLOT(disconnect()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(disconnect()) ); ready=false; } @@ -286,7 +286,7 @@ void MSNFileTransferSocket::slotSendFile() { //the transfer seems to be finished. // if we are not already disconected in 30 seconds, do it. - TQTimer::singleShot( 30000 , this, TQT_SLOT(disconnect() ) ); + TQTimer::singleShot( 30000 , this, TQ_SLOT(disconnect() ) ); return; } @@ -317,7 +317,7 @@ void MSNFileTransferSocket::slotSendFile() } ready=false; - TQTimer::singleShot( 10, this, TQT_SLOT(slotSendFile()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotSendFile()) ); } void MSNFileTransferSocket::slotReadyWrite() @@ -328,7 +328,7 @@ void MSNFileTransferSocket::slotReadyWrite() TQString MSNFileTransferSocket::invitationHead() { - TQTimer::singleShot( 10 * 60000, this, TQT_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer + TQTimer::singleShot( 10 * 60000, this, TQ_SLOT(slotTimer()) ); //the user has 10 mins to accept or refuse or initiate the transfer return TQString( MSNInvitation::invitationHead()+ "Application-File: "+ m_fileName.right( m_fileName.length() - m_fileName.findRev( '/' ) - 1 ) +"\r\n" @@ -353,8 +353,8 @@ void MSNFileTransferSocket::parseInvitation(const TQString& msg) Kopete::TransferManager::transferManager()->askIncomingTransfer( m_contact , filename, filesize, TQString(), TQString::number( cookie() ) ); - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQT_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQT_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ),this, TQ_SLOT( slotFileTransferAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused( const Kopete::FileTransferInfo & ) ), this, TQ_SLOT( slotFileTransferRefused( const Kopete::FileTransferInfo & ) ) ); } else if( msg.contains("Invitation-Command: ACCEPT") ) @@ -442,7 +442,7 @@ void MSNFileTransferSocket::slotFileTransferAccepted(Kopete::Transfer *trans, co "Request-Data: IP-Address:\r\n" ).utf8(); manager->service()->sendCommand( "MSG" , "N", true, message ); - TQTimer::singleShot( 3 * 60000, this, TQT_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this + TQTimer::singleShot( 3 * 60000, this, TQ_SLOT(slotTimer()) ); //if after 3 minutes the transfer has not begin, delete this } else { diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index ad4e2b6d..c29e6d8c 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -64,8 +64,8 @@ MSNNotifySocket::MSNNotifySocket( MSNAccount *account, const TQString& /*msnId*/ m_account = account; m_password=password; - TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), - this, TQT_SLOT( slotReadMessage( const TQByteArray & ) ) ); + TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), + this, TQ_SLOT( slotReadMessage( const TQByteArray & ) ) ); m_keepaliveTimer = 0L; m_isLogged = false; } @@ -288,9 +288,9 @@ void MSNNotifySocket::parseCommand( const TQString &cmd, uint id, const TQString { m_secureLoginHandler = new MSNSecureLoginHandler(m_account->accountId(), m_password, data.section( ' ' , 2 , 2 )); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginFailed()), this, TQT_SLOT(sslLoginFailed())); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginBadPassword()), this, TQT_SLOT(sslLoginIncorrect())); - TQObject::connect(m_secureLoginHandler, TQT_SIGNAL(loginSuccesful(TQString )), this, TQT_SLOT(sslLoginSucceeded(TQString ))); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginFailed()), this, TQ_SLOT(sslLoginFailed())); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginBadPassword()), this, TQ_SLOT(sslLoginIncorrect())); + TQObject::connect(m_secureLoginHandler, TQ_SIGNAL(loginSuccesful(TQString )), this, TQ_SLOT(sslLoginSucceeded(TQString ))); m_secureLoginHandler->login(); } @@ -724,7 +724,7 @@ bool MSNNotifySocket::setUseHttpMethod(bool useHttp) else { if( !m_keepaliveTimer ) { m_keepaliveTimer = new TQTimer( this, "m_keepaliveTimer" ); - TQObject::connect( m_keepaliveTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSendKeepAlive() ) ); + TQObject::connect( m_keepaliveTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSendKeepAlive() ) ); } } @@ -755,7 +755,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) // If there are new email message available, raise the unread email event. TQObject::connect(KNotification::event( "msn_mail", i18n( "You have one unread message in your MSN inbox.", "You have %n unread messages in your MSN inbox.", mailCount ), 0 , 0 , i18n( "Open Inbox..." ) ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); } } else if(msg.contains("text/x-msmsgsactivemailnotification")) @@ -777,7 +777,7 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) //TODO: it is also possible to get the subject (but warning about the encoding) TQObject::connect(KNotification::event( "msn_mail",i18n( "You have one new email from %1 in your MSN inbox." ).arg(m), 0 , 0 , i18n( "Open Inbox..." ) ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); } else if(msg.contains("text/x-msmsgsprofile")) { @@ -912,8 +912,8 @@ void MSNNotifySocket::slotReadMessage( const TQByteArray &bytes ) if( subscString != TQString::fromLatin1("s.htm") && actionString != TQString::fromLatin1("a.htm") ) { KNotification* notification = KNotification::event("msn_alert", textString, 0L, 0L, actions); - TQObject::connect(notification, TQT_SIGNAL(activated(unsigned int)), this, TQT_SLOT(slotMSNAlertLink(unsigned int))); - TQObject::connect(notification, TQT_SIGNAL(closed()), this, TQT_SLOT(slotMSNAlertUnwanted())); + TQObject::connect(notification, TQ_SIGNAL(activated(unsigned int)), this, TQ_SLOT(slotMSNAlertLink(unsigned int))); + TQObject::connect(notification, TQ_SIGNAL(closed()), this, TQ_SLOT(slotMSNAlertUnwanted())); } } // end for each MSG tag } diff --git a/kopete/protocols/msn/msnsecureloginhandler.cpp b/kopete/protocols/msn/msnsecureloginhandler.cpp index 936b88fc..4bc58277 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.cpp +++ b/kopete/protocols/msn/msnsecureloginhandler.cpp @@ -45,7 +45,7 @@ void MSNSecureLoginHandler::login() getLoginServer->addMetaData("cache", "reload"); getLoginServer->addMetaData("PropagateHttpHeader", "true"); - connect(getLoginServer, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotLoginServerReceived(TDEIO::Job* ))); + connect(getLoginServer, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotLoginServerReceived(TDEIO::Job* ))); } void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob) @@ -86,7 +86,7 @@ void MSNSecureLoginHandler::slotLoginServerReceived(TDEIO::Job *loginJob) authJob->addMetaData("cookies", "manual"); authJob->addMetaData("cache", "reload"); - connect(authJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotTweenerReceived(TDEIO::Job* ))); + connect(authJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotTweenerReceived(TDEIO::Job* ))); } else { diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 167c9974..e090bdaf 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -112,12 +112,12 @@ void MSNSocket::connect( const TQString &server, uint port ) // non-empty, so disable it until we have actual data in the queue m_socket->enableWrite( false ); - TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotDataReceived() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( slotReadyWrite() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( hostFound() ), this, TQT_SLOT( slotHostFound() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotConnectionSuccess() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotSocketError( int ) ) ); - TQObject::connect( m_socket, TQT_SIGNAL( closed( ) ), this, TQT_SLOT( slotSocketClosed( ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotDataReceived() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( slotReadyWrite() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( hostFound() ), this, TQ_SLOT( slotHostFound() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotConnectionSuccess() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotSocketError( int ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( closed( ) ), this, TQ_SLOT( slotSocketClosed( ) ) ); if(m_useHttp) { @@ -125,7 +125,7 @@ void MSNSocket::connect( const TQString &server, uint port ) { m_timer = new TQTimer(this, "Http poll timer"); // Connect the slot HttpPoll with the timer timeout signal. - TQObject::connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotHttpPoll())); + TQObject::connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotHttpPoll())); } } @@ -429,7 +429,7 @@ void MSNSocket::slotReadLine() if ( m_buffer.size() >= 3 && ( m_buffer.data()[ 0 ] == '\0' || m_buffer.data()[ 0 ]== '\1' ) ) { bytesReceived( m_buffer.take( 3 ) ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) ); return; } @@ -451,7 +451,7 @@ void MSNSocket::slotReadLine() // Don't block the GUI while parsing data, only do a single line! // (Done before parseLine() to prevent a potential crash) - TQTimer::singleShot( 0, this, TQT_SLOT( slotReadLine() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotReadLine() ) ); parseLine( command ); // WARNING: At this point 'this' can be deleted (when disconnecting) @@ -938,10 +938,10 @@ bool MSNSocket::accept( TDEServerSocket *server ) m_socket->enableRead( true ); m_socket->enableWrite( true ); - TQObject::connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotDataReceived() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( slotReadyWrite() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( closed() ), this, TQT_SLOT( slotSocketClosed() ) ); - TQObject::connect( m_socket, TQT_SIGNAL( gotError( int ) ), this, TQT_SLOT( slotSocketError( int ) ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotDataReceived() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( slotReadyWrite() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( closed() ), this, TQ_SLOT( slotSocketClosed() ) ); + TQObject::connect( m_socket, TQ_SIGNAL( gotError( int ) ), this, TQ_SLOT( slotSocketError( int ) ) ); doneConnect(); return true; diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index e74e728f..e60c01aa 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -96,14 +96,14 @@ void MSNSwitchBoardSocket::connectToSwitchBoard(TQString ID, TQString address, T TQString server = address.left( address.find( ":" ) ); uint port = address.right( address.length() - address.findRev( ":" ) - 1 ).toUInt(); - TQObject::connect( this, TQT_SIGNAL( blockRead( const TQByteArray & ) ), - this, TQT_SLOT(slotReadMessage( const TQByteArray & ) ) ); + TQObject::connect( this, TQ_SIGNAL( blockRead( const TQByteArray & ) ), + this, TQ_SLOT(slotReadMessage( const TQByteArray & ) ) ); - TQObject::connect( this, TQT_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ), - this, TQT_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) ); + TQObject::connect( this, TQ_SIGNAL( onlineStatusChanged( MSNSocket::OnlineStatus ) ), + this, TQ_SLOT( slotOnlineStatusChanged( MSNSocket::OnlineStatus ) ) ); - TQObject::connect( this, TQT_SIGNAL( socketClosed( ) ), - this, TQT_SLOT( slotSocketClosed( ) ) ); + TQObject::connect( this, TQ_SIGNAL( socketClosed( ) ), + this, TQ_SLOT( slotSocketClosed( ) ) ); connect( server, port ); } @@ -408,7 +408,7 @@ void MSNSwitchBoardSocket::slotReadMessage( const TQByteArray &bytes ) if(!m_emoticonTimer) //to be sure no message will be lost, we will appends message to { // the queue in 15 secondes even if we have not received emoticons m_emoticonTimer=new TQTimer(this); - TQObject::connect(m_emoticonTimer , TQT_SIGNAL(timeout()) , this, TQT_SLOT(cleanQueue())); + TQObject::connect(m_emoticonTimer , TQ_SIGNAL(timeout()) , this, TQ_SLOT(cleanQueue())); m_emoticonTimer->start( 15000 , true ); } } @@ -828,7 +828,7 @@ int MSNSwitchBoardSocket::sendMsg( const Kopete::Message &msg ) { m_keepAliveNb=20; m_keepAlive=new TQTimer(this); - TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer())); + TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer())); m_keepAlive->start(50*1000); } @@ -878,7 +878,7 @@ void MSNSwitchBoardSocket::slotOnlineStatusChanged( MSNSocket::OnlineStatus stat { m_keepAliveNb=20; m_keepAlive=new TQTimer(this); - TQObject::connect(m_keepAlive, TQT_SIGNAL(timeout()) , this , TQT_SLOT(slotKeepAliveTimer())); + TQObject::connect(m_keepAlive, TQ_SIGNAL(timeout()) , this , TQ_SLOT(slotKeepAliveTimer())); m_keepAlive->start(50*1000); } } @@ -1090,11 +1090,11 @@ Dispatcher* MSNSwitchBoardSocket::PeerDispatcher() } m_dispatcher = new Dispatcher(this, m_account->accountId(),ip ); -// TQObject::connect(this, TQT_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQT_SLOT(slotReadMessage(const TQByteArray&))); -// TQObject::connect(m_dispatcher, TQT_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQT_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool))); - TQObject::connect(m_dispatcher, TQT_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQT_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64))); - TQObject::connect(m_dispatcher, TQT_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQT_SLOT(slotEmoticonReceived( KTempFile *, const TQString&))); - TQObject::connect(this, TQT_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQT_SLOT(messageAcknowledged(unsigned int, bool))); +// TQObject::connect(this, TQ_SIGNAL(blockRead(const TQByteArray&)), m_dispatcher, TQ_SLOT(slotReadMessage(const TQByteArray&))); +// TQObject::connect(m_dispatcher, TQ_SIGNAL(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool)), this, TQ_SLOT(sendCommand(const TQString&, const TQString&, bool, const TQByteArray&, bool))); + TQObject::connect(m_dispatcher, TQ_SIGNAL(incomingTransfer(const TQString&, const TQString&, TQ_INT64)), this, TQ_SLOT(slotIncomingFileTransfer(const TQString&, const TQString&, TQ_INT64))); + TQObject::connect(m_dispatcher, TQ_SIGNAL(displayIconReceived(KTempFile *, const TQString&)), this, TQ_SLOT(slotEmoticonReceived( KTempFile *, const TQString&))); + TQObject::connect(this, TQ_SIGNAL(msgAcknowledgement(unsigned int, bool)), m_dispatcher, TQ_SLOT(messageAcknowledged(unsigned int, bool))); m_dispatcher->m_pictureUrl = m_account->pictureUrl(); } return m_dispatcher; diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index 5d66c495..037cd093 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -246,7 +246,7 @@ void OutgoingTransfer::processMessage(const Message& message) m_transfer = Kopete::TransferManager::transferManager()->addTransfer(contact, m_file->name(), m_file->size(), m_recipient, Kopete::FileTransferInfo::Outgoing); - TQObject::connect(m_transfer , TQT_SIGNAL(transferCanceled()), this, TQT_SLOT(abort())); + TQObject::connect(m_transfer , TQ_SIGNAL(transferCanceled()), this, TQ_SLOT(abort())); m_state = Negotiation; @@ -345,10 +345,10 @@ void OutgoingTransfer::connectToEndpoint(const TQString& hostName) // when we are ready to sent data. // NOTE readyWrite consumes too much cpu usage. m_socket->enableWrite(false); - TQObject::connect(m_socket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotRead())); - TQObject::connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), this, TQT_SLOT(slotConnected())); - TQObject::connect(m_socket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); - TQObject::connect(m_socket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_socket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotRead())); + TQObject::connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry&)), this, TQ_SLOT(slotConnected())); + TQObject::connect(m_socket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); + TQObject::connect(m_socket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Try to connect to the endpoint. m_socket->connect(); } @@ -363,7 +363,7 @@ void OutgoingTransfer::slotConnected() // Not all data was written, close the socket. m_socket->closeNow(); // Schedule the data to be sent through the existing session. - TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData())); return; } @@ -418,7 +418,7 @@ void OutgoingTransfer::slotSocketError(int) { // Otherwise, send the data through the session. m_identifier -= 1; - TQTimer::singleShot(2000, this, TQT_SLOT(slotSendData())); + TQTimer::singleShot(2000, this, TQ_SLOT(slotSendData())); } } diff --git a/kopete/protocols/msn/transport.cpp b/kopete/protocols/msn/transport.cpp index 57b1f356..4f22ea8a 100644 --- a/kopete/protocols/msn/transport.cpp +++ b/kopete/protocols/msn/transport.cpp @@ -72,7 +72,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans if (bridge != 0l) { - TQObject::connect(bridge, TQT_SIGNAL(readyRead(const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQByteArray&))); + TQObject::connect(bridge, TQ_SIGNAL(readyRead(const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQByteArray&))); } return 0l; @@ -81,7 +81,7 @@ TransportBridge* Transport::getBridge (const TQString& to, TQ_UINT16 port, Trans void Transport::setDefaultBridge(MSNSwitchBoardSocket* mss) { mDefaultBridge = mss; - TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQT_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQT_SLOT(slotOnReceive(const TQString&, const TQByteArray&))); + TQObject::connect((MSNSwitchBoardSocket*)mDefaultBridge, TQ_SIGNAL(messageReceived(const TQString&, const TQByteArray&)), TQ_SLOT(slotOnReceive(const TQString&, const TQByteArray&))); } //END @@ -171,8 +171,8 @@ TcpTransportBridge::TcpTransportBridge(const KNetwork::KInetSocketAddress& to, M { mSocket = new KStreamSocket(mAddress.ipAddress().toString(), TQString::number(mAddress.port()), this); mSocket->setBlocking(false); - TQObject::connect(mSocket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT(slotOnSocketConnect())); - TQObject::connect(mSocket, TQT_SIGNAL(gotError(int)), TQT_SLOT(slotOnError(int))); + TQObject::connect(mSocket, TQ_SIGNAL(connected(const KResolverEntry&)), TQ_SLOT(slotOnSocketConnect())); + TQObject::connect(mSocket, TQ_SIGNAL(gotError(int)), TQ_SLOT(slotOnError(int))); mConnected = false; } @@ -199,7 +199,7 @@ void TcpTransportBridge::slotOnConnect() KStreamSocket *socket = static_cast<KStreamSocket*>(mSocket); socket->setTimeout(5000); - TQObject::connect(socket, TQT_SIGNAL(timeOut()), TQT_SLOT(slotOnSocketConnectTimeout())); + TQObject::connect(socket, TQ_SIGNAL(timeOut()), TQ_SLOT(slotOnSocketConnectTimeout())); mSocket->connect(); } @@ -239,8 +239,8 @@ void TcpTransportBridge::slotOnSocketConnect() << mSocket->localAddress().toString() << endl; mConnected = true; - TQObject::connect(mSocket, TQT_SIGNAL(readyRead()), TQT_SLOT(slotOnSocketReceive())); - TQObject::connect(mSocket, TQT_SIGNAL(closed()), TQT_SLOT(slotOnSocketClose())); + TQObject::connect(mSocket, TQ_SIGNAL(readyRead()), TQ_SLOT(slotOnSocketReceive())); + TQObject::connect(mSocket, TQ_SIGNAL(closed()), TQ_SLOT(slotOnSocketClose())); mVerified = true; TQString foo = "foo\0"; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 37cc1dd8..600f0f15 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -174,11 +174,11 @@ MSNEditAccountWidget::MSNEditAccountWidget( MSNProtocol *proto, Kopete::Account d->ui->m_phones->setDisabled( true ); } - connect( d->ui->m_allowButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAllow() ) ); - connect( d->ui->m_blockButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBlock() ) ); - connect( d->ui->m_selectImage, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSelectImage() ) ); - connect( d->ui->m_RLButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowReverseList() ) ); - connect( d->ui->buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); + connect( d->ui->m_allowButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAllow() ) ); + connect( d->ui->m_blockButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBlock() ) ); + connect( d->ui->m_selectImage, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSelectImage() ) ); + connect( d->ui->m_RLButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowReverseList() ) ); + connect( d->ui->buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); TQWidget::setTabOrder( d->ui->m_login, d->ui->m_password->mRemembered ); TQWidget::setTabOrder( d->ui->m_password->mRemembered, d->ui->m_password->mPassword ); TQWidget::setTabOrder( d->ui->m_password->mPassword, d->ui->m_autologin ); diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index 60046d17..44d3ffd4 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -131,7 +131,7 @@ void Webcam::sendBYEMessage() sendMessage(BYE,content); //If ever the opposite client was dead or something, we'll ack anyway, so everything get cleaned - TQTimer::singleShot(60*1000 , this, TQT_SLOT(acknowledged())); + TQTimer::singleShot(60*1000 , this, TQ_SLOT(acknowledged())); } @@ -342,8 +342,8 @@ void Webcam::processMessage(const Message& message) } //m_listener->setResolutionEnabled(true); // Create the callback that will try to accept incoming connections. - TQObject::connect(m_listener, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotAccept())); - TQObject::connect(m_listener, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotListenError(int))); + TQObject::connect(m_listener, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotAccept())); + TQObject::connect(m_listener, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotListenError(int))); // Listen for incoming connections. bool isListening = m_listener->listen(); kdDebug(14140) << k_funcinfo << (isListening ? TQString("listening %1").arg(m_listener->localAddress().toString()) : TQString("not listening")) << endl; @@ -383,8 +383,8 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port1 << endl; TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port1, this ); m_allSockets.append(sock); - TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); - TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) ); + TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int))); sock->connect(ip, port1); kdDebug(14140) << k_funcinfo << "okok " << sock << " - " << sock->peerAddress().toString() << " ; " << sock->localAddress().toString() << endl; } @@ -393,8 +393,8 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port2 << endl; TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port2, this ); m_allSockets.append(sock); - TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); - TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) ); + TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int))); sock->connect(ip, port2); } if(!port3.isNull()) @@ -402,8 +402,8 @@ void Webcam::processMessage(const Message& message) kdDebug(14140) << k_funcinfo << "trying to connect on " << ip <<":" << port3 << endl; TDEBufferedSocket *sock=new TDEBufferedSocket( ip, port3, this ); m_allSockets.append(sock); - TQObject::connect( sock, TQT_SIGNAL( connected( const KResolverEntry&) ), this, TQT_SLOT( slotSocketConnected() ) ); - TQObject::connect( sock, TQT_SIGNAL( gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect( sock, TQ_SIGNAL( connected( const KResolverEntry&) ), this, TQ_SLOT( slotSocketConnected() ) ); + TQObject::connect( sock, TQ_SIGNAL( gotError(int)), this, TQ_SLOT(slotSocketError(int))); sock->connect(ip, port3); } } @@ -568,11 +568,11 @@ void Webcam::slotSocketConnected() m_webcamSocket->enableWrite(false); // Create the callback that will try to read bytes from the accepted socket. - TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketRead())); + TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketRead())); // Create the callback that will try to handle the socket close event. - TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Create the callback that will try to handle the socket error event. -// TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); +// TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); m_webcamStates[m_webcamSocket]=wsConnected; TQCString to_send=m_peerAuth.utf8(); @@ -608,11 +608,11 @@ void Webcam::slotAccept() m_webcamSocket->enableWrite(false); // Create the callback that will try to read bytes from the accepted socket. - TQObject::connect(m_webcamSocket, TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotSocketRead())); + TQObject::connect(m_webcamSocket, TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotSocketRead())); // Create the callback that will try to handle the socket close event. - TQObject::connect(m_webcamSocket, TQT_SIGNAL(closed()), this, TQT_SLOT(slotSocketClosed())); + TQObject::connect(m_webcamSocket, TQ_SIGNAL(closed()), this, TQ_SLOT(slotSocketClosed())); // Create the callback that will try to handle the socket error event. - TQObject::connect(m_webcamSocket, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + TQObject::connect(m_webcamSocket, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); m_allSockets.append(m_webcamSocket); m_webcamStates[m_webcamSocket]=wsNegotiating; @@ -668,7 +668,7 @@ void Webcam::slotSocketRead() kdDebug(14140) << k_funcinfo << "new timer" << m_timerId << endl; } m_widget=new MSNWebcamDialog(m_recipient); - connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage())); + connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage())); } else @@ -718,7 +718,7 @@ void Webcam::slotSocketRead() kdDebug(14140) << k_funcinfo << "new timer" << m_timerId << endl; } m_widget=new MSNWebcamDialog(m_recipient); - connect(m_widget, TQT_SIGNAL( closingWebcamDialog() ) , this , TQT_SLOT(sendBYEMessage())); + connect(m_widget, TQ_SIGNAL( closingWebcamDialog() ) , this , TQ_SLOT(sendBYEMessage())); } m_webcamStates[m_webcamSocket]=wsTransfer; diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index d7a49e09..311f12a3 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -36,12 +36,12 @@ MSNWebcamDialog::MSNWebcamDialog( const TQString& contact, TQWidget * parent, co setEscapeButton( KDialogBase::Close ); /* - TQObject::connect( contact, TQT_SIGNAL( signalReceivedWebcamImage( const TQPixmap& ) ), - this, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( signalReceivedWebcamImage( const TQPixmap& ) ), + this, TQ_SLOT( newImage( const TQPixmap& ) ) ); */ - TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); + TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); /* - TQObject::connect( contact, TQT_SIGNAL( webcamClosed( int ) ), this, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::connect( contact, TQ_SIGNAL( webcamClosed( int ) ), this, TQ_SLOT( webcamClosed( int ) ) ); */ TQFrame* page = plainPage(); if ( page ) diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 82b9a29c..4a34b369 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -95,8 +95,8 @@ Kopete::ChatSession* AIMMyselfContact::manager( Kopete::Contact::CanCreateFlags session = new AIMChatSession( this, chatMembers, account()->protocol(), exchange, room ); session->setEngine( m_acct->engine() ); - connect( session, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), - this, TQT_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) ); + connect( session, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession* ) ), + this, TQ_SLOT( sendMessage( Kopete::Message&, Kopete::ChatSession* ) ) ); m_chatRoomSessions.append( session ); } return session; @@ -214,20 +214,20 @@ AIMAccount::AIMAccount(Kopete::Protocol *parent, TQString accountID, const char m_joinChatDialog = 0; m_visibilityDialog = 0; TQObject::connect( Kopete::ContactList::self(), - TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), + TQ_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), this, - TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); + TQ_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( chatRoomConnected( WORD, const TQString& ) ), - this, TQT_SLOT( connectedToChatRoom( WORD, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( chatRoomConnected( WORD, const TQString& ) ), + this, TQ_SLOT( connectedToChatRoom( WORD, const TQString& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SLOT( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - TQObject::connect( engine(), TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + TQObject::connect( engine(), TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SLOT( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - TQObject::connect( this, TQT_SIGNAL( buddyIconChanged() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( this, TQ_SIGNAL( buddyIconChanged() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); } @@ -309,30 +309,30 @@ TDEActionMenu* AIMAccount::actionMenu() i18n( "%2 <%1>" ).arg( accountId(), accountNick )); mActionMenu->insert( new TDEAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, - TQT_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); + TQ_SLOT( slotGoOnline() ), mActionMenu, "AIMAccount::mActionOnline") ); TDEAction* mActionAway = new Kopete::AwayAction(i18n("Away"), p->statusAway.iconFor( this ), 0, this, - TQT_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); + TQ_SLOT(slotGoAway( const TQString & )), this, "AIMAccount::mActionNA" ); mActionAway->setEnabled( isConnected() ); mActionMenu->insert( mActionAway ); TDEAction* mActionOffline = new TDEAction( i18n("Offline"), p->statusOffline.iconFor(this), 0, this, - TQT_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); + TQ_SLOT( slotGoOffline() ), mActionMenu, "AIMAccount::mActionOffline"); mActionMenu->insert( mActionOffline ); mActionMenu->popupMenu()->insertSeparator(); TDEAction* m_joinChatAction = new TDEAction( i18n( "Join Chat..." ), TQString(), 0, this, - TQT_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); + TQ_SLOT( slotJoinChat() ), mActionMenu, "join_a_chat" ); mActionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, - this, TQT_SLOT( slotSetVisiblility() ), this, + this, TQ_SLOT( slotSetVisiblility() ), this, "AIMAccount::mActionSetVisibility") ); mActionMenu->insert( m_joinChatAction ); TDEAction* m_editInfoAction = new TDEAction( i18n( "Edit User Info..." ), "identity", 0, - this, TQT_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); + this, TQ_SLOT( slotEditInfo() ), mActionMenu, "actionEditInfo"); mActionMenu->insert( m_editInfoAction ); @@ -415,10 +415,10 @@ void AIMAccount::slotGlobalIdentityChanged( const TQString& key, const TQVariant void AIMAccount::slotBuddyIconChanged() { // need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); if ( !engine()->isActive() ) { - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); return; } @@ -520,8 +520,8 @@ void AIMAccount::slotJoinChat() if ( !m_joinChatDialog ) { m_joinChatDialog = new AIMJoinChatUI( this, false, Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_joinChatDialog, TQT_SIGNAL( closing( int ) ), - this, TQT_SLOT( joinChatDialogClosed( int ) ) ); + TQObject::connect( m_joinChatDialog, TQ_SIGNAL( closing( int ) ), + this, TQ_SLOT( joinChatDialogClosed( int ) ) ); TQValueList<int> list = engine()->chatExchangeList(); m_joinChatDialog->setExchangeList( list ); m_joinChatDialog->show(); @@ -794,8 +794,8 @@ void AIMAccount::slotSetVisiblility() if ( !m_visibilityDialog ) { m_visibilityDialog = new OscarVisibilityDialog( engine(), Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_visibilityDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( slotVisibilityDialogClosed() ) ); + TQObject::connect( m_visibilityDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( slotVisibilityDialogClosed() ) ); //add all contacts; OscarVisibilityDialog::ContactMap contactMap; diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index 12eb4bd2..0d42c8ce 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -58,21 +58,21 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: // Set the last autoresponse time to the current time yesterday m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOffline( const TQString& ) ), - this, TQT_SLOT( userOffline( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), - this, TQT_SLOT( updateProfile( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), - this, TQT_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), - this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( requestBuddyIcon() ) ); - TQObject::connect( this, TQT_SIGNAL( featuresUpdated() ), this, TQT_SLOT( updateFeatures() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOffline( const TQString& ) ), + this, TQ_SLOT( userOffline( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SLOT( updateAwayMessage( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), + this, TQ_SLOT( updateProfile( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQ_SLOT( gotWarning( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), + this, TQ_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( requestBuddyIcon() ) ); + TQObject::connect( this, TQ_SIGNAL( featuresUpdated() ), this, TQ_SLOT( updateFeatures() ) ); } AIMContact::~AIMContact() @@ -90,12 +90,12 @@ TQPtrList<TDEAction> *AIMContact::customContextMenuActions() TQPtrList<TDEAction> *actionCollection = new TQPtrList<TDEAction>(); if ( !m_warnUserAction ) { - m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQT_SLOT( warnUser() ), this, "warnAction" ); + m_warnUserAction = new TDEAction( i18n( "&Warn User" ), 0, this, TQ_SLOT( warnUser() ), this, "warnAction" ); } m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, - this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); + this, TQ_SLOT(slotVisibleTo()), this, "actionVisibleTo"); m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, - this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); + this, TQ_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); @@ -162,7 +162,7 @@ void AIMContact::slotUserInfo() m_infoDialog = new AIMUserInfoDialog( this, static_cast<AIMAccount*>( account() ), false, Kopete::UI::Global::mainWidget(), 0 ); if( !m_infoDialog ) return; - connect( m_infoDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfoDialog() ) ); + connect( m_infoDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfoDialog() ) ); m_infoDialog->show(); if ( mAccount->isConnected() ) { @@ -240,7 +240,7 @@ void AIMContact::userInfoUpdated( const TQString& contact, const UserDetails& de int time = ( TDEApplication::random() % 10 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestBuddyIcon() ) ); } OscarContact::userInfoUpdated( contact, details ); diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 667a926d..36a79613 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -41,8 +41,8 @@ AIMJoinChatUI::AIMJoinChatUI( AIMAccount* account, bool modal, setMainWidget( m_joinUI ); - TQObject::connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( joinChat() ) ); - TQObject::connect( this, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( closeClicked() ) ); + TQObject::connect( this, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( joinChat() ) ); + TQObject::connect( this, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( closeClicked() ) ); } AIMJoinChatUI::~AIMJoinChatUI() diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index 46d6db03..561eef41 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -50,10 +50,10 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool mMainWidget = new AIMUserInfoWidget(this, "aimuserinfowidget"); setMainWidget(mMainWidget); - TQObject::connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSaveClicked())); - TQObject::connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotUpdateClicked())); - TQObject::connect(this, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCloseClicked())); - TQObject::connect(c, TQT_SIGNAL(updatedProfile()), this, TQT_SLOT(slotUpdateProfile())); + TQObject::connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSaveClicked())); + TQObject::connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotUpdateClicked())); + TQObject::connect(this, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCloseClicked())); + TQObject::connect(c, TQ_SIGNAL(updatedProfile()), this, TQ_SLOT(slotUpdateProfile())); mMainWidget->txtScreenName->setText( c->contactId() ); @@ -100,11 +100,11 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool userInfoView->setTextFormat(AutoText); userInfoView->setNotifyClick(true); TQObject::connect( - userInfoView, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(slotUrlClicked(const TQString&))); + userInfoView, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(slotUrlClicked(const TQString&))); TQObject::connect( - userInfoView, TQT_SIGNAL(mailClick(const TQString&, const TQString&)), - this, TQT_SLOT(slotMailClicked(const TQString&, const TQString&))); + userInfoView, TQ_SIGNAL(mailClick(const TQString&, const TQString&)), + this, TQ_SLOT(slotMailClicked(const TQString&, const TQString&))); showButton(Cancel, false); setButtonText(Ok, i18n("&Close")); setEscapeButton(Ok); @@ -115,7 +115,7 @@ AIMUserInfoDialog::AIMUserInfoDialog( Kopete::Contact *c, AIMAccount *acc, bool // Update the user view to indicate that we're requesting the user's profile userInfoView->setText(i18n("Requesting User Profile, please wait...")); } - TQTimer::singleShot(0, this, TQT_SLOT(slotUpdateProfile())); + TQTimer::singleShot(0, this, TQ_SLOT(slotUpdateProfile())); } } diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp index 8ea32a3b..7a8a499e 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountwidget.cpp @@ -80,7 +80,7 @@ AIMEditAccountWidget::AIMEditAccountWidget( AIMProtocol *protocol, // Global Identity mGui->mGlobalIdentity->setChecked( account->configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) ); } - TQObject::connect( mGui->buttonRegister, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenRegister() ) ); + TQObject::connect( mGui->buttonRegister, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenRegister() ) ); /* Set tab order to password custom widget correctly */ TQWidget::setTabOrder( mGui->edtAccountId, mGui->mPasswordWidget->mRemembered ); diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index f5c6b9ea..01892598 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -43,9 +43,9 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acct ) { - TQObject::connect( acct->engine(), TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( fetchShortInfo() ) ); - TQObject::connect( acct->engine(), TQT_SIGNAL( receivedIcqShortInfo( const TQString& ) ), - this, TQT_SLOT( receivedShortInfo( const TQString& ) ) ); + TQObject::connect( acct->engine(), TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( fetchShortInfo() ) ); + TQObject::connect( acct->engine(), TQ_SIGNAL( receivedIcqShortInfo( const TQString& ) ), + this, TQ_SLOT( receivedShortInfo( const TQString& ) ) ); } void ICQMyselfContact::userInfoUpdated() @@ -88,10 +88,10 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char mHideIP = configGroup()->readBoolEntry( "HideIP", true ); mInitialStatusMessage = TQString(); - TQObject::connect( Kopete::ContactList::self(), TQT_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), - this, TQT_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); + TQObject::connect( Kopete::ContactList::self(), TQ_SIGNAL( globalIdentityChanged( const TQString&, const TQVariant& ) ), + this, TQ_SLOT( slotGlobalIdentityChanged( const TQString&, const TQVariant& ) ) ); - TQObject::connect( this, TQT_SIGNAL( buddyIconChanged() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( this, TQ_SIGNAL( buddyIconChanged() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); //setIgnoreUnknownContacts(pluginData(protocol(), "IgnoreUnknownContacts").toUInt() == 1); @@ -129,15 +129,15 @@ TDEActionMenu* ICQAccount::actionMenu() TDEToggleAction* actionInvisible = new TDEToggleAction( i18n( "In&visible" ), ICQ::Presence( presence().type(), ICQ::Presence::Invisible ).toOnlineStatus().iconFor( this ), - 0, this, TQT_SLOT( slotToggleInvisible() ), this ); + 0, this, TQ_SLOT( slotToggleInvisible() ), this ); actionInvisible->setChecked( presence().visibility() == ICQ::Presence::Invisible ); actionMenu->insert( actionInvisible ); actionMenu->popupMenu()->insertSeparator(); actionMenu->insert( new TDEToggleAction( i18n( "Set Visibility..." ), 0, 0, - this, TQT_SLOT( slotSetVisiblility() ), this, + this, TQ_SLOT( slotSetVisiblility() ), this, "ICQAccount::mActionSetVisibility") ); - //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQT_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); + //actionMenu->insert( new TDEToggleAction( i18n( "Send &SMS..." ), 0, 0, this, TQ_SLOT( slotSendSMS() ), this, "ICQAccount::mActionSendSMS") ); return actionMenu; } @@ -231,8 +231,8 @@ void ICQAccount::slotSetVisiblility() if ( !m_visibilityDialog ) { m_visibilityDialog = new OscarVisibilityDialog( engine(), Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_visibilityDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( slotVisibilityDialogClosed() ) ); + TQObject::connect( m_visibilityDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( slotVisibilityDialogClosed() ) ); //add all contacts; OscarVisibilityDialog::ContactMap contactMap; @@ -417,10 +417,10 @@ void ICQAccount::slotGlobalIdentityChanged( const TQString& key, const TQVariant void ICQAccount::slotBuddyIconChanged() { // need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); if ( !engine()->isActive() ) { - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotBuddyIconChanged() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotBuddyIconChanged() ) ); return; } diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index 01c0e43d..2758d2c4 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -66,28 +66,28 @@ ICQContact::ICQContact( ICQAccount *account, const TQString &name, Kopete::MetaC else setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loggedIn() ) ); - //TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( userOnline( const TQString&, UserDetails ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( userIsOffline( const TQString& ) ), this, TQT_SLOT( userOffline( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ), - this, TQT_SLOT( slotGotAuthRequest( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ), - this, TQT_SLOT( slotGotAuthReply(const TQString&, const TQString&, bool ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedIcqShortInfo( const TQString& ) ), - this, TQT_SLOT( receivedShortInfo( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedIcqLongInfo( const TQString& ) ), - this, TQT_SLOT( receivedLongInfo( const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SLOT( receivedStatusMessage( const TQString&, const TQString& ) ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedAwayMessage( const Oscar::Message& ) ), - this, TQT_SLOT( receivedStatusMessage( const Oscar::Message& ) ) ); - TQObject::connect( this, TQT_SIGNAL( featuresUpdated() ), this, TQT_SLOT( updateFeatures() ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( requestBuddyIcon() ) ); - TQObject::connect( mAccount->engine(), TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), - this, TQT_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loggedIn() ) ); + //TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOnline( const TQString& ) ), this, TQ_SLOT( userOnline( const TQString&, UserDetails ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( userIsOffline( const TQString& ) ), this, TQ_SLOT( userOffline( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ), + this, TQ_SLOT( slotGotAuthRequest( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ), + this, TQ_SLOT( slotGotAuthReply(const TQString&, const TQString&, bool ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedIcqShortInfo( const TQString& ) ), + this, TQ_SLOT( receivedShortInfo( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedIcqLongInfo( const TQString& ) ), + this, TQ_SLOT( receivedLongInfo( const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SLOT( receivedStatusMessage( const TQString&, const TQString& ) ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( receivedAwayMessage( const Oscar::Message& ) ), + this, TQ_SLOT( receivedStatusMessage( const Oscar::Message& ) ) ); + TQObject::connect( this, TQ_SIGNAL( featuresUpdated() ), this, TQ_SLOT( updateFeatures() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( requestBuddyIcon() ) ); + TQObject::connect( mAccount->engine(), TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ), + this, TQ_SLOT( haveIcon( const TQString&, TQByteArray ) ) ); } @@ -193,7 +193,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de int time = ( TDEApplication::random() % 10 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating buddy icon in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestBuddyIcon() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestBuddyIcon() ) ); } } } @@ -237,7 +237,7 @@ void ICQContact::loggedIn() m_requestingNickname = true; int time = ( TDEApplication::random() % 20 ) * 1000; kdDebug(OSCAR_ICQ_DEBUG) << k_funcinfo << "updating nickname in " << time/1000 << " seconds" << endl; - TQTimer::singleShot( time, this, TQT_SLOT( requestShortInfo() ) ); + TQTimer::singleShot( time, this, TQ_SLOT( requestShortInfo() ) ); } } @@ -298,7 +298,7 @@ void ICQContact::slotGotAuthRequest( const TQString& contact, const TQString& re ICQAuthReplyDialog *replyDialog = new ICQAuthReplyDialog(); - connect( replyDialog, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotAuthReplyDialogOkClicked() ) ); + connect( replyDialog, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotAuthReplyDialogOkClicked() ) ); replyDialog->setUser( property( Kopete::Global::Properties::self()->nickName() ).value().toString() ); replyDialog->setRequestReason( reason ); replyDialog->setModal( TRUE ); @@ -685,12 +685,12 @@ TQPtrList<TDEAction> *ICQContact::customContextMenuActions() if(actionReadAwayMessage==0) { actionReadAwayMessage = new TDEAction(awTxt, awIcn, 0, - this, TQT_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); + this, TQ_SLOT(slotReadAwayMessage()), this, "actionReadAwayMessage"); */ actionRequestAuth = new TDEAction(i18n("&Request Authorization"), "mail-reply-sender", 0, - this, TQT_SLOT(slotRequestAuth()), this, "actionRequestAuth"); + this, TQ_SLOT(slotRequestAuth()), this, "actionRequestAuth"); actionSendAuth = new TDEAction(i18n("&Grant Authorization"), "mail-forward", 0, - this, TQT_SLOT(slotSendAuth()), this, "actionSendAuth"); + this, TQ_SLOT(slotSendAuth()), this, "actionSendAuth"); /* } else @@ -701,11 +701,11 @@ TQPtrList<TDEAction> *ICQContact::customContextMenuActions() */ m_actionIgnore = new TDEToggleAction(i18n("&Ignore"), "", 0, - this, TQT_SLOT(slotIgnore()), this, "actionIgnore"); + this, TQ_SLOT(slotIgnore()), this, "actionIgnore"); m_actionVisibleTo = new TDEToggleAction(i18n("Always &Visible To"), "", 0, - this, TQT_SLOT(slotVisibleTo()), this, "actionVisibleTo"); + this, TQ_SLOT(slotVisibleTo()), this, "actionVisibleTo"); m_actionInvisibleTo = new TDEToggleAction(i18n("Always &Invisible To"), "", 0, - this, TQT_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); + this, TQ_SLOT(slotInvisibleTo()), this, "actionInvisibleTo"); bool on = account()->isConnected(); if ( m_ssiItem.waitingAuth() ) @@ -717,7 +717,7 @@ TQPtrList<TDEAction> *ICQContact::customContextMenuActions() m_selectEncoding = new TDEAction( i18n( "Select Encoding..." ), "charset", 0, - this, TQT_SLOT( changeContactEncoding() ), this, "changeEncoding" ); + this, TQ_SLOT( changeContactEncoding() ), this, "changeEncoding" ); /* actionReadAwayMessage->setEnabled(status != OSCAR_OFFLINE && status != OSCAR_ONLINE); @@ -748,7 +748,7 @@ TQPtrList<TDEAction> *ICQContact::customContextMenuActions() void ICQContact::slotUserInfo() { m_infoWidget = new ICQUserInfoWidget( Kopete::UI::Global::mainWidget(), "icq info" ); - TQObject::connect( m_infoWidget, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfoDialog() ) ); + TQObject::connect( m_infoWidget, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfoDialog() ) ); m_infoWidget->setContact( this ); m_infoWidget->show(); if ( account()->isConnected() ) @@ -768,8 +768,8 @@ void ICQContact::changeContactEncoding() return; m_oesd = new OscarEncodingSelectionDialog( Kopete::UI::Global::mainWidget(), property(mProtocol->contactEncoding).value().toInt() ); - connect( m_oesd, TQT_SIGNAL( closing( int ) ), - this, TQT_SLOT( changeEncodingDialogClosed( int ) ) ); + connect( m_oesd, TQ_SIGNAL( closing( int ) ), + this, TQ_SLOT( changeEncodingDialogClosed( int ) ) ); m_oesd->show(); } @@ -827,7 +827,7 @@ void ICQContact::slotReadAwayMessage() awayMessageDialog = new ICQReadAway(this, 0L, "awayMessageDialog"); if(!awayMessageDialog) return; - TQObject::connect(awayMessageDialog, TQT_SIGNAL(closing()), this, TQT_SLOT(slotCloseAwayMessageDialog())); + TQObject::connect(awayMessageDialog, TQ_SIGNAL(closing()), this, TQ_SLOT(slotCloseAwayMessageDialog())); awayMessageDialog->show(); } else diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 8686c8d8..361e13d2 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -47,19 +47,19 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name) awayMessageBrowser->setText(mContact->awayMessage()); TQObject::connect( - awayMessageBrowser, TQT_SIGNAL(urlClick(const TQString&)), - this, TQT_SLOT(slotUrlClicked(const TQString&))); + awayMessageBrowser, TQ_SIGNAL(urlClick(const TQString&)), + this, TQ_SLOT(slotUrlClicked(const TQString&))); TQObject::connect( - awayMessageBrowser, TQT_SIGNAL(mailClick(const TQString&, const TQString&)), - this, TQT_SLOT(slotMailClicked(const TQString&, const TQString&))); + awayMessageBrowser, TQ_SIGNAL(mailClick(const TQString&, const TQString&)), + this, TQ_SLOT(slotMailClicked(const TQString&, const TQString&))); - connect(this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(slotFetchAwayMessage())); - connect(this, TQT_SIGNAL(closeClicked()), - this, TQT_SLOT(slotCloseClicked())); + connect(this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(slotFetchAwayMessage())); + connect(this, TQ_SIGNAL(closeClicked()), + this, TQ_SLOT(slotCloseClicked())); - connect(c, TQT_SIGNAL(awayMessageChanged()), - this, TQT_SLOT(slotAwayMessageChanged())); + connect(c, TQ_SIGNAL(awayMessageChanged()), + this, TQ_SLOT(slotAwayMessageChanged())); slotFetchAwayMessage(); } diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index 687de1b2..022b99a5 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -48,7 +48,7 @@ ICQAddContactPage::ICQAddContactPage(ICQAccount *owner, TQWidget *parent, const (new TQVBoxLayout(this))->setAutoAdd(true); addUI = new icqAddUI(this); - connect( addUI->searchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( showSearchDialog() ) ); + connect( addUI->searchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( showSearchDialog() ) ); } ICQAddContactPage::~ICQAddContactPage() @@ -109,7 +109,7 @@ void ICQAddContactPage::showSearchDialog() { m_searchDialog = new ICQSearchDialog( mAccount, this, "icqSearchDialog" ); m_searchDialog->show(); - connect( m_searchDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( searchDialogDestroyed() ) ); + connect( m_searchDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( searchDialogDestroyed() ) ); } } diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index e3b40b3b..17865d36 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -99,7 +99,7 @@ ICQEditAccountWidget::ICQEditAccountWidget(ICQProtocol *protocol, 4 ); } - TQObject::connect(mAccountSettings->buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); + TQObject::connect(mAccountSettings->buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); /* Set tab order to password custom widget correctly */ TQWidget::setTabOrder( mAccountSettings->edtAccountId, mAccountSettings->mPasswordWidget->mRemembered ); diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index 9a212447..ec1e7e55 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -47,14 +47,14 @@ ICQSearchDialog::ICQSearchDialog( ICQAccount* account, TQWidget* parent, const c m_account = account; m_searchUI = new ICQSearchBase( this, name ); setMainWidget( m_searchUI ); - connect( m_searchUI->searchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( startSearch() ) ); - connect( m_searchUI->searchResults, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( resultSelectionChanged() ) ); - connect( m_searchUI->addButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addContact() ) ); - connect( m_searchUI->clearButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clearResults() ) ); - connect( m_searchUI->stopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( stopSearch() ) ); - connect( m_searchUI->closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeDialog() ) ); - connect( m_searchUI->userInfoButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( userInfo() ) ); - connect( m_searchUI->newSearchButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newSearch() ) ); + connect( m_searchUI->searchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( startSearch() ) ); + connect( m_searchUI->searchResults, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( resultSelectionChanged() ) ); + connect( m_searchUI->addButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addContact() ) ); + connect( m_searchUI->clearButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clearResults() ) ); + connect( m_searchUI->stopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( stopSearch() ) ); + connect( m_searchUI->closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeDialog() ) ); + connect( m_searchUI->userInfoButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( userInfo() ) ); + connect( m_searchUI->newSearchButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newSearch() ) ); ICQProtocol *p = ICQProtocol::protocol(); p->fillComboFromTable( m_searchUI->gender, p->genders() ); @@ -91,10 +91,10 @@ void ICQSearchDialog::startSearch() m_searchUI->searchButton->setEnabled( false ); m_searchUI->newSearchButton->setEnabled( false ); - connect( m_account->engine(), TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), - this, TQT_SLOT( newResult( const ICQSearchResult& ) ) ); - connect( m_account->engine(), TQT_SIGNAL( endOfSearch( int ) ), - this, TQT_SLOT( searchFinished( int ) ) ); + connect( m_account->engine(), TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), + this, TQ_SLOT( newResult( const ICQSearchResult& ) ) ); + connect( m_account->engine(), TQ_SIGNAL( endOfSearch( int ) ), + this, TQ_SLOT( searchFinished( int ) ) ); const TQWidget* currentPage = m_searchUI->tabWidget3->currentPage(); @@ -159,10 +159,10 @@ void ICQSearchDialog::startSearch() void ICQSearchDialog::stopSearch() { - disconnect( m_account->engine(), TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), - this, TQT_SLOT( newResult( const ICQSearchResult& ) ) ); - disconnect( m_account->engine(), TQT_SIGNAL( endOfSearch( int ) ), - this, TQT_SLOT( searchFinished( int ) ) ); + disconnect( m_account->engine(), TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ), + this, TQ_SLOT( newResult( const ICQSearchResult& ) ) ); + disconnect( m_account->engine(), TQ_SIGNAL( endOfSearch( int ) ), + this, TQ_SLOT( searchFinished( int ) ) ); m_searchUI->stopButton->setEnabled( false ); m_searchUI->searchButton->setEnabled( true ); @@ -203,7 +203,7 @@ void ICQSearchDialog::userInfo() NULL); m_infoWidget = new ICQUserInfoWidget( Kopete::UI::Global::mainWidget(), "icq info" ); - TQObject::connect( m_infoWidget, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeUserInfo() ) ); + TQObject::connect( m_infoWidget, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeUserInfo() ) ); m_infoWidget->setContact( m_contact ); m_infoWidget->setModal(true); diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 4126a3ec..aa793b62 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -78,16 +78,16 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name ) void ICQUserInfoWidget::setContact( ICQContact* contact ) { m_contact = contact; - TQObject::connect( contact, TQT_SIGNAL( haveBasicInfo( const ICQGeneralUserInfo& ) ), - this, TQT_SLOT( fillBasicInfo( const ICQGeneralUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveWorkInfo( const ICQWorkUserInfo& ) ), - this, TQT_SLOT( fillWorkInfo( const ICQWorkUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveEmailInfo( const ICQEmailInfo& ) ), - this, TQT_SLOT( fillEmailInfo( const ICQEmailInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveMoreInfo( const ICQMoreUserInfo& ) ), - this, TQT_SLOT( fillMoreInfo( const ICQMoreUserInfo& ) ) ); - TQObject::connect( contact, TQT_SIGNAL( haveInterestInfo( const ICQInterestInfo& ) ), - this, TQT_SLOT( fillInterestInfo( const ICQInterestInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveBasicInfo( const ICQGeneralUserInfo& ) ), + this, TQ_SLOT( fillBasicInfo( const ICQGeneralUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveWorkInfo( const ICQWorkUserInfo& ) ), + this, TQ_SLOT( fillWorkInfo( const ICQWorkUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveEmailInfo( const ICQEmailInfo& ) ), + this, TQ_SLOT( fillEmailInfo( const ICQEmailInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveMoreInfo( const ICQMoreUserInfo& ) ), + this, TQ_SLOT( fillMoreInfo( const ICQMoreUserInfo& ) ) ); + TQObject::connect( contact, TQ_SIGNAL( haveInterestInfo( const ICQInterestInfo& ) ), + this, TQ_SLOT( fillInterestInfo( const ICQInterestInfo& ) ) ); } void ICQUserInfoWidget::fillBasicInfo( const ICQGeneralUserInfo& ui ) diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 1f7ff117..d8712416 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -43,7 +43,7 @@ void AimLoginTask::onGo() //send Snac 17,06 sendAuthStringRequest(); //when we have the authKey, login - connect( this, TQT_SIGNAL( haveAuthKey() ), this, TQT_SLOT( sendLoginRequest() ) ); + connect( this, TQ_SIGNAL( haveAuthKey() ), this, TQ_SLOT( sendLoginRequest() ) ); } bool AimLoginTask::forMe( Transfer* transfer ) const diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index 10fec375..5f487058 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -165,10 +165,10 @@ Client::Client( TQObject* parent ) d->awayMsgRequestTimer = new TQTimer(); d->codecProvider = &defaultCodecProvider; - connect( this, TQT_SIGNAL( redirectionFinished( WORD ) ), - this, TQT_SLOT( checkRedirectionQueue( WORD ) ) ); - connect( d->awayMsgRequestTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( nextICQAwayMessageRequest() ) ); + connect( this, TQ_SIGNAL( redirectionFinished( WORD ) ), + this, TQ_SLOT( checkRedirectionQueue( WORD ) ) ); + connect( d->awayMsgRequestTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( nextICQAwayMessageRequest() ) ); } Client::~Client() @@ -194,10 +194,10 @@ void Client::connectToServer( Connection *c, const TQString& server, bool auth ) if ( auth == true ) { m_loginTask = new StageOneLoginTask( c->rootTask() ); - connect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + connect( m_loginTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); } - connect( c, TQT_SIGNAL( socketError( int, const TQString& ) ), this, TQT_SLOT( determineDisconnection( int, const TQString& ) ) ); + connect( c, TQ_SIGNAL( socketError( int, const TQString& ) ), this, TQ_SLOT( determineDisconnection( int, const TQString& ) ) ); c->connectToServer(server, auth); } @@ -343,7 +343,7 @@ void Client::lt_loginFinished() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage two done. setting up services" << endl; initializeStaticTasks(); ServiceSetupTask* ssTask = new ServiceSetupTask( d->connections.defaultConnection()->rootTask() ); - connect( ssTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( serviceSetupFinished() ) ); + connect( ssTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( serviceSetupFinished() ) ); ssTask->go( true ); //fire and forget m_loginTaskTwo->deleteLater(); m_loginTaskTwo = 0; @@ -351,7 +351,7 @@ void Client::lt_loginFinished() else if ( d->stage == ClientPrivate::StageOne ) { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "stage one login done" << endl; - disconnect( m_loginTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + disconnect( m_loginTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); if ( m_loginTask->statusCode() == 0 ) //we can start stage two { @@ -362,7 +362,7 @@ void Client::lt_loginFinished() d->port = m_loginTask->bosPort().toUInt(); d->cookie = m_loginTask->loginCookie(); close(); - TQTimer::singleShot( 100, this, TQT_SLOT(startStageTwo() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT(startStageTwo() ) ); } else { @@ -385,11 +385,11 @@ void Client::startStageTwo() //create the new login task m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() ); m_loginTaskTwo->setCookie( d->cookie ); - TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( lt_loginFinished() ) ); + TQObject::connect( m_loginTaskTwo, TQ_SIGNAL( finished() ), this, TQ_SLOT( lt_loginFinished() ) ); //connect - TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) ); + TQObject::connect( c, TQ_SIGNAL( connected() ), this, TQ_SLOT( streamConnected() ) ); connectToServer( c, d->host, false ) ; } @@ -412,8 +412,8 @@ void Client::serviceSetupFinished() } OfflineMessagesTask *offlineMsgTask = new OfflineMessagesTask( c->rootTask() ); - connect( offlineMsgTask, TQT_SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), - this, TQT_SIGNAL( messageReceived(const Oscar::Message& ) ) ); + connect( offlineMsgTask, TQ_SIGNAL( receivedOfflineMessage(const Oscar::Message& ) ), + this, TQ_SIGNAL( messageReceived(const Oscar::Message& ) ) ); offlineMsgTask->go( true ); } @@ -628,34 +628,34 @@ void Client::initializeStaticTasks() d->typingNotifyTask = new TypingNotifyTask( c->rootTask() ); d->ssiModifyTask = new SSIModifyTask( c->rootTask(), true ); - connect( d->onlineNotifier, TQT_SIGNAL( userIsOnline( const TQString&, const UserDetails& ) ), - this, TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ) ); - connect( d->onlineNotifier, TQT_SIGNAL( userIsOffline( const TQString&, const UserDetails& ) ), - this, TQT_SLOT( offlineUser( const TQString&, const UserDetails & ) ) ); + connect( d->onlineNotifier, TQ_SIGNAL( userIsOnline( const TQString&, const UserDetails& ) ), + this, TQ_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ) ); + connect( d->onlineNotifier, TQ_SIGNAL( userIsOffline( const TQString&, const UserDetails& ) ), + this, TQ_SLOT( offlineUser( const TQString&, const UserDetails & ) ) ); - connect( d->ownStatusTask, TQT_SIGNAL( gotInfo() ), this, TQT_SLOT( haveOwnUserInfo() ) ); - connect( d->ownStatusTask, TQT_SIGNAL( buddyIconUploadRequested() ), this, - TQT_SIGNAL( iconNeedsUploading() ) ); + connect( d->ownStatusTask, TQ_SIGNAL( gotInfo() ), this, TQ_SLOT( haveOwnUserInfo() ) ); + connect( d->ownStatusTask, TQ_SIGNAL( buddyIconUploadRequested() ), this, + TQ_SIGNAL( iconNeedsUploading() ) ); - connect( d->messageReceiverTask, TQT_SIGNAL( receivedMessage( const Oscar::Message& ) ), - this, TQT_SLOT( receivedMessage( const Oscar::Message& ) ) ); + connect( d->messageReceiverTask, TQ_SIGNAL( receivedMessage( const Oscar::Message& ) ), + this, TQ_SLOT( receivedMessage( const Oscar::Message& ) ) ); - connect( d->ssiAuthTask, TQT_SIGNAL( authRequested( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ) ); - connect( d->ssiAuthTask, TQT_SIGNAL( authReplied( const TQString&, const TQString&, bool ) ), - this, TQT_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ) ); + connect( d->ssiAuthTask, TQ_SIGNAL( authRequested( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( authRequestReceived( const TQString&, const TQString& ) ) ); + connect( d->ssiAuthTask, TQ_SIGNAL( authReplied( const TQString&, const TQString&, bool ) ), + this, TQ_SIGNAL( authReplyReceived( const TQString&, const TQString&, bool ) ) ); - connect( d->icqInfoTask, TQT_SIGNAL( receivedInfoFor( const TQString&, unsigned int ) ), - this, TQT_SLOT( receivedIcqInfo( const TQString&, unsigned int ) ) ); + connect( d->icqInfoTask, TQ_SIGNAL( receivedInfoFor( const TQString&, unsigned int ) ), + this, TQ_SLOT( receivedIcqInfo( const TQString&, unsigned int ) ) ); - connect( d->userInfoTask, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( receivedProfile( const TQString&, const TQString& ) ) ); - connect( d->userInfoTask, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), - this, TQT_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ) ); - connect( d->typingNotifyTask, TQT_SIGNAL( typingStarted( const TQString& ) ), - this, TQT_SIGNAL( userStartedTyping( const TQString& ) ) ); - connect( d->typingNotifyTask, TQT_SIGNAL( typingFinished( const TQString& ) ), - this, TQT_SIGNAL( userStoppedTyping( const TQString& ) ) ); + connect( d->userInfoTask, TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( receivedProfile( const TQString&, const TQString& ) ) ); + connect( d->userInfoTask, TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ), + this, TQ_SIGNAL( receivedAwayMessage( const TQString&, const TQString& ) ) ); + connect( d->typingNotifyTask, TQ_SIGNAL( typingStarted( const TQString& ) ), + this, TQ_SIGNAL( userStartedTyping( const TQString& ) ) ); + connect( d->typingNotifyTask, TQ_SIGNAL( typingFinished( const TQString& ) ), + this, TQ_SIGNAL( userStoppedTyping( const TQString& ) ) ); } void Client::removeGroup( const TQString& groupName ) @@ -808,8 +808,8 @@ void Client::sendWarning( const TQString& contact, bool anonymous ) WarningTask* warnTask = new WarningTask( c->rootTask() ); warnTask->setContact( contact ); warnTask->setAnonymous( anonymous ); - TQObject::connect( warnTask, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), - this, TQT_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); + TQObject::connect( warnTask, TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ), + this, TQ_SIGNAL( userWarned( const TQString&, TQ_UINT16, TQ_UINT16 ) ) ); warnTask->go( true ); } @@ -974,9 +974,9 @@ void Client::whitePagesSearch( const ICQWPSearchInfo& info ) if ( !c ) return; UserSearchTask* ust = new UserSearchTask( c->rootTask() ); - connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ), - this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); - connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) ); + connect( ust, TQ_SIGNAL( foundUser( const ICQSearchResult& ) ), + this, TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); + connect( ust, TQ_SIGNAL( searchFinished( int ) ), this, TQ_SIGNAL( endOfSearch( int ) ) ); ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works ust->searchWhitePages( info ); } @@ -987,9 +987,9 @@ void Client::uinSearch( const TQString& uin ) if ( !c ) return; UserSearchTask* ust = new UserSearchTask( c->rootTask() ); - connect( ust, TQT_SIGNAL( foundUser( const ICQSearchResult& ) ), - this, TQT_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); - connect( ust, TQT_SIGNAL( searchFinished( int ) ), this, TQT_SIGNAL( endOfSearch( int ) ) ); + connect( ust, TQ_SIGNAL( foundUser( const ICQSearchResult& ) ), + this, TQ_SIGNAL( gotSearchResults( const ICQSearchResult& ) ) ); + connect( ust, TQ_SIGNAL( searchFinished( int ) ), this, TQ_SIGNAL( endOfSearch( int ) ) ); ust->go( true ); //onGo does nothing in this task. This is just here so autodelete works ust->searchUserByUIN( uin ); } @@ -1079,8 +1079,8 @@ void Client::requestBuddyIcon( const TQString& user, const TQByteArray& hash, BY return; BuddyIconTask* bit = new BuddyIconTask( c->rootTask() ); - connect( bit, TQT_SIGNAL( haveIcon( const TQString&, TQByteArray ) ), - this, TQT_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ) ); + connect( bit, TQ_SIGNAL( haveIcon( const TQString&, TQByteArray ) ), + this, TQ_SIGNAL( haveIconForContact( const TQString&, TQByteArray ) ) ); bit->requestIconFor( user ); bit->setHashType( hashType ); bit->setHash( hash ); @@ -1118,8 +1118,8 @@ void Client::requestServerRedirect( WORD family, WORD exchange, srt->setChatRoom( room ); } - connect( srt, TQT_SIGNAL( haveServer( const TQString&, const TQByteArray&, WORD ) ), - this, TQT_SLOT( haveServerForRedirect( const TQString&, const TQByteArray&, WORD ) ) ); + connect( srt, TQ_SIGNAL( haveServer( const TQString&, const TQByteArray&, WORD ) ), + this, TQ_SLOT( haveServerForRedirect( const TQString&, const TQByteArray&, WORD ) ) ); srt->setService( family ); srt->go( true ); } @@ -1147,11 +1147,11 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo //create the new login task m_loginTaskTwo = new StageTwoLoginTask( c->rootTask() ); m_loginTaskTwo->setCookie( cookie ); - TQObject::connect( m_loginTaskTwo, TQT_SIGNAL( finished() ), this, TQT_SLOT( serverRedirectFinished() ) ); + TQObject::connect( m_loginTaskTwo, TQ_SIGNAL( finished() ), this, TQ_SLOT( serverRedirectFinished() ) ); //connect connectToServer( c, d->host, false ); - TQObject::connect( c, TQT_SIGNAL( connected() ), this, TQT_SLOT( streamConnected() ) ); + TQObject::connect( c, TQ_SIGNAL( connected() ), this, TQ_SLOT( streamConnected() ) ); if ( srt ) d->connections.addChatInfoForConnection( c, srt->chatExchange(), srt->chatRoomName() ); @@ -1177,8 +1177,8 @@ void Client::serverRedirectFinished() if ( d->currentRedirect == 0x000D ) { - connect( this, TQT_SIGNAL( chatNavigationConnected() ), - this, TQT_SLOT( requestChatNavLimits() ) ); + connect( this, TQ_SIGNAL( chatNavigationConnected() ), + this, TQ_SLOT( requestChatNavLimits() ) ); emit chatNavigationConnected(); } @@ -1199,12 +1199,12 @@ void Client::serverRedirectFinished() { kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "setting up chat connection" << endl; ChatServiceTask* cst = new ChatServiceTask( c->rootTask(), exchange, roomName ); - connect( cst, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - connect( cst, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), - this, TQT_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); - connect( cst, TQT_SIGNAL( newChatMessage( const Oscar::Message& ) ), - this, TQT_SIGNAL( messageReceived( const Oscar::Message& ) ) ); + connect( cst, TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SIGNAL( userJoinedChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + connect( cst, TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ), + this, TQ_SIGNAL( userLeftChat( Oscar::WORD, const TQString&, const TQString& ) ) ); + connect( cst, TQ_SIGNAL( newChatMessage( const Oscar::Message& ) ), + this, TQ_SIGNAL( messageReceived( const Oscar::Message& ) ) ); } emit chatRoomConnected( exchange, roomName ); } @@ -1235,8 +1235,8 @@ void Client::requestChatNavLimits() kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting chat nav service limits" << endl; ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() ); cnst->setRequestType( ChatNavServiceTask::Limits ); - TQObject::connect( cnst, TQT_SIGNAL( haveChatExchanges( const TQValueList<int>& ) ), - this, TQT_SLOT( setChatExchangeList( const TQValueList<int>& ) ) ); + TQObject::connect( cnst, TQ_SIGNAL( haveChatExchanges( const TQValueList<int>& ) ), + this, TQ_SLOT( setChatExchangeList( const TQValueList<int>& ) ) ); cnst->go( true ); //autodelete } @@ -1283,8 +1283,8 @@ void Client::joinChatRoom( const TQString& roomName, int exchange ) kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "joining the chat room '" << roomName << "' on exchange " << exchange << endl; ChatNavServiceTask* cnst = new ChatNavServiceTask( c->rootTask() ); - connect( cnst, TQT_SIGNAL( connectChat( WORD, TQByteArray, WORD, const TQString& ) ), - this, TQT_SLOT( setupChatConnection( WORD, TQByteArray, WORD, const TQString& ) ) ); + connect( cnst, TQ_SIGNAL( connectChat( WORD, TQByteArray, WORD, const TQString& ) ), + this, TQ_SLOT( setupChatConnection( WORD, TQByteArray, WORD, const TQString& ) ) ); cnst->createRoom( exchange, roomName ); } diff --git a/kopete/protocols/oscar/liboscar/connection.cpp b/kopete/protocols/oscar/liboscar/connection.cpp index 1cdebe01..fbfa65d9 100644 --- a/kopete/protocols/oscar/liboscar/connection.cpp +++ b/kopete/protocols/oscar/liboscar/connection.cpp @@ -77,14 +77,14 @@ Connection::~Connection() void Connection::setClient( Client* c ) { d->client = c; - connect( c, TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loggedIn() ) ); + connect( c, TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loggedIn() ) ); } void Connection::connectToServer( const TQString& host, bool auth ) { - connect( d->clientStream, TQT_SIGNAL( error( int ) ), this, TQT_SLOT( streamSocketError( int ) ) ); - connect( d->clientStream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) ); - connect( d->clientStream, TQT_SIGNAL( connected() ), this, TQT_SIGNAL( connected() ) ); + connect( d->clientStream, TQ_SIGNAL( error( int ) ), this, TQ_SLOT( streamSocketError( int ) ) ); + connect( d->clientStream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) ); + connect( d->clientStream, TQ_SIGNAL( connected() ), this, TQ_SIGNAL( connected() ) ); d->clientStream->connectToServer( host, auth ); } diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index 91bb2434..2206d1a0 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -63,7 +63,7 @@ bool StageOneLoginTask::take( Transfer* transfer ) m_closeTask = new CloseConnectionTask( client()->rootTask() ); //connect finished signal - connect( m_closeTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeTaskFinished() ) ); + connect( m_closeTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeTaskFinished() ) ); m_icqTask->go( true ); } else @@ -80,7 +80,7 @@ bool StageOneLoginTask::take( Transfer* transfer ) send( ft ); m_aimTask = new AimLoginTask( client()->rootTask() ); - connect( m_aimTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( aimTaskFinished() ) ); + connect( m_aimTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( aimTaskFinished() ) ); m_aimTask->go( true ); } return true; @@ -145,8 +145,8 @@ StageTwoLoginTask::StageTwoLoginTask( Task* parent ) m_versionTask = new ServerVersionsTask( rootTask ); m_rateTask = new RateInfoTask( rootTask ); - TQObject::connect( m_versionTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( versionTaskFinished() ) ); - TQObject::connect( m_rateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( rateTaskFinished() ) ); + TQObject::connect( m_versionTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( versionTaskFinished() ) ); + TQObject::connect( m_rateTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( rateTaskFinished() ) ); } StageTwoLoginTask::~StageTwoLoginTask() diff --git a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp index 22f55500..03fd80bc 100644 --- a/kopete/protocols/oscar/liboscar/oscarbytestream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarbytestream.cpp @@ -38,11 +38,11 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent, const char */*name*/ ) mSocket->enableRead( true ); // connect signals and slots - TQObject::connect( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) ); } bool KNetworkByteStream::connect( TQString host, TQString service ) diff --git a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp index 793608d6..59bfcc11 100644 --- a/kopete/protocols/oscar/liboscar/oscarclientstream.cpp +++ b/kopete/protocols/oscar/liboscar/oscarclientstream.cpp @@ -112,13 +112,13 @@ ClientStream::ClientStream(Connector *conn, TQObject *parent) d = new Private; d->mode = ClientMode; d->conn = conn; - connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) ); - connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) ); - connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); - connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) ); + connect( d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()) ); + connect( d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()) ); + connect( &d->client, TQ_SIGNAL( outgoingData( const TQByteArray& ) ), TQ_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); + connect( &d->client, TQ_SIGNAL( incomingData() ), TQ_SLOT ( cp_incomingData() ) ); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); } ClientStream::~ClientStream() @@ -329,11 +329,11 @@ void ClientStream::cp_incomingData() void ClientStream::cr_connected() { d->bs = d->conn->stream(); - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); d->state = Active; if ( d->noop_time ) @@ -408,7 +408,7 @@ void ClientStream::processNext() { if( !d->in.isEmpty() ) { - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } } diff --git a/kopete/protocols/oscar/liboscar/oscarconnector.cpp b/kopete/protocols/oscar/liboscar/oscarconnector.cpp index 7bbe38e5..10d54957 100644 --- a/kopete/protocols/oscar/liboscar/oscarconnector.cpp +++ b/kopete/protocols/oscar/liboscar/oscarconnector.cpp @@ -33,8 +33,8 @@ KNetworkConnector::KNetworkConnector( TQObject *parent, const char */*name*/ ) mByteStream = new KNetworkByteStream( this ); - connect( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); + connect( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); mPort = 0; } diff --git a/kopete/protocols/oscar/liboscar/rateclass.cpp b/kopete/protocols/oscar/liboscar/rateclass.cpp index 9f0a7601..66958a8a 100644 --- a/kopete/protocols/oscar/liboscar/rateclass.cpp +++ b/kopete/protocols/oscar/liboscar/rateclass.cpp @@ -194,7 +194,7 @@ void RateClass::setupTimer() } else { - TQTimer::singleShot( ttns, this, TQT_SLOT( slotSend() ) ); //or send later + TQTimer::singleShot( ttns, this, TQ_SLOT( slotSend() ) ); //or send later } } } diff --git a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp index 75a30f63..65f37648 100644 --- a/kopete/protocols/oscar/liboscar/rateclassmanager.cpp +++ b/kopete/protocols/oscar/liboscar/rateclassmanager.cpp @@ -60,7 +60,7 @@ void RateClassManager::reset() void RateClassManager::registerClass( RateClass* rc ) { - TQObject::connect( rc, TQT_SIGNAL( dataReady( Transfer* ) ), this, TQT_SLOT( transferReady( Transfer* ) ) ); + TQObject::connect( rc, TQ_SIGNAL( dataReady( Transfer* ) ), this, TQ_SLOT( transferReady( Transfer* ) ) ); d->classList.append( rc ); } diff --git a/kopete/protocols/oscar/liboscar/rateinfotask.cpp b/kopete/protocols/oscar/liboscar/rateinfotask.cpp index b918fe48..8ece4bd2 100644 --- a/kopete/protocols/oscar/liboscar/rateinfotask.cpp +++ b/kopete/protocols/oscar/liboscar/rateinfotask.cpp @@ -32,7 +32,7 @@ using namespace Oscar; RateInfoTask::RateInfoTask( Task* parent ) : Task( parent ) { - connect( this, TQT_SIGNAL( gotRateLimits() ), this, TQT_SLOT( sendRateInfoAck() ) ); + connect( this, TQ_SIGNAL( gotRateLimits() ), this, TQ_SLOT( sendRateInfoAck() ) ); } diff --git a/kopete/protocols/oscar/liboscar/safedelete.cpp b/kopete/protocols/oscar/liboscar/safedelete.cpp index 9de147f0..2b466e68 100644 --- a/kopete/protocols/oscar/liboscar/safedelete.cpp +++ b/kopete/protocols/oscar/liboscar/safedelete.cpp @@ -110,7 +110,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp index af4dd08c..20aac363 100644 --- a/kopete/protocols/oscar/liboscar/servicesetuptask.cpp +++ b/kopete/protocols/oscar/liboscar/servicesetuptask.cpp @@ -47,14 +47,14 @@ ServiceSetupTask::ServiceSetupTask( Task* parent ) m_ssiListTask = new SSIListTask( parent ); m_ssiActivateTask = new SSIActivateTask( parent ); - TQObject::connect( m_ssiListTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_ssiParamTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_prmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_icbmTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_blmLimitsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_profileTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_locRightsTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); - TQObject::connect( m_ssiActivateTask, TQT_SIGNAL( finished() ), this, TQT_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiListTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiParamTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_prmTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_icbmTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_blmLimitsTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_profileTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_locRightsTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); + TQObject::connect( m_ssiActivateTask, TQ_SIGNAL( finished() ), this, TQ_SLOT( childTaskFinished() ) ); } diff --git a/kopete/protocols/oscar/liboscar/ssilisttask.cpp b/kopete/protocols/oscar/liboscar/ssilisttask.cpp index 55236339..963682b3 100644 --- a/kopete/protocols/oscar/liboscar/ssilisttask.cpp +++ b/kopete/protocols/oscar/liboscar/ssilisttask.cpp @@ -26,9 +26,9 @@ SSIListTask::SSIListTask( Task* parent ) : Task( parent ) { m_ssiManager = client()->ssiManager(); - TQObject::connect( this, TQT_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newContact( const Oscar::SSI& ) ) ); - TQObject::connect( this, TQT_SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newGroup( const Oscar::SSI& ) ) ); - TQObject::connect( this, TQT_SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, TQT_SLOT( newItem( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newContact( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newContact( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newGroup( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newGroup( const Oscar::SSI& ) ) ); + TQObject::connect( this, TQ_SIGNAL( newItem( const Oscar::SSI& ) ), m_ssiManager, TQ_SLOT( newItem( const Oscar::SSI& ) ) ); } diff --git a/kopete/protocols/oscar/liboscar/task.cpp b/kopete/protocols/oscar/liboscar/task.cpp index d7634210..c27f6434 100644 --- a/kopete/protocols/oscar/liboscar/task.cpp +++ b/kopete/protocols/oscar/liboscar/task.cpp @@ -46,7 +46,7 @@ Task::Task(Task *parent) { init(); d->client = parent->client(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Connection* parent, bool) @@ -54,7 +54,7 @@ Task::Task(Connection* parent, bool) { init(); d->client = parent; - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::~Task() @@ -173,7 +173,7 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - TQTimer::singleShot(0, this, TQT_SLOT(done())); + TQTimer::singleShot(0, this, TQ_SLOT(done())); } } diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp index 77563c05..070e69cc 100644 --- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp +++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp @@ -10,12 +10,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myConnector->setOptHostPort( "login.oscar.aol.com", 5190 ); myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); // notify and start sending - //connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) ); + //connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp index d1025059..4cba0a56 100644 --- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp index 410b6021..a8e667a3 100644 --- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -36,7 +36,7 @@ void LoginTest::slotDoTest() myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); - TQTimer::singleShot( 10000, this, TQT_SLOT(runAddGroupTest() ) ); + TQTimer::singleShot( 10000, this, TQ_SLOT(runAddGroupTest() ) ); connected = true; } @@ -59,7 +59,7 @@ void LoginTest::runAddGroupTest() tqDebug( "running ssi group add test" ); TQString group = TQString::fromLatin1( "dummygroup" ); myClient->addGroup( group ); - TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( runDelGroupTest() ) ); } void LoginTest::runDelGroupTest() diff --git a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp index d634f5b9..0c917fd2 100644 --- a/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp @@ -51,7 +51,7 @@ void KUnitTest::registerTests() KUnitTest::KUnitTest() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkRun()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkRun()) ); m_tests.setAutoDelete( TRUE ); // m_qtests.setAutoDelete( TRUE ); @@ -153,8 +153,8 @@ int KUnitTest::runTests() //void KUnitTest::addTester( TQTester *test ) //{ // m_qtests.insert( test, test ); -// connect( test, TQT_SIGNAL(destroyed(TQObject*)), -// TQT_SLOT(qtesterDone(TQObject* )) ); +// connect( test, TQ_SIGNAL(destroyed(TQObject*)), +// TQ_SLOT(qtesterDone(TQObject* )) ); //} void KUnitTest::qtesterDone( TQObject *obj ) diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp index 8d75b79d..2c9fd0a9 100644 --- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp @@ -10,13 +10,13 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - //connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + //connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient = new Client(); myConnection = new Connection( myConnector, myTestObject, "AUTHORIZER" ); myConnection->setClient( myClient ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -36,8 +36,8 @@ void LoginTest::slotDoTest() myClient->setIsIcq( true ); myClient->start( server, 5190, "userid", "password" ); myClient->connectToServer( myConnection, server, true ); - //TQObject::connect( myClient, TQT_SIGNAL( userIsOnline( const TQString& ) ), this, TQT_SLOT( runUserInfoTest())); - //TQTimer::singleShot( 6000, this, TQT_SLOT(runUserInfoTest() ) ); + //TQObject::connect( myClient, TQ_SIGNAL( userIsOnline( const TQString& ) ), this, TQ_SLOT( runUserInfoTest())); + //TQTimer::singleShot( 6000, this, TQ_SLOT(runUserInfoTest() ) ); connected = true; } diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 6bb0edb9..683d92b2 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -113,19 +113,19 @@ OscarAccount::OscarAccount(Kopete::Protocol *parent, const TQString &accountID, d->engine->setCodecProvider( d ); d->olnscDialog = 0L; - TQObject::connect( d->engine, TQT_SIGNAL( loggedIn() ), this, TQT_SLOT( loginActions() ) ); - TQObject::connect( d->engine, TQT_SIGNAL( messageReceived( const Oscar::Message& ) ), - this, TQT_SLOT( messageReceived(const Oscar::Message& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( socketError( int, const TQString& ) ), - this, TQT_SLOT( slotSocketError( int, const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( taskError( const Oscar::SNAC&, int, bool ) ), - this, TQT_SLOT( slotTaskError( const Oscar::SNAC&, int, bool ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( userStartedTyping( const TQString& ) ), - this, TQT_SLOT( userStartedTyping( const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( userStoppedTyping( const TQString& ) ), - this, TQT_SLOT( userStoppedTyping( const TQString& ) ) ); - TQObject::connect( d->engine, TQT_SIGNAL( iconNeedsUploading() ), - this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::connect( d->engine, TQ_SIGNAL( loggedIn() ), this, TQ_SLOT( loginActions() ) ); + TQObject::connect( d->engine, TQ_SIGNAL( messageReceived( const Oscar::Message& ) ), + this, TQ_SLOT( messageReceived(const Oscar::Message& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( socketError( int, const TQString& ) ), + this, TQ_SLOT( slotSocketError( int, const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( taskError( const Oscar::SNAC&, int, bool ) ), + this, TQ_SLOT( slotTaskError( const Oscar::SNAC&, int, bool ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( userStartedTyping( const TQString& ) ), + this, TQ_SLOT( userStartedTyping( const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( userStoppedTyping( const TQString& ) ), + this, TQ_SLOT( userStoppedTyping( const TQString& ) ) ); + TQObject::connect( d->engine, TQ_SIGNAL( iconNeedsUploading() ), + this, TQ_SLOT( slotSendBuddyIcon() ) ); } OscarAccount::~OscarAccount() @@ -144,18 +144,18 @@ void OscarAccount::logOff( Kopete::Account::DisconnectReason reason ) kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "accountId='" << accountId() << "'" << endl; //disconnect the signals Kopete::ContactList* kcl = Kopete::ContactList::self(); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( contactAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( groupAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( groupUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); - TQObject::disconnect( d->engine->ssiManager(), TQT_SIGNAL( contactUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( contactAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( groupAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( groupUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); + TQObject::disconnect( d->engine->ssiManager(), TQ_SIGNAL( contactUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); d->engine->close(); myself()->setOnlineStatus( Kopete::OnlineStatus::Offline ); @@ -198,10 +198,10 @@ void OscarAccount::processSSIList() { //disconnect signals so we don't attempt to add things to SSI! Kopete::ContactList* kcl = Kopete::ContactList::self(); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::disconnect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::disconnect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl; @@ -248,18 +248,18 @@ void OscarAccount::processSSIList() addContact( ( *bit ).name(), TQString(), group, Kopete::Account::DontChangeKABC ); } - TQObject::connect( kcl, TQT_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), - this, TQT_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); - TQObject::connect( kcl, TQT_SIGNAL( groupRemoved( Kopete::Group* ) ), - this, TQT_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( contactAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( groupAdded( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( groupUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); - TQObject::connect( listManager, TQT_SIGNAL( contactUpdated( const Oscar::SSI& ) ), - this, TQT_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); + TQObject::connect( kcl, TQ_SIGNAL( groupRenamed( Kopete::Group*, const TQString& ) ), + this, TQ_SLOT( kopeteGroupRenamed( Kopete::Group*, const TQString& ) ) ); + TQObject::connect( kcl, TQ_SIGNAL( groupRemoved( Kopete::Group* ) ), + this, TQ_SLOT( kopeteGroupRemoved( Kopete::Group* ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( contactAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactAdded( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( groupAdded( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupAdded( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( groupUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiGroupUpdated( const Oscar::SSI& ) ) ); + TQObject::connect( listManager, TQ_SIGNAL( contactUpdated( const Oscar::SSI& ) ), + this, TQ_SLOT( ssiContactUpdated( const Oscar::SSI& ) ) ); //TODO: check the kopete contact list and handle non server side contacts appropriately. TQDict<Kopete::Contact> nonServerContacts = contacts(); @@ -280,8 +280,8 @@ void OscarAccount::processSSIList() if ( !nonServerContactList.isEmpty() && showMissingContactsDialog ) { d->olnscDialog = new OscarListNonServerContacts( Kopete::UI::Global::mainWidget() ); - TQObject::connect( d->olnscDialog, TQT_SIGNAL( closing() ), - this, TQT_SLOT( nonServerAddContactDialogClosed() ) ); + TQObject::connect( d->olnscDialog, TQ_SIGNAL( closing() ), + this, TQ_SLOT( nonServerAddContactDialogClosed() ) ); d->olnscDialog->addContacts( nonServerContactList ); d->olnscDialog->show(); } @@ -781,7 +781,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal ) void OscarAccount::slotSendBuddyIcon() { //need to disconnect because we could end up with many connections - TQObject::disconnect( engine(), TQT_SIGNAL( iconServerConnected() ), this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::disconnect( engine(), TQ_SIGNAL( iconServerConnected() ), this, TQ_SLOT( slotSendBuddyIcon() ) ); TQString photoPath = myself()->property( Kopete::Global::Properties::self()->photo() ).value().toString(); if ( photoPath.isEmpty() ) return; @@ -794,8 +794,8 @@ void OscarAccount::slotSendBuddyIcon() if ( !engine()->hasIconConnection() ) { //will send icon when we connect to icon server - TQObject::connect( engine(), TQT_SIGNAL( iconServerConnected() ), - this, TQT_SLOT( slotSendBuddyIcon() ) ); + TQObject::connect( engine(), TQ_SIGNAL( iconServerConnected() ), + this, TQ_SLOT( slotSendBuddyIcon() ) ); return; } TQByteArray imageData = iconFile.readAll(); diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index 512b65ff..45874477 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -51,7 +51,7 @@ OscarContact::OscarContact( Kopete::Account* account, const TQString& name, mName = name; mMsgManager = 0L; m_ssiItem = ssiItem; - connect( this, TQT_SIGNAL( updatedSSI() ), this, TQT_SLOT( updateSSIItem() ) ); + connect( this, TQ_SIGNAL( updatedSSI() ), this, TQ_SLOT( updateSSIItem() ) ); } OscarContact::~OscarContact() @@ -105,15 +105,15 @@ Kopete::ChatSession* OscarContact::manager( CanCreateFlags canCreate ) mMsgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), theContact, protocol()); // This is for when the user types a message and presses send - connect(mMsgManager, TQT_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession * ) ), - this, TQT_SLOT( slotSendMsg( Kopete::Message&, Kopete::ChatSession * ) ) ); + connect(mMsgManager, TQ_SIGNAL( messageSent( Kopete::Message&, Kopete::ChatSession * ) ), + this, TQ_SLOT( slotSendMsg( Kopete::Message&, Kopete::ChatSession * ) ) ); // For when the message manager is destroyed - connect(mMsgManager, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( chatSessionDestroyed() ) ); + connect(mMsgManager, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( chatSessionDestroyed() ) ); - connect(mMsgManager, TQT_SIGNAL( myselfTyping( bool ) ), - this, TQT_SLOT( slotTyping( bool ) ) ); + connect(mMsgManager, TQ_SIGNAL( myselfTyping( bool ) ), + this, TQ_SLOT( slotTyping( bool ) ) ); } return mMsgManager; } diff --git a/kopete/protocols/oscar/oscarmyselfcontact.cpp b/kopete/protocols/oscar/oscarmyselfcontact.cpp index e5f1cd9e..78a01433 100644 --- a/kopete/protocols/oscar/oscarmyselfcontact.cpp +++ b/kopete/protocols/oscar/oscarmyselfcontact.cpp @@ -27,7 +27,7 @@ OscarMyselfContact::OscarMyselfContact( OscarAccount* account ) : Kopete::Contact( account, account->accountId(), Kopete::ContactList::self()->myself() ) { - TQObject::connect( account->engine(), TQT_SIGNAL( haveOwnInfo() ), this, TQT_SLOT( userInfoUpdated() ) ); + TQObject::connect( account->engine(), TQ_SIGNAL( haveOwnInfo() ), this, TQ_SLOT( userInfoUpdated() ) ); } OscarMyselfContact::~OscarMyselfContact() diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index 16149c18..6da4b0e0 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -71,10 +71,10 @@ bool OscarVersionUpdater::update( unsigned int stamp ) mTransferJob = TDEIO::get ( url ); kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl; - connect ( mTransferJob, TQT_SIGNAL ( result ( TDEIO::Job* ) ), - this, TQT_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); - connect ( mTransferJob, TQT_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( result ( TDEIO::Job* ) ), + this, TQ_SLOT ( slotTransferResult ( TDEIO::Job* ) ) ); + connect ( mTransferJob, TQ_SIGNAL ( data ( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT ( slotTransferData ( TDEIO::Job*, const TQByteArray& ) ) ); } return isUpdating; } diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index 235693e1..c82d0a86 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -32,14 +32,14 @@ OscarVisibilityDialog::OscarVisibilityDialog( Client* client, TQWidget* parent ) m_visibilityUI = new OscarVisibilityBase( this ); setMainWidget( m_visibilityUI ); - TQObject::connect(m_visibilityUI->visibleAdd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddToVisible())); - TQObject::connect(m_visibilityUI->visibleRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveFromVisible())); - TQObject::connect(m_visibilityUI->invisibleAdd, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddToInvisible())); - TQObject::connect(m_visibilityUI->invisibleRemove, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveFromInvisible())); + TQObject::connect(m_visibilityUI->visibleAdd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddToVisible())); + TQObject::connect(m_visibilityUI->visibleRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveFromVisible())); + TQObject::connect(m_visibilityUI->invisibleAdd, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddToInvisible())); + TQObject::connect(m_visibilityUI->invisibleRemove, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveFromInvisible())); } void OscarVisibilityDialog::addContacts( const ContactMap& contacts ) diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp index 085b9cd5..fc532ffd 100644 --- a/kopete/protocols/sms/services/kopete_unix_serial.cpp +++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp @@ -305,7 +305,7 @@ KopeteUnixSerialPort::KopeteUnixSerialPort(string device, speed_t lineSpeed, s.find("CABLE: GSM") != string::npos) { _readNotifier = new TQSocketNotifier(_fd, TQSocketNotifier::Read); - connect( _readNotifier, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated())); + connect( _readNotifier, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated())); return; // found OK, return } } diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index 1a8a510a..c3902d4f 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -80,9 +80,9 @@ void SMSClient::send(const Kopete::Message& msg) *p << provider + ":" + nr; *p << message; - TQObject::connect(p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess*))); - TQObject::connect(p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); - TQObject::connect(p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess*))); + TQObject::connect(p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); + TQObject::connect(p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess*, char*, int))); p->start(TDEProcess::Block, TDEProcess::AllOutput); } diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 73eb71db..0d22fd4f 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -67,8 +67,8 @@ void SMSSend::send(const Kopete::Message& msg) m_provider = new SMSSendProvider(provider, prefix, m_account, this); - TQObject::connect( m_provider, TQT_SIGNAL(messageSent(const Kopete::Message &)), this, TQT_SIGNAL(messageSent(const Kopete::Message &))); - TQObject::connect( m_provider, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &))); + TQObject::connect( m_provider, TQ_SIGNAL(messageSent(const Kopete::Message &)), this, TQ_SIGNAL(messageSent(const Kopete::Message &))); + TQObject::connect( m_provider, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), this, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &))); m_provider->send(msg); } @@ -108,13 +108,13 @@ void SMSSend::setWidgetContainer(TQWidget* parent, TQGridLayout* layout) } } - TQObject::connect (prefWidget->program, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(loadProviders(const TQString&))); + TQObject::connect (prefWidget->program, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(loadProviders(const TQString&))); prefWidget->program->setURL(prefix); - TQObject::connect(prefWidget->provider, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(setOptions(const TQString &))); + TQObject::connect(prefWidget->provider, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(setOptions(const TQString &))); prefWidget->show(); } diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 3ca0b419..24ea8bdc 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -244,9 +244,9 @@ void SMSSendProvider::send(const Kopete::Message& msg) *p << TQString("%1/bin/smssend").arg(prefix) << provider << values; output = ""; - connect( p, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendFinished(TDEProcess *))); - connect( p, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); -// connect( p, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); + connect( p, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendFinished(TDEProcess *))); + connect( p, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); +// connect( p, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQ_SLOT(slotReceivedOutput(TDEProcess *, char *, int))); p->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); } diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 2e596025..eddf3508 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -46,12 +46,12 @@ SMSAccount::SMSAccount( SMSProtocol *parent, const TQString &accountID, const ch if( theService ) { - TQObject::connect (theService, TQT_SIGNAL(messageSent(const Kopete::Message &)), - this, TQT_SLOT(slotSendingSuccess(const Kopete::Message &))); - TQObject::connect (theService, TQT_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), - this, TQT_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); - TQObject::connect (theService, TQT_SIGNAL(connected()), this, TQT_SLOT(slotConnected())); - TQObject::connect (theService, TQT_SIGNAL(disconnected()), this, TQT_SLOT(slotDisconnected())); + TQObject::connect (theService, TQ_SIGNAL(messageSent(const Kopete::Message &)), + this, TQ_SLOT(slotSendingSuccess(const Kopete::Message &))); + TQObject::connect (theService, TQ_SIGNAL(messageNotSent(const Kopete::Message &, const TQString &)), + this, TQ_SLOT(slotSendingFailure(const Kopete::Message &, const TQString &))); + TQObject::connect (theService, TQ_SIGNAL(connected()), this, TQ_SLOT(slotConnected())); + TQObject::connect (theService, TQ_SIGNAL(disconnected()), this, TQ_SLOT(slotDisconnected())); } } diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index 2a1afa09..d67bd9be 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -79,9 +79,9 @@ Kopete::ChatSession* SMSContact::manager( Kopete::Contact::CanCreateFlags canCre TQPtrList<Kopete::Contact> contacts; contacts.append(this); m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol()); - connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - account(), TQT_SLOT(slotSendMessage(Kopete::Message&))); - connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + account(), TQ_SLOT(slotSendMessage(Kopete::Message&))); + connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } } @@ -123,7 +123,7 @@ TQPtrList<TDEAction>* SMSContact::customContextMenuActions() { TQPtrList<TDEAction> *m_actionCollection = new TQPtrList<TDEAction>(); if( !m_actionPrefs ) - m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQT_SLOT(userPrefs()), this, "userPrefs"); + m_actionPrefs = new TDEAction(i18n("&Contact Settings"), 0, this, TQ_SLOT(userPrefs()), this, "userPrefs"); m_actionCollection->append( m_actionPrefs ); diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index 11771f9e..5994534d 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -63,10 +63,10 @@ SMSEditAccountWidget::SMSEditAccountWidget(SMSProtocol *protocol, Kopete::Accoun preferencesDialog->serviceName->insertStringList(ServiceLoader::services()); - connect (preferencesDialog->serviceName, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(setServicePreferences(const TQString &))); - connect (preferencesDialog->descButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(showDescription())); + connect (preferencesDialog->serviceName, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(setServicePreferences(const TQString &))); + connect (preferencesDialog->descButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(showDescription())); for (int i=0; i < preferencesDialog->serviceName->count(); i++) @@ -118,7 +118,7 @@ void SMSEditAccountWidget::setServicePreferences(const TQString& serviceName) if (service == 0L) return; - connect (this, TQT_SIGNAL(saved()), service, TQT_SLOT(savePreferences())); + connect (this, TQ_SIGNAL(saved()), service, TQ_SLOT(savePreferences())); delete middleFrameLayout; middleFrameLayout = new TQGridLayout(preferencesDialog->middleFrame, 1, 2, 0, 6, "middleFrameLayout"); diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index 267f452b..810b8a6b 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -51,7 +51,7 @@ TDEActionMenu* TestbedAccount::actionMenu() TDEAction *action; - action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQT_SLOT (slotShowVideo ()), this, "actionShowVideo"); + action = new TDEAction (i18n ("Show my own video..."), "testbed_showvideo", 0, this, TQ_SLOT (slotShowVideo ()), this, "actionShowVideo"); mActionMenu->insert(action); action->setEnabled( isConnected() ); @@ -90,8 +90,8 @@ void TestbedAccount::connect( const Kopete::OnlineStatus& /* initialStatus */ ) { kdDebug ( 14210 ) << k_funcinfo << endl; myself()->setOnlineStatus( TestbedProtocol::protocol()->testbedOnline ); - TQObject::connect ( m_server, TQT_SIGNAL ( messageReceived( const TQString & ) ), - this, TQT_SLOT ( receivedMessage( const TQString & ) ) ); + TQObject::connect ( m_server, TQ_SIGNAL ( messageReceived( const TQString & ) ), + this, TQ_SLOT ( receivedMessage( const TQString & ) ) ); } void TestbedAccount::disconnect() diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index b53c4adb..7195f7bc 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -74,9 +74,9 @@ Kopete::ChatSession* TestbedContact::manager( CanCreateFlags ) TQPtrList<Kopete::Contact> contacts; contacts.append(this); m_msgManager = Kopete::ChatSessionManager::self()->create(account()->myself(), contacts, protocol()); - connect(m_msgManager, TQT_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), - this, TQT_SLOT( sendMessage( Kopete::Message& ) ) ); - connect(m_msgManager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_msgManager, TQ_SIGNAL(messageSent(Kopete::Message&, Kopete::ChatSession*)), + this, TQ_SLOT( sendMessage( Kopete::Message& ) ) ); + connect(m_msgManager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); return m_msgManager; } } @@ -87,7 +87,7 @@ TQPtrList<TDEAction> *TestbedContact::customContextMenuActions() //OBSOLETE //FIXME!!! this function is obsolete, we should use XMLGUI instead /*m_actionCollection = new TDEActionCollection( this, "userColl" ); m_actionPrefs = new TDEAction(i18n( "&Contact Settings" ), 0, this, - TQT_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); + TQ_SLOT( showContactSettings( )), m_actionCollection, "contactSettings" ); return m_actionCollection;*/ return 0L; diff --git a/kopete/protocols/testbed/testbedfakeserver.cpp b/kopete/protocols/testbed/testbedfakeserver.cpp index 9a4116ca..40f724f1 100644 --- a/kopete/protocols/testbed/testbedfakeserver.cpp +++ b/kopete/protocols/testbed/testbedfakeserver.cpp @@ -40,7 +40,7 @@ void TestbedFakeServer::sendMessage( TQString contactId, TQString message ) TQString messageId = contactId + TQString::fromLatin1(": "); TestbedIncomingMessage* msg = new TestbedIncomingMessage( this, messageId + message ); m_incomingMessages.append( msg ); - TQTimer::singleShot( 1000, msg, TQT_SLOT( deliver() ) ); + TQTimer::singleShot( 1000, msg, TQ_SLOT( deliver() ) ); // This removes any delivered messages purgeMessages(); diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index 6022d8cb..df8a8a1a 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -34,7 +34,7 @@ TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * setInitialSize( TQSize(320,290), false ); setEscapeButton( KDialogBase::Close ); -// TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); +// TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); TQWidget *page = plainPage(); setMainWidget(page); @@ -59,7 +59,7 @@ kdDebug() << "Just captured 1st frame" << endl; mPixmap=TQPixmap(320,240,-1, TQPixmap::DefaultOptim); if (mPixmap.convertFromImage(mImage,0) == true) mImageContainer->updatePixmap(mPixmap); - connect(&qtimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateImage()) ); + connect(&qtimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateImage()) ); qtimer.start(0,FALSE); } diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 497f13fe..138f2957 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -36,10 +36,10 @@ WinPopupLib::WinPopupLib(const TQString &smbClient,int groupFreq) : smbClientBin(smbClient), groupCheckFreq(groupFreq) { - connect(&updateGroupDataTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotUpdateGroupData())); + connect(&updateGroupDataTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotUpdateGroupData())); updateGroupDataTimer.start(1, true); - TQTimer::singleShot(1, this, TQT_SLOT(slotStartDirLister())); + TQTimer::singleShot(1, this, TQ_SLOT(slotStartDirLister())); } WinPopupLib::~WinPopupLib() @@ -51,8 +51,8 @@ void WinPopupLib::slotStartDirLister() if (checkMessageDir()) { dirLister = new KDirLister(); dirLister->setAutoUpdate(true); - connect(dirLister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewMessages(const KFileItemList &))); - connect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted())); + connect(dirLister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewMessages(const KFileItemList &))); + connect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted())); dirLister->openURL(KURL::fromPathOrURL(WP_POPUP_DIR)); } } @@ -162,8 +162,8 @@ void WinPopupLib::startReadProcess(const TQString &Host) KProcIO *reader = new KProcIO; *reader << smbClientBin << "-N" << "-E" << "-g" << "-L" << Host << "-"; - connect(reader, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotReadProcessReady(KProcIO *))); - connect(reader, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotReadProcessExited(TDEProcess *))); + connect(reader, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotReadProcessReady(KProcIO *))); + connect(reader, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotReadProcessExited(TDEProcess *))); if (!reader->start(TDEProcess::NotifyOnExit, true)) { // still to come @@ -250,7 +250,7 @@ void WinPopupLib::slotReadProcessExited(TDEProcess *r) void WinPopupLib::slotListCompleted() { /// only to check received messages during start up, then we use newItems. GF - disconnect(dirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotListCompleted())); + disconnect(dirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotListCompleted())); readMessages(dirLister->items()); } @@ -331,7 +331,7 @@ void WinPopupLib::sendMessage(const TQString &Body, const TQString &Destination) *sender << smbClientBin << "-M" << Destination; *sender << "-N" << "-"; - connect(sender, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotSendProcessExited(TDEProcess *))); + connect(sender, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotSendProcessExited(TDEProcess *))); if (sender->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin)) { sender->writeStdin(Body.local8Bit(), Body.local8Bit().length()); diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 75788a2b..695147a2 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -165,12 +165,12 @@ TDEActionMenu* WPAccount::actionMenu() if (mProtocol) { TDEAction *goOnline = new TDEAction("Online", TQIconSet(mProtocol->WPOnline.iconFor(this)), 0, - this, TQT_SLOT(connect()), theActionMenu, "actionGoAvailable"); + this, TQ_SLOT(connect()), theActionMenu, "actionGoAvailable"); goOnline->setEnabled(isConnected() && isAway()); theActionMenu->insert(goOnline); TDEAction *goAway = new TDEAction("Away", TQIconSet(mProtocol->WPAway.iconFor(this)), 0, - this, TQT_SLOT(goAway()), theActionMenu, "actionGoAway"); + this, TQ_SLOT(goAway()), theActionMenu, "actionGoAway"); goAway->setEnabled(isConnected() && !isAway()); theActionMenu->insert(goAway); @@ -178,7 +178,7 @@ TDEActionMenu* WPAccount::actionMenu() theActionMenu->popupMenu()->insertSeparator(); theActionMenu->insert(new TDEAction(i18n("Properties"), 0, - this, TQT_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); + this, TQ_SLOT(editAccount()), theActionMenu, "actionAccountProperties")); } diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index 133d9b54..1d08ba8f 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -42,8 +42,8 @@ WPAddContact::WPAddContact(TQWidget *parent, WPAccount *newAccount, const char * (new TQVBoxLayout(this))->setAutoAdd(true); theDialog = new WPAddContactBase(this); - connect(theDialog->mHostGroup, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSelected(const TQString &))); - connect(theDialog->mRefresh, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpdateGroups())); + connect(theDialog->mHostGroup, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSelected(const TQString &))); + connect(theDialog->mRefresh, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpdateGroups())); theDialog->show(); theAccount = newAccount; diff --git a/kopete/protocols/winpopup/wpcontact.cpp b/kopete/protocols/winpopup/wpcontact.cpp index b8718de6..29517745 100644 --- a/kopete/protocols/winpopup/wpcontact.cpp +++ b/kopete/protocols/winpopup/wpcontact.cpp @@ -51,7 +51,7 @@ WPContact::WPContact(Kopete::Account *account, const TQString &newHostName, cons // Initialise and start the periodical checking for contact's status setOnlineStatus(static_cast<WPProtocol *>(protocol())->WPOffline); - connect(&checkStatus, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheckStatus())); + connect(&checkStatus, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheckStatus())); checkStatus.start(1000, false); } @@ -77,9 +77,9 @@ Kopete::ChatSession* WPContact::manager( Kopete::Contact::CanCreateFlags /*canCr m_manager = Kopete::ChatSessionManager::self()->create( account()->myself(), singleContact, protocol() ); - connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQT_SLOT(slotSendMessage(Kopete::Message &))); - connect(m_manager, TQT_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQT_SLOT(appendMessage(Kopete::Message &))); - connect(m_manager, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotChatSessionDestroyed())); + connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), this, TQ_SLOT(slotSendMessage(Kopete::Message &))); + connect(m_manager, TQ_SIGNAL(messageSent(Kopete::Message &, Kopete::ChatSession *)), m_manager, TQ_SLOT(appendMessage(Kopete::Message &))); + connect(m_manager, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotChatSessionDestroyed())); } return m_manager; @@ -111,7 +111,7 @@ void WPContact::slotUserInfo() if (!m_infoDialog) { m_infoDialog = new WPUserInfo( this, static_cast<WPAccount*>( account() ) ); if (!m_infoDialog) return; - connect( m_infoDialog, TQT_SIGNAL( closing() ), this, TQT_SLOT( slotCloseUserInfoDialog() ) ); + connect( m_infoDialog, TQ_SIGNAL( closing() ), this, TQ_SLOT( slotCloseUserInfoDialog() ) ); m_infoDialog->show(); } else { m_infoDialog->raise(); diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index 3b2cba49..a418d7e7 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -67,8 +67,8 @@ WPProtocol::WPProtocol( TQObject *parent, const char *name, const TQStringList & readConfig(); popupClient = new WinPopupLib(smbClientBin, groupCheckFreq); - TQObject::connect(popupClient, TQT_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)), - this, TQT_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &))); + TQObject::connect(popupClient, TQ_SIGNAL(signalNewMessage(const TQString &, const TQDateTime &, const TQString &)), + this, TQ_SLOT(slotReceivedMessage(const TQString &, const TQDateTime &, const TQString &))); } // Destructor diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 2809763d..32fc6837 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -50,7 +50,7 @@ WPUserInfo::WPUserInfo( WPContact *contact, WPAccount */*account*/, TQWidget *pa m_mainWidget->sOS->setText(i18n("Looking")); m_mainWidget->sServer->setText(i18n("Looking")); - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCloseClicked() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCloseClicked() ) ); startDetailsProcess(m_contact->contactId()); } @@ -65,8 +65,8 @@ void WPUserInfo::startDetailsProcess(const TQString &host) KProcIO *details = new KProcIO; *details << theSMBClientPath << "-N" << "-E" << "-g" << "-L" << host << "-"; - connect(details, TQT_SIGNAL(readReady(KProcIO *)), this, TQT_SLOT(slotDetailsProcessReady(KProcIO *))); - connect(details, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotDetailsProcessExited(TDEProcess *))); + connect(details, TQ_SIGNAL(readReady(KProcIO *)), this, TQ_SLOT(slotDetailsProcessReady(KProcIO *))); + connect(details, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotDetailsProcessExited(TDEProcess *))); if (!details->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { slotDetailsProcessExited(details); diff --git a/kopete/protocols/yahoo/libkyahoo/client.cpp b/kopete/protocols/yahoo/libkyahoo/client.cpp index 2a5967f8..f987ae65 100644 --- a/kopete/protocols/yahoo/libkyahoo/client.cpp +++ b/kopete/protocols/yahoo/libkyahoo/client.cpp @@ -123,17 +123,17 @@ Client::Client(TQObject *par) :TQObject(par, "yahooclient") m_connector = 0L; m_pingTimer = new TQTimer( this ); - TQObject::connect( m_pingTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( sendPing() ) ); + TQObject::connect( m_pingTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( sendPing() ) ); - TQObject::connect( d->loginTask, TQT_SIGNAL( haveSessionID( uint ) ), TQT_SLOT( lt_gotSessionID( uint ) ) ); - TQObject::connect( d->loginTask, TQT_SIGNAL( buddyListReady() ), TQT_SLOT( processPictureQueue() ) ); - TQObject::connect( d->loginTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ), - TQT_SLOT( slotLoginResponse( int, const TQString& ) ) ); - TQObject::connect( d->loginTask, TQT_SIGNAL( haveCookies() ), TQT_SLOT( slotGotCookies() ) ); - TQObject::connect( d->listTask, TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ), - TQT_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) ); - TQObject::connect( d->listTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->loginTask, TQ_SIGNAL( haveSessionID( uint ) ), TQ_SLOT( lt_gotSessionID( uint ) ) ); + TQObject::connect( d->loginTask, TQ_SIGNAL( buddyListReady() ), TQ_SLOT( processPictureQueue() ) ); + TQObject::connect( d->loginTask, TQ_SIGNAL( loginResponse( int, const TQString& ) ), + TQ_SLOT( slotLoginResponse( int, const TQString& ) ) ); + TQObject::connect( d->loginTask, TQ_SIGNAL( haveCookies() ), TQ_SLOT( slotGotCookies() ) ); + TQObject::connect( d->listTask, TQ_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ), + TQ_SIGNAL( gotBuddy(const TQString &, const TQString &, const TQString &) ) ); + TQObject::connect( d->listTask, TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), + TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); } Client::~Client() @@ -156,10 +156,10 @@ void Client::connect( const TQString &host, const uint port, const TQString &use m_connector = new KNetworkConnector; m_connector->setOptHostPort( host, port ); d->stream = new ClientStream( m_connector, this ); - TQObject::connect( d->stream, TQT_SIGNAL( connected() ), this, TQT_SLOT( cs_connected() ) ); - TQObject::connect( d->stream, TQT_SIGNAL( error(int) ), this, TQT_SLOT( streamError(int) ) ); - TQObject::connect( d->stream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) ); - TQObject::connect( d->stream, TQT_SIGNAL( connectionClosed() ), this, TQT_SLOT( streamDisconnected() ) ); + TQObject::connect( d->stream, TQ_SIGNAL( connected() ), this, TQ_SLOT( cs_connected() ) ); + TQObject::connect( d->stream, TQ_SIGNAL( error(int) ), this, TQ_SLOT( streamError(int) ) ); + TQObject::connect( d->stream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) ); + TQObject::connect( d->stream, TQ_SIGNAL( connectionClosed() ), this, TQ_SLOT( streamDisconnected() ) ); d->stream->connectToServer( host, false ); } @@ -193,7 +193,7 @@ void Client::close() deleteTasks(); d->loginTask->reset(); if( d->stream ) { - TQObject::disconnect( d->stream, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( streamReadyRead() ) ); + TQObject::disconnect( d->stream, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( streamReadyRead() ) ); d->stream->deleteLater(); } d->stream = 0L; @@ -353,11 +353,11 @@ void Client::sendFile( unsigned int transferId, const TQString &to, const TQStri { SendFileTask *sft = new SendFileTask( d->root ); - TQObject::connect( sft, TQT_SIGNAL(complete(unsigned int)), TQT_SIGNAL(fileTransferComplete(unsigned int)) ); - TQObject::connect( sft, TQT_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQT_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) ); - TQObject::connect( sft, TQT_SIGNAL(error(unsigned int, int, const TQString &)), TQT_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) ); + TQObject::connect( sft, TQ_SIGNAL(complete(unsigned int)), TQ_SIGNAL(fileTransferComplete(unsigned int)) ); + TQObject::connect( sft, TQ_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQ_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) ); + TQObject::connect( sft, TQ_SIGNAL(error(unsigned int, int, const TQString &)), TQ_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) ); - TQObject::connect( this, TQT_SIGNAL(fileTransferCanceled( unsigned int )), sft, TQT_SLOT(canceled( unsigned int )) ); + TQObject::connect( this, TQ_SIGNAL(fileTransferCanceled( unsigned int )), sft, TQ_SLOT(canceled( unsigned int )) ); sft->setTarget( to ); sft->setMessage( msg ); @@ -370,10 +370,10 @@ void Client::receiveFile( unsigned int transferId, const TQString &userId, KURL { ReceiveFileTask *rft = new ReceiveFileTask( d->root ); - TQObject::connect( rft, TQT_SIGNAL(complete(unsigned int)), TQT_SIGNAL(fileTransferComplete(unsigned int)) ); - TQObject::connect( rft, TQT_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQT_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) ); - TQObject::connect( rft, TQT_SIGNAL(error(unsigned int, int, const TQString &)), TQT_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) ); - TQObject::connect( this, TQT_SIGNAL(fileTransferCanceled( unsigned int )), rft, TQT_SLOT(canceled( unsigned int )) ); + TQObject::connect( rft, TQ_SIGNAL(complete(unsigned int)), TQ_SIGNAL(fileTransferComplete(unsigned int)) ); + TQObject::connect( rft, TQ_SIGNAL(bytesProcessed(unsigned int, unsigned int)), TQ_SIGNAL(fileTransferBytesProcessed(unsigned int, unsigned int)) ); + TQObject::connect( rft, TQ_SIGNAL(error(unsigned int, int, const TQString &)), TQ_SIGNAL(fileTransferError(unsigned int, int, const TQString &)) ); + TQObject::connect( this, TQ_SIGNAL(fileTransferCanceled( unsigned int )), rft, TQ_SLOT(canceled( unsigned int )) ); rft->setRemoteUrl( remoteURL ); rft->setLocalUrl( localURL ); @@ -457,8 +457,8 @@ void Client::addBuddy( const TQString &userId, const TQString &group, const TQSt { ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root ); - TQObject::connect(mbt, TQT_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool )), - TQT_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool))); + TQObject::connect(mbt, TQ_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool )), + TQ_SIGNAL(buddyAddResult( const TQString &, const TQString &, bool))); mbt->setType( ModifyBuddyTask::AddBuddy ); mbt->setTarget( userId ); @@ -471,8 +471,8 @@ void Client::removeBuddy( const TQString &userId, const TQString &group ) { ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root ); - TQObject::connect(mbt, TQT_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool )), - TQT_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool))); + TQObject::connect(mbt, TQ_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool )), + TQ_SIGNAL(buddyRemoveResult( const TQString &, const TQString &, bool))); mbt->setType( ModifyBuddyTask::RemoveBuddy ); mbt->setTarget( userId ); @@ -484,8 +484,8 @@ void Client::moveBuddy( const TQString &userId, const TQString &oldGroup, const { ModifyBuddyTask *mbt = new ModifyBuddyTask( d->root ); - TQObject::connect(mbt, TQT_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool )), - TQT_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool))); + TQObject::connect(mbt, TQ_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool )), + TQ_SIGNAL(buddyChangeGroupResult( const TQString &, const TQString &, bool))); mbt->setType( ModifyBuddyTask::MoveBuddy ); mbt->setTarget( userId ); @@ -511,7 +511,7 @@ void Client::processPictureQueue() if( !d->pictureRequestQueue.isEmpty() ) { - TQTimer::singleShot( 1000, this, TQT_SLOT(processPictureQueue()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(processPictureQueue()) ); } } @@ -533,8 +533,8 @@ void Client::downloadPicture( const TQString &userId, KURL url, int checksum ) if( !d->iconLoader ) { d->iconLoader = new YahooBuddyIconLoader( this ); - TQObject::connect( d->iconLoader, TQT_SIGNAL(fetchedBuddyIcon(const TQString&, const TQByteArray &, int )), - TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int ) ) ); + TQObject::connect( d->iconLoader, TQ_SIGNAL(fetchedBuddyIcon(const TQString&, const TQByteArray &, int )), + TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int ) ) ); } d->iconLoader->fetchBuddyIcon( TQString(userId), KURL(url), checksum ); @@ -658,8 +658,8 @@ void Client::saveYABEntry( YABEntry &entry ) ModifyYABTask *myt = new ModifyYABTask( d->root ); myt->setAction( ModifyYABTask::EditEntry ); myt->setEntry( entry ); - TQObject::connect( myt, TQT_SIGNAL(gotEntry( YABEntry * )), this, TQT_SIGNAL( gotYABEntry( YABEntry * ) ) ); - TQObject::connect( myt, TQT_SIGNAL(error( YABEntry *, const TQString &)), this, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::connect( myt, TQ_SIGNAL(gotEntry( YABEntry * )), this, TQ_SIGNAL( gotYABEntry( YABEntry * ) ) ); + TQObject::connect( myt, TQ_SIGNAL(error( YABEntry *, const TQString &)), this, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & ))); myt->go(true); } @@ -668,8 +668,8 @@ void Client::addYABEntry( YABEntry &entry ) ModifyYABTask *myt = new ModifyYABTask( d->root ); myt->setAction( ModifyYABTask::AddEntry ); myt->setEntry( entry ); - TQObject::connect( myt, TQT_SIGNAL(gotEntry( YABEntry * )), this, TQT_SIGNAL( gotYABEntry( YABEntry * ) ) ); - TQObject::connect( myt, TQT_SIGNAL(error( YABEntry *, const TQString &)), this, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::connect( myt, TQ_SIGNAL(gotEntry( YABEntry * )), this, TQ_SIGNAL( gotYABEntry( YABEntry * ) ) ); + TQObject::connect( myt, TQ_SIGNAL(error( YABEntry *, const TQString &)), this, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & ))); myt->go(true); } @@ -839,104 +839,104 @@ void Client::initTasks() return; d->statusTask = new StatusNotifierTask( d->root ); - TQObject::connect( d->statusTask, TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ), - TQT_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), - TQT_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( loginResponse( int, const TQString& ) ), - TQT_SLOT( slotLoginResponse( int, const TQString& ) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ), - TQT_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( authorizationAccepted( const TQString& ) ), - TQT_SIGNAL( authorizationAccepted( const TQString& ) ) ); - TQObject::connect( d->statusTask, TQT_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ), - TQT_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ), + TQ_SIGNAL( statusChanged(const TQString&,int,const TQString&,int,int,int) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ), + TQ_SIGNAL( stealthStatusChanged( const TQString&, Yahoo::StealthStatus ) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( loginResponse( int, const TQString& ) ), + TQ_SLOT( slotLoginResponse( int, const TQString& ) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ), + TQ_SIGNAL( authorizationRejected( const TQString&, const TQString& ) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( authorizationAccepted( const TQString& ) ), + TQ_SIGNAL( authorizationAccepted( const TQString& ) ) ); + TQObject::connect( d->statusTask, TQ_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ), + TQ_SIGNAL( gotAuthorizationRequest( const TQString &, const TQString &, const TQString & ) ) ); d->mailTask = new MailNotifierTask( d->root ); - TQObject::connect( d->mailTask, TQT_SIGNAL( mailNotify(const TQString&, const TQString&, int) ), - TQT_SIGNAL( mailNotify(const TQString&, const TQString&, int) ) ); + TQObject::connect( d->mailTask, TQ_SIGNAL( mailNotify(const TQString&, const TQString&, int) ), + TQ_SIGNAL( mailNotify(const TQString&, const TQString&, int) ) ); d->messageReceiverTask = new MessageReceiverTask( d->root ); - TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ), - TQT_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ) ); - TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( systemMessage(const TQString&) ), - TQT_SIGNAL( systemMessage(const TQString&) ) ); - TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotTypingNotify(const TQString &, int) ), - TQT_SIGNAL( typingNotify(const TQString &, int) ) ); - TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotBuzz( const TQString &, long ) ), - TQT_SIGNAL( gotBuzz( const TQString &, long ) ) ); - TQObject::connect( d->messageReceiverTask, TQT_SIGNAL( gotWebcamInvite(const TQString &) ), - TQT_SIGNAL( gotWebcamInvite(const TQString &) ) ); + TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ), + TQ_SIGNAL( gotIm(const TQString&, const TQString&, long, int) ) ); + TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( systemMessage(const TQString&) ), + TQ_SIGNAL( systemMessage(const TQString&) ) ); + TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotTypingNotify(const TQString &, int) ), + TQ_SIGNAL( typingNotify(const TQString &, int) ) ); + TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotBuzz( const TQString &, long ) ), + TQ_SIGNAL( gotBuzz( const TQString &, long ) ) ); + TQObject::connect( d->messageReceiverTask, TQ_SIGNAL( gotWebcamInvite(const TQString &) ), + TQ_SIGNAL( gotWebcamInvite(const TQString &) ) ); d->pictureNotifierTask = new PictureNotifierTask( d->root ); - TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureStatusNotify( const TQString &, int ) ), - TQT_SIGNAL( pictureStatusNotify( const TQString &, int ) ) ); - TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureChecksumNotify( const TQString &, int ) ), - TQT_SIGNAL( pictureChecksumNotify( const TQString &, int ) ) ); - TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ), - TQT_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ) ); - TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureRequest( const TQString & ) ), - TQT_SIGNAL( pictureRequest( const TQString & ) ) ); - TQObject::connect( d->pictureNotifierTask, TQT_SIGNAL( pictureUploaded( const TQString &, int ) ), - TQT_SIGNAL( pictureUploaded( const TQString &, int ) ) ); + TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureStatusNotify( const TQString &, int ) ), + TQ_SIGNAL( pictureStatusNotify( const TQString &, int ) ) ); + TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureChecksumNotify( const TQString &, int ) ), + TQ_SIGNAL( pictureChecksumNotify( const TQString &, int ) ) ); + TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ), + TQ_SIGNAL( pictureInfoNotify( const TQString &, KURL, int ) ) ); + TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureRequest( const TQString & ) ), + TQ_SIGNAL( pictureRequest( const TQString & ) ) ); + TQObject::connect( d->pictureNotifierTask, TQ_SIGNAL( pictureUploaded( const TQString &, int ) ), + TQ_SIGNAL( pictureUploaded( const TQString &, int ) ) ); d->webcamTask = new WebcamTask( d->root ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ), - TQT_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamNotAvailable( const TQString & ) ), - TQT_SIGNAL( webcamNotAvailable( const TQString & ) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamClosed( const TQString &, int ) ), - TQT_SIGNAL( webcamClosed( const TQString &, int ) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( webcamPaused(const TQString&) ), - TQT_SIGNAL( webcamPaused(const TQString&) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( readyForTransmission() ), - TQT_SIGNAL( webcamReadyForTransmission() ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( stopTransmission() ), - TQT_SIGNAL( webcamStopTransmission() ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerJoined( const TQString &) ), - TQT_SIGNAL( webcamViewerJoined( const TQString &) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerLeft( const TQString &) ), - TQT_SIGNAL( webcamViewerLeft( const TQString &) ) ); - TQObject::connect( d->webcamTask, TQT_SIGNAL( viewerRequest( const TQString &) ), - TQT_SIGNAL( webcamViewerRequest( const TQString &) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ), + TQ_SIGNAL( webcamImageReceived( const TQString &, const TQPixmap &) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamNotAvailable( const TQString & ) ), + TQ_SIGNAL( webcamNotAvailable( const TQString & ) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamClosed( const TQString &, int ) ), + TQ_SIGNAL( webcamClosed( const TQString &, int ) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( webcamPaused(const TQString&) ), + TQ_SIGNAL( webcamPaused(const TQString&) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( readyForTransmission() ), + TQ_SIGNAL( webcamReadyForTransmission() ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( stopTransmission() ), + TQ_SIGNAL( webcamStopTransmission() ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerJoined( const TQString &) ), + TQ_SIGNAL( webcamViewerJoined( const TQString &) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerLeft( const TQString &) ), + TQ_SIGNAL( webcamViewerLeft( const TQString &) ) ); + TQObject::connect( d->webcamTask, TQ_SIGNAL( viewerRequest( const TQString &) ), + TQ_SIGNAL( webcamViewerRequest( const TQString &) ) ); d->conferenceTask = new ConferenceTask( d->root ); - TQObject::connect( d->conferenceTask, TQT_SIGNAL( gotInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ), - TQT_SIGNAL( gotConferenceInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ) ); - TQObject::connect( d->conferenceTask, TQT_SIGNAL( gotMessage( const TQString &, const TQString &, const TQString & ) ), - TQT_SIGNAL( gotConferenceMessage( const TQString &, const TQString &, const TQString & ) ) ); - TQObject::connect( d->conferenceTask, TQT_SIGNAL( userJoined( const TQString &, const TQString & ) ), - TQT_SIGNAL( confUserJoined( const TQString &, const TQString & ) ) ); - TQObject::connect( d->conferenceTask, TQT_SIGNAL( userLeft( const TQString &, const TQString & ) ), - TQT_SIGNAL( confUserLeft( const TQString &, const TQString & ) ) ); - TQObject::connect( d->conferenceTask, TQT_SIGNAL( userDeclined( const TQString &, const TQString &, const TQString & ) ), - TQT_SIGNAL( confUserDeclined( const TQString &, const TQString &, const TQString & ) ) ); + TQObject::connect( d->conferenceTask, TQ_SIGNAL( gotInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ), + TQ_SIGNAL( gotConferenceInvite( const TQString &, const TQString &, const TQString &, const TQStringList & ) ) ); + TQObject::connect( d->conferenceTask, TQ_SIGNAL( gotMessage( const TQString &, const TQString &, const TQString & ) ), + TQ_SIGNAL( gotConferenceMessage( const TQString &, const TQString &, const TQString & ) ) ); + TQObject::connect( d->conferenceTask, TQ_SIGNAL( userJoined( const TQString &, const TQString & ) ), + TQ_SIGNAL( confUserJoined( const TQString &, const TQString & ) ) ); + TQObject::connect( d->conferenceTask, TQ_SIGNAL( userLeft( const TQString &, const TQString & ) ), + TQ_SIGNAL( confUserLeft( const TQString &, const TQString & ) ) ); + TQObject::connect( d->conferenceTask, TQ_SIGNAL( userDeclined( const TQString &, const TQString &, const TQString & ) ), + TQ_SIGNAL( confUserDeclined( const TQString &, const TQString &, const TQString & ) ) ); d->yabTask = new YABTask( d->root ); - TQObject::connect( d->yabTask, TQT_SIGNAL( gotEntry( YABEntry * ) ), - TQT_SIGNAL( gotYABEntry( YABEntry * ) ) ); - TQObject::connect( d->yabTask, TQT_SIGNAL( gotRevision( long, bool ) ), - TQT_SIGNAL( gotYABRevision( long, bool ) ) ); + TQObject::connect( d->yabTask, TQ_SIGNAL( gotEntry( YABEntry * ) ), + TQ_SIGNAL( gotYABEntry( YABEntry * ) ) ); + TQObject::connect( d->yabTask, TQ_SIGNAL( gotRevision( long, bool ) ), + TQ_SIGNAL( gotYABRevision( long, bool ) ) ); d->fileTransferTask = new FileTransferNotifierTask( d->root ); - TQObject::connect( d->fileTransferTask, TQT_SIGNAL(incomingFileTransfer( const TQString &, const TQString &, + TQObject::connect( d->fileTransferTask, TQ_SIGNAL(incomingFileTransfer( const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap & )), - TQT_SIGNAL(incomingFileTransfer( const TQString &, const TQString &, + TQ_SIGNAL(incomingFileTransfer( const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap & )) ); d->yahooChatTask = new YahooChatTask( d->root ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), - TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )) ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), - TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ), - TQT_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ) ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool ) ), - TQT_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool ) ) ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString) ), - TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString) ) ); - TQObject::connect( d->yahooChatTask, TQT_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ), - TQT_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), + TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), + TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ), + TQ_SIGNAL(chatRoomJoined( int , int , const TQString &, const TQString & ) ) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool ) ), + TQ_SIGNAL(chatBuddyHasJoined( const TQString &, const TQString &, bool ) ) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString) ), + TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString) ) ); + TQObject::connect( d->yahooChatTask, TQ_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ), + TQ_SIGNAL(chatMessageReceived( const TQString &, const TQString &, const TQString & ) ) ); } void Client::deleteTasks() diff --git a/kopete/protocols/yahoo/libkyahoo/logintask.cpp b/kopete/protocols/yahoo/libkyahoo/logintask.cpp index 7e853fec..2b28f986 100644 --- a/kopete/protocols/yahoo/libkyahoo/logintask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/logintask.cpp @@ -215,10 +215,10 @@ void LoginTask::sendAuthSixteenStage1(const TQString& sn, const TQString& seed) TQString fullUrl = YahooTokenUrl.arg(sn, client()->password(), seed); KURL tokenUrl(fullUrl); TDEIO::Job* job = TDEIO::get(tokenUrl, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(handleAuthSixteenStage1Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(handleAuthSixteenStage1Result(TDEIO::Job*))); } void LoginTask::handleAuthSixteenStage1Data(TDEIO::Job* job, const TQByteArray& data) @@ -295,10 +295,10 @@ void LoginTask::sendAuthSixteenStage2(const TQString& token) TQString fullUrl = YahooLoginUrl.arg(token); KURL loginUrl(fullUrl); TDEIO::Job* job = TDEIO::get(loginUrl, true, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - this, TQT_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&))); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + this, TQ_SLOT(handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(handleAuthSixteenStage2Result(TDEIO::Job*))); } void LoginTask::handleAuthSixteenStage2Data(TDEIO::Job*, const TQByteArray& data) diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index b81d5b29..e8b3ff09 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -46,8 +46,8 @@ void ModifyYABTask::onGo() { kdDebug(YAHOO_RAW_DEBUG) ; m_socket = new TDEBufferedSocket( "address.yahoo.com", TQString::number(80) ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); m_socket->connect(); } @@ -123,7 +123,7 @@ void ModifyYABTask::connectSucceeded() return; } - connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); } void ModifyYABTask::slotRead() diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index d56666cd..7572ede8 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -58,8 +58,8 @@ void ReceiveFileTask::onGo() return; } m_transferJob = TDEIO::get( m_remoteUrl, false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); delete t; break; case FileTransfer7Accept: @@ -196,8 +196,8 @@ void ReceiveFileTask::parseFileTransfer7Info( YMSGTransfer *transfer ) m_transferJob = TDEIO::get( TQString::fromLatin1("http://%1/relay?token=%2&sender=%3&recver=%4") .arg( TQString(transfer->firstParam( 250 )) ).arg( TQString(transfer->firstParam( 251 )) ).arg(m_userId).arg(client()->userId()), false, false ); - TQObject::connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - TQObject::connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + TQObject::connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: T=%1; path=/; domain=.yahoo.com; Y=%2; path=/; domain=.yahoo.com;") .arg(client()->tCookie()).arg(client()->yCookie()) ); diff --git a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp index 714b0960..1820e95f 100644 --- a/kopete/protocols/yahoo/libkyahoo/safedelete.cpp +++ b/kopete/protocols/yahoo/libkyahoo/safedelete.cpp @@ -111,7 +111,7 @@ SafeDeleteLater::SafeDeleteLater() { list.setAutoDelete(true); self = this; - TQTimer::singleShot(0, this, TQT_SLOT(explode())); + TQTimer::singleShot(0, this, TQ_SLOT(explode())); } SafeDeleteLater::~SafeDeleteLater() diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index e50f420a..6b54f789 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -177,8 +177,8 @@ void SendFileTask::parseTransferAccept(const Transfer *transfer) m_socket = new KStreamSocket( m_relayHost, TQString::number(80) ); m_socket->setBlocking( true ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); m_socket->connect(); @@ -232,7 +232,7 @@ void SendFileTask::connectSucceeded() } else { - connect( m_socket, TQT_SIGNAL(readyWrite()), this, TQT_SLOT(transmitData()) ); + connect( m_socket, TQ_SIGNAL(readyWrite()), this, TQ_SLOT(transmitData()) ); m_socket->enableWrite( true ); } } diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 2fcc1d7e..fb8e13b7 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -65,9 +65,9 @@ void SendPictureTask::initiateUpload() { kdDebug(YAHOO_GEN_DEBUG) << k_funcinfo << endl; m_socket = new TDEBufferedSocket( "filetransfer.msg.yahoo.com", TQString::number(80) ); - connect( m_socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( connectSucceeded() ) ); - connect( m_socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( connectFailed(int) ) ); - connect( m_socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( readResult() ) ); + connect( m_socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( connectSucceeded() ) ); + connect( m_socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( connectFailed(int) ) ); + connect( m_socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( readResult() ) ); m_socket->connect(); } diff --git a/kopete/protocols/yahoo/libkyahoo/task.cpp b/kopete/protocols/yahoo/libkyahoo/task.cpp index 9ae7861b..8efeb924 100644 --- a/kopete/protocols/yahoo/libkyahoo/task.cpp +++ b/kopete/protocols/yahoo/libkyahoo/task.cpp @@ -47,7 +47,7 @@ Task::Task(Task *parent) d->transfer = 0; d->client = parent->client(); //d->id = client()->genUniqueId(); - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::Task(Client *parent, bool) @@ -56,7 +56,7 @@ Task::Task(Client *parent, bool) init(); d->client = parent; - connect(d->client, TQT_SIGNAL(disconnected()), TQT_SLOT(clientDisconnected())); + connect(d->client, TQ_SIGNAL(disconnected()), TQ_SLOT(clientDisconnected())); } Task::~Task() @@ -172,7 +172,7 @@ void Task::onDisconnect() d->statusString = tr("Disconnected"); // delay this so that tasks that react don't block the shutdown - TQTimer::singleShot(0, this, TQT_SLOT(done())); + TQTimer::singleShot(0, this, TQ_SLOT(done())); } } diff --git a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp index efcd63cf..31a5b99f 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/clientstream_test.cpp @@ -13,12 +13,12 @@ ClientStreamTest::ClientStreamTest(int argc, char ** argv) : TQApplication( argc myConnector->setOptHostPort( "scs.msg.yahoo.com", 5050 ); myTestObject = new ClientStream( myConnector, myConnector); // notify when the transport layer is connected - connect( myTestObject, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myTestObject, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); // notify and start sending - //connect( myTestObject, TQT_SIGNAL( warning(int) ), TQT_SLOT( slotWarning(int) ) ); + //connect( myTestObject, TQ_SIGNAL( warning(int) ), TQ_SLOT( slotWarning(int) ) ); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } diff --git a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp index 5e9b04a5..8bd11f64 100644 --- a/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp +++ b/kopete/protocols/yahoo/libkyahoo/tests/logintest.cpp @@ -33,7 +33,7 @@ LoginTest::LoginTest(int argc, char ** argv) : TQApplication( argc, argv ) // notify when the transport layer is connected myClient = new Client(); // do test once the event loop is running - TQTimer::singleShot( 0, this, TQT_SLOT( slotDoTest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotDoTest() ) ); connected = false; } @@ -50,7 +50,7 @@ void LoginTest::slotDoTest() // connect to server kdDebug(14180) << k_funcinfo << " connecting to server" << endl; - connect( myClient, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnected() ) ); + connect( myClient, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnected() ) ); myClient->start( server, 5050, "duncanmacvicar", "**********" ); myClient->connectToServer( myClientStream, server, true ); } diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index abfab0dc..b4c74f89 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -111,9 +111,9 @@ void WebcamTask::parseWebcamInformation( YMSGTransfer *t ) KStreamSocket *socket = new KStreamSocket( info.server, TQString::number(5100) ); socketMap[socket] = info; socket->enableRead( true ); - connect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage1Established() ) ); - connect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); - connect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage1Established() ) ); + connect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); + connect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); socket->connect(); } @@ -124,8 +124,8 @@ void WebcamTask::slotConnectionStage1Established() if( !socket ) return; kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection Stage1 to the user " << socketMap[socket].sender << " established." << endl; - disconnect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage1Established() ) ); - disconnect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); + disconnect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage1Established() ) ); + disconnect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); socketMap[socket].status = ConnectedStage1; @@ -157,8 +157,8 @@ void WebcamTask::slotConnectionStage2Established() return; kdDebug(YAHOO_RAW_DEBUG) << "Webcam connection Stage2 to the user " << socketMap[socket].sender << " established." << endl; - disconnect( socket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage2Established() ) ); - disconnect( socket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); + disconnect( socket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage2Established() ) ); + disconnect( socket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); socketMap[socket].status = ConnectedStage2; TQByteArray buffer; @@ -211,7 +211,7 @@ void WebcamTask::slotRead() switch( socketMap[socket].status ) { case ConnectedStage1: - disconnect( socket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + disconnect( socket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); connectStage2( socket ); break; case ConnectedStage2: @@ -255,13 +255,13 @@ void WebcamTask::connectStage2( KStreamSocket *socket ) newSocket = new KStreamSocket( server, TQString::number(5100) ); socketMap[newSocket] = socketMap[socket]; newSocket->enableRead( true ); - connect( newSocket, TQT_SIGNAL( connected( const KResolverEntry& ) ), this, TQT_SLOT( slotConnectionStage2Established() ) ); - connect( newSocket, TQT_SIGNAL( gotError(int) ), this, TQT_SLOT( slotConnectionFailed(int) ) ); - connect( newSocket, TQT_SIGNAL( readyRead() ), this, TQT_SLOT( slotRead() ) ); + connect( newSocket, TQ_SIGNAL( connected( const KResolverEntry& ) ), this, TQ_SLOT( slotConnectionStage2Established() ) ); + connect( newSocket, TQ_SIGNAL( gotError(int) ), this, TQ_SLOT( slotConnectionFailed(int) ) ); + connect( newSocket, TQ_SIGNAL( readyRead() ), this, TQ_SLOT( slotRead() ) ); if( socketMap[newSocket].direction == Outgoing ) { newSocket->enableWrite( true ); - connect( newSocket, TQT_SIGNAL( readyWrite() ), this, TQT_SLOT( transmitWebcamImage() ) ); + connect( newSocket, TQ_SIGNAL( readyWrite() ), this, TQ_SLOT( transmitWebcamImage() ) ); } newSocket->connect(); @@ -635,7 +635,7 @@ void WebcamTask::sendEmptyWebcamImage() pictureBuffer.resize( 0 ); transmissionPending = true; - TQTimer::singleShot( 1000, this, TQT_SLOT(sendEmptyWebcamImage()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(sendEmptyWebcamImage()) ); } diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index c48a2549..d5b4eaa2 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -101,8 +101,8 @@ void YABTask::getAllEntries( long lastMerge, long lastRemoteRevision ) m_transferJob->addMetaData("cookies", "manual"); m_transferJob->addMetaData("setcookies", TQString::fromLatin1("Cookie: Y=%1; T=%2; C=%3;") .arg(client()->yCookie()).arg(client()->tCookie()).arg(client()->cCookie()) ); - connect( m_transferJob, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); - connect( m_transferJob, TQT_SIGNAL( result( TDEIO::Job *) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) ); + connect( m_transferJob, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) ); + connect( m_transferJob, TQ_SIGNAL( result( TDEIO::Job *) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) ); } void YABTask::slotData( TDEIO::Job* /*job*/, const TQByteArray &info ) diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 569a4e45..1dc3f84c 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -49,8 +49,8 @@ void YahooBuddyIconLoader::fetchBuddyIcon( const TQString &who, KURL url, int ch ext = ext.right( ext.length() - ext.findRev( "." ) ); transfer = TDEIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[transfer].url = url; m_jobs[transfer].who = who; diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp index d49ea2ff..6dccf375 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobytestream.cpp @@ -36,11 +36,11 @@ KNetworkByteStream::KNetworkByteStream( TQObject *parent ) mSocket->enableRead( true ); // connect signals and slots - TQObject::connect( mSocket, TQT_SIGNAL ( gotError ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQT_SLOT ( slotConnected () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( closed () ), this, TQT_SLOT ( slotConnectionClosed () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( readyRead () ), this, TQT_SLOT ( slotReadyRead () ) ); - TQObject::connect( mSocket, TQT_SIGNAL ( bytesWritten ( int ) ), this, TQT_SLOT ( slotBytesWritten ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( gotError ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( connected ( const KResolverEntry& ) ), this, TQ_SLOT ( slotConnected () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( closed () ), this, TQ_SLOT ( slotConnectionClosed () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( readyRead () ), this, TQ_SLOT ( slotReadyRead () ) ); + TQObject::connect( mSocket, TQ_SIGNAL ( bytesWritten ( int ) ), this, TQ_SLOT ( slotBytesWritten ( int ) ) ); } bool KNetworkByteStream::connect( TQString host, TQString service ) diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 9e5d7cd1..210ed95d 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -98,8 +98,8 @@ void YahooChatTask::getYahooChatCategories() transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotCategoriesComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) @@ -114,8 +114,8 @@ void YahooChatTask::getYahooChatRooms( const Yahoo::ChatCategory &category ) transfer->addMetaData("setcookies", TQString("Cookie: %1; %2; %3").arg(client()->tCookie(), client()->yCookie()) ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotChatRoomsComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); m_jobs[ transfer ].category = category; } diff --git a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp index c5427d3e..8ef1b642 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooclientstream.cpp @@ -109,13 +109,13 @@ ClientStream::ClientStream(Connector *conn, TQObject *parent) d->mode = Client; d->conn = conn; - connect( d->conn, TQT_SIGNAL(connected()), TQT_SLOT(cr_connected()) ); - connect( d->conn, TQT_SIGNAL(error()), TQT_SLOT(cr_error()) ); - connect( &d->client, TQT_SIGNAL( outgoingData( const TQByteArray& ) ), TQT_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); - connect( &d->client, TQT_SIGNAL( incomingData() ), TQT_SLOT ( cp_incomingData() ) ); + connect( d->conn, TQ_SIGNAL(connected()), TQ_SLOT(cr_connected()) ); + connect( d->conn, TQ_SIGNAL(error()), TQ_SLOT(cr_error()) ); + connect( &d->client, TQ_SIGNAL( outgoingData( const TQByteArray& ) ), TQ_SLOT ( cp_outgoingData( const TQByteArray & ) ) ); + connect( &d->client, TQ_SIGNAL( incomingData() ), TQ_SLOT ( cp_incomingData() ) ); d->noop_time = 0; - connect(&d->noopTimer, TQT_SIGNAL(timeout()), TQT_SLOT(doNoop())); + connect(&d->noopTimer, TQ_SIGNAL(timeout()), TQ_SLOT(doNoop())); } ClientStream::~ClientStream() @@ -327,11 +327,11 @@ void ClientStream::cr_connected() kdDebug(YAHOO_RAW_DEBUG) ; d->bs = d->conn->stream(); - connect(d->bs, TQT_SIGNAL(connectionClosed()), TQT_SLOT(bs_connectionClosed())); - connect(d->bs, TQT_SIGNAL(delayedCloseFinished()), TQT_SLOT(bs_delayedCloseFinished())); - connect(d->bs, TQT_SIGNAL(readyRead()), TQT_SLOT(bs_readyRead())); - connect(d->bs, TQT_SIGNAL(bytesWritten(int)), TQT_SLOT(bs_bytesWritten(int))); - connect(d->bs, TQT_SIGNAL(error(int)), TQT_SLOT(bs_error(int))); + connect(d->bs, TQ_SIGNAL(connectionClosed()), TQ_SLOT(bs_connectionClosed())); + connect(d->bs, TQ_SIGNAL(delayedCloseFinished()), TQ_SLOT(bs_delayedCloseFinished())); + connect(d->bs, TQ_SIGNAL(readyRead()), TQ_SLOT(bs_readyRead())); + connect(d->bs, TQ_SIGNAL(bytesWritten(int)), TQ_SLOT(bs_bytesWritten(int))); + connect(d->bs, TQ_SIGNAL(error(int)), TQ_SLOT(bs_error(int))); TQByteArray spare = d->bs->read(); @@ -399,7 +399,7 @@ void ClientStream::processNext() { if( !d->in.isEmpty() ) { - TQTimer::singleShot(0, this, TQT_SLOT(doReadyRead())); + TQTimer::singleShot(0, this, TQ_SLOT(doReadyRead())); } } diff --git a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp index 43061f61..5200bad6 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahooconnector.cpp @@ -34,8 +34,8 @@ KNetworkConnector::KNetworkConnector( TQObject *parent ) mByteStream = new KNetworkByteStream( this ); - connect( mByteStream, TQT_SIGNAL ( connected () ), this, TQT_SLOT ( slotConnected () ) ); - connect( mByteStream, TQT_SIGNAL ( error ( int ) ), this, TQT_SLOT ( slotError ( int ) ) ); + connect( mByteStream, TQ_SIGNAL ( connected () ), this, TQ_SLOT ( slotConnected () ) ); + connect( mByteStream, TQ_SIGNAL ( error ( int ) ), this, TQ_SLOT ( slotError ( int ) ) ); mPort = 5510; } diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index de4687ec..aa9b4bcf 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -66,7 +66,7 @@ YahooUserInfoDialog::YahooUserInfoDialog( YahooContact *c, TQWidget * parent, co m_otherInfoWidget = new YahooOtherInfoWidget( otherInfo, "Other Information" ); otherLayout->addWidget( m_otherInfoWidget ); - TQObject::connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotSaveAndCloseClicked())); + TQObject::connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotSaveAndCloseClicked())); } void YahooUserInfoDialog::setAccountConnected( bool isOnline ) diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index ce3d9536..4e585bba 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -34,7 +34,7 @@ YahooWebcamDialog::YahooWebcamDialog( const TQString &contactId, TQWidget * pare setInitialSize( TQSize(320,290), false ); setEscapeButton( KDialogBase::Close ); - TQObject::connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SIGNAL( closingWebcamDialog() ) ); + TQObject::connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SIGNAL( closingWebcamDialog() ) ); contactName = contactId; TQWidget *page = plainPage(); diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index f5c2e26b..28d73f06 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -83,21 +83,21 @@ YahooAccount::YahooAccount(YahooProtocol *parent, const TQString& accountId, con // FIXME //m_openInboxAction = new TDEAction( TDEIcon("mail-folder-inbox"), i18n( "Open Inbo&x..." ), this ); //, "m_openInboxAction" ); - //TQObject::connect(m_openInboxAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenInbox() ) ); + //TQObject::connect(m_openInboxAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotOpenInbox() ) ); //m_openYABAction = new TDEAction( TDEIcon("x-office-address-book"), i18n( "Open &Address book..." ), this ); //, "m_openYABAction" ); - //TQObject::connect(m_openYABAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotOpenYAB() ) ); + //TQObject::connect(m_openYABAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotOpenYAB() ) ); //m_editOwnYABEntry = new TDEAction( TDEIcon("document-properties"), i18n( "&Edit my contact details..."), this ); //, "m_editOwnYABEntry" ); - //TQObject::connect(m_editOwnYABEntry, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotEditOwnYABEntry() ) ); + //TQObject::connect(m_editOwnYABEntry, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotEditOwnYABEntry() ) ); //m_joinChatAction = new TDEAction( TDEIcon("im-chat-room-join"), i18n( "&Join chat room..."), this ); //, "m_joinChatAction" ); - //TQObject::connect(m_joinChatAction, TQT_SIGNAL( triggered(bool) ), this, TQT_SLOT( slotJoinChatRoom() ) ); + //TQObject::connect(m_joinChatAction, TQ_SIGNAL( triggered(bool) ), this, TQ_SLOT( slotJoinChatRoom() ) ); - m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQT_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); - m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQT_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); - m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQT_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); - m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQT_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); + m_openInboxAction = new TDEAction( i18n( "Open Inbo&x..." ), "mail_generic", 0, this, TQ_SLOT( slotOpenInbox() ), this, "m_openInboxAction" ); + m_openYABAction = new TDEAction( i18n( "Open &Addressbook..." ), "contents", 0, this, TQ_SLOT( slotOpenYAB() ), this, "m_openYABAction" ); + m_editOwnYABEntry = new TDEAction( i18n( "&Edit my contact details..."), "contents", 0, this, TQ_SLOT( slotEditOwnYABEntry() ), this, "m_editOwnYABEntry" ); + m_joinChatAction = new TDEAction( i18n( "&Join chat room..."), "contents", 0, this, TQ_SLOT( slotJoinChatRoom() ), this, "m_joinChatAction"); YahooContact* _myself=new YahooContact( this, accountId.lower(), accountId, Kopete::ContactList::self()->myself() ); setMyself( _myself ); @@ -229,290 +229,290 @@ void YahooAccount::initConnectionSignals( enum SignalConnectionType sct ) if ( sct == MakeConnections ) { - TQObject::connect(m_session, TQT_SIGNAL(loggedIn( int, const TQString &)), - this, TQT_SLOT(slotLoginResponse(int, const TQString &)) ); + TQObject::connect(m_session, TQ_SIGNAL(loggedIn( int, const TQString &)), + this, TQ_SLOT(slotLoginResponse(int, const TQString &)) ); - TQObject::connect(m_session, TQT_SIGNAL(disconnected()), - this, TQT_SLOT(slotDisconnected()) ); + TQObject::connect(m_session, TQ_SIGNAL(disconnected()), + this, TQ_SLOT(slotDisconnected()) ); - TQObject::connect(m_session, TQT_SIGNAL(loginFailed()), - this, TQT_SLOT(slotLoginFailed()) ); + TQObject::connect(m_session, TQ_SIGNAL(loginFailed()), + this, TQ_SLOT(slotLoginFailed()) ); - TQObject::connect(m_session, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); + TQObject::connect(m_session, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); - TQObject::connect(m_session, TQT_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); + TQObject::connect(m_session, TQ_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); - TQObject::connect(m_session, TQT_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); + TQObject::connect(m_session, TQ_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); - TQObject::connect(m_session, TQT_SIGNAL(authorizationAccepted( const TQString & )), - this, TQT_SLOT(slotAuthorizationAccepted( const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(authorizationAccepted( const TQString & )), + this, TQ_SLOT(slotAuthorizationAccepted( const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(authorizationRejected( const TQString &, const TQString & )), - this, TQT_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(authorizationRejected( const TQString &, const TQString & )), + this, TQ_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), - this, TQT_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); + TQObject::connect(m_session, TQ_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), + this, TQ_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); - TQObject::connect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), - this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); + TQObject::connect(m_session, TQ_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), + this, TQ_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::connect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::connect(m_session, TQ_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQ_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); - TQObject::connect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), - this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); + TQObject::connect(m_session, TQ_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), + this, TQ_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); - TQObject::connect(m_session, TQT_SIGNAL(gotBuzz(const TQString&, long)), - this, TQT_SLOT(slotGotBuzz(const TQString &, long))); + TQObject::connect(m_session, TQ_SIGNAL(gotBuzz(const TQString&, long)), + this, TQ_SLOT(slotGotBuzz(const TQString &, long))); - TQObject::connect(m_session, TQT_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, + TQObject::connect(m_session, TQ_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ), this, - TQT_SLOT( slotGotConfInvite( const TQString&, const TQString&, + TQ_SLOT( slotGotConfInvite( const TQString&, const TQString&, const TQString&, const TQStringList& ) ) ); - TQObject::connect(m_session, TQT_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), + TQObject::connect(m_session, TQ_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString &)) ); + TQ_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(confUserJoined( const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(confUserJoined( const TQString &, const TQString &)), this, + TQ_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(confUserLeft( const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(confUserLeft( const TQString &, const TQString &)), this, + TQ_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); - TQObject::connect(m_session , TQT_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); + TQObject::connect(m_session , TQ_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, + TQ_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); TQObject::connect(m_session, - TQT_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), + TQ_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), this, - TQT_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); + TQ_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferComplete(unsigned int)), this, - TQT_SLOT(slotFileTransferComplete(unsigned int)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferComplete(unsigned int)), this, + TQ_SLOT(slotFileTransferComplete(unsigned int)) ); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, - TQT_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, + TQ_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); - TQObject::connect(m_session, TQT_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, - TQT_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); + TQObject::connect(m_session, TQ_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, + TQ_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); - TQObject::connect(m_session, TQT_SIGNAL(typingNotify(const TQString &, int)), this , - TQT_SLOT(slotTypingNotify(const TQString &, int))); + TQObject::connect(m_session, TQ_SIGNAL(typingNotify(const TQString &, int)), this , + TQ_SLOT(slotTypingNotify(const TQString &, int))); -// TQObject::connect(m_session, TQT_SIGNAL(gameNotify(const TQString &, int)), this, -// TQT_SLOT(slotGameNotify( const TQString &, int))); +// TQObject::connect(m_session, TQ_SIGNAL(gameNotify(const TQString &, int)), this, +// TQ_SLOT(slotGameNotify( const TQString &, int))); - TQObject::connect(m_session, TQT_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, - TQT_SLOT(slotMailNotify(const TQString &, const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, + TQ_SLOT(slotMailNotify(const TQString &, const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(systemMessage(const TQString&)), this, - TQT_SLOT(slotSystemMessage(const TQString &))); + TQObject::connect(m_session, TQ_SIGNAL(systemMessage(const TQString&)), this, + TQ_SLOT(slotSystemMessage(const TQString &))); -// TQObject::connect(m_session, TQT_SIGNAL(gotIdentities(const TQStringList &)), this, -// TQT_SLOT(slotGotIdentities( const TQStringList&))); +// TQObject::connect(m_session, TQ_SIGNAL(gotIdentities(const TQStringList &)), this, +// TQ_SLOT(slotGotIdentities( const TQStringList&))); - TQObject::connect(m_session, TQT_SIGNAL(gotWebcamInvite(const TQString&)), this, TQT_SLOT(slotGotWebcamInvite(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(gotWebcamInvite(const TQString&)), this, TQ_SLOT(slotGotWebcamInvite(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamNotAvailable(const TQString&)), this, TQT_SLOT(slotWebcamNotAvailable(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamNotAvailable(const TQString&)), this, TQ_SLOT(slotWebcamNotAvailable(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQT_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); + TQObject::connect(m_session, TQ_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQ_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); - TQObject::connect(m_session, TQT_SIGNAL(webcamClosed(const TQString&, int )), this, TQT_SLOT(slotWebcamClosed(const TQString&, int ))); + TQObject::connect(m_session, TQ_SIGNAL(webcamClosed(const TQString&, int )), this, TQ_SLOT(slotWebcamClosed(const TQString&, int ))); - TQObject::connect(m_session, TQT_SIGNAL(webcamPaused(const TQString&)), this, TQT_SLOT(slotWebcamPaused(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamPaused(const TQString&)), this, TQ_SLOT(slotWebcamPaused(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamReadyForTransmission()), this, TQT_SLOT(slotWebcamReadyForTransmission())); + TQObject::connect(m_session, TQ_SIGNAL(webcamReadyForTransmission()), this, TQ_SLOT(slotWebcamReadyForTransmission())); - TQObject::connect(m_session, TQT_SIGNAL(webcamStopTransmission()), this, TQT_SLOT(slotWebcamStopTransmission())); + TQObject::connect(m_session, TQ_SIGNAL(webcamStopTransmission()), this, TQ_SLOT(slotWebcamStopTransmission())); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerJoined(const TQString&)), this, TQT_SLOT(slotWebcamViewerJoined(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerJoined(const TQString&)), this, TQ_SLOT(slotWebcamViewerJoined(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerLeft(const TQString&)), this, TQT_SLOT(slotWebcamViewerLeft(const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerLeft(const TQString&)), this, TQ_SLOT(slotWebcamViewerLeft(const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(webcamViewerRequest(const TQString&)), this, TQT_SLOT(slotWebcamViewerRequest( const TQString&))); + TQObject::connect(m_session, TQ_SIGNAL(webcamViewerRequest(const TQString&)), this, TQ_SLOT(slotWebcamViewerRequest( const TQString&))); - TQObject::connect(m_session, TQT_SIGNAL(pictureStatusNotify( const TQString&, int )), TQT_SLOT(slotPictureStatusNotify( const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(pictureStatusNotify( const TQString&, int )), TQ_SLOT(slotPictureStatusNotify( const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int)), this, TQT_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &, int)) ); + TQObject::connect(m_session, TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int)), this, TQ_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &, int)) ); - TQObject::connect(m_session, TQT_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQT_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); + TQObject::connect(m_session, TQ_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQ_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); - TQObject::connect(m_session, TQT_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQT_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); + TQObject::connect(m_session, TQ_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQ_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); - TQObject::connect(m_session, TQT_SIGNAL(pictureRequest(const TQString&)), this, TQT_SLOT(slotGotBuddyIconRequest(const TQString&)) ); + TQObject::connect(m_session, TQ_SIGNAL(pictureRequest(const TQString&)), this, TQ_SLOT(slotGotBuddyIconRequest(const TQString&)) ); - TQObject::connect(m_session, TQT_SIGNAL(pictureUploaded( const TQString &, int)), this, TQT_SLOT(slotBuddyIconChanged(const TQString&, int))); + TQObject::connect(m_session, TQ_SIGNAL(pictureUploaded( const TQString &, int)), this, TQ_SLOT(slotBuddyIconChanged(const TQString&, int))); - TQObject::connect(m_session, TQT_SIGNAL(gotYABEntry( YABEntry * )), this, TQT_SLOT(slotGotYABEntry( YABEntry * ))); + TQObject::connect(m_session, TQ_SIGNAL(gotYABEntry( YABEntry * )), this, TQ_SLOT(slotGotYABEntry( YABEntry * ))); - TQObject::connect(m_session, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQT_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::connect(m_session, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQ_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); - TQObject::connect(m_session, TQT_SIGNAL(gotYABRevision( long, bool )), this, TQT_SLOT(slotGotYABRevision( long , bool )) ); + TQObject::connect(m_session, TQ_SIGNAL(gotYABRevision( long, bool )), this, TQ_SLOT(slotGotYABRevision( long , bool )) ); - TQObject::connect(m_session, TQT_SIGNAL(chatRoomJoined(int,int,TQString,TQString)), this, TQT_SLOT(slotChatJoined(int,int,TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatRoomJoined(int,int,TQString,TQString)), this, TQ_SLOT(slotChatJoined(int,int,TQString,TQString))); - TQObject::connect(m_session, TQT_SIGNAL(chatBuddyHasJoined(TQString,TQString,bool)), this, TQT_SLOT(slotChatBuddyHasJoined(TQString,TQString,bool))); + TQObject::connect(m_session, TQ_SIGNAL(chatBuddyHasJoined(TQString,TQString,bool)), this, TQ_SLOT(slotChatBuddyHasJoined(TQString,TQString,bool))); - TQObject::connect(m_session, TQT_SIGNAL(chatBuddyHasLeft(TQString,TQString)), this, TQT_SLOT(slotChatBuddyHasLeft(TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatBuddyHasLeft(TQString,TQString)), this, TQ_SLOT(slotChatBuddyHasLeft(TQString,TQString))); - TQObject::connect(m_session, TQT_SIGNAL(chatMessageReceived(TQString,TQString,TQString)), this, TQT_SLOT(slotChatMessageReceived(TQString,TQString,TQString))); + TQObject::connect(m_session, TQ_SIGNAL(chatMessageReceived(TQString,TQString,TQString)), this, TQ_SLOT(slotChatMessageReceived(TQString,TQString,TQString))); } if ( sct == DeleteConnections ) { - TQObject::disconnect(m_session, TQT_SIGNAL(loggedIn(int, const TQString &)), - this, TQT_SLOT(slotLoginResponse(int, const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(loggedIn(int, const TQString &)), + this, TQ_SLOT(slotLoginResponse(int, const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(disconnected()), - this, TQT_SLOT(slotDisconnected()) ); + TQObject::disconnect(m_session, TQ_SIGNAL(disconnected()), + this, TQ_SLOT(slotDisconnected()) ); - TQObject::disconnect(m_session, TQT_SIGNAL(loginFailed()), - this, TQT_SLOT(slotLoginFailed()) ); + TQObject::disconnect(m_session, TQ_SIGNAL(loginFailed()), + this, TQ_SLOT(slotLoginFailed()) ); - TQObject::disconnect(m_session, TQT_SIGNAL(error(int)), - this, TQT_SLOT(slotError(int))); + TQObject::disconnect(m_session, TQ_SIGNAL(error(int)), + this, TQ_SLOT(slotError(int))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), - this, TQT_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotBuddy(const TQString &, const TQString &, const TQString &)), + this, TQ_SLOT(slotGotBuddy(const TQString &, const TQString &, const TQString &))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyAddResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyAddResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyRemoveResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyRemoveResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), - this, TQT_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(buddyChangeGroupResult(const TQString &, const TQString &, bool)), + this, TQ_SLOT(slotBuddyChangeGroupResult(const TQString &, const TQString &, bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(authorizationAccepted( const TQString &)), - this, TQT_SLOT(slotAuthorizationAccepted( const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(authorizationAccepted( const TQString &)), + this, TQ_SLOT(slotAuthorizationAccepted( const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(authorizationRejected( const TQString &, const TQString &)), - this, TQT_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(authorizationRejected( const TQString &, const TQString &)), + this, TQ_SLOT(slotAuthorizationRejected( const TQString &, const TQString & )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), - this, TQT_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(gotAuthorizationRequest( const TQString &, const TQString &, const TQString & )), + this, TQ_SLOT(slotgotAuthorizationRequest( const TQString &, const TQString &, const TQString & )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), - this, TQT_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); + TQObject::disconnect(m_session, TQ_SIGNAL(statusChanged(const TQString&,int,const TQString&,int,int,int)), + this, TQ_SLOT(slotStatusChanged(const TQString&,int,const TQString&,int,int,int))); - TQObject::disconnect(m_session, TQT_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), - this, TQT_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(stealthStatusChanged(const TQString &, Yahoo::StealthStatus)), + this, TQ_SLOT(slotStealthStatusChanged( const TQString &, Yahoo::StealthStatus)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), - this, TQT_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotIm(const TQString&, const TQString&, long, int)), + this, TQ_SLOT(slotGotIm(const TQString &, const TQString&, long, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotBuzz(const TQString&, long)), - this, TQT_SLOT(slotGotBuzz(const TQString &, long))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotBuzz(const TQString&, long)), + this, TQ_SLOT(slotGotBuzz(const TQString &, long))); TQObject::disconnect(m_session, - TQT_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, + TQ_SIGNAL( gotConferenceInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ), this, - TQT_SLOT( slotGotConfInvite( const TQString&, const TQString&, + TQ_SLOT( slotGotConfInvite( const TQString&, const TQString&, const TQString&, const TQStringList&) ) ); TQObject::disconnect(m_session, - TQT_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), + TQ_SIGNAL(confUserDeclined(const TQString&, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString& ) ) ); + TQ_SLOT(slotConfUserDecline( const TQString &, const TQString &, const TQString& ) ) ); - TQObject::disconnect(m_session , TQT_SIGNAL(confUserJoined( const TQString &, const TQString &)), - this, TQT_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(confUserJoined( const TQString &, const TQString &)), + this, TQ_SLOT(slotConfUserJoin( const TQString &, const TQString &)) ); - TQObject::disconnect(m_session , TQT_SIGNAL(confUserLeft( const TQString &, const TQString &)), - this, TQT_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(confUserLeft( const TQString &, const TQString &)), + this, TQ_SLOT(slotConfUserLeave( const TQString &, const TQString &)) ); - TQObject::disconnect(m_session , TQT_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, - TQT_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); + TQObject::disconnect(m_session , TQ_SIGNAL(gotConferenceMessage( const TQString &, const TQString &, const TQString &)), this, + TQ_SLOT(slotConfMessage( const TQString &, const TQString &, const TQString &)) ); TQObject::disconnect(m_session, - TQT_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, + TQ_SIGNAL(incomingFileTransfer(const TQString &, const TQString &, long, const TQString &, const TQString &, unsigned long, const TQPixmap &)), this, - TQT_SLOT(slotGotFile(const TQString&, const TQString&, + TQ_SLOT(slotGotFile(const TQString&, const TQString&, long, const TQString&, const TQString&, unsigned long, const TQPixmap &))); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferComplete(unsigned int)), this, - TQT_SLOT(slotFileTransferComplete(unsigned int)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferComplete(unsigned int)), this, + TQ_SLOT(slotFileTransferComplete(unsigned int)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, - TQT_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferBytesProcessed(unsigned int,unsigned int)), this, + TQ_SLOT(slotFileTransferBytesProcessed(unsigned int,unsigned int)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, - TQT_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(fileTransferError(unsigned int,int,const TQString &)), this, + TQ_SLOT(slotFileTransferError(unsigned int,int,const TQString &)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(typingNotify(const TQString &, int)), this , - TQT_SLOT(slotTypingNotify(const TQString &, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(typingNotify(const TQString &, int)), this , + TQ_SLOT(slotTypingNotify(const TQString &, int))); -// TQObject::disconnect(m_session, TQT_SIGNAL(gameNotify(const TQString &, int)), this, -// TQT_SLOT(slotGameNotify( const TQString &, int))); +// TQObject::disconnect(m_session, TQ_SIGNAL(gameNotify(const TQString &, int)), this, +// TQ_SLOT(slotGameNotify( const TQString &, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, - TQT_SLOT(slotMailNotify(const TQString &, const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(mailNotify(const TQString&, const TQString&, int)), this, + TQ_SLOT(slotMailNotify(const TQString &, const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(systemMessage(const TQString&)), this, - TQT_SLOT(slotSystemMessage(const TQString &))); + TQObject::disconnect(m_session, TQ_SIGNAL(systemMessage(const TQString&)), this, + TQ_SLOT(slotSystemMessage(const TQString &))); -// TQObject::disconnect(m_session, TQT_SIGNAL(gotIdentities(const TQStringList &)), this, -// TQT_SLOT(slotGotIdentities( const TQStringList&))); +// TQObject::disconnect(m_session, TQ_SIGNAL(gotIdentities(const TQStringList &)), this, +// TQ_SLOT(slotGotIdentities( const TQStringList&))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotWebcamInvite(const TQString&)), this, TQT_SLOT(slotGotWebcamInvite(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotWebcamInvite(const TQString&)), this, TQ_SLOT(slotGotWebcamInvite(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamNotAvailable(const TQString&)), this, TQT_SLOT(slotWebcamNotAvailable(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamNotAvailable(const TQString&)), this, TQ_SLOT(slotWebcamNotAvailable(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQT_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamImageReceived(const TQString&, const TQPixmap& )), this, TQ_SLOT(slotGotWebcamImage(const TQString&, const TQPixmap& ))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamClosed(const TQString&, int )), this, TQT_SLOT(slotWebcamClosed(const TQString&, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamClosed(const TQString&, int )), this, TQ_SLOT(slotWebcamClosed(const TQString&, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamPaused(const TQString&)), this, TQT_SLOT(slotWebcamPaused(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamPaused(const TQString&)), this, TQ_SLOT(slotWebcamPaused(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamReadyForTransmission()), this, TQT_SLOT(slotWebcamReadyForTransmission())); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamReadyForTransmission()), this, TQ_SLOT(slotWebcamReadyForTransmission())); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamStopTransmission()), this, TQT_SLOT(slotWebcamStopTransmission())); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamStopTransmission()), this, TQ_SLOT(slotWebcamStopTransmission())); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerJoined(const TQString&)), this, TQT_SLOT(slotWebcamViewerJoined(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerJoined(const TQString&)), this, TQ_SLOT(slotWebcamViewerJoined(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerLeft(const TQString&)), this, TQT_SLOT(slotWebcamViewerLeft(const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerLeft(const TQString&)), this, TQ_SLOT(slotWebcamViewerLeft(const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(webcamViewerRequest(const TQString&)), this, TQT_SLOT(slotWebcamViewerRequest( const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(webcamViewerRequest(const TQString&)), this, TQ_SLOT(slotWebcamViewerRequest( const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int )), this, TQT_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &,int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureDownloaded(const TQString&, const TQByteArray &, int )), this, TQ_SLOT(slotGotBuddyIcon(const TQString&, const TQByteArray &,int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQT_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureInfoNotify(const TQString&, KURL, int)), this, TQ_SLOT(slotGotBuddyIconInfo(const TQString&, KURL, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureRequest(const TQString&)), this, TQT_SLOT(slotGotBuddyIconRequest(const TQString&)) ); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureRequest(const TQString&)), this, TQ_SLOT(slotGotBuddyIconRequest(const TQString&)) ); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureUploaded( const TQString &, int )), this, TQT_SLOT(slotBuddyIconChanged(const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureUploaded( const TQString &, int )), this, TQ_SLOT(slotBuddyIconChanged(const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureStatusNotify( const TQString&, int )), this, TQT_SLOT(slotPictureStatusNotify( const TQString&, int))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureStatusNotify( const TQString&, int )), this, TQ_SLOT(slotPictureStatusNotify( const TQString&, int))); - TQObject::disconnect(m_session, TQT_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQT_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); + TQObject::disconnect(m_session, TQ_SIGNAL(pictureChecksumNotify(const TQString&, int)), this, TQ_SLOT(slotGotBuddyIconChecksum(const TQString&, int ))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotYABEntry( YABEntry * )), this, TQT_SLOT(slotGotYABEntry( YABEntry * ))); + TQObject::disconnect(m_session, TQ_SIGNAL(gotYABEntry( YABEntry * )), this, TQ_SLOT(slotGotYABEntry( YABEntry * ))); - TQObject::disconnect(m_session, TQT_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQT_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); + TQObject::disconnect(m_session, TQ_SIGNAL(modifyYABEntryError( YABEntry *, const TQString & )), this, TQ_SLOT(slotModifyYABEntryError( YABEntry *, const TQString & ))); - TQObject::disconnect(m_session, TQT_SIGNAL(gotYABRevision( long, bool )), this, TQT_SLOT(slotGotYABRevision( long , bool )) ); + TQObject::disconnect(m_session, TQ_SIGNAL(gotYABRevision( long, bool )), this, TQ_SLOT(slotGotYABRevision( long , bool )) ); - TQObject::disconnect(m_session, TQT_SIGNAL(chatRoomJoined(int,int,const TQString&,const TQString&)), this, TQT_SLOT(slotChatJoined(int,int,const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatRoomJoined(int,int,const TQString&,const TQString&)), this, TQ_SLOT(slotChatJoined(int,int,const TQString&,const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatBuddyHasJoined(const TQString&,const TQString&,bool)), this, TQT_SLOT(slotChatBuddyHasJoined(const TQString&,const TQString&,bool))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatBuddyHasJoined(const TQString&,const TQString&,bool)), this, TQ_SLOT(slotChatBuddyHasJoined(const TQString&,const TQString&,bool))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatBuddyHasLeft(const TQString&,const TQString&)), this, TQT_SLOT(slotChatBuddyHasLeft(const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatBuddyHasLeft(const TQString&,const TQString&)), this, TQ_SLOT(slotChatBuddyHasLeft(const TQString&,const TQString&))); - TQObject::disconnect(m_session, TQT_SIGNAL(chatMessageReceived(const TQString&,const TQString&,const TQString&)), this, TQT_SLOT(slotChatMessageReceived(const TQString&,const TQString&,const TQString&))); + TQObject::disconnect(m_session, TQ_SIGNAL(chatMessageReceived(const TQString&,const TQString&,const TQString&)), this, TQ_SLOT(slotChatMessageReceived(const TQString&,const TQString&,const TQString&))); } } @@ -698,7 +698,7 @@ void YahooAccount::sendFile( YahooContact *to, const KURL &url ) url.fileName(), file.size(), to->userId(), Kopete::FileTransferInfo::Outgoing ); m_session->sendFile( transfer->info().transferId(), to->userId(), TQString(), url ); - TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); + TQObject::connect( transfer, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFileTransferResult( TDEIO::Job * )) ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); } @@ -921,8 +921,8 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt // actions |= Kopete::AddedInfoEvent::AddAction; //Kopete::AddedInfoEvent* event = new Kopete::AddedInfoEvent( user, this ); - //TQObject::connect( event, TQT_SIGNAL(actionActivated(uint)), - // this, TQT_SLOT(slotAddedInfoEventActionActivated(uint)) ); + //TQObject::connect( event, TQ_SIGNAL(actionActivated(uint)), + // this, TQ_SLOT(slotAddedInfoEventActionActivated(uint)) ); //event->showActions( actions ); //event->sendEvent(); @@ -933,8 +933,8 @@ void YahooAccount::slotgotAuthorizationRequest( const TQString &user, const TQSt Kopete::UI::ContactAddedNotifyDialog *dialog= new Kopete::UI::ContactAddedNotifyDialog( user,TQString(),this, hideFlags ); - TQObject::connect(dialog,TQT_SIGNAL(applyClicked(const TQString&)), - this,TQT_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); + TQObject::connect(dialog,TQ_SIGNAL(applyClicked(const TQString&)), + this,TQ_SLOT(slotContactAddedNotifyDialogClosed(const TQString& ))); dialog->show(); } @@ -1237,7 +1237,7 @@ void YahooAccount::slotGotConfInvite( const TQString & who, const TQString & roo YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others ); m_conferences[room] = session; - TQObject::connect( session, TQT_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQT_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); + TQObject::connect( session, TQ_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQ_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); for ( TQStringList::ConstIterator it = myMembers.constBegin(); it != myMembers.constEnd(); ++it ) { @@ -1287,8 +1287,8 @@ void YahooAccount::prepareConference( const TQString &who ) } YahooInviteListImpl *dlg = new YahooInviteListImpl( Kopete::UI::Global::mainWidget() ); - TQObject::connect( dlg, TQT_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), - this, TQT_SLOT( slotInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); + TQObject::connect( dlg, TQ_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), + this, TQ_SLOT( slotInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); dlg->setRoom( room ); dlg->fillFriendList( buddies ); dlg->addInvitees( TQStringList( who ) ); @@ -1305,7 +1305,7 @@ kdDebug(YAHOO_GEN_DEBUG) << "Inviting " << members << " to the conference " << r YahooConferenceChatSession *session = new YahooConferenceChatSession( room, protocol(), myself(), others ); m_conferences[room] = session; - TQObject::connect( session, TQT_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQT_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); + TQObject::connect( session, TQ_SIGNAL(leavingConference( YahooConferenceChatSession * ) ), this, TQ_SLOT( slotConfLeave( YahooConferenceChatSession * ) ) ); session->joined( static_cast< YahooContact *>(myself()) ); session->view( true )->raise( false ); @@ -1478,7 +1478,7 @@ void YahooAccount::slotGotYABEntry( YABEntry *entry ) dlg->setData( *entry ); dlg->setAccountConnected( isConnected() ); dlg->show(); - TQObject::connect( dlg, TQT_SIGNAL(saveYABEntry( YABEntry & )), this, TQT_SLOT(slotSaveYABEntry( YABEntry & ))); + TQObject::connect( dlg, TQ_SIGNAL(saveYABEntry( YABEntry & )), this, TQ_SLOT(slotSaveYABEntry( YABEntry & ))); delete entry; } } @@ -1511,10 +1511,10 @@ void YahooAccount::slotGotFile( const TQString & who, const TQString & url , l if( m_pendingFileTransfers.empty() ) { - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::connect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::connect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } m_pendingFileTransfers.append( url ); } @@ -1541,14 +1541,14 @@ void YahooAccount::slotReceiveFileAccepted(Kopete::Transfer *transfer, const TQS m_session->receiveFile( transfer->info().transferId(), transfer->info().contact()->contactId(), transfer->info().internalId(), fileName ); m_fileTransfers.insert( transfer->info().transferId(), transfer ); - TQObject::connect( transfer, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFileTransferResult( TDEIO::Job * )) ); + TQObject::connect( transfer, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotFileTransferResult( TDEIO::Job * )) ); if( m_pendingFileTransfers.empty() ) { - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } } @@ -1562,10 +1562,10 @@ void YahooAccount::slotReceiveFileRefused( const Kopete::FileTransferInfo& info if( m_pendingFileTransfers.empty() ) { - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), - this, TQT_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); - TQObject::disconnect( Kopete::TransferManager::transferManager(), TQT_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), - this, TQT_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( accepted( Kopete::Transfer *, const TQString& ) ), + this, TQ_SLOT( slotReceiveFileAccepted( Kopete::Transfer *, const TQString& ) ) ); + TQObject::disconnect( Kopete::TransferManager::transferManager(), TQ_SIGNAL( refused(const Kopete::FileTransferInfo& ) ), + this, TQ_SLOT( slotReceiveFileRefused( const Kopete::FileTransferInfo& ) ) ); } } @@ -1644,7 +1644,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec { TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have one unread message in your Yahoo inbox.", "You have %n unread messages in your Yahoo inbox.", cnt ), TQPixmap() , 0 ), - TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; } @@ -1652,7 +1652,7 @@ void YahooAccount::slotMailNotify( const TQString& from, const TQString& subjec { kdDebug(YAHOO_GEN_DEBUG) << "attempting to trigger event" << endl; TQObject::connect(KNotification::event( TQString::fromLatin1("yahoo_mail"), i18n( "You have a message from %1 in your Yahoo inbox. <br><br>Subject: %2").arg( from ).arg( subject ), - TQPixmap() , 0 ), TQT_SIGNAL(activated(unsigned int ) ) , this, TQT_SLOT( slotOpenInbox() ) ); + TQPixmap() , 0 ), TQ_SIGNAL(activated(unsigned int ) ) , this, TQ_SLOT( slotOpenInbox() ) ); m_currentMailCount = cnt; } @@ -1859,7 +1859,7 @@ void YahooAccount::slotWebcamReadyForTransmission() if( !m_webcam ) { m_webcam = new YahooWebcam( this ); - TQObject::connect( m_webcam, TQT_SIGNAL(webcamClosing()), this, TQT_SLOT(slotOutgoingWebcamClosing()) ); + TQObject::connect( m_webcam, TQ_SIGNAL(webcamClosing()), this, TQ_SLOT(slotOutgoingWebcamClosing()) ); } m_webcam->startTransmission(); @@ -1988,12 +1988,12 @@ void YahooAccount::slotJoinChatRoom() /* YahooChatSelectorDialog *chatDialog = new YahooChatSelectorDialog( Kopete::UI::Global::mainWidget() ); - TQObject::connect( m_session, TQT_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), chatDialog, - TQT_SLOT(slotSetChatCategories( const TQDomDocument & )) ); - TQObject::connect( m_session, TQT_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), - chatDialog, TQT_SLOT(slotSetChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); - TQObject::connect( chatDialog, TQT_SIGNAL(chatCategorySelected( const Yahoo::ChatCategory & )), - this, TQT_SLOT(slotChatCategorySelected( const Yahoo::ChatCategory & ) ) ); + TQObject::connect( m_session, TQ_SIGNAL(gotYahooChatCategories( const TQDomDocument & )), chatDialog, + TQ_SLOT(slotSetChatCategories( const TQDomDocument & )) ); + TQObject::connect( m_session, TQ_SIGNAL(gotYahooChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )), + chatDialog, TQ_SLOT(slotSetChatRooms( const Yahoo::ChatCategory &, const TQDomDocument & )) ); + TQObject::connect( chatDialog, TQ_SIGNAL(chatCategorySelected( const Yahoo::ChatCategory & )), + this, TQ_SLOT(slotChatCategorySelected( const Yahoo::ChatCategory & ) ) ); m_session->getYahooChatCategories(); if( chatDialog->exec() == TQDialog::Accepted ) @@ -2028,8 +2028,8 @@ void YahooAccount::slotChatJoined( int roomId, int categoryId, const TQString &c if( !m_chatChatSession ) { m_chatChatSession = new YahooChatChatSession( protocol(), myself(), others ); - TQObject::connect( m_chatChatSession, TQT_SIGNAL(closing(Kopete::ChatSession *)), this, - TQT_SLOT(slotLeavChat()) ); + TQObject::connect( m_chatChatSession, TQ_SIGNAL(closing(Kopete::ChatSession *)), this, + TQ_SLOT(slotLeavChat()) ); } m_chatChatSession->removeAllContacts(); m_chatChatSession->setHandle( handle ); diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index 6f2ab25d..d6e7fbf1 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -53,19 +53,19 @@ YahooChatSession::YahooChatSession( Kopete::Protocol *protocol, const Kopete::Co setInstance(protocol->instance()); // Add Actions - new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQT_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; - new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQT_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; - new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQT_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; - new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQT_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; - new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQT_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); + new TDEAction( i18n( "Buzz Contact" ), TQIconSet(BarIcon("bell")), "Ctrl+G", this, TQ_SLOT( slotBuzzContact() ), actionCollection(), "yahooBuzz" ) ; + new TDEAction( i18n( "Show User Info" ), TQIconSet(BarIcon("idea")), 0, this, TQ_SLOT( slotUserInfo() ), actionCollection(), "yahooShowInfo" ) ; + new TDEAction( i18n( "Request Webcam" ), TQIconSet(BarIcon("webcamreceive")), 0, this, TQ_SLOT( slotRequestWebcam() ), actionCollection(), "yahooRequestWebcam" ) ; + new TDEAction( i18n( "Invite to view your Webcam" ), TQIconSet(BarIcon("webcamsend")), 0, this, TQ_SLOT( slotInviteWebcam() ), actionCollection(), "yahooSendWebcam" ) ; + new TDEAction( i18n( "Send File" ), TQIconSet(BarIcon("attach")), 0, this, TQ_SLOT( slotSendFile() ), actionCollection(), "yahooSendFile" ); YahooContact *c = static_cast<YahooContact*>( others.first() ); - connect( c, TQT_SIGNAL( displayPictureChanged() ), this, TQT_SLOT( slotDisplayPictureChanged() ) ); + connect( c, TQ_SIGNAL( displayPictureChanged() ), this, TQ_SLOT( slotDisplayPictureChanged() ) ); m_image = new TQLabel( 0L, "tde toolbar widget" ); - new KWidgetAction( m_image, i18n( "Yahoo Display Picture" ), 0, this, TQT_SLOT( slotDisplayPictureChanged() ), actionCollection(), "yahooDisplayPicture" ); + new KWidgetAction( m_image, i18n( "Yahoo Display Picture" ), 0, this, TQ_SLOT( slotDisplayPictureChanged() ), actionCollection(), "yahooDisplayPicture" ); if(c->hasProperty(Kopete::Global::Properties::self()->photo().key()) ) { - connect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + connect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); } else { @@ -131,7 +131,7 @@ void YahooChatSession::slotDisplayPictureChanged() if(w) { //We connected that in the constructor. we don't need to keep this slot active. - disconnect( Kopete::ChatSessionManager::self() , TQT_SIGNAL(viewActivated(KopeteView* )) , this, TQT_SLOT(slotDisplayPictureChanged()) ); + disconnect( Kopete::ChatSessionManager::self() , TQ_SIGNAL(viewActivated(KopeteView* )) , this, TQ_SLOT(slotDisplayPictureChanged()) ); TQPtrListIterator<TDEToolBar> it=w->toolBarIterator() ; TDEAction *imgAction=actionCollection()->action("yahooDisplayPicture"); @@ -142,8 +142,8 @@ void YahooChatSession::slotDisplayPictureChanged() { sz=tb->iconSize(); //ipdate if the size of the toolbar change. - disconnect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); - connect(tb, TQT_SIGNAL(modechange()), this, TQT_SLOT(slotDisplayPictureChanged())); + disconnect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); + connect(tb, TQ_SIGNAL(modechange()), this, TQ_SLOT(slotDisplayPictureChanged())); break; } ++it; diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index 3060ed48..0b473fd5 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -42,12 +42,12 @@ YahooConferenceChatSession::YahooConferenceChatSession( const TQString & yahooRo Kopete::ChatSessionManager::self()->registerChatSession( this ); setInstance(protocol->instance()); - connect ( this, TQT_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), - TQT_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); + connect ( this, TQ_SIGNAL( messageSent ( Kopete::Message &, Kopete::ChatSession * ) ), + TQ_SLOT( slotMessageSent ( Kopete::Message &, Kopete::ChatSession * ) ) ); m_yahooRoom = yahooRoom; - m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQT_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); + m_actionInvite = new TDEAction( i18n( "&Invite others" ), "kontact_contacts", this, TQ_SLOT( slotInviteOthers() ), actionCollection(), "yahooInvite"); setXMLFile("yahooconferenceui.rc"); } @@ -100,8 +100,8 @@ void YahooConferenceChatSession::slotInviteOthers() } YahooInviteListImpl *dlg = new YahooInviteListImpl( Kopete::UI::Global::mainWidget() ); - TQObject::connect( dlg, TQT_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), - account(), TQT_SLOT( slotAddInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); + TQObject::connect( dlg, TQ_SIGNAL( readyToInvite( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ), + account(), TQ_SLOT( slotAddInviteConference( const TQString &, const TQStringList &, const TQStringList &, const TQString & ) ) ); dlg->setRoom( m_yahooRoom ); dlg->fillFriendList( buddies ); for( TQPtrList<Kopete::Contact>::ConstIterator it = members().begin(); it != members().end(); it++ ) diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 4f93ea3a..3b3f2b85 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -206,11 +206,11 @@ Kopete::ChatSession *YahooContact::manager( Kopete::Contact::CanCreateFlags canC Kopete::ContactPtrList m_them; m_them.append( this ); m_manager = new YahooChatSession( protocol(), account()->myself(), m_them ); - connect( m_manager, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotChatSessionDestroyed() ) ); - connect( m_manager, TQT_SIGNAL( messageSent ( Kopete::Message&, Kopete::ChatSession* ) ), this, TQT_SLOT( slotSendMessage( Kopete::Message& ) ) ); - connect( m_manager, TQT_SIGNAL( myselfTyping( bool) ), this, TQT_SLOT( slotTyping( bool ) ) ); - connect( m_account, TQT_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), m_manager, TQT_SLOT( receivedTypingMsg( const TQString&, bool ) ) ); - connect( this, TQT_SIGNAL(displayPictureChanged()), m_manager, TQT_SLOT(slotDisplayPictureChanged())); + connect( m_manager, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotChatSessionDestroyed() ) ); + connect( m_manager, TQ_SIGNAL( messageSent ( Kopete::Message&, Kopete::ChatSession* ) ), this, TQ_SLOT( slotSendMessage( Kopete::Message& ) ) ); + connect( m_manager, TQ_SIGNAL( myselfTyping( bool) ), this, TQ_SLOT( slotTyping( bool ) ) ); + connect( m_account, TQ_SIGNAL( receivedTypingMsg( const TQString &, bool ) ), m_manager, TQ_SLOT( receivedTypingMsg( const TQString&, bool ) ) ); + connect( this, TQ_SIGNAL(displayPictureChanged()), m_manager, TQ_SLOT(slotDisplayPictureChanged())); } return m_manager; @@ -342,7 +342,7 @@ void YahooContact::slotSendMessage( Kopete::Message &message ) void YahooContact::sendFile( const KURL &sourceURL, const TQString &fileName, uint fileSize ) { Kopete::TransferManager::transferManager()->sendFile( sourceURL, fileName, fileSize, - false, this, TQT_SLOT(slotSendFile( const KURL & )) ); + false, this, TQ_SLOT(slotSendFile( const KURL & )) ); } void YahooContact::slotTyping(bool isTyping_ ) @@ -367,7 +367,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if ( !m_webcamAction ) { m_webcamAction = new TDEAction( i18n( "View &Webcam" ), "webcamreceive", TDEShortcut(), - this, TQT_SLOT( requestWebcam() ), this, "view_webcam" ); + this, TQ_SLOT( requestWebcam() ), this, "view_webcam" ); } if ( isReachable() ) m_webcamAction->setEnabled( true ); @@ -378,7 +378,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if( !m_inviteWebcamAction ) { m_inviteWebcamAction = new TDEAction( i18n( "Invite to view your Webcam" ), "webcamsend", TDEShortcut(), - this, TQT_SLOT( inviteWebcam() ), this, "invite_webcam" ); + this, TQ_SLOT( inviteWebcam() ), this, "invite_webcam" ); } if ( isReachable() ) m_inviteWebcamAction->setEnabled( true ); @@ -388,7 +388,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if ( !m_buzzAction ) { - m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQT_SLOT( buzzContact() ), this, "buzz_contact"); + m_buzzAction = new TDEAction( i18n( "&Buzz Contact" ), "bell", TDEShortcut(), this, TQ_SLOT( buzzContact() ), this, "buzz_contact"); } if ( isReachable() ) m_buzzAction->setEnabled( true ); @@ -398,7 +398,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if ( !m_stealthAction ) { - m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQT_SLOT( stealthContact() ), this, "stealth_contact"); + m_stealthAction = new TDEAction( i18n( "&Stealth Setting" ), "yahoo_stealthed", TDEShortcut(), this, TQ_SLOT( stealthContact() ), this, "stealth_contact"); } if ( isReachable() ) m_stealthAction->setEnabled( true ); @@ -408,7 +408,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if ( !m_inviteConferenceAction ) { - m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQT_SLOT( inviteConference() ), this, "invite_conference"); + m_inviteConferenceAction = new TDEAction( i18n( "&Invite to Conference" ), "kontact_contacts", TDEShortcut(), this, TQ_SLOT( inviteConference() ), this, "invite_conference"); } if ( isReachable() ) m_inviteConferenceAction->setEnabled( true ); @@ -418,7 +418,7 @@ TQPtrList<TDEAction> *YahooContact::customContextMenuActions() if ( !m_profileAction ) { - m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQT_SLOT( slotUserProfile() ), this, "profile_contact"); + m_profileAction = new TDEAction( i18n( "&View Yahoo Profile" ), "kontact_notes", TDEShortcut(), this, TQ_SLOT( slotUserProfile() ), this, "profile_contact"); } m_profileAction->setEnabled( true ); actionCollection->append( m_profileAction ); @@ -440,7 +440,7 @@ void YahooContact::slotUserInfo() dlg->setData( *m_YABEntry ); dlg->setAccountConnected( m_account->isConnected() ); dlg->show(); - TQObject::connect( dlg, TQT_SIGNAL(saveYABEntry( YABEntry & )), m_account, TQT_SLOT(slotSaveYABEntry( YABEntry & ))); + TQObject::connect( dlg, TQ_SIGNAL(saveYABEntry( YABEntry & )), m_account, TQ_SLOT(slotSaveYABEntry( YABEntry & ))); } void YahooContact::slotUserProfile() @@ -639,19 +639,19 @@ void YahooContact::initWebcamViewer() if ( !m_webcamDialog ) { m_webcamDialog = new YahooWebcamDialog( userId(), Kopete::UI::Global::mainWidget() ); -// TQObject::connect( m_webcamDialog, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( closeWebcamDialog() ) ); +// TQObject::connect( m_webcamDialog, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( closeWebcamDialog() ) ); - TQObject::connect( this, TQT_SIGNAL( signalWebcamClosed( int ) ), - m_webcamDialog, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::connect( this, TQ_SIGNAL( signalWebcamClosed( int ) ), + m_webcamDialog, TQ_SLOT( webcamClosed( int ) ) ); - TQObject::connect( this, TQT_SIGNAL( signalWebcamPaused() ), - m_webcamDialog, TQT_SLOT( webcamPaused() ) ); + TQObject::connect( this, TQ_SIGNAL( signalWebcamPaused() ), + m_webcamDialog, TQ_SLOT( webcamPaused() ) ); - TQObject::connect( this, TQT_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), - m_webcamDialog, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::connect( this, TQ_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), + m_webcamDialog, TQ_SLOT( newImage( const TQPixmap& ) ) ); - TQObject::connect( m_webcamDialog, TQT_SIGNAL ( closingWebcamDialog ( ) ), - this, TQT_SLOT ( closeWebcamDialog ( ) ) ); + TQObject::connect( m_webcamDialog, TQ_SIGNAL ( closingWebcamDialog ( ) ), + this, TQ_SLOT ( closeWebcamDialog ( ) ) ); } m_webcamDialog->show(); } @@ -673,17 +673,17 @@ void YahooContact::requestWebcam() void YahooContact::closeWebcamDialog() { - TQObject::disconnect( this, TQT_SIGNAL( signalWebcamClosed( int ) ), - m_webcamDialog, TQT_SLOT( webcamClosed( int ) ) ); + TQObject::disconnect( this, TQ_SIGNAL( signalWebcamClosed( int ) ), + m_webcamDialog, TQ_SLOT( webcamClosed( int ) ) ); - TQObject::disconnect( this, TQT_SIGNAL( signalWebcamPaused() ), - m_webcamDialog, TQT_SLOT( webcamPaused( ) ) ); + TQObject::disconnect( this, TQ_SIGNAL( signalWebcamPaused() ), + m_webcamDialog, TQ_SLOT( webcamPaused( ) ) ); - TQObject::disconnect( this, TQT_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), - m_webcamDialog, TQT_SLOT( newImage( const TQPixmap& ) ) ); + TQObject::disconnect( this, TQ_SIGNAL ( signalReceivedWebcamImage( const TQPixmap& ) ), + m_webcamDialog, TQ_SLOT( newImage( const TQPixmap& ) ) ); - TQObject::disconnect( m_webcamDialog, TQT_SIGNAL ( closingWebcamDialog ( ) ), - this, TQT_SLOT ( closeWebcamDialog ( ) ) ); + TQObject::disconnect( m_webcamDialog, TQ_SIGNAL ( closingWebcamDialog ( ) ), + this, TQ_SLOT ( closeWebcamDialog ( ) ) ); if( m_receivingWebcam ) m_account->yahooSession()->closeWebcam( contactId() ); m_webcamDialog->delayedDestruct(); diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index 3f66da83..2e6de47c 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -76,7 +76,7 @@ YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *the bool sendPicture = account()->configGroup()->readBoolEntry("sendPicture", false); optionSendBuddyIcon->setChecked( sendPicture ); buttonSelectPicture->setEnabled( sendPicture ); - connect( optionSendBuddyIcon, TQT_SIGNAL( toggled( bool ) ), buttonSelectPicture, TQT_SLOT( setEnabled( bool ) ) ); + connect( optionSendBuddyIcon, TQ_SIGNAL( toggled( bool ) ), buttonSelectPicture, TQ_SLOT( setEnabled( bool ) ) ); editPictureUrl->setText( iconUrl ); if( !iconUrl.isEmpty() ) m_Picture->setPixmap( KURL( iconUrl ).path() ); @@ -86,8 +86,8 @@ YahooEditAccount::YahooEditAccount(YahooProtocol *protocol, Kopete::Account *the mGlobalIdentity->setChecked( account()->configGroup()->readBoolEntry("ExcludeGlobalIdentity", false) ); } - TQObject::connect(buttonRegister, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpenRegister())); - TQObject::connect(buttonSelectPicture, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectPicture())); + TQObject::connect(buttonRegister, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpenRegister())); + TQObject::connect(buttonSelectPicture, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectPicture())); optionSendBuddyIcon->setEnabled( account() ); diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index be369973..d2ccb943 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -59,8 +59,8 @@ void YahooVerifyAccount::setUrl( KURL url ) mFile = new KTempFile( locateLocal( "tmp", url.fileName() ) ); mFile->setAutoDelete( true ); TDEIO::TransferJob *transfer = TDEIO::get( url, false, false ); - connect( transfer, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotComplete( TDEIO::Job* ) ) ); - connect( transfer, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( transfer, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotComplete( TDEIO::Job* ) ) ); + connect( transfer, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); } void YahooVerifyAccount::slotData( TDEIO::Job */*job*/, const TQByteArray& data ) diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 51d7b1bf..9e13bc3c 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -35,13 +35,13 @@ YahooWebcam::YahooWebcam( YahooAccount *account ) : TQObject( 0, "yahoo_webcam" m_img = new TQImage(); m_sendTimer = new TQTimer( this ); - connect( m_sendTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(sendImage()) ); + connect( m_sendTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(sendImage()) ); m_updateTimer = new TQTimer( this ); - connect( m_updateTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateImage()) ); + connect( m_updateTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateImage()) ); theDialog = new YahooWebcamDialog( "YahooWebcam" ); - connect( theDialog, TQT_SIGNAL(closingWebcamDialog()), this, TQT_SLOT(webcamDialogClosing()) ); + connect( theDialog, TQ_SIGNAL(closingWebcamDialog()), this, TQ_SLOT(webcamDialogClosing()) ); m_devicePool = Kopete::AV::VideoDevicePool::self(); m_devicePool->open(); diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp index a783f0bf..f22f3b98 100644 --- a/kpf/src/ActiveMonitor.cpp +++ b/kpf/src/ActiveMonitor.cpp @@ -64,29 +64,29 @@ namespace KPF connect ( view_, - TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotSelectionChanged()) + TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotSelectionChanged()) ); connect ( server_, - TQT_SIGNAL(connection(Server *)), - TQT_SLOT(slotConnection(Server *)) + TQ_SIGNAL(connection(Server *)), + TQ_SLOT(slotConnection(Server *)) ); connect ( server_, - TQT_SIGNAL(output(Server *, ulong)), - TQT_SLOT(slotOutput(Server *, ulong)) + TQ_SIGNAL(output(Server *, ulong)), + TQ_SLOT(slotOutput(Server *, ulong)) ); - connect(server_, TQT_SIGNAL(finished(Server *)), TQT_SLOT(slotFinished(Server *))); - connect(server_, TQT_SIGNAL(request(Server *)), TQT_SLOT(slotRequest(Server *))); - connect(server_, TQT_SIGNAL(response(Server *)), TQT_SLOT(slotResponse(Server *))); + connect(server_, TQ_SIGNAL(finished(Server *)), TQ_SLOT(slotFinished(Server *))); + connect(server_, TQ_SIGNAL(request(Server *)), TQ_SLOT(slotRequest(Server *))); + connect(server_, TQ_SIGNAL(response(Server *)), TQ_SLOT(slotResponse(Server *))); - connect(&cullTimer_, TQT_SIGNAL(timeout()), TQT_SLOT(slotCull())); + connect(&cullTimer_, TQ_SIGNAL(timeout()), TQ_SLOT(slotCull())); cullTimer_.start(1000); diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp index ac7fbe31..613dc5b7 100644 --- a/kpf/src/ActiveMonitorWindow.cpp +++ b/kpf/src/ActiveMonitorWindow.cpp @@ -52,7 +52,7 @@ namespace KPF "process-stop", 0, monitor_, - TQT_SLOT(slotKillSelected()), + TQ_SLOT(slotKillSelected()), actionCollection(), "kill" ); diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp index dca2c4aa..da45c5f4 100644 --- a/kpf/src/Applet.cpp +++ b/kpf/src/Applet.cpp @@ -109,15 +109,15 @@ namespace KPF connect ( WebServerManager::instance(), - TQT_SIGNAL(serverCreated(WebServer *)), - TQT_SLOT(slotServerCreated(WebServer *)) + TQ_SIGNAL(serverCreated(WebServer *)), + TQ_SLOT(slotServerCreated(WebServer *)) ); connect ( WebServerManager::instance(), - TQT_SIGNAL(serverDisabled(WebServer *)), - TQT_SLOT(slotServerDisabled(WebServer *)) + TQ_SIGNAL(serverDisabled(WebServer *)), + TQ_SLOT(slotServerDisabled(WebServer *)) ); WebServerManager::instance()->loadConfig(); @@ -316,8 +316,8 @@ namespace KPF connect ( wizard_, - TQT_SIGNAL(dying(ServerWizard *)), - TQT_SLOT(slotWizardDying(ServerWizard *)) + TQ_SIGNAL(dying(ServerWizard *)), + TQ_SLOT(slotWizardDying(ServerWizard *)) ); wizard_->setLocation(location); @@ -338,8 +338,8 @@ namespace KPF connect ( wizard_, - TQT_SIGNAL(dying(ServerWizard *)), - TQT_SLOT(slotWizardDying(ServerWizard *)) + TQ_SIGNAL(dying(ServerWizard *)), + TQ_SLOT(slotWizardDying(ServerWizard *)) ); wizard_->show(); @@ -438,15 +438,15 @@ namespace KPF connect ( i, - TQT_SIGNAL(newServer()), - TQT_SLOT(slotNewServer()) + TQ_SIGNAL(newServer()), + TQ_SLOT(slotNewServer()) ); connect ( i, - TQT_SIGNAL(newServerAtLocation(const TQString &)), - TQT_SLOT(slotNewServerAtLocation(const TQString &)) + TQ_SIGNAL(newServerAtLocation(const TQString &)), + TQ_SLOT(slotNewServerAtLocation(const TQString &)) ); itemList_.append(i); diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp index e066200f..99e8e1d2 100644 --- a/kpf/src/AppletItem.cpp +++ b/kpf/src/AppletItem.cpp @@ -94,8 +94,8 @@ namespace KPF connect ( monitorWindow_, - TQT_SIGNAL(dying(ActiveMonitorWindow *)), - TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *)) + TQ_SIGNAL(dying(ActiveMonitorWindow *)), + TQ_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *)) ); } @@ -320,8 +320,8 @@ namespace KPF connect ( monitorWindow_, - TQT_SIGNAL(dying(ActiveMonitorWindow *)), - TQT_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *)) + TQ_SIGNAL(dying(ActiveMonitorWindow *)), + TQ_SLOT(slotActiveMonitorWindowDying(ActiveMonitorWindow *)) ); #endif @@ -332,7 +332,7 @@ namespace KPF void AppletItem::removeServer() { - TQTimer::singleShot(0, this, TQT_SLOT(slotSuicide())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSuicide())); } void @@ -349,8 +349,8 @@ namespace KPF connect ( configDialog_, - TQT_SIGNAL(dying(SingleServerConfigDialog *)), - TQT_SLOT(slotConfigDialogDying(SingleServerConfigDialog *)) + TQ_SIGNAL(dying(SingleServerConfigDialog *)), + TQ_SLOT(slotConfigDialogDying(SingleServerConfigDialog *)) ); configDialog_->show(); diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp index 967d5048..8bb52e96 100644 --- a/kpf/src/BandwidthGraph.cpp +++ b/kpf/src/BandwidthGraph.cpp @@ -55,8 +55,8 @@ namespace KPF connect ( server_, - TQT_SIGNAL(wholeServerOutput(ulong)), - TQT_SLOT(slotOutput(ulong)) + TQ_SIGNAL(wholeServerOutput(ulong)), + TQ_SLOT(slotOutput(ulong)) ); if (UseOverlays == overlaySelect_) @@ -64,15 +64,15 @@ namespace KPF connect ( server_, - TQT_SIGNAL(contentionChange(bool)), this, - TQT_SLOT(slotServerContentionChange(bool)) + TQ_SIGNAL(contentionChange(bool)), this, + TQ_SLOT(slotServerContentionChange(bool)) ); connect ( server_, - TQT_SIGNAL(pauseChange(bool)), this, - TQT_SLOT(slotServerPauseChange(bool)) + TQ_SIGNAL(pauseChange(bool)), this, + TQ_SLOT(slotServerPauseChange(bool)) ); } diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp index c753ecae..178be7c4 100644 --- a/kpf/src/ConfigDialogPage.cpp +++ b/kpf/src/ConfigDialogPage.cpp @@ -113,8 +113,8 @@ namespace KPF connect ( cb_customErrorMessages_, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotCustomErrorMessagesToggled(bool)) + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotCustomErrorMessagesToggled(bool)) ); #endif @@ -122,8 +122,8 @@ namespace KPF connect ( pb_errorMessages_, - TQT_SIGNAL(clicked()), - TQT_SLOT(slotConfigureErrorMessages()) + TQ_SIGNAL(clicked()), + TQ_SLOT(slotConfigureErrorMessages()) ); #endif @@ -197,22 +197,22 @@ namespace KPF connect ( sb_listenPort_, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotListenPortChanged(int)) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotListenPortChanged(int)) ); connect ( sb_bandwidthLimit_, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotBandwidthLimitChanged(int)) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotBandwidthLimitChanged(int)) ); connect ( cb_followSymlinks_, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotFollowSymlinksToggled(bool)) + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotFollowSymlinksToggled(bool)) ); diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp index 3b6acdd5..16070d39 100644 --- a/kpf/src/DirSelectWidget.cpp +++ b/kpf/src/DirSelectWidget.cpp @@ -52,8 +52,8 @@ namespace KPF connect ( this, - TQT_SIGNAL(expanded(TQListViewItem *)), - TQT_SLOT(slotExpanded(TQListViewItem *)) + TQ_SIGNAL(expanded(TQListViewItem *)), + TQ_SLOT(slotExpanded(TQListViewItem *)) ); TQListViewItem * root = new TQListViewItem(this, "/"); diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp index 43b9ccea..f6d95da5 100644 --- a/kpf/src/PropertiesDialogPlugin.cpp +++ b/kpf/src/PropertiesDialogPlugin.cpp @@ -201,15 +201,15 @@ namespace KPF connect ( kapp->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString &)), - TQT_SLOT(slotApplicationRegistered(const TQCString &)) + TQ_SIGNAL(applicationRegistered(const TQCString &)), + TQ_SLOT(slotApplicationRegistered(const TQCString &)) ); connect ( kapp->dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString &)), - TQT_SLOT(slotApplicationUnregistered(const TQCString &)) + TQ_SIGNAL(applicationRemoved(const TQCString &)), + TQ_SLOT(slotApplicationUnregistered(const TQCString &)) ); d->kpfRunning = kapp->dcopClient()->isApplicationRegistered("kpf"); @@ -309,7 +309,7 @@ namespace KPF l->addStretch(1); - connect(d->pb_startKPF, TQT_SIGNAL(clicked()), TQT_SLOT(slotStartKPF())); + connect(d->pb_startKPF, TQ_SIGNAL(clicked()), TQ_SLOT(slotStartKPF())); return w; } @@ -453,51 +453,51 @@ namespace KPF TQWhatsThis::add(d->le_serverName, serverNameHelp); TQWhatsThis::add(d->cb_followSymlinks, followSymlinksHelp); - connect(d->cb_share, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSharingToggled(bool))); + connect(d->cb_share, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSharingToggled(bool))); slotSharingToggled(false); connect ( d->cb_share, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); connect ( d->sb_listenPort, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); connect ( d->sb_bandwidthLimit, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); #if 0 connect ( d->sb_connectionLimit, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotChanged()) ); #endif connect ( d->le_serverName, - TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotChanged()) ); connect ( d->cb_followSymlinks, - TQT_SIGNAL(toggled(bool)), - TQT_SLOT(slotChanged()) + TQ_SIGNAL(toggled(bool)), + TQ_SLOT(slotChanged()) ); return w; @@ -512,7 +512,7 @@ namespace KPF kapp->dcopClient() ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop")); - TQTimer::singleShot(4 * 1000, this, TQT_SLOT(slotStartKPFFailed())); + TQTimer::singleShot(4 * 1000, this, TQ_SLOT(slotStartKPFFailed())); } void diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp index 0959d801..69a11519 100644 --- a/kpf/src/Server.cpp +++ b/kpf/src/Server.cpp @@ -57,34 +57,34 @@ namespace KPF d->socket.setSocket(socket); - connect(&(d->socket), TQT_SIGNAL(readyRead()), this, TQT_SLOT(slotReadyRead())); + connect(&(d->socket), TQ_SIGNAL(readyRead()), this, TQ_SLOT(slotReadyRead())); connect ( &(d->socket), - TQT_SIGNAL(bytesWritten(int)), - TQT_SLOT(slotBytesWritten(int)) + TQ_SIGNAL(bytesWritten(int)), + TQ_SLOT(slotBytesWritten(int)) ); connect ( &(d->socket), - TQT_SIGNAL(connectionClosed()), - TQT_SLOT(slotConnectionClosed()) + TQ_SIGNAL(connectionClosed()), + TQ_SLOT(slotConnectionClosed()) ); connect ( &(d->idleTimer), - TQT_SIGNAL(timeout()), - TQT_SLOT(slotTimeout()) + TQ_SIGNAL(timeout()), + TQ_SLOT(slotTimeout()) ); connect ( &(d->readTimer), - TQT_SIGNAL(timeout()), - TQT_SLOT(slotRead()) + TQ_SIGNAL(timeout()), + TQ_SLOT(slotRead()) ); // If nothing happens for a bit, cancel ourselves. @@ -207,7 +207,7 @@ namespace KPF TQStringList l(TQStringList::split(' ', line)); - // A request usually looks like TQT_METHOD PATH PROTOCOL but we don't + // A request usually looks like METHOD PATH PROTOCOL but we don't // require PROTOCOL - we just assume HTTP/0.9 and act accordingly. if (l.count() == 2) @@ -238,7 +238,7 @@ namespace KPF bool Server::checkRequest() { - // We only handle TQT_METHOD of GET or HEAD. + // We only handle METHOD of GET or HEAD. if (Request::Unsupported == d->request.method()) { diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp index 0cf84fd5..38c6c15a 100644 --- a/kpf/src/ServerWizard.cpp +++ b/kpf/src/ServerWizard.cpp @@ -244,8 +244,8 @@ namespace KPF connect ( kur_root_, - TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(slotServerRootChanged(const TQString &)) + TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(slotServerRootChanged(const TQString &)) ); // Used for setting the caption on the file dialog. @@ -253,8 +253,8 @@ namespace KPF connect ( kur_root_, - TQT_SIGNAL(openFileDialog(KURLRequester *)), - TQT_SLOT(slotOpenFileDialog(KURLRequester *)) + TQ_SIGNAL(openFileDialog(KURLRequester *)), + TQ_SLOT(slotOpenFileDialog(KURLRequester *)) ); // This slot sets the 'Next' button on page 2 to enabled/disabled @@ -263,8 +263,8 @@ namespace KPF connect ( sb_listenPort_, - TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotListenPortChanged(int)) + TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotListenPortChanged(int)) ); // Update 'Next' button on page 1. diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp index afdc77a4..f272485e 100644 --- a/kpf/src/SingleServerConfigDialog.cpp +++ b/kpf/src/SingleServerConfigDialog.cpp @@ -52,13 +52,13 @@ namespace KPF connect ( widget_, - TQT_SIGNAL(ok(bool)), - TQT_SLOT(slotOk(bool)) + TQ_SIGNAL(ok(bool)), + TQ_SLOT(slotOk(bool)) ); setMainWidget(widget_); - connect(this, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); + connect(this, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); widget_->checkOk(); } diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp index 4db88b62..0ebe0228 100644 --- a/kpf/src/StartingKPFDialog.cpp +++ b/kpf/src/StartingKPFDialog.cpp @@ -80,14 +80,14 @@ namespace KPF connect ( kapp->dcopClient(), - TQT_SIGNAL(applicationRegistered(const TQCString &)), - TQT_SLOT(slotApplicationRegistered(const TQCString &)) + TQ_SIGNAL(applicationRegistered(const TQCString &)), + TQ_SLOT(slotApplicationRegistered(const TQCString &)) ); kapp->dcopClient() ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop")); - connect(&d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); enableButtonOK(false); enableButtonCancel(true); diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp index 20320a32..6d10d8bd 100644 --- a/kpf/src/WebServer.cpp +++ b/kpf/src/WebServer.cpp @@ -110,10 +110,10 @@ namespace KPF loadConfig(); publish(); - connect(&d->bindTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBind())); - connect(&d->writeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite())); - connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput())); - connect(&d->backlogTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog())); + connect(&d->bindTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBind())); + connect(&d->writeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWrite())); + connect(&d->resetOutputTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckOutput())); + connect(&d->backlogTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotClearBacklog())); d->bindTimer .start( 0, true); d->resetOutputTimer .start(1000 / SamplesPerSecond, false); @@ -144,10 +144,10 @@ namespace KPF saveConfig(); publish(); - connect(&d->bindTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotBind())); - connect(&d->writeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotWrite())); - connect(&d->resetOutputTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCheckOutput())); - connect(&d->backlogTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotClearBacklog())); + connect(&d->bindTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotBind())); + connect(&d->writeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotWrite())); + connect(&d->resetOutputTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCheckOutput())); + connect(&d->backlogTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotClearBacklog())); d->bindTimer .start( 0, true); d->resetOutputTimer .start(1000 / SamplesPerSecond, false); @@ -164,7 +164,7 @@ namespace KPF void WebServer::publish() { d->service = new DNSSD::PublicService(d->serverName,"_http._tcp",d->listenPort); - connect(d->service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool))); + connect(d->service,TQ_SIGNAL(published(bool)),this,TQ_SLOT(wasPublished(bool))); d->service->publishAsync(); } @@ -195,7 +195,7 @@ namespace KPF emit(contentionChange(d->portContention)); if (!d->portContention) - connect(d->socket, TQT_SIGNAL(connection(int)), TQT_SLOT(slotConnection(int))); + connect(d->socket, TQ_SIGNAL(connection(int)), TQ_SLOT(slotConnection(int))); else { @@ -277,18 +277,18 @@ namespace KPF connect ( s, - TQT_SIGNAL(output(Server *, ulong)), - TQT_SLOT(slotOutput(Server *, ulong)) + TQ_SIGNAL(output(Server *, ulong)), + TQ_SLOT(slotOutput(Server *, ulong)) ); - connect(s, TQT_SIGNAL(finished(Server *)), TQT_SLOT(slotFinished(Server *))); - connect(s, TQT_SIGNAL(request(Server *)), TQT_SIGNAL(request(Server *))); - connect(s, TQT_SIGNAL(response(Server *)), TQT_SIGNAL(response(Server *))); + connect(s, TQ_SIGNAL(finished(Server *)), TQ_SLOT(slotFinished(Server *))); + connect(s, TQ_SIGNAL(request(Server *)), TQ_SIGNAL(request(Server *))); + connect(s, TQ_SIGNAL(response(Server *)), TQ_SIGNAL(response(Server *))); d->serverList.append(s); connect - (s, TQT_SIGNAL(readyToWrite(Server *)), TQT_SLOT(slotReadyToWrite(Server *))); + (s, TQ_SIGNAL(readyToWrite(Server *)), TQ_SLOT(slotReadyToWrite(Server *))); emit(connection(s)); diff --git a/kppp/accounting.cpp b/kppp/accounting.cpp index bdc22c56..99cbd65d 100644 --- a/kppp/accounting.cpp +++ b/kppp/accounting.cpp @@ -439,8 +439,8 @@ void ExecutableAccounting::slotStart() { TQString s_total; s_total.sprintf("%0.8f", total()); *proc << s << s_total; - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(gotData(TDEProcess *, char *, int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(gotData(TDEProcess *, char *, int))); proc->start(); time_t start_time = time(0); diff --git a/kppp/accounts.cpp b/kppp/accounts.cpp index 352fdd5b..13f2ea37 100644 --- a/kppp/accounts.cpp +++ b/kppp/accounts.cpp @@ -63,16 +63,16 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) accountlist_l = new TQListBox(parent); accountlist_l->setMinimumSize(160, 128); - connect(accountlist_l, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotListBoxSelect(int))); - connect(accountlist_l, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(editaccount())); + connect(accountlist_l, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotListBoxSelect(int))); + connect(accountlist_l, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(editaccount())); l11->addWidget(accountlist_l, 10); TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); edit_b = new TQPushButton(i18n("&Edit..."), parent); - connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editaccount())); + connect(edit_b, TQ_SIGNAL(clicked()), TQ_SLOT(editaccount())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); min = edit_b->sizeHint().width(); @@ -82,13 +82,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) l111->addWidget(edit_b); new_b = new TQPushButton(i18n("&New..."), parent); - connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newaccount())); + connect(new_b, TQ_SIGNAL(clicked()), TQ_SLOT(newaccount())); l111->addWidget(new_b); TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n" "to the Internet")); copy_b = new TQPushButton(i18n("Co&py"), parent); - connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copyaccount())); + connect(copy_b, TQ_SIGNAL(clicked()), TQ_SLOT(copyaccount())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, i18n("Makes a copy of the selected account. All\n" @@ -97,7 +97,7 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) "needs")); delete_b = new TQPushButton(i18n("De&lete"), parent); - connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deleteaccount())); + connect(delete_b, TQ_SIGNAL(clicked()), TQ_SLOT(deleteaccount())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, i18n("<p>Deletes the selected account\n\n" @@ -155,13 +155,13 @@ AccountWidget::AccountWidget( TQWidget *parent, const char *name ) l122->addStretch(1); reset = new TQPushButton(i18n("&Reset..."), parent); reset->setEnabled(FALSE); - connect(reset, TQT_SIGNAL(clicked()), - this, TQT_SLOT(resetClicked())); + connect(reset, TQ_SIGNAL(clicked()), + this, TQ_SLOT(resetClicked())); l122->addWidget(reset); log = new TQPushButton(i18n("&View Logs"), parent); - connect(log, TQT_SIGNAL(clicked()), - this, TQT_SLOT(viewLogClicked())); + connect(log, TQ_SIGNAL(clicked()), + this, TQ_SLOT(viewLogClicked())); l122->addWidget(log); l122->addStretch(1); @@ -461,10 +461,10 @@ QueryReset::QueryReset(TQWidget *parent) : TQDialog(parent, 0, true) { ok->setDefault(true); TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel()); - connect(ok, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accepted())); - connect(cancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); + connect(ok, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accepted())); + connect(cancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); bbox->layout(); tl->addWidget(bbox); diff --git a/kppp/acctselect.cpp b/kppp/acctselect.cpp index f42b5a66..cd4013dd 100644 --- a/kppp/acctselect.cpp +++ b/kppp/acctselect.cpp @@ -60,20 +60,20 @@ AccountingSelector::AccountingSelector(TQWidget *parent, bool _isnewaccount, con enable_accounting = new TQCheckBox(i18n("&Enable accounting"), parent); l1->addWidget(enable_accounting, 1); - connect(enable_accounting, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableItems(bool))); + connect(enable_accounting, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableItems(bool))); // insert the tree widget tl = new TQListView(parent, "treewidget"); - connect(tl, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, - TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(tl, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, + TQ_SLOT(slotSelectionChanged(TQListViewItem*))); tl->setMinimumSize(220, 200); l1->addWidget(tl, 1); KURLLabel *up = new KURLLabel(parent); up->setText(i18n("Check for rule updates")); up->setURL("http://developer.kde.org/~kppp/rules.html"); - connect(up, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(openURL(const TQString&))); + connect(up, TQ_SIGNAL(leftClickedURL(const TQString&)), TQ_SLOT(openURL(const TQString&))); l1->addWidget(up, 1); diff --git a/kppp/connect.cpp b/kppp/connect.cpp index 4e494ea1..abcc277c 100644 --- a/kppp/connect.cpp +++ b/kppp/connect.cpp @@ -125,11 +125,11 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) debug = new TQPushButton(i18n("&Log"), this); debug->setToggleButton(true); - connect(debug, TQT_SIGNAL(clicked()), TQT_SIGNAL(toggleDebugWindow())); + connect(debug, TQ_SIGNAL(clicked()), TQ_SIGNAL(toggleDebugWindow())); cancel = new KPushButton(KStdGuiItem::cancel(), this); cancel->setFocus(); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton())); int maxw = TQMAX(cancel->sizeHint().width(), debug->sizeHint().width()); @@ -143,24 +143,24 @@ ConnectWidget::ConnectWidget(TQWidget *parent, const char *name, PPPStats *st) setFixedSize(sizeHint()); pausetimer = new TQTimer(this); - connect(pausetimer, TQT_SIGNAL(timeout()), TQT_SLOT(pause())); + connect(pausetimer, TQ_SIGNAL(timeout()), TQ_SLOT(pause())); kapp->processEvents(); timeout_timer = new TQTimer(this); - connect(timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(script_timed_out())); + connect(timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(script_timed_out())); inittimer = new TQTimer(this); - connect(inittimer, TQT_SIGNAL(timeout()), TQT_SLOT(init())); + connect(inittimer, TQ_SIGNAL(timeout()), TQ_SLOT(init())); if_timeout_timer = new TQTimer(this); - connect(if_timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(if_waiting_timed_out())); + connect(if_timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(if_waiting_timed_out())); - connect(this,TQT_SIGNAL(if_waiting_signal()),this,TQT_SLOT(if_waiting_slot())); + connect(this,TQ_SIGNAL(if_waiting_signal()),this,TQ_SLOT(if_waiting_slot())); prompt = new PWEntry( this, "pw" ); if_timer = new TQTimer(this); - connect(if_timer,TQT_SIGNAL(timeout()), TQT_SLOT(if_waiting_slot())); + connect(if_timer,TQ_SIGNAL(timeout()), TQ_SLOT(if_waiting_slot())); } @@ -259,7 +259,7 @@ void ConnectWidget::init() { semaphore = false; Modem::modem->stop(); - Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char))); + Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char))); // if we are stuck anywhere we will time out timeout_timer->start(gpppdata.modemTimeout()*1000); diff --git a/kppp/conwindow.cpp b/kppp/conwindow.cpp index 4523af90..9f4a10bd 100644 --- a/kppp/conwindow.cpp +++ b/kppp/conwindow.cpp @@ -62,15 +62,15 @@ ConWindow::ConWindow(TQWidget *parent, const char *name,TQWidget *mainwidget, cancelbutton = new TQPushButton(this); cancelbutton->setText(i18n("&Disconnect")); - connect(cancelbutton, TQT_SIGNAL(clicked()), mainwidget, TQT_SLOT(disconnect())); + connect(cancelbutton, TQ_SIGNAL(clicked()), mainwidget, TQ_SLOT(disconnect())); statsbutton = new TQPushButton(this); statsbutton->setText(i18n("De&tails")); statsbutton->setFocus(); - connect(statsbutton, TQT_SIGNAL(clicked()), mainwidget, TQT_SLOT(showStats())); + connect(statsbutton, TQ_SIGNAL(clicked()), mainwidget, TQ_SLOT(showStats())); clocktimer = new TQTimer(this); - connect(clocktimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeclick())); + connect(clocktimer, TQ_SIGNAL(timeout()), TQ_SLOT(timeclick())); // read window position from config file int p_x, p_y; diff --git a/kppp/debug.cpp b/kppp/debug.cpp index 24fd939f..23790300 100644 --- a/kppp/debug.cpp +++ b/kppp/debug.cpp @@ -65,7 +65,7 @@ DebugWidget::DebugWidget(TQWidget *parent, const char *name) dismiss->setGeometry(330,340,70,30); dismiss->setText(i18n("&Close")); dismiss->setFocus(); - connect(dismiss, TQT_SIGNAL(clicked()), TQT_SLOT(hide())); + connect(dismiss, TQ_SIGNAL(clicked()), TQ_SLOT(hide())); /* fline = new TQFrame(this,"line"); diff --git a/kppp/docking.cpp b/kppp/docking.cpp index 792d80a6..041dcd46 100644 --- a/kppp/docking.cpp +++ b/kppp/docking.cpp @@ -50,12 +50,12 @@ DockWidget::DockWidget(TQWidget *parent, const char *name, PPPStats *st) // popup menu for right mouse button popup_m = contextMenu(); toggleID = popup_m->insertItem(i18n("Restore"), - this, TQT_SLOT(toggle_window_state())); - popup_m->insertItem(i18n("Details"), p_kppp, TQT_SLOT(showStats())); + this, TQ_SLOT(toggle_window_state())); + popup_m->insertItem(i18n("Details"), p_kppp, TQ_SLOT(showStats())); popup_m->insertSeparator(); - popup_m->insertItem(i18n("Disconnect"), p_kppp, TQT_SLOT(disconnect())); + popup_m->insertItem(i18n("Disconnect"), p_kppp, TQ_SLOT(disconnect())); // connect to stats for little modem animation - connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int))); + connect(stats, TQ_SIGNAL(statsChanged(int)), TQ_SLOT(paintIcon(int))); DockWidget::dock_widget = this; } diff --git a/kppp/edit.cpp b/kppp/edit.cpp index 7e7d46c2..b4537617 100644 --- a/kppp/edit.cpp +++ b/kppp/edit.cpp @@ -89,16 +89,16 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) lpn1->addStretch(1); lpn1->addWidget(up); lpn1->addWidget(down); - connect(add, TQT_SIGNAL(clicked()), - this, TQT_SLOT(addNumber())); - connect(del, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delNumber())); - connect(up, TQT_SIGNAL(clicked()), - this, TQT_SLOT(upNumber())); - connect(down, TQT_SIGNAL(clicked()), - this, TQT_SLOT(downNumber())); - connect(numbers, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(selectionChanged(int))); + connect(add, TQ_SIGNAL(clicked()), + this, TQ_SLOT(addNumber())); + connect(del, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delNumber())); + connect(up, TQ_SIGNAL(clicked()), + this, TQ_SLOT(upNumber())); + connect(down, TQ_SIGNAL(clicked()), + this, TQ_SLOT(downNumber())); + connect(numbers, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(selectionChanged(int))); numbersChanged(); tmp = i18n("<p>Specifies the phone numbers to dial. You\n" @@ -157,8 +157,8 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) cbtype->insertItem(i18n("None")); cbtype->insertItem(i18n("Administrator-defined")); cbtype->insertItem(i18n("User-defined")); - connect(cbtype, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(cbtypeChanged(int))); + connect(cbtype, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(cbtypeChanged(int))); tl->addWidget(cbtype, 5, 1); tmp = i18n("Callback type"); @@ -178,7 +178,7 @@ DialWidget::DialWidget( TQWidget *parent, bool isnewaccount, const char *name ) TQWhatsThis::add(cbphone,tmp); pppdargs = new TQPushButton(i18n("Customize &pppd Arguments..."), parent); - connect(pppdargs, TQT_SIGNAL(clicked()), TQT_SLOT(pppdargsbutton())); + connect(pppdargs, TQ_SIGNAL(clicked()), TQ_SLOT(pppdargsbutton())); tl->addMultiCellWidget(pppdargs, 7, 7, 0, 1, AlignCenter); // Set defaults if editing an existing connection @@ -438,8 +438,8 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name ) rb = new TQButtonGroup(parent); rb->hide(); - connect(rb, TQT_SIGNAL(clicked(int)), - TQT_SLOT(hitIPSelect(int))); + connect(rb, TQ_SIGNAL(clicked(int)), + TQ_SLOT(hitIPSelect(int))); dynamicadd_rb = new TQRadioButton(box); dynamicadd_rb->setText(i18n("Dynamic IP address")); @@ -496,8 +496,8 @@ IPWidget::IPWidget( TQWidget *parent, bool isnewaccount, const char *name ) autoname = new TQCheckBox(i18n("&Auto-configure hostname from this IP"), parent); autoname->setChecked(gpppdata.autoname()); - connect(autoname,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(autoname_t(bool))); + connect(autoname,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(autoname_t(bool))); TQWhatsThis::add(autoname, i18n("<p>Whenever you connect, this reconfigures\n" @@ -613,7 +613,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) bg = new TQButtonGroup("Group", this); conf_label->setBuddy(bg); - connect(bg, TQT_SIGNAL(clicked(int)), TQT_SLOT(DNS_Mode_Selected(int))); + connect(bg, TQ_SIGNAL(clicked(int)), TQ_SLOT(DNS_Mode_Selected(int))); bg->hide(); autodns = new TQRadioButton(i18n("Automatic"), parent); @@ -634,10 +634,10 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) tl->addLayout(l2, 3, 1); dnsipaddr = new IPLineEdit(parent); dns_label->setBuddy(dnsipaddr); - connect(dnsipaddr, TQT_SIGNAL(returnPressed()), - TQT_SLOT(adddns())); - connect(dnsipaddr, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(DNS_Edit_Changed(const TQString &))); + connect(dnsipaddr, TQ_SIGNAL(returnPressed()), + TQ_SLOT(adddns())); + connect(dnsipaddr, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(DNS_Edit_Changed(const TQString &))); l2->addWidget(dnsipaddr, 1); l2->addStretch(1); tmp = i18n("<p>Allows you to specify a new DNS server to be\n" @@ -654,7 +654,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1, 4, 1); add = new TQPushButton(i18n("&Add"), parent); - connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(adddns())); + connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(adddns())); int width = add->sizeHint().width(); width = TQMAX(width,60); add->setMinimumWidth(width); @@ -666,7 +666,7 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) "will then be added to the list below")); remove = new TQPushButton(i18n("&Remove"), parent); - connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removedns())); + connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removedns())); width = remove->sizeHint().width(); width = TQMAX(width,60); remove->setMinimumWidth(width); @@ -682,8 +682,8 @@ DNSWidget::DNSWidget( TQWidget *parent, bool isnewaccount, const char *name ) dnsservers = new TQListBox(parent); servers_label->setBuddy(dnsservers); dnsservers->setMinimumSize(150, 80); - connect(dnsservers, TQT_SIGNAL(highlighted(int)), - TQT_SLOT(DNS_Entry_Selected(int))); + connect(dnsservers, TQ_SIGNAL(highlighted(int)), + TQ_SLOT(DNS_Entry_Selected(int))); tl->addWidget(dnsservers, 5, 1); tmp = i18n("<p>This shows all defined DNS servers to use\n" "while you are connected. Use the <b>Add</b> and\n" @@ -793,7 +793,7 @@ GatewayWidget::GatewayWidget( TQWidget *parent, bool isnewaccount, const char *n rb = new TQButtonGroup(parent); rb->hide(); - connect(rb, TQT_SIGNAL(clicked(int)), TQT_SLOT(hitGatewaySelect(int))); + connect(rb, TQ_SIGNAL(clicked(int)), TQ_SLOT(hitGatewaySelect(int))); defaultgateway = new TQRadioButton(box); defaultgateway->setText(i18n("Default gateway")); @@ -879,19 +879,19 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam { TQVBoxLayout *tl = new TQVBoxLayout(parent, 0, KDialog::spacingHint()); se = new ScriptEdit(parent); - connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(addButton())); + connect(se, TQ_SIGNAL(returnPressed()), TQ_SLOT(addButton())); tl->addWidget(se); // insert equal-sized buttons KButtonBox *bbox = new KButtonBox(parent); add = bbox->addButton(i18n("&Add")); - connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addButton())); + connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(addButton())); bbox->addStretch(1); insert = bbox->addButton(i18n("&Insert")); - connect(insert, TQT_SIGNAL(clicked()), TQT_SLOT(insertButton())); + connect(insert, TQ_SIGNAL(clicked()), TQ_SLOT(insertButton())); bbox->addStretch(1); remove = bbox->addButton(i18n("&Remove")); - connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removeButton())); + connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removeButton())); bbox->layout(); tl->addWidget(bbox); @@ -899,17 +899,17 @@ ScriptWidget::ScriptWidget( TQWidget *parent, bool isnewaccount, const char *nam tl->addLayout(l12); stl = new TQListBox(parent); stl->setVScrollBarMode( TQScrollView::AlwaysOff ); - connect(stl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(stlhighlighted(int))); + connect(stl, TQ_SIGNAL(highlighted(int)), TQ_SLOT(stlhighlighted(int))); stl->setMinimumSize(TQSize(70, 140)); sl = new TQListBox(parent); sl->setVScrollBarMode( TQScrollView::AlwaysOff ); - connect(sl, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slhighlighted(int))); + connect(sl, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slhighlighted(int))); sl->setMinimumSize(TQSize(150, 140)); slb = new TQScrollBar(parent); slb->setFixedWidth(slb->sizeHint().width()); - connect(slb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrolling(int))); + connect(slb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrolling(int))); l12->addWidget(stl, 1); l12->addWidget(sl, 3); @@ -1214,8 +1214,8 @@ PhoneNumberDialog::PhoneNumberDialog(TQWidget *parent) : KDialogBase(parent, 0, le = newLineEdit(14, hbox); le->setMinimumWidth(125); - connect(le, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &))); + connect(le, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &))); le->setFocus(); textChanged(""); diff --git a/kppp/general.cpp b/kppp/general.cpp index b1e2c0b0..aeea5059 100644 --- a/kppp/general.cpp +++ b/kppp/general.cpp @@ -66,8 +66,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) pppdTimeout->setLabel(i18n("pppd &timeout:")); pppdTimeout->setRange(1, TIMEOUT_SIZE, 5, true); pppdTimeout->setSuffix(i18n(" sec")); - connect(pppdTimeout, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(pppdtimeoutchanged(int))); + connect(pppdTimeout, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(pppdtimeoutchanged(int))); tl->addWidget(pppdTimeout); TQString tmp = i18n("<i>kppp</i> will wait this number of seconds\n" "to see if a PPP connection is established.\n" @@ -90,14 +90,14 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) "size.")); chkBox->setChecked(gpppdata.get_dock_into_panel()); - connect(chkBox,TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(docking_toggled(bool))); + connect(chkBox,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(docking_toggled(bool))); tl->addWidget(chkBox); chkBox = new TQCheckBox(i18n("A&utomatic redial on disconnect"), parent); chkBox->setChecked(gpppdata.automatic_redial()); - connect(chkBox,TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(redial_toggled(bool))); + connect(chkBox,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(redial_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("<p>When a connection is established and\n" @@ -108,8 +108,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) chkBox = new TQCheckBox(i18n("Automatic redial on NO &CARRIER"), parent); chkBox->setChecked(gpppdata.get_redial_on_nocarrier()); - connect(chkBox,TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(nocarrier_toggled(bool))); + connect(chkBox,TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(nocarrier_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("<p>When dialing if modem returns NO CARRIER\n" @@ -119,8 +119,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) chkBox = new TQCheckBox(i18n("&Show clock on caption"), parent); chkBox->setChecked(gpppdata.get_show_clock_on_caption()); - connect(chkBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(caption_toggled(bool))); + connect(chkBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(caption_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("When this option is checked, the window\n" @@ -130,8 +130,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) chkBox = new TQCheckBox(i18n("Disco&nnect on X server shutdown"), parent); chkBox->setChecked(gpppdata.get_xserver_exit_disconnect()); - connect(chkBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(xserver_toggled(bool))); + connect(chkBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(xserver_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("<p>Checking this option will close any\n" @@ -143,8 +143,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) chkBox = new TQCheckBox(i18n("&Quit on disconnect"), parent); chkBox->setChecked(gpppdata.quit_on_disconnect()); - connect(chkBox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(quit_toggled(bool))); + connect(chkBox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(quit_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("When this option is turned on, <i>kppp</i>\n" @@ -152,8 +152,8 @@ GeneralWidget::GeneralWidget( TQWidget *parent, const char *name) chkBox = new TQCheckBox(i18n("Minimi&ze window on connect"), parent); chkBox->setChecked(gpppdata.get_iconify_on_connect()); - connect(chkBox,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(iconify_toggled(bool))); + connect(chkBox,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(iconify_toggled(bool))); tl->addWidget(chkBox); TQWhatsThis::add(chkBox, i18n("Iconifies <i>kppp</i>'s window when a\n" @@ -238,8 +238,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) modemdevice->insertItem(gpppdata.modemDevice()); tl->addWidget(modemdevice, 1, 1); -/* connect(modemdevice, TQT_SIGNAL(activated(int)), - TQT_SLOT(setmodemdc(int)));*/ +/* connect(modemdevice, TQ_SIGNAL(activated(int)), + TQ_SLOT(setmodemdc(int)));*/ tmp = i18n("This specifies the serial port your modem is attached \n" "to. On Linux/x86, typically this is either /dev/ttyS0 \n" "(COM1 under DOS) or /dev/ttyS1 (COM2 under DOS).\n" @@ -266,8 +266,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) flowListItem << "None"; tl->addWidget(flowcontrol, 2, 1); - /*connect(flowcontrol, TQT_SIGNAL(activated(int)), - TQT_SLOT(setflowcontrol(int)));*/ + /*connect(flowcontrol, TQ_SIGNAL(activated(int)), + TQ_SLOT(setflowcontrol(int)));*/ tmp = i18n("<p>Specifies how the serial port and modem\n" "communicate. You should not change this unless\n" @@ -287,7 +287,7 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) enter->insertItem("LF"); enter->insertItem("CR/LF"); tl->addWidget(enter, 3, 1); - /* connect(enter, TQT_SIGNAL(activated(int)), TQT_SLOT(setenter(int)));*/ + /* connect(enter, TQ_SIGNAL(activated(int)), TQ_SLOT(setenter(int)));*/ tmp = i18n("<p>Specifies how AT commands are sent to your\n" "modem. Most modems will work fine with the\n" "default <i>CR/LF</i>. If your modem does not react\n" @@ -336,8 +336,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) baud_c->insertItem(baudrates[k]); baud_c->setCurrentItem(3); - /*connect(baud_c, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(speed_selection(int)));*/ + /*connect(baud_c, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(speed_selection(int)));*/ tl->addWidget(baud_c, 4, 1); tmp = i18n("Specifies the speed your modem and the serial\n" @@ -361,8 +361,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) modemlockfile = new TQCheckBox(i18n("&Use lock file"), parent); modemlockfile->setChecked(gpppdata.modemLockFile()); -/* connect(modemlockfile, TQT_SIGNAL(toggled(bool)), - TQT_SLOT(modemlockfilechanged(bool)));*/ +/* connect(modemlockfile, TQ_SIGNAL(toggled(bool)), + TQ_SLOT(modemlockfilechanged(bool)));*/ tl->addMultiCellWidget(modemlockfile, 5, 5, 0, 1); // l12->addStretch(1); TQWhatsThis::add(modemlockfile, @@ -382,8 +382,8 @@ ModemWidget::ModemWidget(TQWidget *parent, bool isnewmodem, const char *name) modemtimeout->setLabel(i18n("Modem &timeout:")); modemtimeout->setRange(1, 120, 1); modemtimeout->setSuffix(i18n(" sec")); -/* connect(modemtimeout, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(modemtimeoutchanged(int)));*/ +/* connect(modemtimeout, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(modemtimeoutchanged(int)));*/ tl->addMultiCellWidget(modemtimeout, 6, 6, 0, 1); TQWhatsThis::add(modemtimeout, @@ -453,7 +453,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) waitfordt = new TQCheckBox(i18n("&Wait for dial tone before dialing"), parent); waitfordt->setChecked(gpppdata.waitForDialTone()); - // connect(waitfordt, TQT_SIGNAL(toggled(bool)), TQT_SLOT(waitfordtchanged(bool))); + // connect(waitfordt, TQ_SIGNAL(toggled(bool)), TQ_SLOT(waitfordtchanged(bool))); l1->addWidget(waitfordt); TQWhatsThis::add(waitfordt, i18n("<p>Normally the modem waits for a dial tone\n" @@ -468,7 +468,7 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) busywait->setLabel(i18n("B&usy wait:")); busywait->setRange(0, 300, 5, true); busywait->setSuffix(i18n(" sec")); - // connect(busywait, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(busywaitchanged(int))); + // connect(busywait, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(busywaitchanged(int))); l1->addWidget(busywait); TQWhatsThis::add(busywait, @@ -494,8 +494,8 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) l1->addLayout(hbl); - /* connect(volume, TQT_SIGNAL(valueChanged(int)), - this, TQT_SLOT(volumeChanged(int)));*/ + /* connect(volume, TQ_SIGNAL(valueChanged(int)), + this, TQ_SLOT(volumeChanged(int)));*/ TQString tmp = i18n("Most modems have a speaker which makes\n" "a lot of noise when dialing. Here you can\n" "either turn this completely off or select a\n" @@ -512,8 +512,8 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) #if 0 chkbox1 = new TQCheckBox(i18n("Modem asserts CD line"), parent); chkbox1->setChecked(gpppdata.UseCDLine()); - connect(chkbox1,TQT_SIGNAL(toggled(bool)), - this,TQT_SLOT(use_cdline_toggled(bool))); + connect(chkbox1,TQ_SIGNAL(toggled(bool)), + this,TQ_SLOT(use_cdline_toggled(bool))); l12->addWidget(chkbox1); l12->addStretch(1); l1->addStretch(1); @@ -558,12 +558,12 @@ ModemWidget2::ModemWidget2(TQWidget *parent, const char *name) hbox->addStretch(1); l1->addStretch(1); - connect(modemcmds, TQT_SIGNAL(clicked()), - TQT_SLOT(modemcmdsbutton())); - connect(modeminfo_button, TQT_SIGNAL(clicked()), - TQT_SLOT(query_modem())); - connect(terminal_button, TQT_SIGNAL(clicked()), - TQT_SLOT(terminal())); + connect(modemcmds, TQ_SIGNAL(clicked()), + TQ_SLOT(modemcmdsbutton())); + connect(modeminfo_button, TQ_SIGNAL(clicked()), + TQ_SLOT(query_modem())); + connect(terminal_button, TQ_SIGNAL(clicked()), + TQ_SLOT(terminal())); // Create the Modem Command so if the window is not opened they are autosaved anyway mc = new ModemCommands(this); @@ -647,15 +647,15 @@ GraphSetup::GraphSetup(TQWidget *parent, const char *name) : tl->addStretch(); - connect(enable_check, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableToggled(bool))); - connect(bg_color, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(colorChanged(const TQColor&))); - connect(text_color, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(colorChanged(const TQColor&))); - connect(in_color, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(colorChanged(const TQColor&))); - connect(out_color, TQT_SIGNAL(changed(const TQColor &)), - TQT_SLOT(colorChanged(const TQColor&))); + connect(enable_check, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableToggled(bool))); + connect(bg_color, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(colorChanged(const TQColor&))); + connect(text_color, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(colorChanged(const TQColor&))); + connect(in_color, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(colorChanged(const TQColor&))); + connect(out_color, TQ_SIGNAL(changed(const TQColor &)), + TQ_SLOT(colorChanged(const TQColor&))); tl->activate(); diff --git a/kppp/kpppwidget.cpp b/kppp/kpppwidget.cpp index 3599145a..a6dfae00 100644 --- a/kppp/kpppwidget.cpp +++ b/kppp/kpppwidget.cpp @@ -105,8 +105,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) connectto_c = new TQComboBox(false, this); label1->setBuddy(connectto_c); - connect(connectto_c, TQT_SIGNAL(activated(int)), - TQT_SLOT(newdefaultaccount(int))); + connect(connectto_c, TQ_SIGNAL(activated(int)), + TQ_SLOT(newdefaultaccount(int))); l1->addWidget(connectto_c, 0, 2); label7 = new TQLabel(i18n("Use &modem: "), this); @@ -115,8 +115,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) label7->setBuddy(connectto_c); m_bModemCShown = false; - connect(modem_c, TQT_SIGNAL(activated(int)), - TQT_SLOT(newdefaultmodem(int))); + connect(modem_c, TQ_SIGNAL(activated(int)), + TQ_SLOT(newdefaultmodem(int))); // l1->addWidget(modem_c, 1, 2); (done in resetmodems()) ID_Label = new TQLabel(i18n("&Login ID:"), this); @@ -126,8 +126,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) ID_Edit = new TQLineEdit(this); ID_Label->setBuddy(ID_Edit); l1->addWidget(ID_Edit, 2, 2); - connect(ID_Edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(enterPressedInID())); + connect(ID_Edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(enterPressedInID())); TQString tmp = i18n("<p>Type in the username that you got from your\n" "ISP. This is especially important for PAP\n" "and CHAP. You may omit this when you use\n" @@ -146,8 +146,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) PW_Label->setBuddy(PW_Edit); PW_Edit->setEchoMode(TQLineEdit::Password); l1->addWidget(PW_Edit, 3, 2); - connect(PW_Edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(enterPressedInPW())); + connect(PW_Edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(enterPressedInPW())); tmp = i18n("<p>Type in the password that you got from your\n" "ISP. This is especially important for PAP\n" @@ -166,8 +166,8 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) tl->addSpacing(5); l3->addSpacing(10); log = new TQCheckBox(i18n("Show lo&g window"), this); - connect(log, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(log_window_toggled(bool))); + connect(log, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(log_window_toggled(bool))); log->setChecked(gpppdata.get_show_log_window()); l3->addWidget(log); @@ -188,12 +188,12 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) int minw = 0; quit_b = new KPushButton(KStdGuiItem::quit(), this); - connect( quit_b, TQT_SIGNAL(clicked()), TQT_SLOT(quitbutton())); + connect( quit_b, TQ_SIGNAL(clicked()), TQ_SLOT(quitbutton())); if(quit_b->sizeHint().width() > minw) minw = quit_b->sizeHint().width(); setup_b = new KPushButton(KGuiItem(i18n("Co&nfigure..."), "configure"), this); - connect( setup_b, TQT_SIGNAL(clicked()), TQT_SLOT(expandbutton())); + connect( setup_b, TQ_SIGNAL(clicked()), TQ_SLOT(expandbutton())); if(setup_b->sizeHint().width() > minw) minw = setup_b->sizeHint().width(); @@ -201,7 +201,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) setup_b->setEnabled(false); help_b = new KPushButton(KStdGuiItem::help(), this); - connect( help_b, TQT_SIGNAL(clicked()), TQT_SLOT(helpbutton())); + connect( help_b, TQ_SIGNAL(clicked()), TQ_SLOT(helpbutton())); KHelpMenu *helpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData(), true); help_b->setPopup((TQPopupMenu*)helpMenu->menu()); @@ -212,7 +212,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) connect_b = new TQPushButton(i18n("&Connect"), this); connect_b->setDefault(true); connect_b->setFocus(); - connect(connect_b, TQT_SIGNAL(clicked()), TQT_SLOT(beginConnect())); + connect(connect_b, TQ_SIGNAL(clicked()), TQ_SLOT(beginConnect())); if(connect_b->sizeHint().width() > minw) minw = connect_b->sizeHint().width(); @@ -233,7 +233,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) // we also connect cmld_start to the beginConnect so that I can run // the dialer through a command line argument - connect(this,TQT_SIGNAL(cmdl_start()),this,TQT_SLOT(beginConnect())); + connect(this,TQ_SIGNAL(cmdl_start()),this,TQ_SLOT(beginConnect())); stats = new PPPStats; @@ -256,28 +256,28 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) resetmodems(); con = new ConnectWidget(0, "con", stats); KWin::setIcons(con->winId(), kapp->icon(), kapp->miniIcon() ); - connect(this, TQT_SIGNAL(begin_connect()),con, TQT_SLOT(preinit())); + connect(this, TQ_SIGNAL(begin_connect()),con, TQ_SLOT(preinit())); TQRect desk = TDEGlobalSettings::desktopGeometry(topLevelWidget()); con->setGeometry(desk.center().x()-175, desk.center().y()-55, 350,110); // connect the ConnectWidgets various signals - connect(con, TQT_SIGNAL(closeDebugWindow()), - debugwindow, TQT_SLOT(hide())); - connect(con, TQT_SIGNAL(debugMessage(const TQString &)), - debugwindow, TQT_SLOT(statusLabel(const TQString &))); - connect(con, TQT_SIGNAL(toggleDebugWindow()), - debugwindow, TQT_SLOT(toggleVisibility())); - connect(con, TQT_SIGNAL(debugPutChar(unsigned char)), - debugwindow, TQT_SLOT(addChar(unsigned char))); - connect(con, TQT_SIGNAL(startAccounting()), - this, TQT_SLOT(startAccounting())); - connect(con, TQT_SIGNAL(stopAccounting()), - this, TQT_SLOT(stopAccounting())); - connect(TDEApplication::kApplication(), TQT_SIGNAL(saveYourself()), - this, TQT_SLOT(saveMyself())); - connect(TDEApplication::kApplication(), TQT_SIGNAL(shutDown()), - this, TQT_SLOT(shutDown())); + connect(con, TQ_SIGNAL(closeDebugWindow()), + debugwindow, TQ_SLOT(hide())); + connect(con, TQ_SIGNAL(debugMessage(const TQString &)), + debugwindow, TQ_SLOT(statusLabel(const TQString &))); + connect(con, TQ_SIGNAL(toggleDebugWindow()), + debugwindow, TQ_SLOT(toggleVisibility())); + connect(con, TQ_SIGNAL(debugPutChar(unsigned char)), + debugwindow, TQ_SLOT(addChar(unsigned char))); + connect(con, TQ_SIGNAL(startAccounting()), + this, TQ_SLOT(startAccounting())); + connect(con, TQ_SIGNAL(stopAccounting()), + this, TQ_SLOT(stopAccounting())); + connect(TDEApplication::kApplication(), TQ_SIGNAL(saveYourself()), + this, TQ_SLOT(saveMyself())); + connect(TDEApplication::kApplication(), TQ_SIGNAL(shutDown()), + this, TQ_SLOT(shutDown())); debugwindow->setGeometry(desk.center().x()+190, desk.center().y()-55, debugwindow->width(),debugwindow->height()); @@ -342,7 +342,7 @@ KPPPWidget::KPPPWidget( TQWidget *parent, const char *name ) // this timer will delay the actual disconnection DISCONNECTION_DELAY ms // to give applications time to shutdown, logout, whatever.. disconnectTimer = new TQTimer(this); - connect(disconnectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(delayedDisconnect())); + connect(disconnectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(delayedDisconnect())); } KPPPWidget::~KPPPWidget() @@ -391,16 +391,16 @@ void KPPPWidget::prepareSetupDialog() { // tabWindow->setFixedSize( 365, 375 ); accounts = new AccountWidget(tabWindow->addPage( i18n("&Accounts"), i18n("Account Setup") ) ); - connect(accounts, TQT_SIGNAL(resetaccounts()), - this, TQT_SLOT(resetaccounts())); - connect(accounts, TQT_SIGNAL(resetCosts(const TQString &)), - this, TQT_SLOT(resetCosts(const TQString &))); - connect(accounts, TQT_SIGNAL(resetVolume(const TQString &)), - this, TQT_SLOT(resetVolume(const TQString &))); + connect(accounts, TQ_SIGNAL(resetaccounts()), + this, TQ_SLOT(resetaccounts())); + connect(accounts, TQ_SIGNAL(resetCosts(const TQString &)), + this, TQ_SLOT(resetCosts(const TQString &))); + connect(accounts, TQ_SIGNAL(resetVolume(const TQString &)), + this, TQ_SLOT(resetVolume(const TQString &))); modems = new ModemsWidget(tabWindow->addPage( i18n("&Modems"), i18n("Modems Setup") ) ); - connect(modems, TQT_SIGNAL(resetmodems()), - this, TQT_SLOT(resetmodems())); + connect(modems, TQ_SIGNAL(resetmodems()), + this, TQ_SLOT(resetmodems())); graph = new GraphSetup( tabWindow->addPage( i18n("&Graph"), i18n("Throughput Graph" ) ) ); general = new GeneralWidget( tabWindow->addPage( i18n("M&isc"), i18n("Miscellaneous Settings") ) ); @@ -476,11 +476,11 @@ void KPPPWidget::resetaccounts() { PW_Edit->setText(gpppdata.storedPassword()); } - connect(ID_Edit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(usernameChanged(const TQString &))); + connect(ID_Edit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(usernameChanged(const TQString &))); - connect(PW_Edit, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(passwordChanged(const TQString &))); + connect(PW_Edit, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(passwordChanged(const TQString &))); if (ID_Edit->text().isEmpty()) ID_Edit->setFocus(); @@ -917,8 +917,8 @@ void KPPPWidget::startAccounting() { // acct = new ExecutableAccounting(this); // connect to the accounting object - connect(acct, TQT_SIGNAL(changed(TQString, TQString)), - con_win, TQT_SLOT(slotAccounting(TQString, TQString))); + connect(acct, TQ_SIGNAL(changed(TQString, TQString)), + con_win, TQ_SLOT(slotAccounting(TQString, TQString))); if(!acct->loadRuleSet(gpppdata.accountingFile())) { TQString s= i18n("Can not load the accounting " @@ -927,7 +927,7 @@ void KPPPWidget::startAccounting() { // starting the messagebox with a timer will prevent us // from blocking the calling function ConnectWidget::timerEvent ruleset_load_errmsg = s; - TQTimer::singleShot(0, this, TQT_SLOT(rulesetLoadError())); + TQTimer::singleShot(0, this, TQ_SLOT(rulesetLoadError())); return; } else acct->slotStart(); @@ -1043,8 +1043,8 @@ void KPPPWidget::showNews() { bbox->addStretch(1); TQPushButton *ok = bbox->addButton(KStdGuiItem::ok()); ok->setDefault(true); - dlg.connect(ok, TQT_SIGNAL(clicked()), - &dlg, TQT_SLOT(accept())); + dlg.connect(ok, TQ_SIGNAL(clicked()), + &dlg, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); diff --git a/kppp/loginterm.cpp b/kppp/loginterm.cpp index a663e9b2..e5c4f3f1 100644 --- a/kppp/loginterm.cpp +++ b/kppp/loginterm.cpp @@ -116,11 +116,11 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name) cancel_b = new KPushButton(KStdGuiItem::cancel(), this, "cancel"); cancel_b->setFixedHeight(25); - connect(cancel_b, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton())); + connect(cancel_b, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton())); continue_b = new KPushButton(KStdGuiItem::cont(), this, "continue"); continue_b->setFixedHeight(25); - connect(continue_b, TQT_SIGNAL(clicked()), TQT_SLOT(continuebutton())); + connect(continue_b, TQ_SIGNAL(clicked()), TQ_SLOT(continuebutton())); int mwidth; if (cancel_b->sizeHint().width() > continue_b->sizeHint().width()) @@ -136,7 +136,7 @@ LoginTerm::LoginTerm (TQWidget *parent, const char *name) cont = false; - Modem::modem->notify(text_window, TQT_SLOT(readChar(unsigned char))); + Modem::modem->notify(text_window, TQ_SLOT(readChar(unsigned char))); } diff --git a/kppp/logview/export.cpp b/kppp/logview/export.cpp index f236be50..432ec970 100644 --- a/kppp/logview/export.cpp +++ b/kppp/logview/export.cpp @@ -60,7 +60,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) TQHBoxLayout *formatLayout = new TQHBoxLayout(formatPage); typeList = new TQListBox(formatPage); - connect(typeList, TQT_SIGNAL(highlighted(int)), TQT_SLOT (typeHighlighted(int))); + connect(typeList, TQ_SIGNAL(highlighted(int)), TQ_SLOT (typeHighlighted(int))); typeList->setMinimumSize(50, 200); TQToolTip::add(typeList, i18n("List with possible output formats")); int i=0; @@ -100,7 +100,7 @@ ExportWizard::ExportWizard(TQWidget *parent, const TQString &_date) fnGet->setMaximumWidth(200); TQToolTip::add(fnGet, i18n("Select the filename of the exported output file")); filenameLayout->addWidget(fnGet); - connect(fnGet, TQT_SIGNAL(clicked()), TQT_SLOT(getFilename())); + connect(fnGet, TQ_SIGNAL(clicked()), TQ_SLOT(getFilename())); filenameLayout->addStretch(2); addPage(filenamePage, i18n("Selection of Filename")); diff --git a/kppp/logview/main.cpp b/kppp/logview/main.cpp index 8633d46f..b4591e0c 100644 --- a/kppp/logview/main.cpp +++ b/kppp/logview/main.cpp @@ -73,8 +73,8 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") { mb->insertItem(i18n("&File"), fm); mb->setAccel(CTRL + Key_Q, F_EXIT); - connect(mb, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(menuCallback(int))); + connect(mb, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(menuCallback(int))); } else { mb = 0; TQPushButton *but = new KPushButton(KStdGuiItem::close(),w); @@ -82,8 +82,8 @@ TopWidget::TopWidget() : TDEMainWindow(0, "") { lh->addStretch(10); lh->addWidget(but); - connect(but, TQT_SIGNAL(clicked()), - kapp, TQT_SLOT(quit())); + connect(but, TQ_SIGNAL(clicked()), + kapp, TQ_SLOT(quit())); } setMinimumSize(mw->sizeHint().width() + 15, diff --git a/kppp/logview/monthly.cpp b/kppp/logview/monthly.cpp index 1a6b5a1f..656bf582 100644 --- a/kppp/logview/monthly.cpp +++ b/kppp/logview/monthly.cpp @@ -196,7 +196,7 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : lv->setMinimumHeight(280); lv->setSelectionMode(TQListView::Extended); selectionItem = 0L; - connect(lv, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(lv, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); lv2 = new TDEListView(this); lv2->addColumn(i18n("Connection")); @@ -225,8 +225,8 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : cboConnections = new TQComboBox(false, this); // add a combo box to select connections cboConnections->setMaximumWidth(200); // a resonable size cboConnections->insertItem(i18n("All Connections")); // default to all connections - connect(cboConnections, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotConnections(int))); + connect(cboConnections, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotConnections(int))); bbox = new KButtonBox(this, TQt::Vertical); prev = bbox->addButton(i18n("&Prev Month")); @@ -236,14 +236,14 @@ MonthlyWidget::MonthlyWidget(TQWidget *parent) : bbox->addStretch(1); exportBttn = bbox->addButton(i18n("&Export...")); - connect(prev, TQT_SIGNAL(released()), - this, TQT_SLOT(prevMonth())); - connect(next, TQT_SIGNAL(released()), - this, TQT_SLOT(nextMonth())); - connect(today, TQT_SIGNAL(released()), - this, TQT_SLOT(currentMonth())); - connect(exportBttn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(exportWizard())); + connect(prev, TQ_SIGNAL(released()), + this, TQ_SLOT(prevMonth())); + connect(next, TQ_SIGNAL(released()), + this, TQ_SLOT(nextMonth())); + connect(today, TQ_SIGNAL(released()), + this, TQ_SLOT(currentMonth())); + connect(exportBttn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(exportWizard())); bbox->addStretch(8); bbox->layout(); diff --git a/kppp/miniterm.cpp b/kppp/miniterm.cpp index 55f526fd..e65f812e 100644 --- a/kppp/miniterm.cpp +++ b/kppp/miniterm.cpp @@ -54,9 +54,9 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name) KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); m_file = new TQPopupMenu(this); - m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQT_SLOT(cancelbutton()) ); + m_file->insertItem( SmallIcon("window-close"), i18n("&Close"), this, TQ_SLOT(cancelbutton()) ); m_options = new TQPopupMenu(this); - m_options->insertItem(i18n("&Reset Modem"),this,TQT_SLOT(resetModem())); + m_options->insertItem(i18n("&Reset Modem"),this,TQ_SLOT(resetModem())); m_help = new KHelpMenu(this, i18n("MiniTerm - A terminal emulation for KPPP\n\n" @@ -86,7 +86,7 @@ MiniTerm::MiniTerm(TQWidget *parent, const char *name) layout->addWidget(statusbar); inittimer = new TQTimer(this); - connect(inittimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(init())); + connect(inittimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(init())); inittimer->start(500); resize(550,400); @@ -103,16 +103,16 @@ void MiniTerm::setupToolbar() { toolbar = new TDEToolBar( this ); toolbar->insertButton("system-log-out", 0, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(cancelbutton()), TRUE, i18n("Close MiniTerm")); toolbar->insertButton("back", 0, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(resetModem()), TRUE, i18n("Reset Modem")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(resetModem()), TRUE, i18n("Reset Modem")); toolbar->insertButton("help", 0, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(help()), TRUE, i18n("Help")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(help()), TRUE, i18n("Help")); toolbar->setBarPos( TDEToolBar::Top ); toolbar->setMovingEnabled(false); @@ -154,7 +154,7 @@ void MiniTerm::init() { kapp->processEvents(); kapp->processEvents(); - Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char))); + Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char))); return; } } diff --git a/kppp/modem.cpp b/kppp/modem.cpp index ee75d417..9b24cb94 100644 --- a/kppp/modem.cpp +++ b/kppp/modem.cpp @@ -253,13 +253,13 @@ void Modem::readtty(int) { void Modem::notify(const TQObject *receiver, const char *member) { - connect(this, TQT_SIGNAL(charWaiting(unsigned char)), receiver, member); + connect(this, TQ_SIGNAL(charWaiting(unsigned char)), receiver, member); startNotifier(); } void Modem::stop() { - disconnect(TQT_SIGNAL(charWaiting(unsigned char))); + disconnect(TQ_SIGNAL(charWaiting(unsigned char))); stopNotifier(); } @@ -268,7 +268,7 @@ void Modem::startNotifier() { if(modemfd >= 0) { if(sn == 0) { sn = new TQSocketNotifier(modemfd, TQSocketNotifier::Read, this); - connect(sn, TQT_SIGNAL(activated(int)), TQT_SLOT(readtty(int))); + connect(sn, TQ_SIGNAL(activated(int)), TQ_SLOT(readtty(int))); kdDebug(5002) << "TQSocketNotifier started!" << endl; } else { // Debug("TQSocketNotifier re-enabled!"); diff --git a/kppp/modemcmds.cpp b/kppp/modemcmds.cpp index 625ee40b..0a68996a 100644 --- a/kppp/modemcmds.cpp +++ b/kppp/modemcmds.cpp @@ -73,8 +73,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) preinitslider = new TQSlider(0, 300, 1, 0, TQt::Horizontal, dummyWidget); preinitslider->setFixedHeight(preinitslider->sizeHint().height()); - connect(preinitslider, TQT_SIGNAL(valueChanged(int)), - lpreinitslider, TQT_SLOT(setNum(int))); + connect(preinitslider, TQ_SIGNAL(valueChanged(int)), + lpreinitslider, TQ_SLOT(setNum(int))); l2->addWidget(lpreinitslider, 0); l2->addWidget(preinitslider, 1); @@ -97,8 +97,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) initslider = new TQSlider(1, 300, 1, 0, TQt::Horizontal, dummyWidget); initslider->setFixedHeight(initslider->sizeHint().height()); - connect(initslider, TQT_SIGNAL(valueChanged(int)), - linitslider, TQT_SLOT(setNum(int))); + connect(initslider, TQ_SIGNAL(valueChanged(int)), + linitslider, TQ_SLOT(setNum(int))); l3->addWidget(linitslider, 0); l3->addWidget(initslider, 1); @@ -113,8 +113,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) durationslider = new TQSlider(1, 255, 1, 0, TQt::Horizontal, dummyWidget); durationslider->setFixedHeight(durationslider->sizeHint().height()); - connect(durationslider, TQT_SIGNAL(valueChanged(int)), - ldurationslider, TQT_SLOT(setNum(int))); + connect(durationslider, TQ_SIGNAL(valueChanged(int)), + ldurationslider, TQ_SLOT(setNum(int))); l4->addWidget(ldurationslider, 0); l4->addWidget(durationslider, 1); @@ -229,8 +229,8 @@ ModemCommands::ModemCommands(TQWidget *parent, const char *name) slider = new TQSlider(0, 255, 1, 0, TQt::Horizontal, dummyWidget); slider->setFixedHeight(slider->sizeHint().height()); - connect(slider, TQT_SIGNAL(valueChanged(int)), - lslider, TQT_SLOT(setNum(int))); + connect(slider, TQ_SIGNAL(valueChanged(int)), + lslider, TQ_SLOT(setNum(int))); l5->addWidget(lslider, 0); l5->addWidget(slider, 1); diff --git a/kppp/modemdb.cpp b/kppp/modemdb.cpp index a59bbb7d..4124f52c 100644 --- a/kppp/modemdb.cpp +++ b/kppp/modemdb.cpp @@ -81,16 +81,16 @@ ModemSelector::ModemSelector(TQWidget *parent) : TQDialog(parent, 0, true) { db = new ModemDatabase(); // set up signal/slots - connect(ok, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); - connect(cancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); - connect(vendor, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(vendorSelected(int))); - connect(model, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(modelSelected(int))); - connect(model, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(selected(int))); + connect(ok, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); + connect(vendor, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(vendorSelected(int))); + connect(model, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(modelSelected(int))); + connect(model, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(selected(int))); // fill vendor list with life vendor->insertStringList(*db->vendors()); diff --git a/kppp/modeminfo.cpp b/kppp/modeminfo.cpp index 75a6c00a..7053f2e9 100644 --- a/kppp/modeminfo.cpp +++ b/kppp/modeminfo.cpp @@ -67,7 +67,7 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) cancel = new KPushButton(KStdGuiItem::cancel(), this); cancel->setFocus(); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(cancelbutton())); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(cancelbutton())); TQHBoxLayout *l1 = new TQHBoxLayout; tl->addLayout(l1); @@ -81,13 +81,13 @@ ModemTransfer::ModemTransfer(TQWidget *parent, const char *name) //////////////////////////////////////////////// timeout_timer = new TQTimer(this); - connect(timeout_timer, TQT_SIGNAL(timeout()), TQT_SLOT(time_out_slot())); + connect(timeout_timer, TQ_SIGNAL(timeout()), TQ_SLOT(time_out_slot())); scripttimer = new TQTimer(this); - connect(scripttimer, TQT_SIGNAL(timeout()), TQT_SLOT(do_script())); + connect(scripttimer, TQ_SIGNAL(timeout()), TQ_SLOT(do_script())); timeout_timer->start(15000,TRUE); // 15 secs single shot - TQTimer::singleShot(500, this, TQT_SLOT(init())); + TQTimer::singleShot(500, this, TQ_SLOT(init())); } @@ -151,7 +151,7 @@ void ModemTransfer::init() { // clear modem buffer Modem::modem->flush(); - Modem::modem->notify(this, TQT_SLOT(readChar(unsigned char))); + Modem::modem->notify(this, TQ_SLOT(readChar(unsigned char))); return; } } @@ -277,7 +277,7 @@ ModemInfo::ModemInfo(TQWidget *parent, const char* name) tl->addLayout(l2); l2->addStretch(1); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); l2->addWidget(ok); setMinimumSize(sizeHint()); diff --git a/kppp/modems.cpp b/kppp/modems.cpp index c064b714..9ceab292 100644 --- a/kppp/modems.cpp +++ b/kppp/modems.cpp @@ -62,16 +62,16 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) modemlist_l = new TQListBox(parent); modemlist_l->setMinimumSize(160, 128); - connect(modemlist_l, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(slotListBoxSelect(int))); - connect(modemlist_l, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(editmodem())); + connect(modemlist_l, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(slotListBoxSelect(int))); + connect(modemlist_l, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(editmodem())); l11->addWidget(modemlist_l, 10); TQVBoxLayout *l111 = new TQVBoxLayout; l11->addLayout(l111, 1); edit_b = new TQPushButton(i18n("&Edit..."), parent); - connect(edit_b, TQT_SIGNAL(clicked()), TQT_SLOT(editmodem())); + connect(edit_b, TQ_SIGNAL(clicked()), TQ_SLOT(editmodem())); TQWhatsThis::add(edit_b, i18n("Allows you to modify the selected account")); min = edit_b->sizeHint().width(); @@ -81,13 +81,13 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) l111->addWidget(edit_b); new_b = new TQPushButton(i18n("&New..."), parent); - connect(new_b, TQT_SIGNAL(clicked()), TQT_SLOT(newmodem())); + connect(new_b, TQ_SIGNAL(clicked()), TQ_SLOT(newmodem())); l111->addWidget(new_b); TQWhatsThis::add(new_b, i18n("Create a new dialup connection\n" "to the Internet")); copy_b = new TQPushButton(i18n("Co&py"), parent); - connect(copy_b, TQT_SIGNAL(clicked()), TQT_SLOT(copymodem())); + connect(copy_b, TQ_SIGNAL(clicked()), TQ_SLOT(copymodem())); l111->addWidget(copy_b); TQWhatsThis::add(copy_b, i18n("Makes a copy of the selected account. All\n" @@ -96,7 +96,7 @@ ModemsWidget::ModemsWidget( TQWidget *parent, const char *name ) "needs")); delete_b = new TQPushButton(i18n("De&lete"), parent); - connect(delete_b, TQT_SIGNAL(clicked()), TQT_SLOT(deletemodem())); + connect(delete_b, TQ_SIGNAL(clicked()), TQ_SLOT(deletemodem())); l111->addWidget(delete_b); TQWhatsThis::add(delete_b, i18n("<p>Deletes the selected account\n\n" @@ -224,7 +224,7 @@ int ModemsWidget::doTab(){ } modem1 = new ModemWidget(tabWindow->addPage( i18n("&Device"), i18n("Serial Device")), isnewmodem ); modem2 = new ModemWidget2(tabWindow->addPage( i18n("&Modem"), i18n("Modem Settings"))); - connect ( modem1->connectName(), TQT_SIGNAL(textChanged ( const TQString & )), this, TQT_SLOT(modemNameChanged(const TQString & ))); + connect ( modem1->connectName(), TQ_SIGNAL(textChanged ( const TQString & )), this, TQ_SLOT(modemNameChanged(const TQString & ))); modemNameChanged(modem1->connectName()->text()); int result = 0; diff --git a/kppp/pppdargs.cpp b/kppp/pppdargs.cpp index 138cc663..2bbc1e62 100644 --- a/kppp/pppdargs.cpp +++ b/kppp/pppdargs.cpp @@ -61,29 +61,29 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) argument = new TQLineEdit(this); argument_label->setBuddy(argument); - connect(argument, TQT_SIGNAL(returnPressed()), - TQT_SLOT(addbutton())); + connect(argument, TQ_SIGNAL(returnPressed()), + TQ_SLOT(addbutton())); l11->addWidget(argument); - connect(argument, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &))); + connect(argument, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &))); arguments = new TQListBox(this); arguments->setMinimumSize(1, fontMetrics().lineSpacing()*10); - connect(arguments, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(itemSelected(int))); + connect(arguments, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(itemSelected(int))); l1->addWidget(arguments, 1); add = new TQPushButton(i18n("&Add"), this); - connect(add, TQT_SIGNAL(clicked()), TQT_SLOT(addbutton())); + connect(add, TQ_SIGNAL(clicked()), TQ_SLOT(addbutton())); l2->addWidget(add); l2->addStretch(1); remove = new TQPushButton(i18n("&Remove"), this); - connect(remove, TQT_SIGNAL(clicked()), TQT_SLOT(removebutton())); + connect(remove, TQ_SIGNAL(clicked()), TQ_SLOT(removebutton())); l2->addWidget(remove); defaults = new KPushButton(KStdGuiItem::defaults(), this); - connect(defaults, TQT_SIGNAL(clicked()), TQT_SLOT(defaultsbutton())); + connect(defaults, TQ_SIGNAL(clicked()), TQ_SLOT(defaultsbutton())); l2->addWidget(defaults); l->addSpacing(5); @@ -91,10 +91,10 @@ PPPdArguments::PPPdArguments(TQWidget *parent, const char *name) KButtonBox *bbox = new KButtonBox(this); bbox->addStretch(1); closebtn = bbox->addButton(KStdGuiItem::ok()); - connect(closebtn, TQT_SIGNAL(clicked()), TQT_SLOT(closebutton())); + connect(closebtn, TQ_SIGNAL(clicked()), TQ_SLOT(closebutton())); TQPushButton *cancel = bbox->addButton(KStdGuiItem::cancel()); - connect(cancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); + connect(cancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); bbox->layout(); l->addWidget(bbox); diff --git a/kppp/ppplog.cpp b/kppp/ppplog.cpp index 8ca0a652..590c15bc 100644 --- a/kppp/ppplog.cpp +++ b/kppp/ppplog.cpp @@ -265,10 +265,10 @@ void PPPL_ShowLog() { for(uint i = 0; i < result.count(); i++) diagnosis->append(*result.at(i)); - dlg->connect(close, TQT_SIGNAL(clicked()), - dlg, TQT_SLOT(reject())); - dlg->connect(write, TQT_SIGNAL(clicked()), - dlg, TQT_SLOT(accept())); + dlg->connect(close, TQ_SIGNAL(clicked()), + dlg, TQ_SLOT(reject())); + dlg->connect(write, TQ_SIGNAL(clicked()), + dlg, TQ_SLOT(accept())); if(dlg->exec()) { TQDir d = TQDir::home(); diff --git a/kppp/pppstatdlg.cpp b/kppp/pppstatdlg.cpp index f65c36ca..f70b379d 100644 --- a/kppp/pppstatdlg.cpp +++ b/kppp/pppstatdlg.cpp @@ -174,19 +174,19 @@ PPPStatsDlg::PPPStatsDlg(TQWidget *parent, const char *name, TQWidget *, cancelbutton = new KPushButton(KStdGuiItem::close(),this, "cancelbutton"); cancelbutton->setFocus(); - connect(cancelbutton, TQT_SIGNAL(clicked()), this,TQT_SLOT(cancel())); + connect(cancelbutton, TQ_SIGNAL(clicked()), this,TQ_SLOT(cancel())); cancelbutton->setFixedHeight(cancelbutton->sizeHint().height()); cancelbutton->setMinimumWidth(TQMAX(cancelbutton->sizeHint().width(), 70)); l12->addWidget(cancelbutton); if(gpppdata.graphingEnabled()) { graphTimer = new TQTimer(this); - connect(graphTimer, TQT_SIGNAL(timeout()), TQT_SLOT(updateGraph())); + connect(graphTimer, TQ_SIGNAL(timeout()), TQ_SLOT(updateGraph())); } setFixedSize(sizeHint()); - connect(stats, TQT_SIGNAL(statsChanged(int)), TQT_SLOT(paintIcon(int))); + connect(stats, TQ_SIGNAL(statsChanged(int)), TQ_SLOT(paintIcon(int))); // read window position from config file int p_x, p_y; diff --git a/kppp/pppstats.cpp b/kppp/pppstats.cpp index 9dd6f366..aedd63bf 100644 --- a/kppp/pppstats.cpp +++ b/kppp/pppstats.cpp @@ -109,7 +109,7 @@ PPPStats::PPPStats() { clear(); timer = new TQTimer; - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timerClick())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(timerClick())); } diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp index d88fbefb..508b5f5f 100644 --- a/kppp/providerdb.cpp +++ b/kppp/providerdb.cpp @@ -83,10 +83,10 @@ ProviderDB::ProviderDB(TQWidget *parent) : setFinish(page9, true); setFinishEnabled(page9, true); - connect((const TQObject *)nextButton(), TQT_SIGNAL(clicked()), - this, TQT_SLOT(pageSelected())); - connect((const TQObject *)backButton(), TQT_SIGNAL(clicked()), - this, TQT_SLOT(pageSelected())); + connect((const TQObject *)nextButton(), TQ_SIGNAL(clicked()), + this, TQ_SLOT(pageSelected())); + connect((const TQObject *)backButton(), TQ_SIGNAL(clicked()), + this, TQ_SLOT(pageSelected())); // resize(minimumSize()); adjustSize(); @@ -198,8 +198,8 @@ PDB_Country::PDB_Country(TQWidget *parent) : TQWidget(parent) { l1->addStretch(1); lb = new TQListBox(this); - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(selectionChanged(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(selectionChanged(int))); lb->setMinimumSize(220, 100); l1->addWidget(lb, 2); l1->addStretch(1); @@ -274,8 +274,8 @@ PDB_Provider::PDB_Provider(TQWidget *parent) : TQWidget(parent) { l1->addStretch(1); lb = new TQListBox(this); - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(selectionChanged(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(selectionChanged(int))); lb->setMinimumSize(220, 100); l1->addWidget(lb, 2); l1->addStretch(1); @@ -350,13 +350,13 @@ PDB_UserInfo::PDB_UserInfo(TQWidget *parent) : TQWidget(parent) { l = new TQLabel(i18n("Password:"), this); l1->addWidget(l, 1, 0); _username = newLineEdit(24, this); - connect(_username, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &))); + connect(_username, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &))); l1->addWidget(_username, 0, 1); _password = newLineEdit(24, this); _password->setEchoMode(TQLineEdit::Password); - connect(_password, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(textChanged(const TQString &))); + connect(_password, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(textChanged(const TQString &))); l1->addWidget(_password, 1, 1); tl->activate(); } diff --git a/kppp/pwentry.cpp b/kppp/pwentry.cpp index 2af3efb4..32442a53 100644 --- a/kppp/pwentry.cpp +++ b/kppp/pwentry.cpp @@ -53,7 +53,7 @@ PWEntry::PWEntry( TQWidget *parent, const char *name ) pw = new TQLineEdit( this, "le" ); pw->setEchoMode( TQLineEdit::Password ); - connect( pw, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(hide()) ); + connect( pw, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(hide()) ); isconsumed = TRUE; } diff --git a/kppp/scriptedit.cpp b/kppp/scriptedit.cpp index afa88821..9667776d 100644 --- a/kppp/scriptedit.cpp +++ b/kppp/scriptedit.cpp @@ -51,12 +51,12 @@ ScriptEdit::ScriptEdit( TQWidget *parent, const char *name ) st->insertItem("Scan"); st->insertItem("Save"); st->insertItem("SendNoEcho"); - connect(st, TQT_SIGNAL(activated(int)), TQT_SLOT(setType(int))); + connect(st, TQ_SIGNAL(activated(int)), TQ_SLOT(setType(int))); se = new TQLineEdit(this, "se"); se->setGeometry(120, 5, 140, 25); se->setMaxLength(50); - connect(se, TQT_SIGNAL(returnPressed()), TQT_SLOT(seReturnPressed())); + connect(se, TQ_SIGNAL(returnPressed()), TQ_SLOT(seReturnPressed())); tl->addWidget(st, 3); tl->addWidget(se, 7); diff --git a/krdc/kfullscreenpanel.cpp b/krdc/kfullscreenpanel.cpp index 0c85cfdd..1546c8fa 100644 --- a/krdc/kfullscreenpanel.cpp +++ b/krdc/kfullscreenpanel.cpp @@ -20,7 +20,7 @@ Counter::Counter(float start) : m_currentValue(start) { - connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); } void Counter::count(float stop, float stepSize, float frequency) { @@ -63,8 +63,8 @@ KFullscreenPanel::KFullscreenPanel(TQWidget* parent, m_fsResolution(resolution), m_counter(0) { - connect(&m_counter, TQT_SIGNAL(countingDownFinished()), TQT_SLOT(hide())); - connect(&m_counter, TQT_SIGNAL(counted(float)), TQT_SLOT(movePanel(float))); + connect(&m_counter, TQ_SIGNAL(countingDownFinished()), TQ_SLOT(hide())); + connect(&m_counter, TQ_SIGNAL(counted(float)), TQ_SLOT(movePanel(float))); } KFullscreenPanel::~KFullscreenPanel() { diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index 0c82cdf1..1e86891d 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -101,8 +101,8 @@ KRDC::KRDC(WindowMode wm, const TQString &host, m_localCursor(localCursor), m_initialWindowSize(initialWindowSize) { - connect(&m_autoHideTimer, TQT_SIGNAL(timeout()), TQT_SLOT(hideFullscreenToolbarNow())); - connect(&m_bumpScrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(bumpScroll())); + connect(&m_autoHideTimer, TQ_SIGNAL(timeout()), TQ_SLOT(hideFullscreenToolbarNow())); + connect(&m_bumpScrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(bumpScroll())); m_pindown = UserIcon("pindown"); m_pinup = UserIcon("pinup"); @@ -192,18 +192,18 @@ bool KRDC::start() m_scrollView->addChild(m_view); TQWhatsThis::add(m_view, i18n("Here you can see the remote desktop. If the other side allows you to control it, you can also move the mouse, click or enter keystrokes. If the content does not fit your screen, click on the toolbar's full screen button or scale button. To end the connection, just close the window.")); - connect(m_view, TQT_SIGNAL(changeSize(int,int)), TQT_SLOT(setSize(int,int))); - connect(m_view, TQT_SIGNAL(connected()), TQT_SLOT(show())); - connect(m_view, TQT_SIGNAL(disconnected()), TQT_SIGNAL(disconnected())); + connect(m_view, TQ_SIGNAL(changeSize(int,int)), TQ_SLOT(setSize(int,int))); + connect(m_view, TQ_SIGNAL(connected()), TQ_SLOT(show())); + connect(m_view, TQ_SIGNAL(disconnected()), TQ_SIGNAL(disconnected())); // note that the disconnectedError() will be disconnected when kremoteview // is completely initialized - connect(m_view, TQT_SIGNAL(disconnectedError()), TQT_SIGNAL(disconnectedError())); - connect(m_view, TQT_SIGNAL(statusChanged(RemoteViewStatus)), - TQT_SLOT(changeProgress(RemoteViewStatus))); - connect(m_view, TQT_SIGNAL(showingPasswordDialog(bool)), - TQT_SLOT(showingPasswordDialog(bool))); - connect(m_keyCaptureDialog, TQT_SIGNAL(keyPressed(XEvent*)), - m_view, TQT_SLOT(pressKey(XEvent*))); + connect(m_view, TQ_SIGNAL(disconnectedError()), TQ_SIGNAL(disconnectedError())); + connect(m_view, TQ_SIGNAL(statusChanged(RemoteViewStatus)), + TQ_SLOT(changeProgress(RemoteViewStatus))); + connect(m_view, TQ_SIGNAL(showingPasswordDialog(bool)), + TQ_SLOT(showingPasswordDialog(bool))); + connect(m_keyCaptureDialog, TQ_SIGNAL(keyPressed(XEvent*)), + m_view, TQ_SLOT(pressKey(XEvent*))); ret_status = m_view->start(); @@ -219,8 +219,8 @@ void KRDC::changeProgress(RemoteViewStatus s) { m_progress = m_progressDialog->progressBar(); m_progress->setTextEnabled(false); m_progress->setTotalSteps(3); - connect(m_progressDialog, TQT_SIGNAL(cancelClicked()), - TQT_SIGNAL(disconnectedError())); + connect(m_progressDialog, TQ_SIGNAL(cancelClicked()), + TQ_SIGNAL(disconnectedError())); } if (s == REMOTE_VIEW_CONNECTING) { @@ -243,10 +243,10 @@ void KRDC::changeProgress(RemoteViewStatus s) { m_progress->setValue(3); hideProgressDialog(); if (s == REMOTE_VIEW_CONNECTED) { - TQObject::disconnect(m_view, TQT_SIGNAL(disconnectedError()), - this, TQT_SIGNAL(disconnectedError())); - connect(m_view, TQT_SIGNAL(disconnectedError()), - TQT_SIGNAL(disconnected())); + TQObject::disconnect(m_view, TQ_SIGNAL(disconnectedError()), + this, TQ_SIGNAL(disconnectedError())); + connect(m_view, TQ_SIGNAL(disconnectedError()), + TQ_SIGNAL(disconnected())); if (m_view->startFullscreen()) { // m_view instance is asking to start in fullscreen mode enableFullscreen(true); @@ -268,7 +268,7 @@ void KRDC::showingPasswordDialog(bool b) { void KRDC::showProgressDialog() { m_showProgress = true; - TQTimer::singleShot(400, this, TQT_SLOT(showProgressTimeout())); + TQTimer::singleShot(400, this, TQ_SLOT(showProgressTimeout())); } void KRDC::hideProgressDialog() { @@ -387,12 +387,12 @@ TQSize KRDC::sizeHint() TQPopupMenu *KRDC::createPopupMenu(TQWidget *parent) const { TDEPopupMenu *pu = new TDEPopupMenu(parent); - pu->insertItem(i18n("View Only"), this, TQT_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID); + pu->insertItem(i18n("View Only"), this, TQ_SLOT(viewOnlyToggled()), 0, VIEW_ONLY_ID); pu->setCheckable(true); pu->setItemChecked(VIEW_ONLY_ID, m_view->viewOnly()); if (m_view->supportsLocalCursor()) { pu->insertItem(i18n("Always Show Local Cursor"), this, - TQT_SLOT(showLocalCursorToggled()), 0, + TQ_SLOT(showLocalCursorToggled()), 0, SHOW_LOCAL_CURSOR_ID); pu->setCheckable(true); pu->setItemChecked(SHOW_LOCAL_CURSOR_ID, @@ -475,8 +475,8 @@ void KRDC::switchToFullscreen(bool scaling) } m_fsToolbar = new KFullscreenPanel(this, "fstoolbar", m_fullscreenResolution); - connect(m_fsToolbar, TQT_SIGNAL(mouseEnter()), TQT_SLOT(showFullscreenToolbar())); - connect(m_fsToolbar, TQT_SIGNAL(mouseLeave()), TQT_SLOT(hideFullscreenToolbarDelayed())); + connect(m_fsToolbar, TQ_SIGNAL(mouseEnter()), TQ_SLOT(showFullscreenToolbar())); + connect(m_fsToolbar, TQ_SIGNAL(mouseLeave()), TQ_SLOT(hideFullscreenToolbarDelayed())); TDEToolBar *t = new TDEToolBar(m_fsToolbar); m_fsToolbarWidget = t; @@ -490,14 +490,14 @@ void KRDC::switchToFullscreen(bool scaling) pinButton->setIconSet(pinIconSet); TQToolTip::add(pinButton, i18n("Autohide on/off")); t->setToggle(FS_AUTOHIDE_ID); - t->addConnection(FS_AUTOHIDE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFsToolbarAutoHide(bool))); + t->addConnection(FS_AUTOHIDE_ID, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setFsToolbarAutoHide(bool))); t->insertButton("view-restore", FS_FULLSCREEN_ID); TDEToolBarButton *fullscreenButton = t->getButton(FS_FULLSCREEN_ID); TQToolTip::add(fullscreenButton, i18n("Fullscreen")); t->setToggle(FS_FULLSCREEN_ID); t->setButton(FS_FULLSCREEN_ID, true); - t->addConnection(FS_FULLSCREEN_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool))); + t->addConnection(FS_FULLSCREEN_ID, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFullscreen(bool))); m_popup = createPopupMenu(t); t->insertButton("configure", FS_ADVANCED_ID, m_popup, true, i18n("Advanced options")); @@ -517,18 +517,18 @@ void KRDC::switchToFullscreen(bool scaling) TQToolTip::add(scaleButton, i18n("Scale view")); t->setToggle(FS_SCALE_ID); t->setButton(FS_SCALE_ID, scaling); - t->addConnection(FS_SCALE_ID, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToFullscreen(bool))); + t->addConnection(FS_SCALE_ID, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(switchToFullscreen(bool))); } t->insertButton("iconify", FS_ICONIFY_ID); TDEToolBarButton *iconifyButton = t->getButton(FS_ICONIFY_ID); TQToolTip::add(iconifyButton, i18n("Minimize")); - t->addConnection(FS_ICONIFY_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(iconify())); + t->addConnection(FS_ICONIFY_ID, TQ_SIGNAL(clicked()), this, TQ_SLOT(iconify())); t->insertButton("close", FS_CLOSE_ID); TDEToolBarButton *closeButton = t->getButton(FS_CLOSE_ID); TQToolTip::add(closeButton, i18n("Close")); - t->addConnection(FS_CLOSE_ID, TQT_SIGNAL(clicked()), this, TQT_SLOT(quit())); + t->addConnection(FS_CLOSE_ID, TQ_SIGNAL(clicked()), this, TQ_SLOT(quit())); m_fsToolbar->setChild(t); @@ -591,14 +591,14 @@ void KRDC::switchToNormal(bool scaling) TDEToolBar *t = new TDEToolBar(m_dockArea); m_toolbar = t; t->setIconText(TDEToolBar::IconTextRight); - connect(t, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(toolbarChanged())); + connect(t, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(toolbarChanged())); t->insertButton("view-fullscreen", 0, true, i18n("Fullscreen")); TDEToolBarButton *fullscreenButton = t->getButton(0); TQToolTip::add(fullscreenButton, i18n("Fullscreen")); TQWhatsThis::add(fullscreenButton, i18n("Switches to full screen. If the remote desktop has a different screen resolution, Remote Desktop Connection will automatically switch to the nearest resolution.")); t->setToggle(0); t->setButton(0, false); - t->addConnection(0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(enableFullscreen(bool))); + t->addConnection(0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(enableFullscreen(bool))); if (m_view->supportsScaling()) { t->insertButton("zoom-fit-best", 1, true, i18n("Scale")); @@ -607,14 +607,14 @@ void KRDC::switchToNormal(bool scaling) TQWhatsThis::add(scaleButton, i18n("This option scales the remote screen to fit your window size.")); t->setToggle(1); t->setButton(1, scaling); - t->addConnection(1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(switchToNormal(bool))); + t->addConnection(1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(switchToNormal(bool))); } t->insertButton("key_enter", 2, true, i18n("Special Keys")); TDEToolBarButton *skButton = t->getButton(2); TQToolTip::add(skButton, i18n("Enter special keys.")); TQWhatsThis::add(skButton, i18n("This option allows you to send special key combinations like Ctrl-Alt-Del to the remote host.")); - t->addConnection(2, TQT_SIGNAL(clicked()), m_keyCaptureDialog, TQT_SLOT(execute())); + t->addConnection(2, TQ_SIGNAL(clicked()), m_keyCaptureDialog, TQ_SLOT(execute())); if (m_popup) { m_popup->deleteLater(); diff --git a/krdc/main.cpp b/krdc/main.cpp index 1488df43..11106084 100644 --- a/krdc/main.cpp +++ b/krdc/main.cpp @@ -192,7 +192,7 @@ int MainController::main() { } void MainController::errorRestartRequested() { - TQTimer::singleShot(0, this, TQT_SLOT(errorRestart())); + TQTimer::singleShot(0, this, TQ_SLOT(errorRestart())); } bool MainController::start() { @@ -201,10 +201,10 @@ bool MainController::start() { m_scale, m_localCursor, m_initialWindowSize); m_app->setMainWidget(m_krdc); - TQObject::connect(m_krdc, TQT_SIGNAL(disconnected()), - m_app, TQT_SLOT(quit())); - connect(m_krdc, TQT_SIGNAL(disconnectedError()), - TQT_SLOT(errorRestartRequested())); + TQObject::connect(m_krdc, TQ_SIGNAL(disconnected()), + m_app, TQ_SLOT(quit())); + connect(m_krdc, TQ_SIGNAL(disconnectedError()), + TQ_SLOT(errorRestartRequested())); return m_krdc->start(); } diff --git a/krdc/maindialog.cpp b/krdc/maindialog.cpp index 88310d57..11546308 100644 --- a/krdc/maindialog.cpp +++ b/krdc/maindialog.cpp @@ -36,8 +36,8 @@ MainDialog::MainDialog( TQWidget *parent, const char *name ) setButtonText( Ok, i18n( "Connect" ) ); enableButtonOK( false ); - connect( m_dialogWidget, TQT_SIGNAL( hostValid( bool ) ), - TQT_SLOT( enableButtonOK( bool ) ) ); + connect( m_dialogWidget, TQ_SIGNAL( hostValid( bool ) ), + TQ_SLOT( enableButtonOK( bool ) ) ); } void MainDialog::setRemoteHost( const TQString &host ) diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index 93b39a43..3fa4dc23 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -92,26 +92,26 @@ MainDialogWidget::MainDialogWidget( TQWidget *parent, const char *name ) m_searchInput->setTrapReturnKey( true ); connect( m_browsingView, - TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( itemSelected( TQListViewItem * ) ) ); + TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( itemSelected( TQListViewItem * ) ) ); connect( m_browsingView, - TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( itemDoubleClicked( TQListViewItem * ) ) ); + TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( itemDoubleClicked( TQListViewItem * ) ) ); connect( m_scopeCombo, - TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( scopeSelected( const TQString & ) ) ); + TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( scopeSelected( const TQString & ) ) ); connect( m_serverInput, - TQT_SIGNAL( returnPressed( const TQString & ) ), - TQT_SLOT( rescan() ) ); + TQ_SIGNAL( returnPressed( const TQString & ) ), + TQ_SLOT( rescan() ) ); bool showBrowse = hp->showBrowsingPanel(); enableBrowsingArea( showBrowse ); m_locator_dnssd = new DNSSD::ServiceBrowser(TQStringList::split(',',"_rfb._tcp,_rdp._tcp"),0,DNSSD::ServiceBrowser::AutoResolve); - connect(m_locator_dnssd,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), - TQT_SLOT(addedService(DNSSD::RemoteService::Ptr))); - connect(m_locator_dnssd,TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), - TQT_SLOT(removedService(DNSSD::RemoteService::Ptr))); + connect(m_locator_dnssd,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), + TQ_SLOT(addedService(DNSSD::RemoteService::Ptr))); + connect(m_locator_dnssd,TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), + TQ_SLOT(removedService(DNSSD::RemoteService::Ptr))); m_locator_dnssd->startBrowse(); adjustSize(); @@ -179,7 +179,7 @@ void MainDialogWidget::enableBrowsingArea( bool enable ) setMinimumSize(minimumSize().width(), (h > 0) ? h : 0); resize(width(), height()-hOffset); - TQTimer::singleShot( 0, parentWidget(), TQT_SLOT( adjustSize() ) ); + TQTimer::singleShot( 0, parentWidget(), TQ_SLOT( adjustSize() ) ); } if (enable) @@ -259,12 +259,12 @@ bool MainDialogWidget::ensureLocatorOpen() return false; } - connect( m_locator, TQT_SIGNAL( foundService( TQString,int ) ), - TQT_SLOT( foundService( TQString,int ) ) ); - connect( m_locator, TQT_SIGNAL( lastServiceSignal( bool ) ), - TQT_SLOT( lastSignalServices( bool ) ) ); - connect( m_locator, TQT_SIGNAL( foundScopes( TQStringList ) ), - TQT_SLOT( foundScopes( TQStringList ) ) ); + connect( m_locator, TQ_SIGNAL( foundService( TQString,int ) ), + TQ_SLOT( foundService( TQString,int ) ) ); + connect( m_locator, TQ_SIGNAL( lastServiceSignal( bool ) ), + TQ_SLOT( lastSignalServices( bool ) ) ); + connect( m_locator, TQ_SIGNAL( foundScopes( TQStringList ) ), + TQ_SLOT( foundScopes( TQStringList ) ) ); return true; } diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index acb819ba..e18368fa 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -42,7 +42,7 @@ PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name ) page = addVBoxPage( i18n( "&Host Profiles" ) ); m_hostProfiles = new HostProfiles( page, "m_hostProfiles" ); - connect( m_hostProfiles, TQT_SIGNAL( hostDoubleClicked(HostPrefPtr) ), this, TQT_SLOT( slotHostDoubleClicked(HostPrefPtr) )); + connect( m_hostProfiles, TQ_SIGNAL( hostDoubleClicked(HostPrefPtr) ), this, TQ_SLOT( slotHostDoubleClicked(HostPrefPtr) )); page = addVBoxPage( i18n( "&VNC Defaults" ) ); m_vncPrefs = new VncPrefs( page, "m_vncPrefs" ); diff --git a/krdc/rdp/krdpview.cpp b/krdc/rdp/krdpview.cpp index 057c6fe6..8278d67e 100644 --- a/krdc/rdp/krdpview.cpp +++ b/krdc/rdp/krdpview.cpp @@ -291,10 +291,10 @@ bool KRdpView::start() *m_process << "-X" << ("0x" + TQString::number(m_container->winId(), 16)); *m_process << "-a" << TQString::number(hp->colorDepth()); *m_process << (m_host + ":" + TQString::number(m_port)); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(processDied(TDEProcess *))); - connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(receivedStderr(TDEProcess *, char *, int))); - connect(m_container, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(connectionClosed())); - connect(m_container, TQT_SIGNAL(newEmbeddedWindow(WId)), TQT_SLOT(connectionOpened(WId))); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(processDied(TDEProcess *))); + connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(receivedStderr(TDEProcess *, char *, int))); + connect(m_container, TQ_SIGNAL(embeddedWindowDestroyed()), TQ_SLOT(connectionClosed())); + connect(m_container, TQ_SIGNAL(newEmbeddedWindow(WId)), TQ_SLOT(connectionOpened(WId))); tqDebug("Color depth: %d", hp->colorDepth()); if(!m_process->start(TDEProcess::NotifyOnExit, TDEProcess::Stderr)) { diff --git a/krdc/vnc/kvncview.cpp b/krdc/vnc/kvncview.cpp index d30ea356..88219776 100644 --- a/krdc/vnc/kvncview.cpp +++ b/krdc/vnc/kvncview.cpp @@ -94,8 +94,8 @@ KVncView::KVncView(TQWidget *parent, setFocusPolicy(TQWidget::StrongFocus); m_cb = TQApplication::clipboard(); - connect(m_cb, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect(m_cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(m_cb, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); + connect(m_cb, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); TDEStandardDirs *dirs = TDEGlobal::dirs(); TQBitmap cursorBitmap(dirs->findResource("appdata", @@ -290,7 +290,7 @@ bool KVncView::start() { setStatus(REMOTE_VIEW_CONNECTING); m_cthreadObject.moveToThread(&m_cthread); - TQTimer::singleShot(0, &m_cthreadObject, SLOT(run())); + TQTimer::singleShot(0, &m_cthreadObject, TQ_SLOT(run())); m_cthread.start(); setBackgroundMode(TQt::NoBackground); diff --git a/krfb/kcm_krfb/kcm_krfb.cpp b/krfb/kcm_krfb/kcm_krfb.cpp index 0c51ea4a..56c69852 100644 --- a/krfb/kcm_krfb/kcm_krfb.cpp +++ b/krfb/kcm_krfb/kcm_krfb.cpp @@ -75,19 +75,19 @@ KcmKRfb::KcmKRfb(TQWidget *p, const char *name, const TQStringList &) : load(); - connect(m_confWidget->passwordInput, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(configChanged()) ); - connect(m_confWidget->allowUninvitedCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect(m_confWidget->enableSLPCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect(m_confWidget->confirmConnectionsCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect(m_confWidget->allowDesktopControlCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect(m_confWidget->autoPortCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); - connect(m_confWidget->portInput, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(configChanged()) ); - connect((TQObject*)m_confWidget->manageInvitations, TQT_SIGNAL(clicked()), - &m_configuration, TQT_SLOT(showManageInvitationsDialog()) ); - connect(&m_configuration, TQT_SIGNAL(invitationNumChanged(int)), - this, TQT_SLOT(setInvitationNum(int))); + connect(m_confWidget->passwordInput, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(configChanged()) ); + connect(m_confWidget->allowUninvitedCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + connect(m_confWidget->enableSLPCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + connect(m_confWidget->confirmConnectionsCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + connect(m_confWidget->allowDesktopControlCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + connect(m_confWidget->autoPortCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); + connect(m_confWidget->portInput, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(configChanged()) ); + connect((TQObject*)m_confWidget->manageInvitations, TQ_SIGNAL(clicked()), + &m_configuration, TQ_SLOT(showManageInvitationsDialog()) ); + connect(&m_configuration, TQ_SIGNAL(invitationNumChanged(int)), + this, TQ_SLOT(setInvitationNum(int))); setInvitationNum(m_configuration.invitations().size()); - connect(m_confWidget->disableBackgroundCB, TQT_SIGNAL(clicked()), TQT_SLOT(configChanged()) ); + connect(m_confWidget->disableBackgroundCB, TQ_SIGNAL(clicked()), TQ_SLOT(configChanged()) ); } void KcmKRfb::configChanged() { diff --git a/krfb/kinetd/kinetd.cpp b/krfb/kinetd/kinetd.cpp index 9828ebd1..692e6ea7 100644 --- a/krfb/kinetd/kinetd.cpp +++ b/krfb/kinetd/kinetd.cpp @@ -77,8 +77,8 @@ bool PortListener::acquirePort() { delete m_socket; m_socket = new TDEServerSocket(m_port, false); } - connect(m_socket, TQT_SIGNAL(accepted(TDESocket*)), - TQT_SLOT(accepted(TDESocket*))); + connect(m_socket, TQ_SIGNAL(accepted(TDESocket*)), + TQ_SLOT(accepted(TDESocket*))); bool s = m_registerService; bool sd =m_dnssdRegister; @@ -421,9 +421,9 @@ KInetD::KInetD(TQCString &n) : m_srvreg = 0; } m_portListeners.setAutoDelete(true); - connect(&m_expirationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(setExpirationTimer())); - connect(&m_portRetryTimer, TQT_SIGNAL(timeout()), TQT_SLOT(portRetryTimer())); - connect(&m_reregistrationTimer, TQT_SIGNAL(timeout()), TQT_SLOT(reregistrationTimer())); + connect(&m_expirationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(setExpirationTimer())); + connect(&m_portRetryTimer, TQ_SIGNAL(timeout()), TQ_SLOT(portRetryTimer())); + connect(&m_reregistrationTimer, TQ_SIGNAL(timeout()), TQ_SLOT(reregistrationTimer())); loadServiceList(); } diff --git a/krfb/krfb/configuration.cpp b/krfb/krfb/configuration.cpp index c4acbfe4..b197ea13 100644 --- a/krfb/krfb/configuration.cpp +++ b/krfb/krfb/configuration.cpp @@ -58,29 +58,29 @@ Configuration::Configuration(krfb_mode mode) : connectDCOPSignal( 0, "KRFB::ConfigChanged", "KRFB_ConfigChanged()", "updateTDEConfig()", false ); - connect(invMngDlg.newPersonalInvitationButton, TQT_SIGNAL(clicked()), - TQT_SLOT(showPersonalInvitationDialog())); - connect(invMngDlg.newEmailInvitationButton, TQT_SIGNAL(clicked()), TQT_SLOT(inviteEmail())); - connect(invMngDlg.deleteOneButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteOnePressed())); - connect(invMngDlg.deleteAllButton, TQT_SIGNAL(clicked()), TQT_SLOT(invMngDlgDeleteAllPressed())); + connect(invMngDlg.newPersonalInvitationButton, TQ_SIGNAL(clicked()), + TQ_SLOT(showPersonalInvitationDialog())); + connect(invMngDlg.newEmailInvitationButton, TQ_SIGNAL(clicked()), TQ_SLOT(inviteEmail())); + connect(invMngDlg.deleteOneButton, TQ_SIGNAL(clicked()), TQ_SLOT(invMngDlgDeleteOnePressed())); + connect(invMngDlg.deleteAllButton, TQ_SIGNAL(clicked()), TQ_SLOT(invMngDlgDeleteAllPressed())); invMngDlg.listView->setSelectionMode(TQListView::Extended); invMngDlg.listView->setMinimumSize(TQSize(400, 100)); // TQTs size is much to small - connect(&invDlg, TQT_SIGNAL(createInviteClicked()), - TQT_SLOT(showPersonalInvitationDialog())); - connect(&invDlg, TQT_SIGNAL(emailInviteClicked()), - TQT_SLOT(inviteEmail())); - connect(&invDlg, TQT_SIGNAL(manageInviteClicked()), - TQT_SLOT(showManageInvitationsDialog())); - connect(&invDlg, TQT_SIGNAL(configureClicked()), - TQT_SLOT(showConfigurationModule())); - connect(this, TQT_SIGNAL(invitationNumChanged(int)), - &invDlg, TQT_SLOT(setInviteCount(int))); - connect(this, TQT_SIGNAL(invitationNumChanged(int)), - &invMngDlg, TQT_SLOT(listSizeChanged(int))); + connect(&invDlg, TQ_SIGNAL(createInviteClicked()), + TQ_SLOT(showPersonalInvitationDialog())); + connect(&invDlg, TQ_SIGNAL(emailInviteClicked()), + TQ_SLOT(inviteEmail())); + connect(&invDlg, TQ_SIGNAL(manageInviteClicked()), + TQ_SLOT(showManageInvitationsDialog())); + connect(&invDlg, TQ_SIGNAL(configureClicked()), + TQ_SLOT(showConfigurationModule())); + connect(this, TQ_SIGNAL(invitationNumChanged(int)), + &invDlg, TQ_SLOT(setInviteCount(int))); + connect(this, TQ_SIGNAL(invitationNumChanged(int)), + &invMngDlg, TQ_SLOT(listSizeChanged(int))); emit invitationNumChanged(invitationList.size()); - connect(&refreshTimer, TQT_SIGNAL(timeout()), TQT_SLOT(refreshTimeout())); + connect(&refreshTimer, TQ_SIGNAL(timeout()), TQ_SLOT(refreshTimeout())); refreshTimer.start(1000*60); } diff --git a/krfb/krfb/invitedialog.cpp b/krfb/krfb/invitedialog.cpp index 59d62fb7..62fdde38 100644 --- a/krfb/krfb/invitedialog.cpp +++ b/krfb/krfb/invitedialog.cpp @@ -38,12 +38,12 @@ InviteDialog::InviteDialog( TQWidget *parent, const char *name ) setButtonGuiItem( User1, KStdGuiItem::configure() ); - connect( m_inviteWidget->btnCreateInvite, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( createInviteClicked() ) ); - connect( m_inviteWidget->btnEmailInvite, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( emailInviteClicked() ) ); - connect( m_inviteWidget->btnManageInvite, TQT_SIGNAL( clicked() ), - TQT_SIGNAL( manageInviteClicked() ) ); + connect( m_inviteWidget->btnCreateInvite, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( createInviteClicked() ) ); + connect( m_inviteWidget->btnEmailInvite, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( emailInviteClicked() ) ); + connect( m_inviteWidget->btnManageInvite, TQ_SIGNAL( clicked() ), + TQ_SIGNAL( manageInviteClicked() ) ); } void InviteDialog::slotUser1() diff --git a/krfb/krfb/main.cpp b/krfb/krfb/main.cpp index 3ec53e3f..a9c4a6c7 100644 --- a/krfb/krfb/main.cpp +++ b/krfb/krfb/main.cpp @@ -145,33 +145,33 @@ int main(int argc, char *argv[]) RFBController controller(config); KRfbIfaceImpl dcopiface(&controller); - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), // dont show passivepopup - &trayicon, TQT_SLOT(prepareQuit())); - TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), - &controller, TQT_SLOT(closeConnection())); - - TQObject::connect(&trayicon, TQT_SIGNAL(showManageInvitations()), - config, TQT_SLOT(showManageInvitationsDialog())); - TQObject::connect(&trayicon, TQT_SIGNAL(enableDesktopControl(bool)), - &controller, TQT_SLOT(enableDesktopControl(bool))); - TQObject::connect(&trayicon, TQT_SIGNAL(diconnectedMessageDisplayed()), - &app, TQT_SLOT(quit())); - - TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()), - &controller, TQT_SLOT(closeConnection())); - TQObject::connect(&dcopiface, TQT_SIGNAL(exitApp()), - &app, TQT_SLOT(quit())); - - TQObject::connect(&controller, TQT_SIGNAL(sessionRefused()), - &app, TQT_SLOT(quit())); - TQObject::connect(&controller, TQT_SIGNAL(sessionEstablished(TQString)), - &trayicon, TQT_SLOT(showConnectedMessage(TQString))); - TQObject::connect(&controller, TQT_SIGNAL(sessionFinished()), - &trayicon, TQT_SLOT(showDisconnectedMessage())); - TQObject::connect(&controller, TQT_SIGNAL(desktopControlSettingChanged(bool)), - &trayicon, TQT_SLOT(setDesktopControlSetting(bool))); - TQObject::connect(&controller, TQT_SIGNAL(quitApp()), - &app, TQT_SLOT(quit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), // dont show passivepopup + &trayicon, TQ_SLOT(prepareQuit())); + TQObject::connect(&app, TQ_SIGNAL(lastWindowClosed()), + &controller, TQ_SLOT(closeConnection())); + + TQObject::connect(&trayicon, TQ_SIGNAL(showManageInvitations()), + config, TQ_SLOT(showManageInvitationsDialog())); + TQObject::connect(&trayicon, TQ_SIGNAL(enableDesktopControl(bool)), + &controller, TQ_SLOT(enableDesktopControl(bool))); + TQObject::connect(&trayicon, TQ_SIGNAL(diconnectedMessageDisplayed()), + &app, TQ_SLOT(quit())); + + TQObject::connect(&dcopiface, TQ_SIGNAL(exitApp()), + &controller, TQ_SLOT(closeConnection())); + TQObject::connect(&dcopiface, TQ_SIGNAL(exitApp()), + &app, TQ_SLOT(quit())); + + TQObject::connect(&controller, TQ_SIGNAL(sessionRefused()), + &app, TQ_SLOT(quit())); + TQObject::connect(&controller, TQ_SIGNAL(sessionEstablished(TQString)), + &trayicon, TQ_SLOT(showConnectedMessage(TQString))); + TQObject::connect(&controller, TQ_SIGNAL(sessionFinished()), + &trayicon, TQ_SLOT(showDisconnectedMessage())); + TQObject::connect(&controller, TQ_SIGNAL(desktopControlSettingChanged(bool)), + &trayicon, TQ_SLOT(setDesktopControlSetting(bool))); + TQObject::connect(&controller, TQ_SIGNAL(quitApp()), + &app, TQ_SLOT(quit())); sigset_t sigs; sigemptyset(&sigs); diff --git a/krfb/krfb/rfbcontroller.cpp b/krfb/krfb/rfbcontroller.cpp index fe6aee94..9abe8c5f 100644 --- a/krfb/krfb/rfbcontroller.cpp +++ b/krfb/krfb/rfbcontroller.cpp @@ -411,14 +411,14 @@ RFBController::RFBController(Configuration *c) : forcedClose(false) { self = this; - connect(&dialog, TQT_SIGNAL(okClicked()), TQT_SLOT(dialogAccepted())); - connect(&dialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(dialogRefused())); - connect(&initIdleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(checkAsyncEvents())); - connect(&idleTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleSlot())); + connect(&dialog, TQ_SIGNAL(okClicked()), TQ_SLOT(dialogAccepted())); + connect(&dialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(dialogRefused())); + connect(&initIdleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(checkAsyncEvents())); + connect(&idleTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleSlot())); clipboard = TQApplication::clipboard(); - connect(clipboard, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect(clipboard, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged())); + connect(clipboard, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(selectionChanged())); + connect(clipboard, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged())); asyncQueue.setAutoDelete(true); @@ -543,7 +543,7 @@ void RFBController::stopServer(bool xtestUngrab) if (xtestUngrab) { disabler.disable = true; - TQTimer::singleShot(0, &disabler, TQT_SLOT(exec())); + TQTimer::singleShot(0, &disabler, TQ_SLOT(exec())); } } diff --git a/krfb/krfb/trayicon.cpp b/krfb/krfb/trayicon.cpp index 92d0d494..792f771d 100644 --- a/krfb/krfb/trayicon.cpp +++ b/krfb/krfb/trayicon.cpp @@ -61,7 +61,7 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : TQToolTip::add(this, i18n("Desktop Sharing - connecting")); manageInvitationsAction = new TDEAction(i18n("Manage &Invitations"), TQString(), - 0, this, TQT_SIGNAL(showManageInvitations()), + 0, this, TQ_SIGNAL(showManageInvitations()), &actionCollection); manageInvitationsAction->plug(contextMenu()); @@ -71,11 +71,11 @@ TrayIcon::TrayIcon(KDialog *d, Configuration *c) : enableControlAction->setCheckedState(i18n("Disable Remote Control")); enableControlAction->plug(contextMenu()); enableControlAction->setEnabled(false); - connect(enableControlAction, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(enableDesktopControl(bool))); + connect(enableControlAction, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(enableDesktopControl(bool))); contextMenu()->insertSeparator(); - aboutAction = KStdAction::aboutApp(this, TQT_SLOT(showAbout()), &actionCollection); + aboutAction = KStdAction::aboutApp(this, TQ_SLOT(showAbout()), &actionCollection); aboutAction->plug(contextMenu()); show(); @@ -114,7 +114,7 @@ void TrayIcon::showDisconnectedMessage() { i18n("The remote user has closed the connection."), trayIconClosed, this); - connect(p, TQT_SIGNAL(hidden()), this, TQT_SIGNAL(diconnectedMessageDisplayed())); + connect(p, TQ_SIGNAL(hidden()), this, TQ_SIGNAL(diconnectedMessageDisplayed())); } void TrayIcon::setDesktopControlSetting(bool b) { diff --git a/ksirc/FilterRuleEditor.cpp b/ksirc/FilterRuleEditor.cpp index 357ad1d7..44d9d338 100644 --- a/ksirc/FilterRuleEditor.cpp +++ b/ksirc/FilterRuleEditor.cpp @@ -37,17 +37,17 @@ FilterRuleEditor::FilterRuleEditor newHighlight(0); // ### split "OkPressed()" into 2 slots - connect( filter->ModifyButton, TQT_SIGNAL(clicked()), TQT_SLOT(OkPressed()) ); - connect( filter->InsertButton, TQT_SIGNAL(clicked()), TQT_SLOT(OkPressed()) ); + connect( filter->ModifyButton, TQ_SIGNAL(clicked()), TQ_SLOT(OkPressed()) ); + connect( filter->InsertButton, TQ_SIGNAL(clicked()), TQ_SLOT(OkPressed()) ); - connect( filter->NewButton, TQT_SIGNAL(clicked()), TQT_SLOT(newRule()) ); - connect( filter->DeleteButton, TQT_SIGNAL(clicked()), TQT_SLOT(deleteRule()) ); + connect( filter->NewButton, TQ_SIGNAL(clicked()), TQ_SLOT(newRule()) ); + connect( filter->DeleteButton, TQ_SIGNAL(clicked()), TQ_SLOT(deleteRule()) ); - connect( filter->UpButton, TQT_SIGNAL(clicked()), TQT_SLOT(raiseRule()) ); - connect( filter->DownButton, TQT_SIGNAL(clicked()), TQT_SLOT(lowerRule()) ); + connect( filter->UpButton, TQ_SIGNAL(clicked()), TQ_SLOT(raiseRule()) ); + connect( filter->DownButton, TQ_SIGNAL(clicked()), TQ_SLOT(lowerRule()) ); - connect( filter->RuleList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(newHighlight(int)) ); - connect( filter->RuleList, TQT_SIGNAL(selected(int)), TQT_SLOT(newHighlight(int)) ); + connect( filter->RuleList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(newHighlight(int)) ); + connect( filter->RuleList, TQ_SIGNAL(selected(int)), TQ_SLOT(newHighlight(int)) ); filter->RuleList->setHScrollBarMode( TQListBox::AlwaysOff ); diff --git a/ksirc/KSOpenkSirc/open_ksirc.cpp b/ksirc/KSOpenkSirc/open_ksirc.cpp index 0630de34..7a7cee21 100644 --- a/ksirc/KSOpenkSirc/open_ksirc.cpp +++ b/ksirc/KSOpenkSirc/open_ksirc.cpp @@ -110,21 +110,21 @@ open_ksirc::open_ksirc TQString blah = i18n("Recent"); setGroup(blah); - connect(ComboB_ServerGroup, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(setGroup( const TQString& ))); - connect(ComboB_ServerName, TQT_SIGNAL(activated( const TQString& )), - this, TQT_SLOT(setServer( const TQString& ))); + connect(ComboB_ServerGroup, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(setGroup( const TQString& ))); + connect(ComboB_ServerName, TQ_SIGNAL(activated( const TQString& )), + this, TQ_SLOT(setServer( const TQString& ))); - connect(PB_Connect, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickConnect())); - connect(PB_Edit, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickEdit())); - connect(PB_Cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(clickCancel())); + connect(PB_Connect, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickConnect())); + connect(PB_Edit, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickEdit())); + connect(PB_Cancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(clickCancel())); PB_Connect->setDefault(TRUE); PB_Connect->setAutoDefault(TRUE); PB_Edit->setEnabled(false); // Not yet implemented. ComboB_ServerName->setFocus(); - connect(ComboB_ServerName, TQT_SIGNAL(enterPressed()), this, TQT_SLOT(clickConnect())); + connect(ComboB_ServerName, TQ_SIGNAL(enterPressed()), this, TQ_SLOT(clickConnect())); } // insert a sorted list of groups into ComboB_ServerGroup, note that diff --git a/ksirc/KSPrefs/ksprefs.cpp b/ksirc/KSPrefs/ksprefs.cpp index 6de1e845..34071979 100644 --- a/ksirc/KSPrefs/ksprefs.cpp +++ b/ksirc/KSPrefs/ksprefs.cpp @@ -69,20 +69,20 @@ KSPrefs::KSPrefs(TQWidget * parent, const char * name): pageAutoConnect = new PageAutoConnect( itemAutoConnect ); pageShortcuts = new PageShortcuts( itemShortcuts ); - connect(pageLooknFeel, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageGeneral, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageStartup, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageIRCColors, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageFont, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageRMBMenu, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageServChan, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageAutoConnect, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - connect(pageShortcuts, TQT_SIGNAL( modified() ), TQT_SLOT( modified() ) ); - - connect(this, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( saveConfig() ) ); - connect(this, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( saveConfig() ) ); - connect(this, TQT_SIGNAL( defaultClicked() ), this, TQT_SLOT(defaultConfig() ) ); + connect(pageLooknFeel, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageGeneral, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageStartup, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageColors, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageIRCColors, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageFont, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageRMBMenu, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageServChan, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageAutoConnect, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + connect(pageShortcuts, TQ_SIGNAL( modified() ), TQ_SLOT( modified() ) ); + + connect(this, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( saveConfig() ) ); + connect(this, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( saveConfig() ) ); + connect(this, TQ_SIGNAL( defaultClicked() ), this, TQ_SLOT(defaultConfig() ) ); looknfeelTopLayout->addWidget( pageLooknFeel ); generalTopLayout->addWidget( pageGeneral ); diff --git a/ksirc/KSPrefs/page_font.cpp b/ksirc/KSPrefs/page_font.cpp index a4a59c1b..9230503f 100644 --- a/ksirc/KSPrefs/page_font.cpp +++ b/ksirc/KSPrefs/page_font.cpp @@ -6,7 +6,7 @@ PageFont::PageFont( TQWidget *parent, const char *name ) : layout = new TQHBoxLayout(this); fontchooser = new TDEFontChooser(this); layout->addWidget(fontchooser); - connect(fontchooser,TQT_SIGNAL(fontSelected ( const TQFont&)), this, TQT_SLOT(update())); + connect(fontchooser,TQ_SIGNAL(fontSelected ( const TQFont&)), this, TQ_SLOT(update())); } PageFont::~PageFont( ) diff --git a/ksirc/KSPrefs/page_rmbmenu.cpp b/ksirc/KSPrefs/page_rmbmenu.cpp index 0a5c223f..03f7fa0d 100644 --- a/ksirc/KSPrefs/page_rmbmenu.cpp +++ b/ksirc/KSPrefs/page_rmbmenu.cpp @@ -41,21 +41,21 @@ PageRMBMenu::PageRMBMenu( TQWidget *parent, const char *name ) : PageRMBMenuBase changeItemPB->hide(); - connect(commandLB, TQT_SIGNAL(highlighted( int )), - this, TQT_SLOT(highlighted( int ))); - connect(moveUpPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(moveDown())); - connect(moveDownPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(moveUp())); + connect(commandLB, TQ_SIGNAL(highlighted( int )), + this, TQ_SLOT(highlighted( int ))); + connect(moveUpPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(moveDown())); + connect(moveDownPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(moveUp())); - connect(insertSeperatorPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(insSeperator())); + connect(insertSeperatorPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(insSeperator())); - connect(insertItemPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(insCommand())); + connect(insertItemPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(insCommand())); - connect(deleteItemPB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(delCommand())); + connect(deleteItemPB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(delCommand())); } diff --git a/ksirc/KSPrefs/page_servchan.cpp b/ksirc/KSPrefs/page_servchan.cpp index 91edf864..fc9e73e6 100644 --- a/ksirc/KSPrefs/page_servchan.cpp +++ b/ksirc/KSPrefs/page_servchan.cpp @@ -17,10 +17,10 @@ PageServChan::PageServChan( TQWidget *parent, const char *name ) : PageServChanBase( parent, name) { - connect(serverDeleteItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedSL())); - connect(ServerAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedSL())); - connect(chanDeleteItmPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(deletePressedCL())); - connect(ChanAddItemPB, TQT_SIGNAL(pressed()), this, TQT_SLOT(addPressedCL())); + connect(serverDeleteItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(deletePressedSL())); + connect(ServerAddItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(addPressedSL())); + connect(chanDeleteItmPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(deletePressedCL())); + connect(ChanAddItemPB, TQ_SIGNAL(pressed()), this, TQ_SLOT(addPressedCL())); } diff --git a/ksirc/KSPrefs/page_shortcuts.cpp b/ksirc/KSPrefs/page_shortcuts.cpp index c1f3da12..fc52334a 100644 --- a/ksirc/KSPrefs/page_shortcuts.cpp +++ b/ksirc/KSPrefs/page_shortcuts.cpp @@ -21,7 +21,7 @@ PageShortcuts::PageShortcuts( TQWidget *parent, const char *name ) : PageShortcu globalGB->setColumnLayout( 0, TQt::Horizontal ); m_key = new KKeyChooser(servercontroller::self()->getGlobalAccel(), globalGB); - connect(m_key, TQT_SIGNAL(keyChange()), this, TQT_SLOT(changed())); + connect(m_key, TQ_SIGNAL(keyChange()), this, TQ_SLOT(changed())); globalGB->layout()->add(m_key); } diff --git a/ksirc/KSPrefs/page_startup.cpp b/ksirc/KSPrefs/page_startup.cpp index d95a2725..e2a4813d 100644 --- a/ksirc/KSPrefs/page_startup.cpp +++ b/ksirc/KSPrefs/page_startup.cpp @@ -27,8 +27,8 @@ PageStartup::PageStartup( TQWidget *parent, const char *name ) : PageStartupBase serverLB->downButton()->hide(); TQListBox *lb = serverLB->listBox(); - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(clickedLB(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(clickedLB(int))); changing = false; diff --git a/ksirc/KSProgress/ksprogressdata.cpp b/ksirc/KSProgress/ksprogressdata.cpp index 5aacdb59..4c83794d 100644 --- a/ksirc/KSProgress/ksprogressdata.cpp +++ b/ksirc/KSProgress/ksprogressdata.cpp @@ -38,7 +38,7 @@ ksprogressData::ksprogressData dlgedit_PushButton_1->setGeometry( 70, 90, 100, 30 ); dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); - connect( dlgedit_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(cancelPressed()) ); + connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(cancelPressed()) ); dlgedit_PushButton_1->setAutoRepeat( FALSE ); fileName = new TQLabel( this, "Label_1" ); diff --git a/ksirc/KSTicker/ksticker.cpp b/ksirc/KSTicker/ksticker.cpp index 8e81ae1d..5fe687e2 100644 --- a/ksirc/KSTicker/ksticker.cpp +++ b/ksirc/KSTicker/ksticker.cpp @@ -55,12 +55,12 @@ KSTicker::KSTicker(TQWidget * parent, const char * name, WFlags f) chars = this->width() / onechar; popup = new TQPopupMenu(); - popup->insertItem(i18n( "Font..." ), this, TQT_SLOT(fontSelector())); - popup->insertItem(i18n( "Scroll Rate..." ), this, TQT_SLOT(scrollRate())); - iScrollItem = popup->insertItem(i18n( "Scroll Constantly" ), this, TQT_SLOT(scrollConstantly())); + popup->insertItem(i18n( "Font..." ), this, TQ_SLOT(fontSelector())); + popup->insertItem(i18n( "Scroll Rate..." ), this, TQ_SLOT(scrollRate())); + iScrollItem = popup->insertItem(i18n( "Scroll Constantly" ), this, TQ_SLOT(scrollConstantly())); popup->setItemChecked(iScrollItem, bScrollConstantly); popup->insertSeparator(); - popup->insertItem(i18n( "Return to Normal Mode" ), this, TQT_SIGNAL(doubleClick())); + popup->insertItem(i18n( "Return to Normal Mode" ), this, TQ_SIGNAL(doubleClick())); currentStr = ""; @@ -434,8 +434,8 @@ void KSTicker::scrollRate() { SpeedDialog *sd = new SpeedDialog(tickRate, tickStep); sd->setLimit(5, 200, 1, onechar); - connect(sd, TQT_SIGNAL(stateChange(int, int)), - this, TQT_SLOT(setSpeed(int, int))); + connect(sd, TQ_SIGNAL(stateChange(int, int)), + this, TQ_SLOT(setSpeed(int, int))); sd->show(); } diff --git a/ksirc/KSTicker/ksttest.cpp b/ksirc/KSTicker/ksttest.cpp index f11be8da..88669f8d 100644 --- a/ksirc/KSTicker/ksttest.cpp +++ b/ksirc/KSTicker/ksttest.cpp @@ -80,10 +80,10 @@ int main(int argc, char **argv){ StdInTicker *kst = new StdInTicker(); TQSocketNotifier *sn = new TQSocketNotifier(0, TQSocketNotifier::Read); - TQObject::connect(sn, TQT_SIGNAL(activated(int)), - kst, TQT_SLOT(readsocket(int))); - TQObject::connect(kst, TQT_SIGNAL(doubleClick()), kst, TQT_SLOT(end())); - TQObject::connect(kst, TQT_SIGNAL(closing()), kst, TQT_SLOT(end())); + TQObject::connect(sn, TQ_SIGNAL(activated(int)), + kst, TQ_SLOT(readsocket(int))); + TQObject::connect(kst, TQ_SIGNAL(doubleClick()), kst, TQ_SLOT(end())); + TQObject::connect(kst, TQ_SIGNAL(closing()), kst, TQ_SLOT(end())); a.setMainWidget(kst); kst->show(); return a.exec(); diff --git a/ksirc/KSTicker/speeddialog.cpp b/ksirc/KSTicker/speeddialog.cpp index 8bc3ca0d..8a6628ae 100644 --- a/ksirc/KSTicker/speeddialog.cpp +++ b/ksirc/KSTicker/speeddialog.cpp @@ -21,10 +21,10 @@ SpeedDialog::SpeedDialog : speeddialogData( parent, name ) { setCaption(i18n( "Speed Setup") ); - connect(sliderTick, TQT_SIGNAL(valueChanged(int)), - lcdTick, TQT_SLOT(display(int))); - connect(sliderStep, TQT_SIGNAL(valueChanged(int)), - lcdStep, TQT_SLOT(display(int))); + connect(sliderTick, TQ_SIGNAL(valueChanged(int)), + lcdTick, TQ_SLOT(display(int))); + connect(sliderStep, TQ_SIGNAL(valueChanged(int)), + lcdStep, TQ_SLOT(display(int))); lcdTick->display(tick); sliderTick->setValue(tick); lcdStep->display(step); diff --git a/ksirc/KSTicker/speeddialogData.cpp b/ksirc/KSTicker/speeddialogData.cpp index 38d5b524..6e2c01bf 100644 --- a/ksirc/KSTicker/speeddialogData.cpp +++ b/ksirc/KSTicker/speeddialogData.cpp @@ -25,7 +25,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQGridLayout *grid = new TQGridLayout( this, 3, 2 , KDialog::marginHint(), KDialog::spacingHint()); sliderTick = new TQSlider( this, "Slider_1" ); grid->addWidget( sliderTick, 0, 1 ); - connect( sliderTick, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateTick(int)) ); + connect( sliderTick, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateTick(int)) ); sliderTick->setOrientation( TQt::Horizontal ); sliderTick->setRange( 10, 200 ); sliderTick->setSteps( 10, 50 ); @@ -37,7 +37,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) sliderStep = new TQSlider( this, "Slider_2" ); grid->addWidget( sliderStep, 1, 1 ); - connect( sliderStep, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateStep(int)) ); + connect( sliderStep, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateStep(int)) ); sliderStep->setOrientation( TQt::Horizontal ); sliderStep->setRange( 1, 10 ); sliderStep->setSteps( 1, 2 ); @@ -81,7 +81,7 @@ speeddialogData::speeddialogData ( TQWidget* parent, const char* name ) TQPushButton* dlgedit_PushButton_2; dlgedit_PushButton_2 = new KPushButton( KStdGuiItem::close(), this, "PushButton_2" ); - connect( dlgedit_PushButton_2, TQT_SIGNAL(pressed()), TQT_SLOT(terminate()) ); + connect( dlgedit_PushButton_2, TQ_SIGNAL(pressed()), TQ_SLOT(terminate()) ); grid->addWidget( dlgedit_PushButton_2, 2, 2 ); //resize( 270,120 ); diff --git a/ksirc/NewWindowDialog.cpp b/ksirc/NewWindowDialog.cpp index f7cf4f69..de243be6 100644 --- a/ksirc/NewWindowDialog.cpp +++ b/ksirc/NewWindowDialog.cpp @@ -30,10 +30,10 @@ NewWindowDialog::NewWindowDialog(const KSircChannel &channelInfo, TQWidget * par l2->setBuddy(m_le); connect( - m_combo, TQT_SIGNAL(activated(const TQString &)), - m_combo, TQT_SLOT(addToHistory(const TQString &))); - connect( m_combo->lineEdit(), TQT_SIGNAL(textChanged ( const TQString & )), - this, TQT_SLOT( slotTextChanged( const TQString &))); + m_combo, TQ_SIGNAL(activated(const TQString &)), + m_combo, TQ_SLOT(addToHistory(const TQString &))); + connect( m_combo->lineEdit(), TQ_SIGNAL(textChanged ( const TQString & )), + this, TQ_SLOT( slotTextChanged( const TQString &))); TDEConfig *kConfig = kapp->config(); TDEConfigGroupSaver saver(kConfig, "Recent"); diff --git a/ksirc/ahistlineedit.cpp b/ksirc/ahistlineedit.cpp index 6f3b038e..902ac0bd 100644 --- a/ksirc/ahistlineedit.cpp +++ b/ksirc/ahistlineedit.cpp @@ -66,8 +66,8 @@ aHistLineEdit::aHistLineEdit(TQWidget *parent, const char *name) setVScrollBarMode( AlwaysOff ); setHScrollBarMode( AlwaysOff ); -// connect( this, TQT_SIGNAL( returnPressed () ), this, TQT_SLOT( slotReturn() ) ); - connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) ); +// connect( this, TQ_SIGNAL( returnPressed () ), this, TQ_SLOT( slotReturn() ) ); + connect( this, TQ_SIGNAL( textChanged () ), this, TQ_SLOT( slotMaybeResize() ) ); setTabChangesFocus(true); setTextFormat(PlainText); diff --git a/ksirc/alistbox.cpp b/ksirc/alistbox.cpp index 7cb71022..7557e2b6 100644 --- a/ksirc/alistbox.cpp +++ b/ksirc/alistbox.cpp @@ -29,15 +29,15 @@ aListBox::aListBox(TQWidget *parent, const char *name ) clear(); p_scroll = TQPalette(palette()); setAcceptDrops( true ); - connect(this, TQT_SIGNAL(selected (const TQString&)), - this, TQT_SIGNAL(selectedNick(const TQString&))); + connect(this, TQ_SIGNAL(selected (const TQString&)), + this, TQ_SIGNAL(selectedNick(const TQString&))); m_nickListDirty = true; updateNickPrefixWidth(); - connect( this, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( reEmitContextMenuRequest( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint & ) ), + this, TQ_SLOT( reEmitContextMenuRequest( TQListBoxItem * ) ) ); } aListBox::~aListBox() diff --git a/ksirc/chanButtons.cpp b/ksirc/chanButtons.cpp index b7a4f307..482c96ad 100644 --- a/ksirc/chanButtons.cpp +++ b/ksirc/chanButtons.cpp @@ -28,15 +28,15 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) { Popupmenu = new TDEPopupMenu( this ); Popupmenu->insertTitle(i18n("Channel Modes")); - toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQT_SLOT(invite())); - toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQT_SLOT(limited())); - toggleMenu[2] = Popupmenu->insertItem(i18n("k (key to join)"), this, TQT_SLOT(key())); - toggleMenu[3] = Popupmenu->insertItem(i18n("s (secret)"), this, TQT_SLOT(secret())); + toggleMenu[0] = Popupmenu->insertItem(i18n("i (invite-only)"), this, TQ_SLOT(invite())); + toggleMenu[1] = Popupmenu->insertItem(i18n("l (limited users)"), this, TQ_SLOT(limited())); + toggleMenu[2] = Popupmenu->insertItem(i18n("k (key to join)"), this, TQ_SLOT(key())); + toggleMenu[3] = Popupmenu->insertItem(i18n("s (secret)"), this, TQ_SLOT(secret())); Popupmenu->insertSeparator(); Popupmenu->insertTitle(i18n("User Modes")); - toggleMenu[4] = Popupmenu->insertItem(i18n("i (be invisible)"), this, TQT_SLOT(invisible())); - toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQT_SLOT(wallops())); - toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQT_SLOT(serverNotices())); + toggleMenu[4] = Popupmenu->insertItem(i18n("i (be invisible)"), this, TQ_SLOT(invisible())); + toggleMenu[5] = Popupmenu->insertItem(i18n("w (receive wallops)"), this, TQ_SLOT(wallops())); + toggleMenu[6] = Popupmenu->insertItem(i18n("s (get server notices)"), this, TQ_SLOT(serverNotices())); layout = new TQHBoxLayout(this); layout->setSpacing(0); @@ -46,21 +46,21 @@ chanButtons::chanButtons(KSircProcess *proc, TQWidget *parent, const char *name) protectButton->setToggleButton(true); makeSquare(protectButton); TQToolTip::add(protectButton, i18n("Only op'ed users can change the topic")); - connect(protectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(protectMode())); + connect(protectButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(protectMode())); layout->addWidget(protectButton); outsideButton = new TQPushButton(i18n("N"), this); outsideButton->setToggleButton(true); makeSquare(outsideButton); TQToolTip::add(outsideButton, i18n("No outside messages")); - connect(outsideButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(outsideMode())); + connect(outsideButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(outsideMode())); layout->addWidget(outsideButton); moderateButton = new TQPushButton(i18n("M"), this); moderateButton->setToggleButton(true); makeSquare(moderateButton); TQToolTip::add(moderateButton, i18n("Only op'ed users and voiced users (+v) can speak")); - connect(moderateButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(moderateMode())); + connect(moderateButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(moderateMode())); layout->addWidget(moderateButton); menuButton = new TQPushButton(i18n("..."), this); @@ -235,10 +235,10 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, Layout->addWidget(okButton); switch (modeType) { case limited: - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(limitedUsers())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(limitedUsers())); break; case key: - connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(keyString())); + connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(keyString())); break; } @@ -248,7 +248,7 @@ chanbuttonsDialog::chanbuttonsDialog(const type &modeType, TQWidget *parent, cancelButton->setSizePolicy(TQSizePolicy((TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, cancelButton->sizePolicy().hasHeightForWidth())); Layout->addWidget(cancelButton); - connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); LimitedLayout->addLayout(Layout); TQSpacerItem *spacer = new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding); diff --git a/ksirc/charSelector.cpp b/ksirc/charSelector.cpp index 32f4be55..7d239276 100644 --- a/ksirc/charSelector.cpp +++ b/ksirc/charSelector.cpp @@ -19,13 +19,13 @@ charSelector::charSelector(TQWidget *parent, const char* name) testLayout->addWidget(charSelect); charSelect->installEventFilter(this); - connect(charSelect, TQT_SIGNAL(doubleClicked()), TQT_SLOT(insertText())); + connect(charSelect, TQ_SIGNAL(doubleClicked()), TQ_SLOT(insertText())); TQHBoxLayout *buttonLayout = new TQHBoxLayout; buttonLayout->setSpacing( spacingHint() ); insertButton = new TQPushButton(i18n("&Insert Char"), this); - connect(insertButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertText())); + connect(insertButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertText())); buttonLayout->addWidget(insertButton); TQSpacerItem *spacer = new TQSpacerItem(50, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding); diff --git a/ksirc/colorpicker.cpp b/ksirc/colorpicker.cpp index 84eb1eb0..cbd7317a 100644 --- a/ksirc/colorpicker.cpp +++ b/ksirc/colorpicker.cpp @@ -71,10 +71,10 @@ ColorPicker::ColorPicker( TQWidget *parent, const char *name ) ok->setAutoDefault( false ); cancel->setAutoDefault( false ); - connect( foregroundColor, TQT_SIGNAL( colorPicked( int ) ), - this, TQT_SLOT( setForegroundColor( int ) ) ); - connect( backgroundColor, TQT_SIGNAL( colorPicked( int ) ), - this, TQT_SLOT( setBackgroundColor( int ) ) ); + connect( foregroundColor, TQ_SIGNAL( colorPicked( int ) ), + this, TQ_SLOT( setForegroundColor( int ) ) ); + connect( backgroundColor, TQ_SIGNAL( colorPicked( int ) ), + this, TQ_SLOT( setBackgroundColor( int ) ) ); ok->setEnabled( false ); diff --git a/ksirc/dccManager.cpp b/ksirc/dccManager.cpp index a7576c7f..9ac46b7f 100644 --- a/ksirc/dccManager.cpp +++ b/ksirc/dccManager.cpp @@ -215,10 +215,10 @@ dccManager::dccManager( TQWidget *parent, const char *name ) : dccManagerbase( p m_sendit->setSelectable(false); m_chatit->setSelectable(false); -// connect(klvBox, TQT_SIGNAL(clicked(TQListViewItem *)), -// this, TQT_SLOT(getSelChange(TQListViewItem *))); - connect(klvBox, TQT_SIGNAL(currentChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); +// connect(klvBox, TQ_SIGNAL(clicked(TQListViewItem *)), +// this, TQ_SLOT(getSelChange(TQListViewItem *))); + connect(klvBox, TQ_SIGNAL(currentChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); klvBox->setCurrentItem(m_chatit); getSelChange(klvBox->currentItem()); @@ -232,8 +232,8 @@ dccItem *dccManager::newSendItem(TQString file, TQString who, enum dccItem::dccS { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_sendit, this, dccItem::dccSend, file, who, status, size); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -241,8 +241,8 @@ dccItem *dccManager::newGetItem(TQString file, TQString who, enum dccItem::dccSt { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_getit, this, dccItem::dccGet, file, who, status, size); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -251,8 +251,8 @@ dccItem *dccManager::newChatItem(TQString who, enum dccItem::dccStatus status) { emit changed(false, i18n("dcc activity")); dccItem *it = new dccItem(m_chatit, this, dccItem::dccChat, "", who, status, 0); - connect(it, TQT_SIGNAL(statusChanged(TQListViewItem *)), - this, TQT_SLOT(getSelChange(TQListViewItem *))); + connect(it, TQ_SIGNAL(statusChanged(TQListViewItem *)), + this, TQ_SLOT(getSelChange(TQListViewItem *))); return it; } @@ -268,8 +268,8 @@ void dccManager::kpbNew_clicked() dccNewDialog = new dccNew(); dccNewDialog->show(); - connect(dccNewDialog, TQT_SIGNAL(accepted(int, TQString, TQString)), - this, TQT_SLOT(dccNewAccepted(int, TQString, TQString))); + connect(dccNewDialog, TQ_SIGNAL(accepted(int, TQString, TQString)), + this, TQ_SLOT(dccNewAccepted(int, TQString, TQString))); } diff --git a/ksirc/dccNew.cpp b/ksirc/dccNew.cpp index fe30011d..03aa40f0 100644 --- a/ksirc/dccNew.cpp +++ b/ksirc/dccNew.cpp @@ -94,14 +94,14 @@ dccNew::dccNew( TQWidget *parent, const char *name, int type, TQString nick ) fileSendClicked(); } - connect(nickList, TQT_SIGNAL(highlighted(const TQString &)), - cbNicks, TQT_SLOT(setEditText(const TQString &))); + connect(nickList, TQ_SIGNAL(highlighted(const TQString &)), + cbNicks, TQ_SLOT(setEditText(const TQString &))); - connect(pbCancel, TQT_SIGNAL(clicked()), - this, TQT_SLOT(reject())); + connect(pbCancel, TQ_SIGNAL(clicked()), + this, TQ_SLOT(reject())); - connect(pbSend, TQT_SIGNAL(clicked()), - this, TQT_SLOT(accept())); + connect(pbSend, TQ_SIGNAL(clicked()), + this, TQ_SLOT(accept())); } diff --git a/ksirc/dccToplevel.cpp b/ksirc/dccToplevel.cpp index 4e6e9353..8db0c1ee 100644 --- a/ksirc/dccToplevel.cpp +++ b/ksirc/dccToplevel.cpp @@ -22,10 +22,10 @@ dccTopLevel::dccTopLevel(TQWidget *parent, const char *name) // m_mgr->show(); setCentralWidget(m_mgr); - connect(m_mgr, TQT_SIGNAL(changed(bool, TQString)), this, TQT_SIGNAL(changed(bool, TQString))); + connect(m_mgr, TQ_SIGNAL(changed(bool, TQString)), this, TQ_SIGNAL(changed(bool, TQString))); TQPopupMenu *win = new TQPopupMenu(this, TQCString(this->name()) + "_popup_window"); - TDEAction *act = KStdAction::close(this, TQT_SLOT( close() ), actionCollection() ); + TDEAction *act = KStdAction::close(this, TQ_SLOT( close() ), actionCollection() ); act->plug(win); menuBar()->insertItem(i18n("&File"), win, DTL_WINDOW_ID, -1); diff --git a/ksirc/displayMgrMDI.cpp b/ksirc/displayMgrMDI.cpp index 9dbbc981..ae2c45bf 100644 --- a/ksirc/displayMgrMDI.cpp +++ b/ksirc/displayMgrMDI.cpp @@ -36,7 +36,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) topLevel()->addWidget( w, show ); if(w->inherits("KSircTopLevel")){ KSircTopLevel *t = static_cast<KSircTopLevel *>(w); - connect(m_topLevel->tabWidget(), TQT_SIGNAL(currentChanged(TQWidget *)), t, TQT_SLOT(focusChange(TQWidget *))); + connect(m_topLevel->tabWidget(), TQ_SIGNAL(currentChanged(TQWidget *)), t, TQ_SLOT(focusChange(TQWidget *))); } if(w->inherits("TDEMainWindow")){ TDEMainWindow *t = static_cast<TDEMainWindow *>(w); @@ -45,10 +45,10 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) if(cmenu){ TQPopupMenu *m = new TQPopupMenu(t, TQCString(t->name()) + "_popup_MDI"); m->setCheckable(true); - m->insertItem(i18n("Detach Window"), this, TQT_SLOT(reparentReq()), 0, DMM_DEATCH_ID, 0); + m->insertItem(i18n("Detach Window"), this, TQ_SLOT(reparentReq()), 0, DMM_DEATCH_ID, 0); m->insertSeparator(0); - m->insertItem(i18n("Move Tab Left"), this, TQT_SLOT(moveWindowLeft()), ALT+SHIFT+Key_Left, DMM_MOVEL_ID, 0); - m->insertItem(i18n("Move Tab Right"), this, TQT_SLOT(moveWindowRight()), ALT+SHIFT+Key_Right, DMM_MOVER_ID, 0); + m->insertItem(i18n("Move Tab Left"), this, TQ_SLOT(moveWindowLeft()), ALT+SHIFT+Key_Left, DMM_MOVEL_ID, 0); + m->insertItem(i18n("Move Tab Right"), this, TQ_SLOT(moveWindowRight()), ALT+SHIFT+Key_Right, DMM_MOVER_ID, 0); /* * By using an posisiton of 4 this works for KSircTopLevel * and DCCTopLevel but will cause problems when we have @@ -62,7 +62,7 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) TDEToggleAction *showmenu = KStdAction::showMenubar( 0, 0, t->actionCollection() ); showmenu->plug( sm ); - connect( showmenu, TQT_SIGNAL(toggled(bool)), cmenu, TQT_SLOT(setShown(bool)) ); + connect( showmenu, TQ_SIGNAL(toggled(bool)), cmenu, TQ_SLOT(setShown(bool)) ); TDESelectAction *selectTabbar = new TDESelectAction(i18n("&Tab Bar"), 0, this, "tabbar" ); TQStringList tabbaritems; @@ -70,11 +70,11 @@ void DisplayMgrMDI::newTopLevel( TQWidget *w, bool show ) selectTabbar->setItems(tabbaritems); selectTabbar->setCurrentItem(1); selectTabbar->plug( sm ); - connect( selectTabbar, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setTabPosition(int)) ); + connect( selectTabbar, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setTabPosition(int)) ); TDEToggleAction *showfull = KStdAction::fullScreen( 0, 0, t->actionCollection(), t ); showfull->plug( sm ); - connect( showfull, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(setFullScreen(bool)) ); + connect( showfull, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(setFullScreen(bool)) ); cmenu->insertItem( i18n("&Settings"), sm, -1, 5 ); } @@ -239,8 +239,8 @@ MDITopLevel *DisplayMgrMDI::topLevel() m_topLevel->show(); TDEAccel *a = new TDEAccel( m_topLevel ); - a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQT_SLOT(slotCycleTabsLeft()) ); - a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQT_SLOT(slotCycleTabsRight()) ); + a->insert( "cycle left", i18n("Cycle left"), TQString(), ALT+Key_Left, ALT+Key_Left, this, TQ_SLOT(slotCycleTabsLeft()) ); + a->insert( "cycle right", i18n("Cycle right"), TQString(), ALT+Key_Right, ALT+Key_Right, this, TQ_SLOT(slotCycleTabsRight()) ); } return m_topLevel; diff --git a/ksirc/dockservercontroller.cpp b/ksirc/dockservercontroller.cpp index be5bb6bc..d46d8c43 100644 --- a/ksirc/dockservercontroller.cpp +++ b/ksirc/dockservercontroller.cpp @@ -63,24 +63,24 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren pop->setName("dockServerController_menu_pop"); #ifndef NDEBUG - pop->insertItem(i18n("Dump Object Tree"), sc, TQT_SLOT(dump_obj())); - pop->insertItem(i18n("Server Debug Window"), sc, TQT_SLOT(server_debug())); + pop->insertItem(i18n("Dump Object Tree"), sc, TQ_SLOT(dump_obj())); + pop->insertItem(i18n("Server Debug Window"), sc, TQ_SLOT(server_debug())); pop->insertSeparator(); #endif pop->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), - m_sc, TQT_SLOT(filter_rule_editor())); + m_sc, TQ_SLOT(filter_rule_editor())); - KStdAction::preferences(m_sc, TQT_SLOT(general_prefs()), + KStdAction::preferences(m_sc, TQ_SLOT(general_prefs()), m_sc->actionCollection())->plug(pop); - KStdAction::configureNotifications(m_sc, TQT_SLOT(notification_prefs()), actionCollection())->plug(pop); + KStdAction::configureNotifications(m_sc, TQ_SLOT(notification_prefs()), actionCollection())->plug(pop); pop->insertSeparator(); pop->insertItem(i18n("New &Server..."), - m_sc, TQT_SLOT(new_connection())); - pop->insertItem(i18n("&Do Autoconnect..."), m_sc, TQT_SLOT(start_autoconnect_check())); - connect(this, TQT_SIGNAL(quitSelected()), m_sc, TQT_SLOT(endksirc())); + m_sc, TQ_SLOT(new_connection())); + pop->insertItem(i18n("&Do Autoconnect..."), m_sc, TQ_SLOT(start_autoconnect_check())); + connect(this, TQ_SIGNAL(quitSelected()), m_sc, TQ_SLOT(endksirc())); #if KDE_IS_VERSION(3,1,92) m_pic_dock = KSystemTray::loadIcon( "ksirc" ); @@ -97,7 +97,7 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren createMainPopup(); m_blinkTimer = new TQTimer( this ); - connect( m_blinkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT( blinkDockedIcon() ) ); + connect( m_blinkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT( blinkDockedIcon() ) ); m_blinkStatus = false; m_blinkActive = false; @@ -107,14 +107,14 @@ dockServerController::dockServerController(servercontroller *sc, TQWidget *paren i18n("If someone said your nick in a window, this action " "will make that window active for you."), ALT+CTRL+Key_A, KKey::QtWIN+CTRL+Key_A, this, - TQT_SLOT(raiseLastActiveWindow())); + TQ_SLOT(raiseLastActiveWindow())); servercontroller::self() ->getGlobalAccel() ->insert("Clear Blink", i18n("Clear Blinking Dock Icon"), i18n("If the dock icon is blinking, but you don't want " "to go to the window this will clear the blinking."), ALT+CTRL+Key_Down, KKey::QtWIN+CTRL+Key_Down, this, - TQT_SLOT(blinkClear())); + TQ_SLOT(blinkClear())); // mainPop = new TDEPopupMenu(this, "dockServerController_main_pop"); // mainPop->setTitle(i18n("KSirc Dock Menu")); @@ -161,12 +161,12 @@ void dockServerController::createMainPopup() if(mainPop) delete mainPop; mainPop = new TDEPopupMenu(this, "dockservercontrller_main_pop"); - connect(mainPop, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(mainActivated(int))); - connect(mainPop, TQT_SIGNAL(aboutToShow()), - this, TQT_SLOT(mainPopShow())); - connect(mainPop, TQT_SIGNAL(aboutToHide()), - this, TQT_SLOT(mainPopHide())); + connect(mainPop, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(mainActivated(int))); + connect(mainPop, TQ_SIGNAL(aboutToShow()), + this, TQ_SLOT(mainPopShow())); + connect(mainPop, TQ_SIGNAL(aboutToHide()), + this, TQ_SLOT(mainPopHide())); TQDictIterator<dscNickInfo> it( m_nicks ); @@ -187,8 +187,8 @@ void dockServerController::createMainPopup() sub->setItemParameter(cid, id); sub->setItemParameter(wid, id); sub->setItemParameter(dcid, id); - connect(sub, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(subItemActivated(int))); + connect(sub, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(subItemActivated(int))); } else { sub->insertItem(i18n("Went Offline: ") + it.current()->offline().toString("hh:mm")); @@ -206,8 +206,8 @@ void dockServerController::createMainPopup() } } if(mainPop->count() == 0){ - mainPop->insertItem(i18n("Help on Notify Popup..."), this, TQT_SLOT(helpNotice())); - mainPop->insertItem(i18n("Configure Notify..."), this, TQT_SLOT(configNotify())); + mainPop->insertItem(i18n("Help on Notify Popup..."), this, TQ_SLOT(helpNotice())); + mainPop->insertItem(i18n("Configure Notify..."), this, TQ_SLOT(configNotify())); } } @@ -421,8 +421,8 @@ void dockServerController::helpNotice() void dockServerController::configNotify() { KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - m_sc, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + m_sc, TQ_SLOT(configChange())); kp->resize(550, 450); kp->showPage(2); /* Show auto connect page */ kp->show(); diff --git a/ksirc/ioDCC.cpp b/ksirc/ioDCC.cpp index be0cdbb6..f5053400 100644 --- a/ksirc/ioDCC.cpp +++ b/ksirc/ioDCC.cpp @@ -31,11 +31,11 @@ KSircIODCC::KSircIODCC(KSircProcess *_proc) : displayMgr->newTopLevel(mgr, FALSE); displayMgr->setCaption(mgr, proc->serverName() + i18n(" DCC Controller")); - connect(mgr->mgr(), TQT_SIGNAL(dccConnectClicked(dccItem *)), this, TQT_SLOT(dccConnectClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccResumeClicked(dccItem *)), this, TQT_SLOT(dccResumeClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccRenameClicked(dccItem *)), this, TQT_SLOT(dccRenameClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(dccAbortClicked(dccItem *)), this, TQT_SLOT(dccAbortClicked(dccItem *))); - connect(mgr->mgr(), TQT_SIGNAL(outputLine(TQCString)), this, TQT_SIGNAL(outputLine(TQCString))); + connect(mgr->mgr(), TQ_SIGNAL(dccConnectClicked(dccItem *)), this, TQ_SLOT(dccConnectClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccResumeClicked(dccItem *)), this, TQ_SLOT(dccResumeClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccRenameClicked(dccItem *)), this, TQ_SLOT(dccRenameClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(dccAbortClicked(dccItem *)), this, TQ_SLOT(dccAbortClicked(dccItem *))); + connect(mgr->mgr(), TQ_SIGNAL(outputLine(TQCString)), this, TQ_SIGNAL(outputLine(TQCString))); } @@ -99,8 +99,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newGetItem(filename, who, dccItem::dccGotOffer, fileSize); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); TQString key = TQString("%1/%2").arg(filename).arg(who); @@ -173,8 +173,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newChatItem(who, dccItem::dccGotOffer); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); it->setWhoPostfix("(" + ip + ")"); DCCChatItems.insert(who, it); } @@ -190,8 +190,8 @@ void KSircIODCC::sirc_receive(TQCString str, bool ) // setup dcc dialog displayMgr->show(mgr); dccItem *it = mgr->mgr()->newChatItem(who, dccItem::dccSentOffer); - connect(it, TQT_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), - this, TQT_SLOT(dccRenameDone(dccItem *, TQString, TQString))); + connect(it, TQ_SIGNAL(itemRenamed(dccItem *, TQString, TQString)), + this, TQ_SLOT(dccRenameDone(dccItem *, TQString, TQString))); DCCChatItems.insert(who, it); } else { diff --git a/ksirc/iocontroller.cpp b/ksirc/iocontroller.cpp index b197cbda..a9e5571a 100644 --- a/ksirc/iocontroller.cpp +++ b/ksirc/iocontroller.cpp @@ -103,20 +103,20 @@ KSircIOController::KSircIOController(TDEProcess *_proc, KSircProcess *_ksircproc // Connect the data arrived // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - this, TQT_SLOT(stdout_read(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + this, TQ_SLOT(stdout_read(TDEProcess*, char*, int))); // Connect the stderr data // to sirc receive for adding // the main text window - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(stderr_read(TDEProcess*, char*, int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(stderr_read(TDEProcess*, char*, int))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(sircDied(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(sircDied(TDEProcess *))); // Notify on sirc dying - connect(proc, TQT_SIGNAL(wroteStdin(TDEProcess*)), - this, TQT_SLOT(procCTS(TDEProcess*))); + connect(proc, TQ_SIGNAL(wroteStdin(TDEProcess*)), + this, TQ_SLOT(procCTS(TDEProcess*))); proc_CTS = TRUE; #if 0 showDebugTraffic(true); @@ -397,8 +397,8 @@ void KSircIOController::showDebugTraffic(bool show) m_debugLB = new TQListBox(0x0, TQCString(this->name()) + "_debugWindow"); m_debugLB->resize(600, 300); m_debugLB->show(); - connect(m_debugLB,TQT_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)), - this,TQT_SLOT(showContextMenuOnDebugWindow(TQListBoxItem *,const TQPoint &))); + connect(m_debugLB,TQ_SIGNAL(contextMenuRequested(TQListBoxItem *,const TQPoint &)), + this,TQ_SLOT(showContextMenuOnDebugWindow(TQListBoxItem *,const TQPoint &))); } else if(m_debugLB != 0 && show == false){ delete m_debugLB; diff --git a/ksirc/ksircprocess.cpp b/ksirc/ksircprocess.cpp index 4184bd06..3bbee663 100644 --- a/ksirc/ksircprocess.cpp +++ b/ksirc/ksircprocess.cpp @@ -215,22 +215,22 @@ KSircProcess::KSircProcess( TQString &server_id, KSircServer &kss, TQObject * pa KSircIODCC *dcc = new KSircIODCC(this); TopList.insert("!dcc", dcc); dcc = static_cast<KSircIODCC *>( TopList["!dcc"] ); // g++ bug - connect(dcc, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); + connect(dcc, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); KSircIOLAG *lag = new KSircIOLAG(this); TopList.insert("!lag", lag); lag = static_cast<KSircIOLAG*>( TopList["!lag"] ); // g++ bug! - connect(lag, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); + connect(lag, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); KSircIONotify *notify = new KSircIONotify(this); TopList.insert("!notify", notify); notify = static_cast<KSircIONotify *>( TopList["!notify"] ); // g++ bug - connect(notify, TQT_SIGNAL(notify_online(TQString)), - this, TQT_SLOT(notify_forw_online(TQString))); - connect(notify, TQT_SIGNAL(notify_offline(TQString)), - this, TQT_SLOT(notify_forw_offline(TQString))); + connect(notify, TQ_SIGNAL(notify_online(TQString)), + this, TQ_SLOT(notify_forw_online(TQString))); + connect(notify, TQ_SIGNAL(notify_offline(TQString)), + this, TQ_SLOT(notify_forw_offline(TQString))); TopList.insert("!base_rules", new KSMBaseRules(this)); @@ -383,20 +383,20 @@ void KSircProcess::new_toplevel(const KSircChannel &channelInfo, bool safe) // Connect needed signals. For a message window we never want it // becomming the default so we ignore focusIn events into it. - connect(wm, TQT_SIGNAL(outputLine(TQCString)), - iocontrol, TQT_SLOT(stdin_write(TQCString))); - connect(wm, TQT_SIGNAL(open_toplevel(const KSircChannel &)), - this,TQT_SLOT(new_toplevel (const KSircChannel &))); - connect(wm, TQT_SIGNAL(closing(KSircTopLevel *, TQString)), - this,TQT_SLOT(close_toplevel(KSircTopLevel *, TQString))); - connect(wm, TQT_SIGNAL(currentWindow(KSircTopLevel *)), - this,TQT_SLOT(default_window(KSircTopLevel *))); - connect(wm, TQT_SIGNAL(changeChannel(const TQString &, const TQString &)), - this,TQT_SLOT(recvChangeChannel(const TQString &, const TQString &))); - connect(wm, TQT_SIGNAL(destroyed(TQObject *)), - this,TQT_SLOT(clean_toplevel(TQObject *))); - connect( wm, TQT_SIGNAL( requestQuit( const TQCString& ) ), - TQT_SLOT( request_quit( const TQCString& ) ) ); + connect(wm, TQ_SIGNAL(outputLine(TQCString)), + iocontrol, TQ_SLOT(stdin_write(TQCString))); + connect(wm, TQ_SIGNAL(open_toplevel(const KSircChannel &)), + this,TQ_SLOT(new_toplevel (const KSircChannel &))); + connect(wm, TQ_SIGNAL(closing(KSircTopLevel *, TQString)), + this,TQ_SLOT(close_toplevel(KSircTopLevel *, TQString))); + connect(wm, TQ_SIGNAL(currentWindow(KSircTopLevel *)), + this,TQ_SLOT(default_window(KSircTopLevel *))); + connect(wm, TQ_SIGNAL(changeChannel(const TQString &, const TQString &)), + this,TQ_SLOT(recvChangeChannel(const TQString &, const TQString &))); + connect(wm, TQ_SIGNAL(destroyed(TQObject *)), + this,TQ_SLOT(clean_toplevel(TQObject *))); + connect( wm, TQ_SIGNAL( requestQuit( const TQCString& ) ), + TQ_SLOT( request_quit( const TQCString& ) ) ); default_window(wm); // Set it to the default window. emit ProcMessage(serverID(), ProcCommand::addTopLevel, channelInfo.channel()); @@ -457,7 +457,7 @@ void KSircProcess::close_toplevel(KSircTopLevel *wm, TQString name) // Let's let em know she's deleted! if(ksopts->autoCreateWin == TRUE){ emit ProcMessage(serverID(), ProcCommand::turnOffAutoCreate, TQString()); - TQTimer::singleShot(5000, this, TQT_SLOT(turn_on_autocreate())); + TQTimer::singleShot(5000, this, TQ_SLOT(turn_on_autocreate())); auto_create_really = TRUE; } else{ @@ -496,7 +496,7 @@ void KSircProcess::request_quit( const TQCString& command ) iocontrol->stdin_write( command ); // Since removing the toplevels will delete the one that emitted this // signal as well, we need to defer this a little (malte) - TQTimer::singleShot( 0, this, TQT_SLOT( do_quit() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( do_quit() ) ); } void KSircProcess::do_quit() diff --git a/ksirc/kstextview.cpp b/ksirc/kstextview.cpp index 12a6747e..85bb62cb 100644 --- a/ksirc/kstextview.cpp +++ b/ksirc/kstextview.cpp @@ -1625,8 +1625,8 @@ TextView::TextView( TQWidget *parent, const char *name ) viewport()->setBackgroundMode( PaletteBase ); viewport()->setMouseTracking( true ); m_autoScrollTimer = new TQTimer( this ); - connect(verticalScrollBar(), TQT_SIGNAL(valueChanged( int ) ), - this, TQT_SLOT(scrolling( int ))); + connect(verticalScrollBar(), TQ_SIGNAL(valueChanged( int ) ), + this, TQ_SLOT(scrolling( int ))); setDragAutoScroll( false ); @@ -2028,16 +2028,16 @@ void TextView::emitLinkClickedForMouseEvent( TQMouseEvent *ev ) void TextView::startAutoScroll() { if(m_autoScrollTimer->isActive() == false){ - connect( m_autoScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoScroll() ) ); + connect( m_autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScroll() ) ); m_autoScrollTimer->start( 75, false ); } } void TextView::stopAutoScroll() { - disconnect( m_autoScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( autoScroll() ) ); + disconnect( m_autoScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( autoScroll() ) ); m_autoScrollTimer->stop(); } diff --git a/ksirc/ksview.cpp b/ksirc/ksview.cpp index 5a34d95a..fe2261de 100644 --- a/ksirc/ksview.cpp +++ b/ksirc/ksview.cpp @@ -49,8 +49,8 @@ KSircView::KSircView(KSircProcess *proc, TQWidget *parent, const char *name) m_timestamps = false; viewport()->setAcceptDrops(true); clear(); - connect( this, TQT_SIGNAL( linkClicked( const TQMouseEvent *, const TQString & ) ), - this, TQT_SLOT( anchorClicked( const TQMouseEvent *, const TQString & ) ) ); + connect( this, TQ_SIGNAL( linkClicked( const TQMouseEvent *, const TQString & ) ), + this, TQ_SLOT( anchorClicked( const TQMouseEvent *, const TQString & ) ) ); TQPixmap background = ksopts->backgroundPixmap(); if ( !background.isNull() ) diff --git a/ksirc/mditoplevel.cpp b/ksirc/mditoplevel.cpp index 326286de..3576b554 100644 --- a/ksirc/mditoplevel.cpp +++ b/ksirc/mditoplevel.cpp @@ -39,11 +39,11 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) setCentralWidget( m_tab ); - connect( m_tab, TQT_SIGNAL( currentChanged( TQWidget * ) ), - this, TQT_SLOT( slotCurrentChanged( TQWidget * ) ) ); + connect( m_tab, TQ_SIGNAL( currentChanged( TQWidget * ) ), + this, TQ_SLOT( slotCurrentChanged( TQWidget * ) ) ); - connect( m_tab, TQT_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ), - this, TQT_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) ); + connect( m_tab, TQ_SIGNAL( showContexMenu(TQWidget *, const TQPoint &) ), + this, TQ_SLOT( slotShowContexMenu(TQWidget *, const TQPoint &) ) ); TDEConfig *config = kapp->config(); config->setGroup("MDI"); @@ -54,7 +54,7 @@ MDITopLevel::MDITopLevel(TQWidget *parent, const char *name) m_addressedIcon = UserIcon( "application-vnd.tde.info" ); m_pop = new TDEPopupMenu(m_tab, ""); - m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQT_SLOT( slotCloseLastWid() )); + m_pop->insertItem( SmallIcon("window-close"), i18n("Close"), this, TQ_SLOT( slotCloseLastWid() )); } @@ -89,16 +89,16 @@ void MDITopLevel::addWidget( TQWidget *widget, bool show ) m_tabWidgets.append( widget ); - connect( widget, TQT_SIGNAL( destroyed() ) , - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( widget, TQ_SIGNAL( destroyed() ) , + this, TQ_SLOT( slotWidgetDestroyed() ) ); - connect( widget, TQT_SIGNAL( changeChannel( const TQString &, const TQString & ) ), - this, TQT_SLOT( slotChangeChannelName( const TQString &, const TQString & ) ) ); + connect( widget, TQ_SIGNAL( changeChannel( const TQString &, const TQString & ) ), + this, TQ_SLOT( slotChangeChannelName( const TQString &, const TQString & ) ) ); widget->installEventFilter( this ); - connect( widget, TQT_SIGNAL( changed( bool, TQString ) ), - this, TQT_SLOT( slotMarkPageDirty( bool ) ) ); + connect( widget, TQ_SIGNAL( changed( bool, TQString ) ), + this, TQ_SLOT( slotMarkPageDirty( bool ) ) ); } void MDITopLevel::removeWidget( TQWidget *widget ) diff --git a/ksirc/objFinder.cpp b/ksirc/objFinder.cpp index 993fd743..38042963 100644 --- a/ksirc/objFinder.cpp +++ b/ksirc/objFinder.cpp @@ -43,8 +43,8 @@ void objFinder::insert(TQObject *obj, const char *key){ } } objList->insert(name, obj); - connect(obj, TQT_SIGNAL(destroyed()), - objFind, TQT_SLOT(objDest())); + connect(obj, TQ_SIGNAL(destroyed()), + objFind, TQ_SLOT(objDest())); emit objFind->inserted(obj); } diff --git a/ksirc/puke/controller.cpp b/ksirc/puke/controller.cpp index 06d290fb..a854cd60 100644 --- a/ksirc/puke/controller.cpp +++ b/ksirc/puke/controller.cpp @@ -103,11 +103,11 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name // accept() never blocks. qsnListen = new TQSocketNotifier(iListenFd, TQSocketNotifier::Read, this, TQString(name) + "_iListen"); - connect(qsnListen, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(NewConnect(int))); + connect(qsnListen, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(NewConnect(int))); - connect(objFind, TQT_SIGNAL(inserted(TQObject *)), - this, TQT_SLOT(slotInserted(TQObject *))); + connect(objFind, TQ_SIGNAL(inserted(TQObject *)), + this, TQ_SLOT(slotInserted(TQObject *))); qidConnectFd.setAutoDelete(TRUE); @@ -124,8 +124,8 @@ PukeController::PukeController(TQString sock, TQObject *parent, const char *name * Connect outputMessage to the acutal write buffer function * outputMessage signals from pobjects are chained until they finally reach us. */ - connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage *)), - this, TQT_SLOT(writeBuffer(int, PukeMessage *))); + connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage *)), + this, TQ_SLOT(writeBuffer(int, PukeMessage *))); initHdlr(); // Setup message command handlers. @@ -176,10 +176,10 @@ void PukeController::NewConnect(int) fdStatus *fds = new fdStatus(); fds->sr = new TQSocketNotifier(cfd, TQSocketNotifier::Read, this); fds->sw = new TQSocketNotifier(cfd, TQSocketNotifier::Write, this); - connect(fds->sr, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(Traffic(int))); - connect(fds->sw, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(Writeable(int))); + connect(fds->sr, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(Traffic(int))); + connect(fds->sw, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(Writeable(int))); qidConnectFd.insert(cfd, fds); qsnListen->setEnabled(TRUE); @@ -609,8 +609,8 @@ void PukeController::hdlrPukeFetchWidget(int fd, PukeMessage *pm) } ws->type = iType; - connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - this, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + this, TQ_SIGNAL(outputMessage(int, PukeMessage*))); // insertPBoject(fd, uiBaseWinId, ws); // The widget list has to exist since we have ourselves in the list @@ -796,8 +796,8 @@ void PukeController::insertPObject(int fd, int iWinId, WidgetS *obj){ // Now connect to the destroyed signal so we can remove the object from the lists // Once it is deleted - connect(obj->pwidget, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(pobjectDestroyed())); + connect(obj->pwidget, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(pobjectDestroyed())); } void PukeController::pobjectDestroyed(){ @@ -959,8 +959,8 @@ widgetId PukeController::createWidget(widgetId wI, PukeMessage *pm) } ws->type = iType; - connect(ws->pwidget, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - this, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(ws->pwidget, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + this, TQ_SIGNAL(outputMessage(int, PukeMessage*))); // insertPBoject(fd, uiBaseWinId, ws); // The widget list has to exist since we have ourselves in the list diff --git a/ksirc/puke/pbutton.cpp b/ksirc/puke/pbutton.cpp index edccbe81..6f128464 100644 --- a/ksirc/puke/pbutton.cpp +++ b/ksirc/puke/pbutton.cpp @@ -92,14 +92,14 @@ void PButton::setWidget(TQObject *_qb) button = (TQButton *) _qb; if(button != 0){ - connect(button, TQT_SIGNAL(pressed()), - this, TQT_SLOT(buttonPressed())); - connect(button, TQT_SIGNAL(released()), - this, TQT_SLOT(buttonReleased())); - connect(button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(buttonClicked())); - connect(button, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(buttonToggled(bool))); + connect(button, TQ_SIGNAL(pressed()), + this, TQ_SLOT(buttonPressed())); + connect(button, TQ_SIGNAL(released()), + this, TQ_SLOT(buttonReleased())); + connect(button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(buttonClicked())); + connect(button, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(buttonToggled(bool))); } PWidget::setWidget(_qb); diff --git a/ksirc/puke/plined.cpp b/ksirc/puke/plined.cpp index 56a4ddc0..1817e0a9 100644 --- a/ksirc/puke/plined.cpp +++ b/ksirc/puke/plined.cpp @@ -111,10 +111,10 @@ void PLineEdit::setWidget(TQObject *_le) lineedit = (TQLineEdit *) _le; if(lineedit != 0){ - connect(lineedit, TQT_SIGNAL(textChanged(const char *)), - this, TQT_SLOT(updateText(const char *))); - connect(lineedit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(returnPress())); + connect(lineedit, TQ_SIGNAL(textChanged(const char *)), + this, TQ_SLOT(updateText(const char *))); + connect(lineedit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(returnPress())); } PWidget::setWidget(_le); diff --git a/ksirc/puke/plistbox.cpp b/ksirc/puke/plistbox.cpp index d0b98305..b8f9b8b8 100644 --- a/ksirc/puke/plistbox.cpp +++ b/ksirc/puke/plistbox.cpp @@ -160,10 +160,10 @@ void PListBox::setWidget(TQObject *_lb) lb = (TQListBox *) _lb; if(lb != 0){ - connect(lb, TQT_SIGNAL(highlighted(int)), - this, TQT_SLOT(highlighted(int))); - connect(lb, TQT_SIGNAL(selected(int)), - this, TQT_SLOT(selected(int))); + connect(lb, TQ_SIGNAL(highlighted(int)), + this, TQ_SLOT(highlighted(int))); + connect(lb, TQ_SIGNAL(selected(int)), + this, TQ_SLOT(selected(int))); } PFrame::setWidget(lb); diff --git a/ksirc/puke/pmenudta.cpp b/ksirc/puke/pmenudta.cpp index 576ebc39..1bf7f9bd 100644 --- a/ksirc/puke/pmenudta.cpp +++ b/ksirc/puke/pmenudta.cpp @@ -7,8 +7,8 @@ PMenuData::PMenuData(PObject *_child) : PObject() { child = _child; - connect(this, TQT_SIGNAL(outputMessage(int, PukeMessage*)), - child, TQT_SIGNAL(outputMessage(int, PukeMessage*))); + connect(this, TQ_SIGNAL(outputMessage(int, PukeMessage*)), + child, TQ_SIGNAL(outputMessage(int, PukeMessage*))); } PMenuData::~PMenuData() diff --git a/ksirc/puke/pobject.cpp b/ksirc/puke/pobject.cpp index 99be1274..28a305c1 100644 --- a/ksirc/puke/pobject.cpp +++ b/ksirc/puke/pobject.cpp @@ -83,14 +83,14 @@ void PObject::setWidget(TQObject *_o) // Disconnect everything from the object we where listning too // Just in case it fires something off, we don't want to get it if(widget() != 0){ - disconnect(widget(), TQT_SIGNAL(destroyed()), - this, TQT_SLOT(swidgetDestroyed())); + disconnect(widget(), TQ_SIGNAL(destroyed()), + this, TQ_SLOT(swidgetDestroyed())); } obj = _o; if(obj != 0){ - connect(widget(), TQT_SIGNAL(destroyed()), - this, TQT_SLOT(swidgetDestroyed())); + connect(widget(), TQ_SIGNAL(destroyed()), + this, TQ_SLOT(swidgetDestroyed())); } } diff --git a/ksirc/puke/pobjfinder.cpp b/ksirc/puke/pobjfinder.cpp index 2931ec77..27f5ce1e 100644 --- a/ksirc/puke/pobjfinder.cpp +++ b/ksirc/puke/pobjfinder.cpp @@ -19,8 +19,8 @@ PObjFinder::PObjFinder(PObject *parent) // We don't actually encase a widget since all the ObjFinder interface // is static setWidget(0x0); - connect(controller(), TQT_SIGNAL(inserted(TQObject *)), - this, TQT_SLOT(newObject(TQObject *))); + connect(controller(), TQ_SIGNAL(inserted(TQObject *)), + this, TQ_SLOT(newObject(TQObject *))); } PObjFinder::~PObjFinder() diff --git a/ksirc/puke/ppopmenu.cpp b/ksirc/puke/ppopmenu.cpp index d50f6610..fe8bb1f7 100644 --- a/ksirc/puke/ppopmenu.cpp +++ b/ksirc/puke/ppopmenu.cpp @@ -89,8 +89,8 @@ void PPopupMenu::setWidget(TQObject *_menu) menu = (TQPopupMenu *) _menu; if(menu != 0x0){ - connect(menu, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(got_activated(int))); + connect(menu, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(got_activated(int))); } PFrame::setWidget(menu); } diff --git a/ksirc/puke/pprogress.cpp b/ksirc/puke/pprogress.cpp index e1a6203c..4666fa59 100644 --- a/ksirc/puke/pprogress.cpp +++ b/ksirc/puke/pprogress.cpp @@ -115,8 +115,8 @@ void PProgress::setWidget(TQObject *_f) ksp = (KSProgress *) _f; if(widget() != 0){ - connect(widget(), TQT_SIGNAL(cancel()), - this, TQT_SLOT(cancelPressed())); + connect(widget(), TQ_SIGNAL(cancel()), + this, TQ_SLOT(cancelPressed())); } PWidget::setWidget(ksp); diff --git a/ksirc/servercontroller.cpp b/ksirc/servercontroller.cpp index 273fd6ef..67736f44 100644 --- a/ksirc/servercontroller.cpp +++ b/ksirc/servercontroller.cpp @@ -145,25 +145,25 @@ servercontroller::servercontroller( TQWidget*, const char* name ) sci->setFrameStyle(TQFrame::Box | TQFrame::Raised); ConnectionTree = sci->ConnectionTree; - connect(ConnectionTree, TQT_SIGNAL(clicked( TQListViewItem * )), - this, TQT_SLOT(WindowSelected(TQListViewItem *))); + connect(ConnectionTree, TQ_SIGNAL(clicked( TQListViewItem * )), + this, TQ_SLOT(WindowSelected(TQListViewItem *))); setFrameBorderWidth(5); TQPopupMenu *file = new TQPopupMenu(this, TQCString(name) + "_menu_file"); - KStdAction::quit(this, TQT_SLOT(endksirc()), actionCollection())->plug(file); + KStdAction::quit(this, TQ_SLOT(endksirc()), actionCollection())->plug(file); #ifndef NDEBUG - file->insertItem(i18n("Dump Object Tree"), this, TQT_SLOT(dump_obj())); - file->insertItem(i18n("Server Debug Window"), this, TQT_SLOT(server_debug())); + file->insertItem(i18n("Dump Object Tree"), this, TQ_SLOT(dump_obj())); + file->insertItem(i18n("Server Debug Window"), this, TQ_SLOT(server_debug())); #endif MenuBar->insertItem(i18n("&File"), file); connections = new TQPopupMenu(this, TQCString(name) + "_menu_connections"); - server_id = connections->insertItem(i18n("&New Server..."), this, TQT_SLOT(new_connection()), Key_F2 ); - join_id = connections->insertItem(i18n("&Join Channel..."), this, TQT_SLOT(new_channel()), Key_F3 ); + server_id = connections->insertItem(i18n("&New Server..."), this, TQ_SLOT(new_connection()), Key_F2 ); + join_id = connections->insertItem(i18n("&Join Channel..."), this, TQ_SLOT(new_channel()), Key_F3 ); connections->insertSeparator(); - connections->insertItem(i18n("&Do Autoconnect..."), this, TQT_SLOT(start_autoconnect_check())); + connections->insertItem(i18n("&Do Autoconnect..."), this, TQ_SLOT(start_autoconnect_check())); connections->setItemEnabled(join_id, FALSE); MenuBar->insertItem(i18n("&Connections"), connections); @@ -171,11 +171,11 @@ servercontroller::servercontroller( TQWidget*, const char* name ) options->setCheckable(TRUE); options->insertItem(SmallIcon( "filter" ), i18n("&Filter Rule Editor..."), - this, TQT_SLOT(filter_rule_editor())); + this, TQ_SLOT(filter_rule_editor())); options->insertSeparator(); - KStdAction::configureNotifications(this, TQT_SLOT(notification_prefs()), actionCollection())->plug(options); + KStdAction::configureNotifications(this, TQ_SLOT(notification_prefs()), actionCollection())->plug(options); - KStdAction::preferences(this, TQT_SLOT(general_prefs()), actionCollection())->plug(options); + KStdAction::preferences(this, TQ_SLOT(general_prefs()), actionCollection())->plug(options); MenuBar->insertItem(i18n("&Settings"), options); @@ -188,7 +188,7 @@ servercontroller::servercontroller( TQWidget*, const char* name ) "when in docked mode, since you don't need to click on the " "dock icon."), ALT+CTRL+Key_C, KKey::QtWIN+CTRL+Key_C, this, - TQT_SLOT(new_connection())); + TQ_SLOT(new_connection())); open_toplevels = 0; @@ -239,8 +239,8 @@ void servercontroller::checkDocking() void servercontroller::new_connection() { open_ksirc *w = new open_ksirc(); // Create new ksirc popup - connect(w, TQT_SIGNAL(open_ksircprocess(KSircServer &)), // connected ok to process - this, TQT_SLOT(new_ksircprocess(KSircServer &))); // start + connect(w, TQ_SIGNAL(open_ksircprocess(KSircServer &)), // connected ok to process + this, TQ_SLOT(new_ksircprocess(KSircServer &))); // start w->exec(); // show the sucker! delete w; } @@ -270,10 +270,10 @@ void servercontroller::new_ksircprocess(KSircServer &kss) //this->insertChild(proc); // Add it to out inheritance tree so we can retreive child widgets from it. objFinder::insert(proc); proc_list.insert(server_id, proc); // Add proc to hash - connect(proc, TQT_SIGNAL(ProcMessage(TQString, int, TQString)), - this, TQT_SLOT(ProcMessage(TQString, int, TQString))); - connect(this, TQT_SIGNAL(ServMessage(TQString, int, TQString)), - proc, TQT_SLOT(ServMessage(TQString, int, TQString))); + connect(proc, TQ_SIGNAL(ProcMessage(TQString, int, TQString)), + this, TQ_SLOT(ProcMessage(TQString, int, TQString))); + connect(this, TQ_SIGNAL(ServMessage(TQString, int, TQString)), + proc, TQ_SLOT(ServMessage(TQString, int, TQString))); if(!ConnectionTree->currentItem()){ // If nothing's highlighted ConnectionTree->setCurrentItem(rootItem); // highlight it. @@ -305,8 +305,8 @@ void servercontroller::new_channel() KSircChannel ci(server, TQString()); NewWindowDialog w(ci); - connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), - this, TQT_SLOT(new_toplevel(const KSircChannel &))); + connect(&w, TQ_SIGNAL(openTopLevel(const KSircChannel &)), + this, TQ_SLOT(new_toplevel(const KSircChannel &))); w.exec(); } @@ -330,8 +330,8 @@ void servercontroller::ToggleAutoCreate() void servercontroller::general_prefs() { KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - this, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + this, TQ_SLOT(configChange())); kp->resize(550, 450); kp->show(); } @@ -373,8 +373,8 @@ void servercontroller::server_debug() void servercontroller::filter_rule_editor() { FilterRuleEditor *fe = new FilterRuleEditor(); - connect(fe, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(slot_filters_update())); + connect(fe, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(slot_filters_update())); fe->show(); } @@ -917,7 +917,7 @@ void servercontroller::do_autoconnect() void servercontroller::start_autoconnect() { at = new TQTimer(this); - connect(at, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_autoconnect())); + connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); at->start(250, FALSE); } @@ -929,15 +929,15 @@ void servercontroller::start_autoconnect_check() { if(servers.count() == 0){ KSPrefs *kp = new KSPrefs(); - connect(kp, TQT_SIGNAL(update(int)), - this, TQT_SLOT(configChange())); + connect(kp, TQ_SIGNAL(update(int)), + this, TQ_SLOT(configChange())); kp->resize(550, 450); kp->showPage(7); /* Show auto connect page */ kp->show(); } else { at = new TQTimer(this); - connect(at, TQT_SIGNAL(timeout()), this, TQT_SLOT(do_autoconnect())); + connect(at, TQ_SIGNAL(timeout()), this, TQ_SLOT(do_autoconnect())); at->start(250, FALSE); } diff --git a/ksirc/ssfepromptdata.cpp b/ksirc/ssfepromptdata.cpp index 15349f44..b9a5acdc 100644 --- a/ksirc/ssfepromptdata.cpp +++ b/ksirc/ssfepromptdata.cpp @@ -38,7 +38,7 @@ ssfepromptdata::ssfepromptdata SLine->setGeometry( 240, 10, 100, 30 ); SLine->setMinimumSize( 10, 10 ); SLine->setMaximumSize( 32767, 32767 ); - connect( SLine, TQT_SIGNAL(returnPressed()), TQT_SLOT(terminate()) ); + connect( SLine, TQ_SIGNAL(returnPressed()), TQ_SLOT(terminate()) ); SLine->setText( "" ); SLine->setMaxLength( 32767 ); SLine->setEchoMode( TQLineEdit::Normal ); @@ -49,7 +49,7 @@ ssfepromptdata::ssfepromptdata dlgedit_PushButton_1->setGeometry( 240, 50, 100, 30 ); dlgedit_PushButton_1->setMinimumSize( 10, 10 ); dlgedit_PushButton_1->setMaximumSize( 32767, 32767 ); - connect( dlgedit_PushButton_1, TQT_SIGNAL(clicked()), TQT_SLOT(terminate()) ); + connect( dlgedit_PushButton_1, TQ_SIGNAL(clicked()), TQ_SLOT(terminate()) ); dlgedit_PushButton_1->setAutoRepeat( FALSE ); dlgedit_PushButton_1->setAutoDefault( TRUE ); diff --git a/ksirc/topic.cpp b/ksirc/topic.cpp index b2ab5840..bcb61263 100644 --- a/ksirc/topic.cpp +++ b/ksirc/topic.cpp @@ -99,12 +99,12 @@ void KSircTopic::contentsMouseReleaseEvent( TQMouseEvent *e ) m_editor = new KSircTopicEditor( this ); - connect( m_editor, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( setNewTopic() ) ); - connect( m_editor, TQT_SIGNAL( resized() ), - this, TQT_SLOT( slotEditResized() ) ); - connect( m_editor, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( doResize() ) ); + connect( m_editor, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( setNewTopic() ) ); + connect( m_editor, TQ_SIGNAL( resized() ), + this, TQ_SLOT( slotEditResized() ) ); + connect( m_editor, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( doResize() ) ); /* * If you don't do this order @@ -132,9 +132,9 @@ void KSircTopic::setNewTopic() * from the server. If we can't set the topic * don't make it look like it was set */ - TQTimer::singleShot( 0, m_editor, TQT_SLOT( close() ) ); - disconnect( m_editor, TQT_SIGNAL( resized() ), - this, TQT_SLOT( slotEditResized() ) ); + TQTimer::singleShot( 0, m_editor, TQ_SLOT( close() ) ); + disconnect( m_editor, TQ_SIGNAL( resized() ), + this, TQ_SLOT( slotEditResized() ) ); doResize(); emit topicChange( topic ); } @@ -185,7 +185,7 @@ KSircTopicEditor::KSircTopicEditor( TQWidget *parent, const char *name ) { setWFlags( WDestructiveClose ); setFocusPolicy( TQWidget::ClickFocus ); - connect( this, TQT_SIGNAL( textChanged () ), this, TQT_SLOT( slotMaybeResize() ) ); + connect( this, TQ_SIGNAL( textChanged () ), this, TQ_SLOT( slotMaybeResize() ) ); } void KSircTopicEditor::keyPressEvent( TQKeyEvent *ev ) @@ -193,7 +193,7 @@ void KSircTopicEditor::keyPressEvent( TQKeyEvent *ev ) if ( ev->key() == Key_Escape ) { ev->accept(); - TQTimer::singleShot( 0, this, TQT_SLOT( close() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( close() ) ); return; } else if ( ev->key() == Key_Return ) @@ -216,7 +216,7 @@ void KSircTopicEditor::focusOutEvent( TQFocusEvent * fe ) return; } - TQTimer::singleShot( 0, this, TQT_SLOT( close() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( close() ) ); } TQPopupMenu *KSircTopicEditor::createPopupMenu( const TQPoint &pos ) diff --git a/ksirc/toplevel.cpp b/ksirc/toplevel.cpp index 840987f9..d1fbb2ef 100644 --- a/ksirc/toplevel.cpp +++ b/ksirc/toplevel.cpp @@ -149,34 +149,34 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf m_channelInfo.setEncoding(ksopts->chan(m_channelInfo).encoding); selector = new charSelector(); - connect(selector, TQT_SIGNAL(clicked()), this, TQT_SLOT(insertText())); + connect(selector, TQ_SIGNAL(clicked()), this, TQ_SLOT(insertText())); selector->setFont(ksopts->defaultFont.family()); file = new TQPopupMenu(this, TQCString(this->name()) + "_popup_file"); file->setCheckable(true); - TDEAction *act = KStdAction::openNew( this, TQT_SLOT( newWindow() ), actionCollection() ); + TDEAction *act = KStdAction::openNew( this, TQ_SLOT( newWindow() ), actionCollection() ); act->plug( file ); - file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQT_SLOT(new_connection()), Key_F2); + file->insertItem(i18n("New Ser&ver..."), servercontroller::self(), TQ_SLOT(new_connection()), Key_F2); file->insertSeparator(); - file->insertItem(i18n("&DCC Manager..."), this, TQT_SLOT(showDCCMgr())); - file->insertItem(i18n("&Save to Logfile..."), this, TQT_SLOT(saveCurrLog()), CTRL + Key_S); + file->insertItem(i18n("&DCC Manager..."), this, TQ_SLOT(showDCCMgr())); + file->insertItem(i18n("&Save to Logfile..."), this, TQ_SLOT(saveCurrLog()), CTRL + Key_S); - tsitem = file->insertItem(i18n("Time St&"), this, TQT_SLOT(toggleTimestamp()), CTRL + Key_T); + tsitem = file->insertItem(i18n("Time St&"), this, TQ_SLOT(toggleTimestamp()), CTRL + Key_T); file->setItemChecked(tsitem, ksopts->chan(m_channelInfo).timeStamp); - fjpitem = file->insertItem(i18n("Hide Join/Part Messages"), this, TQT_SLOT(toggleFilterJoinPart())); + fjpitem = file->insertItem(i18n("Hide Join/Part Messages"), this, TQ_SLOT(toggleFilterJoinPart())); file->setItemChecked(fjpitem, ksopts->chan(m_channelInfo).filterJoinPart); - file->insertItem(i18n("Character &Table"), selector, TQT_SLOT(show()), CTRL + Key_H); - beepitem = file->insertItem(i18n("N&otify on Change"), this, TQT_SLOT(toggleBeep()), CTRL + Key_P); + file->insertItem(i18n("Character &Table"), selector, TQ_SLOT(show()), CTRL + Key_H); + beepitem = file->insertItem(i18n("N&otify on Change"), this, TQ_SLOT(toggleBeep()), CTRL + Key_P); file->setItemChecked(beepitem, ksopts->chan(m_channelInfo).beepOnMsg); encodingAction = new TDESelectAction( i18n( "&Encoding" ), 0, this ); - connect( encodingAction, TQT_SIGNAL( activated() ), this, TQT_SLOT( setEncoding() ) ); + connect( encodingAction, TQ_SIGNAL( activated() ), this, TQ_SLOT( setEncoding() ) ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); - topicitem = file->insertItem(i18n("S&how Topic"), this, TQT_SLOT(toggleTopic()), CTRL + Key_O); + topicitem = file->insertItem(i18n("S&how Topic"), this, TQ_SLOT(toggleTopic()), CTRL + Key_O); if (isPrivateChat() || m_channelInfo.channel().startsWith("!no_channel")) { file->setItemEnabled(topicitem, false); } @@ -184,7 +184,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf file->setItemChecked(topicitem, ksopts->chan(m_channelInfo).topicShow); } - tickeritem = file->insertItem(i18n("Ticker &Mode"), this, TQT_SLOT(toggleTicker())); + tickeritem = file->insertItem(i18n("Ticker &Mode"), this, TQ_SLOT(toggleTicker())); // remove utf16/ucs2 as it just doesn't work for IRC TQStringList::Iterator encodingIt = encodings.begin(); @@ -208,7 +208,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf setEncoding(); file->insertSeparator(); - act = KStdAction::close( this, TQT_SLOT( terminate() ), actionCollection() ); + act = KStdAction::close( this, TQ_SLOT( terminate() ), actionCollection() ); act->plug( file ); kmenu = menuBar(); @@ -231,8 +231,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf ksTopic = new KSircTopic( top ); ksTopic->setFont(ksopts->defaultFont); - connect( ksTopic, TQT_SIGNAL( topicChange( const TQString & ) ), - this, TQT_SLOT( setTopicIntern( const TQString & ) ) ); + connect( ksTopic, TQ_SIGNAL( topicChange( const TQString & ) ), + this, TQ_SLOT( setTopicIntern( const TQString & ) ) ); TQCString kstn = TQCString(this->name()) + "_"; @@ -249,8 +249,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf nicks_box = new TQVBox(pan); channelButtons = new chanButtons(ksircProcess(), nicks_box); - connect(channelButtons, TQT_SIGNAL(mode(TQString, int, TQString)), - this, TQT_SLOT(setMode(TQString, int, TQString))); + connect(channelButtons, TQ_SIGNAL(mode(TQString, int, TQString)), + this, TQ_SLOT(setMode(TQString, int, TQString))); nicks = new aListBox(nicks_box, kstn + "aListBox"); nicks->setFocusPolicy(TQWidget::NoFocus); @@ -312,11 +312,11 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf mainw->enableTimeStamps(ksopts->chan(m_channelInfo).timeStamp); edit = new TQPopupMenu(this); - act = KStdAction::copy( mainw, TQT_SLOT( copy() ), actionCollection() ); + act = KStdAction::copy( mainw, TQ_SLOT( copy() ), actionCollection() ); act->plug( edit ); - act = KStdAction::paste( this, TQT_SLOT( pasteToWindow() ), actionCollection() ); + act = KStdAction::paste( this, TQ_SLOT( pasteToWindow() ), actionCollection() ); act->plug( edit ); - edit->insertItem(i18n("C&lear Window"), this, TQT_SLOT(clearWindow()), CTRL + Key_L); + edit->insertItem(i18n("C&lear Window"), this, TQ_SLOT(clearWindow()), CTRL + Key_L); kmenu->insertItem(i18n("&Edit"), edit, -1, -1); linee = new aHistLineEdit(top, ""); @@ -353,8 +353,8 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf } - connect(mainw, TQT_SIGNAL(pasteReq( const TQString& )), - this, TQT_SLOT( slotTextDropped( const TQString& ))); + connect(mainw, TQ_SIGNAL(pasteReq( const TQString& )), + this, TQ_SLOT( slotTextDropped( const TQString& ))); nicks->setFont(ksopts->defaultFont); @@ -370,17 +370,17 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf linee->setWordWrap(TQTextEdit::WidgetWidth); } - connect(linee, TQT_SIGNAL(gotFocus()), - this, TQT_SLOT(gotFocus())); - connect(linee, TQT_SIGNAL(lostFocus()), - this, TQT_SLOT(lostFocus())); - connect(linee, TQT_SIGNAL(pasteText(const TQString&)), - this, TQT_SLOT(slotTextDropped(const TQString&))); - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(gotFocus()), + this, TQ_SLOT(gotFocus())); + connect(linee, TQ_SIGNAL(lostFocus()), + this, TQ_SLOT(lostFocus())); + connect(linee, TQ_SIGNAL(pasteText(const TQString&)), + this, TQ_SLOT(slotTextDropped(const TQString&))); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); - connect( linee, TQT_SIGNAL( gotReturnPressed() ), - this, TQT_SLOT( returnPressed() ) ); + connect( linee, TQ_SIGNAL( gotReturnPressed() ), + this, TQ_SLOT( returnPressed() ) ); linee->setFocus(); // Give SLE focus linee->slotMaybeResize(); @@ -440,7 +440,7 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf cml.insert(top, new TQPopupMenu(this)); command->insertItem(top, cml[top]); } - cml[top]->insertItem(item, this, TQT_SLOT(cmd_process(int)), 0, i); + cml[top]->insertItem(item, this, TQ_SLOT(cmd_process(int)), 0, i); i++; } @@ -449,17 +449,17 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf kmenu->insertItem( KStdGuiItem::help().text(), helpMenu( TQString(), false )); - connect(user_controls, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(UserParseMenu(int))); + connect(user_controls, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(UserParseMenu(int))); - connect(nicks, TQT_SIGNAL(contextMenuRequested(int)), this, - TQT_SLOT(UserSelected(int))); - connect(nicks, TQT_SIGNAL(selectedNick(const TQString &)), - this, TQT_SLOT(openQueryFromNick(const TQString &))); - connect(nicks, TQT_SIGNAL(mouseButtonClicked ( int, TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(pasteToNickList(int, TQListBoxItem *, const TQPoint &))); - connect(nicks, TQT_SIGNAL(textDropped( const TQListBoxItem *, const TQString& )), - this, TQT_SLOT(dndTextToNickList(const TQListBoxItem *, const TQString&))); + connect(nicks, TQ_SIGNAL(contextMenuRequested(int)), this, + TQ_SLOT(UserSelected(int))); + connect(nicks, TQ_SIGNAL(selectedNick(const TQString &)), + this, TQ_SLOT(openQueryFromNick(const TQString &))); + connect(nicks, TQ_SIGNAL(mouseButtonClicked ( int, TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(pasteToNickList(int, TQListBoxItem *, const TQPoint &))); + connect(nicks, TQ_SIGNAL(textDropped( const TQListBoxItem *, const TQString& )), + this, TQ_SLOT(dndTextToNickList(const TQListBoxItem *, const TQString&))); UserUpdateMenu(); // Must call to update Popup. @@ -467,10 +467,10 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf accel->connectItem(accel->insertItem(SHIFT + Key_PageUp), this, - TQT_SLOT(AccelScrollUpPage())); + TQ_SLOT(AccelScrollUpPage())); accel->connectItem(accel->insertItem(SHIFT + Key_PageDown), this, - TQT_SLOT(AccelScrollDownPage())); + TQ_SLOT(AccelScrollDownPage())); /* * Pageup/dn @@ -479,41 +479,41 @@ KSircTopLevel::KSircTopLevel(KSircProcess *_proc, const KSircChannel &channelInf accel->connectItem(accel->insertItem(Key_PageUp), this, - TQT_SLOT(AccelScrollUpPage())); + TQ_SLOT(AccelScrollUpPage())); accel->connectItem(accel->insertItem(Key_PageDown), this, - TQT_SLOT(AccelScrollDownPage())); + TQ_SLOT(AccelScrollDownPage())); /* * These are not presently implemented, so let's not fill the logs. accel->connectItem(accel->insertItem(CTRL + Key_Return), this, - TQT_SLOT(AccelPriorMsgNick())); + TQ_SLOT(AccelPriorMsgNick())); accel->connectItem(accel->insertItem(CTRL + SHIFT + Key_Return), this, - TQT_SLOT(AccelNextMsgNick())); + TQ_SLOT(AccelNextMsgNick())); */ accel->connectItem(accel->insertItem(Key_Tab), // adds TAB accelerator this, // connected to the main - TQT_SLOT(TabNickCompletionNormal())); // TabNickCompletion() slot + TQ_SLOT(TabNickCompletionNormal())); // TabNickCompletion() slot accel->connectItem(accel->insertItem(SHIFT+Key_Tab), // adds TAB accelerator this, // connected to the main - TQT_SLOT(TabNickCompletionShift())); // TabNickCompletion() slot + TQ_SLOT(TabNickCompletionShift())); // TabNickCompletion() slot accel->connectItem(accel->insertItem(CTRL + Key_N), - this, TQT_SLOT(newWindow())); + this, TQ_SLOT(newWindow())); // accel->connectItem(accel->insertItem(CTRL + Key_S), -// this, TQT_SLOT(toggleTimestamp())); +// this, TQ_SLOT(toggleTimestamp())); // Drag & Drop - connect( mainw, TQT_SIGNAL( textDropped(const TQString&) ), - TQT_SLOT( slotTextDropped(const TQString&) )); - connect( mainw, TQT_SIGNAL( urlsDropped(const TQStringList&) ), - TQT_SLOT( slotDropURLs(const TQStringList&) )); - connect( nicks, TQT_SIGNAL( urlsDropped( const TQStringList&, const TQString& )), - TQT_SLOT( slotDccURLs( const TQStringList&, const TQString& ))); - connect( this, TQT_SIGNAL( changed(bool, TQString) ), this, TQT_SLOT( doChange(bool, TQString) )); + connect( mainw, TQ_SIGNAL( textDropped(const TQString&) ), + TQ_SLOT( slotTextDropped(const TQString&) )); + connect( mainw, TQ_SIGNAL( urlsDropped(const TQStringList&) ), + TQ_SLOT( slotDropURLs(const TQStringList&) )); + connect( nicks, TQ_SIGNAL( urlsDropped( const TQStringList&, const TQString& )), + TQ_SLOT( slotDccURLs( const TQStringList&, const TQString& ))); + connect( this, TQ_SIGNAL( changed(bool, TQString) ), this, TQ_SLOT( doChange(bool, TQString) )); mainw->setAcceptFiles( isPrivateChat() ); resize(600, 360); @@ -748,8 +748,8 @@ void KSircTopLevel::TabNickCompletion(int dir) TQString line = tab_nick + ": "; // tab_nick holds the last night since we haven't overritten it yet. linee->setText(line); linee->setCursorPosition(line.length()); - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); return; } @@ -800,8 +800,8 @@ void KSircTopLevel::TabNickCompletion(int dir) tab_pressed = tab; // setText causes lineeTextChanged to get called and erase tab_pressed - connect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + connect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); } @@ -1193,7 +1193,7 @@ void KSircTopLevel::AccelScrollUpPage() void KSircTopLevel::newWindow() { NewWindowDialog w(KSircChannel(m_channelInfo.server(), TQString())); - connect(&w, TQT_SIGNAL(openTopLevel(const KSircChannel &)), TQT_SIGNAL(open_toplevel(const KSircChannel &))); + connect(&w, TQ_SIGNAL(openTopLevel(const KSircChannel &)), TQ_SIGNAL(open_toplevel(const KSircChannel &))); w.exec(); } @@ -1637,8 +1637,8 @@ void KSircTopLevel::clearWindow() void KSircTopLevel::lineeNotTab() { tab_pressed = -1; - disconnect(linee, TQT_SIGNAL(notTab()), - this, TQT_SLOT(lineeNotTab())); + disconnect(linee, TQ_SIGNAL(notTab()), + this, TQ_SLOT(lineeNotTab())); addCompleteNick(tab_nick); } @@ -1651,7 +1651,7 @@ bool KSircTopLevel::event( TQEvent *e) if(e->type() == TQEvent::ApplicationPaletteChange || e->type() == TQEvent::ApplicationFontChange) { - TQTimer::singleShot(750, this, TQT_SLOT(initColors())); + TQTimer::singleShot(750, this, TQ_SLOT(initColors())); initColors(); } return TDEMainWindow::event(e); @@ -1804,7 +1804,7 @@ void KSircTopLevel::toggleTicker() ticker->show(); displayMgr->hide(this); - connect(ticker, TQT_SIGNAL(doubleClick()), this, TQT_SLOT(toggleTicker())); + connect(ticker, TQ_SIGNAL(doubleClick()), this, TQ_SLOT(toggleTicker())); } } diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp index 103c152c..5f7372db 100644 --- a/ktalkd/kcmktalkd/answmachpage.cpp +++ b/ktalkd/kcmktalkd/answmachpage.cpp @@ -92,18 +92,18 @@ KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name, load(); - connect(answmach_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(answmachOnOff())); + connect(answmach_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(answmachOnOff())); // Emit changed(true) when anything changes - connect(answmach_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged())); - connect(mail_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); - connect(subj_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); - connect(head_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotChanged())); - connect(emptymail_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged())); - connect(msg_ml, TQT_SIGNAL(textChanged()), this, TQT_SLOT(slotChanged())); + connect(answmach_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged())); + connect(mail_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); + connect(subj_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); + connect(head_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotChanged())); + connect(emptymail_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged())); + connect(msg_ml, TQ_SIGNAL(textChanged()), this, TQ_SLOT(slotChanged())); } diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp index ea323ad6..20f09d4f 100644 --- a/ktalkd/kcmktalkd/forwmachpage.cpp +++ b/ktalkd/kcmktalkd/forwmachpage.cpp @@ -75,12 +75,12 @@ See Help for further explanation.\n\ load(); - connect(forwmach_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(forwmachOnOff())); + connect(forwmach_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(forwmachOnOff())); // emit changed(true) on changes - connect(forwmach_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotChanged())); - connect(address_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotChanged())); - connect(method_combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); + connect(forwmach_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotChanged())); + connect(address_edit, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotChanged())); + connect(method_combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); } KForwmachPageConfig::~KForwmachPageConfig( ) { diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp index 29c4cbf2..6ebe0aac 100644 --- a/ktalkd/kcmktalkd/main.cpp +++ b/ktalkd/kcmktalkd/main.cpp @@ -50,9 +50,9 @@ KTalkdConfigModule::KTalkdConfigModule(TQWidget *parent, const char *name) tab->addTab(answmachpage, i18n("Ans&wering Machine")); tab->addTab(forwmachpage, i18n("forward call", "&Forward")); - connect(soundpage, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(answmachpage, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); - connect(forwmachpage, TQT_SIGNAL(changed(bool)), this, TQT_SIGNAL(changed(bool))); + connect(soundpage, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(answmachpage, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); + connect(forwmachpage, TQ_SIGNAL(changed(bool)), this, TQ_SIGNAL(changed(bool))); } KTalkdConfigModule::~KTalkdConfigModule() { diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp index e3cac09b..1c2e7a08 100644 --- a/ktalkd/kcmktalkd/soundpage.cpp +++ b/ktalkd/kcmktalkd/soundpage.cpp @@ -117,12 +117,12 @@ KSoundPageConfig::KSoundPageConfig( TQWidget *parent, const char* name, load(); - connect(sound_cb, TQT_SIGNAL(clicked()), this, TQT_SLOT(soundOnOff())); - connect(btn_test, TQT_SIGNAL(clicked()), this, TQT_SLOT(playCurrentSound())); + connect(sound_cb, TQ_SIGNAL(clicked()), this, TQ_SLOT(soundOnOff())); + connect(btn_test, TQ_SIGNAL(clicked()), this, TQ_SLOT(playCurrentSound())); // emit changed(true) on changes - connect(extprg_edit->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotChanged())); - connect(client_edit->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotChanged())); + connect(extprg_edit->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotChanged())); + connect(client_edit->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotChanged())); } KSoundPageConfig::~KSoundPageConfig( ) { diff --git a/ktalkd/ktalkd/machines/forwmach.cpp b/ktalkd/ktalkd/machines/forwmach.cpp index 5bb5cd0d..8f838440 100644 --- a/ktalkd/ktalkd/machines/forwmach.cpp +++ b/ktalkd/ktalkd/machines/forwmach.cpp @@ -428,7 +428,7 @@ char * ForwMachine::forwMachFindMatch(TABLE_ENTRY * table, NEW_CTL_MSG * mp) void sig_handler(int signum) { - ktalk_debug("TQT_SIGNAL received : %d",signum); + ktalk_debug("TQ_SIGNAL received : %d",signum); ForwMachine * fwm = ForwMachine::getForwMachine(); fwm->processDelete(); } diff --git a/lanbrowsing/kcmlisa/kcmlisa.cpp b/lanbrowsing/kcmlisa/kcmlisa.cpp index ee1bf4c7..f449bf48 100644 --- a/lanbrowsing/kcmlisa/kcmlisa.cpp +++ b/lanbrowsing/kcmlisa/kcmlisa.cpp @@ -117,7 +117,7 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) m_advancedSettingsButton=new TQPushButton(i18n("Ad&vanced Settings..."),hbox); m_lisaAdvancedDlg=new KDialogBase(0,0,true,i18n("Advanced Settings for LISa"),KDialogBase::Close, KDialogBase::Close); - connect(m_advancedSettingsButton,TQT_SIGNAL(clicked()),m_lisaAdvancedDlg,TQT_SLOT(show())); + connect(m_advancedSettingsButton,TQ_SIGNAL(clicked()),m_lisaAdvancedDlg,TQ_SLOT(show())); TQVBox *vbox=m_lisaAdvancedDlg->makeVBoxMainWidget(); @@ -159,29 +159,29 @@ LisaSettings::LisaSettings(const TQString& config, TQWidget *parent) dummy=new TQWidget(advGrid); dummy->setMinimumHeight(10); - connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); - connect(m_sendPings,TQT_SIGNAL(toggled(bool)),m_pingAddresses,TQT_SLOT(setEnabled(bool))); - - connect(m_pingAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); - connect(m_allowedAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); - connect(m_broadcastNetwork,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); - - connect(m_pingAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); - connect(m_allowedAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); - connect(m_broadcastNetwork,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); - - connect(m_sendPings,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_firstWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_secondWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_maxPingsAtOnce,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_secondScan,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_deliverUnnamedHosts,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_updatePeriod,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_pingNames,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_useNmblookup,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_autoSetup,TQT_SIGNAL(clicked()),this,TQT_SLOT(autoSetup())); - connect(m_suggestSettings,TQT_SIGNAL(clicked()),this,TQT_SLOT(suggestSettings())); - connect(this, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged())); + connect(m_secondScan,TQ_SIGNAL(toggled(bool)),m_secondWait,TQ_SLOT(setEnabled(bool))); + connect(m_sendPings,TQ_SIGNAL(toggled(bool)),m_pingAddresses,TQ_SLOT(setEnabled(bool))); + + connect(m_pingAddresses,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SIGNAL(changed())); + connect(m_allowedAddresses,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SIGNAL(changed())); + connect(m_broadcastNetwork,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SIGNAL(changed())); + + connect(m_pingAddresses,TQ_SIGNAL(returnPressed()),this,TQ_SIGNAL(changed())); + connect(m_allowedAddresses,TQ_SIGNAL(returnPressed()),this,TQ_SIGNAL(changed())); + connect(m_broadcastNetwork,TQ_SIGNAL(returnPressed()),this,TQ_SIGNAL(changed())); + + connect(m_sendPings,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_firstWait,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_secondWait,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_maxPingsAtOnce,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_secondScan,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_deliverUnnamedHosts,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_updatePeriod,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_pingNames,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_useNmblookup,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_autoSetup,TQ_SIGNAL(clicked()),this,TQ_SLOT(autoSetup())); + connect(m_suggestSettings,TQ_SIGNAL(clicked()),this,TQ_SLOT(suggestSettings())); + connect(this, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged())); } void LisaSettings::load() @@ -290,7 +290,7 @@ void LisaSettings::save() tmp.close(); TQString suCommand=TQString("cp '%1' '%2'; chmod 644 '%3'; rm -f '%4'").arg(m_tmpFilename).arg(m_configFilename).arg(m_configFilename).arg(m_tmpFilename); TDEProcess *proc = new TDEProcess(); - connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(saveDone(TDEProcess *))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(saveDone(TDEProcess *))); *proc<<"tdesu"<<"-c"<<suCommand; TDEApplication::setOverrideCursor(TQt::waitCursor); setEnabled(false); diff --git a/lanbrowsing/kcmlisa/kcmreslisa.cpp b/lanbrowsing/kcmlisa/kcmreslisa.cpp index a08a1336..2a0ac748 100644 --- a/lanbrowsing/kcmlisa/kcmreslisa.cpp +++ b/lanbrowsing/kcmlisa/kcmreslisa.cpp @@ -85,7 +85,7 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) m_reslisaAdvancedDlg=new KDialogBase(0,0,true,i18n("Advanced Settings for ResLISa"),KDialogBase::Close, KDialogBase::Close); - connect(m_advancedSettingsButton,TQT_SIGNAL(clicked()),m_reslisaAdvancedDlg,TQT_SLOT(show())); + connect(m_advancedSettingsButton,TQ_SIGNAL(clicked()),m_reslisaAdvancedDlg,TQ_SLOT(show())); TQVBox *vbox=m_reslisaAdvancedDlg->makeVBoxMainWidget(); @@ -121,22 +121,22 @@ ResLisaSettings::ResLisaSettings(const TQString& config, TQWidget *parent) TQWidget *dummy=new TQWidget(advGrid); dummy->setMinimumHeight(10); - connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); + connect(m_secondScan,TQ_SIGNAL(toggled(bool)),m_secondWait,TQ_SLOT(setEnabled(bool))); - connect(m_allowedAddresses,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); + connect(m_allowedAddresses,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SIGNAL(changed())); - connect(m_allowedAddresses,TQT_SIGNAL(returnPressed()),this,TQT_SIGNAL(changed())); + connect(m_allowedAddresses,TQ_SIGNAL(returnPressed()),this,TQ_SIGNAL(changed())); - connect(m_firstWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_secondWait,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_maxPingsAtOnce,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_secondScan,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_deliverUnnamedHosts,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_updatePeriod,TQT_SIGNAL(valueChanged(int)),this,TQT_SIGNAL(changed())); - connect(m_pingNames,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_useNmblookup,TQT_SIGNAL(toggled(bool)),this,TQT_SIGNAL(changed())); - connect(m_suggestSettings,TQT_SIGNAL(clicked()),this,TQT_SLOT(suggestSettings())); - connect(m_rlanSidebar,TQT_SIGNAL(clicked()),this,TQT_SIGNAL(changed())); + connect(m_firstWait,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_secondWait,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_maxPingsAtOnce,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_secondScan,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_deliverUnnamedHosts,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_updatePeriod,TQ_SIGNAL(valueChanged(int)),this,TQ_SIGNAL(changed())); + connect(m_pingNames,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_useNmblookup,TQ_SIGNAL(toggled(bool)),this,TQ_SIGNAL(changed())); + connect(m_suggestSettings,TQ_SIGNAL(clicked()),this,TQ_SLOT(suggestSettings())); + connect(m_rlanSidebar,TQ_SIGNAL(clicked()),this,TQ_SIGNAL(changed())); load(); } diff --git a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp index 850e5238..37b56c51 100644 --- a/lanbrowsing/kcmlisa/kcmtdeiolan.cpp +++ b/lanbrowsing/kcmlisa/kcmtdeiolan.cpp @@ -61,13 +61,13 @@ IOSlaveSettings::IOSlaveSettings(const TQString& config, TQWidget *parent) layout->setStretchFactor(hbox,0); layout->setStretchFactor(w,1); - connect(m_ftpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_httpSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_nfsSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_smbSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_fishSettings,TQT_SIGNAL(changed()),this,TQT_SIGNAL(changed())); - connect(m_shortHostnames,TQT_SIGNAL(clicked()),this,TQT_SIGNAL(changed())); - connect(m_defaultLisaHostLe, TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SIGNAL(changed())); + connect(m_ftpSettings,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_httpSettings,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_nfsSettings,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_smbSettings,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_fishSettings,TQ_SIGNAL(changed()),this,TQ_SIGNAL(changed())); + connect(m_shortHostnames,TQ_SIGNAL(clicked()),this,TQ_SIGNAL(changed())); + connect(m_defaultLisaHostLe, TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SIGNAL(changed())); } void IOSlaveSettings::load() diff --git a/lanbrowsing/kcmlisa/portsettingsbar.cpp b/lanbrowsing/kcmlisa/portsettingsbar.cpp index 2833a443..213dcdf6 100644 --- a/lanbrowsing/kcmlisa/portsettingsbar.cpp +++ b/lanbrowsing/kcmlisa/portsettingsbar.cpp @@ -34,7 +34,7 @@ PortSettingsBar::PortSettingsBar(const TQString& title, TQWidget *parent) m_box->insertItem(i18n("Always")); m_box->insertItem(i18n("Never")); - connect(m_box,TQT_SIGNAL(activated(int)),this,TQT_SIGNAL(changed())); + connect(m_box,TQ_SIGNAL(activated(int)),this,TQ_SIGNAL(changed())); } int PortSettingsBar::selected() const diff --git a/lanbrowsing/kcmlisa/setupwizard.cpp b/lanbrowsing/kcmlisa/setupwizard.cpp index 820f09da..5d8c1ec0 100644 --- a/lanbrowsing/kcmlisa/setupwizard.cpp +++ b/lanbrowsing/kcmlisa/setupwizard.cpp @@ -170,7 +170,7 @@ void SetupWizard::setupNoNicPage() m_noNicPage->setMargin(KDialog::marginHint()); m_noNicPage->setSpacing(KDialog::spacingHint()); m_manualAddress=new KRestrictedLine(m_noNicPage,"0123456789./"); - connect(m_manualAddress,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(checkIPAddress(const TQString&))); + connect(m_manualAddress,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(checkIPAddress(const TQString&))); TQWidget *dummy=new TQWidget(m_noNicPage); m_noNicPage->setStretchFactor(dummy,10); @@ -340,7 +340,7 @@ void SetupWizard::setupAdvancedSettingsPage() info=new TQLabel(i18n("<b>If unsure, keep it as is.</b>"), m_advancedPage); info->setAlignment(AlignRight|AlignVCenter); - connect(m_secondScan,TQT_SIGNAL(toggled(bool)),m_secondWait,TQT_SLOT(setEnabled(bool))); + connect(m_secondScan,TQ_SIGNAL(toggled(bool)),m_secondWait,TQ_SLOT(setEnabled(bool))); setHelpEnabled( m_advancedPage, false ); } diff --git a/librss/image.cpp b/librss/image.cpp index d37ebdda..f9a6f9b3 100644 --- a/librss/image.cpp +++ b/librss/image.cpp @@ -111,9 +111,9 @@ void Image::getPixmap() d->pixmapBuffer->open(IO_WriteOnly); TDEIO::Job *job = TDEIO::get(d->url, false, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *))); } void Image::slotData(TDEIO::Job *, const TQByteArray &data) diff --git a/librss/loader.cpp b/librss/loader.cpp index 51e993ce..442be08f 100644 --- a/librss/loader.cpp +++ b/librss/loader.cpp @@ -65,11 +65,11 @@ void FileRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); TDEIO::Job *job = TDEIO::get(url, false, false); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), - TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)), + TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &))); } int FileRetriever::errorCode() const @@ -138,10 +138,10 @@ void OutputRetriever::retrieveData(const KURL &url) d->buffer->open(IO_WriteOnly); d->process = new KShellProcess(); - connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)), - TQT_SLOT(slotExited(TDEProcess *))); - connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - TQT_SLOT(slotOutput(TDEProcess *, char *, int))); + connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)), + TQ_SLOT(slotExited(TDEProcess *))); + connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + TQ_SLOT(slotOutput(TDEProcess *, char *, int))); *d->process << url.path(); d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout); } @@ -197,7 +197,7 @@ Loader *Loader::create() Loader *Loader::create(TQObject *object, const char *slot) { Loader *loader = create(); - connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), + connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), object, slot); return loader; } @@ -218,8 +218,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever) d->retriever = retriever; - connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)), - this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool))); + connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)), + this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool))); d->retriever->retrieveData(url); } diff --git a/librss/loader.h b/librss/loader.h index 32857de0..09a7886e 100644 --- a/librss/loader.h +++ b/librss/loader.h @@ -197,8 +197,8 @@ namespace RSS * * \code * Loader *loader = Loader::create(); - * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)), - * this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status))); + * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)), + * this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status))); * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever); * \endcode * diff --git a/librss/testlibrss.cpp b/librss/testlibrss.cpp index d68b2768..f84dc03d 100644 --- a/librss/testlibrss.cpp +++ b/librss/testlibrss.cpp @@ -10,8 +10,8 @@ using namespace RSS; void Tester::test() { Loader *loader = Loader::create(); - connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ), - this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); + connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ), + this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) ); loader->loadFrom( "http://sourceforge.net/export/rss2_projnews.php?group_id=29057&rss_fulltext=1", new FileRetriever ); } diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp index a70baa9d..13b62520 100644 --- a/tdednssd/ioslave/dnssd.cpp +++ b/tdednssd/ioslave/dnssd.cpp @@ -294,15 +294,15 @@ void ZeroConfProtocol::listDir(const KURL& url ) if (allDomains=url.host().isEmpty()) browser = new ServiceBrowser(ServiceBrowser::AllServices); else browser = new ServiceBrowser(ServiceBrowser::AllServices,url.host()); - connect(browser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), - this,TQT_SLOT(newType(DNSSD::RemoteService::Ptr))); + connect(browser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), + this,TQ_SLOT(newType(DNSSD::RemoteService::Ptr))); break; case ServiceDir: if (url.host().isEmpty()) browser = new ServiceBrowser(url.path(-1).section("/",1,-1)); else browser = new ServiceBrowser(url.path(-1).section("/",1,-1),url.host()); - connect(browser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), - this,TQT_SLOT(newService(DNSSD::RemoteService::Ptr))); + connect(browser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), + this,TQ_SLOT(newService(DNSSD::RemoteService::Ptr))); break; case Service: resolveAndRedirect(url); @@ -311,7 +311,7 @@ void ZeroConfProtocol::listDir(const KURL& url ) error(ERR_MALFORMED_URL,i18n("invalid URL")); return; } - connect(browser,TQT_SIGNAL(finished()),this,TQT_SLOT(allReported())); + connect(browser,TQ_SIGNAL(finished()),this,TQ_SLOT(allReported())); browser->startBrowse(); kapp->eventLoop()->enterLoop(); } diff --git a/tdednssd/kdedmodule/watcher.cpp b/tdednssd/kdedmodule/watcher.cpp index f6b7a973..4aeb37eb 100644 --- a/tdednssd/kdedmodule/watcher.cpp +++ b/tdednssd/kdedmodule/watcher.cpp @@ -30,11 +30,11 @@ Watcher::Watcher(const TQString& type, const TQString& domain) { if (domain.isEmpty()) browser = new ServiceBrowser(type); else browser = new ServiceBrowser(type,domain); - connect(browser,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), - TQT_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); - connect(browser,TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), - TQT_SLOT(serviceRemoved(DNSSD::RemoteService::Ptr))); - connect(browser,TQT_SIGNAL(finished()),TQT_SLOT(finished())); + connect(browser,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)), + TQ_SLOT(serviceAdded(DNSSD::RemoteService::Ptr))); + connect(browser,TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr)), + TQ_SLOT(serviceRemoved(DNSSD::RemoteService::Ptr))); + connect(browser,TQ_SIGNAL(finished()),TQ_SLOT(finished())); browser->startBrowse(); } diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp index 928c2b6f..db2e3545 100644 --- a/wifi/interface_wireless_wirelessextensions.cpp +++ b/wifi/interface_wireless_wirelessextensions.cpp @@ -539,7 +539,7 @@ TQTable* Interface_wireless_wirelessextensions::get_available_networks () *iwlist << iwlist_bin << interface_name << "scanning"; -// connect ( iwlist, TQT_SIGNAL ( readReady ( KProcIO * ) ), this, TQT_SLOT ( parseScanData ( KProcIO * ) ) ); +// connect ( iwlist, TQ_SIGNAL ( readReady ( KProcIO * ) ), this, TQ_SLOT ( parseScanData ( KProcIO * ) ) ); if ( !iwlist->start ( TDEProcess::Block ) ) KMessageBox::sorry ( 0, i18n ( "Unable to perform the scan. Please make sure the executable \"iwlist\" is in your $PATH." ), diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp index 1b80bb13..24cc90bb 100644 --- a/wifi/kcmwifi/ifconfigpage.cpp +++ b/wifi/kcmwifi/ifconfigpage.cpp @@ -41,37 +41,37 @@ IfConfigPage::IfConfigPage( int configNum, TQWidget *parent, const char *name ) : IfConfigPageBase( parent, name ), m_configNum( configNum ) { - connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); - connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); - connect( le_networkName, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); - connect( cmb_wifiMode, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); - connect( cmb_speed, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); - connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); - connect( url_connectScript, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); - connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); - connect( le_interface, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SIGNAL( changed() ) ); - - connect( pb_setupPower, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupPower() ) ); - connect( pb_setupCrypto, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSetupCrypto() ) ); - - connect( cb_useCrypto, TQT_SIGNAL( toggled( bool ) ), - pb_setupCrypto, TQT_SLOT( setEnabled( bool ) ) ); - connect( cb_pmEnabled, TQT_SIGNAL( toggled( bool ) ), - pb_setupPower, TQT_SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), - lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), - lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); - connect( cb_runScript, TQT_SIGNAL( toggled( bool ) ), - lb_connectScript, TQT_SLOT( setEnabled( bool ) ) ); - connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), - le_interface, TQT_SLOT( setDisabled( bool ) ) ); - - connect( cb_Autodetect, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT ( slotResetInterface( bool ) ) ); + connect( cb_pmEnabled, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) ); + connect( cb_useCrypto, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) ); + connect( le_networkName, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); + connect( cmb_wifiMode, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); + connect( cmb_speed, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); + connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) ); + connect( url_connectScript, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); + connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) ); + connect( le_interface, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SIGNAL( changed() ) ); + + connect( pb_setupPower, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetupPower() ) ); + connect( pb_setupCrypto, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSetupCrypto() ) ); + + connect( cb_useCrypto, TQ_SIGNAL( toggled( bool ) ), + pb_setupCrypto, TQ_SLOT( setEnabled( bool ) ) ); + connect( cb_pmEnabled, TQ_SIGNAL( toggled( bool ) ), + pb_setupPower, TQ_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ), + lb_connectScript, TQ_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ), + lb_connectScript, TQ_SLOT( setEnabled( bool ) ) ); + connect( cb_runScript, TQ_SIGNAL( toggled( bool ) ), + lb_connectScript, TQ_SLOT( setEnabled( bool ) ) ); + connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ), + le_interface, TQ_SLOT( setDisabled( bool ) ) ); + + connect( cb_Autodetect, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT ( slotResetInterface( bool ) ) ); } void IfConfigPage::slotResetInterface( bool checked ) diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp index e35dae27..76393d69 100644 --- a/wifi/kcmwifi/kcmwifi.cpp +++ b/wifi/kcmwifi/kcmwifi.cpp @@ -55,7 +55,7 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); tabs->addTab(ifConfigPage, i18n ("Config &%1").arg( i+1 )); - connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); + connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; } @@ -65,8 +65,8 @@ KCMWifi::KCMWifi(TQWidget * parent, const char *name, const TQStringList &) top->addWidget( m_mainConfig ); top->addStretch(); - connect(m_mainConfig, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); - connect(m_mainConfig, TQT_SIGNAL(activateClicked()), TQT_SLOT(slotActivate())); + connect(m_mainConfig, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) ); + connect(m_mainConfig, TQ_SIGNAL(activateClicked()), TQ_SLOT(slotActivate())); if ( geteuid() != 0 ) { @@ -147,7 +147,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) { IfConfigPage *ifConfigPage = new IfConfigPage( vendorBase + m_activeVendorCount, tabs, "m_configPage" ); tabs->addTab(ifConfigPage, i18n ("Vendor %1").arg( m_activeVendorCount+1 ) ); - connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); + connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) ); m_ifConfigPage[ vendorBase+m_activeVendorCount ] = ifConfigPage; m_mainConfig->registerConfig( vendorBase+m_activeVendorCount ); m_activeVendorCount++; @@ -170,7 +170,7 @@ IfConfigPage* KCMWifi::addConfigTab( int count, bool vendor ) { IfConfigPage *ifConfigPage = new IfConfigPage( i, tabs, "m_configPage" ); tabs->insertTab(ifConfigPage, i18n ("Config &%1").arg( i+1 ), i ); - connect(ifConfigPage, TQT_SIGNAL(changed()), TQT_SLOT( slotChanged() ) ); + connect(ifConfigPage, TQ_SIGNAL(changed()), TQ_SLOT( slotChanged() ) ); m_ifConfigPage[ i ] = ifConfigPage; m_mainConfig->registerConfig( i+1 ); retval = ifConfigPage; diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp index 7ebb401b..f77292a3 100644 --- a/wifi/kcmwifi/mainconfig.cpp +++ b/wifi/kcmwifi/mainconfig.cpp @@ -43,12 +43,12 @@ MainConfig::MainConfig( TQWidget *parent, const char *name ) } - connect( cb_usePreset, TQT_SIGNAL( toggled( bool ) ), TQT_SIGNAL( changed() ) ); - connect( cmb_presetConfig, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) ); - connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SIGNAL( changed() ) ); + connect( cb_usePreset, TQ_SIGNAL( toggled( bool ) ), TQ_SIGNAL( changed() ) ); + connect( cmb_presetConfig, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) ); + connect( sb_numConfigs, TQ_SIGNAL( valueChanged( int ) ), TQ_SIGNAL( changed() ) ); - connect( pb_activate, TQT_SIGNAL( clicked() ), TQT_SIGNAL( activateClicked() ) ); - connect( sb_numConfigs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotChangeNumConfigs( int ) ) ); + connect( pb_activate, TQ_SIGNAL( clicked() ), TQ_SIGNAL( activateClicked() ) ); + connect( sb_numConfigs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotChangeNumConfigs( int ) ) ); } diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp index 6dccea02..33fa1c88 100644 --- a/wifi/kcmwifi/wificonfig.cpp +++ b/wifi/kcmwifi/wificonfig.cpp @@ -268,8 +268,8 @@ TQString WifiConfig::autoDetectInterface() KProcIO test; test << "iwconfig"; test << *it; - connect( &test, TQT_SIGNAL( readReady( KProcIO * ) ), - this, TQT_SLOT( slotTestInterface( KProcIO * ) ) ); + connect( &test, TQ_SIGNAL( readReady( KProcIO * ) ), + this, TQ_SLOT( slotTestInterface( KProcIO * ) ) ); test.start ( TDEProcess::Block ); } } diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp index 8a7a4d0d..830b2738 100644 --- a/wifi/kwifimanager.cpp +++ b/wifi/kwifimanager.cpp @@ -103,13 +103,13 @@ DCOPObject("dcop_interface"), TDEMainWindow (0, name), device(0), m_shuttingDown #endif counter = new TQTimer (this); - connect (counter, TQT_SIGNAL (timeout ()), device, TQT_SLOT (poll_device_info())); + connect (counter, TQ_SIGNAL (timeout ()), device, TQ_SLOT (poll_device_info())); counter->start (1000); tricorder_trigger = new TQTimer (); - connect (tricorder_trigger, TQT_SIGNAL (timeout ()), this, - TQT_SLOT (tricorder_beep ())); - connect (trayicon, TQT_SIGNAL (quitSelected ()), this, TQT_SLOT (slotFileQuit ())); + connect (tricorder_trigger, TQ_SIGNAL (timeout ()), this, + TQ_SLOT (tricorder_beep ())); + connect (trayicon, TQ_SIGNAL (quitSelected ()), this, TQ_SLOT (slotFileQuit ())); slotToggleTric(); //set to value saved by TDEConfig setAutoSaveSettings(); @@ -305,43 +305,43 @@ KWiFiManagerApp::initActions () if (config->hasGroup("General")) config->setGroup("General"); fileDisableRadio = new TDEToggleAction (i18n ("&Disable Radio"), 0, this, - TQT_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio"); + TQ_SLOT (slotDisableRadio ()), actionCollection (), "disable_radio"); fileDisableRadio->setChecked( false ); settingsUseAlternateCalc = new TDEToggleAction (i18n ("&Use Alternate Strength Calculation"), 0, this, - TQT_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation"); + TQ_SLOT (slotToggleStrengthCalc ()), actionCollection (), "use_alt_calculation"); settingsUseAlternateCalc->setChecked( config->readBoolEntry("useAlternateStrengthCalculation") ); slotToggleStrengthCalc(); //set to value saved by TDEConfig settingsShowStatsNoise = new TDEToggleAction (i18n ("Show &Noise Graph in Statistics Window"), 0, this, - TQT_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise"); + TQ_SLOT (slotShowStatsNoise ()), actionCollection (), "show_stats_noise"); settingsShowStatsNoise->setChecked( config->readBoolEntry("showStatsNoise") ); slotShowStatsNoise(); //set to value saved by TDEConfig settingsShowStrengthNumber = new TDEToggleAction (i18n ("&Show Strength Number in System Tray"), 0, this, - TQT_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray"); + TQ_SLOT (slotToggleShowStrengthNumber ()), actionCollection (), "show_strength_number_in_tray"); settingsShowStrengthNumber->setChecked( config->readBoolEntry("showStrengthNumberInTray") ); slotToggleShowStrengthNumber (); //set to value saved by TDEConfig - KStdAction::quit (this, TQT_SLOT (slotFileQuit ()), actionCollection ()); + KStdAction::quit (this, TQ_SLOT (slotFileQuit ()), actionCollection ()); new TDEAction (i18n ("Configuration &Editor..."), 0, this, - TQT_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor"); + TQ_SLOT (slotStartConfigEditor ()), actionCollection (), "configuration_editor"); new TDEAction (i18n ("Connection &Statistics"), 0, this, - TQT_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics"); + TQ_SLOT (slotStartStatViewer ()), actionCollection (), "connection_statistics"); settingsAcousticScanning = new TDEToggleAction (i18n ("&Acoustic Scanning"), 0, this, - TQT_SLOT (slotToggleTric ()), + TQ_SLOT (slotToggleTric ()), actionCollection (), "acoustic_scanning"); settingsAcousticScanning->setChecked( config->readBoolEntry("acousticScanning") ); #ifdef WITHOUT_ARTS settingsAcousticScanning->setEnabled( false); #endif settingsStayInSystrayOnClose = new TDEToggleAction (i18n ("Stay in System &Tray on Close"), 0, this, - TQT_SLOT (slotToggleStayInSystray()), + TQ_SLOT (slotToggleStayInSystray()), actionCollection (), "stay_in_systray_on_close"); settingsStayInSystrayOnClose->setChecked( config->readBoolEntry("stayInSystrayOnClose") ); createGUI(); @@ -383,20 +383,20 @@ KWiFiManagerApp::initView () zentrallayout->addMultiCellWidget (status, 1, 2, 1, 1); zentrallayout->addWidget (scan, 2, 0); zentrallayout->addMultiCellWidget (location, 3, 3, 0, 1, TQt::AlignLeft); - connect (device, TQT_SIGNAL (interfaceChanged ()), this, TQT_SLOT (slotChangeWindowCaption ())); - connect (device, TQT_SIGNAL (strengthChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (strengthChanged ()), strength, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), status, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (speedChanged ()), speedmeter, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (modeChanged ()), pictogram, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (essidChanged (TQString)), this, TQT_SLOT (slotLogESSID (TQString))); - connect (device, TQT_SIGNAL (essidChanged (TQString)), location, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (statusChanged ()), location, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotTXPowerChanged ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), this, TQT_SLOT (slotChangeTrayIcon ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), pictogram, TQT_SLOT (repaint ())); - connect (device, TQT_SIGNAL (txPowerChanged ()), strength, TQT_SLOT (repaint ())); - connect (scan, TQT_SIGNAL (clicked()), this, TQT_SLOT (slotNetworkScan())); + connect (device, TQ_SIGNAL (interfaceChanged ()), this, TQ_SLOT (slotChangeWindowCaption ())); + connect (device, TQ_SIGNAL (strengthChanged ()), this, TQ_SLOT (slotChangeTrayIcon ())); + connect (device, TQ_SIGNAL (strengthChanged ()), strength, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (statusChanged ()), status, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (speedChanged ()), speedmeter, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (modeChanged ()), pictogram, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (essidChanged (TQString)), this, TQ_SLOT (slotLogESSID (TQString))); + connect (device, TQ_SIGNAL (essidChanged (TQString)), location, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (statusChanged ()), location, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (txPowerChanged ()), this, TQ_SLOT (slotTXPowerChanged ())); + connect (device, TQ_SIGNAL (txPowerChanged ()), this, TQ_SLOT (slotChangeTrayIcon ())); + connect (device, TQ_SIGNAL (txPowerChanged ()), pictogram, TQ_SLOT (repaint ())); + connect (device, TQ_SIGNAL (txPowerChanged ()), strength, TQ_SLOT (repaint ())); + connect (scan, TQ_SIGNAL (clicked()), this, TQ_SLOT (slotNetworkScan())); } void @@ -427,7 +427,7 @@ KWiFiManagerApp::slotStartStatViewer () delete statistik; statistik = new Statistics (device, showStatsNoise); statistik->setFixedSize (590, 300); - connect(device,TQT_SIGNAL(statsUpdated()),statistik,TQT_SLOT(repaint())); + connect(device,TQ_SIGNAL(statsUpdated()),statistik,TQ_SLOT(repaint())); statistik->show (); } @@ -460,7 +460,7 @@ KWiFiManagerApp::slotDisableRadio () //*disablePower << "tdesu" << "iwconfig" << "eth1" << "txpower" << onOrOff; *disablePower << "tdesu" << "iwconfig" << interface << "txpower" << onOrOff; - connect( disablePower, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotDisablePowerProcessExited()) ); + connect( disablePower, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotDisablePowerProcessExited()) ); disablePower->start(TDEProcess::NotifyOnExit); } diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp index ada6cabb..182a3ca6 100644 --- a/wifi/kwireless/kwirelesswidget.cpp +++ b/wifi/kwireless/kwirelesswidget.cpp @@ -150,7 +150,7 @@ KWireLessWidget::KWireLessWidget(TQWidget *parent, const char* name) { // this way, only the poll() method of the first instance will // ever be called (intended behaviour): timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(poll())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(poll())); // single shot, will be restartet at the end of poll () timer->start(100, true); } @@ -186,8 +186,8 @@ void KWireLessWidget::mousePressEvent(TQMouseEvent *e) if( e->button() == TQt::LeftButton) { PropertiesDialog dialog(this); - connect(this, TQT_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)), - &dialog, TQT_SLOT(update(TQPtrList<DeviceInfo> *))); + connect(this, TQ_SIGNAL(updateDeviceInfo(TQPtrList<DeviceInfo> *)), + &dialog, TQ_SLOT(update(TQPtrList<DeviceInfo> *))); dialog.exec(); } } diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp index fb32d938..afbd8115 100644 --- a/wifi/kwireless/propertytable.cpp +++ b/wifi/kwireless/propertytable.cpp @@ -43,10 +43,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, const char *name) table->table->setReadOnly(true); adjustSize(); timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timer->start(3000, false); - connect(table->cbDeviceSelector, TQT_SIGNAL(activated(int)), - TQT_SLOT(selected(int))); + connect(table->cbDeviceSelector, TQ_SIGNAL(activated(int)), + TQ_SLOT(selected(int))); } void PropertiesDialog::update(TQPtrList<DeviceInfo> *_info) diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp index 08fb28b8..7503aa28 100644 --- a/wifi/networkscanning.cpp +++ b/wifi/networkscanning.cpp @@ -53,7 +53,7 @@ NetworkScanning::networkScan () } networks->setSelectionMode(TQTable::SingleRow); - connect(networks,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkWEP())); + connect(networks,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(checkWEP())); this->setCaption( i18n( "Scan Results" ) ); @@ -66,10 +66,10 @@ NetworkScanning::networkScan () networks->setLeftMargin( 0 ); networks->verticalHeader()->hide(); - connect ( close, TQT_SIGNAL( clicked() ), this, TQT_SLOT( hide() ) ); - connect ( switchNet, TQT_SIGNAL( clicked() ), this, TQT_SLOT( switchToNetwork() ) ); - connect ( networks, TQT_SIGNAL( currentChanged(int,int)), this, TQT_SLOT( checkSettings(int,int))); - connect ( networks, TQT_SIGNAL( valueChanged(int,int)), this, TQT_SLOT( checkSettings(int,int))); + connect ( close, TQ_SIGNAL( clicked() ), this, TQ_SLOT( hide() ) ); + connect ( switchNet, TQ_SIGNAL( clicked() ), this, TQ_SLOT( switchToNetwork() ) ); + connect ( networks, TQ_SIGNAL( currentChanged(int,int)), this, TQ_SLOT( checkSettings(int,int))); + connect ( networks, TQ_SIGNAL( valueChanged(int,int)), this, TQ_SLOT( checkSettings(int,int))); networkSelectionLayout->addMultiCellWidget( networks, 0, 0, 0, 2 ); networkSelectionLayout->addWidget( switchNet, 1, 0 ); |