From 7864df7a5e0a69bb3e525ec3e47256bdcbf2832b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 14:58:21 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- src/noteedit.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/noteedit.cpp') diff --git a/src/noteedit.cpp b/src/noteedit.cpp index 141db05..01dbf11 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -796,7 +796,7 @@ InlineEditors* InlineEditors::instance() return instance; } -void InlineEditors::initToolBars(KActionCollection *actionCollection) +void InlineEditors::initToolBars(TDEActionCollection *actionCollection) { TQFont defaultFont; TQColor textColor = (Global::bnpView && Global::bnpView->currentBasket() ? @@ -818,32 +818,32 @@ void InlineEditors::initToolBars(KActionCollection *actionCollection) richTextColor = new FocusedColorCombo(Global::mainWindow()); richTextColor->setFixedWidth(richTextColor->sizeHint().height() * 2); richTextColor->setColor(textColor); - action = new KWidgetAction(richTextColor, i18n("Color"), KShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color"); + action = new KWidgetAction(richTextColor, i18n("Color"), TDEShortcut(), 0, TQT_SLOT(), actionCollection, "richtext_color"); - richTextBold = new KToggleAction( i18n("Bold"), "text_bold", "Ctrl+B", actionCollection, "richtext_bold" ); - richTextItalic = new KToggleAction( i18n("Italic"), "text_italic", "Ctrl+I", actionCollection, "richtext_italic" ); - richTextUnderline = new KToggleAction( i18n("Underline"), "text_under", "Ctrl+U", actionCollection, "richtext_underline" ); + richTextBold = new TDEToggleAction( i18n("Bold"), "text_bold", "Ctrl+B", actionCollection, "richtext_bold" ); + richTextItalic = new TDEToggleAction( i18n("Italic"), "text_italic", "Ctrl+I", actionCollection, "richtext_italic" ); + richTextUnderline = new TDEToggleAction( i18n("Underline"), "text_under", "Ctrl+U", actionCollection, "richtext_underline" ); -// richTextSuper = new KToggleAction( i18n("Superscript"), "text_super", "", actionCollection, "richtext_super" ); -// richTextSub = new KToggleAction( i18n("Subscript"), "text_sub", "", actionCollection, "richtext_sub" ); +// richTextSuper = new TDEToggleAction( i18n("Superscript"), "text_super", "", actionCollection, "richtext_super" ); +// richTextSub = new TDEToggleAction( i18n("Subscript"), "text_sub", "", actionCollection, "richtext_sub" ); - richTextLeft = new KToggleAction( i18n("Align Left"), "text_left", "", actionCollection, "richtext_left" ); - richTextCenter = new KToggleAction( i18n("Centered"), "text_center", "", actionCollection, "richtext_center" ); - richTextRight = new KToggleAction( i18n("Align Right"), "text_right", "", actionCollection, "richtext_right" ); - richTextJustified = new KToggleAction( i18n("Justified"), "text_block", "", actionCollection, "richtext_block" ); + richTextLeft = new TDEToggleAction( i18n("Align Left"), "text_left", "", actionCollection, "richtext_left" ); + richTextCenter = new TDEToggleAction( i18n("Centered"), "text_center", "", actionCollection, "richtext_center" ); + richTextRight = new TDEToggleAction( i18n("Align Right"), "text_right", "", actionCollection, "richtext_right" ); + richTextJustified = new TDEToggleAction( i18n("Justified"), "text_block", "", actionCollection, "richtext_block" ); richTextLeft->setExclusiveGroup("rt_justify"); richTextCenter->setExclusiveGroup("rt_justify"); richTextRight->setExclusiveGroup("rt_justify"); richTextJustified->setExclusiveGroup("rt_justify"); - richTextUndo = new KAction( i18n("Undo"), "undo", "", actionCollection, "richtext_undo"); - richTextRedo = new KAction( i18n("Redo"), "redo", "", actionCollection, "richtext_redo"); + richTextUndo = new TDEAction( i18n("Undo"), "undo", "", actionCollection, "richtext_undo"); + richTextRedo = new TDEAction( i18n("Redo"), "redo", "", actionCollection, "richtext_redo"); disableRichTextToolBar(); } -KToolBar* InlineEditors::richTextToolBar() +TDEToolBar* InlineEditors::richTextToolBar() { if (Global::mainWindow()) { Global::mainWindow()->toolBar(); // Make sure we create the main toolbar FIRST, so it will be on top of the edit toolbar! -- cgit v1.2.1