Skip to content

Commit 554f26a

Browse files
githubuser0xFFFFgithubuser0xFFFF
authored
Merge pull request #41 from kozodeevv/Conditional_prints
Make debug messages conditional.
2 parents bf27207 + 10fbb6f commit 554f26a

10 files changed

+79
-69
lines changed

‎src/DockAreaTabBar.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ void CDockAreaTabBar::mouseReleaseEvent(QMouseEvent* ev)
171171
{
172172
if (ev->button() == Qt::LeftButton)
173173
{
174-
qDebug() << "CTabsScrollArea::mouseReleaseEvent";
174+
ADS_PRINT("CTabsScrollArea::mouseReleaseEvent");
175175
ev->accept();
176176
d->FloatingWidget = nullptr;
177177
d->DragStartMousePos = QPoint();
@@ -215,7 +215,7 @@ void CDockAreaTabBar::mouseMoveEvent(QMouseEvent* ev)
215215
int DragDistance = (d->DragStartMousePos - ev->pos()).manhattanLength();
216216
if (DragDistance >= CDockManager::startDragDistance())
217217
{
218-
qDebug() << "CTabsScrollArea::startFloating";
218+
ADS_PRINT("CTabsScrollArea::startFloating");
219219
startFloating(d->DragStartMousePos);
220220
auto Overlay = d->DockArea->dockManager()->containerOverlay();
221221
Overlay->setAllowedAreas(OuterDockAreas);
@@ -321,7 +321,7 @@ void CDockAreaTabBar::removeTab(CDockWidgetTab* Tab)
321321
{
322322
return;
323323
}
324-
qDebug() << "CDockAreaTabBar::removeTab ";
324+
ADS_PRINT("CDockAreaTabBar::removeTab ");
325325
int NewCurrentIndex = currentIndex();
326326
int RemoveIndex = d->TabsLayout->indexOf(Tab);
327327
if (count() == 1)
@@ -364,7 +364,7 @@ void CDockAreaTabBar::removeTab(CDockWidgetTab* Tab)
364364
d->TabsLayout->removeWidget(Tab);
365365
Tab->disconnect(this);
366366
Tab->removeEventFilter(this);
367-
qDebug() << "NewCurrentIndex " << NewCurrentIndex;
367+
ADS_PRINT("NewCurrentIndex " << NewCurrentIndex);
368368
if (NewCurrentIndex != d->CurrentIndex)
369369
{
370370
setCurrentIndex(NewCurrentIndex);
@@ -492,7 +492,7 @@ void CDockAreaTabBar::onTabWidgetMoved(const QPoint& GlobalPos)
492492
{
493493
if (MousePos.x() > tab(count() - 1)->geometry().right())
494494
{
495-
qDebug() << "after all tabs";
495+
ADS_PRINT("after all tabs");
496496
toIndex = count() - 1;
497497
}
498498
else
@@ -505,7 +505,7 @@ void CDockAreaTabBar::onTabWidgetMoved(const QPoint& GlobalPos)
505505
d->TabsLayout->insertWidget(toIndex, MovingTab);
506506
if (toIndex >= 0)
507507
{
508-
qDebug() << "tabMoved from " << fromIndex << " to " << toIndex;
508+
ADS_PRINT("tabMoved from " << fromIndex << " to " << toIndex);
509509
emit tabMoved(fromIndex, toIndex);
510510
setCurrentIndex(toIndex);
511511
}

‎src/DockAreaTitleBar.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ void CDockAreaTitleBar::onTabsMenuAboutToShow()
276276
//============================================================================
277277
void CDockAreaTitleBar::onCloseButtonClicked()
278278
{
279-
qDebug() << "CDockAreaTitleBar::onCloseButtonClicked";
279+
ADS_PRINT("CDockAreaTitleBar::onCloseButtonClicked");
280280
if (d->testConfigFlag(CDockManager::DockAreaCloseButtonClosesTab))
281281
{
282282
d->TabBar->closeTab(d->TabBar->currentIndex());

‎src/DockAreaWidget.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ CDockAreaWidget::CDockAreaWidget(CDockManager* DockManager, CDockContainerWidget
356356
//============================================================================
357357
CDockAreaWidget::~CDockAreaWidget()
358358
{
359-
qDebug() << "~CDockAreaWidget()";
359+
ADS_PRINT("~CDockAreaWidget()");
360360
delete d->ContentsLayout;
361361
delete d;
362362
}
@@ -409,7 +409,7 @@ void CDockAreaWidget::insertDockWidget(int index, CDockWidget* DockWidget,
409409
//============================================================================
410410
void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
411411
{
412-
qDebug() << "CDockAreaWidget::removeDockWidget";
412+
ADS_PRINT("CDockAreaWidget::removeDockWidget");
413413
auto NextOpenDockWidget = nextOpenDockWidget(DockWidget);
414414

415415
d->ContentsLayout->removeWidget(DockWidget);
@@ -423,7 +423,7 @@ void CDockAreaWidget::removeDockWidget(CDockWidget* DockWidget)
423423
}
424424
else if (d->ContentsLayout->isEmpty() && DockContainer->dockAreaCount() > 1)
425425
{
426-
qDebug() << "Dock Area empty";
426+
ADS_PRINT("Dock Area empty");
427427
DockContainer->removeDockArea(this);
428428
this->deleteLater();
429429
}
@@ -483,7 +483,7 @@ void CDockAreaWidget::hideAreaWithNoVisibleContent()
483483
//============================================================================
484484
void CDockAreaWidget::onTabCloseRequested(int Index)
485485
{
486-
qDebug() << "CDockAreaWidget::onTabCloseRequested " << Index;
486+
ADS_PRINT("CDockAreaWidget::onTabCloseRequested " << Index);
487487
dockWidget(Index)->toggleView(false);
488488
}
489489

@@ -646,11 +646,11 @@ CDockWidget* CDockAreaWidget::dockWidget(int Index) const
646646
//============================================================================
647647
void CDockAreaWidget::reorderDockWidget(int fromIndex, int toIndex)
648648
{
649-
qDebug() << "CDockAreaWidget::reorderDockWidget";
649+
ADS_PRINT("CDockAreaWidget::reorderDockWidget");
650650
if (fromIndex >= d->ContentsLayout->count() || fromIndex < 0
651651
|| toIndex >= d->ContentsLayout->count() || toIndex < 0 || fromIndex == toIndex)
652652
{
653-
qDebug() << "Invalid index for tab movement" << fromIndex << toIndex;
653+
ADS_PRINT("Invalid index for tab movement" << fromIndex << toIndex);
654654
return;
655655
}
656656

@@ -705,8 +705,8 @@ void CDockAreaWidget::saveState(QXmlStreamWriter& s) const
705705
auto CurrentDockWidget = currentDockWidget();
706706
QString Name = CurrentDockWidget ? CurrentDockWidget->objectName() : "";
707707
s.writeAttribute("Current", Name);
708-
qDebug() << "CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
709-
<< " Current: " << Name;
708+
ADS_PRINT("CDockAreaWidget::saveState TabCount: " << d->ContentsLayout->count()
709+
<< " Current: " << Name);
710710
for (int i = 0; i < d->ContentsLayout->count(); ++i)
711711
{
712712
dockWidget(i)->saveState(s);

‎src/DockContainerWidget.cpp‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,8 @@ void DockContainerWidgetPrivate::saveChildNodesState(QXmlStreamWriter& s, QWidge
557557
s.writeStartElement("Splitter");
558558
s.writeAttribute("Orientation", (Splitter->orientation() == Qt::Horizontal) ? "-" : "|");
559559
s.writeAttribute("Count", QString::number(Splitter->count()));
560-
qDebug() << "NodeSplitter orient: " << Splitter->orientation()
561-
<< " WidgetCont: " << Splitter->count();
560+
ADS_PRINT("NodeSplitter orient: " << Splitter->orientation()
561+
<< " WidgetCont: " << Splitter->count());
562562
for (int i = 0; i < Splitter->count(); ++i)
563563
{
564564
saveChildNodesState(s, Splitter->widget(i));
@@ -608,8 +608,8 @@ bool DockContainerWidgetPrivate::restoreSplitter(QXmlStreamReader& s,
608608
{
609609
return false;
610610
}
611-
qDebug() << "Restore NodeSplitter Orientation: " << Orientation <<
612-
" WidgetCount: " << WidgetCount;
611+
ADS_PRINT("Restore NodeSplitter Orientation: " << Orientation <<
612+
" WidgetCount: " << WidgetCount);
613613
QSplitter* Splitter = nullptr;
614614
if (!Testing)
615615
{
@@ -632,7 +632,7 @@ bool DockContainerWidgetPrivate::restoreSplitter(QXmlStreamReader& s,
632632
else if (s.name() == "Sizes")
633633
{
634634
QString sSizes = s.readElementText().trimmed();
635-
qDebug() << "Sizes: " << sSizes;
635+
ADS_PRINT("Sizes: " << sSizes);
636636
QTextStream TextStream(&sSizes);
637637
while (!TextStream.atEnd())
638638
{
@@ -656,8 +656,8 @@ bool DockContainerWidgetPrivate::restoreSplitter(QXmlStreamReader& s,
656656
continue;
657657
}
658658

659-
qDebug() << "ChildNode isVisible " << ChildNode->isVisible()
660-
<< " isVisibleTo " << ChildNode->isVisibleTo(Splitter);
659+
ADS_PRINT("ChildNode isVisible " << ChildNode->isVisible()
660+
<< " isVisibleTo " << ChildNode->isVisibleTo(Splitter));
661661
Splitter->addWidget(ChildNode);
662662
Visible |= ChildNode->isVisibleTo(Splitter);
663663
}
@@ -703,8 +703,8 @@ bool DockContainerWidgetPrivate::restoreDockArea(QXmlStreamReader& s,
703703

704704

705705
QString CurrentDockWidget = s.attributes().value("Current").toString();
706-
qDebug() << "Restore NodeDockArea Tabs: " << Tabs << " Current: "
707-
<< CurrentDockWidget;
706+
ADS_PRINT("Restore NodeDockArea Tabs: " << Tabs << " Current: "
707+
<< CurrentDockWidget);
708708

709709
CDockAreaWidget* DockArea = nullptr;
710710
if (!Testing)
@@ -738,7 +738,7 @@ bool DockContainerWidgetPrivate::restoreDockArea(QXmlStreamReader& s,
738738
continue;
739739
}
740740

741-
qDebug() << "Dock Widget found - parent " << DockWidget->parent();
741+
ADS_PRINT("Dock Widget found - parent " << DockWidget->parent());
742742
// We hide the DockArea here to prevent the short display (the flashing)
743743
// of the dock areas during application startup
744744
DockArea->hide();
@@ -780,17 +780,17 @@ bool DockContainerWidgetPrivate::restoreChildNodes(QXmlStreamReader& s,
780780
if (s.name() == "Splitter")
781781
{
782782
Result = restoreSplitter(s, CreatedWidget, Testing);
783-
qDebug() << "Splitter";
783+
ADS_PRINT("Splitter");
784784
}
785785
else if (s.name() == "Area")
786786
{
787787
Result = restoreDockArea(s, CreatedWidget, Testing);
788-
qDebug() << "DockAreaWidget";
788+
ADS_PRINT("DockAreaWidget");
789789
}
790790
else
791791
{
792792
s.skipCurrentElement();
793-
qDebug() << "Unknown element";
793+
ADS_PRINT("Unknown element");
794794
}
795795
}
796796

@@ -862,15 +862,17 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
862862
buf.fill(' ', level * 4);
863863
if (Splitter)
864864
{
865+
#ifdef ADS_DEBUG_PRINT
865866
qDebug("%sSplitter %s v: %s c: %s",
866867
(const char*)buf,
867868
(Splitter->orientation() == Qt::Vertical) ? "--" : "|",
868869
Splitter->isHidden() ? " " : "v",
869870
QString::number(Splitter->count()).toStdString().c_str());
870-
std::cout << (const char*)buf << "Splitter "
871-
<< ((Splitter->orientation() == Qt::Vertical) ? "--" : "|") << " "
872-
<< (Splitter->isHidden() ? " " : "v") << " "
873-
<< QString::number(Splitter->count()).toStdString() << std::endl;
871+
std::cout << (const char*)buf << "Splitter "
872+
<< ((Splitter->orientation() == Qt::Vertical) ? "--" : "|") << " "
873+
<< (Splitter->isHidden() ? " " : "v") << " "
874+
<< QString::number(Splitter->count()).toStdString() << std::endl;
875+
#endif
874876
for (int i = 0; i < Splitter->count(); ++i)
875877
{
876878
dumpRecursive(level + 1, Splitter->widget(i));
@@ -883,6 +885,7 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
883885
{
884886
return;
885887
}
888+
#ifdef ADS_DEBUG_PRINT
886889
qDebug("%sDockArea", (const char*)buf);
887890
std::cout << (const char*)buf
888891
<< (DockArea->isHidden() ? " " : "v")
@@ -896,7 +899,8 @@ void DockContainerWidgetPrivate::dumpRecursive(int level, QWidget* widget)
896899
std::cout << (DockWidget->isHidden() ? " " : "v");
897900
std::cout << (DockWidget->isClosed() ? "c" : " ") << " ";
898901
std::cout << DockWidget->windowTitle().toStdString() << std::endl;
899-
}
902+
}
903+
#endif
900904
}
901905
#else
902906
Q_UNUSED(level);
@@ -923,12 +927,12 @@ CDockAreaWidget* DockContainerWidgetPrivate::dockWidgetIntoDockArea(DockWidgetAr
923927
int index = TargetAreaSplitter ->indexOf(TargetDockArea);
924928
if (TargetAreaSplitter->orientation() == InsertParam.orientation())
925929
{
926-
qDebug() << "TargetAreaSplitter->orientation() == InsertParam.orientation()";
930+
ADS_PRINT("TargetAreaSplitter->orientation() == InsertParam.orientation()");
927931
TargetAreaSplitter->insertWidget(index + InsertParam.insertOffset(), NewDockArea);
928932
}
929933
else
930934
{
931-
qDebug() << "TargetAreaSplitter->orientation() != InsertParam.orientation()";
935+
ADS_PRINT("TargetAreaSplitter->orientation() != InsertParam.orientation()");
932936
QSplitter* NewSplitter = newSplitter(InsertParam.orientation());
933937
NewSplitter->addWidget(TargetDockArea);
934938
insertWidgetIntoSplitter(NewSplitter, NewDockArea, InsertParam.append());
@@ -1056,7 +1060,7 @@ void CDockContainerWidget::addDockArea(CDockAreaWidget* DockAreaWidget,
10561060
//============================================================================
10571061
void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
10581062
{
1059-
qDebug() << "CDockContainerWidget::removeDockArea";
1063+
ADS_PRINT("CDockContainerWidget::removeDockArea");
10601064
area->disconnect(this);
10611065
d->DockAreas.removeAll(area);
10621066
CDockSplitter* Splitter = internal::findParent<CDockSplitter*>(area);
@@ -1082,7 +1086,7 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
10821086
// avoid too many empty splitters
10831087
if (Splitter == d->RootSplitter)
10841088
{
1085-
qDebug() << "Removed from RootSplitter";
1089+
ADS_PRINT("Removed from RootSplitter");
10861090
// If splitter is empty, we are finished
10871091
if (!Splitter->count())
10881092
{
@@ -1104,11 +1108,11 @@ void CDockContainerWidget::removeDockArea(CDockAreaWidget* area)
11041108
QLayoutItem* li = d->Layout->replaceWidget(Splitter, ChildSplitter);
11051109
d->RootSplitter = ChildSplitter;
11061110
delete li;
1107-
qDebug() << "RootSplitter replaced by child splitter";
1111+
ADS_PRINT("RootSplitter replaced by child splitter");
11081112
}
11091113
else if (Splitter->count() == 1)
11101114
{
1111-
qDebug() << "Replacing splitter with content";
1115+
ADS_PRINT("Replacing splitter with content");
11121116
QSplitter* ParentSplitter = internal::findParent<QSplitter*>(Splitter);
11131117
auto Sizes = ParentSplitter->sizes();
11141118
QWidget* widget = Splitter->widget(0);
@@ -1187,7 +1191,7 @@ int CDockContainerWidget::visibleDockAreaCount() const
11871191
void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWidget,
11881192
const QPoint& TargetPos)
11891193
{
1190-
qDebug() << "CDockContainerWidget::dropFloatingWidget";
1194+
ADS_PRINT("CDockContainerWidget::dropFloatingWidget");
11911195
CDockAreaWidget* DockArea = dockAreaAt(TargetPos);
11921196
auto dropArea = InvalidDockWidgetArea;
11931197
auto ContainerDropArea = d->DockManager->containerOverlay()->dropAreaUnderCursor();
@@ -1207,7 +1211,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
12071211

12081212
if (dropArea != InvalidDockWidgetArea)
12091213
{
1210-
qDebug() << "Dock Area Drop Content: " << dropArea;
1214+
ADS_PRINT("Dock Area Drop Content: " << dropArea);
12111215
d->dropIntoSection(FloatingWidget, DockArea, dropArea);
12121216
}
12131217
}
@@ -1216,7 +1220,7 @@ void CDockContainerWidget::dropFloatingWidget(CFloatingDockContainer* FloatingWi
12161220
if (InvalidDockWidgetArea == dropArea)
12171221
{
12181222
dropArea = ContainerDropArea;
1219-
qDebug() << "Container Drop Content: " << dropArea;
1223+
ADS_PRINT("Container Drop Content: " << dropArea);
12201224
if (dropArea != InvalidDockWidgetArea)
12211225
{
12221226
d->dropIntoContainer(FloatingWidget, dropArea);
@@ -1258,8 +1262,8 @@ QList<CDockAreaWidget*> CDockContainerWidget::openedDockAreas() const
12581262
//============================================================================
12591263
void CDockContainerWidget::saveState(QXmlStreamWriter& s) const
12601264
{
1261-
qDebug() << "CDockContainerWidget::saveState isFloating "
1262-
<< isFloating();
1265+
ADS_PRINT("CDockContainerWidget::saveState isFloating "
1266+
<< isFloating());
12631267

12641268
s.writeStartElement("Container");
12651269
s.writeAttribute("Floating", QString::number(isFloating() ? 1 : 0));
@@ -1282,7 +1286,7 @@ void CDockContainerWidget::saveState(QXmlStreamWriter& s) const
12821286
bool CDockContainerWidget::restoreState(QXmlStreamReader& s, bool Testing)
12831287
{
12841288
bool IsFloating = s.attributes().value("Floating").toInt();
1285-
qDebug() << "Restore CDockContainerWidget Floating" << IsFloating;
1289+
ADS_PRINT("Restore CDockContainerWidget Floating" << IsFloating);
12861290

12871291
QWidget*NewRootSplitter {};
12881292
if (!Testing)
@@ -1294,7 +1298,7 @@ bool CDockContainerWidget::restoreState(QXmlStreamReader& s, bool Testing)
12941298

12951299
if (IsFloating)
12961300
{
1297-
qDebug() << "Restore floating widget";
1301+
ADS_PRINT("Restore floating widget");
12981302
if (!s.readNextStartElement() || s.name() != "Geometry")
12991303
{
13001304
return false;

0 commit comments

Comments
 (0)