diff options
author | Timothy Pearson <[email protected]> | 2013-02-01 15:14:12 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-01 15:14:12 -0600 |
commit | fd5d099065a748cac49e20a13481f85666c53c71 (patch) | |
tree | a0f1672cd88eb0e69b9ddc2ed9b08ecd98538bd3 /knode | |
parent | b440a9c608596cd88efdb3bfa4661c5e37efbe4b (diff) | |
download | tdepim-fd5d099065a748cac49e20a13481f85666c53c71.tar.gz tdepim-fd5d099065a748cac49e20a13481f85666c53c71.zip |
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'knode')
-rw-r--r-- | knode/articlewidget.cpp | 62 | ||||
-rw-r--r-- | knode/articlewidget.h | 54 | ||||
-rw-r--r-- | knode/headerview.cpp | 16 | ||||
-rw-r--r-- | knode/headerview.h | 8 | ||||
-rw-r--r-- | knode/knarticlewindow.cpp | 4 | ||||
-rw-r--r-- | knode/knarticlewindow.h | 2 | ||||
-rw-r--r-- | knode/kncollectionview.cpp | 4 | ||||
-rw-r--r-- | knode/kncollectionview.h | 4 | ||||
-rw-r--r-- | knode/kncomposer.cpp | 76 | ||||
-rw-r--r-- | knode/kncomposer.h | 24 | ||||
-rw-r--r-- | knode/knconfigwidgets.cpp | 4 | ||||
-rw-r--r-- | knode/knfiltermanager.cpp | 4 | ||||
-rw-r--r-- | knode/knfiltermanager.h | 4 | ||||
-rw-r--r-- | knode/knhdrviewitem.cpp | 6 | ||||
-rw-r--r-- | knode/knhdrviewitem.h | 2 | ||||
-rw-r--r-- | knode/knmainwidget.cpp | 188 | ||||
-rw-r--r-- | knode/knmainwidget.h | 48 | ||||
-rw-r--r-- | knode/knode.cpp | 2 | ||||
-rw-r--r-- | knode/knode.h | 2 |
19 files changed, 257 insertions, 257 deletions
diff --git a/knode/articlewidget.cpp b/knode/articlewidget.cpp index 91ba87ac5..6e7c4f613 100644 --- a/knode/articlewidget.cpp +++ b/knode/articlewidget.cpp @@ -77,7 +77,7 @@ TQValueList<ArticleWidget*> ArticleWidget::mInstances; ArticleWidget::ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, const char *name ) : TQWidget( parent, name ), mArticle( 0 ), @@ -141,78 +141,78 @@ void ArticleWidget::initActions() mSelectAllAction = KStdAction::selectAll( TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), mActionCollection ); mFindAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT(slotFind()), mActionCollection, "find_in_article" ); mFindAction->setText( i18n("F&ind in Article...") ); - mViewSourceAction = new KAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), + mViewSourceAction = new TDEAction( i18n("&View Source"), Key_V , TQT_TQOBJECT(this), TQT_SLOT(slotViewSource()), mActionCollection, "article_viewSource" ); - mReplyAction = new KAction( i18n("&Followup to Newsgroup..."), "message_reply", + mReplyAction = new TDEAction( i18n("&Followup to Newsgroup..."), "message_reply", Key_R, TQT_TQOBJECT(this), TQT_SLOT(slotReply()), mActionCollection, "article_postReply" ); - mRemailAction = new KAction( i18n("Reply by E&mail..."), "mail_reply", + mRemailAction = new TDEAction( i18n("Reply by E&mail..."), "mail_reply", Key_A, TQT_TQOBJECT(this), TQT_SLOT(slotRemail()), mActionCollection, "article_mailReply" ); - mForwardAction = new KAction( i18n("Forw&ard by Email..."), "mail_forward", + mForwardAction = new TDEAction( i18n("Forw&ard by Email..."), "mail_forward", Key_F, TQT_TQOBJECT(this), TQT_SLOT(slotForward()), mActionCollection, "article_forward" ); - mCancelAction = new KAction( i18n("article","&Cancel Article"), + mCancelAction = new TDEAction( i18n("article","&Cancel Article"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotCancel()), mActionCollection, "article_cancel" ); - mSupersedeAction = new KAction(i18n("S&upersede Article"), + mSupersedeAction = new TDEAction(i18n("S&upersede Article"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSupersede()), mActionCollection, "article_supersede" ); - mFixedFontToggle = new KToggleAction( i18n("U&se Fixed Font"), + mFixedFontToggle = new TDEToggleAction( i18n("U&se Fixed Font"), Key_X ,TQT_TQOBJECT(this), TQT_SLOT(slotToggleFixedFont()), mActionCollection, "view_useFixedFont" ); - mFancyToggle = new KToggleAction( i18n("Fancy Formating"), + mFancyToggle = new TDEToggleAction( i18n("Fancy Formating"), Key_Y, TQT_TQOBJECT(this), TQT_SLOT(slotToggleFancyFormating()), mActionCollection, "view_fancyFormating" ); - mRot13Toggle = new KToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), + mRot13Toggle = new TDEToggleAction( i18n("&Unscramble (Rot 13)"), "decrypted", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleRot13()), mActionCollection, "view_rot13" ); mRot13Toggle->setChecked( false ); - KRadioAction *ra; - mHeaderStyleMenu = new KActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); - ra = new KRadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), + TDERadioAction *ra; + mHeaderStyleMenu = new TDEActionMenu( i18n("&Headers"), mActionCollection, "view_headers" ); + ra = new TDERadioAction( i18n("&Fancy Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFancyHeaders()), mActionCollection, "view_headers_fancy" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), + ra = new TDERadioAction( i18n("&Standard Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotStandardHeaders()), mActionCollection, "view_headers_standard" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), + ra = new TDERadioAction( i18n("&All Headers"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAllHeaders()), mActionCollection, "view_headers_all" ); ra->setExclusiveGroup( "view_headers" ); mHeaderStyleMenu->insert( ra ); - mAttachmentStyleMenu = new KActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); - ra = new KRadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), + mAttachmentStyleMenu = new TDEActionMenu( i18n("&Attachments"), mActionCollection, "view_attachments" ); + ra = new TDERadioAction( i18n("&As Icon"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotIconAttachments()), mActionCollection, "view_attachments_icon" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), + ra = new TDERadioAction( i18n("&Inline"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInlineAttachments()), mActionCollection, "view_attachments_inline" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - ra = new KRadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), + ra = new TDERadioAction( i18n("&Hide"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotHideAttachments()), mActionCollection, "view_attachments_hide" ); ra->setExclusiveGroup( "view_attachments" ); mAttachmentStyleMenu->insert( ra ); - mCharsetSelect = new KSelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); + mCharsetSelect = new TDESelectAction( i18n("Chars&et"), 0, mActionCollection, "set_charset" ); mCharsetSelect->setShortcutConfigurable( false ); TQStringList cs = TDEGlobal::charsets()->descriptiveEncodingNames(); cs.prepend( i18n("Automatic") ); mCharsetSelect->setItems( cs ); mCharsetSelect->setCurrentItem( 0 ); connect( mCharsetSelect, TQT_SIGNAL(activated(const TQString&)),TQT_SLOT(slotSetCharset(const TQString&)) ); - mCharsetSelectKeyb = new KAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), + mCharsetSelectKeyb = new TDEAction( i18n("Charset"), Key_C, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharsetKeyboard()), mActionCollection, "set_charset_keyboard" ); - new KAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), + new TDEAction( i18n("&Open URL"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenURL()), mActionCollection, "open_url" ); - new KAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), + new TDEAction( i18n("&Copy Link Address"), "editcopy", 0, TQT_TQOBJECT(this), TQT_SLOT( slotCopyURL()), mActionCollection, "copy_url" ); - new KAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + new TDEAction( i18n("&Bookmark This Link"), "bookmark_add", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), mActionCollection, "add_bookmark" ); - new KAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), + new TDEAction( i18n("&Add to Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddToAddressBook()), mActionCollection, "add_addr_book" ); - new KAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), + new TDEAction( i18n("&Open in Address Book"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenInAddressBook()), mActionCollection, "openin_addr_book" ); - new KAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), + new TDEAction( i18n("&Open Attachment"), "fileopen", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOpenAttachment()), mActionCollection, "open_attachment" ); - new KAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), + new TDEAction( i18n("&Save Attachment As..."), "filesaveas", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveAttachment()), mActionCollection, "save_attachment" ); } @@ -289,10 +289,10 @@ void ArticleWidget::readConfig() conf->setGroup( "READNEWS" ); mAttachmentStyle = conf->readEntry( "attachmentStyle", "inline" ); mHeaderStyle = conf->readEntry( "headerStyle", "fancy" ); - KRadioAction *ra = 0; - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); + TDERadioAction *ra = 0; + ra = static_cast<TDERadioAction*>( mActionCollection->action( TQString("view_attachments_%1").arg(mAttachmentStyle).latin1() ) ); ra->setChecked( true ); - ra = static_cast<KRadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); + ra = static_cast<TDERadioAction*>( mActionCollection->action( TQString("view_headers_%1").arg(mHeaderStyle).latin1() ) ); ra->setChecked( true ); delete mCSSHelper; diff --git a/knode/articlewidget.h b/knode/articlewidget.h index 2a508ee72..cc1cac20b 100644 --- a/knode/articlewidget.h +++ b/knode/articlewidget.h @@ -27,13 +27,13 @@ class TQStringList; class TQTimer; -class KAction; -class KActionCollection; -class KActionMenu; +class TDEAction; +class TDEActionCollection; +class TDEActionMenu; class TDEHTMLPart; class KURL; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KXMLGUIClient; namespace Kpgp { @@ -59,7 +59,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { /// Construct a new article widget ArticleWidget( TQWidget *parent, KXMLGUIClient *guiClient, - KActionCollection *actionCollection, + TDEActionCollection *actionCollection, const char *name = 0 ); ~ArticleWidget(); @@ -73,7 +73,7 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { /// returns the currently shown article KNArticle *article() const { return mArticle; } - KAction* setCharsetKeyboardAction() const { return mCharsetSelectKeyb; } + TDEAction* setCharsetKeyboardAction() const { return mCharsetSelectKeyb; } /// notify all instances about a config change static void configChanged(); @@ -243,26 +243,26 @@ class ArticleWidget : public TQWidget, public KNJobConsumer { static TQValueList<ArticleWidget*> mInstances; KXMLGUIClient *mGuiClient; - KActionCollection *mActionCollection; - - KAction *mSaveAction; - KAction *mPrintAction; - KAction *mCopySelectionAction; - KAction *mSelectAllAction; - KAction *mFindAction; - KAction *mViewSourceAction; - KAction *mCharsetSelectKeyb; - KAction *mReplyAction; - KAction *mRemailAction; - KAction *mForwardAction; - KAction *mCancelAction; - KAction *mSupersedeAction; - KActionMenu *mHeaderStyleMenu; - KActionMenu *mAttachmentStyleMenu; - KToggleAction *mFixedFontToggle; - KToggleAction *mFancyToggle; - KToggleAction *mRot13Toggle; - KSelectAction *mCharsetSelect; + TDEActionCollection *mActionCollection; + + TDEAction *mSaveAction; + TDEAction *mPrintAction; + TDEAction *mCopySelectionAction; + TDEAction *mSelectAllAction; + TDEAction *mFindAction; + TDEAction *mViewSourceAction; + TDEAction *mCharsetSelectKeyb; + TDEAction *mReplyAction; + TDEAction *mRemailAction; + TDEAction *mForwardAction; + TDEAction *mCancelAction; + TDEAction *mSupersedeAction; + TDEActionMenu *mHeaderStyleMenu; + TDEActionMenu *mAttachmentStyleMenu; + TDEToggleAction *mFixedFontToggle; + TDEToggleAction *mFancyToggle; + TDEToggleAction *mRot13Toggle; + TDESelectAction *mCharsetSelect; }; } diff --git a/knode/headerview.cpp b/knode/headerview.cpp index 9995ba465..6bfea7042 100644 --- a/knode/headerview.cpp +++ b/knode/headerview.cpp @@ -33,7 +33,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : - KListView(parent,name), + TDEListView(parent,name), mSortCol( -1 ), mSortAsc( true ), mSortByThreadChangeDate( false ), @@ -70,7 +70,7 @@ KNHeaderView::KNHeaderView(TQWidget *parent, const char *name) : TQT_SLOT(slotSizeChanged(int, int, int)) ); // column selection RMB menu - mPopup = new KPopupMenu( this ); + mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); mPopup->insertItem( i18n("Line Count"), KPaintInfo::COL_SIZE ); @@ -213,7 +213,7 @@ void KNHeaderView::setSorting( int column, bool ascending ) emit sortingChanged( column ); } - KListView::setSorting( column, ascending ); + TDEListView::setSorting( column, ascending ); if ( currentItem() ) ensureItemVisible( currentItem() ); @@ -458,7 +458,7 @@ bool KNHeaderView::event( TQEvent *e ) if (e->type() == TQEvent::ApplicationPaletteChange) return TQListView::event(e); else - return KListView::event(e); + return TDEListView::event(e); } void KNHeaderView::contentsMousePressEvent( TQMouseEvent *e ) @@ -470,7 +470,7 @@ void KNHeaderView::contentsMousePressEvent( TQMouseEvent *e ) TQPoint vp = contentsToViewport(e->pos()); TQListViewItem *i = itemAt(vp); - KListView::contentsMousePressEvent( e ); + TDEListView::contentsMousePressEvent( e ); if ( i ) { int decoLeft = header()->sectionPos( 0 ) + @@ -495,7 +495,7 @@ void KNHeaderView::contentsMouseDoubleClickEvent( TQMouseEvent *e ) return; } - KListView::contentsMouseDoubleClickEvent( e ); + TDEListView::contentsMouseDoubleClickEvent( e ); } @@ -517,7 +517,7 @@ void KNHeaderView::keyPressEvent(TQKeyEvent *e) break; default: - KListView::keyPressEvent (e); + TDEListView::keyPressEvent (e); } } @@ -555,7 +555,7 @@ bool KNHeaderView::eventFilter(TQObject *o, TQEvent *e) return true; } - return KListView::eventFilter(o, e); + return TDEListView::eventFilter(o, e); } diff --git a/knode/headerview.h b/knode/headerview.h index 78e6f2a65..4a297c817 100644 --- a/knode/headerview.h +++ b/knode/headerview.h @@ -21,10 +21,10 @@ #include <kfoldertree.h> #include <kmime_util.h> -class KPopupMenu; +class TDEPopupMenu; class KNHdrViewItem; -class KNHeaderView : public KListView { +class KNHeaderView : public TDEListView { Q_OBJECT @@ -73,7 +73,7 @@ class KNHeaderView : public KListView { protected: void activeRemoved() { mActiveItem = 0; } /** - * Reimplemented to avoid that KListview reloads the alternate + * Reimplemented to avoid that TDEListview reloads the alternate * background on palette changes. */ virtual bool event( TQEvent *e ); @@ -93,7 +93,7 @@ class KNHeaderView : public KListView { KNHdrViewItem *mActiveItem; KPaintInfo mPaintInfo; KMime::DateFormatter mDateFormatter; - KPopupMenu *mPopup; + TDEPopupMenu *mPopup; bool mShowingFolder; bool mInitDone; diff --git a/knode/knarticlewindow.cpp b/knode/knarticlewindow.cpp index a45cf7735..22e37171d 100644 --- a/knode/knarticlewindow.cpp +++ b/knode/knarticlewindow.cpp @@ -86,7 +86,7 @@ bool KNArticleWindow::raiseWindowForArticle(const TQCString &mid) //================================================================================== KNArticleWindow::KNArticleWindow(KNArticle *art) - : KMainWindow(0, "articleWindow") + : TDEMainWindow(0, "articleWindow") { if(knGlobals.instance) setInstance(knGlobals.instance); @@ -106,7 +106,7 @@ KNArticleWindow::KNArticleWindow(KNArticle *art) // settings menu KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); - KAccel *accel = new KAccel( this ); + TDEAccel *accel = new TDEAccel( this ); artW->setCharsetKeyboardAction()->plugAccel( accel ); setupGUI( ToolBar|Keys|Create, "knreaderui.rc"); diff --git a/knode/knarticlewindow.h b/knode/knarticlewindow.h index 2fa102860..5feafa033 100644 --- a/knode/knarticlewindow.h +++ b/knode/knarticlewindow.h @@ -24,7 +24,7 @@ namespace KNode { class ArticleWidget; } -class KNArticleWindow : public KMainWindow { +class KNArticleWindow : public TDEMainWindow { Q_OBJECT diff --git a/knode/kncollectionview.cpp b/knode/kncollectionview.cpp index 56fe429f6..2f45a30ad 100644 --- a/knode/kncollectionview.cpp +++ b/knode/kncollectionview.cpp @@ -46,7 +46,7 @@ KNCollectionView::KNCollectionView(TQWidget *parent, const char* name) : // popup menu to enable/disable unread and total columns header()->setClickEnabled( true ); header()->installEventFilter( this ); - mPopup = new KPopupMenu( this ); + mPopup = new TDEPopupMenu( this ); mPopup->insertTitle( i18n("View Columns") ); mPopup->setCheckable( true ); mUnreadPop = mPopup->insertItem( i18n("Unread Column"), this, TQT_SLOT(toggleUnreadColumn()) ); @@ -377,7 +377,7 @@ TQDragObject* KNCollectionView::dragObject() void KNCollectionView::contentsDropEvent( TQDropEvent *e ) { - cleanItemHighlighter(); // necessary since we overwrite KListView::contentsDropEvent() + cleanItemHighlighter(); // necessary since we overwrite TDEListView::contentsDropEvent() TQListViewItem *item = itemAt( contentsToViewport(e->pos()) ); KNCollectionViewItem *fti = static_cast<KNCollectionViewItem*>(item); if (fti && (fti->coll) && acceptDrag(e)) { diff --git a/knode/kncollectionview.h b/knode/kncollectionview.h index 44d6ab3af..74a6e25ee 100644 --- a/knode/kncollectionview.h +++ b/knode/kncollectionview.h @@ -18,7 +18,7 @@ #include <kfoldertree.h> -class KPopupMenu; +class TDEPopupMenu; class KNNntpAccount; class KNGroup; class KNFolder; @@ -86,7 +86,7 @@ class KNCollectionView : public KFolderTree { private: TQListViewItem *mActiveItem; - KPopupMenu *mPopup; + TDEPopupMenu *mPopup; int mUnreadPop, mTotalPop; }; diff --git a/knode/kncomposer.cpp b/knode/kncomposer.cpp index 6a31f805c..555d224aa 100644 --- a/knode/kncomposer.cpp +++ b/knode/kncomposer.cpp @@ -21,7 +21,7 @@ #include "addressesdialog.h" using KPIM::AddressesDialog; #include "recentaddresses.h" -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; #include <kaccel.h> #include <kcharsets.h> #include <kmessagebox.h> @@ -85,7 +85,7 @@ TQPopupMenu *KNLineEdit::createPopupMenu() void KNLineEdit::editRecentAddresses() { - KRecentAddress::RecentAddressDialog dlg( this ); + TDERecentAddress::RecentAddressDialog dlg( this ); dlg.setAddresses( RecentAddresses::self( knGlobals.config() )->addresses() ); if ( dlg.exec() ) { RecentAddresses::self( knGlobals.config() )->clear(); @@ -164,7 +164,7 @@ void KNLineEditSpell::spellCheckerCorrected( const TQString &old, const TQString KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString &sig, const TQString &unwraped, bool firstEdit, bool dislikesCopies, bool createCopy) - : KMainWindow(0,"composerWindow"), r_esult(CRsave), a_rticle(a), s_ignature(sig), u_nwraped(unwraped), + : TDEMainWindow(0,"composerWindow"), r_esult(CRsave), a_rticle(a), s_ignature(sig), u_nwraped(unwraped), n_eeds8Bit(true), v_alidated(false), a_uthorDislikesMailCopies(dislikesCopies), e_xternalEdited(false), e_xternalEditor(0), e_ditorTempfile(0), s_pellChecker(0), a_ttChanged(false), mFirstEdit( firstEdit ) @@ -205,16 +205,16 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & //------------------------------- <Actions> -------------------------------------- //file menu - new KAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this), + new TDEAction(i18n("&Send Now"),"mail_send", CTRL + Key_Return , TQT_TQOBJECT(this), TQT_SLOT(slotSendNow()), actionCollection(), "send_now"); - new KAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Send &Later"), "queue", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSendLater()), actionCollection(), "send_later"); - new KAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this), + new TDEAction(i18n("Save as &Draft"),"filesave", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotSaveAsDraft()), actionCollection(), "save_as_draft"); - new KAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this), + new TDEAction(i18n("D&elete"),"editdelete", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtDelete()), actionCollection(), "art_delete"); KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()),actionCollection()); @@ -230,7 +230,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::pasteText(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); - new KAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Paste as &Quotation"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotPasteAsQuotation()), actionCollection(), "paste_quoted"); KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT(slotSelectAll()), actionCollection()); @@ -241,73 +241,73 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::replace(TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotReplace()), actionCollection()); //attach menu - new KAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), + new TDEAction(i18n("Append &Signature"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotAppendSig()), actionCollection(), "append_signature"); - new KAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), + new TDEAction(i18n("&Insert File..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFile()), actionCollection(), "insert_file"); - new KAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), + new TDEAction(i18n("Insert File (in a &box)..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotInsertFileBoxed()), actionCollection(), "insert_file_boxed"); - new KAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), + new TDEAction(i18n("Attach &File..."), "attach", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachFile()), actionCollection(), "attach_file"); - a_ctPGPsign = new KToggleAction(i18n("Sign Article with &PGP"), + a_ctPGPsign = new TDEToggleAction(i18n("Sign Article with &PGP"), "signature", 0, actionCollection(), "sign_article"); - a_ctRemoveAttachment = new KAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), + a_ctRemoveAttachment = new TDEAction(i18n("&Remove"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveAttachment()), actionCollection(), "remove_attachment"); - a_ctAttachmentProperties = new KAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), + a_ctAttachmentProperties = new TDEAction(i18n("&Properties"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAttachmentProperties()), actionCollection(), "attachment_properties"); //options menu - a_ctDoPost = new KToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this), + a_ctDoPost = new TDEToggleAction(i18n("Send &News Article"), "filenew", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleDoPost()), actionCollection(), "send_news"); - a_ctDoMail = new KToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), + a_ctDoMail = new TDEToggleAction(i18n("Send E&mail"), "mail_generic" , 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleDoMail()), actionCollection(), "send_mail"); - a_ctSetCharset = new KSelectAction(i18n("Set &Charset"), 0, actionCollection(), "set_charset"); + 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&))); - a_ctSetCharsetKeyb = new KAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), + a_ctSetCharsetKeyb = new TDEAction(i18n("Set Charset"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSetCharsetKeyboard()), actionCollection(), "set_charset_keyboard"); - a_ctWordWrap = new KToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), + a_ctWordWrap = new TDEToggleAction(i18n("&Word Wrap"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotToggleWordWrap()), actionCollection(), "toggle_wordwrap"); //tools menu - new KAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Add &Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote"); - new KAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("&Remove Quote Characters"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote"); - new KAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Add &Box"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotAddBox()), actionCollection(), "tools_box"); - new KAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), + new TDEAction(i18n("Re&move Box"), 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRemoveBox()), actionCollection(), "tools_unbox"); - KAction *undoRewrap = new KAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), + TDEAction *undoRewrap = new TDEAction(i18n("Get &Original Text (not re-wrapped)"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotUndoRewrap()), actionCollection(), "tools_undoRewrap"); undoRewrap->setEnabled(!u_nwraped.isNull()); - KAction *rot13 = new KAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), + TDEAction *rot13 = new TDEAction(i18n("S&cramble (Rot 13)"), "encrypted", 0, TQT_TQOBJECT(v_iew->e_dit), TQT_SLOT(slotRot13()), actionCollection(), "tools_rot13"); rot13->setEnabled(false); connect(v_iew->e_dit, TQT_SIGNAL(copyAvailable(bool)), rot13, TQT_SLOT(setEnabled(bool))); - a_ctExternalEditor = new KAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this), + a_ctExternalEditor = new TDEAction(i18n("Start &External Editor"), "run", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExternalEditor()), actionCollection(), "external_editor"); a_ctSpellCheck = KStdAction::spelling (TQT_TQOBJECT(this), TQT_SLOT(slotSpellcheck()), actionCollection()); @@ -322,7 +322,7 @@ KNComposer::KNComposer(KNLocalArticle *a, const TQString &text, const TQString & KStdAction::preferences(TQT_TQOBJECT(knGlobals.top), TQT_SLOT(slotSettings()), actionCollection()); - a_ccel=new KAccel(this); + a_ccel=new TDEAccel(this); a_ctSetCharsetKeyb->plugAccel(a_ccel); createGUI("kncomposerui.rc", false); @@ -418,7 +418,7 @@ int KNComposer::listOfResultOfCheckWord( const TQStringList & lst , const TQStri { if ( !(*it).isEmpty() ) // in case of removed subtypes or placeholders { - KAction * act = new KAction( *it ); + TDEAction * act = new TDEAction( *it ); connect( act, TQT_SIGNAL(activated()), v_iew->e_dit, TQT_SLOT(slotCorrectWord()) ); m_listAction.append( act ); @@ -1547,7 +1547,7 @@ void KNComposer::slotCancelEditor() } -void KNComposer::slotAttachmentPopup(KListView*, TQListViewItem *it, const TQPoint &p) +void KNComposer::slotAttachmentPopup(TDEListView*, TQListViewItem *it, const TQPoint &p) { if(it) a_ttPopup->popup(p); @@ -1911,8 +1911,8 @@ void KNComposer::ComposerView::showAttachmentView() connect(a_ttView, TQT_SIGNAL(clicked ( TQListViewItem * )), parent(), TQT_SLOT(slotAttachmentSelected(TQListViewItem*))); - connect(a_ttView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - parent(), TQT_SLOT(slotAttachmentPopup(KListView*, TQListViewItem*, const TQPoint&))); + 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*)), @@ -2054,7 +2054,7 @@ bool KNComposer::Editor::eventFilter(TQObject*o, TQEvent* e) //Continue if this word was misspelled if( !word.isEmpty() && m_replacements.contains( word ) ) { - KPopupMenu p; + TDEPopupMenu p; p.insertTitle( i18n("Suggestions") ); //Add the suggestions to the popup menu @@ -2476,7 +2476,7 @@ void KNComposer::Editor::slotMisspelling (const TQString &, const TQStringList & void KNComposer::Editor::slotCorrectWord() { removeSelectedText(); - KAction * act = (KAction *)(sender()); + TDEAction * act = (TDEAction *)(sender()); int line, col; getCursorPosition(&line,&col); @@ -2491,7 +2491,7 @@ void KNComposer::Editor::slotCorrectWord() KNComposer::AttachmentView::AttachmentView(TQWidget *parent, char *name) - : KListView(parent, name) + : TDEListView(parent, name) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); // match the TQMultiLineEdit style addColumn(i18n("File"), 115); @@ -2517,15 +2517,15 @@ void KNComposer::AttachmentView::keyPressEvent(TQKeyEvent *e) if( (e->key()==Key_Delete) && (currentItem()) ) emit(delPressed(currentItem())); else - KListView::keyPressEvent(e); + TDEListView::keyPressEvent(e); } //===================================================================================== -KNComposer::AttachmentViewItem::AttachmentViewItem(KListView *v, KNAttachment *a) : - KListViewItem(v), attachment(a) +KNComposer::AttachmentViewItem::AttachmentViewItem(TDEListView *v, KNAttachment *a) : + TDEListViewItem(v), attachment(a) { setText(0, a->name()); setText(1, a->mimeType()); diff --git a/knode/kncomposer.h b/knode/kncomposer.h index e41a40f11..2f136f11c 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -34,14 +34,14 @@ class TQGroupBox; class TDEProcess; class KSpell; class KDictSpellingHighlighter; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; class KNLocalArticle; class KNAttachment; class SpellingFilter; -class KNComposer : public KMainWindow , virtual public KNodeComposerIface { +class KNComposer : public TDEMainWindow , virtual public KNodeComposerIface { Q_OBJECT @@ -110,20 +110,20 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { //Attachments TQValueList<KNAttachment*> mDeletedAttachments; - TQPtrList<KAction> m_listAction; + TQPtrList<TDEAction> m_listAction; bool a_ttChanged; //------------------------------ <Actions> ----------------------------- - KAccel *a_ccel; - KAction *a_ctExternalEditor, + TDEAccel *a_ccel; + TDEAction *a_ctExternalEditor, *a_ctSpellCheck, *a_ctRemoveAttachment, *a_ctAttachmentProperties, *a_ctSetCharsetKeyb; - KToggleAction *a_ctPGPsign, + TDEToggleAction *a_ctPGPsign, *a_ctDoPost, *a_ctDoMail, *a_ctWordWrap; - KSelectAction *a_ctSetCharset; + TDESelectAction *a_ctSetCharset; bool spellLineEdit; protected slots: void slotSendNow(); @@ -164,7 +164,7 @@ class KNComposer : public KMainWindow , virtual public KNodeComposerIface { void slotCancelEditor(); // attachment list - void slotAttachmentPopup(KListView*, TQListViewItem *it, const TQPoint &p); + void slotAttachmentPopup(TDEListView*, TQListViewItem *it, const TQPoint &p); void slotAttachmentSelected(TQListViewItem *it); void slotAttachmentEdit(TQListViewItem *it); void slotAttachmentRemove(TQListViewItem *it); @@ -302,7 +302,7 @@ private: }; -class KNComposer::AttachmentView : public KListView { +class KNComposer::AttachmentView : public TDEListView { Q_OBJECT @@ -319,10 +319,10 @@ class KNComposer::AttachmentView : public KListView { }; -class KNComposer::AttachmentViewItem : public KListViewItem { +class KNComposer::AttachmentViewItem : public TDEListViewItem { public: - AttachmentViewItem(KListView *v, KNAttachment *a); + AttachmentViewItem(TDEListView *v, KNAttachment *a); ~AttachmentViewItem(); KNAttachment *attachment; diff --git a/knode/knconfigwidgets.cpp b/knode/knconfigwidgets.cpp index 8a1c3fbcb..48447cbc1 100644 --- a/knode/knconfigwidgets.cpp +++ b/knode/knconfigwidgets.cpp @@ -964,9 +964,9 @@ void KNConfig::AppearanceWidget::slotFontItemSelected(TQListBoxItem *it) if (it) { FontListItem *fontItem = static_cast<FontListItem*>(it); TQFont font = fontItem->font(); - int result = KFontDialog::getFont(font,false,this); + int result = TDEFontDialog::getFont(font,false,this); - if (result == KFontDialog::Accepted) { + if (result == TDEFontDialog::Accepted) { fontItem->setFont(font); f_List->triggerUpdate(false); } diff --git a/knode/knfiltermanager.cpp b/knode/knfiltermanager.cpp index 16ff8ce3a..b7401f1ac 100644 --- a/knode/knfiltermanager.cpp +++ b/knode/knfiltermanager.cpp @@ -31,7 +31,7 @@ KNFilterSelectAction::KNFilterSelectAction( const TQString& text, const TQString& pix, TQObject* parent, const char *name ) - : KActionMenu(text,pix,parent,name), currentItem(-42) + : TDEActionMenu(text,pix,parent,name), currentItem(-42) { popupMenu()->setCheckable(true); connect(popupMenu(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotMenuActivated(int))); @@ -379,7 +379,7 @@ void KNFilterManager::slotShowFilterChooser() } -void KNFilterManager::setMenuAction(KNFilterSelectAction *a, KAction *keybA) +void KNFilterManager::setMenuAction(KNFilterSelectAction *a, TDEAction *keybA) { if(a) { a_ctFilter = a; diff --git a/knode/knfiltermanager.h b/knode/knfiltermanager.h index 5bf974546..3172ce788 100644 --- a/knode/knfiltermanager.h +++ b/knode/knfiltermanager.h @@ -28,7 +28,7 @@ class KNArticleFilter; class KNFilterDialog; -class KNFilterSelectAction : public KActionMenu +class KNFilterSelectAction : public TDEActionMenu { Q_OBJECT @@ -79,7 +79,7 @@ class KNFilterManager : public TQObject // Allow to delay the setup of UI elements, since the knode part may not // be available when the config dialog is called - void setMenuAction(KNFilterSelectAction *a, KAction *keybA); + void setMenuAction(KNFilterSelectAction *a, TDEAction *keybA); protected: void loadFilters(); diff --git a/knode/knhdrviewitem.cpp b/knode/knhdrviewitem.cpp index 6330b89ab..1e31a1b9f 100644 --- a/knode/knhdrviewitem.cpp +++ b/knode/knhdrviewitem.cpp @@ -29,14 +29,14 @@ KNHdrViewItem::KNHdrViewItem( KNHeaderView *ref, KNArticle *a ) : - KListViewItem( ref ) + TDEListViewItem( ref ) { init( a ); } KNHdrViewItem::KNHdrViewItem( KNHdrViewItem *ref, KNArticle *a ) : - KListViewItem( ref ) + TDEListViewItem( ref ) { init( a ); } @@ -235,7 +235,7 @@ TQString KNHdrViewItem::text( int col ) const if ( col == hv->paintInfo()->dateCol ) { return hv->mDateFormatter.dateString( art->date()->qdt() ); } else - return KListViewItem::text( col ); + return TDEListViewItem::text( col ); } diff --git a/knode/knhdrviewitem.h b/knode/knhdrviewitem.h index 476c6d53c..5b69e947e 100644 --- a/knode/knhdrviewitem.h +++ b/knode/knhdrviewitem.h @@ -24,7 +24,7 @@ class KNArticle; class KNHeaderView; -class KNHdrViewItem : public KListViewItem { +class KNHdrViewItem : public TDEListViewItem { public: KNHdrViewItem( KNHeaderView *ref, KNArticle *a = 0 ); diff --git a/knode/knmainwidget.cpp b/knode/knmainwidget.cpp index 30edb5edb..d4ae80256 100644 --- a/knode/knmainwidget.cpp +++ b/knode/knmainwidget.cpp @@ -35,7 +35,7 @@ #include "krsqueezedtextlabel.h" #include "recentaddresses.h" using KPIM::BroadcastStatus; -using KRecentAddress::RecentAddresses; +using TDERecentAddress::RecentAddresses; //GUI #include "knmainwidget.h" @@ -128,8 +128,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa 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(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotCollectionRMB(KListView*, TQListViewItem*, const TQPoint&))); + 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*)), @@ -155,8 +155,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa h_drDock->setWidget(dummy); h_drDock->manualDock(a_rtDock, KDockWidget::DockTop, 5000); - q_uicksearch = new KToolBar(dummy, "search toolbar"); - KAction *resetQuickSearch = new KAction( i18n( "Reset Quick Search" ), + q_uicksearch = new TDEToolBar(dummy, "search toolbar"); + TDEAction *resetQuickSearch = new TDEAction( i18n( "Reset Quick Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", @@ -168,7 +168,7 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa "all messages are shown again." ) ); TQLabel *lbl = new TQLabel(i18n("&Search:"), q_uicksearch, "kde toolbar widget"); - s_earchLineEdit = new KListViewSearchLine(q_uicksearch, h_drView, "KListViewSearchLine"); + 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() )); @@ -184,8 +184,8 @@ KNMainWidget::KNMainWidget( KXMLGUIClient* client, bool detachable, TQWidget* pa TQT_SLOT(slotArticleSelected(TQListViewItem*))); connect(h_drView, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotArticleSelectionChanged())); - connect(h_drView, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotArticleRMB(KListView*, TQListViewItem*, const TQPoint&))); + 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)), @@ -305,7 +305,7 @@ KNMainWidget::~KNMainWidget() void KNMainWidget::iniStatusBar() { //statusbar - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *sb = mainWin ? mainWin->statusBar() : 0; s_tatusFilter = new KRSqueezedTextLabel( TQString(), sb ); s_tatusFilter->setAlignment( AlignLeft | AlignVCenter ); @@ -317,7 +317,7 @@ void KNMainWidget::iniStatusBar() void KNMainWidget::setStatusMsg(const TQString& text, int id) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( !bar ) return; @@ -342,7 +342,7 @@ void KNMainWidget::setStatusMsg(const TQString& text, int id) void KNMainWidget::setStatusHelpMsg(const TQString& text) { - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KStatusBar *bar = mainWin ? mainWin->statusBar() : 0; if ( bar ) bar->message(text, 2000); @@ -375,12 +375,12 @@ void KNMainWidget::setCursorBusy(bool b) void KNMainWidget::blockUI(bool b) { b_lockui = b; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(!b); a_ccel->setEnabled(!b); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); if (b) @@ -394,8 +394,8 @@ void KNMainWidget::blockUI(bool b) void KNMainWidget::disableAccels(bool b) { a_ccel->setEnabled(!b); - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(!b); if (b) @@ -409,12 +409,12 @@ void KNMainWidget::disableAccels(bool b) void KNMainWidget::secureProcessEvents() { b_lockui = true; - KMainWindow *mainWin = dynamic_cast<KMainWindow*>(topLevelWidget()); + TDEMainWindow *mainWin = dynamic_cast<TDEMainWindow*>(topLevelWidget()); KMenuBar *mbar = mainWin ? mainWin->menuBar() : 0; if ( mbar ) mbar->setEnabled(false); a_ccel->setEnabled(false); - KAccel *naccel = mainWin ? mainWin->accel() : 0; + TDEAccel *naccel = mainWin ? mainWin->accel() : 0; if ( naccel ) naccel->setEnabled(false); installEventFilter(this); @@ -545,122 +545,122 @@ void KNMainWidget::configChanged() void KNMainWidget::initActions() { - a_ccel=new KAccel(this); + a_ccel=new TDEAccel(this); mArticleViewer->setCharsetKeyboardAction()->plugAccel(a_ccel); //navigation - a_ctNavNextArt = new KAction( KGuiItem(i18n("&Next Article"), "next", + a_ctNavNextArt = new TDEAction( KGuiItem(i18n("&Next Article"), "next", i18n("Go to next article")), "N;Right", TQT_TQOBJECT(h_drView), TQT_SLOT(nextArticle()), actionCollection(), "go_nextArticle" ); - a_ctNavPrevArt = new KAction( KGuiItem(i18n("&Previous Article"), "previous", + a_ctNavPrevArt = new TDEAction( KGuiItem(i18n("&Previous Article"), "previous", i18n("Go to previous article")), "P;Left" , TQT_TQOBJECT(h_drView), TQT_SLOT(prevArticle()), actionCollection(), "go_prevArticle" ); - a_ctNavNextUnreadArt = new KAction(i18n("Next Unread &Article"), "1rightarrow", ALT+SHIFT+Key_Space , TQT_TQOBJECT(this), + 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 KAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), + a_ctNavNextUnreadThread = new TDEAction(i18n("Next Unread &Thread"),"2rightarrow", SHIFT+Key_Space , TQT_TQOBJECT(this), TQT_SLOT(slotNavNextUnreadThread()), actionCollection(), "go_nextUnreadThread"); - a_ctNavNextGroup = new KAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView), + a_ctNavNextGroup = new TDEAction(i18n("Ne&xt Group"), "down", Key_Plus , TQT_TQOBJECT(c_olView), TQT_SLOT(nextGroup()), actionCollection(), "go_nextGroup"); - a_ctNavPrevGroup = new KAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView), + a_ctNavPrevGroup = new TDEAction(i18n("Pre&vious Group"), "up", Key_Minus , TQT_TQOBJECT(c_olView), TQT_SLOT(prevGroup()), actionCollection(), "go_prevGroup"); - a_ctNavReadThrough = new KAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), + a_ctNavReadThrough = new TDEAction(i18n("Read &Through Articles"), Key_Space , TQT_TQOBJECT(this), TQT_SLOT(slotNavReadThrough()), actionCollection(), "go_readThrough"); a_ctNavReadThrough->plugAccel(a_ccel); TQAccel *accel = new TQAccel( this ); - new KAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Focus on Next Folder"), CTRL+Key_Right, TQT_TQOBJECT(c_olView), TQT_SLOT(incCurrentFolder()), actionCollection(), "inc_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Right), c_olView, TQT_SLOT(incCurrentFolder())); - new KAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Focus on Previous Folder"), CTRL+Key_Left, TQT_TQOBJECT(c_olView), TQT_SLOT(decCurrentFolder()), actionCollection(), "dec_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Left), c_olView, TQT_SLOT(decCurrentFolder())); - new KAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), + new TDEAction( i18n("Select Folder with Focus"), CTRL+Key_Space, TQT_TQOBJECT(c_olView), TQT_SLOT(selectCurrentFolder()), actionCollection(), "select_current_folder" ); accel->connectItem(accel->insertItem(CTRL+Key_Space), c_olView, TQT_SLOT(selectCurrentFolder())); - new KAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Focus on Next Article"), ALT+Key_Right, TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()), actionCollection(), "inc_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Right), TQT_TQOBJECT(h_drView), TQT_SLOT(incCurrentArticle()) ); - new KAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Focus on Previous Article"), ALT+Key_Left, TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()), actionCollection(), "dec_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Left), TQT_TQOBJECT(h_drView), TQT_SLOT(decCurrentArticle()) ); - new KAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), + new TDEAction( i18n("Select Article with Focus"), ALT+Key_Space, TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()), actionCollection(), "select_current_article" ); accel->connectItem( accel->insertItem(ALT+Key_Space), TQT_TQOBJECT(h_drView), TQT_SLOT(selectCurrentArticle()) ); //collection-view - accounts - a_ctAccProperties = new KAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), + a_ctAccProperties = new TDEAction(i18n("Account &Properties"), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccProperties()), actionCollection(), "account_properties"); - a_ctAccRename = new KAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), + a_ctAccRename = new TDEAction(i18n("&Rename Account"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccRename()), actionCollection(), "account_rename"); - a_ctAccSubscribe = new KAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), + a_ctAccSubscribe = new TDEAction(i18n("&Subscribe to Newsgroups..."), "news_subscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccSubscribe()), actionCollection(), "account_subscribe"); - a_ctAccExpireAll = new KAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), + a_ctAccExpireAll = new TDEAction(i18n("&Expire All Groups"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccExpireAll()), actionCollection(), "account_expire_all"); - a_ctAccGetNewHdrs = new KAction(i18n("&Get New Articles in All Groups"), "mail_get", 0, TQT_TQOBJECT(this), + 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 KAction(i18n("&Get New Articles in All Accounts"), "mail_get_all", 0, TQT_TQOBJECT(this), + 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 KAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this), + a_ctAccDelete = new TDEAction(i18n("&Delete Account"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAccDelete()), actionCollection(), "account_delete"); - a_ctAccPostNewArticle = new KAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this), + a_ctAccPostNewArticle = new TDEAction(i18n("&Post to Newsgroup..."), "mail_new", CTRL+Key_N, TQT_TQOBJECT(this), TQT_SLOT(slotAccPostNewArticle()), actionCollection(), "article_postNew"); //collection-view - groups - a_ctGrpProperties = new KAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), + a_ctGrpProperties = new TDEAction(i18n("Group &Properties"), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpProperties()), actionCollection(), "group_properties"); - a_ctGrpRename = new KAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), + a_ctGrpRename = new TDEAction(i18n("Rename &Group"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpRename()), actionCollection(), "group_rename"); - a_ctGrpGetNewHdrs = new KAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), + a_ctGrpGetNewHdrs = new TDEAction(i18n("&Get New Articles"), "mail_get" , 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpGetNewHdrs()), actionCollection(), "group_dnlHeaders"); - a_ctGrpExpire = new KAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), + a_ctGrpExpire = new TDEAction(i18n("E&xpire Group"), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpExpire()), actionCollection(), "group_expire"); - a_ctGrpReorganize = new KAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), + a_ctGrpReorganize = new TDEAction(i18n("Re&organize Group"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpReorganize()), actionCollection(), "group_reorg"); - a_ctGrpUnsubscribe = new KAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), + a_ctGrpUnsubscribe = new TDEAction(i18n("&Unsubscribe From Group"), "news_unsubscribe", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpUnsubscribe()), actionCollection(), "group_unsubscribe"); - a_ctGrpSetAllRead = new KAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), + a_ctGrpSetAllRead = new TDEAction(i18n("Mark All as &Read"), "goto", 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetAllRead()), actionCollection(), "group_allRead"); - a_ctGrpSetAllUnread = new KAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), + a_ctGrpSetAllUnread = new TDEAction(i18n("Mark All as U&nread"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetAllUnread()), actionCollection(), "group_allUnread"); - a_ctGrpSetUnread = new KAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), + a_ctGrpSetUnread = new TDEAction(i18n("Mark Last as Unr&ead..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotGrpSetUnread()), actionCollection(), "group_unread"); - (void) new KAction( i18n("&Configure KNode..."), + (void) new TDEAction( i18n("&Configure KNode..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSettings()), actionCollection(), "knode_configure_knode" ); //collection-view - folder - a_ctFolNew = new KAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this), + a_ctFolNew = new TDEAction(i18n("&New Folder"), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolNew()), actionCollection(), "folder_new"); - a_ctFolNewChild = new KAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this), + a_ctFolNewChild = new TDEAction(i18n("New &Subfolder"), "folder_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolNewChild()), actionCollection(), "folder_newChild"); - a_ctFolDelete = new KAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), + a_ctFolDelete = new TDEAction(i18n("&Delete Folder"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolDelete()), actionCollection(), "folder_delete"); - a_ctFolRename = new KAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), + a_ctFolRename = new TDEAction(i18n("&Rename Folder"), "text", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolRename()), actionCollection(), "folder_rename"); - a_ctFolCompact = new KAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), + a_ctFolCompact = new TDEAction(i18n("C&ompact Folder"), "wizard", 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolCompact()), actionCollection(), "folder_compact"); - a_ctFolCompactAll = new KAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), + a_ctFolCompactAll = new TDEAction(i18n("Co&mpact All Folders"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolCompactAll()), actionCollection(), "folder_compact_all"); - a_ctFolEmpty = new KAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), + a_ctFolEmpty = new TDEAction(i18n("&Empty Folder"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolEmpty()), actionCollection(), "folder_empty"); - a_ctFolMboxImport = new KAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), + a_ctFolMboxImport = new TDEAction(i18n("&Import MBox Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolMBoxImport()), actionCollection(), "folder_MboxImport"); - a_ctFolMboxExport = new KAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), + a_ctFolMboxExport = new TDEAction(i18n("E&xport as MBox Folder..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFolMBoxExport()), actionCollection(), "folder_MboxExport"); //header-view - list-handling - a_ctArtSortHeaders = new KSelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); + a_ctArtSortHeaders = new TDESelectAction(i18n("S&ort"), 0, actionCollection(), "view_Sort"); TQStringList items; items += i18n("By &Subject"); items += i18n("By S&ender"); @@ -670,94 +670,94 @@ void KNMainWidget::initActions() a_ctArtSortHeaders->setItems(items); a_ctArtSortHeaders->setShortcutConfigurable(false); connect(a_ctArtSortHeaders, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotArtSortHeaders(int))); - a_ctArtSortHeadersKeyb = new KAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), + a_ctArtSortHeadersKeyb = new TDEAction(i18n("Sort"), TQString(), Key_F7 , TQT_TQOBJECT(this), TQT_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 KAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); + a_ctArtFilterKeyb = new TDEAction(i18n("Filter"), Key_F6, actionCollection(), "view_Filter_Keyb"); a_ctArtFilterKeyb->plugAccel(a_ccel); - a_ctArtSearch = new KAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), + a_ctArtSearch = new TDEAction(i18n("&Search Articles..."),"mail_find" , Key_F4 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSearch()), actionCollection(), "article_search"); - a_ctArtRefreshList = new KAction(i18n("&Refresh List"),"reload", KStdAccel::shortcut(KStdAccel::Reload), TQT_TQOBJECT(this), + a_ctArtRefreshList = new TDEAction(i18n("&Refresh List"),"reload", TDEStdAccel::shortcut(TDEStdAccel::Reload), TQT_TQOBJECT(this), TQT_SLOT(slotArtRefreshList()), actionCollection(), "view_Refresh"); - a_ctArtCollapseAll = new KAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), + a_ctArtCollapseAll = new TDEAction(i18n("&Collapse All Threads"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtCollapseAll()), actionCollection(), "view_CollapseAll"); - a_ctArtExpandAll = new KAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), + a_ctArtExpandAll = new TDEAction(i18n("E&xpand All Threads"), 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtExpandAll()), actionCollection(), "view_ExpandAll"); - a_ctArtToggleThread = new KAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), + a_ctArtToggleThread = new TDEAction(i18n("&Toggle Subthread"), Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleThread()), actionCollection(), "thread_toggle"); - a_ctArtToggleShowThreads = new KToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), + a_ctArtToggleShowThreads = new TDEToggleAction(i18n("Show T&hreads"), 0 , TQT_TQOBJECT(this), TQT_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 KAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), + a_ctArtSetArtRead = new TDEAction(i18n("Mark as &Read"), Key_D , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetArtRead()), actionCollection(), "article_read"); - a_ctArtSetArtUnread = new KAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), + a_ctArtSetArtUnread = new TDEAction(i18n("Mar&k as Unread"), Key_U , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetArtUnread()), actionCollection(), "article_unread"); - a_ctArtSetThreadRead = new KAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), + a_ctArtSetThreadRead = new TDEAction(i18n("Mark &Thread as Read"), CTRL+Key_D , TQT_TQOBJECT(this), TQT_SLOT(slotArtSetThreadRead()), actionCollection(), "thread_read"); - a_ctArtSetThreadUnread = new KAction(i18n("Mark T&hread as Unread"), CTRL+Key_U , TQT_TQOBJECT(this), + 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 KAction(i18n("Open in Own &Window"), "window_new", Key_O , TQT_TQOBJECT(this), + a_ctArtOpenNewWindow = new TDEAction(i18n("Open in Own &Window"), "window_new", Key_O , TQT_TQOBJECT(this), TQT_SLOT(slotArtOpenNewWindow()), actionCollection(), "article_ownWindow"); // scoring - a_ctScoresEdit = new KAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), + a_ctScoresEdit = new TDEAction(i18n("&Edit Scoring Rules..."), "edit", CTRL+Key_E, TQT_TQOBJECT(this), TQT_SLOT(slotScoreEdit()), actionCollection(), "scoreedit"); - a_ctReScore = new KAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), + a_ctReScore = new TDEAction(i18n("Recalculate &Scores"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotReScore()),actionCollection(),"rescore"); - a_ctScoreLower = new KAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), + a_ctScoreLower = new TDEAction(i18n("&Lower Score for Author..."), CTRL+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotScoreLower()), actionCollection(), "scorelower"); - a_ctScoreRaise = new KAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), + a_ctScoreRaise = new TDEAction(i18n("&Raise Score for Author..."), CTRL+Key_I, TQT_TQOBJECT(this), TQT_SLOT(slotScoreRaise()),actionCollection(),"scoreraise"); - a_ctArtToggleIgnored = new KAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this), + a_ctArtToggleIgnored = new TDEAction(i18n("&Ignore Thread"), "bottom", Key_I , TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleIgnored()), actionCollection(), "thread_ignore"); - a_ctArtToggleWatched = new KAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this), + a_ctArtToggleWatched = new TDEAction(i18n("&Watch Thread"), "top", Key_W , TQT_TQOBJECT(this), TQT_SLOT(slotArtToggleWatched()), actionCollection(), "thread_watch"); //header-view local articles - a_ctArtSendOutbox = new KAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this), + a_ctArtSendOutbox = new TDEAction(i18n("Sen&d Pending Messages"), "mail_send", 0, TQT_TQOBJECT(this), TQT_SLOT(slotArtSendOutbox()), actionCollection(), "net_sendPending"); - a_ctArtDelete = new KAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this), + a_ctArtDelete = new TDEAction(i18n("&Delete Article"), "editdelete", Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotArtDelete()), actionCollection(), "article_delete"); - a_ctArtSendNow = new KAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this), + a_ctArtSendNow = new TDEAction(i18n("Send &Now"),"mail_send", 0 , TQT_TQOBJECT(this), TQT_SLOT(slotArtSendNow()), actionCollection(), "article_sendNow"); - a_ctArtEdit = new KAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), + a_ctArtEdit = new TDEAction(i18n("edit article","&Edit Article..."), "edit", Key_E , TQT_TQOBJECT(this), TQT_SLOT(slotArtEdit()), actionCollection(), "article_edit"); //network - a_ctNetCancel = new KAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this), + a_ctNetCancel = new TDEAction(i18n("Stop &Network"),"stop",0, TQT_TQOBJECT(this), TQT_SLOT(slotNetCancel()), actionCollection(), "net_stop"); a_ctNetCancel->setEnabled(false); - a_ctFetchArticleWithID = new KAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), + a_ctFetchArticleWithID = new TDEAction(i18n("&Fetch Article with ID..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFetchArticleWithID()), actionCollection(), "fetch_article_with_id"); a_ctFetchArticleWithID->setEnabled(false); - a_ctToggleGroupView = new KToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), + a_ctToggleGroupView = new TDEToggleAction(i18n("Show &Group View"), CTRL+Key_G, TQT_TQOBJECT(this), TQT_SLOT(slotToggleGroupView()), actionCollection(), "settings_show_groupView"); a_ctToggleGroupView->setCheckedState(i18n("Hide &Group View")); - a_ctToggleHeaderView = new KToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), + a_ctToggleHeaderView = new TDEToggleAction(i18n("Show &Header View"), CTRL+Key_H, TQT_TQOBJECT(this), TQT_SLOT(slotToggleHeaderView()), actionCollection(), "settings_show_headerView"); a_ctToggleHeaderView->setCheckedState(i18n("Hide &Header View")); - a_ctToggleArticleViewer = new KToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), + a_ctToggleArticleViewer = new TDEToggleAction(i18n("Show &Article Viewer"), CTRL+Key_J, TQT_TQOBJECT(this), TQT_SLOT(slotToggleArticleViewer()), actionCollection(), "settings_show_articleViewer"); a_ctToggleArticleViewer->setCheckedState(i18n("Hide &Article Viewer")); - a_ctToggleQuickSearch = new KToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), + a_ctToggleQuickSearch = new TDEToggleAction(i18n("Show Quick Search"), TQString(), TQT_TQOBJECT(this), TQT_SLOT(slotToggleQuickSearch()), actionCollection(), "settings_show_quickSearch"); a_ctToggleQuickSearch->setCheckedState(i18n("Hide Quick Search")); - a_ctSwitchToGroupView = new KAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), + a_ctSwitchToGroupView = new TDEAction(i18n("Switch to Group View"), Key_G , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToGroupView()), actionCollection(), "switch_to_group_view"); a_ctSwitchToGroupView->plugAccel(a_ccel); - a_ctSwitchToHeaderView = new KAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), + a_ctSwitchToHeaderView = new TDEAction(i18n("Switch to Header View"), Key_H , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToHeaderView()), actionCollection(), "switch_to_header_view"); a_ctSwitchToHeaderView->plugAccel(a_ccel); - a_ctSwitchToArticleViewer = new KAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), + a_ctSwitchToArticleViewer = new TDEAction(i18n("Switch to Article Viewer"), Key_J , TQT_TQOBJECT(this), TQT_SLOT(slotSwitchToArticleViewer()), actionCollection(), "switch_to_article_viewer"); a_ctSwitchToArticleViewer->plugAccel(a_ccel); } @@ -1220,7 +1220,7 @@ void KNMainWidget::slotCollectionViewDrop(TQDropEvent* e, KNCollectionViewItem* } -void KNMainWidget::slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint &p) +void KNMainWidget::slotArticleRMB(TDEListView*, TQListViewItem *i, const TQPoint &p) { if(b_lockui) return; @@ -1239,7 +1239,7 @@ void KNMainWidget::slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint & } -void KNMainWidget::slotCollectionRMB(KListView*, TQListViewItem *i, const TQPoint &p) +void KNMainWidget::slotCollectionRMB(TDEListView*, TQListViewItem *i, const TQPoint &p) { if(b_lockui) return; @@ -2028,7 +2028,7 @@ void KNMainWidget::slotSettings() c_fgManager->configure(); } -KActionCollection* KNMainWidget::actionCollection() const +TDEActionCollection* KNMainWidget::actionCollection() const { return m_GUIClient->actionCollection(); } diff --git a/knode/knmainwidget.h b/knode/knmainwidget.h index 8670966a8..c90e697df 100644 --- a/knode/knmainwidget.h +++ b/knode/knmainwidget.h @@ -26,10 +26,10 @@ class TQListViewItem; class KURL; -class KAccel; -class KAction; -class KToggleAction; -class KSelectAction; +class TDEAccel; +class TDEAction; +class TDEToggleAction; +class TDESelectAction; class KRSqueezedTextLabel; class KLineEdit; class KXMLGUIClient; @@ -58,7 +58,7 @@ namespace KNode { class KNArticle; class KNLocalArticle; class KNRemoteArticle; -class KActionCollection; +class TDEActionCollection; class KDE_EXPORT KNMainWidget : public KDockArea, virtual public KNodeIface { @@ -160,7 +160,7 @@ signals: protected: - KActionCollection* actionCollection() const; + TDEActionCollection* actionCollection() const; KXMLGUIFactory *factory() const; void initActions(); @@ -190,14 +190,14 @@ protected: void closeCurrentThread(); //GUI - KAccel *a_ccel; + TDEAccel *a_ccel; KNProgress *p_rogBar; KNode::ArticleWidget *mArticleViewer; KNCollectionView *c_olView; KNHeaderView *h_drView; KDockWidget *c_olDock, *h_drDock, *a_rtDock; bool b_lockui; - KToolBar *q_uicksearch; + TDEToolBar *q_uicksearch; TQLineEdit *s_earchLineEdit; //Core @@ -220,8 +220,8 @@ protected slots: void slotCollectionSelected(TQListViewItem*); void slotCollectionRenamed(TQListViewItem*); void slotCollectionViewDrop(TQDropEvent* e, KNCollectionViewItem* after); - void slotArticleRMB(KListView*, TQListViewItem *i, const TQPoint &p); - void slotCollectionRMB(KListView*, TQListViewItem *i, const TQPoint &p); + void slotArticleRMB(TDEListView*, TQListViewItem *i, const TQPoint &p); + void slotCollectionRMB(TDEListView*, TQListViewItem *i, const TQPoint &p); /** Open selected article in own composer/reader window */ void slotOpenArticle(TQListViewItem *item); void slotHdrViewSortingChanged(int i); @@ -241,7 +241,7 @@ protected slots: protected: //navigation - KAction *a_ctNavNextArt, + TDEAction *a_ctNavNextArt, *a_ctNavPrevArt, *a_ctNavNextUnreadArt, *a_ctNavNextUnreadThread, @@ -250,7 +250,7 @@ protected: *a_ctNavReadThrough; //collection-view - accounts - KAction *a_ctAccProperties, + TDEAction *a_ctAccProperties, *a_ctAccRename, *a_ctAccSubscribe, *a_ctAccExpireAll, @@ -260,7 +260,7 @@ protected: *a_ctAccPostNewArticle; //collection-view - groups - KAction *a_ctGrpProperties, + TDEAction *a_ctGrpProperties, *a_ctGrpRename, *a_ctGrpGetNewHdrs, *a_ctGrpExpire, @@ -271,7 +271,7 @@ protected: *a_ctGrpSetUnread; //collection-view - folder - KAction *a_ctFolNew, + TDEAction *a_ctFolNew, *a_ctFolNewChild, *a_ctFolDelete, *a_ctFolRename, @@ -282,26 +282,26 @@ protected: *a_ctFolMboxExport; //header-view - list-handling - KSelectAction *a_ctArtSortHeaders; + TDESelectAction *a_ctArtSortHeaders; KNFilterSelectAction *a_ctArtFilter; - KAction *a_ctArtSortHeadersKeyb, + TDEAction *a_ctArtSortHeadersKeyb, *a_ctArtFilterKeyb, *a_ctArtSearch, *a_ctArtRefreshList, *a_ctArtCollapseAll, *a_ctArtExpandAll, *a_ctArtToggleThread; - KToggleAction *a_ctArtToggleShowThreads; + TDEToggleAction *a_ctArtToggleShowThreads; //header-view - remote articles - KAction *a_ctArtSetArtRead, + TDEAction *a_ctArtSetArtRead, *a_ctArtSetArtUnread, *a_ctArtSetThreadRead, *a_ctArtSetThreadUnread, *a_ctArtOpenNewWindow; // scoring - KAction *a_ctScoresEdit, + TDEAction *a_ctScoresEdit, *a_ctReScore, *a_ctScoreLower, *a_ctScoreRaise, @@ -309,22 +309,22 @@ protected: *a_ctArtToggleWatched; //header-view local articles - KAction *a_ctArtSendOutbox, + TDEAction *a_ctArtSendOutbox, *a_ctArtDelete, *a_ctArtSendNow, *a_ctArtEdit; //network - KAction *a_ctNetCancel; + TDEAction *a_ctNetCancel; - KAction *a_ctFetchArticleWithID; + TDEAction *a_ctFetchArticleWithID; // settings menu - KToggleAction *a_ctToggleGroupView, + TDEToggleAction *a_ctToggleGroupView, *a_ctToggleHeaderView, *a_ctToggleArticleViewer, *a_ctToggleQuickSearch; - KAction *a_ctSwitchToGroupView, + TDEAction *a_ctSwitchToGroupView, *a_ctSwitchToHeaderView, *a_ctSwitchToArticleViewer; diff --git a/knode/knode.cpp b/knode/knode.cpp index 6bb741c80..40dfa2cf6 100644 --- a/knode/knode.cpp +++ b/knode/knode.cpp @@ -39,7 +39,7 @@ #include "knhdrviewitem.h" KNMainWindow::KNMainWindow( TQWidget* pWidget ) - : KMainWindow(pWidget,"mainWindow") + : TDEMainWindow(pWidget,"mainWindow") { //setupStatusBar(); createStandardStatusBarAction(); diff --git a/knode/knode.h b/knode/knode.h index d22c96084..5d89532b7 100644 --- a/knode/knode.h +++ b/knode/knode.h @@ -41,7 +41,7 @@ class KNMainWidget; class KNHeaderView; -class KNMainWindow : public KMainWindow +class KNMainWindow : public TDEMainWindow { Q_OBJECT |