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/note.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/note.cpp') diff --git a/src/note.cpp b/src/note.cpp index adf859d..abc72dd 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -90,12 +90,12 @@ Note::~Note() TQString Note::addedStringDate() { - return KGlobal::locale()->formatDateTime(m_addedDate); + return TDEGlobal::locale()->formatDateTime(m_addedDate); } TQString Note::lastModificationStringDate() { - return KGlobal::locale()->formatDateTime(m_lastModificationDate); + return TDEGlobal::locale()->formatDateTime(m_lastModificationDate); } TQString Note::toText(const TQString &cuttedFullPath) @@ -1288,7 +1288,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro cg.setColor(TQColorGroup::Base, background); // Fill the inside of the expander in white, typically: - TQBrush brush(KGlobalSettings::baseColor()); + TQBrush brush(TDEGlobalSettings::baseColor()); painter->fillRect(x, y, 9, 9, brush); // Draw it: @@ -1776,7 +1776,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) // Draw gradient or resizer: if (m_hovered && m_hoveredZone == Resizer) { TQColor baseColor(basket()->backgroundColor()); - TQColor highColor(KGlobalSettings::highlightColor()); + TQColor highColor(TDEGlobalSettings::highlightColor()); drawResizer(&painter2, 0, 0, RESIZER_WIDTH, resizerHeight(), baseColor, highColor, /*rounded=*/!isColumn()); if (!isColumn()) { drawRoundings(&painter2, RESIZER_WIDTH - 3, 0, /*type=*/3); @@ -1808,9 +1808,9 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) selectionRectInside.moveBy(right, y()); basket()->blendBackground(painter2, selectionRectInside, right, y(), false); } - painter2.setPen(KGlobalSettings::highlightColor().dark()); + painter2.setPen(TDEGlobalSettings::highlightColor().dark()); painter2.drawRect(selectionRect); - painter2.setPen(Tools::mixColor(KGlobalSettings::highlightColor().dark(), basket()->backgroundColor())); + painter2.setPen(Tools::mixColor(TDEGlobalSettings::highlightColor().dark(), basket()->backgroundColor())); painter2.drawPoint(selectionRect.topLeft()); painter2.drawPoint(selectionRect.topRight()); painter2.drawPoint(selectionRect.bottomLeft()); @@ -1852,7 +1852,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) /** Initialise colors: */ TQColor baseColor(basket()->backgroundColor()); - TQColor highColor(KGlobalSettings::highlightColor()); + TQColor highColor(TDEGlobalSettings::highlightColor()); TQColor midColor = Tools::mixColor(baseColor, highColor); /** Initialise brushs and pens: */ @@ -1904,9 +1904,9 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) TQColor background = basket()->backgroundColor(); if (isSelected()) if (m_computedState.backgroundColor().isValid()) - background = Tools::mixColor(Tools::mixColor(m_computedState.backgroundColor(), KGlobalSettings::highlightColor()), KGlobalSettings::highlightColor()); + background = Tools::mixColor(Tools::mixColor(m_computedState.backgroundColor(), TDEGlobalSettings::highlightColor()), TDEGlobalSettings::highlightColor()); else - background = KGlobalSettings::highlightColor(); + background = TDEGlobalSettings::highlightColor(); else if (m_computedState.backgroundColor().isValid()) background = m_computedState.backgroundColor(); TQColor bgColor; @@ -1983,7 +1983,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) cg.setColor(TQColorGroup::Text, (m_computedState.textColor().isValid() ? m_computedState.textColor() : basket()->textColor()) ); cg.setColor(TQColorGroup::Background, bgColor); if (isSelected()) - cg.setColor(TQColorGroup::Text, KGlobalSettings::highlightedTextColor()); + cg.setColor(TQColorGroup::Text, TDEGlobalSettings::highlightedTextColor()); // Draw the Tags Arrow: if (hovered) { @@ -2047,18 +2047,18 @@ void Note::drawBufferOnScreen(TQPainter *painter, const TQPixmap &contentPixmap) //blendBackground(painter2, selectionRectInside, rect.x(), rect.y(), true, &m_selectedBackgroundPixmap); } - painter3.setPen(KGlobalSettings::highlightColor().dark()); + painter3.setPen(TDEGlobalSettings::highlightColor().dark()); painter3.drawRect(selectionRect); if (isGroup()) - painter3.setPen(Tools::mixColor(KGlobalSettings::highlightColor().dark(), basket()->backgroundColor())); + painter3.setPen(Tools::mixColor(TDEGlobalSettings::highlightColor().dark(), basket()->backgroundColor())); else { // What are the background colors: TQColor bgColor = basket()->backgroundColor(); if (isSelected()) - bgColor = (m_computedState.backgroundColor().isValid() ? Tools::mixColor(Tools::mixColor(m_computedState.backgroundColor(), KGlobalSettings::highlightColor()), KGlobalSettings::highlightColor()) : KGlobalSettings::highlightColor()); + bgColor = (m_computedState.backgroundColor().isValid() ? Tools::mixColor(Tools::mixColor(m_computedState.backgroundColor(), TDEGlobalSettings::highlightColor()), TDEGlobalSettings::highlightColor()) : TDEGlobalSettings::highlightColor()); else if (m_computedState.backgroundColor().isValid()) bgColor = m_computedState.backgroundColor(); - painter3.setPen(Tools::mixColor(KGlobalSettings::highlightColor().dark(), bgColor)); + painter3.setPen(Tools::mixColor(TDEGlobalSettings::highlightColor().dark(), bgColor)); } painter3.drawPoint(selectionRect.topLeft()); painter3.drawPoint(selectionRect.topRight()); @@ -2374,7 +2374,7 @@ void Note::unbufferizeAll() void Note::bufferizeSelectionPixmap() { if (m_bufferedSelectionPixmap.isNull()) { - TQColor insideColor = KGlobalSettings::highlightColor(); + TQColor insideColor = TDEGlobalSettings::highlightColor(); KPixmap kpixmap(m_bufferedPixmap); m_bufferedSelectionPixmap = KPixmapEffect::fade(kpixmap, 0.25, insideColor); } -- cgit v1.2.1