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

1 files changed, 12 insertions, 12 deletions

diff --git a/src/kcolorcombo2.cpp b/src/kcolorcombo2.cpp
index 04f1b43..1671186 100644
--- a/src/kcolorcombo2.cpp
+++ b/src/kcolorcombo2.cpp
@@ -84,8 +84,8 @@ void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap!
 	// Initialize the pixmap:
 	m_pixmap.resize(width, height);
 	TQPainter painter(&m_pixmap);
-	painter.fillRect(0, 0, width, height, KGlobalSettings::baseColor());
-	painter.setPen(KGlobalSettings::textColor());
+	painter.fillRect(0, 0, width, height, TDEGlobalSettings::baseColor());
+	painter.setPen(TDEGlobalSettings::textColor());
 	painter.drawRect(0, 0, width, height);
 
 	// Needed to draw:
@@ -99,7 +99,7 @@ void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap!
 			y = 1 + MARGIN + (colorHeight + MARGIN) * j;
 			if (i == m_selectedColumn && j == m_selectedRow) {
 				selectionRect = TQRect(x - 2, y - 2, colorWidth + 4, colorHeight + 4);
-				painter.fillRect(selectionRect, KGlobalSettings::highlightColor());
+				painter.fillRect(selectionRect, TDEGlobalSettings::highlightColor());
 			}
 			m_selector->drawColorRect(painter, x, y, m_selector->colorAt(i, j), /*isDefault=*/false, colorWidth, colorHeight);
 		}
@@ -116,10 +116,10 @@ void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap!
 		x = 1 + MARGIN;
 		if (m_selectedColumn < m_columnOther && rowCount == m_selectedRow) {
 			selectionRect = TQRect(x - 2, y - 2, defaultCellWidth, colorHeight + 4);
-			painter.fillRect(selectionRect, KGlobalSettings::highlightColor());
-			textColor = KGlobalSettings::highlightedTextColor();
+			painter.fillRect(selectionRect, TDEGlobalSettings::highlightColor());
+			textColor = TDEGlobalSettings::highlightedTextColor();
 		} else
-			textColor = KGlobalSettings::textColor();
+			textColor = TDEGlobalSettings::textColor();
 		m_selector->drawColorRect(painter, x, y, m_selector->defaultColor(), /*isDefault=*/true, colorWidth, colorHeight);
 		painter.setFont(m_selector->font());
 		painter.setPen(textColor);
@@ -128,10 +128,10 @@ void KColorPopup::relayout() // FIXME: relayout should NOT redraw the pixmap!
 	x = 1 + MARGIN + m_columnOther * (colorWidth + MARGIN);
 	if (m_selectedColumn >= m_columnOther && rowCount == m_selectedRow) {
 		selectionRect = TQRect(x - 2, y - 2, otherCellWidth, colorHeight + 4);
-		painter.fillRect(selectionRect, KGlobalSettings::highlightColor());
-		textColor = KGlobalSettings::highlightedTextColor();
+		painter.fillRect(selectionRect, TDEGlobalSettings::highlightColor());
+		textColor = TDEGlobalSettings::highlightedTextColor();
 	} else
-		textColor = KGlobalSettings::textColor();
+		textColor = TDEGlobalSettings::textColor();
 	m_selector->drawColorRect(painter, x, y, m_otherColor, /*isDefault=*/false, colorWidth, colorHeight);
 	painter.setFont(m_selector->font());
 	painter.setPen(textColor);
@@ -561,7 +561,7 @@ void KColorCombo2::drawColorRect(TQPainter &painter, int x, int y, const TQColor
 	// Stroke:
 	int dontCare, value;
 	color.getHsv(/*hue:*/&dontCare, /*saturation:*/&dontCare, &value);
-	TQColor stroke = (color.isValid() ? color.dark(125) : KGlobalSettings::textColor());
+	TQColor stroke = (color.isValid() ? color.dark(125) : TDEGlobalSettings::textColor());
 	painter.setPen(/*color);//*/stroke);
 	painter.drawLine(x + 1,         y,              x + width - 2, y);
 	painter.drawLine(x,             y + 1,          x,             y + height - 2);
@@ -630,7 +630,7 @@ void KColorCombo2::popup()
 		setRainbowPreset();
 
 	// Compute where to show the popup:
-	TQRect desk = KGlobalSettings::desktopGeometry(this);
+	TQRect desk = TDEGlobalSettings::desktopGeometry(this);
 
 	TQPoint popupPoint = mapToGlobal(TQPoint(0, 0));
 
@@ -715,7 +715,7 @@ void KColorCombo2::mousePressEvent(TQMouseEvent *event)
 void KColorCombo2::mouseMoveEvent(TQMouseEvent *event)
 {
 	if( (event->state() & Qt::LeftButton) &&
-	    (event->pos() - m_dragStartPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) {
+	    (event->pos() - m_dragStartPos).manhattanLength() > TDEGlobalSettings::dndEventDelay() ) {
 		// Drag color object:
 		KColorDrag *colorDrag = new KColorDrag(effectiveColor(), this);
 		// Replace the drag pixmap with our own rounded one, at the same position and dimetions: