diff options
Diffstat (limited to 'knode')
70 files changed, 816 insertions, 775 deletions
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 1b5b3b9a3..faf4b4e8b 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -98,20 +98,20 @@ ArticleWidget::ArticleWidget( TQWidget *parent, TQHBoxLayout *box = new TQHBoxLayout( this ); mViewer = new TDEHTMLPart( this, "mViewer" ); box->addWidget( mViewer->widget() ); - mViewer->widget()->setFocusPolicy( TQ_WheelFocus ); + mViewer->widget()->setFocusPolicy( TQWidget::WheelFocus ); mViewer->setPluginsEnabled( false ); mViewer->setJScriptEnabled( false ); mViewer->setJavaEnabled( false ); mViewer->setMetaRefreshEnabled( false ); mViewer->setOnlyLocalReferences( true ); - mViewer->view()->setFocusPolicy( TQ_WheelFocus ); - connect( mViewer->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), - TQT_SLOT(slotURLClicked(const KURL&)) ); - connect( mViewer, TQT_SIGNAL(popupMenu(const TQString&, const TQPoint&)), - TQT_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); + mViewer->view()->setFocusPolicy( TQWidget::WheelFocus ); + connect( mViewer->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL&, const KParts::URLArgs&)), + TQ_SLOT(slotURLClicked(const KURL&)) ); + connect( mViewer, TQ_SIGNAL(popupMenu(const TQString&, const TQPoint&)), + TQ_SLOT(slotURLPopup(const TQString&, const TQPoint&)) ); mTimer = new TQTimer( this ); - connect( mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()) ); + connect( mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()) ); initActions(); readConfig(); @@ -134,58 +134,58 @@ ArticleWidget::~ArticleWidget() void ArticleWidget::initActions() { - mSaveAction = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT(slotSave()), mActionCollection ); + mSaveAction = KStdAction::save( this, TQ_SLOT(slotSave()), mActionCollection ); mSaveAction->setText( KStdGuiItem::saveAs().text() ); - mPrintAction = KStdAction::print( TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), mActionCollection ); - mCopySelectionAction = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT(slotCopySelection()), mActionCollection ); - mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection ); - mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); + mPrintAction = KStdAction::print( this, TQ_SLOT(slotPrint()), mActionCollection ); + mCopySelectionAction = KStdAction::copy( this, TQ_SLOT(slotCopySelection()), mActionCollection ); + mSelectAllAction = KStdAction::selectAll( this, TQ_SLOT(slotSelectAll()), mActionCollection ); + mFindAction = KStdAction::find( this, TQ_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); - mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), - TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , this, + TQ_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", - Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); + Key_R, this, TQ_SLOT(slotReply()), mActionCollection, "article_postReply" ); mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail-reply-sender", - Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); + Key_A, this, TQ_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail-forward", - Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); + Key_F, this, TQ_SLOT(slotForward()), mActionCollection, "article_forward" ); mCancelAction = new TDEAction( i18n("article","&Cancel Article"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); + 0, this, TQ_SLOT(slotCancel()), mActionCollection, "article_cancel" ); mSupersedeAction = new TDEAction(i18n("S&upersede Article"), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); + 0, this, TQ_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), - Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); + Key_X ,this, TQ_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), - Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); - mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); + Key_Y, this, TQ_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); + mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , this, + TQ_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); mRot13Toggle->setChecked( false ); TDERadioAction *ra; mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); - ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + ra = new TDERadioAction( i18n("&Fancy Headers"), 0, this, TQ_SLOT(slotFancyHeaders()), mActionCollection, "view_headers_fancy" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + ra = new TDERadioAction( i18n("&Standard Headers"), 0, this, TQ_SLOT(slotStandardHeaders()), mActionCollection, "view_headers_standard" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + ra = new TDERadioAction( i18n("&All Headers"), 0, this, TQ_SLOT(slotAllHeaders()), mActionCollection, "view_headers_all" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); - ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), + ra = new TDERadioAction( i18n("&As Icon"), 0, this, TQ_SLOT(slotIconAttachments()), mActionCollection, "view_attachments_icon" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + ra = new TDERadioAction( i18n("&Inline"), 0, this, TQ_SLOT(slotInlineAttachments()), mActionCollection, "view_attachments_inline" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + ra = new TDERadioAction( i18n("&Hide"), 0, this, TQ_SLOT(slotHideAttachments()), mActionCollection, "view_attachments_hide" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); @@ -196,23 +196,23 @@ void ArticleWidget::initActions() cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); - connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); - mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), - TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); + connect( mCharsetSelect, TQ_SIGNAL(activated(const TQString&)),TQ_SLOT(slotSetCharset(const TQString&)) ); + mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, this, + TQ_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); - new TDEAction( i18n("&Open URL"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), + new TDEAction( i18n("&Open URL"), "document-open", 0, this, TQ_SLOT(slotOpenURL()), mActionCollection, "open_url" ); - new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), + new TDEAction( i18n("&Copy Link Address"), "edit-copy", 0, this, TQ_SLOT( slotCopyURL()), mActionCollection, "copy_url" ); - new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, this, TQ_SLOT(slotAddBookmark()), mActionCollection, "add_bookmark" ); - new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), + new TDEAction( i18n("&Add to Address Book"), 0, this, TQ_SLOT(slotAddToAddressBook()), mActionCollection, "add_addr_book" ); - new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), + new TDEAction( i18n("&Open in Address Book"), 0, this, TQ_SLOT(slotOpenInAddressBook()), mActionCollection, "openin_addr_book" ); - new TDEAction( i18n("&Open Attachment"), "document-open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), + new TDEAction( i18n("&Open Attachment"), "document-open", 0, this, TQ_SLOT(slotOpenAttachment()), mActionCollection, "open_attachment" ); - new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), + new TDEAction( i18n("&Save Attachment As..."), "document-save-as", 0, this, TQ_SLOT(slotSaveAttachment()), mActionCollection, "save_attachment" ); } @@ -1472,7 +1472,7 @@ void ArticleWidget::focusOutEvent( TQFocusEvent *e ) bool ArticleWidget::eventFilter( TQObject *o, TQEvent *e ) { - if ( e->type() == TQEvent::KeyPress && (TQT_TQKEYEVENT(e)->key() == Key_Tab) ) { + if ( e->type() == TQEvent::KeyPress && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab) ) { emit focusChangeRequest( this ); if ( !hasFocus() ) // focusChangeRequest was successful return true; diff --git a/knode/articlewidget.h b/knode/articlewidget.h index cc1cac20b..8a00e33fe 100644 --- a/knode/articlewidget.h +++ b/knode/articlewidget.h @@ -52,7 +52,7 @@ class CSSHelper; */ class ArticleWidget : public TQWidget, public KNJobConsumer { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 06210b2a5..cae8da28b 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -65,9 +65,9 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : setColumnAlignment( mPaintInfo.scoreCol, TQt::AlignRight ); // due to our own column text squeezing we need to repaint on column resizing - disconnect( header(), TQT_SIGNAL(sizeChange(int, int, int)) ); - connect( header(), TQT_SIGNAL(sizeChange(int, int, int)), - TQT_SLOT(slotSizeChanged(int, int, int)) ); + disconnect( header(), TQ_SIGNAL(sizeChange(int, int, int)) ); + connect( header(), TQ_SIGNAL(sizeChange(int, int, int)), + TQ_SLOT(slotSizeChanged(int, int, int)) ); // column selection RMB menu mPopup = new TDEPopupMenu( this ); @@ -76,11 +76,11 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE ); mPopup->insertItem( i18n("Score"), KPaintInfo::COL_SCORE ); - connect( mPopup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(toggleColumn(int)) ); + connect( mPopup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(toggleColumn(int)) ); // connect to the article manager - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowGroup()), TQT_SLOT(prepareForGroup()) ); - connect( knGlobals.articleManager(), TQT_SIGNAL(aboutToShowFolder()), TQT_SLOT(prepareForFolder()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowGroup()), TQ_SLOT(prepareForGroup()) ); + connect( knGlobals.articleManager(), TQ_SIGNAL(aboutToShowFolder()), TQ_SLOT(prepareForFolder()) ); new KNHeaderViewToolTip( this ); @@ -188,7 +188,7 @@ void KNHeaderView::ensureItemVisibleWithMargin( const TQListViewItem *i ) { ensureVisible( contentsX(), y + h/2, 0, h/2 ); mDelayedCenter = y + h/2; - TQTimer::singleShot( 300, this, TQT_SLOT(slotCenterDelayed()) ); + TQTimer::singleShot( 300, this, TQ_SLOT(slotCenterDelayed()) ); } else { ensureVisible( contentsX(), y + h/2, 0, h/2 ); } @@ -540,7 +540,7 @@ void KNHeaderView::slotSizeChanged( int section, int, int newSize ) bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) { + if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) { emit(focusChangeRequest(this)); if (!hasFocus()) // focusChangeRequest was successful return true; @@ -548,10 +548,10 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) // right click on header if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && - o->isA(TQHEADER_OBJECT_NAME_STRING) ) + static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton && + o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() ); return true; } @@ -576,7 +576,7 @@ void KNHeaderView::focusOutEvent(TQFocusEvent *e) void KNHeaderView::resetCurrentTime() { mDateFormatter.reset(); - TQTimer::singleShot( 1000, this, TQT_SLOT(resetCurrentTime()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(resetCurrentTime()) ); } diff --git a/knode/headerview.h b/knode/headerview.h index 1b74d3639..3da99acbd 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -26,7 +26,7 @@ class KNHdrViewItem; class KNHeaderView : public TDEListView { - Q_OBJECT + TQ_OBJECT friend class KNHdrViewItem; diff --git a/knode/knaccountmanager.cpp b/knode/knaccountmanager.cpp index 77b97288e..45c219365 100644 --- a/knode/knaccountmanager.cpp +++ b/knode/knaccountmanager.cpp @@ -228,7 +228,7 @@ void KNAccountManager::loadPasswordsAsync() else mWallet = Wallet::openWallet( Wallet::NetworkWallet(), 0, Wallet::Asynchronous ); if ( mWallet ) { - connect( mWallet, TQT_SIGNAL(walletOpened(bool)), TQT_SLOT(slotWalletOpened(bool)) ); + connect( mWallet, TQ_SIGNAL(walletOpened(bool)), TQ_SLOT(slotWalletOpened(bool)) ); mAsyncOpening = true; } else { diff --git a/knode/knaccountmanager.h b/knode/knaccountmanager.h index 56e994c6b..8a8b5f61b 100644 --- a/knode/knaccountmanager.h +++ b/knode/knaccountmanager.h @@ -29,7 +29,7 @@ class KNServerInfo; class KNAccountManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knapplication.h b/knode/knapplication.h index 4536c1197..c65c010da 100644 --- a/knode/knapplication.h +++ b/knode/knapplication.h @@ -21,7 +21,7 @@ class KNApplication : public KUniqueApplication { - Q_OBJECT + TQ_OBJECT public: KNApplication(): KUniqueApplication() { }; diff --git a/knode/knarticlefactory.cpp b/knode/knarticlefactory.cpp index 78d391495..c01e58f8e 100644 --- a/knode/knarticlefactory.cpp +++ b/knode/knarticlefactory.cpp @@ -65,7 +65,7 @@ void KNArticleFactory::createPosting(KNNntpAccount *a) KNComposer *c = new KNComposer( art, TQString(), sig, TQString(), true ); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -94,7 +94,7 @@ void KNArticleFactory::createPosting(KNGroup *g) KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -264,7 +264,7 @@ void KNArticleFactory::createReply(KNRemoteArticle *a, TQString selectedText, bo //open composer KNComposer *c=new KNComposer(art, quoted, sig, notRewraped, true, authorDislikesMailCopies, authorWantsMailCopies); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -349,7 +349,7 @@ void KNArticleFactory::createForward(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, fwd, sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -500,7 +500,7 @@ void KNArticleFactory::createSupersede(KNArticle *a) //open composer KNComposer *c=new KNComposer(art, text, sig); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -525,7 +525,7 @@ void KNArticleFactory::createMail(KMime::Headers::AddressField *address) //open composer KNComposer *c=new KNComposer(art, TQString(), sig, TQString(), true); mCompList.append( c ); - connect(c, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(c, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); c->show(); } @@ -604,7 +604,7 @@ void KNArticleFactory::edit(KNLocalArticle *a) .arg(id->getSigGeneratorStdErr())); mCompList.append( com ); - connect(com, TQT_SIGNAL(composerDone(KNComposer*)), this, TQT_SLOT(slotComposerDone(KNComposer*))); + connect(com, TQ_SIGNAL(composerDone(KNComposer*)), this, TQ_SLOT(slotComposerDone(KNComposer*))); com->show(); } @@ -990,7 +990,7 @@ void KNArticleFactory::showSendErrorDialog() { if(!s_endErrDlg) { s_endErrDlg=new KNSendErrorDialog(); - connect(s_endErrDlg, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(slotSendErrorDialogDone())); + connect(s_endErrDlg, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(slotSendErrorDialogDone())); } s_endErrDlg->show(); } @@ -1075,7 +1075,7 @@ KNSendErrorDialog::KNSendErrorDialog() j_obs=new KNDialogListBox(true, page); e_rror=new TQLabel(TQString(), page); - connect(j_obs, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHighlighted(int))); + connect(j_obs, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotHighlighted(int))); KNHelper::restoreWindowSize("sendDlg", this, TQSize(320,250)); } diff --git a/knode/knarticlefactory.h b/knode/knarticlefactory.h index 1e13ddc14..c01ac3daf 100644 --- a/knode/knarticlefactory.h +++ b/knode/knarticlefactory.h @@ -38,7 +38,7 @@ namespace KNConfig { class KNArticleFactory : public TQObject , public KNJobConsumer { - Q_OBJECT + TQ_OBJECT public: @@ -96,7 +96,7 @@ class KNArticleFactory : public TQObject , public KNJobConsumer { class KNSendErrorDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knarticlemanager.cpp b/knode/knarticlemanager.cpp index 86c58cc61..332690c2e 100644 --- a/knode/knarticlemanager.cpp +++ b/knode/knarticlemanager.cpp @@ -53,8 +53,8 @@ KNArticleManager::KNArticleManager() : TQObject(0,0) s_earchDlg=0; d_isableExpander=false; - connect(f_ilterMgr, TQT_SIGNAL(filterChanged(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(f_ilterMgr, TQ_SIGNAL(filterChanged(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); } @@ -390,10 +390,10 @@ void KNArticleManager::search() KWin::activateWindow(s_earchDlg->winId()); } else { s_earchDlg=new KNSearchDialog(KNSearchDialog::STgroupSearch, 0); - connect(s_earchDlg, TQT_SIGNAL(doSearch(KNArticleFilter*)), this, - TQT_SLOT(slotFilterChanged(KNArticleFilter*))); - connect(s_earchDlg, TQT_SIGNAL(dialogDone()), this, - TQT_SLOT(slotSearchDialogDone())); + connect(s_earchDlg, TQ_SIGNAL(doSearch(KNArticleFilter*)), this, + TQ_SLOT(slotFilterChanged(KNArticleFilter*))); + connect(s_earchDlg, TQ_SIGNAL(dialogDone()), this, + TQ_SLOT(slotSearchDialogDone())); s_earchDlg->show(); } } @@ -1081,8 +1081,8 @@ void KNArticleManager::slotItemExpanded(TQListViewItem *p) void KNArticleManager::setView(KNHeaderView* v) { v_iew = v; if(v) { - connect(v, TQT_SIGNAL(expanded(TQListViewItem*)), this, - TQT_SLOT(slotItemExpanded(TQListViewItem*))); + connect(v, TQ_SIGNAL(expanded(TQListViewItem*)), this, + TQ_SLOT(slotItemExpanded(TQListViewItem*))); } } diff --git a/knode/knarticlemanager.h b/knode/knarticlemanager.h index ee62c8d08..73fe07d9b 100644 --- a/knode/knarticlemanager.h +++ b/knode/knarticlemanager.h @@ -38,7 +38,7 @@ class KNJobData; class KNArticleManager : public TQObject, public KNJobConsumer { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index 53b810897..4a4235e82 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -100,10 +100,10 @@ KNArticleWindow::KNArticleWindow(KNArticle *art) mInstances.append( this ); // file menu - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection() ); + KStdAction::close( this, TQ_SLOT(close()), actionCollection() ); // settings menu - KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); TDEAccel *accel = new TDEAccel( this ); artW->setCharsetKeyboardAction()->plugAccel( accel ); diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h index b8171da57..e452720ac 100644 --- a/knode/knarticlewindow.h +++ b/knode/knarticlewindow.h @@ -26,7 +26,7 @@ namespace KNode { class KNArticleWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/kncleanup.h b/knode/kncleanup.h index d765dc154..5019b2079 100644 --- a/knode/kncleanup.h +++ b/knode/kncleanup.h @@ -15,8 +15,6 @@ #ifndef KNCLEANUP_H #define KNCLEANUP_H -#include <tqsemimodal.h> - class TQProgressBar; class TQLabel; diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 8a02fed2e..e7f9aa877 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -49,8 +49,8 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); - mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) ); - mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQT_SLOT(toggleTotalColumn()) ); + mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQ_SLOT(toggleUnreadColumn()) ); + mTotalPop = mPopup->insertItem( i18n("Total Column"), this, TQ_SLOT(toggleTotalColumn()) ); // add unread and total columns if necessary readConfig(); @@ -61,21 +61,21 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : // connect to the account manager KNAccountManager* am = knGlobals.accountManager(); - connect(am, TQT_SIGNAL(accountAdded(KNNntpAccount*)), TQT_SLOT(addAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), TQT_SLOT(removeAccount(KNNntpAccount*))); - connect(am, TQT_SIGNAL(accountModified(KNNntpAccount*)), TQT_SLOT(updateAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountAdded(KNNntpAccount*)), TQ_SLOT(addAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), TQ_SLOT(removeAccount(KNNntpAccount*))); + connect(am, TQ_SIGNAL(accountModified(KNNntpAccount*)), TQ_SLOT(updateAccount(KNNntpAccount*))); // connect to the group manager KNGroupManager* gm = knGlobals.groupManager(); - connect(gm, TQT_SIGNAL(groupAdded(KNGroup*)), TQT_SLOT(addGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupRemoved(KNGroup*)), TQT_SLOT(removeGroup(KNGroup*))); - connect(gm, TQT_SIGNAL(groupUpdated(KNGroup*)), TQT_SLOT(updateGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupAdded(KNGroup*)), TQ_SLOT(addGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupRemoved(KNGroup*)), TQ_SLOT(removeGroup(KNGroup*))); + connect(gm, TQ_SIGNAL(groupUpdated(KNGroup*)), TQ_SLOT(updateGroup(KNGroup*))); // connect to the folder manager KNFolderManager* fm = knGlobals.folderManager(); - connect(fm, TQT_SIGNAL(folderAdded(KNFolder*)), TQT_SLOT(addPendingFolders())); - connect(fm, TQT_SIGNAL(folderRemoved(KNFolder*)), TQT_SLOT(removeFolder(KNFolder*))); - connect(fm, TQT_SIGNAL(folderActivated(KNFolder*)), TQT_SLOT(activateFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderAdded(KNFolder*)), TQ_SLOT(addPendingFolders())); + connect(fm, TQ_SIGNAL(folderRemoved(KNFolder*)), TQ_SLOT(removeFolder(KNFolder*))); + connect(fm, TQ_SIGNAL(folderActivated(KNFolder*)), TQ_SLOT(activateFolder(KNFolder*))); installEventFilter(this); } @@ -421,7 +421,7 @@ void KNCollectionView::updatePopup() const bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e) { - if ((e->type() == TQEvent::KeyPress) && (TQT_TQKEYEVENT(e)->key() == Key_Tab)) { + if ((e->type() == TQEvent::KeyPress) && (static_cast<TQKeyEvent*>(e)->key() == Key_Tab)) { emit(focusChangeRequest(this)); if (!hasFocus()) // focusChangeRequest was successful return true; @@ -429,10 +429,10 @@ bool KNCollectionView::eventFilter(TQObject *o, TQEvent *e) // header popup menu if ( e->type() == TQEvent::MouseButtonPress && - TQT_TQMOUSEEVENT(e)->button() == Qt::RightButton && - o->isA(TQHEADER_OBJECT_NAME_STRING) ) + static_cast<TQMouseEvent*>(e)->button() == TQt::RightButton && + o->isA("TQHeader") ) { - mPopup->popup( TQT_TQMOUSEEVENT(e)->globalPos() ); + mPopup->popup( static_cast<TQMouseEvent*>(e)->globalPos() ); return true; } diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h index 74a6e25ee..957aa207d 100644 --- a/knode/kncollectionview.h +++ b/knode/kncollectionview.h @@ -26,7 +26,7 @@ class KNCollectionViewItem; class KNCollectionView : public KFolderTree { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 8695048e6..5b4f86038 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -78,7 +78,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu() menu->insertSeparator(); menu->insertItem( i18n( "Edit Recent Addresses..." ), - this, TQT_SLOT( editRecentAddresses() ) ); + this, TQ_SLOT( editRecentAddresses() ) ); return menu; } @@ -183,9 +183,9 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & v_iew=new ComposerView(this); setCentralWidget(v_iew); - connect(v_iew->c_ancelEditorBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancelEditor())); - connect(v_iew->e_dit, TQT_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQT_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); - connect(v_iew->e_dit, TQT_SIGNAL(sigDropEvent(TQDropEvent *)), TQT_SLOT(slotDropEvent(TQDropEvent *))); + connect(v_iew->c_ancelEditorBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancelEditor())); + connect(v_iew->e_dit, TQ_SIGNAL(sigDragEnterEvent(TQDragEnterEvent *)), TQ_SLOT(slotDragEnterEvent(TQDragEnterEvent *))); + connect(v_iew->e_dit, TQ_SIGNAL(sigDropEvent(TQDropEvent *)), TQ_SLOT(slotDropEvent(TQDropEvent *))); //statusbar KStatusBar *sb=statusBar(); @@ -199,128 +199,128 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & sb->setItemAlignment (4,AlignCenter | AlignVCenter); sb->insertItem(TQString(), 5,0); // line sb->setItemAlignment (5,AlignCenter | AlignVCenter); - connect(v_iew->e_dit, TQT_SIGNAL(CursorPositionChanged()), TQT_SLOT(slotUpdateCursorPos())); - connect(v_iew->e_dit, TQT_SIGNAL(toggle_overwrite_signal()), TQT_SLOT(slotUpdateStatusBar())); + connect(v_iew->e_dit, TQ_SIGNAL(CursorPositionChanged()), TQ_SLOT(slotUpdateCursorPos())); + connect(v_iew->e_dit, TQ_SIGNAL(toggle_overwrite_signal()), TQ_SLOT(slotUpdateStatusBar())); //------------------------------- <Actions> -------------------------------------- //file menu - new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , TQT_TQOBJECT(this), - TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); + new TDEAction(i18n("&Send Now"),"mail-send", CTRL + Key_Return , this, + TQ_SLOT(slotSendNow()), actionCollection(), "send_now"); - new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); + new TDEAction(i18n("Send &Later"), "queue", 0, this, + TQ_SLOT(slotSendLater()), actionCollection(), "send_later"); - new TDEAction(i18n("Save as &Draft"),"document-save", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); + new TDEAction(i18n("Save as &Draft"),"document-save", 0 , this, + TQ_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); - new TDEAction(i18n("D&elete"),"edit-delete", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); + new TDEAction(i18n("D&elete"),"edit-delete", 0 , this, + TQ_SLOT(slotArtDelete()), actionCollection(), "art_delete"); - KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); + KStdAction::close(this, TQ_SLOT(close()),actionCollection()); //edit menu - KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotUndo()), actionCollection()); - KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotRedo()), actionCollection()); + KStdAction::undo(this, TQ_SLOT(slotUndo()), actionCollection()); + KStdAction::redo(this, TQ_SLOT(slotRedo()), actionCollection()); - KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); + KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection()); - KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); + KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection()); - KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); + KStdAction::pasteText(this, TQ_SLOT(slotPaste()), actionCollection()); - new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); + new TDEAction(i18n("Paste as &Quotation"), 0, v_iew->e_dit, + TQ_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); - KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); + KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection()); - KStdAction::find(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotFind()), actionCollection()); - KStdAction::findNext(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotSearchAgain()), actionCollection()); + KStdAction::find(v_iew->e_dit, TQ_SLOT(slotFind()), actionCollection()); + KStdAction::findNext(v_iew->e_dit, TQ_SLOT(slotSearchAgain()), actionCollection()); - KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection()); + KStdAction::replace(v_iew->e_dit, TQ_SLOT(slotReplace()), actionCollection()); //attach menu - new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), + new TDEAction(i18n("Append &Signature"), 0 , this, TQ_SLOT(slotAppendSig()), actionCollection(), "append_signature"); - new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + new TDEAction(i18n("&Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), + new TDEAction(i18n("Insert File (in a &box)..."), 0, this, TQ_SLOT(slotInsertFileBoxed()), actionCollection(), "insert_file_boxed"); - new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + new TDEAction(i18n("Attach &File..."), "attach", 0, this, TQ_SLOT(slotAttachFile()), actionCollection(), "attach_file"); a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), "signature", 0, actionCollection(), "sign_article"); - a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); + a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, this, + TQ_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); - a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); + a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, this, + TQ_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); //options menu - a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); + a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "document-new", 0 , this, + TQ_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); - a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); + a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , this, + TQ_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); a_ctSetCharset = new TDESelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); a_ctSetCharset->setItems(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); a_ctSetCharset->setShortcutConfigurable(false); - connect(a_ctSetCharset, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotSetCharset(const TQString&))); + connect(a_ctSetCharset, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotSetCharset(const TQString&))); - a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); + a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, this, + TQ_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); - a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); + a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , this, + TQ_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); //tools menu - new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); + new TDEAction(i18n("Add &Quote Characters"), 0, v_iew->e_dit, + TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); + new TDEAction(i18n("&Remove Quote Characters"), 0, v_iew->e_dit, + TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); + new TDEAction(i18n("Add &Box"), 0, v_iew->e_dit, + TQ_SLOT(slotAddBox()), actionCollection(), "tools_box"); - new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); + new TDEAction(i18n("Re&move Box"), 0, v_iew->e_dit, + TQ_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); - TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); + TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, this, + TQ_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); undoRewrap->setEnabled(!u_nwraped.isNull()); - TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), - TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); + TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, v_iew->e_dit, + TQ_SLOT(slotRot13()), actionCollection(), "tools_rot13"); rot13->setEnabled(false); - connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); + connect(v_iew->e_dit, TQ_SIGNAL(copyAvailable(bool)), rot13, TQ_SLOT(setEnabled(bool))); - a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); + a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "system-run", 0, this, + TQ_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); - a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection()); + a_ctSpellCheck = KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection()); //settings menu createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); + KStdAction::preferences(knGlobals.top, TQ_SLOT(slotSettings()), actionCollection()); a_ccel=new TDEAccel(this); a_ctSetCharsetKeyb->plugAccel(a_ccel); @@ -420,7 +420,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri { TDEAction * act = new TDEAction( *it ); - connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) ); + connect( act, TQ_SIGNAL(activated()), v_iew->e_dit, TQ_SLOT(slotCorrectWord()) ); m_listAction.append( act ); } } @@ -437,7 +437,7 @@ void KNComposer::slotUndo() if (fw->inherits("KEdit")) ((TQMultiLineEdit*)fw)->undo(); - else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->undo(); } @@ -448,7 +448,7 @@ void KNComposer::slotRedo() if (fw->inherits("KEdit")) ((TQMultiLineEdit*)fw)->redo(); - else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->redo(); } @@ -459,7 +459,7 @@ void KNComposer::slotCut() if (fw->inherits("KEdit")) ((TQMultiLineEdit*)fw)->cut(); - else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->cut(); else kdDebug(5003) << "wrong focus widget" << endl; } @@ -471,7 +471,7 @@ void KNComposer::slotCopy() if (fw->inherits("KEdit")) ((TQMultiLineEdit*)fw)->copy(); - else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->copy(); else kdDebug(5003) << "wrong focus widget" << endl; @@ -485,7 +485,7 @@ void KNComposer::slotPaste() if (fw->inherits("KEdit")) ((TQMultiLineEdit*)fw)->paste(); - else if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->paste(); else kdDebug(5003) << "wrong focus widget" << endl; } @@ -495,9 +495,9 @@ void KNComposer::slotSelectAll() TQWidget* fw = focusWidget(); if (!fw) return; - if (fw->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) + if (fw->inherits("TQLineEdit")) ((TQLineEdit*)fw)->selectAll(); - else if (fw->inherits(TQMULTILINEEDIT_OBJECT_NAME_STRING)) + else if (fw->inherits("TQMultiLineEdit")) ((TQMultiLineEdit*)fw)->selectAll(); } @@ -1302,7 +1302,7 @@ void KNComposer::slotExternalEditor() if(!filenameAdded) // no %f in the editor command (*e_xternalEditor) << e_ditorTempfile->name(); - connect(e_xternalEditor, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotEditorFinished(TDEProcess *))); + connect(e_xternalEditor, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotEditorFinished(TDEProcess *))); if(!e_xternalEditor->start()) { KMessageBox::error(this, i18n("Unable to start external editor.\nPlease check your configuration in the settings dialog.")); delete e_xternalEditor; @@ -1327,17 +1327,17 @@ void KNComposer::slotSpellcheck() a_ctExternalEditor->setEnabled(false); a_ctSpellCheck->setEnabled(false); - s_pellChecker = new KSpell(TQT_TQWIDGET(this), i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); + s_pellChecker = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { s_pellChecker->addPersonal( *it ); } - connect(s_pellChecker, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(s_pellChecker, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(s_pellChecker, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); - connect(s_pellChecker, TQT_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), - this, TQT_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(s_pellChecker, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(s_pellChecker, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(s_pellChecker, TQ_SIGNAL(corrected (const TQString &, const TQString &, unsigned int)), + this, TQ_SLOT(slotCorrected (const TQString &, const TQString &, unsigned int))); } @@ -1401,7 +1401,7 @@ void KNComposer::slotConfToolbar() conf->setGroup("composerWindow_options"); saveMainWindowSettings(conf); KEditToolbar dlg(guiFactory(),this); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -1508,10 +1508,10 @@ void KNComposer::slotGroupsBtnClicked() KNGroupSelectDialog *dlg=new KNGroupSelectDialog(this, nntp, v_iew->g_roups->text().remove(TQRegExp("\\s"))); - connect(dlg, TQT_SIGNAL(loadList(KNNntpAccount*)), - knGlobals.groupManager(), TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(knGlobals.groupManager(), TQT_SIGNAL(newListReady(KNGroupListData*)), - dlg, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(dlg, TQ_SIGNAL(loadList(KNNntpAccount*)), + knGlobals.groupManager(), TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(knGlobals.groupManager(), TQ_SIGNAL(newListReady(KNGroupListData*)), + dlg, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(dlg->exec()) v_iew->g_roups->setText(dlg->selectedGroups()); @@ -1725,7 +1725,7 @@ TQPopupMenu * KNComposer::popupMenu( const TQString& name ) KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) - : TQSplitter(Qt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false) + : TQSplitter(TQt::Vertical, composer, n), a_ttWidget(0), a_ttView(0), v_iewOpen(false) { TQWidget *main=new TQWidget(this); @@ -1744,7 +1744,7 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_to, 0,0); hdrL->addWidget(t_o, 0,1); hdrL->addWidget(t_oBtn, 0,2); - connect(t_oBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotToBtnClicked())); + connect(t_oBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotToBtnClicked())); //Newsgroups g_roups=new KNLineEdit(this, false, hdrFrame); @@ -1755,9 +1755,9 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) hdrL->addWidget(l_groups, 1,0); hdrL->addWidget(g_roups, 1,1); hdrL->addWidget(g_roupsBtn, 1,2); - connect(g_roups, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotGroupsChanged(const TQString&))); - connect(g_roupsBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotGroupsBtnClicked())); + connect(g_roups, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotGroupsChanged(const TQString&))); + connect(g_roupsBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotGroupsBtnClicked())); //Followup-To f_up2=new KComboBox(true, hdrFrame); @@ -1772,8 +1772,8 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) TQLabel *l=new TQLabel(s_ubject, i18n("S&ubject:"), hdrFrame); hdrL->addWidget(l, 3,0); hdrL->addMultiCellWidget(s_ubject, 3,3, 1,2); - connect(s_ubject, TQT_SIGNAL(textChanged(const TQString&)), - parent(), TQT_SLOT(slotSubjectChanged(const TQString&))); + connect(s_ubject, TQ_SIGNAL(textChanged(const TQString&)), + parent(), TQ_SLOT(slotSubjectChanged(const TQString&))); //Editor e_dit=new Editor(this, composer, main); @@ -1793,12 +1793,12 @@ KNComposer::ComposerView::ComposerView(KNComposer *composer, const char *n) mSpellChecker = new KDictSpellingHighlighter(e_dit, /*active*/ true, /*autoEnabled*/ true, /*spellColor*/ config->readColorEntry("NewMessage", &c), /*colorQuoting*/ true, col1, col2, col3, col4); - connect( mSpellChecker, TQT_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, - TQT_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); + connect( mSpellChecker, TQ_SIGNAL(newSuggestions(const TQString&, const TQStringList&, unsigned int)), e_dit, + TQ_SLOT(slotAddSuggestion(const TQString&, const TQStringList&, unsigned int)) ); TQVBoxLayout *notL=new TQVBoxLayout(e_dit); notL->addStretch(1); - n_otification=new TQGroupBox(2, Qt::Horizontal, e_dit); + n_otification=new TQGroupBox(2, TQt::Horizontal, e_dit); l=new TQLabel(i18n("You are currently editing the article body\nin an external editor. To continue, you have\nto close the external editor."), n_otification); c_ancelEditorBtn=new TQPushButton(i18n("&Kill External Editor"), n_otification); n_otification->setFrameStyle(TQFrame::Panel | TQFrame::Raised); @@ -1906,33 +1906,33 @@ void KNComposer::ComposerView::showAttachmentView() topL->addMultiCellWidget(a_ttView, 0,2, 0,0); //connections - connect(a_ttView, TQT_SIGNAL(currentChanged(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), - parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - - connect(a_ttView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(a_ttView, TQT_SIGNAL(delPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentRemove(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(returnPressed(TQListViewItem*)), - parent(), TQT_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(currentChanged(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(clicked ( TQListViewItem * )), + parent(), TQ_SLOT(slotAttachmentSelected(TQListViewItem*))); + + connect(a_ttView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + parent(), TQ_SLOT(slotAttachmentPopup(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(a_ttView, TQ_SIGNAL(delPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentRemove(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); + connect(a_ttView, TQ_SIGNAL(returnPressed(TQListViewItem*)), + parent(), TQ_SLOT(slotAttachmentEdit(TQListViewItem*))); //buttons a_ttAddBtn=new TQPushButton(i18n("A&dd..."),a_ttWidget); - connect(a_ttAddBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachFile())); + connect(a_ttAddBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachFile())); topL->addWidget(a_ttAddBtn, 0,1); a_ttRemoveBtn=new TQPushButton(i18n("&Remove"), a_ttWidget); a_ttRemoveBtn->setEnabled(false); - connect(a_ttRemoveBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotRemoveAttachment())); + connect(a_ttRemoveBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotRemoveAttachment())); topL->addWidget(a_ttRemoveBtn, 1,1); a_ttEditBtn=new TQPushButton(i18n("&Properties"), a_ttWidget); a_ttEditBtn->setEnabled(false); - connect(a_ttEditBtn, TQT_SIGNAL(clicked()), parent(), TQT_SLOT(slotAttachmentProperties())); + connect(a_ttEditBtn, TQ_SIGNAL(clicked()), parent(), TQ_SLOT(slotAttachmentProperties())); topL->addWidget(a_ttEditBtn, 2,1, TQt::AlignTop); topL->setRowStretch(2,1); @@ -2011,7 +2011,7 @@ KNComposer::Editor::~Editor() //----------------------------------------------------------------------------- bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) { - if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(this)) + if (o == this) KCursor::autoHideEventFilter(o, e); if (e->type() == TQEvent::KeyPress) @@ -2398,15 +2398,15 @@ void KNComposer::Editor::contentsContextMenuEvent( TQContextMenuEvent */*e*/ ) } else { - spell = new KSpell(this, i18n("Spellcheck"), TQT_TQOBJECT(this), TQT_SLOT(slotSpellStarted(KSpell *))); + spell = new KSpell(this, i18n("Spellcheck"), this, TQ_SLOT(slotSpellStarted(KSpell *))); TQStringList l = KSpellingHighlighter::personalWords(); for ( TQStringList::Iterator it = l.begin(); it != l.end(); ++it ) { spell->addPersonal( *it ); } - connect(spell, TQT_SIGNAL(death()), this, TQT_SLOT(slotSpellFinished())); - connect(spell, TQT_SIGNAL(done(const TQString&)), this, TQT_SLOT(slotSpellDone(const TQString&))); - connect(spell, TQT_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); + connect(spell, TQ_SIGNAL(death()), this, TQ_SLOT(slotSpellFinished())); + connect(spell, TQ_SIGNAL(done(const TQString&)), this, TQ_SLOT(slotSpellDone(const TQString&))); + connect(spell, TQ_SIGNAL(misspelling (const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling (const TQString &, const TQStringList &, unsigned int))); } } @@ -2600,8 +2600,8 @@ KNComposer::AttachmentPropertiesDlg::AttachmentPropertiesDlg(KNAttachment *a, TQ topL->addWidget(mimeGB); //connections - connect(m_imeType, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotMimeTypeTextChanged(const TQString&))); + connect(m_imeType, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotMimeTypeTextChanged(const TQString&))); //finish GUI setFixedHeight(sizeHint().height()); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index c966209f6..00dc15517 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -43,7 +43,7 @@ class SpellingFilter; class KNComposer : public TDEMainWindow , virtual public KNodeComposerIface { - Q_OBJECT + TQ_OBJECT public: @@ -251,7 +251,7 @@ class KNComposer::ComposerView : public TQSplitter { //internal class : handle Tabs... (expanding them in textLine(), etc.) class KNComposer::Editor : public KEdit { - Q_OBJECT + TQ_OBJECT public: @@ -304,7 +304,7 @@ private: class KNComposer::AttachmentView : public TDEListView { - Q_OBJECT + TQ_OBJECT public: @@ -332,7 +332,7 @@ class KNComposer::AttachmentViewItem : public TDEListViewItem { class KNComposer::AttachmentPropertiesDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -357,7 +357,7 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase { //----------------------------------------------------------------------------- class KNLineEdit : public TDEABC::AddressLineEdit { - Q_OBJECT + TQ_OBJECT typedef TDEABC::AddressLineEdit KNLineEditInherited; public: @@ -377,7 +377,7 @@ private: class KNLineEditSpell : public KNLineEdit { - Q_OBJECT + TQ_OBJECT public: KNLineEditSpell(KNComposer::ComposerView *_composerView, bool useCompletion,TQWidget * parent, const char * name = 0); diff --git a/knode/knconfig.cpp b/knode/knconfig.cpp index 7c0ef4359..9be34f005 100644 --- a/knode/knconfig.cpp +++ b/knode/knconfig.cpp @@ -138,8 +138,8 @@ TQString KNConfig::Identity::getSignature() for ( TQStringList::Iterator it = command.begin(); it != command.end(); ++it ) process << (*it); - connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); - connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStdout(TDEProcess *, char *, int))); + connect(&process, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(slotReceiveStderr(TDEProcess *, char *, int))); if (!process.start(TDEProcess::Block,TDEProcess::AllOutput)) KMessageBox::error(knGlobals.topWidget, i18n("Cannot run the signature generator.")); diff --git a/knode/knconfig.h b/knode/knconfig.h index c86050494..f3dff7cd4 100644 --- a/knode/knconfig.h +++ b/knode/knconfig.h @@ -65,7 +65,7 @@ class Base { class KDE_EXPORT Identity : public TQObject, public Base { -Q_OBJECT +TQ_OBJECT friend class IdentityWidget; diff --git a/knode/knconfigmanager.cpp b/knode/knconfigmanager.cpp index a07a9c5e0..f7d265067 100644 --- a/knode/knconfigmanager.cpp +++ b/knode/knconfigmanager.cpp @@ -67,7 +67,7 @@ void KNConfigManager::configure() { if(!d_ialog) { d_ialog=new KNConfigDialog(knGlobals.topWidget, "Preferences_Dlg"); - connect(d_ialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotDialogDone())); + connect(d_ialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotDialogDone())); d_ialog->show(); } else @@ -113,7 +113,7 @@ KNConfigDialog::KNConfigDialog(TQWidget *p, const char *n) setHelp("anc-setting-your-identity"); - connect(this, TQT_SIGNAL(configCommitted()), this, TQT_SLOT(slotConfigCommitted())); + connect(this, TQ_SIGNAL(configCommitted()), this, TQ_SLOT(slotConfigCommitted())); } diff --git a/knode/knconfigmanager.h b/knode/knconfigmanager.h index c0c6a49ef..25cbd211f 100644 --- a/knode/knconfigmanager.h +++ b/knode/knconfigmanager.h @@ -26,7 +26,7 @@ class KNConfigDialog; class KNConfigManager : TQObject { - Q_OBJECT + TQ_OBJECT public: @@ -71,7 +71,7 @@ class KNConfigManager : TQObject { class KNConfigDialog : public KCMultiDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knconfigpages.cpp b/knode/knconfigpages.cpp index d9f218781..91d7666c2 100644 --- a/knode/knconfigpages.cpp +++ b/knode/knconfigpages.cpp @@ -38,7 +38,7 @@ KNConfig::BasePageWithTabs::BasePageWithTabs( TQWidget * parent, const char * na void KNConfig::BasePageWithTabs::addTab( TDECModule* tab, const TQString & title ) { mTabWidget->addTab( tab, title ); - connect( tab, TQT_SIGNAL(changed( bool )), this, TQT_SIGNAL(changed( bool )) ); + connect( tab, TQ_SIGNAL(changed( bool )), this, TQ_SIGNAL(changed( bool )) ); } void KNConfig::BasePageWithTabs::load() { diff --git a/knode/knconfigpages.h b/knode/knconfigpages.h index 9bcaf1d42..80d3a6cfd 100644 --- a/knode/knconfigpages.h +++ b/knode/knconfigpages.h @@ -30,7 +30,7 @@ namespace KNConfig { * Code mostly taken from kmail. */ class KDE_EXPORT BasePageWithTabs : public TDECModule { - Q_OBJECT + TQ_OBJECT public: BasePageWithTabs( TQWidget * parent=0, const char * name=0 ); @@ -51,7 +51,7 @@ class KDE_EXPORT BasePageWithTabs : public TDECModule { // accounts page class AccountsPage : public BasePageWithTabs { - Q_OBJECT + TQ_OBJECT public: @@ -61,7 +61,7 @@ class AccountsPage : public BasePageWithTabs { // read news page class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { - Q_OBJECT + TQ_OBJECT public: @@ -70,7 +70,7 @@ class KDE_EXPORT ReadNewsPage : public BasePageWithTabs { // post news page class KDE_EXPORT PostNewsPage : public BasePageWithTabs { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 68b474a14..27c81824a 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -66,7 +66,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>John Stuart Masterson III</b>.</p></qt>"); TQWhatsThis::add( n_ame, msg ); TQWhatsThis::add( l, msg ); - connect( n_ame, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( n_ame, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); o_rga=new KLineEdit(this); l=new TQLabel(o_rga, i18n("Organi&zation:"), this); @@ -76,7 +76,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "<p>Ex: <b>KNode, Inc</b>.</p></qt>" ); TQWhatsThis::add( o_rga, msg ); TQWhatsThis::add( l, msg ); - connect( o_rga, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( o_rga, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); e_mail=new KLineEdit(this); l=new TQLabel(e_mail, i18n("Email a&ddress:"), this); @@ -86,7 +86,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "reading your articles</p><p>Ex: <b>nospam@please.com</b>.</qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( e_mail, msg ); - connect( e_mail, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( e_mail, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); r_eplyTo=new KLineEdit(this); l=new TQLabel(r_eplyTo, i18n("&Reply-to address:"), this); @@ -97,13 +97,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "email address.</p><p>Ex: <b>john@example.com</b>.</p></qt>" ); TQWhatsThis::add( l, msg ); TQWhatsThis::add( r_eplyTo, msg ); - connect( r_eplyTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( r_eplyTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); m_ailCopiesTo=new KLineEdit(this); l=new TQLabel(m_ailCopiesTo, i18n("&Mail-copies-to:"), this); topL->addWidget(l, 4,0); topL->addMultiCellWidget(m_ailCopiesTo, 4,4, 1,2); - connect( m_ailCopiesTo, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed()) ); + connect( m_ailCopiesTo, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed()) ); s_igningKey = new Kpgp::SecretKeyRequester(this); s_igningKey->dialogButton()->setText(i18n("Chan&ge...")); @@ -117,11 +117,11 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * "used to sign your articles.</p></qt>"); TQWhatsThis::add( l, msg ); TQWhatsThis::add( s_igningKey, msg ); - connect( s_igningKey, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( s_igningKey, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); b_uttonGroup = new TQButtonGroup(this); - connect( b_uttonGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(slotSignatureType(int)) ); + connect( b_uttonGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(slotSignatureType(int)) ); b_uttonGroup->setExclusive(true); b_uttonGroup->hide(); @@ -143,12 +143,12 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * TQWhatsThis::add( s_ig, msg ); c_hooseBtn = new TQPushButton( i18n("Choo&se..."), this); - connect(c_hooseBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureChoose())); + connect(c_hooseBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureChoose())); topL->addWidget(c_hooseBtn, 7, 2 ); e_ditBtn = new TQPushButton( i18n("&Edit File"), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSignatureEdit())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSignatureEdit())); topL->addWidget(e_ditBtn, 8, 2); s_igGenerator = new TQCheckBox(i18n("&The file is a program"), this); @@ -156,7 +156,7 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * msg = i18n( "<qt><p>Mark this option if the signature will be generated by a program</p>" "<p>Ex: <b>/home/robt/gensig.sh</b>.</p></qt>" ); TQWhatsThis::add( s_igGenerator, msg ); - connect( s_igGenerator, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect( s_igGenerator, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); s_igEdit = new TQRadioButton( i18n("Specify signature &below"), this); b_uttonGroup->insert(s_igEdit, 1); @@ -165,13 +165,13 @@ KNConfig::IdentityWidget::IdentityWidget( Identity *d, TQWidget *p, const char * s_igEditor = new TQTextEdit(this); s_igEditor->setTextFormat(TQt::PlainText); topL->addMultiCellWidget(s_igEditor, 10, 10, 0, 2); - connect( s_igEditor, TQT_SIGNAL(textChanged()), TQT_SLOT(changed()) ); + connect( s_igEditor, TQ_SIGNAL(textChanged()), TQ_SLOT(changed()) ); topL->setColStretch(1,1); topL->setRowStretch(7,1); topL->setResizeMode(TQLayout::Minimum); - connect(s_ig,TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textFileNameChanged(const TQString &))); + connect(s_ig,TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textFileNameChanged(const TQString &))); load(); } @@ -289,12 +289,12 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // account listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,4, 0,0); // info box - TQGroupBox *gb = new TQGroupBox(2,Qt::Vertical,TQString(),this); + TQGroupBox *gb = new TQGroupBox(2,TQt::Vertical,TQString(),this); topL->addWidget(gb,5,0); s_erverInfo = new TQLabel(gb); @@ -302,19 +302,19 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 1,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 2,1); s_ubBtn=new TQPushButton(i18n("&Subscribe..."), this); - connect(s_ubBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSubBtnClicked())); + connect(s_ubBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSubBtnClicked())); topL->addWidget(s_ubBtn, 3,1); topL->setRowStretch(4,1); // stretch the server listbox @@ -323,9 +323,9 @@ KNConfig::NntpAccountListWidget::NntpAccountListWidget(TQWidget *p, const char * // the settings dialog is non-modal, so we have to react to changes // made outside of the dialog - connect(a_ccManager, TQT_SIGNAL(accountAdded(KNNntpAccount*)), this, TQT_SLOT(slotAddItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQT_SLOT(slotRemoveItem(KNNntpAccount*))); - connect(a_ccManager, TQT_SIGNAL(accountModified(KNNntpAccount*)), this, TQT_SLOT(slotUpdateItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountAdded(KNNntpAccount*)), this, TQ_SLOT(slotAddItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountRemoved(KNNntpAccount*)), this, TQ_SLOT(slotRemoveItem(KNNntpAccount*))); + connect(a_ccManager, TQ_SIGNAL(accountModified(KNNntpAccount*)), this, TQ_SLOT(slotUpdateItem(KNNntpAccount*))); slotSelectionChanged(); // disable Delete & Edit initially } @@ -510,7 +510,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(u_seDiskCache, 6,6, 0,3);*/ a_uth=new TQCheckBox(i18n("Server requires &authentication"), page); - connect(a_uth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotAuthChecked(bool))); + connect(a_uth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotAuthChecked(bool))); topL->addMultiCellWidget(a_uth, 6,6, 0,3); u_ser=new KLineEdit(page); @@ -531,7 +531,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge topL->addMultiCellWidget(p_ass, 8,8, 1,2); i_nterval=new TQCheckBox(i18n("Enable &interval news checking"), page); - connect(i_nterval, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotIntervalChecked(bool))); + connect(i_nterval, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotIntervalChecked(bool))); topL->addMultiCellWidget(i_nterval, 9,9, 0,3); c_heckInterval=new KIntSpinBox(1,10000,1,1,10,page); @@ -559,7 +559,7 @@ KNConfig::NntpAccountConfDialog::NntpAccountConfDialog(KNNntpAccount *a, TQWidge cleanupLayout->addWidget( mCleanupWidget ); cleanupLayout->addStretch( 1 ); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); KNHelper::restoreWindowSize("accNewsPropDLG", this, sizeHint()); @@ -633,7 +633,7 @@ KNConfig::SmtpAccountWidget::SmtpAccountWidget( TQWidget *p, const char *n ) : SmtpAccountWidgetBase( p, n ) { mAccount = knGlobals.accountManager()->smtp(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordChanged()) ); load(); } @@ -821,29 +821,29 @@ KNConfig::AppearanceWidget::AppearanceWidget( TQWidget *p, const char *n ) : //color-list c_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(c_List,1,3,0,0); - 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"),this); topL->addWidget(c_olorCB,0,0); - connect(c_olorCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotColCheckBoxToggled(bool))); + connect(c_olorCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotColCheckBoxToggled(bool))); c_olChngBtn=new TQPushButton(i18n("Cha&nge..."), this); - connect(c_olChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotColChangeBtnClicked())); + connect(c_olChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotColChangeBtnClicked())); topL->addWidget(c_olChngBtn,1,1); //font-list f_List = new KNDialogListBox(false, this); topL->addMultiCellWidget(f_List,5,7,0,0); - 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"),this); topL->addWidget(f_ontCB,4,0); - connect(f_ontCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFontCheckBoxToggled(bool))); + connect(f_ontCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFontCheckBoxToggled(bool))); f_ntChngBtn=new TQPushButton(i18n("Chang&e..."), this); - connect(f_ntChngBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFontChangeBtnClicked())); + connect(f_ntChngBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFontChangeBtnClicked())); topL->addWidget(f_ntChngBtn,5,1); load(); @@ -1005,7 +1005,7 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi l1=new TQLabel(m_axFetch, i18n("&Maximum number of articles to fetch:"), hgb); m_arkCB=new TQCheckBox(i18n("Mar&k article as read after:"), hgb); m_arkSecs=new KIntSpinBox(0, 9999, 1, 0, 10, hgb); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), m_arkSecs, TQT_SLOT(setEnabled(bool))); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), m_arkSecs, TQ_SLOT(setEnabled(bool))); m_arkSecs->setSuffix(i18n(" sec")); m_arkCrossCB=new TQCheckBox(i18n("Mark c&rossposted articles as read"), hgb); @@ -1059,19 +1059,19 @@ KNConfig::ReadNewsGeneralWidget::ReadNewsGeneralWidget( ReadNewsGeneral *d, TQWi topL->setResizeMode(TQLayout::Minimum); - connect(a_utoCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axFetch, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkSecs, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(m_arkCrossCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_martScrollingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(e_xpThrCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(d_efaultExpandCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(l_inesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_coreCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(u_nreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(c_ollCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(a_rtCacheSize, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(a_utoCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axFetch, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkSecs, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(m_arkCrossCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_martScrollingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(e_xpThrCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(d_efaultExpandCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(l_inesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_coreCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(u_nreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(c_ollCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(a_rtCacheSize, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); load(); } @@ -1138,7 +1138,7 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkAllReadGoNextCB=new TQCheckBox(i18n("&Switch to the next group"), gb); gbL->addWidget(m_arkAllReadGoNextCB); - connect(m_arkAllReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkAllReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Mark Thread as Read ================================================= @@ -1152,8 +1152,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation m_arkThreadReadGoNextCB=new TQCheckBox(i18n("Go &to the next unread thread"), gb); gbL->addWidget(m_arkThreadReadGoNextCB); - connect(m_arkThreadReadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_arkThreadReadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(m_arkThreadReadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_arkThreadReadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); // ==== Ignore Thread ======================================================= @@ -1167,8 +1167,8 @@ KNConfig::ReadNewsNavigationWidget::ReadNewsNavigationWidget( ReadNewsNavigation i_gnoreThreadGoNextCB=new TQCheckBox(i18n("Go to the next &unread thread"), gb); gbL->addWidget(i_gnoreThreadGoNextCB); - connect(i_gnoreThreadCloseThreadCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(i_gnoreThreadGoNextCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_gnoreThreadCloseThreadCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(i_gnoreThreadGoNextCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); topL->addStretch(1); topL->setResizeMode(TQLayout::Minimum); @@ -1253,14 +1253,14 @@ KNConfig::ReadNewsViewerWidget::ReadNewsViewerWidget( ReadNewsViewer *d, TQWidge topL->setResizeMode(TQLayout::Minimum); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(r_emoveTrailingCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(s_igCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(q_uoteCharacters, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); - connect(o_penAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(a_ltAttCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect( mShowRefBar, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); - connect( mAlwaysShowHTML, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed()) ); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(r_emoveTrailingCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(s_igCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(q_uoteCharacters, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); + connect(o_penAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(a_ltAttCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect( mShowRefBar, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); + connect( mAlwaysShowHTML, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed()) ); load(); } @@ -1311,29 +1311,29 @@ KNConfig::DisplayedHeadersWidget::DisplayedHeadersWidget( DisplayedHeaders *d, T //listbox l_box=new KNDialogListBox(false, this); - connect(l_box, TQT_SIGNAL(selected(int)), this, TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), this, TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); topL->addMultiCellWidget(l_box, 0,6, 0,0); // buttons a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn, 0,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn, 1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn, 2,1); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn, 4,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn, 5,1); topL->addRowSpacing(3,20); // separate up/down buttons @@ -1499,7 +1499,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader h_drC=new KComboBox(true, nameW); h_drC->lineEdit()->setMaxLength(64); - connect(h_drC, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + connect(h_drC, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); nameL->addWidget(new TQLabel(h_drC, i18n("H&eader:"),nameW),0,0); nameL->addWidget(h_drC,0,1); @@ -1551,7 +1551,7 @@ KNConfig::DisplayedHeaderConfDialog::DisplayedHeaderConfDialog(KNDisplayedHeader setFixedHeight(sizeHint().height()); KNHelper::restoreWindowSize("accReadHdrPropDLG", this, sizeHint()); - connect(n_ameE, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotNameChanged(const TQString&))); + connect(n_ameE, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotNameChanged(const TQString&))); setHelp("anc-knode-headers"); slotNameChanged( n_ameE->text() ); @@ -1610,13 +1610,13 @@ KNConfig::ScoringWidget::ScoringWidget( Scoring *d, TQWidget *p, const char *n ) TQLabel *l=new TQLabel(i_gnored, i18n("Default score for &ignored threads:"), this); topL->addWidget(l, 2, 0); topL->addWidget(i_gnored, 2, 1); - connect(i_gnored, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(i_gnored, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); w_atched=new KIntSpinBox(-100000, 100000, 1, 0, 10, this); l=new TQLabel(w_atched, i18n("Default score for &watched threads:"), this); topL->addWidget(l, 3, 0); topL->addWidget(w_atched, 3, 1); - connect(w_atched, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_atched, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); topL->setColStretch(0, 1); @@ -1658,24 +1658,24 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : f_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(f_lb, i18n("&Filters:"),this),0,0); - connect(f_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedFilter())); - connect(f_lb, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelectedFilter(int))); + connect(f_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedFilter())); + connect(f_lb, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelectedFilter(int))); topL->addMultiCellWidget(f_lb,1,5,0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), this); - connect(a_ddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddBtnClicked())); topL->addWidget(a_ddBtn,1,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), this); - connect(e_ditBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEditBtnClicked())); topL->addWidget(e_ditBtn,2,1); c_opyBtn=new TQPushButton(i18n("Co&py..."), this); - connect(c_opyBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCopyBtnClicked())); + connect(c_opyBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCopyBtnClicked())); topL->addWidget(c_opyBtn,3,1); d_elBtn=new TQPushButton(i18n("&Delete"), this); - connect(d_elBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDelBtnClicked())); topL->addWidget(d_elBtn,4,1); // == Menu ==================================================== @@ -1683,23 +1683,23 @@ KNConfig::FilterListWidget::FilterListWidget( TQWidget *p, const char *n ) : m_lb=new KNDialogListBox(false, this); topL->addWidget(new TQLabel(m_lb, i18n("&Menu:"),this),6,0); - connect(m_lb, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChangedMenu())); + connect(m_lb, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChangedMenu())); topL->addMultiCellWidget(m_lb,7,11,0,0); u_pBtn=new TQPushButton(i18n("&Up"), this); - connect(u_pBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUpBtnClicked())); + connect(u_pBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUpBtnClicked())); topL->addWidget(u_pBtn,7,1); d_ownBtn=new TQPushButton(i18n("Do&wn"), this); - connect(d_ownBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDownBtnClicked())); + connect(d_ownBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDownBtnClicked())); topL->addWidget(d_ownBtn,8,1); s_epAddBtn=new TQPushButton(i18n("Add\n&Separator"), this); - connect(s_epAddBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepAddBtnClicked())); + connect(s_epAddBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepAddBtnClicked())); topL->addWidget(s_epAddBtn,9,1); s_epRemBtn=new TQPushButton(i18n("&Remove\nSeparator"), this); - connect(s_epRemBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSepRemBtnClicked())); + connect(s_epRemBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSepRemBtnClicked())); topL->addWidget(s_epRemBtn,10,1); topL->setRowStretch(5,1); @@ -1946,21 +1946,21 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d c_harset->insertStringList(d->composerCharsets()); ggbL->addWidget(new TQLabel(c_harset, i18n("Cha&rset:"), ggb), 1,0); ggbL->addWidget(c_harset, 1,1); - connect(c_harset, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(c_harset, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); e_ncoding=new TQComboBox(ggb); e_ncoding->insertItem(i18n("Allow 8-bit")); e_ncoding->insertItem(i18n("7-bit (Quoted-Printable)")); ggbL->addWidget(new TQLabel(e_ncoding, i18n("Enco&ding:"), ggb), 2,0); ggbL->addWidget(e_ncoding, 2,1); - connect(e_ncoding, TQT_SIGNAL(activated(int)), TQT_SLOT(changed())); + connect(e_ncoding, TQ_SIGNAL(activated(int)), TQ_SLOT(changed())); u_seOwnCSCB=new TQCheckBox(i18n("Use o&wn default charset when replying"), ggb); ggbL->addMultiCellWidget(u_seOwnCSCB, 3,3, 0,1); - connect(u_seOwnCSCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(u_seOwnCSCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); g_enMIdCB=new TQCheckBox(i18n("&Generate message-id"), ggb); - connect(g_enMIdCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotGenMIdCBToggled(bool))); + connect(g_enMIdCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotGenMIdCBToggled(bool))); ggbL->addMultiCellWidget(g_enMIdCB, 4,4, 0,1); h_ost=new KLineEdit(ggb); h_ost->setEnabled(false); @@ -1969,7 +1969,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d ggbL->addWidget(h_ostL, 5,0); ggbL->addWidget(h_ost, 5,1); ggbL->setColStretch(1,1); - connect(h_ost, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(h_ost, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); // ==== X-Headers ============================================================= @@ -1980,20 +1980,20 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d xgbL->addRowSpacing(0, fontMetrics().lineSpacing()-4); l_box=new KNDialogListBox(false, xgb); - connect(l_box, TQT_SIGNAL(selected(int)), TQT_SLOT(slotItemSelected(int))); - connect(l_box, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(l_box, TQ_SIGNAL(selected(int)), TQ_SLOT(slotItemSelected(int))); + connect(l_box, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); xgbL->addMultiCellWidget(l_box, 1,4, 0,0); a_ddBtn=new TQPushButton(i18n("&Add..."), xgb); - connect(a_ddBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddBtnClicked())); + connect(a_ddBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddBtnClicked())); xgbL->addWidget(a_ddBtn, 1,1); d_elBtn=new TQPushButton(i18n("Dele&te"), xgb); - connect(d_elBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelBtnClicked())); + connect(d_elBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelBtnClicked())); xgbL->addWidget(d_elBtn, 2,1); e_ditBtn=new TQPushButton(i18n("modify something","&Edit..."), xgb); - connect(e_ditBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditBtnClicked())); + connect(e_ditBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditBtnClicked())); xgbL->addWidget(e_ditBtn, 3,1); TQLabel *placeHolders = new TQLabel(i18n("<qt>Placeholders for replies: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address</qt>"), xgb); @@ -2001,7 +2001,7 @@ KNConfig::PostNewsTechnicalWidget::PostNewsTechnicalWidget( PostNewsTechnical *d i_ncUaCB=new TQCheckBox(i18n("Do not add the \"&User-Agent\" identification header"), xgb); xgbL->addMultiCellWidget(i_ncUaCB, 6,6, 0,1); - connect(i_ncUaCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(i_ncUaCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); xgbL->setRowStretch(4,1); xgbL->setColStretch(0,1); @@ -2183,13 +2183,13 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T generalL->addWidget(w_ordWrapCB,1,0); m_axLen=new KIntSpinBox(20, 200, 1, 20, 10, generalB); generalL->addWidget(m_axLen,1,2); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), m_axLen, TQT_SLOT(setEnabled(bool))); - connect(w_ordWrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); - connect(m_axLen, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), m_axLen, TQ_SLOT(setEnabled(bool))); + connect(w_ordWrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); + connect(m_axLen, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); o_wnSigCB=new TQCheckBox(i18n("Appe&nd signature automatically"), generalB); generalL->addMultiCellWidget(o_wnSigCB,2,2,0,1); - connect(o_wnSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(o_wnSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); generalL->setColStretch(1,1); @@ -2205,19 +2205,19 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T replyL->addMultiCellWidget(new TQLabel(i_ntro,i18n("&Introduction phrase:"), replyB),1,1,0,1); replyL->addMultiCellWidget(i_ntro, 2,2,0,1); replyL->addMultiCellWidget(new TQLabel(i18n("<qt>Placeholders: <b>%NAME</b>=sender's name, <b>%EMAIL</b>=sender's address,<br><b>%DATE</b>=date, <b>%MSID</b>=message-id, <b>%GROUP</b>=group name, <b>%L</b>=line break</qt>"), replyB),3,3,0,1); - connect(i_ntro, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(i_ntro, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); r_ewrapCB=new TQCheckBox(i18n("Rewrap quoted te&xt automatically"), replyB); replyL->addMultiCellWidget(r_ewrapCB, 4,4,0,1); - connect(r_ewrapCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(r_ewrapCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); a_uthSigCB=new TQCheckBox(i18n("Include the a&uthor's signature"), replyB); replyL->addMultiCellWidget(a_uthSigCB, 5,5,0,1); - connect(a_uthSigCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(a_uthSigCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); c_ursorOnTopCB=new TQCheckBox(i18n("Put the cursor &below the introduction phrase"), replyB); replyL->addMultiCellWidget(c_ursorOnTopCB, 6,6,0,1); - connect(c_ursorOnTopCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(changed())); + connect(c_ursorOnTopCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(changed())); replyL->setColStretch(1,1); @@ -2233,15 +2233,15 @@ KNConfig::PostNewsComposerWidget::PostNewsComposerWidget( PostNewsComposer *d, T editorL->addWidget(new TQLabel(e_ditor, i18n("Specify edi&tor:"), editorB),1,0); editorL->addWidget(e_ditor,1,1); TQPushButton *btn = new TQPushButton(i18n("Choo&se..."),editorB); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotChooseEditor())); - connect(e_ditor, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(changed())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotChooseEditor())); + connect(e_ditor, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(changed())); editorL->addWidget(btn,1,2); editorL->addMultiCellWidget(new TQLabel(i18n("%f will be replaced with the filename to edit."), editorB),2,2,0,2); e_xternCB=new TQCheckBox(i18n("Start exte&rnal editor automatically"), editorB); editorL->addMultiCellWidget(e_xternCB, 3,3,0,2); - connect(e_xternCB, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); + connect(e_xternCB, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); editorL->setColStretch(1,1); @@ -2310,7 +2310,7 @@ KNConfig::PostNewsSpellingWidget::PostNewsSpellingWidget( TQWidget *p, const cha c_onf = new KSpellConfig( this, "spell", 0, false ); topL->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(configChanged()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(configChanged()), TQ_SLOT(changed())); topL->addStretch(1); } @@ -2335,7 +2335,7 @@ KNConfig::PrivacyWidget::PrivacyWidget(TQWidget *p, const char *n) : TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); c_onf = new Kpgp::Config(this,"knode pgp config",false); topLayout->addWidget(c_onf); - connect(c_onf, TQT_SIGNAL(changed()), TQT_SLOT(changed())); + connect(c_onf, TQ_SIGNAL(changed()), TQ_SLOT(changed())); topLayout->addStretch(1); @@ -2367,12 +2367,12 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren if (!mData->isGlobal()) { mDefault = new TQCheckBox( i18n("&Use global cleanup configuration"), this ); - connect( mDefault, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDefaultToggled(bool)) ); + connect( mDefault, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDefaultToggled(bool)) ); top->addWidget( mDefault ); } mExpGroup = new TQGroupBox( i18n("Newsgroup Cleanup Settings"), this ); - mExpGroup->setColumnLayout(0, Qt::Vertical ); + mExpGroup->setColumnLayout(0, TQt::Vertical ); mExpGroup->layout()->setSpacing( KDialog::spacingHint() ); mExpGroup->layout()->setMargin( KDialog::marginHint() ); top->addWidget( mExpGroup ); @@ -2382,38 +2382,38 @@ KNConfig::GroupCleanupWidget::GroupCleanupWidget( Cleanup *data, TQWidget *paren mExpEnabled = new TQCheckBox( i18n("&Expire old articles automatically"), mExpGroup ); grid->addMultiCellWidget( mExpEnabled, 1, 1, 0, 1 ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mExpDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); TQLabel *label = new TQLabel( mExpDays, i18n("&Purge groups every:"), mExpGroup ); grid->addWidget( label, 2, 0 ); grid->addWidget( mExpDays, 2, 1, TQt::AlignRight ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expDaysChanged(int)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), label, TQT_SLOT(setEnabled(bool)) ); - connect( mExpEnabled, TQT_SIGNAL(toggled(bool)), mExpDays, TQT_SLOT(setEnabled(bool)) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expDaysChanged(int)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), label, TQ_SLOT(setEnabled(bool)) ); + connect( mExpEnabled, TQ_SIGNAL(toggled(bool)), mExpDays, TQ_SLOT(setEnabled(bool)) ); mExpReadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpReadDays, i18n("&Keep read articles:"), mExpGroup ); grid->addWidget( label, 3, 0 ); grid->addWidget( mExpReadDays, 3, 1, TQt::AlignRight ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpReadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expReadDaysChanged(int)) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpReadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expReadDaysChanged(int)) ); mExpUnreadDays = new KIntSpinBox( 0, 99999, 1, 0, 10, mExpGroup ); label = new TQLabel( mExpUnreadDays, i18n("Keep u&nread articles:"), mExpGroup ); grid->addWidget( label, 4, 0 ); grid->addWidget( mExpUnreadDays, 4, 1, TQt::AlignRight ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(changed()) ); - connect( mExpUnreadDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(expUnreadDaysChanged(int)) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(changed()) ); + connect( mExpUnreadDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(expUnreadDaysChanged(int)) ); mExpUnavailable = new TQCheckBox( i18n("&Remove articles that are not available on the server"), mExpGroup ); grid->addMultiCellWidget( mExpUnavailable, 5, 5, 0, 1 ); - connect( mExpUnavailable, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mExpUnavailable, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); mPreserveThreads = new TQCheckBox( i18n("Preser&ve threads"), mExpGroup ); grid->addMultiCellWidget( mPreserveThreads, 6, 6, 0, 1 ); - connect( mPreserveThreads, TQT_SIGNAL(toggled(bool)), TQT_SIGNAL(changed()) ); + connect( mPreserveThreads, TQ_SIGNAL(toggled(bool)), TQ_SIGNAL(changed()) ); grid->setColStretch(1,1); } @@ -2476,12 +2476,12 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : mGroupCleanup = new GroupCleanupWidget( d_ata, this ); topL->addWidget( mGroupCleanup ); - connect( mGroupCleanup, TQT_SIGNAL(changed()), TQT_SLOT(changed()) ); + connect( mGroupCleanup, TQ_SIGNAL(changed()), TQ_SLOT(changed()) ); // === folders ========================================================= TQGroupBox *foldersB=new TQGroupBox(i18n("Folders"), this); - foldersB->setColumnLayout(0, Qt::Vertical ); + foldersB->setColumnLayout(0, TQt::Vertical ); foldersB->layout()->setSpacing( KDialog::spacingHint() ); foldersB->layout()->setMargin( KDialog::marginHint() ); @@ -2491,15 +2491,15 @@ KNConfig::CleanupWidget::CleanupWidget( TQWidget *p, const char *n ) : foldersL->setRowSpacing( 0, KDialog::spacingHint() ); f_olderCB=new TQCheckBox(i18n("Co&mpact folders automatically"), foldersB); - connect(f_olderCB, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotFolderCBtoggled(bool))); + connect(f_olderCB, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotFolderCBtoggled(bool))); foldersL->addMultiCellWidget(f_olderCB,1,1,0,1); f_olderDays=new KIntSpinBox(0, 99999, 1, 0, 10, foldersB); f_olderDaysL=new TQLabel(f_olderDays,i18n("P&urge folders every:"), foldersB); foldersL->addWidget(f_olderDaysL,2,0); foldersL->addWidget(f_olderDays,2,1,TQt::AlignRight); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(changed())); - connect(f_olderDays, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotFolderDaysChanged(int))); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(changed())); + connect(f_olderDays, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotFolderDaysChanged(int))); foldersL->setColStretch(1,1); diff --git a/knode/knconfigwidgets.h b/knode/knconfigwidgets.h index 1c9fbeab9..85c2ecd77 100644 --- a/knode/knconfigwidgets.h +++ b/knode/knconfigwidgets.h @@ -65,7 +65,7 @@ namespace KNConfig { class KDE_EXPORT IdentityWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -107,7 +107,7 @@ class KDE_EXPORT IdentityWidget : public TDECModule { class KDE_EXPORT NntpAccountListWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -155,7 +155,7 @@ class KDE_EXPORT NntpAccountListWidget : public TDECModule { class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -197,7 +197,7 @@ class KDE_EXPORT NntpAccountConfDialog : public KDialogBase { class KDE_EXPORT SmtpAccountWidget : public SmtpAccountWidgetBase { -Q_OBJECT +TQ_OBJECT public: @@ -219,7 +219,7 @@ Q_OBJECT class KDE_EXPORT AppearanceWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -348,7 +348,7 @@ class KDE_EXPORT ReadNewsNavigationWidget : public TDECModule { class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -375,7 +375,7 @@ class KDE_EXPORT ReadNewsViewerWidget : public TDECModule { class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -422,7 +422,7 @@ class KDE_EXPORT DisplayedHeadersWidget : public TDECModule { class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -447,7 +447,7 @@ class KDE_EXPORT DisplayedHeaderConfDialog : public KDialogBase { class KDE_EXPORT ScoringWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -468,7 +468,7 @@ class KDE_EXPORT ScoringWidget : public TDECModule { class KDE_EXPORT FilterListWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -534,7 +534,7 @@ class KDE_EXPORT FilterListWidget : public TDECModule { class KDE_EXPORT PostNewsTechnicalWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -588,7 +588,7 @@ class KDE_EXPORT XHeaderConfDialog : public KDialogBase { class KDE_EXPORT PostNewsComposerWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -634,7 +634,7 @@ class KDE_EXPORT PostNewsSpellingWidget : public TDECModule { class KDE_EXPORT PrivacyWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -654,7 +654,7 @@ class KDE_EXPORT PrivacyWidget : public TDECModule { /** Configuration widget for group expireration */ class KDE_EXPORT GroupCleanupWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: @@ -683,7 +683,7 @@ class KDE_EXPORT GroupCleanupWidget : public TQWidget { /** Global cleanup configuration widget */ class KDE_EXPORT CleanupWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: @@ -716,7 +716,7 @@ class KDE_EXPORT CleanupWidget : public TDECModule { /*class CacheWidget : public TDECModule { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knconvert.cpp b/knode/knconvert.cpp index 20a63ffa0..c8325f642 100644 --- a/knode/knconvert.cpp +++ b/knode/knconvert.cpp @@ -61,8 +61,8 @@ KNConvert::KNConvert(const TQString &version) c_ancelBtn=new KPushButton(KStdGuiItem::cancel(), this); btnL->addWidget(c_ancelBtn); - connect(s_tartBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart())); - connect(c_ancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject())); + connect(s_tartBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart())); + connect(c_ancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject())); w_1=new TQWidget(s_tack); s_tack->addWidget(w_1, 1); @@ -78,7 +78,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); c_reateBkup=new TQCheckBox(i18n("Create backup of old data"), w_1); w1L->addMultiCellWidget(c_reateBkup, 2,2, 0,2); - connect(c_reateBkup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCreateBkupToggled(bool))); + connect(c_reateBkup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotCreateBkupToggled(bool))); b_ackupPathLabel=new TQLabel(i18n("Save backup in:"), w_1); w1L->addWidget(b_ackupPathLabel, 3,0); @@ -87,7 +87,7 @@ will be created before the conversion starts.").arg(KNODE_VERSION), w_1); w1L->addWidget(b_ackupPath, 3,1); b_rowseBtn= new TQPushButton(i18n("Browse..."), w_1); - connect(b_rowseBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotBrowse())); + connect(b_rowseBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotBrowse())); w1L->addWidget(b_rowseBtn, 3,2); w1L->setColStretch(1,1); w1L->addRowSpacing(1,15); @@ -177,7 +177,7 @@ void KNConvert::slotStart() *t_ar << "tar"; *t_ar << "-cz" << dataDir << "-f" << b_ackupPath->text(); - connect(t_ar, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotTarExited(TDEProcess*))); + connect(t_ar, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotTarExited(TDEProcess*))); if(!t_ar->start()) { delete t_ar; t_ar = 0; diff --git a/knode/knconvert.h b/knode/knconvert.h index 3f87a25e2..56d2f13b3 100644 --- a/knode/knconvert.h +++ b/knode/knconvert.h @@ -34,7 +34,7 @@ class TDEProcess; class KDE_EXPORT KNConvert : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knfilterconfigwidget.h b/knode/knfilterconfigwidget.h index 680231b5c..634a679aa 100644 --- a/knode/knfilterconfigwidget.h +++ b/knode/knfilterconfigwidget.h @@ -26,7 +26,7 @@ class KNRangeFilterWidget; class KNFilterConfigWidget : public TQTabWidget { - Q_OBJECT + TQ_OBJECT friend class KNFilterDialog; diff --git a/knode/knfilterdialog.cpp b/knode/knfilterdialog.cpp index 6a0e972a4..b8471e6b8 100644 --- a/knode/knfilterdialog.cpp +++ b/knode/knfilterdialog.cpp @@ -78,7 +78,7 @@ KNFilterDialog::KNFilterDialog(KNArticleFilter *f, TQWidget *parent, const char KNHelper::restoreWindowSize("filterDLG", this, sizeHint()); setHelp("anc-using-filters"); - connect( fname, TQT_SIGNAL( textChanged ( const TQString & )), this, TQT_SLOT( slotTextChanged( const TQString & ))); + connect( fname, TQ_SIGNAL( textChanged ( const TQString & )), this, TQ_SLOT( slotTextChanged( const TQString & ))); slotTextChanged( fname->text() ); } diff --git a/knode/knfilterdialog.h b/knode/knfilterdialog.h index b17eaed63..969356398 100644 --- a/knode/knfilterdialog.h +++ b/knode/knfilterdialog.h @@ -28,7 +28,7 @@ class TQCheckBox; class KNFilterDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT friend class KNFilterManager; diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index eee045c28..a80853ea4 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -34,7 +34,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString : TDEActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); - connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); + connect(popupMenu(),TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotMenuActivated(int))); setDelayed(false); } @@ -383,10 +383,10 @@ void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA) { if(a) { a_ctFilter = a; - connect(a_ctFilter, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int))); + connect(a_ctFilter, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int))); } if(keybA) - connect(keybA, TQT_SIGNAL(activated()), this, TQT_SLOT(slotShowFilterChooser())); + connect(keybA, TQ_SIGNAL(activated()), this, TQ_SLOT(slotShowFilterChooser())); updateMenu(); } diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index fec9a9f72..b6df5280e 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -30,7 +30,7 @@ class KNFilterDialog; class KNFilterSelectAction : public TDEActionMenu { - Q_OBJECT + TQ_OBJECT public: @@ -53,7 +53,7 @@ class KNFilterSelectAction : public TDEActionMenu class KNFilterManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knfoldermanager.h b/knode/knfoldermanager.h index 9e817c23d..daf3e0ad1 100644 --- a/knode/knfoldermanager.h +++ b/knode/knfoldermanager.h @@ -25,7 +25,7 @@ class KNCleanUp; class KNFolderManager : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/kngroupbrowser.cpp b/knode/kngroupbrowser.cpp index f2379f51c..865dbd202 100644 --- a/knode/kngroupbrowser.cpp +++ b/knode/kngroupbrowser.cpp @@ -41,10 +41,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp { refilterTimer = new TQTimer(); - allList=new TQSortedList<KNGroupInfo>; - allList->setAutoDelete(true); - matchList=new TQSortedList<KNGroupInfo>; - matchList->setAutoDelete(false); + allList = new std::list<KNGroupInfo*>(); + matchList = new std::list<KNGroupInfo*>(); //create Widgets page=new TQWidget(this); @@ -89,8 +87,8 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp groupView->addColumn(i18n("Description")); groupView->setTreeStepSize(15); - connect(groupView, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotItemDoubleClicked(TQListViewItem*))); //layout TQGridLayout *topL=new TQGridLayout(page,3,1,0,5); @@ -121,22 +119,22 @@ KNGroupBrowser::KNGroupBrowser(TQWidget *parent, const TQString &caption, KNNntp arrL->addWidget(arrowBtn2, AlignCenter); //connect - connect(filterEdit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotFilterTextChanged(const TQString&))); - connect(groupView, TQT_SIGNAL(expanded(TQListViewItem*)), - TQT_SLOT(slotItemExpand(TQListViewItem*))); + connect(filterEdit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotFilterTextChanged(const TQString&))); + connect(groupView, TQ_SIGNAL(expanded(TQListViewItem*)), + TQ_SLOT(slotItemExpand(TQListViewItem*))); - connect(refilterTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotRefilter())); - connect(noTreeCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotTreeCBToggled())); - connect(subCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotSubCBToggled())); - connect(newCB, TQT_SIGNAL(clicked()), TQT_SLOT(slotNewCBToggled())); + connect(refilterTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotRefilter())); + connect(noTreeCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotTreeCBToggled())); + connect(subCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotSubCBToggled())); + connect(newCB, TQ_SIGNAL(clicked()), TQ_SLOT(slotNewCBToggled())); enableButton(User1,false); enableButton(User2,false); filterEdit->setFocus(); - TQTimer::singleShot(2, this, TQT_SLOT(slotLoadList())); + TQTimer::singleShot(2, this, TQ_SLOT(slotLoadList())); } @@ -148,7 +146,16 @@ KNGroupBrowser::~KNGroupBrowser() knGlobals.netAccess()->stopJobsNntp(KNJobData::JTCheckNewGroups); delete matchList; + + for (KNGroupInfo *g : *allList) + { + if (g) + { + delete g; + } + } delete allList; + delete refilterTimer; } @@ -159,6 +166,13 @@ void KNGroupBrowser::slotReceiveList(KNGroupListData* d) enableButton(User2,true); if (d) { // d==0 if something has gone wrong... + for (KNGroupInfo *g : *allList) + { + if (g) + { + delete g; + } + } delete allList; allList = d->extractList(); incrementalFilter=false; @@ -206,8 +220,8 @@ void KNGroupBrowser::createListItems(TQListViewItem *parent) } } - for(KNGroupInfo *gn=matchList->first(); gn; gn=matchList->next()) { - + for (KNGroupInfo *gn : *matchList) + { if(!prefix.isEmpty() && !gn->name.startsWith(prefix)) if(!compare.isNull()) break; @@ -287,7 +301,7 @@ void KNGroupBrowser::slotItemExpand(TQListViewItem *it) { groupView->ensureVisible(groupView->contentsX(), y+h/2, 0, h/2); delayedCenter = y+h/2; - TQTimer::singleShot(300, this, TQT_SLOT(slotCenterDelayed())); + TQTimer::singleShot(300, this, TQ_SLOT(slotCenterDelayed())); } } @@ -321,14 +335,14 @@ void KNGroupBrowser::slotFilter(const TQString &txt) bool doIncrementalUpdate = (!isRegexp && incrementalFilter && (filtertxt.left(lastFilter.length())==lastFilter)); if (doIncrementalUpdate) { - TQSortedList<KNGroupInfo> *tempList = new TQSortedList<KNGroupInfo>(); - tempList->setAutoDelete(false); + std::list<KNGroupInfo*> *tempList = new std::list<KNGroupInfo*>(); - for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) { + for (KNGroupInfo *g : *matchList) + { if ((notCheckSub||g->subscribed)&& (notCheckNew||g->newGroup)&& (notCheckStr||(g->name.find(filtertxt)!=-1))) - tempList->append(g); + tempList->push_back(g); } delete matchList; @@ -336,18 +350,20 @@ void KNGroupBrowser::slotFilter(const TQString &txt) } else { matchList->clear(); - for(KNGroupInfo *g=allList->first(); g; g=allList->next()) { + for (KNGroupInfo *g : *allList) + { if ((notCheckSub||g->subscribed)&& (notCheckNew||g->newGroup)&& (notCheckStr||(isRegexp? (reg.search(g->name,0) != -1):(g->name.find(filtertxt)!=-1)))) - matchList->append(g); + matchList->push_back(g); } } groupView->clear(); - if((matchList->count() < MIN_FOR_TREE) || noTreeCB->isChecked()) { - for(KNGroupInfo *g=matchList->first(); g; g=matchList->next()) { + if((matchList->size() < MIN_FOR_TREE) || noTreeCB->isChecked()) { + for (KNGroupInfo *g : *matchList) + { cit=new CheckItem(groupView, *g, this); updateItemState(cit); } @@ -358,7 +374,7 @@ void KNGroupBrowser::slotFilter(const TQString &txt) lastFilter = filtertxt; incrementalFilter = !isRegexp; - leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->count())); + leftLabel->setText(i18n("Groups on %1: (%2 displayed)").arg(a_ccount->name()).arg(matchList->size())); arrowBtn1->setEnabled(false); arrowBtn2->setEnabled(false); diff --git a/knode/kngroupbrowser.h b/knode/kngroupbrowser.h index a3df9a764..7470486ee 100644 --- a/knode/kngroupbrowser.h +++ b/knode/kngroupbrowser.h @@ -34,7 +34,7 @@ class KNNntpAccount; class KNGroupBrowser : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: @@ -98,7 +98,7 @@ class KNGroupBrowser : public KDialogBase { bool incrementalFilter; KNNntpAccount *a_ccount; - TQSortedList<KNGroupInfo> *allList, *matchList; + std::list<KNGroupInfo*> *allList, *matchList; protected slots: void slotLoadList(); diff --git a/knode/kngroupdialog.cpp b/knode/kngroupdialog.cpp index 8c9a17467..0fe1e7db3 100644 --- a/knode/kngroupdialog.cpp +++ b/knode/kngroupdialog.cpp @@ -51,17 +51,17 @@ KNGroupDialog::KNGroupDialog(TQWidget *parent, KNNntpAccount *a) : dir1=right; dir2=left; - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(subView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(unsubView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(subView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(unsubView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupDlg", this, TQSize(662,393)); // optimized for 800x600 @@ -121,18 +121,17 @@ void KNGroupDialog::updateItemState(CheckItem *it) -void KNGroupDialog::toSubscribe(TQSortedList<KNGroupInfo> *l) +void KNGroupDialog::toSubscribe(std::list<KNGroupInfo*> *l) { KNGroupInfo *info; l->clear(); - l->setAutoDelete(true); bool moderated=false; TQListViewItemIterator it(subView); for(; it.current(); ++it) { info = new KNGroupInfo(); *info = ((static_cast<GroupItem*>(it.current()))->info); - l->append(info); + l->push_back(info); if (info->status==KNGroup::moderated) moderated=true; } @@ -177,17 +176,17 @@ void KNGroupDialog::setButtonDirection(arrowButton b, arrowDirection d) void KNGroupDialog::slotItemSelected(TQListViewItem *it) { - const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject *s=sender(); - if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(subView)) { + if(s==subView) { unsubView->clearSelection(); groupView->clearSelection(); arrowBtn2->setEnabled(false); arrowBtn1->setEnabled(true); setButtonDirection(btn1, left); } - else if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(unsubView)) { + else if(s==unsubView) { subView->clearSelection(); groupView->clearSelection(); arrowBtn1->setEnabled(false); @@ -294,7 +293,7 @@ void KNGroupDialog::slotUser2() TQLabel *l = new TQLabel(TDEGlobal::locale()->formatDate(lastDate, false),btnGrp); topL->addWidget(l, 1, 1, TQt::AlignLeft); - connect(takeLast, TQT_SIGNAL(toggled(bool)), l, TQT_SLOT(setEnabled(bool))); + connect(takeLast, TQ_SIGNAL(toggled(bool)), l, TQ_SLOT(setEnabled(bool))); TQRadioButton *takeCustom = new TQRadioButton( i18n("Created since this date:"), btnGrp ); topL->addMultiCellWidget(takeCustom, 2, 2, 0, 1); @@ -303,7 +302,7 @@ void KNGroupDialog::slotUser2() dateSel->setMinimumSize(dateSel->sizeHint()); topL->addWidget(dateSel, 3, 1, TQt::AlignLeft); - connect(takeCustom, TQT_SIGNAL(toggled(bool)), dateSel, TQT_SLOT(setEnabled(bool))); + connect(takeCustom, TQ_SIGNAL(toggled(bool)), dateSel, TQ_SLOT(setEnabled(bool))); takeLast->setChecked(true); dateSel->setEnabled(false); diff --git a/knode/kngroupdialog.h b/knode/kngroupdialog.h index f9b5a5236..55398b70b 100644 --- a/knode/kngroupdialog.h +++ b/knode/kngroupdialog.h @@ -22,14 +22,14 @@ class KNGroupDialog : public KNGroupBrowser { - Q_OBJECT + TQ_OBJECT public: KNGroupDialog(TQWidget *parent, KNNntpAccount *a); ~KNGroupDialog(); - void toSubscribe(TQSortedList<KNGroupInfo> *l); + void toSubscribe(std::list<KNGroupInfo*> *l); void toUnsubscribe(TQStringList *l); protected: diff --git a/knode/kngroupmanager.cpp b/knode/kngroupmanager.cpp index b429bd6c8..e4c7aed6f 100644 --- a/knode/kngroupmanager.cpp +++ b/knode/kngroupmanager.cpp @@ -12,6 +12,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ +#include <algorithm> #include <stdio.h> #include <stdlib.h> #include <tqdir.h> @@ -74,6 +75,10 @@ bool KNGroupInfo::operator< (const KNGroupInfo &gi2) return (name < gi2.name); } +bool KNGroupInfo::PtrCompFn(KNGroupInfo *a, KNGroupInfo *b) +{ + return *a < *b; +} //=============================================================================== @@ -81,15 +86,24 @@ bool KNGroupInfo::operator< (const KNGroupInfo &gi2) KNGroupListData::KNGroupListData() : codecForDescriptions(0) { - groups = new TQSortedList<KNGroupInfo>; - groups->setAutoDelete(true); + groups = new std::list<KNGroupInfo*>(); } KNGroupListData::~KNGroupListData() { - delete groups; + if (groups) + { + for (KNGroupInfo *g : *groups) + { + if (g) + { + delete g; + } + } + delete groups; + } } @@ -145,7 +159,7 @@ bool KNGroupListData::readIn(KNProtocolClient *client) } else sub = false; - groups->append(new KNGroupInfo(name,description,false,sub,status)); + groups->push_back(new KNGroupInfo(name,description,false,sub,status)); if (timer.elapsed() > 200) { // don't flicker timer.restart(); @@ -169,7 +183,8 @@ bool KNGroupListData::writeOut() TQCString temp; if(f.open(IO_WriteOnly)) { - for (KNGroupInfo *i=groups->first(); i; i=groups->next()) { + for (KNGroupInfo *i : *groups) + { temp = i->name.utf8(); switch (i->status) { case KNGroup::unknown: temp += " u "; @@ -196,27 +211,33 @@ bool KNGroupListData::writeOut() // merge in new groups, we want to preserve the "subscribed"-flag // of the loaded groups and the "new"-flag of the new groups. -void KNGroupListData::merge(TQSortedList<KNGroupInfo>* newGroups) +void KNGroupListData::merge(std::list<KNGroupInfo*> *newGroups) { bool subscribed; - for (KNGroupInfo *i=newGroups->first(); i; i=newGroups->next()) { - if (groups->find(i)>=0) { - subscribed = groups->current()->subscribed; - groups->remove(); // avoid duplicates + for (KNGroupInfo *i : *newGroups) + { + std::list<KNGroupInfo*>::iterator ngIt = std::find(groups->begin(), groups->end(), i); + + if (ngIt != std::end(*groups)) + { + KNGroupInfo *newGr = *ngIt; + subscribed = newGr->subscribed; + groups->erase(ngIt); // avoid duplicates + delete newGr; } else subscribed = false; - groups->append(new KNGroupInfo(i->name,i->description,true,subscribed,i->status)); + groups->push_back(new KNGroupInfo(i->name,i->description,true,subscribed,i->status)); } - groups->sort(); + groups->sort(KNGroupInfo::PtrCompFn); } -TQSortedList<KNGroupInfo>* KNGroupListData::extractList() +std::list<KNGroupInfo*>* KNGroupListData::extractList() { - TQSortedList<KNGroupInfo>* temp = groups; - groups = 0; + std::list<KNGroupInfo*>* temp = groups; + groups = nullptr; return temp; } @@ -397,10 +418,10 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) { KNGroupDialog* gDialog=new KNGroupDialog((parent!=0)? parent:knGlobals.topWidget, a); - connect(gDialog, TQT_SIGNAL(loadList(KNNntpAccount*)), this, TQT_SLOT(slotLoadGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(fetchList(KNNntpAccount*)), this, TQT_SLOT(slotFetchGroupList(KNNntpAccount*))); - connect(gDialog, TQT_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQT_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); - connect(this, TQT_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQT_SLOT(slotReceiveList(KNGroupListData*))); + connect(gDialog, TQ_SIGNAL(loadList(KNNntpAccount*)), this, TQ_SLOT(slotLoadGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(fetchList(KNNntpAccount*)), this, TQ_SLOT(slotFetchGroupList(KNNntpAccount*))); + connect(gDialog, TQ_SIGNAL(checkNew(KNNntpAccount*,TQDate)), this, TQ_SLOT(slotCheckForNewGroups(KNNntpAccount*,TQDate))); + connect(this, TQ_SIGNAL(newListReady(KNGroupListData*)), gDialog, TQ_SLOT(slotReceiveList(KNGroupListData*))); if(gDialog->exec()) { KNGroup *g=0; @@ -417,10 +438,12 @@ void KNGroupManager::showGroupDialog(KNNntpAccount *a, TQWidget *parent) } } - TQSortedList<KNGroupInfo> lst2; + std::list<KNGroupInfo*> lst2; gDialog->toSubscribe(&lst2); - for(KNGroupInfo *var=lst2.first(); var; var=lst2.next()) { + for (KNGroupInfo *var : lst2) + { subscribeGroup(var, a); + delete var; } } @@ -593,12 +616,14 @@ void KNGroupManager::processJob(KNJobData *j) // update the descriptions of the subscribed groups for ( TQValueList<KNGroup*>::Iterator it = mGroupList.begin(); it != mGroupList.end(); ++it ) { if ( (*it)->account() == j->account() ) { - for ( KNGroupInfo* inf = d->groups->first(); inf; inf = d->groups->next() ) + for (KNGroupInfo *inf : *d->groups) + { if ( inf->name == (*it)->groupname() ) { (*it)->setDescription( inf->description ); (*it)->setStatus( inf->status ); break; } + } } } } diff --git a/knode/kngroupmanager.h b/knode/kngroupmanager.h index e35738301..06aa0b112 100644 --- a/knode/kngroupmanager.h +++ b/knode/kngroupmanager.h @@ -15,8 +15,9 @@ #ifndef KNGROUPMANAGER_H #define KNGROUPMANAGER_H +#include <list> + #include <tqobject.h> -#include <tqsortedlist.h> #include "knjobdata.h" #include "kngroup.h" @@ -48,6 +49,8 @@ class KNGroupInfo { bool operator== (const KNGroupInfo &gi2); bool operator< (const KNGroupInfo &gi2); + + static bool PtrCompFn(KNGroupInfo *a, KNGroupInfo *b); }; @@ -59,13 +62,13 @@ class KNGroupListData : public KNJobItem { bool readIn(KNProtocolClient *client=0); bool writeOut(); - void merge(TQSortedList<KNGroupInfo>* newGroups); + void merge(std::list<KNGroupInfo*> *newGroups); - TQSortedList<KNGroupInfo>* extractList(); + std::list<KNGroupInfo*>* extractList(); TQStringList subscribed; TQString path; - TQSortedList<KNGroupInfo> *groups; + std::list<KNGroupInfo*> *groups; TQDate fetchSince; bool getDescriptions; TQTextCodec *codecForDescriptions; @@ -77,7 +80,7 @@ class KNGroupListData : public KNJobItem { class KNGroupManager : public TQObject , public KNJobConsumer { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/kngrouppropdlg.cpp b/knode/kngrouppropdlg.cpp index a6a905786..5a7f52005 100644 --- a/knode/kngrouppropdlg.cpp +++ b/knode/kngrouppropdlg.cpp @@ -62,7 +62,7 @@ KNGroupPropDlg::KNGroupPropDlg(KNGroup *group, TQWidget *parent, const char *nam c_harset->insertStringList(knGlobals.configManager()->postNewsTechnical()->composerCharsets()); c_harset->setCurrentItem(knGlobals.configManager()->postNewsTechnical()->indexForCharset(g_rp->defaultCharset())); c_harset->setEnabled(g_rp->useCharset()); - connect(u_seCharset, TQT_SIGNAL(toggled(bool)), c_harset, TQT_SLOT(setEnabled(bool))); + connect(u_seCharset, TQ_SIGNAL(toggled(bool)), c_harset, TQ_SLOT(setEnabled(bool))); grpL->addWidget(c_harset, 2,2); grpL->setColStretch(1,1); diff --git a/knode/kngroupselectdialog.cpp b/knode/kngroupselectdialog.cpp index 3d137b8a1..10374d6d0 100644 --- a/knode/kngroupselectdialog.cpp +++ b/knode/kngroupselectdialog.cpp @@ -44,14 +44,14 @@ KNGroupSelectDialog::KNGroupSelectDialog(TQWidget *parent, KNNntpAccount *a, con new GroupItem(selView, info); } - connect(selView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(groupView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); - connect(arrowBtn1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn1())); - connect(arrowBtn2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotArrowBtn2())); + connect(selView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(groupView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); + connect(arrowBtn1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn1())); + connect(arrowBtn2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotArrowBtn2())); KNHelper::restoreWindowSize("groupSelDlg", this, TQSize(659,364)); // optimized for 800x600 } @@ -114,9 +114,9 @@ TQString KNGroupSelectDialog::selectedGroups()const void KNGroupSelectDialog::slotItemSelected(TQListViewItem *it) { - const TQObject *s=TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())); + const TQObject *s=sender(); - if(TQT_BASE_OBJECT_CONST(s)==TQT_BASE_OBJECT(groupView)) { + if(s==groupView) { selView->clearSelection(); arrowBtn2->setEnabled(false); if(it) diff --git a/knode/kngroupselectdialog.h b/knode/kngroupselectdialog.h index 177765bf6..ce00191cb 100644 --- a/knode/kngroupselectdialog.h +++ b/knode/kngroupselectdialog.h @@ -22,7 +22,7 @@ class KNGroupSelectDialog : public KNGroupBrowser { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knjobdata.cpp b/knode/knjobdata.cpp index 7d4ac9123..74d98a856 100644 --- a/knode/knjobdata.cpp +++ b/knode/knjobdata.cpp @@ -105,10 +105,10 @@ void KNJobData::setJob( TDEIO::Job *job ) { mJob = job; if ( job ) { - connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), - TQT_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), - TQT_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); + connect( job, TQ_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQ_SLOT( slotJobPercent(TDEIO::Job*, unsigned long) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job*, const TQString&) ), + TQ_SLOT( slotJobInfoMessage(TDEIO::Job*, const TQString&) ) ); } } diff --git a/knode/knjobdata.h b/knode/knjobdata.h index 70a78872a..571067443 100644 --- a/knode/knjobdata.h +++ b/knode/knjobdata.h @@ -70,7 +70,7 @@ class KNJobItem { class KNJobData : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 948ce37e4..35f976c48 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -106,9 +106,9 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //setView(a_rtDock); setMainDockWidget(a_rtDock); - connect(a_rtDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotArticleDockHidden())); - connect(a_rtDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotArticleDockHidden())); - connect( mArticleViewer, TQT_SIGNAL(focusChangeRequest(TQWidget*)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); + connect(a_rtDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotArticleDockHidden())); + connect(a_rtDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotArticleDockHidden())); + connect( mArticleViewer, TQ_SIGNAL(focusChangeRequest(TQWidget*)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget*)) ); //collection view c_olDock = createDockWidget("group_view", UserIcon("group"), 0, @@ -123,22 +123,22 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa c_olDock->setWidget(c_olView); c_olDock->manualDock(a_rtDock, KDockWidget::DockLeft, 3000); - connect(c_olDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotGroupDockHidden())); - connect(c_olView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(c_olView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotCollectionSelected(TQListViewItem*))); - connect(c_olView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(c_olView, TQT_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), - TQT_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); - connect(c_olView, TQT_SIGNAL(itemRenamed(TQListViewItem*)), - TQT_SLOT(slotCollectionRenamed(TQListViewItem*))); - - accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQT_SLOT(scrollUp()) ); - accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQT_SLOT(scrollDown()) ); - accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQT_SLOT(scrollPrior()) ); - accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQT_SLOT(scrollNext()) ); + connect(c_olDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotGroupDockHidden())); + connect(c_olView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(c_olView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotCollectionSelected(TQListViewItem*))); + connect(c_olView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotCollectionRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(c_olView, TQ_SIGNAL(folderDrop(TQDropEvent*, KNCollectionViewItem*)), + TQ_SLOT(slotCollectionViewDrop(TQDropEvent*, KNCollectionViewItem*))); + connect(c_olView, TQ_SIGNAL(itemRenamed(TQListViewItem*)), + TQ_SLOT(slotCollectionRenamed(TQListViewItem*))); + + accel->connectItem( accel->insertItem(Key_Up), mArticleViewer, TQ_SLOT(scrollUp()) ); + accel->connectItem( accel->insertItem(Key_Down), mArticleViewer, TQ_SLOT(scrollDown()) ); + accel->connectItem( accel->insertItem(Key_Prior), mArticleViewer, TQ_SLOT(scrollPrior()) ); + accel->connectItem( accel->insertItem(Key_Next), mArticleViewer, TQ_SLOT(scrollNext()) ); //header view h_drDock = createDockWidget("header_view", SmallIcon("text_block"), 0, @@ -171,25 +171,25 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa s_earchLineEdit = new TDEListViewSearchLine(q_uicksearch, h_drView, "TDEListViewSearchLine"); q_uicksearch->setStretchableWidget(s_earchLineEdit); lbl->setBuddy(s_earchLineEdit); - connect( resetQuickSearch, TQT_SIGNAL( activated() ), s_earchLineEdit, TQT_SLOT( clear() )); + connect( resetQuickSearch, TQ_SIGNAL( activated() ), s_earchLineEdit, TQ_SLOT( clear() )); vlay->addWidget(q_uicksearch); vlay->addWidget(h_drView); - connect(h_drDock, TQT_SIGNAL(iMBeingClosed()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drDock, TQT_SIGNAL(hasUndocked()), TQT_SLOT(slotHeaderDockHidden())); - connect(h_drView, TQT_SIGNAL(focusChangeRequest(TQWidget *)), - TQT_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); - connect(h_drView, TQT_SIGNAL(itemSelected(TQListViewItem*)), - TQT_SLOT(slotArticleSelected(TQListViewItem*))); - connect(h_drView, TQT_SIGNAL(selectionChanged()), - TQT_SLOT(slotArticleSelectionChanged())); - connect(h_drView, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); - connect(h_drView, TQT_SIGNAL(doubleClick(TQListViewItem *)), - TQT_SLOT(slotOpenArticle(TQListViewItem *))); - connect(h_drView, TQT_SIGNAL(sortingChanged(int)), - TQT_SLOT(slotHdrViewSortingChanged(int))); + connect(h_drDock, TQ_SIGNAL(iMBeingClosed()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drDock, TQ_SIGNAL(hasUndocked()), TQ_SLOT(slotHeaderDockHidden())); + connect(h_drView, TQ_SIGNAL(focusChangeRequest(TQWidget *)), + TQ_SLOT(slotDockWidgetFocusChangeRequest(TQWidget *))); + connect(h_drView, TQ_SIGNAL(itemSelected(TQListViewItem*)), + TQ_SLOT(slotArticleSelected(TQListViewItem*))); + connect(h_drView, TQ_SIGNAL(selectionChanged()), + TQ_SLOT(slotArticleSelectionChanged())); + connect(h_drView, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQ_SLOT(slotArticleRMB(TDEListView*, TQListViewItem*, const TQPoint&))); + connect(h_drView, TQ_SIGNAL(doubleClick(TQListViewItem *)), + TQ_SLOT(slotOpenArticle(TQListViewItem *))); + connect(h_drView, TQ_SIGNAL(sortingChanged(int)), + TQ_SLOT(slotHdrViewSortingChanged(int))); //actions initActions(); @@ -200,7 +200,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa //Network n_etAccess = knGlobals.netAccess(); - connect(n_etAccess, TQT_SIGNAL(netActive(bool)), this, TQT_SLOT(slotNetworkActive(bool))); + connect(n_etAccess, TQ_SIGNAL(netActive(bool)), this, TQ_SLOT(slotNetworkActive(bool))); //Filter Manager f_ilManager = knGlobals.filterManager(); @@ -225,8 +225,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa // Score Manager s_coreManager = knGlobals.scoringManager(); - //connect(s_coreManager, TQT_SIGNAL(changedRules()), TQT_SLOT(slotReScore())); - connect(s_coreManager, TQT_SIGNAL(finishedEditing()), TQT_SLOT(slotReScore())); + //connect(s_coreManager, TQ_SIGNAL(changedRules()), TQ_SLOT(slotReScore())); + connect(s_coreManager, TQ_SIGNAL(finishedEditing()), TQ_SLOT(slotReScore())); // Memory Manager m_emManager = knGlobals.memoryManager(); @@ -550,114 +550,114 @@ void KNMainWidget::initActions() //navigation a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "go-next", - i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView), - TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); + i18n("Go to next article")), "N;Right", h_drView, + TQ_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "go-previous", - i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView), - TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); - a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); - a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); - a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , TQT_TQOBJECT(c_olView), - TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); - a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , TQT_TQOBJECT(c_olView), - TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); - a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), - TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); + i18n("Go to previous article")), "P;Left" , h_drView, + TQ_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); + a_ctNavNextUnreadArt = new TDEAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , this, + TQ_SLOT(slotNavNextUnreadArt()), actionCollection(), "go_nextUnreadArticle"); + a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , this, + TQ_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); + a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "go-down", Key_Plus , c_olView, + TQ_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); + a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "go-up", Key_Minus , c_olView, + TQ_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); + a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , this, + TQ_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); a_ctNavReadThrough->plugAccel(a_ccel); TQAccel *accel = new TQAccel( this ); - new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), - TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); + new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, c_olView, + TQ_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Right), - c_olView, TQT_SLOT(incCurrentFolder())); - new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), - TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); + c_olView, TQ_SLOT(incCurrentFolder())); + new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, c_olView, + TQ_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Left), - c_olView, TQT_SLOT(decCurrentFolder())); - new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), - TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); + c_olView, TQ_SLOT(decCurrentFolder())); + new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, c_olView, + TQ_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Space), - c_olView, TQT_SLOT(selectCurrentFolder())); + c_olView, TQ_SLOT(selectCurrentFolder())); - new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), - TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); + new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, h_drView, + TQ_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Right), - TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) ); - new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), - TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); + h_drView, TQ_SLOT(incCurrentArticle()) ); + new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, h_drView, + TQ_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Left), - TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) ); - new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), - TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); + h_drView, TQ_SLOT(decCurrentArticle()) ); + new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, h_drView, + TQ_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Space), - TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) ); + h_drView, TQ_SLOT(selectCurrentArticle()) ); //collection-view - accounts - a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); - a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); - a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); - a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); - a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); - a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); - a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); - a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, TQT_TQOBJECT(this), - TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); + a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, this, + TQ_SLOT(slotAccProperties()), actionCollection(), "account_properties"); + a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, this, + TQ_SLOT(slotAccRename()), actionCollection(), "account_rename"); + a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, this, + TQ_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); + a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, this, + TQ_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); + a_ctAccGetNewHdrs = new TDEAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, this, + TQ_SLOT(slotAccGetNewHdrs()), actionCollection(), "account_dnlHeaders"); + a_ctAccGetNewHdrsAll = new TDEAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, this, + TQ_SLOT(slotAccGetNewHdrsAll()), actionCollection(), "account_dnlAllHeaders"); + a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "edit-delete", 0, this, + TQ_SLOT(slotAccDelete()), actionCollection(), "account_delete"); + a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail-message-new", CTRL+Key_N, this, + TQ_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups - a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); - a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); - a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); - a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); - a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); - a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); - a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); - a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); - a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); + a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, this, + TQ_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); + a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, this, + TQ_SLOT(slotGrpRename()), actionCollection(), "group_rename"); + a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, this, + TQ_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); + a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, this, + TQ_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); + a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, this, + TQ_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); + a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, this, + TQ_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); + a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, this, + TQ_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); + a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, this, + TQ_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); + a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, this, + TQ_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); (void) new TDEAction( i18n("&Configure KNode..."), - "configure", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotSettings()), actionCollection(), + "configure", 0, this, + TQ_SLOT(slotSettings()), actionCollection(), "knode_configure_knode" ); //collection-view - folder - a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolNew()), actionCollection(), "folder-new"); - a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); - a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); - a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); - a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); - a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); - a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); - a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); - a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); + a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder-new", 0, this, + TQ_SLOT(slotFolNew()), actionCollection(), "folder-new"); + a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder-new", 0, this, + TQ_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); + a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "edit-delete", 0, this, + TQ_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); + a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, this, + TQ_SLOT(slotFolRename()), actionCollection(), "folder_rename"); + a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, this, + TQ_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); + a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, this, + TQ_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); + a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, this, + TQ_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); + a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, this, + TQ_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); + a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, this, + TQ_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); //header-view - list-handling a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); @@ -669,96 +669,96 @@ void KNMainWidget::initActions() items += i18n("By &Date"); a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setShortcutConfigurable(false); - connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); - a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); + connect(a_ctArtSortHeaders, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotArtSortHeaders(int))); + a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , this, + TQ_SLOT(slotArtSortHeadersKeyb()), actionCollection(), "view_Sort_Keyb"); a_ctArtSortHeadersKeyb->plugAccel(a_ccel); a_ctArtFilter = new KNFilterSelectAction(i18n("&Filter"), "filter", actionCollection(), "view_Filter"); a_ctArtFilter->setShortcutConfigurable(false); a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); a_ctArtFilterKeyb->plugAccel(a_ccel); - a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); - a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), - TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); - a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); - a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); - a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); - a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); + a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , this, + TQ_SLOT(slotArtSearch()), actionCollection(), "article_search"); + a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), this, + TQ_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); + a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , this, + TQ_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); + a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , this, + TQ_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); + a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, this, + TQ_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); + a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , this, + TQ_SLOT(slotArtToggleShowThreads()), actionCollection(), "view_showThreads"); a_ctArtToggleShowThreads->setCheckedState(i18n("Hide T&hreads")); a_ctArtToggleShowThreads->setChecked(c_fgManager->readNewsGeneral()->showThreads()); //header-view - remote articles - a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); - a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); - a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); - a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); - a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , TQT_TQOBJECT(this), - TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); + a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , this, + TQ_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); + a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , this, + TQ_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); + a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , this, + TQ_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); + a_ctArtSetThreadUnread = new TDEAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , this, + TQ_SLOT(slotArtSetThreadUnread()), actionCollection(), "thread_unread"); + a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window-new", Key_O , this, + TQ_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring - a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); - a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotReScore()),actionCollection(),"rescore"); - a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); - a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), - TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); - a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); - a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , TQT_TQOBJECT(this), - TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); + a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, this, + TQ_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); + a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, this, + TQ_SLOT(slotReScore()),actionCollection(),"rescore"); + a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, this, + TQ_SLOT(slotScoreLower()), actionCollection(), "scorelower"); + a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, this, + TQ_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); + a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "go-bottom", Key_I , this, + TQ_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); + a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "go-top", Key_W , this, + TQ_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles - a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, TQT_TQOBJECT(this), - TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); - a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, TQT_TQOBJECT(this), - TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); - a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , TQT_TQOBJECT(this), - TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); - a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), - TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); + a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail-send", 0, this, + TQ_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); + a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "edit-delete", Key_Delete, this, + TQ_SLOT(slotArtDelete()), actionCollection(), "article_delete"); + a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail-send", 0 , this, + TQ_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); + a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , this, + TQ_SLOT(slotArtEdit()), actionCollection(), "article_edit"); //network - a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, TQT_TQOBJECT(this), - TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); + a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"process-stop",0, this, + TQ_SLOT(slotNetCancel()), actionCollection(), "net_stop"); a_ctNetCancel->setEnabled(false); - a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); + a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, this, + TQ_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); a_ctFetchArticleWithID->setEnabled(false); - a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); + a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, this, + TQ_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); - a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); + a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, this, + TQ_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); - a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), - TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); + a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, this, + TQ_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); - a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), - TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); + a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), this, + TQ_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); - a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); + a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , this, + TQ_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); a_ctSwitchToGroupView->plugAccel(a_ccel); - a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); + a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , this, + TQ_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); a_ctSwitchToHeaderView->plugAccel(a_ccel); - a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), - TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); + a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , this, + TQ_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); a_ctSwitchToArticleViewer->plugAccel(a_ccel); } @@ -2054,7 +2054,7 @@ FetchArticleIdDlg::FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ) edit->setFocus(); enableButtonOK( false ); setButtonOK( i18n("&Fetch") ); - connect( edit, TQT_SIGNAL(textChanged( const TQString & )), this, TQT_SLOT(slotTextChanged(const TQString & ))); + connect( edit, TQ_SIGNAL(textChanged( const TQString & )), this, TQ_SLOT(slotTextChanged(const TQString & ))); KNHelper::restoreWindowSize("fetchArticleWithID", this, TQSize(325,66)); } diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 418e0d3e6..7dabe226f 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -62,7 +62,7 @@ class TDEActionCollection; class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { - Q_OBJECT + TQ_OBJECT public: KNMainWidget( KXMLGUIClient *client, bool detachable, TQWidget* parent, const char* name ); @@ -413,7 +413,7 @@ private: class FetchArticleIdDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: FetchArticleIdDlg(TQWidget *parent, const char */*name*/ ); diff --git a/knode/knnetaccess.cpp b/knode/knnetaccess.cpp index 57488f717..b63ba859b 100644 --- a/knode/knnetaccess.cpp +++ b/knode/knnetaccess.cpp @@ -51,7 +51,7 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) } nntpNotifier=new TQSocketNotifier(nntpInPipe[0], TQSocketNotifier::Read); - connect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + connect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); // initialize the KSocks stuff in the main thread, otherwise we get // strange effects on FreeBSD @@ -60,14 +60,14 @@ KNNetAccess::KNNetAccess(TQObject *parent, const char *name ) nntpClient=new KNNntpClient(nntpOutPipe[0],nntpInPipe[1],nntp_Mutex); nntpClient->start(); - connect( knGlobals.accountManager(), TQT_SIGNAL(passwordsChanged()), TQT_SLOT(slotPasswordsChanged()) ); + connect( knGlobals.accountManager(), TQ_SIGNAL(passwordsChanged()), TQ_SLOT(slotPasswordsChanged()) ); } KNNetAccess::~KNNetAccess() { - disconnect(nntpNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotThreadSignal(int))); + disconnect(nntpNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotThreadSignal(int))); nntpClient->terminateClient(); triggerAsyncThread(nntpOutPipe[1]); @@ -95,7 +95,7 @@ void KNNetAccess::addJob(KNJobData *job) } job->createProgressItem(); - connect( job->progressItem(), TQT_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQT_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); + connect( job->progressItem(), TQ_SIGNAL(progressItemCanceled(KPIM::ProgressItem*)), TQ_SLOT(slotCancelJob(KPIM::ProgressItem*)) ); emit netActive( true ); // put jobs which are waiting for the wallet into an extra queue @@ -275,8 +275,8 @@ void KNNetAccess::startJobSmtp() destination.setPass( account->pass() ); } TDEIO::Job* job = TDEIO::storedPut( art->encodedContent(true), destination, -1, false, false, false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job*) ), - TQT_SLOT( slotJobResult(TDEIO::Job*) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job*) ), + TQ_SLOT( slotJobResult(TDEIO::Job*) ) ); if ( account->encryption() == KNServerInfo::TLS ) job->addMetaData( "tls", "on" ); else diff --git a/knode/knnetaccess.h b/knode/knnetaccess.h index e59d5e514..fb12949ee 100644 --- a/knode/knnetaccess.h +++ b/knode/knnetaccess.h @@ -36,7 +36,7 @@ class KNNntpClient; class KNNetAccess : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knnntpaccount.cpp b/knode/knnntpaccount.cpp index ba1657c0c..c5536c96a 100644 --- a/knode/knnntpaccount.cpp +++ b/knode/knnntpaccount.cpp @@ -46,7 +46,7 @@ void KNNntpAccountIntervalChecking::installTimer() if(!t_imer) { t_imer = new TQTimer(); - connect(t_imer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotCheckNews())); + connect(t_imer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotCheckNews())); } else { diff --git a/knode/knnntpaccount.h b/knode/knnntpaccount.h index 852fa9ab6..fd946438c 100644 --- a/knode/knnntpaccount.h +++ b/knode/knnntpaccount.h @@ -34,7 +34,7 @@ namespace KNConfig { class KNNntpAccountIntervalChecking : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knnntpclient.cpp b/knode/knnntpclient.cpp index 2ba465be3..0755dc969 100644 --- a/knode/knnntpclient.cpp +++ b/knode/knnntpclient.cpp @@ -15,6 +15,9 @@ */ #include <stdlib.h> +#include <algorithm> +#include <vector> + #include <tdelocale.h> #include <tqtextcodec.h> #include <tqmutex.h> @@ -132,7 +135,7 @@ void KNNntpClient::doFetchGroups() default : status = KNGroup::unknown; } - target->groups->append(new KNGroupInfo(name,TQString(),false,subscribed,status)); + target->groups->push_back(new KNGroupInfo(name,TQString(),false,subscribed,status)); } doneLines++; } @@ -140,15 +143,18 @@ void KNNntpClient::doFetchGroups() if (!job->success() || job->canceled()) return; // stopped... - TQSortedVector<KNGroupInfo> tempVector; - target->groups->toVector(&tempVector); - tempVector.sort(); + std::vector<KNGroupInfo*> tempVector; + for (KNGroupInfo *g : *target->groups) + { + tempVector.push_back(g); + } + std::sort(tempVector.begin(), tempVector.end(), KNGroupInfo::PtrCompFn); if (target->getDescriptions) { errorPrefix = i18n("The group descriptions could not be retrieved.\nThe following error occurred:\n"); progressValue = 100; doneLines = 0; - predictedLines = target->groups->count(); + predictedLines = target->groups->size(); sendSignal(TSdownloadDesc); sendSignal(TSprogressUpdate); @@ -189,8 +195,11 @@ void KNNntpClient::doFetchGroups() description = TQString::fromLocal8Bit(s); info.name = name; - if ((pos=tempVector.bsearch(&info))!=-1) - tempVector[pos]->description = description; + if (std::binary_search(tempVector.begin(), tempVector.end(), &info, KNGroupInfo::PtrCompFn)) + { + KNGroupInfo *posGroup = *std::lower_bound(tempVector.begin(), tempVector.end(), &info, KNGroupInfo::PtrCompFn); + posGroup->description = description; + } } doneLines++; } @@ -200,9 +209,11 @@ void KNNntpClient::doFetchGroups() return; // stopped... } - target->groups->setAutoDelete(false); - tempVector.toList(target->groups); - target->groups->setAutoDelete(true); + target->groups->clear(); + for (KNGroupInfo *g : tempVector) + { + target->groups->push_back(g); + } sendSignal(TSwriteGrouplist); if (!target->writeOut()) @@ -229,8 +240,7 @@ void KNNntpClient::doCheckNewGroups() char *s, *line; TQString name; KNGroup::Status status; - TQSortedList<KNGroupInfo> tmpList; - tmpList.setAutoDelete(true); + std::list<KNGroupInfo*> tmpList; while (getNextLine()) { line = getCurrentLine(); @@ -261,19 +271,23 @@ void KNNntpClient::doCheckNewGroups() default : status = KNGroup::unknown; } - tmpList.append(new KNGroupInfo(name,TQString(),true,false,status)); + tmpList.push_back(new KNGroupInfo(name,TQString(),true,false,status)); } doneLines++; } + bool statusOk = true; + if (!job->success() || job->canceled()) - return; // stopped... + { + statusOk = false; // stopped... + } - if (target->getDescriptions) { + if (statusOk && target->getDescriptions) { errorPrefix = i18n("The group descriptions could not be retrieved.\nThe following error occurred:\n"); progressValue = 100; doneLines = 0; - predictedLines = tmpList.count()*3; + predictedLines = tmpList.size()*3; sendSignal(TSdownloadDesc); sendSignal(TSprogressUpdate); @@ -283,14 +297,21 @@ void KNNntpClient::doCheckNewGroups() char *s; int rep; - for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) { + for (KNGroupInfo *group : tmpList) + { if (!sendCommand(cmd+group->name.utf8(),rep)) - return; + { + statusOk = false; + break; + } if (rep != 215) // 215 informations follows break; desList.clear(); if (!getMsg(desList)) - return; + { + statusOk = false; + break; + } if (desList.count()>0) { // group has a description s = desList.first(); @@ -310,17 +331,26 @@ void KNNntpClient::doCheckNewGroups() } } - sendSignal(TSloadGrouplist); + if (statusOk) + { + sendSignal(TSloadGrouplist); - if (!target->readIn()) { - job->setErrorString(i18n("Unable to read the group list file")); - return; + if (!target->readIn()) { + job->setErrorString(i18n("Unable to read the group list file")); + } + else + { + target->merge(&tmpList); + sendSignal(TSwriteGrouplist); + if (!target->writeOut()) { + job->setErrorString(i18n("Unable to write the group list file")); + } + } } - target->merge(&tmpList); - sendSignal(TSwriteGrouplist); - if (!target->writeOut()) { - job->setErrorString(i18n("Unable to write the group list file")); - return; + + for (KNGroupInfo *group : tmpList) + { + delete group; } } diff --git a/knode/knode.cpp b/knode/knode.cpp index 175d1845f..51f4f1278 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -46,17 +46,17 @@ KNMainWindow::KNMainWindow( TQWidget* pWidget ) setStandardToolBarMenuEnabled(true); //config stuff - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(closeAllWindows()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfToolbar()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfKeys()), actionCollection()); + KStdAction::quit(kapp, TQ_SLOT(closeAllWindows()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfKeys()), actionCollection()); m_mainWidget = new KNMainWidget( this, true, this, 0 ); - connect( m_mainWidget, TQT_SIGNAL(signalCaptionChangeRequest(const TQString&)), - TQT_SLOT( setCaption(const TQString&)) ); + connect( m_mainWidget, TQ_SIGNAL(signalCaptionChangeRequest(const TQString&)), + TQ_SLOT( setCaption(const TQString&)) ); setCentralWidget( m_mainWidget ); setupStatusBar(); - connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL(statusMsg(const TQString&)), - this, TQT_SLOT(slotShowStatusMsg(const TQString& )) ); + connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL(statusMsg(const TQString&)), + this, TQ_SLOT(slotShowStatusMsg(const TQString& )) ); createGUI( "knodeui.rc" ); knGlobals.instance = 0; @@ -77,7 +77,7 @@ void KNMainWindow::slotConfToolbar() { saveMainWindowSettings(knGlobals.config(),"mainWindow_options"); KEditToolbar dlg(actionCollection(), "knodeui.rc"); - connect(&dlg,TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg,TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } diff --git a/knode/knode.h b/knode/knode.h index f4bbf19fa..3d1c79937 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -43,7 +43,7 @@ class KNHeaderView; class KNMainWindow : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knode_part.cpp b/knode/knode_part.cpp index c5169a5b3..028a267d3 100644 --- a/knode/knode_part.cpp +++ b/knode/knode_part.cpp @@ -68,13 +68,13 @@ KNodePart::KNodePart(TQWidget *parentWidget, const char *widgetName, // create a canvas to insert our widget TQWidget *canvas = new TQWidget(parentWidget, widgetName); - canvas->setFocusPolicy(TQ_ClickFocus); + canvas->setFocusPolicy(TQWidget::ClickFocus); setWidget(canvas); mainWidget = new KNMainWidget( this, false, canvas, "knode_widget" ); TQVBoxLayout *topLayout = new TQVBoxLayout(canvas); topLayout->addWidget(mainWidget); - mainWidget->setFocusPolicy(TQ_ClickFocus); + mainWidget->setFocusPolicy(TQWidget::ClickFocus); kapp->dcopClient()->resume(); // Ok. We are ready for DCOP requests. diff --git a/knode/knode_part.h b/knode/knode_part.h index b1136db44..99f810c58 100644 --- a/knode/knode_part.h +++ b/knode/knode_part.h @@ -41,7 +41,7 @@ class KNMainWidget; class KNodePart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT public: KNodePart(TQWidget *parentWidget, const char *widgetName, diff --git a/knode/knrangefilter.cpp b/knode/knrangefilter.cpp index f5aa55938..a74a48df8 100644 --- a/knode/knrangefilter.cpp +++ b/knode/knrangefilter.cpp @@ -134,9 +134,9 @@ KNRangeFilterWidget::KNRangeFilterWidget(const TQString& value, int min, int max topL->setColStretch(1,1); topL->setColStretch(5,1); - connect(op1, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp1Changed(int))); - connect(op2, TQT_SIGNAL(activated(int)), TQT_SLOT(slotOp2Changed(int))); - connect(enabled, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotEnabled(bool))); + connect(op1, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp1Changed(int))); + connect(op2, TQ_SIGNAL(activated(int)), TQ_SLOT(slotOp2Changed(int))); + connect(enabled, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotEnabled(bool))); slotEnabled(false); } diff --git a/knode/knrangefilter.h b/knode/knrangefilter.h index 1a1f4ebcc..f5c429f3e 100644 --- a/knode/knrangefilter.h +++ b/knode/knrangefilter.h @@ -62,7 +62,7 @@ class KNRangeFilter { class KNRangeFilterWidget : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knscoring.h b/knode/knscoring.h index 1e0c8c37b..83d332fe1 100644 --- a/knode/knscoring.h +++ b/knode/knscoring.h @@ -60,7 +60,7 @@ public: class KNScoringManager : public KScoringManager { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knsearchdialog.cpp b/knode/knsearchdialog.cpp index b38e06507..646969ee9 100644 --- a/knode/knsearchdialog.cpp +++ b/knode/knsearchdialog.cpp @@ -60,9 +60,9 @@ KNSearchDialog::KNSearchDialog(searchType /*t*/, TQWidget *parent) topL->addLayout(filterL, 1); topL->addWidget(bg); - connect(startBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStartClicked())); - connect(newBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNewClicked())); - connect(closeBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCloseClicked())); + connect(startBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStartClicked())); + connect(newBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNewClicked())); + connect(closeBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotCloseClicked())); f_ilter=new KNArticleFilter(); f_ilter->setLoaded(true); diff --git a/knode/knsearchdialog.h b/knode/knsearchdialog.h index 37b12eb3a..fac2f1be2 100644 --- a/knode/knsearchdialog.h +++ b/knode/knsearchdialog.h @@ -27,7 +27,7 @@ class KNArticleFilter; class KNSearchDialog : public TQDialog { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knsourceviewwindow.cpp b/knode/knsourceviewwindow.cpp index 71af3c18e..651bc1e80 100644 --- a/knode/knsourceviewwindow.cpp +++ b/knode/knsourceviewwindow.cpp @@ -27,7 +27,7 @@ KNSourceViewWindow::KNSourceViewWindow( const TQString &text ) { setWFlags(WType_TopLevel | WDestructiveClose); TQAccel *accel = new TQAccel( this, "browser close-accel" ); - accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQT_SLOT( close() )); + accel->connectItem( accel->insertItem( TQt::Key_Escape ), this , TQ_SLOT( close() )); KNConfig::Appearance *app=knGlobals.configManager()->appearance(); setTextFormat( PlainText ); diff --git a/knode/knsourceviewwindow.h b/knode/knsourceviewwindow.h index 595a1a998..2007a1a37 100644 --- a/knode/knsourceviewwindow.h +++ b/knode/knsourceviewwindow.h @@ -20,7 +20,7 @@ class KNSourceViewWindow : public KTextBrowser { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knstatusfilter.cpp b/knode/knstatusfilter.cpp index ec098d9cc..d770ae22c 100644 --- a/knode/knstatusfilter.cpp +++ b/knode/knstatusfilter.cpp @@ -116,7 +116,7 @@ KNStatusFilterWidget::KNStatusFilterWidget(TQWidget *parent) : topL->setColStretch(2,1); topL->setRowStretch(4,1); - connect(this, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotEnabled(int))); + connect(this, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotEnabled(int))); } diff --git a/knode/knstatusfilter.h b/knode/knstatusfilter.h index cb949fb74..39ad9d912 100644 --- a/knode/knstatusfilter.h +++ b/knode/knstatusfilter.h @@ -53,7 +53,7 @@ class KNStatusFilter { class KNStatusFilterWidget : public TQButtonGroup { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knstringfilter.h b/knode/knstringfilter.h index 8552d0871..64df03404 100644 --- a/knode/knstringfilter.h +++ b/knode/knstringfilter.h @@ -57,7 +57,7 @@ class KNStringFilter { class KNStringFilterWidget : public TQGroupBox { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/knwidgets.cpp b/knode/knwidgets.cpp index b4c9a160c..3e1d8deca 100644 --- a/knode/knwidgets.cpp +++ b/knode/knwidgets.cpp @@ -110,7 +110,7 @@ void KNDialogListBox::keyPressEvent(TQKeyEvent *e) KNDockWidgetHeaderDrag::KNDockWidgetHeaderDrag(TQWidget *focusWidget, KDockWidgetAbstractHeader* parent, KDockWidget* dock, const char* name ) : KDockWidgetHeaderDrag(parent, dock, name), f_ocus(false) { - connect(focusWidget, TQT_SIGNAL(focusChanged(TQFocusEvent*)), TQT_SLOT(slotFocusChanged(TQFocusEvent*))); + connect(focusWidget, TQ_SIGNAL(focusChanged(TQFocusEvent*)), TQ_SLOT(slotFocusChanged(TQFocusEvent*))); } diff --git a/knode/knwidgets.h b/knode/knwidgets.h index dcdfe35b2..53b4b8539 100644 --- a/knode/knwidgets.h +++ b/knode/knwidgets.h @@ -68,7 +68,7 @@ class KNDialogListBox : public TQListBox class KNDockWidgetHeaderDrag : public KDockWidgetHeaderDrag { - Q_OBJECT + TQ_OBJECT public: diff --git a/knode/smtpaccountwidget_base.ui b/knode/smtpaccountwidget_base.ui index 702ce90d3..8913c5095 100644 --- a/knode/smtpaccountwidget_base.ui +++ b/knode/smtpaccountwidget_base.ui @@ -143,9 +143,6 @@ <property name="text"> <string>None</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -154,9 +151,6 @@ <property name="text"> <string>SSL</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton"> <property name="name"> @@ -165,9 +159,6 @@ <property name="text"> <string>TLS</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </vbox> </widget> @@ -219,10 +210,10 @@ <slot>changed()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">useExternalMailerToggled(bool)</slot> <slot access="protected">loginToggled(bool)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in declaration">tdecmodule.h</include> diff --git a/knode/utilities.h b/knode/utilities.h index e88ca6955..f20d99e1c 100644 --- a/knode/utilities.h +++ b/knode/utilities.h @@ -20,8 +20,6 @@ #include <tqfile.h> #include <tqglobal.h> -#include <tqptrvector.h> -#include <tqptrlist.h> class TQWidget; class TQString; @@ -36,25 +34,6 @@ class KTempFile; // utility classes //***************************************************************************** -/** clone of TQSortedList... */ -template<class type> class TQ_EXPORT TQSortedVector : public TQPtrVector<type> -{ -public: - TQSortedVector() {} - TQSortedVector ( uint size ) : TQPtrVector<type>(size) {} - TQSortedVector( const TQSortedVector<type> &l ) : TQPtrVector<type>(l) {} - ~TQSortedVector() { TQPtrVector<type>::clear(); } - TQSortedVector<type> &operator=(const TQSortedVector<type> &l) - { return (TQSortedVector<type>&)TQPtrList<type>::operator=(l); } - - virtual int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) - { if ( *((type*)s1) == *((type*)s2) ) return 0; return ( *((type*)s1) < *((type*)s2) ? -1 : 1 ); } -}; - - -//============================================================================== - - class KNFile : public TQFile { public: @@ -63,7 +42,7 @@ class KNFile : public TQFile { const TQCString& readLine(); const TQCString& readLineWnewLine(); /** searches for the string from the current file position - returns -1 when the string wasn't found. */ + returns -1 when the string wasn't found. */ int findString(const char *s); protected: |