Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

1 files changed, 11 insertions, 11 deletions

diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp
index 4d973372..90e82516 100644
--- a/cervisia/diffview.cpp
+++ b/cervisia/diffview.cpp
@@ -319,8 +319,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
     TQFont oldFont(p->font());
     if (item->type==Separator)
     {
-        backgroundColor = KGlobalSettings::highlightColor();
-        p->setPen(KGlobalSettings::highlightedTextColor());
+        backgroundColor = TDEGlobalSettings::highlightColor();
+        p->setPen(TDEGlobalSettings::highlightedTextColor());
         inverted = false;
         align = AlignLeft;
         innerborder = 0;
@@ -332,8 +332,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
     }
     else if (col == 0 && linenos)
     {
-        backgroundColor = KGlobalSettings::highlightColor();
-        p->setPen(KGlobalSettings::highlightedTextColor());
+        backgroundColor = TDEGlobalSettings::highlightColor();
+        p->setPen(TDEGlobalSettings::highlightedTextColor());
         inverted = false;
         align = AlignLeft;
         innerborder = 0;
@@ -344,8 +344,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
     }
     else if (marker && (col == 0 || col == 1))
     {
-        backgroundColor = KGlobalSettings::alternateBackgroundColor();
-        p->setPen(KGlobalSettings::textColor());
+        backgroundColor = TDEGlobalSettings::alternateBackgroundColor();
+        p->setPen(TDEGlobalSettings::textColor());
         inverted = false;
         align = AlignRight;
         innerborder = BORDER;
@@ -359,8 +359,8 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
             (item->type==Change)? diffChangeColor
             : (item->type==Insert)? diffInsertColor
             : (item->type==Delete)? diffDeleteColor
-            : (item->type==Neutral)? KGlobalSettings::alternateBackgroundColor() : KGlobalSettings::baseColor();
-        p->setPen(KGlobalSettings::textColor());
+            : (item->type==Neutral)? TDEGlobalSettings::alternateBackgroundColor() : TDEGlobalSettings::baseColor();
+        p->setPen(TDEGlobalSettings::textColor());
         inverted = item->inverted;
         align = AlignLeft;
         innerborder = 0;
@@ -370,7 +370,7 @@ void DiffView::paintCell(TQPainter *p, int row, int col)
     if (inverted)
     {
         p->setPen(backgroundColor);
-        backgroundColor = KGlobalSettings::textColor();
+        backgroundColor = TDEGlobalSettings::textColor();
         TQFont f(oldFont);
         f.setBold(true);
         p->setFont(f);
@@ -450,7 +450,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
     const TQByteArray& lineTypes(diffview->compressedContent());
 
     TQPixmap pixbuf(width(), scrollBarGroove.height());
-    pixbuf.fill(KGlobalSettings::baseColor());
+    pixbuf.fill(TDEGlobalSettings::baseColor());
 
     TQPainter p(&pixbuf, this);
     if (const unsigned int numberOfLines = lineTypes.size())
@@ -482,7 +482,7 @@ void DiffZoomWidget::paintEvent(TQPaintEvent *)
                 break;
             case ' ':
             case 'N':
-                color = KGlobalSettings::alternateBackgroundColor();
+                color = TDEGlobalSettings::alternateBackgroundColor();
                 break;
             }