diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:51:01 -0600 |
commit | b9e542d0c805e9adee3a67e44532d5321032e21e (patch) | |
tree | e82d85b9035cc2ca322911e8a6e38a3bd8b1d431 /vcs/cvsservice/annotateview.cpp | |
parent | 7a392a04059bd904dab4c78910a6d34aa0b37798 (diff) | |
download | tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.tar.gz tdevelop-b9e542d0c805e9adee3a67e44532d5321032e21e.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'vcs/cvsservice/annotateview.cpp')
-rw-r--r-- | vcs/cvsservice/annotateview.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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; }; |