Cleanup output clutter

3 files changed, 13 insertions, 13 deletions

diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc
index cadbef85e..ddb95c9e7 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cc
@@ -599,7 +599,7 @@ void KBackgroundManager::slotImageDone(int desk)
     if (current)
     {
         //KPixmap * viewport_background = new KPixmap(TQPixmap(pm->width()*s.width(), pm->height()*s.height()));
-        //printf("slotImageDone(): x: %d y: %d\n\r", viewport_background->size().width(), viewport_background->size().height());
+        //printf("slotImageDone(): x: %d y: %d\n", viewport_background->size().width(), viewport_background->size().height());
         //setPixmap(viewport_background, r->hash(), desk);
         //delete viewport_background;
         
diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp
index 2ef042ed9..9d689d95f 100644
--- a/kdesktop/kxdglauncher.cpp
+++ b/kdesktop/kxdglauncher.cpp
@@ -108,7 +108,7 @@ int main( int argc, char **argv)
 			TQDir myqdir;
 			if (myqdir.exists(getDocumentPath(), TRUE) == true) {
 				if (args->isSet( "getpath" ) == true) {
-					printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
+					printf("%s\n", (const char *)getDocumentPath().local8Bit());
 					return 0;
 				}
 				else {
@@ -152,7 +152,7 @@ int main( int argc, char **argv)
 								config.writeEntry("XDG_DOCUMENTS_DIR", TQString("\"") + xdgModifiedDirectory + TQString("\""), true);
 								config.sync();
 								if (args->isSet( "getpath" ) == true) {
-									printf("%s\n\r", (const char *)getDocumentPath().local8Bit());
+									printf("%s\n", (const char *)getDocumentPath().local8Bit());
 									return 0;
 								}
 								else {
@@ -177,12 +177,12 @@ int main( int argc, char **argv)
 			}
 		}
 		else {
-			printf("[kxdglauncher] XDG variable not recognized\n\r");
+			printf("[kxdglauncher] XDG variable not recognized\n");
 			return 1;
 		}
 	}
 	else {
-		printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n\r");
+		printf("[kxdglauncher] Please specify the desired XDG variable name with --xdgname\n");
 		return 1;
 	}
 }
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 1947793c9..b99b603db 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -148,10 +148,10 @@ void print_trace()
 	size = backtrace (array, 10);
 	strings = backtrace_symbols (array, size);
 
-	printf ("[kdesktop_lock] Obtained %zd stack frames.\n\r", size);
+	printf ("[kdesktop_lock] Obtained %zd stack frames.\n", size);
 
 	for (i = 0; i < size; i++) {
-		printf ("[kdesktop_lock] %s\n\r", strings[i]);
+		printf ("[kdesktop_lock] %s\n", strings[i]);
 	}
 
 	free (strings);
@@ -160,7 +160,7 @@ void print_trace()
 
 static void segv_handler(int)
 {
-	printf("[kdesktop_lock] WARNING: A fatal exception was encountered.  Trapping and ignoring it so as not to compromise desktop security...\n\r");
+	printf("[kdesktop_lock] WARNING: A fatal exception was encountered.  Trapping and ignoring it so as not to compromise desktop security...\n");
 	print_trace();
 	sleep(1);
 }
@@ -876,7 +876,7 @@ void LockProcess::createSaverWindow()
         if (!(flags & CWColormap)) {
             XVisualInfo vinfo;
             if (!XMatchVisualInfo( x11Display(), x11Screen(), 32, TrueColor, &vinfo )) {
-                printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n\r");
+                printf("[ERROR] Unable to locate matching X11 Visual; this application will not function correctly!\n");
             }
             else {
                 visual = vinfo.visual;
@@ -1139,7 +1139,7 @@ void LockProcess::setVRoot(Window win, Window vr)
     Window top = win;
     while (1) {
         if (XQueryTree(tqt_xdisplay(), top, &rootReturn, &parentReturn, &children, &numChildren) == 0) {
-            printf("[WARNING] XQueryTree() failed!\n\r"); fflush(stdout);
+            printf("[WARNING] XQueryTree() failed!\n"); fflush(stdout);
             break;
         }
         if (children) {
@@ -1953,7 +1953,7 @@ void LockProcess::slotForcePaintBackground()
 	TQPixmap blankPixmap(mRootWidth, mRootHeight);
 	blankPixmap.fill(Qt::black);
 	slotPaintBackground(blankPixmap);
-	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n\r"); fflush(stdout);
+	printf("[WARNING] Unable to obtain desktop wallpaper in a timely manner.  High system load or possibly a TDE bug!\n"); fflush(stdout);
 }
 
 void LockProcess::slotPaintBackground(const TQPixmap &rpm)
@@ -2720,7 +2720,7 @@ void ControlPipeHandlerObject::run(void) {
 	int display_number = atoi(TQString(XDisplayString(tqt_xdisplay())).replace(":","").ascii());
 
 	if (display_number < 0) {
-		printf("[kdesktop_lock] Warning: unable to create control socket.  Interactive logon modules may not function properly.\n\r");
+		printf("[kdesktop_lock] Warning: unable to create control socket.  Interactive logon modules may not function properly.\n");
 		TQApplication::eventLoop()->exit(-1);
 		return;
 	}
@@ -2750,7 +2750,7 @@ void ControlPipeHandlerObject::run(void) {
 	}
 
 	if (!mParent->mPipeOpen) {
-		printf("[kdesktop_lock] Warning: unable to create control socket '%s'.  Interactive logon modules may not function properly.\n\r", fifo_file);
+		printf("[kdesktop_lock] Warning: unable to create control socket '%s'.  Interactive logon modules may not function properly.\n", fifo_file);
 		TQApplication::eventLoop()->exit(-1);
 		return;
 	}