summaryrefslogtreecommitdiffstats
path: root/src/notecontent.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:28 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:18:28 -0600
commit934db26c3f8efe148a5680c22f965ee10f818a61 (patch)
tree4a47cbb3ef398d11fa9283b5afdcd0a8d84fad7c /src/notecontent.cpp
parenta1fb52e00e362130a46b34570e53f2c1f322f373 (diff)
downloadbasket-934db26c3f8efe148a5680c22f965ee10f818a61.tar.gz
basket-934db26c3f8efe148a5680c22f965ee10f818a61.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/notecontent.cpp')
-rw-r--r--src/notecontent.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/notecontent.cpp b/src/notecontent.cpp
index 1036516..cc5d683 100644
--- a/src/notecontent.cpp
+++ b/src/notecontent.cpp
@@ -740,7 +740,7 @@ void ImageContent::paint(TQPainter *painter, int width, int /*height*/, const TQ
width -= 1;
// KPixmap pixmap = m_pixmap;
// if (note()->isSelected())
-// pixmap = KPixmapEffect::selectedPixmap(m_pixmap, KGlobalSettings::highlightColor());
+// pixmap = KPixmapEffect::selectedPixmap(m_pixmap, TDEGlobalSettings::highlightColor());
if (width >= m_pixmap.width()) // Full size
painter->drawPixmap(0, 0, m_pixmap);