X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/41253c0c81bafb54a0b6c82e5282e3add85e8a50..76e3eab6ea3545339da2fd30b838acbc8c0ff607:/src/dolphindockwidget.cpp diff --git a/src/dolphindockwidget.cpp b/src/dolphindockwidget.cpp index ccbecb0d6..d4c05eb5c 100644 --- a/src/dolphindockwidget.cpp +++ b/src/dolphindockwidget.cpp @@ -1,67 +1,52 @@ -/*************************************************************************** - * Copyright (C) 2010 by Peter Penz * - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - ***************************************************************************/ +/* + * SPDX-FileCopyrightText: 2010 Peter Penz + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ #include "dolphindockwidget.h" #include -namespace { - // Disable the 'Floatable' feature, i.e., the possibility to drag the - // dock widget out of the main window. This works around problems like - // https://bugs.kde.org/show_bug.cgi?id=288629 - // https://bugs.kde.org/show_bug.cgi?id=322299 - const QDockWidget::DockWidgetFeatures DefaultDockWidgetFeatures = QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable; +namespace +{ +// Disable the 'Floatable' feature, i.e., the possibility to drag the +// dock widget out of the main window. This works around problems like +// https://bugs.kde.org/show_bug.cgi?id=288629 +// https://bugs.kde.org/show_bug.cgi?id=322299 +const QDockWidget::DockWidgetFeatures DefaultDockWidgetFeatures = QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable; } - // Empty titlebar for the dock widgets when "Lock Layout" has been activated. +// Empty titlebar for the dock widgets when "Lock Layout" has been activated. class DolphinDockTitleBar : public QWidget { Q_OBJECT public: - DolphinDockTitleBar(QWidget* parent = 0) : QWidget(parent) {} - virtual ~DolphinDockTitleBar() {} + explicit DolphinDockTitleBar(QWidget *parent = nullptr) + : QWidget(parent) + { + } + ~DolphinDockTitleBar() override + { + } - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize minimumSizeHint() const override { const int border = style()->pixelMetric(QStyle::PM_DockWidgetTitleBarButtonMargin); return QSize(border, border); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { return minimumSizeHint(); } }; -DolphinDockWidget::DolphinDockWidget(const QString& title, QWidget* parent, Qt::WindowFlags flags) : - QDockWidget(title, parent, flags), - m_locked(false), - m_dockTitleBar(0) -{ - setFeatures(DefaultDockWidgetFeatures); -} - -DolphinDockWidget::DolphinDockWidget(QWidget* parent, Qt::WindowFlags flags) : - QDockWidget(parent, flags), - m_locked(false), - m_dockTitleBar(0) +DolphinDockWidget::DolphinDockWidget(const QString &title, QWidget *parent, Qt::WindowFlags flags) + : QDockWidget(title, parent, flags) + , m_locked(false) + , m_dockTitleBar(nullptr) { setFeatures(DefaultDockWidgetFeatures); } @@ -82,7 +67,7 @@ void DolphinDockWidget::setLocked(bool lock) setTitleBarWidget(m_dockTitleBar); setFeatures(QDockWidget::NoDockWidgetFeatures); } else { - setTitleBarWidget(0); + setTitleBarWidget(nullptr); setFeatures(DefaultDockWidgetFeatures); } }