diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:28 -0600 |
| commit | 934db26c3f8efe148a5680c22f965ee10f818a61 (patch) | |
| tree | 4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/noteedit.cpp | |
| parent | a1fb52e00e362130a46b34570e53f2c1f322f373 (diff) | |
| download | basket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/noteedit.cpp')
| -rw-r--r-- | src/noteedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |