From 74b1fc6576fa920094463e6e4f1528bc7a25d6d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 27 Apr 2013 18:37:41 +0200
Subject: Cleanup output clutter

---
 kcontrol/displayconfig/displayconfig.cpp |  2 +-
 kcontrol/iccconfig/iccconfig.cpp         |  2 +-
 kcontrol/randr/tderandrtray.cpp          | 18 +++++++++---------
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index fd503d2cb..db371fc42 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -508,7 +508,7 @@ void KDisplayConfig::updateDraggableMonitorInformationInternal (int monitor_id,
 		}
 	}
 	else {
-		printf("[WARNING] Display layout broken...\n\r"); fflush(stdout);
+		printf("[WARNING] Display layout broken...\n"); fflush(stdout);
 	}
 
 	layoutDragDropDisplay();
diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp
index b7c51c281..9428be40c 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -416,7 +416,7 @@ void KICCConfig::save()
 		errorstr = randrsimple->clearIccConfiguration();
 	}
 	if (errorstr != "") {
-		KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n\r%1").arg(errorstr));
+		KMessageBox::error(this, TQString("Unable to apply ICC configuration:\n%1").arg(errorstr));
 	}
 
 	emit changed(false);
diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp
index e4372d77b..87346818c 100644
--- a/kcontrol/randr/tderandrtray.cpp
+++ b/kcontrol/randr/tderandrtray.cpp
@@ -60,7 +60,7 @@ KRandRSystemTray::KRandRSystemTray(TQWidget* parent, const char *name)
 	TQToolTip::add(this, i18n("Screen resize & rotate"));
 	my_parent = parent;
 
-	//printf("Reading configuration...\n\r");
+	//printf("Reading configuration...\n");
 	globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
 	TDEGlobalAccel* keys = globalKeys;
 #include "tderandrbindings.cpp"
@@ -465,7 +465,7 @@ void KRandRSystemTray::populateMenu(TDEPopupMenu* menu)
 void KRandRSystemTray::slotResolutionChanged(int parameter)
 {
 	if (currentScreen()->currentSize() == parameter) {
-		//printf("This resolution is already in use; applying again...\n\r");
+		//printf("This resolution is already in use; applying again...\n");
 		currentScreen()->proposeSize(parameter);
 		currentScreen()->applyProposed();
 		return;
@@ -619,8 +619,8 @@ void KRandRSystemTray::slotCycleDisplays()
 		}
 	}
 
-	//printf("Active: %d\n\r", current_on_index);
-	//printf("Max: %d\n\r", max_index);
+	//printf("Active: %d\n", current_on_index);
+	//printf("Max: %d\n", max_index);
 
 	if ((current_on_index == -1) && (max_index == -1)) {
 		// There is no connected display available!  ABORT
@@ -740,7 +740,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 			}
 
 			output_name = output_info->name;
-			//printf("ON: Found output %s\n\r", output_name);
+			//printf("ON: Found output %s\n", output_name);
 
 			lastIndex = menu->insertItem(i18n("%1 (Active)").arg(output_name));
 			menu->setItemChecked(lastIndex, true);
@@ -762,7 +762,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 			}
 
 			output_name = output_info->name;
-			//printf("CONNECTED, NOT ON: Found output %s\n\r", output_name);
+			//printf("CONNECTED, NOT ON: Found output %s\n", output_name);
 
 			lastIndex = menu->insertItem(i18n("%1 (Connected, Inactive)").arg(output_name));
 			menu->setItemChecked(lastIndex, false);
@@ -784,7 +784,7 @@ void KRandRSystemTray::addOutputMenu(TDEPopupMenu* menu)
 			}
 
 			output_name = output_info->name;
-			//printf("DISCONNECTED, NOT ON: Found output %s\n\r", output_name);
+			//printf("DISCONNECTED, NOT ON: Found output %s\n", output_name);
 
 			lastIndex = menu->insertItem(i18n("%1 (Disconnected, Inactive)").arg(output_name));
 			menu->setItemChecked(lastIndex, false);
@@ -835,7 +835,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 	}
 
 	if (!randr_screen_info->outputs[parameter]->cur_crtc) {
-		//printf("Screen was off, turning it on...\n\r");
+		//printf("Screen was off, turning it on...\n");
 
 		randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc;
 		randr_screen_info->cur_output = randr_screen_info->outputs[parameter];
@@ -851,7 +851,7 @@ void KRandRSystemTray::slotOutputChanged(int parameter)
 	}
 	else {
 		if (num_outputs_on > 1) {
-			//printf("Screen was on, turning it off...\n\r");
+			//printf("Screen was on, turning it off...\n");
 			randr_screen_info->cur_crtc = randr_screen_info->outputs[parameter]->cur_crtc;
 			randr_screen_info->cur_output = randr_screen_info->outputs[parameter];
 			randr_screen_info->cur_output->auto_set = 0;
-- 
cgit v1.2.1