Cleanup output clutter

(cherry picked from commit 74b1fc6576fa920094463e6e4f1528bc7a25d6d0)

3 files changed, 12 insertions, 12 deletions

diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp
index 5cb1fb71c..37a06ac74 100644
--- a/kcontrol/displayconfig/displayconfig.cpp
+++ b/kcontrol/displayconfig/displayconfig.cpp
@@ -502,7 +502,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 44b69e2ff..74aad1aeb 100644
--- a/kcontrol/iccconfig/iccconfig.cpp
+++ b/kcontrol/iccconfig/iccconfig.cpp
@@ -390,7 +390,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/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index 0fc10f235..3c2250e6c 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -59,7 +59,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 KGlobalAccel(TQT_TQOBJECT(this));
 	KGlobalAccel* keys = globalKeys;
 #include "krandrbindings.cpp"
@@ -408,7 +408,7 @@ void KRandRSystemTray::populateMenu(KPopupMenu* 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;
@@ -568,8 +568,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
@@ -677,7 +677,7 @@ void KRandRSystemTray::findPrimaryDisplay()
 
 		output_name = output_info->name;
 		output_id = randr_screen_info->outputs[i]->id;
-		//printf("ACTIVE CHECK: Found output %s\n\r", output_name);
+		//printf("ACTIVE CHECK: Found output %s\n", output_name);
 
 		randr_screen_info->cur_crtc = randr_screen_info->outputs[i]->cur_crtc;
 		randr_screen_info->cur_output = randr_screen_info->outputs[i];
@@ -708,7 +708,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
 
 			output_name = output_info->name;
 			output_id = randr_screen_info->outputs[i]->id;
-			//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);
@@ -731,7 +731,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
 
 			output_name = output_info->name;
 			output_id = randr_screen_info->outputs[i]->id;
-			//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);
@@ -754,7 +754,7 @@ void KRandRSystemTray::addOutputMenu(KPopupMenu* menu)
 
 			output_name = output_info->name;
 			output_id = randr_screen_info->outputs[i]->id;
-			//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);
@@ -798,7 +798,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];
@@ -814,7 +814,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;