Cleanup output clutter.

2 files changed, 37 insertions, 37 deletions

diff --git a/lib/tdeqt4painter.cpp b/lib/tdeqt4painter.cpp
index a51e7e2..45f6f73 100644
--- a/lib/tdeqt4painter.cpp
+++ b/lib/tdeqt4painter.cpp
@@ -199,7 +199,7 @@ bool TDEQt4PaintDevice::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 					qt4compositionmode=QPainter::RasterOp_NotSource;
 					break;
 				case TQPainter::NotOrROP:
-					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n\r", rop);
+					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n", rop);
 					break;
 				case TQPainter::NotXorROP:
 					qt4compositionmode=QPainter::RasterOp_NotSourceXorDestination;
@@ -217,7 +217,7 @@ bool TDEQt4PaintDevice::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 					qt4compositionmode=QPainter::CompositionMode_Clear;
 					break;
 				case TQPainter::SetROP:
-					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n\r", rop);
+					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n", rop);
 					break;
 				case TQPainter::NopROP:
 					qt4compositionmode=QPainter::CompositionMode_Destination;
@@ -226,7 +226,7 @@ bool TDEQt4PaintDevice::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 					qt4compositionmode=QPainter::RasterOp_SourceAndNotDestination;
 					break;
 				case TQPainter::OrNotROP:
-					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n\r", rop);
+					tqWarning("TDEQt4PaintDevice::cmd: Unhandled raster operation [Was attempting to use raster operation %d\n", rop);
 					break;
 				case TQPainter::NandROP:
 					qt4compositionmode=QPainter::RasterOp_NotSourceOrNotDestination;
diff --git a/plugin/simplestyle.cpp b/plugin/simplestyle.cpp
index 14f469b..d54009d 100644
--- a/plugin/simplestyle.cpp
+++ b/plugin/simplestyle.cpp
@@ -251,7 +251,7 @@ Qt4TDEStyle::Qt4TDEStyle() : m_aboutData(NULL), m_tqApplication(NULL), m_tdeAppl
 #if QT_VERSION > 0x040800
 	// How a bug of this magnitude could go undetected in a major Qt4 release is beyond me...I guess cell phones don't generally use thin lines in their widgets!?
 	// This is Yet Another Example of why TDE cannot rely on Qt4 for anything of any real importance
-	printf("[WARNING] Qt4 >= Qt 4.8.0 detected; you are likely affected by these Qt4 bugs:\n\r[WARNING] https://bugreports.qt-project.org/browse/QTBUG-25896\n\r[WARNING] https://bugreports.qt-project.org/browse/QTBUG-26013\n\r[WARNING] There is no known workaround for this problem; your Qt4 application will display with numerous graphical glitches.\n\r");
+	printf("[WARNING] Qt4 >= Qt 4.8.0 detected; you are likely affected by these Qt4 bugs:\n[WARNING] https://bugreports.qt-project.org/browse/QTBUG-25896\n[WARNING] https://bugreports.qt-project.org/browse/QTBUG-26013\n[WARNING] There is no known workaround for this problem; your Qt4 application will display with numerous graphical glitches.\n");
 #endif
 }
 
@@ -612,7 +612,7 @@ QIcon Qt4TDEStyle::standardIconImplementation(StandardPixmap standardIcon, const
 #endif // INTEGRATE_WITH_TDE
 		default:
 			if (enable_debug_warnings) {
-				printf("No pixmap for Qt4 standard pixmap request %d\n\r", standardIcon); fflush(stdout);
+				printf("No pixmap for Qt4 standard pixmap request %d\n", standardIcon); fflush(stdout);
 			}
 	}
 
@@ -1062,7 +1062,7 @@ int Qt4TDEStyle::styleHint(StyleHint hint, const QStyleOption *opt, const QWidge
 // 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No hints for Qt4 hint request %d\n\r", hint); fflush(stdout);
+				printf("No hints for Qt4 hint request %d\n", hint); fflush(stdout);
 			}
 			retval = 0;
 	}
@@ -1139,7 +1139,7 @@ QSize Qt4TDEStyle::sizeFromContents(ContentsType type, const QStyleOption *opt,
 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No size for Qt4 contents %d\n\r", type); fflush(stdout);
+				printf("No size for Qt4 contents %d\n", type); fflush(stdout);
 			}
 	}
 
@@ -1525,7 +1525,7 @@ int Qt4TDEStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const
 // 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No metrics for Qt4 element %d\n\r", metric); fflush(stdout);
+				printf("No metrics for Qt4 element %d\n", metric); fflush(stdout);
 			}
 			retval = 0;
 	}
@@ -1675,14 +1675,14 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 				if (qt4progressbar_widget->orientation() != Qt::Horizontal) {
 					// Qt3 cannot draw vertical progress bars
 					if (enable_debug_warnings) {
-						printf("No rules to draw vertical Qt4 progress bar\n\r"); fflush(stdout);
+						printf("No rules to draw vertical Qt4 progress bar\n"); fflush(stdout);
 					}
 					interfaceWidget = 0;
 				}
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 progress bar with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 progress bar with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1729,7 +1729,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 					default:
 						// Qt3 cannot draw other tab shapes
 						if (enable_debug_warnings) {
-							printf("No rules to draw Qt4 tab shape %d\n\r", qt4tabbar_widget->shape()); fflush(stdout);
+							printf("No rules to draw Qt4 tab shape %d\n", qt4tabbar_widget->shape()); fflush(stdout);
 						}
 						interfaceWidget = 0;
 				}
@@ -1737,7 +1737,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 tabbar with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 tabbar with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1755,7 +1755,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 radio button with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 radio button with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1773,7 +1773,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 checkbox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 checkbox with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1791,7 +1791,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 pushbutton with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 pushbutton with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1819,7 +1819,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 combobox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 combobox with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1870,7 +1870,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 popup menu with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 popup menu with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1912,7 +1912,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 menu bar with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 menu bar with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1938,7 +1938,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 slider with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 slider with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1961,7 +1961,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 scrollbar with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 scrollbar with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -1982,7 +1982,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -2001,7 +2001,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -2049,7 +2049,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 toolbox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 toolbox with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -2076,7 +2076,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 toolbutton with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 toolbutton with no Qt4 object available\n"); fflush(stdout);
 				}
 				interfaceWidget = 0;
 			}
@@ -2092,7 +2092,7 @@ TQWidget* Qt4TDEStyle::initializeInterfaceWidget(TQt3WidgetType wt, const QWidge
 
 #ifdef DEBUG_SPEW
 	if (enable_debug_warnings) {
-		printf("Widget cache: %d items now present in cache\n\r", m_internalTQt3WidgetCache->count());
+		printf("Widget cache: %d items now present in cache\n", m_internalTQt3WidgetCache->count());
 	}
 #endif // DEBUG_SPEW
 	return interfaceWidget;
@@ -2120,7 +2120,7 @@ QRect Qt4TDEStyle::subElementRect(SubElement element, const QStyleOption *opt, c
 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No rules to obtain Qt4 subelement rect %d\n\r", element); fflush(stdout);
+				printf("No rules to obtain Qt4 subelement rect %d\n", element); fflush(stdout);
 			}
 			can_override = false;
 	}
@@ -2131,7 +2131,7 @@ QRect Qt4TDEStyle::subElementRect(SubElement element, const QStyleOption *opt, c
 
 		if (enable_debug_warnings) {
 #ifdef DEBUG_SPEW
-			printf("Used Qt3 subelement rect %d to handle Qt4 subelement rect %d\n\r", tqtSR, element); fflush(stdout);
+			printf("Used Qt3 subelement rect %d to handle Qt4 subelement rect %d\n", tqtSR, element); fflush(stdout);
 #endif
 		}
 	}
@@ -2187,7 +2187,7 @@ QRect Qt4TDEStyle::subControlRect(ComplexControl control, const QStyleOptionComp
 					break;
 				default:
 					if (enable_debug_warnings) {
-						printf("No rules to obtain Qt4 subcontrol rect %d for control %d\n\r", subControl, control); fflush(stdout);
+						printf("No rules to obtain Qt4 subcontrol rect %d for control %d\n", subControl, control); fflush(stdout);
 					}
 					can_override = false;
 			}
@@ -2195,7 +2195,7 @@ QRect Qt4TDEStyle::subControlRect(ComplexControl control, const QStyleOptionComp
 		}
 		default:
 			if (enable_debug_warnings) {
-				printf("No rules to obtain Qt4 subcontrol rect %d for control %d\n\r", subControl, control); fflush(stdout);
+				printf("No rules to obtain Qt4 subcontrol rect %d for control %d\n", subControl, control); fflush(stdout);
 			}
 			can_override = false;
 	}
@@ -2215,7 +2215,7 @@ QRect Qt4TDEStyle::subControlRect(ComplexControl control, const QStyleOptionComp
 
 		if (enable_debug_warnings) {
 #ifdef DEBUG_SPEW
-			printf("Used Qt3 subcontrol rect %d for control %d to handle Qt4 subcontrol rect %d for control %d\n\r", tqtSC, tqtCC, subControl, control); fflush(stdout);
+			printf("Used Qt3 subcontrol rect %d for control %d to handle Qt4 subcontrol rect %d for control %d\n", tqtSC, tqtCC, subControl, control); fflush(stdout);
 #endif
 		}
 	}
@@ -2445,7 +2445,7 @@ void Qt4TDEStyle::drawComplexControl(ComplexControl control, const QStyleOptionC
 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No rules to draw Qt4 complex control %d\n\r", control); fflush(stdout);
+				printf("No rules to draw Qt4 complex control %d\n", control); fflush(stdout);
 			}
 			can_override = false;
 	}
@@ -2499,7 +2499,7 @@ void Qt4TDEStyle::drawComplexControl(ComplexControl control, const QStyleOptionC
 			}
 			else {
 				if (enable_debug_warnings) {
-					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n\r"); fflush(stdout);
+					printf("Unable to draw Qt4 spinbox with no Qt4 object available\n"); fflush(stdout);
 				}
 			}
 
@@ -2518,7 +2518,7 @@ void Qt4TDEStyle::drawComplexControl(ComplexControl control, const QStyleOptionC
 
 		if (enable_debug_warnings) {
 #ifdef DEBUG_SPEW
-			printf("Used Qt3 complex control %d to draw Qt4 complex control %d\n\r", tqtCC, control); fflush(stdout);
+			printf("Used Qt3 complex control %d to draw Qt4 complex control %d\n", tqtCC, control); fflush(stdout);
 #endif
 		}
 	}
@@ -2841,7 +2841,7 @@ void Qt4TDEStyle::drawControl(ControlElement element, const QStyleOption *opt, Q
 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No rules to draw Qt4 control %d\n\r", element); fflush(stdout);
+				printf("No rules to draw Qt4 control %d\n", element); fflush(stdout);
 			}
 			can_override = false;
 	}
@@ -2888,7 +2888,7 @@ void Qt4TDEStyle::drawControl(ControlElement element, const QStyleOption *opt, Q
 
 		if (enable_debug_warnings) {
 #ifdef DEBUG_SPEW
-			printf("Used Qt3 control %d to draw Qt4 control %d\n\r", tqtCE, element); fflush(stdout);
+			printf("Used Qt3 control %d to draw Qt4 control %d\n", tqtCE, element); fflush(stdout);
 #endif
 		}
 	}
@@ -3084,7 +3084,7 @@ void Qt4TDEStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QP
 			break;
 		default:
 			if (enable_debug_warnings) {
-				printf("No rules to draw Qt4 element %d\n\r", pe); fflush(stdout);
+				printf("No rules to draw Qt4 element %d\n", pe); fflush(stdout);
 			}
 			can_override = false;
 	}
@@ -3132,7 +3132,7 @@ void Qt4TDEStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QP
 
 		if (enable_debug_warnings) {
 #ifdef DEBUG_SPEW
-			printf("Used Qt3 element %d to draw Qt4 element %d\n\r", tqtPE, pe); fflush(stdout);
+			printf("Used Qt3 element %d to draw Qt4 element %d\n", tqtPE, pe); fflush(stdout);
 #endif
 		}
 	}