Replaced std:cout based debug output with qDebug()

Author: Uwe Kindler

_config.yml

@@ -1,6 +1,7 @@
 #include <QString>
 #include <QFile>
 #include <QApplication>
+#include <QDebug>
 
 #include "mainwindow.h"
 
@@ -15,11 +16,39 @@ static void initStyleSheet(QApplication& a)
 	}
 }
 
+
+void myMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+    QByteArray localMsg = msg.toLocal8Bit();
+    switch (type) {
+    case QtDebugMsg:
+        fprintf(stdout, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtInfoMsg:
+        fprintf(stdout, "Info: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtWarningMsg:
+        fprintf(stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtCriticalMsg:
+        fprintf(stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        break;
+    case QtFatalMsg:
+        fprintf(stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), context.file, context.line, context.function);
+        abort();
+    }
+
+    fflush(stderr);
+    fflush(stdout);
+}
+
 int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
 	a.setQuitOnLastWindowClosed(true);
 	initStyleSheet(a);
+	qInstallMessageHandler(myMessageOutput);
+	qDebug() << "Message handler test";
 
 	MainWindow mw;
 	mw.show();

demo/main.cpp

@@ -24,21 +24,25 @@
 
 static int CONTENT_COUNT = 0;
 
+
 static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
 {
 	static int LabelCount = 0;
 	QLabel* l = new QLabel();
 	l->setWordWrap(true);
 	l->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-	l->setText(QString("Label %1 %2 - Lorem Ipsum ist ein einfacher Demo-Text für die Print- "
-		"und Schriftindustrie. Lorem Ipsum ist in der Industrie bereits der "
-		"Standard Demo-Text seit 1500, als ein unbekannter Schriftsteller eine "
-		"Hand voll Wörter nahm und diese durcheinander warf um ein Musterbuch zu "
-		"erstellen. Es hat nicht nur 5 Jahrhunderte überlebt, sondern auch in "
-		"Spruch in die elektronische Schriftbearbeitung geschafft (bemerke, nahezu "
-		"unverändert). Bekannt wurde es 1960, mit dem erscheinen von Letrase, "
-		"welches Passagen von Lorem Ipsum enhielt, so wie Desktop Software wie "
-		"Aldus PageMaker - ebenfalls mit Lorem Ipsum.")
+	l->setText(QString("Label %1 %2 - Lorem ipsum dolor sit amet, consectetuer adipiscing elit. "
+		"Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque "
+		"penatibus et magnis dis parturient montes, nascetur ridiculus mus. "
+		"Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. "
+		"Nulla consequat massa quis enim. Donec pede justo, fringilla vel, "
+		"aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, "
+		"imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede "
+		"mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum "
+		"semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, "
+		"porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, "
+		"dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla "
+		"ut metus varius laoreet.")
 		.arg(LabelCount)
 		.arg(QTime::currentTime().toString("hh:mm:ss:zzz")));
 
@@ -49,6 +53,7 @@ static ads::CDockWidget* createLongTextLabelDockWidget(QMenu* ViewMenu)
 	return DockWidget;
 }
 
+
 static ads::CDockWidget* createCalendarDockWidget(QMenu* ViewMenu)
 {
 	static int CalendarCount = 0;

demo/mainwindow.cpp

@@ -48,7 +48,6 @@
 #include "DockManager.h"
 #include "DockOverlay.h"
 
-#include <iostream>
 
 namespace ads
 {
@@ -83,7 +82,6 @@ class CTabsScrollArea : public QScrollArea
 protected:
 	virtual void wheelEvent(QWheelEvent* Event) override
 	{
-		std::cout << "CTabsScrollArea::wheelEvent" << std::endl;
 		Event->accept();
 		const int direction = Event->angleDelta().y();
 		if (direction < 0)
@@ -117,7 +115,7 @@ class CTabsScrollArea : public QScrollArea
 	{
 		if (ev->button() == Qt::LeftButton)
 		{
-			std::cout << "CTabsScrollArea::mouseReleaseEvent" << std::endl;
+			qDebug() << "CTabsScrollArea::mouseReleaseEvent";
 			ev->accept();
 			m_FloatingWidget = nullptr;
 			m_DragStartMousePos = QPoint();
@@ -154,7 +152,7 @@ class CTabsScrollArea : public QScrollArea
 
 		if (!this->geometry().contains(ev->pos()))
 		{
-			std::cout << "CTabsScrollArea::startFloating" << std::endl;
+			qDebug() << "CTabsScrollArea::startFloating";
 			startFloating(m_DragStartMousePos);
 			auto Overlay = m_DockArea->dockManager()->containerOverlay();
 			Overlay->setAllowedAreas(OuterDockAreas);
@@ -404,7 +402,7 @@ CDockAreaWidget::CDockAreaWidget(CDockManager* DockManager, CDockContainerWidget
 //============================================================================
 CDockAreaWidget::~CDockAreaWidget()
 {
-	std::cout << "~CDockAreaWidget()" << std::endl;
+	qDebug() << "~CDockAreaWidget()";
 	delete d;
 }
 
@@ -465,7 +463,7 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
 //============================================================================
 void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 {
-	std::cout << "CDockAreaWidget::removeDockWidget" << std::endl;
+	qDebug() << "CDockAreaWidget::removeDockWidget";
 	d->ContentsLayout->removeWidget(DockWidget);
 	auto TitleBar = DockWidget->titleBar();
 	TitleBar->hide();
@@ -478,7 +476,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
 	CDockContainerWidget* DockContainer = dockContainer();
 	if (d->ContentsLayout->isEmpty())
 	{
-		std::cout << "Dock Area empty" << std::endl;
+		qDebug() << "Dock Area empty";
 		dockContainer()->removeDockArea(this);
 		this->deleteLater();;
 	}
@@ -720,8 +718,8 @@ void CDockAreaWidget::onDockWidgetViewToggled(bool Open)
 void CDockAreaWidget::saveState(QDataStream& stream) const
 {
 	stream << d->ContentsLayout->count() << d->ContentsLayout->currentIndex();
-	std::cout << "CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
-			<< " CurrentIndex: " << d->ContentsLayout->currentIndex() << std::endl;
+	qDebug() << "CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
+			<< " CurrentIndex: " << d->ContentsLayout->currentIndex();
 	for (int i = 0; i < d->ContentsLayout->count(); ++i)
 	{
 		dockWidget(i)->saveState(stream);

src/DockAreaWidget.cpp

@@ -35,6 +35,7 @@
 #include <QGridLayout>
 #include <QPointer>
 #include <QVariant>
+#include <QDebug>
 
 #include "DockManager.h"
 #include "DockAreaWidget.h"
@@ -45,7 +46,6 @@
 #include "ads_globals.h"
 #include "DockSplitter.h"
 
-#include <iostream>
 
 namespace ads
 {
@@ -314,8 +314,8 @@ void DockContainerWidgetPrivate::saveChildNodesState(QDataStream& stream, QWidge
 	if (Splitter)
 	{
 		stream << internal::SplitterMarker << Splitter->orientation() << Splitter->count();
-		std::cout << "NodeSplitter orient: " << Splitter->orientation()
-			<< " WidgetCont: " << Splitter->count() << std::endl;
+		qDebug() << "NodeSplitter orient: " << Splitter->orientation()
+			<< " WidgetCont: " << Splitter->count();
 		for (int i = 0; i < Splitter->count(); ++i)
 		{
 			saveChildNodesState(stream, Splitter->widget(i));
@@ -341,8 +341,8 @@ bool DockContainerWidgetPrivate::restoreSplitter(QDataStream& stream,
 	int Orientation;
 	int WidgetCount;
 	stream >> Orientation >> WidgetCount;
-	std::cout << "Restore NodeSplitter Orientation: " <<  Orientation <<
-			" WidgetCount: " << WidgetCount << std::endl;
+	qDebug() << "Restore NodeSplitter Orientation: " <<  Orientation <<
+			" WidgetCount: " << WidgetCount;
 	QSplitter* Splitter = nullptr;
 	if (!Testing)
 	{
@@ -362,8 +362,8 @@ bool DockContainerWidgetPrivate::restoreSplitter(QDataStream& stream,
 			continue;
 		}
 
-		std::cout << "ChildNode isVisible " << ChildNode->isVisible()
-			<< " isVisibleTo " << ChildNode->isVisibleTo(Splitter) << std::endl;
+		qDebug() << "ChildNode isVisible " << ChildNode->isVisible()
+			<< " isVisibleTo " << ChildNode->isVisibleTo(Splitter);
 		Splitter->addWidget(ChildNode);
 		Visible |= ChildNode->isVisibleTo(Splitter);
 	}
@@ -399,8 +399,8 @@ bool DockContainerWidgetPrivate::restoreDockArea(QDataStream& stream,
 	int Tabs;
 	int CurrentIndex;
 	stream >> Tabs >> CurrentIndex;
-	std::cout << "Restore NodeDockArea Tabs: " << Tabs << " CurrentIndex: "
-			<< CurrentIndex << std::endl;
+	qDebug() << "Restore NodeDockArea Tabs: " << Tabs << " CurrentIndex: "
+			<< CurrentIndex;
 
 	CDockAreaWidget* DockArea = nullptr;
 	if (!Testing)
@@ -420,17 +420,15 @@ bool DockContainerWidgetPrivate::restoreDockArea(QDataStream& stream,
 		QString ObjectName;
 		bool Closed;
 		stream >> ObjectName >> Closed;
-		std::cout << "Restore DockWidget " << ObjectName.toStdString() << " Closed: "
-			<< Closed << std::endl;
+		qDebug() << "Restore DockWidget " << ObjectName << " Closed: " << Closed;
 
 		CDockWidget* DockWidget = DockManager->findDockWidget(ObjectName);
 		if (!DockWidget || Testing)
 		{
 			continue;
 		}
 
-		std::cout << "Dock Widget found - parent " << DockWidget->parent()
-			<< std::endl;
+		qDebug() << "Dock Widget found - parent " << DockWidget->parent();
 		DockArea->addDockWidget(DockWidget);
 		DockWidget->toggleView(!Closed);
 		DockWidget->setProperty("dirty", false);
@@ -536,8 +534,8 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
     buf.fill(' ', level * 4);
 	if (Splitter)
 	{
-		std::cout << buf.toStdString() << "Splitter " << ((Splitter->orientation() == Qt::Vertical)
-			? "-" : "|") << std::endl;
+		qDebug("%sSplitter %s", (const char*)buf,  (Splitter->orientation() == Qt::Vertical)
+			? "-" : "|");
 		for (int i = 0; i < Splitter->count(); ++i)
 		{
 			dumpRecursive(level + 1, Splitter->widget(i));
@@ -550,7 +548,7 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
 		{
 			return;
 		}
-		std::cout << buf.toStdString() << "DockArea" << std::endl;
+		qDebug("%sDockArea", (const char*)buf);
 	}
 #endif
 }
@@ -574,12 +572,12 @@ CDockAreaWidget* DockContainerWidgetPrivate::dockWidgetIntoDockArea(DockWidgetAr
 	int index = TargetAreaSplitter ->indexOf(TargetDockArea);
 	if (TargetAreaSplitter->orientation() == InsertParam.orientation())
 	{
-		std::cout << "TargetAreaSplitter->orientation() == InsertParam.orientation()" << std::endl;
+		qDebug() << "TargetAreaSplitter->orientation() == InsertParam.orientation()";
 		TargetAreaSplitter->insertWidget(index + InsertParam.insertOffset(), NewDockArea);
 	}
 	else
 	{
-		std::cout << "TargetAreaSplitter->orientation() != InsertParam.orientation()" << std::endl;
+		qDebug() << "TargetAreaSplitter->orientation() != InsertParam.orientation()";
 		QSplitter* NewSplitter = internal::newSplitter(InsertParam.orientation());
 		NewSplitter->addWidget(TargetDockArea);
 		insertWidgetIntoSplitter(NewSplitter, NewDockArea, InsertParam.append());
@@ -696,7 +694,7 @@ void CDockContainerWidget::addDockArea(CDockAreaWidget* DockAreaWidget,
 //============================================================================
 void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
 {
-	std::cout << "CDockContainerWidget::removeDockArea" << std::endl;
+	qDebug() << "CDockContainerWidget::removeDockArea";
 	d->DockAreas.removeAll(area);
 	QSplitter* Splitter = internal::findParent<QSplitter*>(area);
 	area->setParent(0);
@@ -708,7 +706,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
 
 	// It the splitter contains only one single widget, then we do not need
 	// it anymore and can replace it with its content
-	std::cout << "Replacing splitter with content" << std::endl;
+	qDebug() << "Replacing splitter with content";
 	QWidget* widget = Splitter->widget(0);
 	widget->setParent(this);
 	QSplitter* ParentSplitter = internal::findParent<QSplitter*>(Splitter);
@@ -759,7 +757,7 @@ int CDockContainerWidget::dockAreaCount() const
 void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWidget,
 	const QPoint& TargetPos)
 {
-	std::cout << "CDockContainerWidget::dropFloatingWidget" << std::endl;
+	qDebug() << "CDockContainerWidget::dropFloatingWidget";
 	CDockAreaWidget* DockArea = dockAreaAt(TargetPos);
 	auto dropArea = InvalidDockWidgetArea;
 	if (DockArea)
@@ -769,7 +767,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 		dropArea = dropOverlay->showOverlay(DockArea);
 		if (dropArea != InvalidDockWidgetArea)
 		{
-			std::cout << "Dock Area Drop Content: " << dropArea << std::endl;
+			qDebug() << "Dock Area Drop Content: " << dropArea;
 			d->dropIntoSection(FloatingWidget, DockArea, dropArea);
 		}
 	}
@@ -778,7 +776,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
 	if (InvalidDockWidgetArea == dropArea)
 	{
 		dropArea = d->DockManager->containerOverlay()->dropAreaUnderCursor();
-		std::cout << "Container Drop Content: " << dropArea << std::endl;
+		qDebug()  << "Container Drop Content: " << dropArea;
 		if (dropArea != InvalidDockWidgetArea)
 		{
 			d->dropIntoContainer(FloatingWidget, dropArea);
@@ -806,8 +804,8 @@ QList<CDockAreaWidget*> CDockContainerWidget::openedDockAreas() const
 //============================================================================
 void CDockContainerWidget::saveState(QDataStream& stream) const
 {
-	std::cout << "CDockContainerWidget::saveState isFloating "
-		<< isFloating() << std::endl;
+	qDebug() << "CDockContainerWidget::saveState isFloating "
+		<< isFloating();
 	stream << internal::ContainerMarker;
 	stream << isFloating();
 	if (isFloating())
@@ -832,7 +830,7 @@ bool CDockContainerWidget::restoreState(QDataStream& stream, bool Testing)
 	}
 
 	stream >> IsFloating;
-	std::cout << "Restore CDockContainerWidget Floating" << IsFloating << std::endl;
+	qDebug() << "Restore CDockContainerWidget Floating" << IsFloating;
 
 	QWidget* NewRootSplitter;
 	if (!Testing)
@@ -842,7 +840,7 @@ bool CDockContainerWidget::restoreState(QDataStream& stream, bool Testing)
 
 	if (IsFloating)
 	{
-		std::cout << "Restore floating widget" << std::endl;
+		qDebug() << "Restore floating widget";
 		QByteArray Geometry;
 		stream >> Geometry;
 		if (!Testing)