From b9e542d0c805e9adee3a67e44532d5321032e21e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:51:01 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 vcs/cvsservice/annotateview.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'vcs/cvsservice/annotateview.cpp')

diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp
index bd8014d8..cd878508 100644
--- a/vcs/cvsservice/annotateview.cpp
+++ b/vcs/cvsservice/annotateview.cpp
@@ -89,7 +89,7 @@ TQString AnnotateViewItem::text(int col) const
     case AuthorColumn:
         return (m_revision + TQChar(' ') + m_author);
     case DateColumn:
-        return KGlobal::locale()->formatDate(m_logDate.date(), true);
+        return TDEGlobal::locale()->formatDate(m_logDate.date(), true);
     case ContentColumn:
         return m_content;
     default:
@@ -107,13 +107,13 @@ void AnnotateViewItem::paintCell(TQPainter *p, const TQColorGroup &, int col, in
     switch (col)
     {
     case LineNumberColumn:
-        backgroundColor = KGlobalSettings::highlightColor();
-        p->setPen(KGlobalSettings::highlightedTextColor());
+        backgroundColor = TDEGlobalSettings::highlightColor();
+        p->setPen(TDEGlobalSettings::highlightedTextColor());
         break;
     default:
-        backgroundColor = m_odd ? KGlobalSettings::baseColor()
-                                : KGlobalSettings::alternateBackgroundColor();
-        p->setPen(KGlobalSettings::textColor());
+        backgroundColor = m_odd ? TDEGlobalSettings::baseColor()
+                                : TDEGlobalSettings::alternateBackgroundColor();
+        p->setPen(TDEGlobalSettings::textColor());
         break;
     };
 
-- 
cgit v1.2.3