From f723e96108e5204f53cf45aa600a6077e2ec6cde 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:36:33 +0200
Subject: [PATCH] Cleanup output clutter (cherry picked from commit
 987dc667f267a536e918194ab13d7375c3ad5537)

---
 kdecore/svgicons/ksvgiconengine.cpp |  2 +-
 kdeui/ktoolbar.cpp                  |  2 +-
 kdeui/qxembed.cpp                   |  4 ++--
 krandr/libkrandr.cc                 | 10 +++++-----
 libltdl                             |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kdecore/svgicons/ksvgiconengine.cpp b/kdecore/svgicons/ksvgiconengine.cpp
index 42ca8557c..89499b902 100644
--- a/kdecore/svgicons/ksvgiconengine.cpp
+++ b/kdecore/svgicons/ksvgiconengine.cpp
@@ -203,7 +203,7 @@ public:
 
 		TQWMatrix *current = m_engine->painter()->worldMatrix();
 #ifdef USE_QT4
-printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n\r");
+printf("[FIXME] *current = matrix * *current locks up under Qt4; bypassing for now\n");
 #else // USE_QT4
 		*current = matrix * *current;
 #endif // USE_QT4
diff --git a/kdeui/ktoolbar.cpp b/kdeui/ktoolbar.cpp
index 3bbbfcc90..b569a2ec6 100644
--- a/kdeui/ktoolbar.cpp
+++ b/kdeui/ktoolbar.cpp
@@ -1445,7 +1445,7 @@ void KToolBar::resizeEvent( TQResizeEvent *e )
       }
     }
 //     else {
-//         printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing.  Preventing toolbar lockup.  [Code 0045]\n\r");
+//         printf("[WARNING] In KToolBar::resizeEvent, but this code block should not be executing.  Preventing toolbar lockup.  [Code 0045]\n");
 //         setUpdatesEnabled( true );
 //     }
 }
diff --git a/kdeui/qxembed.cpp b/kdeui/qxembed.cpp
index 52659fac7..052b05f2a 100644
--- a/kdeui/qxembed.cpp
+++ b/kdeui/qxembed.cpp
@@ -447,7 +447,7 @@ static int qxembed_x11_event_filter( XEvent* e)
                 extra->embedded = 1;
 #ifdef USE_QT4
                 // [FIXME]
-                printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r");
+                printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n");
 #else // USE_QT4
                 extra->parentWinId = e->xclient.data.l[3];
 #endif // USE_QT4
@@ -1320,7 +1320,7 @@ void QXEmbed::embedClientIntoWindow(TQWidget* client, WId window)
     ((QXEmbed*)client)->topData()->embedded = true;
 #ifdef USE_QT4
     // [FIXME]
-    printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n\r");
+    printf("[FIXME] WId not set in kdelibs/kdeui/qxembed.cpp\n");
 #else // USE_QT4
     ((QXEmbed*)client)->topData()->parentWinId = window;
 #endif // USE_QT4
diff --git a/krandr/libkrandr.cc b/krandr/libkrandr.cc
index e1048969c..893913cea 100644
--- a/krandr/libkrandr.cc
+++ b/krandr/libkrandr.cc
@@ -177,7 +177,7 @@ TQString KRandrSimpleAPI::applyIccFile(TQString screenName, TQString fileName) {
 			icc_command = TQString("xcalib \"%1\"").arg(fileName);
 			if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL)
 			{
-				printf("Xcalib pipe error\n\r");
+				printf("Xcalib pipe error\n [xcalib apply]");
 			}
 			else {
 				fgets(xcalib_result, 2048, pipe_xcalib);
@@ -242,7 +242,7 @@ TQString KRandrSimpleAPI::applyIccFile(TQString screenName, TQString fileName) {
 			icc_command = TQString("xcalib -c");
 			if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL)
 			{
-				printf("Xcalib pipe error\n\r");
+				printf("Xcalib pipe error\n [xcalib clear]");
 			}
 			else {
 				fgets(xcalib_result, 2048, pipe_xcalib);
@@ -393,7 +393,7 @@ TQString KRandrSimpleAPI::applySystemWideIccConfiguration(TQString kde_confdir)
 	icc_command = TQString("xcalib \"%1\"").arg(getIccFileName(NULL, "Default", kde_confdir));
 	if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL)
 	{
-		printf("Xcalib pipe error\n\r");
+		printf("Xcalib pipe error [xcalib apply]\n");
 	}
 	else {
 		fgets(xcalib_result, 2048, pipe_xcalib);
@@ -630,7 +630,7 @@ bool KRandrSimpleAPI::applySystemwideDisplayConfiguration(TQPtrList<SingleScreen
 				}
 			}
 			else {
-				printf("[WARNING] Unable to find configuration for monitor %d; settings may not be correctly applied...\n\r", i); fflush(stdout);
+				printf("[WARNING] Unable to find configuration for monitor %d; settings may not be correctly applied...\n", i); fflush(stdout);
 			}
 		}
 		freeScreenInfoStructure(randr_screen_info);
@@ -1276,7 +1276,7 @@ TQString KRandrSimpleAPI::clearIccConfiguration() {
 	icc_command = TQString("xcalib -c");
 	if ((pipe_xcalib = popen(icc_command.ascii(), "r")) == NULL)
 	{
-		printf("Xcalib pipe error\n\r");
+		printf("Xcalib pipe error [xcalib clear]\n");
 	}
 	else {
 		fgets(xcalib_result, 2048, pipe_xcalib);
diff --git a/libltdl b/libltdl
index 6d6796c29..c61e5d357 160000
--- a/libltdl
+++ b/libltdl
@@ -1 +1 @@
-Subproject commit 6d6796c294ca6e9b7f83c295217817c4bf486031
+Subproject commit c61e5d357a65bd92df169eea934220c325873245