From 934db26c3f8efe148a5680c22f965ee10f818a61 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:18:28 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/noteedit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/noteedit.cpp') diff --git a/src/noteedit.cpp b/src/noteedit.cpp index 0edda4d..77d65c5 100644 --- a/src/noteedit.cpp +++ b/src/noteedit.cpp @@ -801,7 +801,7 @@ void InlineEditors::initToolBars(KActionCollection *actionCollection) TQFont defaultFont; TQColor textColor = (Global::bnpView && Global::bnpView->currentBasket() ? Global::bnpView->currentBasket()->textColor() : - KGlobalSettings::textColor()); + TDEGlobalSettings::textColor()); // Init the RichTextEditor Toolbar: richTextFont = new FocusedFontCombo(Global::mainWindow()); @@ -900,7 +900,7 @@ void InlineEditors::disableRichTextToolBar() TQFont defaultFont; TQColor textColor = (Global::bnpView && Global::bnpView->currentBasket() ? Global::bnpView->currentBasket()->textColor() : - KGlobalSettings::textColor()); + TDEGlobalSettings::textColor()); richTextFont->setCurrentFont(defaultFont.family()); richTextFontSize->setFontSize(defaultFont.pointSize()); richTextColor->setColor(textColor); -- cgit v1.2.1