diff --git a/AdvancedDockingSystem/src/ContainerWidget.cpp b/AdvancedDockingSystem/src/ContainerWidget.cpp index 234dd02..523a36a 100644 --- a/AdvancedDockingSystem/src/ContainerWidget.cpp +++ b/AdvancedDockingSystem/src/ContainerWidget.cpp @@ -195,7 +195,7 @@ bool ContainerWidget::showSectionContent(const SectionContent::RefPtr& sc) // Already visible? // TODO - qDebug("Unable to show SectionContent, don't know where 8-/ (already visible?)"); + qWarning("Unable to show SectionContent, don't know where 8-/ (already visible?)"); return false; } @@ -385,8 +385,6 @@ bool ContainerWidget::restoreState(const QByteArray& data) if (data.isEmpty()) return false; - qDebug() << "Begin to restore state"; - ADS_NS_SER::InMemoryReader reader(data); if (!reader.initReadHeader()) return false; @@ -397,13 +395,6 @@ bool ContainerWidget::restoreState(const QByteArray& data) { restoreHierarchy(hierarchyData); } -// QByteArray sectionIndexData; -// if (reader.read(ADS_NS_SER::ET_SectionIndex, sectionIndexData)) -// { -// // do we need it? -// } - - qDebug() << "End of restore state"; return true; } @@ -702,8 +693,6 @@ QByteArray ContainerWidget::saveHierarchy() const ... todo ... ENDIF */ - qDebug() << "Begin save state"; - QByteArray ba; QDataStream out(&ba, QIODevice::WriteOnly); out.setVersion(QDataStream::Qt_4_5); @@ -765,7 +754,6 @@ QByteArray ContainerWidget::saveHierarchy() const out << -1; qWarning() << "Oh noooz.. Something went wrong. There are too many items in _mainLayout."; } - qDebug() << "End save state"; return ba; } @@ -1057,7 +1045,6 @@ bool ContainerWidget::restoreFloatingWidgets(QDataStream& in, int version, QList in >> geom; bool visible = false; in >> visible; - qDebug() << "Restore FloatingWidget" << uname << geom << visible; const SectionContent::RefPtr sc = SCLookupMapByName(this).value(uname).toStrongRef(); if (!sc) @@ -1176,7 +1163,7 @@ bool ContainerWidget::restoreSectionWidgets(QDataStream& in, int version, QSplit // Unknown else { - qDebug() << QString(); + qWarning() << "Unknown object type during restore"; } return true; @@ -1215,7 +1202,6 @@ void ContainerWidget::onActiveTabChanged() SectionTitleWidget* stw = qobject_cast(sender()); if (stw) { - qDebug() << "Active tab changed" << stw->_content->uid() << stw->isActiveTab(); emit activeTabChanged(stw->_content, stw->isActiveTab()); } } diff --git a/AdvancedDockingSystem/src/DropOverlay.cpp b/AdvancedDockingSystem/src/DropOverlay.cpp index 1b1e829..269d84c 100644 --- a/AdvancedDockingSystem/src/DropOverlay.cpp +++ b/AdvancedDockingSystem/src/DropOverlay.cpp @@ -1,6 +1,5 @@ #include "ads/DropOverlay.h" -#include #include #include #include diff --git a/AdvancedDockingSystem/src/FloatingWidget.cpp b/AdvancedDockingSystem/src/FloatingWidget.cpp index 4bc2dc8..8411526 100644 --- a/AdvancedDockingSystem/src/FloatingWidget.cpp +++ b/AdvancedDockingSystem/src/FloatingWidget.cpp @@ -1,7 +1,5 @@ - #include "ads/FloatingWidget.h" -#include #include #include #include @@ -52,7 +50,6 @@ FloatingWidget::FloatingWidget(ContainerWidget* container, SectionContent::RefPt FloatingWidget::~FloatingWidget() { - qDebug() << Q_FUNC_INFO; _container->_floatings.removeAll(this); // Note: I don't like this here, but we have to remove it from list... } diff --git a/AdvancedDockingSystem/src/SectionContent.cpp b/AdvancedDockingSystem/src/SectionContent.cpp index 13a750b..d68a75d 100644 --- a/AdvancedDockingSystem/src/SectionContent.cpp +++ b/AdvancedDockingSystem/src/SectionContent.cpp @@ -1,6 +1,5 @@ #include "ads/SectionContent.h" -#include #include #include diff --git a/AdvancedDockingSystem/src/SectionContentWidget.cpp b/AdvancedDockingSystem/src/SectionContentWidget.cpp index 6847906..af90f4b 100644 --- a/AdvancedDockingSystem/src/SectionContentWidget.cpp +++ b/AdvancedDockingSystem/src/SectionContentWidget.cpp @@ -1,6 +1,5 @@ #include "ads/SectionContentWidget.h" -#include #include ADS_NAMESPACE_BEGIN @@ -9,8 +8,6 @@ SectionContentWidget::SectionContentWidget(SectionContent::RefPtr c, QWidget* pa QFrame(parent), _content(c) { - qDebug() << Q_FUNC_INFO; - QBoxLayout* l = new QBoxLayout(QBoxLayout::TopToBottom); l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); @@ -20,7 +17,6 @@ SectionContentWidget::SectionContentWidget(SectionContent::RefPtr c, QWidget* pa SectionContentWidget::~SectionContentWidget() { - qDebug() << Q_FUNC_INFO; layout()->removeWidget(_content->contentWidget()); } diff --git a/AdvancedDockingSystem/src/SectionTitleWidget.cpp b/AdvancedDockingSystem/src/SectionTitleWidget.cpp index 5d13ca3..243b394 100644 --- a/AdvancedDockingSystem/src/SectionTitleWidget.cpp +++ b/AdvancedDockingSystem/src/SectionTitleWidget.cpp @@ -1,6 +1,5 @@ #include "ads/SectionTitleWidget.h" -#include #include #include #include @@ -31,8 +30,6 @@ SectionTitleWidget::SectionTitleWidget(SectionContent::RefPtr content, QWidget* _tabMoving(false), _activeTab(false) { - qDebug() << Q_FUNC_INFO; - QBoxLayout* l = new QBoxLayout(QBoxLayout::LeftToRight); l->setContentsMargins(0, 0, 0, 0); l->setSpacing(0); @@ -42,7 +39,6 @@ SectionTitleWidget::SectionTitleWidget(SectionContent::RefPtr content, QWidget* SectionTitleWidget::~SectionTitleWidget() { - qDebug() << Q_FUNC_INFO; layout()->removeWidget(_content->titleWidget()); } @@ -67,7 +63,6 @@ void SectionTitleWidget::setActiveTab(bool active) void SectionTitleWidget::mousePressEvent(QMouseEvent* ev) { -// qDebug() << Q_FUNC_INFO << ev->pos(); if (ev->button() == Qt::LeftButton) { _dragStartPos = ev->pos(); @@ -79,7 +74,6 @@ void SectionTitleWidget::mousePressEvent(QMouseEvent* ev) void SectionTitleWidget::mouseReleaseEvent(QMouseEvent* ev) { -// qDebug() << Q_FUNC_INFO << ev->pos(); SectionWidget* section = NULL; // Drop contents of FloatingWidget into SectionWidget. @@ -161,14 +155,11 @@ void SectionTitleWidget::mouseReleaseEvent(QMouseEvent* ev) else if (_tabMoving && (section = findParentSectionWidget(this)) != NULL) { - qDebug() << "Stop tab move"; - // Find tab under mouse QPoint pos = ev->globalPos(); pos = section->mapFromGlobal(pos); const int fromIndex = section->indexOfContent(_content); const int toIndex = section->indexOfContentByTitlePos(pos, this); - qDebug() << "from" << fromIndex << "to" << toIndex; section->moveContent(fromIndex, toIndex); section->layout()->update(); } diff --git a/AdvancedDockingSystem/src/SectionWidget.cpp b/AdvancedDockingSystem/src/SectionWidget.cpp index 3c50cc0..574f134 100644 --- a/AdvancedDockingSystem/src/SectionWidget.cpp +++ b/AdvancedDockingSystem/src/SectionWidget.cpp @@ -78,7 +78,6 @@ SectionWidget::SectionWidget(ContainerWidget* parent) : SectionWidget::~SectionWidget() { - qDebug() << Q_FUNC_INFO; if (_container) { SWLookupMapById(_container).remove(_uid); @@ -90,7 +89,6 @@ SectionWidget::~SectionWidget() if (splitter && splitter->count() == 0) { splitter->deleteLater(); - qDebug() << "Delete empty splitter"; } } @@ -279,7 +277,6 @@ void SectionWidget::setCurrentIndex(int index) qWarning() << Q_FUNC_INFO << "Invalid index" << index; return; } - qDebug() << Q_FUNC_INFO << index << QString("section=%1; content=%2").arg(_uid).arg(_contents.at(index)->uniqueName()); // Set active TAB for (int i = 0; i < _tabsLayout->count(); ++i) @@ -314,7 +311,6 @@ void SectionWidget::onSectionTitleClicked() void SectionWidget::onCloseButtonClicked() { - qDebug() << Q_FUNC_INFO << currentIndex(); const int index = currentIndex(); if (index < 0 || index > _contents.size() - 1) return;