diff options
| author | Serg Podtynnyi <[email protected]> | 2023-02-04 00:14:53 +0700 |
|---|---|---|
| committer | Serg Podtynnyi <[email protected]> | 2023-02-05 12:45:38 +0700 |
| commit | 38c34eeca315c7be58e65d4d3fb72aaf7b866719 (patch) | |
| tree | 886e53f20c9c43edc3eb7fe04789716a9bc98ebe /src/statusbar | |
| parent | ffff8af851e3a386c44438337779d0ce7ca98a61 (diff) | |
Add clang-format and format code as in Frameworks
Diffstat (limited to 'src/statusbar')
| -rw-r--r-- | src/statusbar/dolphinstatusbar.cpp | 76 | ||||
| -rw-r--r-- | src/statusbar/dolphinstatusbar.h | 30 | ||||
| -rw-r--r-- | src/statusbar/mountpointobserver.cpp | 16 | ||||
| -rw-r--r-- | src/statusbar/mountpointobserver.h | 15 | ||||
| -rw-r--r-- | src/statusbar/mountpointobservercache.cpp | 19 | ||||
| -rw-r--r-- | src/statusbar/mountpointobservercache.h | 12 | ||||
| -rw-r--r-- | src/statusbar/spaceinfoobserver.cpp | 18 | ||||
| -rw-r--r-- | src/statusbar/spaceinfoobserver.h | 8 | ||||
| -rw-r--r-- | src/statusbar/statusbarspaceinfo.cpp | 18 | ||||
| -rw-r--r-- | src/statusbar/statusbarspaceinfo.h | 10 |
10 files changed, 112 insertions, 110 deletions
diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 70ebe0c3c..42ce58f64 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -24,24 +24,25 @@ #include <QTimer> #include <QToolButton> -namespace { - const int UpdateDelay = 50; +namespace +{ +const int UpdateDelay = 50; } -DolphinStatusBar::DolphinStatusBar(QWidget* parent) : - QWidget(parent), - m_text(), - m_defaultText(), - m_label(nullptr), - m_zoomLabel(nullptr), - m_spaceInfo(nullptr), - m_zoomSlider(nullptr), - m_progressBar(nullptr), - m_stopButton(nullptr), - m_progress(100), - m_showProgressBarTimer(nullptr), - m_delayUpdateTimer(nullptr), - m_textTimestamp() +DolphinStatusBar::DolphinStatusBar(QWidget *parent) + : QWidget(parent) + , m_text() + , m_defaultText() + , m_label(nullptr) + , m_zoomLabel(nullptr) + , m_spaceInfo(nullptr) + , m_zoomSlider(nullptr) + , m_progressBar(nullptr) + , m_stopButton(nullptr) + , m_progress(100) + , m_showProgressBarTimer(nullptr) + , m_delayUpdateTimer(nullptr) + , m_textTimestamp() { // Initialize text label m_label = new KSqueezedTextLabel(m_text, this); @@ -49,7 +50,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_label->setTextFormat(Qt::PlainText); // Initialize zoom slider's explanatory label - m_zoomLabel = new QLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'","Zoom:"), this); + m_zoomLabel = new QLabel(i18nc("Used as a noun, i.e. 'Here is the zoom level:'", "Zoom:"), this); // Initialize zoom widget m_zoomSlider = new QSlider(Qt::Horizontal, this); @@ -89,8 +90,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_delayUpdateTimer = new QTimer(this); m_delayUpdateTimer->setInterval(UpdateDelay); m_delayUpdateTimer->setSingleShot(true); - connect(m_delayUpdateTimer, &QTimer::timeout, - this, &DolphinStatusBar::updateLabelText); + connect(m_delayUpdateTimer, &QTimer::timeout, this, &DolphinStatusBar::updateLabelText); // Initialize top layout and size policies const int fontHeight = QFontMetrics(m_label->font()).height(); @@ -112,7 +112,7 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : m_progressBar->setFixedHeight(zoomSliderHeight); m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 20); - QHBoxLayout* topLayout = new QHBoxLayout(this); + QHBoxLayout *topLayout = new QHBoxLayout(this); topLayout->setContentsMargins(2, 0, 2, 0); topLayout->setSpacing(4); topLayout->addWidget(m_label, 1); @@ -125,22 +125,23 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) : setVisible(GeneralSettings::showStatusBar()); setExtensionsVisible(true); - setWhatsThis(xi18nc("@info:whatsthis Statusbar", "<para>This is " - "the <emphasis>Statusbar</emphasis>. It contains three elements " - "by default (left to right):<list><item>A <emphasis>text field" - "</emphasis> that displays the size of selected items. If only " - "one item is selected the name and type is shown as well.</item>" - "<item>A <emphasis>zoom slider</emphasis> that allows you " - "to adjust the size of the icons in the view.</item>" - "<item><emphasis>Space information</emphasis> about the " - "current storage device.</item></list></para>")); + setWhatsThis(xi18nc("@info:whatsthis Statusbar", + "<para>This is " + "the <emphasis>Statusbar</emphasis>. It contains three elements " + "by default (left to right):<list><item>A <emphasis>text field" + "</emphasis> that displays the size of selected items. If only " + "one item is selected the name and type is shown as well.</item>" + "<item>A <emphasis>zoom slider</emphasis> that allows you " + "to adjust the size of the icons in the view.</item>" + "<item><emphasis>Space information</emphasis> about the " + "current storage device.</item></list></para>")); } DolphinStatusBar::~DolphinStatusBar() { } -void DolphinStatusBar::setText(const QString& text) +void DolphinStatusBar::setText(const QString &text) { if (m_text == text) { return; @@ -158,7 +159,7 @@ QString DolphinStatusBar::text() const return m_text; } -void DolphinStatusBar::setProgressText(const QString& text) +void DolphinStatusBar::setProgressText(const QString &text) { m_progressTextLabel->setText(text); } @@ -208,7 +209,7 @@ void DolphinStatusBar::resetToDefaultText() } } -void DolphinStatusBar::setDefaultText(const QString& text) +void DolphinStatusBar::setDefaultText(const QString &text) { m_defaultText = text; updateLabelText(); @@ -219,7 +220,7 @@ QString DolphinStatusBar::defaultText() const return m_defaultText; } -void DolphinStatusBar::setUrl(const QUrl& url) +void DolphinStatusBar::setUrl(const QUrl &url) { if (GeneralSettings::showSpaceInfo()) { m_spaceInfo->setUrl(url); @@ -254,21 +255,21 @@ void DolphinStatusBar::updateSpaceInfo() m_spaceInfo->update(); } -void DolphinStatusBar::contextMenuEvent(QContextMenuEvent* event) +void DolphinStatusBar::contextMenuEvent(QContextMenuEvent *event) { Q_UNUSED(event) QMenu menu(this); - QAction* showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); + QAction *showZoomSliderAction = menu.addAction(i18nc("@action:inmenu", "Show Zoom Slider")); showZoomSliderAction->setCheckable(true); showZoomSliderAction->setChecked(GeneralSettings::showZoomSlider()); - QAction* showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); + QAction *showSpaceInfoAction = menu.addAction(i18nc("@action:inmenu", "Show Space Information")); showSpaceInfoAction->setCheckable(true); showSpaceInfoAction->setChecked(GeneralSettings::showSpaceInfo()); - const QAction* action = menu.exec(QCursor::pos()); + const QAction *action = menu.exec(QCursor::pos()); if (action == showZoomSliderAction) { const bool visible = showZoomSliderAction->isChecked(); GeneralSettings::setShowZoomSlider(visible); @@ -334,4 +335,3 @@ void DolphinStatusBar::setExtensionsVisible(bool visible) m_zoomSlider->setVisible(showZoomSlider); m_zoomLabel->setVisible(showZoomSlider); } - diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h index 7b4434539..c3773d438 100644 --- a/src/statusbar/dolphinstatusbar.h +++ b/src/statusbar/dolphinstatusbar.h @@ -30,7 +30,7 @@ class DolphinStatusBar : public QWidget Q_OBJECT public: - explicit DolphinStatusBar(QWidget* parent); + explicit DolphinStatusBar(QWidget *parent); ~DolphinStatusBar() override; QString text() const; @@ -40,7 +40,7 @@ public: * DolphinStatusBar::setProgress() should be invoked * afterwards each time the progress changes. */ - void setProgressText(const QString& text); + void setProgressText(const QString &text); QString progressText() const; /** @@ -63,7 +63,7 @@ public: * Sets the default text, which is shown if the status bar * is rest by DolphinStatusBar::resetToDefaultText(). */ - void setDefaultText(const QString& text); + void setDefaultText(const QString &text); QString defaultText() const; QUrl url() const; @@ -80,8 +80,8 @@ public: void updateSpaceInfo(); public Q_SLOTS: - void setText(const QString& text); - void setUrl(const QUrl& url); + void setText(const QString &text); + void setUrl(const QUrl &url); void setZoomLevel(int zoomLevel); Q_SIGNALS: @@ -93,7 +93,7 @@ Q_SIGNALS: void zoomLevelChanged(int zoomLevel); protected: - void contextMenuEvent(QContextMenuEvent* event) override; + void contextMenuEvent(QContextMenuEvent *event) override; private Q_SLOTS: void showZoomSliderToolTip(int zoomLevel); @@ -123,19 +123,19 @@ private: private: QString m_text; QString m_defaultText; - KSqueezedTextLabel* m_label; - QLabel* m_zoomLabel; - StatusBarSpaceInfo* m_spaceInfo; + KSqueezedTextLabel *m_label; + QLabel *m_zoomLabel; + StatusBarSpaceInfo *m_spaceInfo; - QSlider* m_zoomSlider; + QSlider *m_zoomSlider; - QLabel* m_progressTextLabel; - QProgressBar* m_progressBar; - QToolButton* m_stopButton; + QLabel *m_progressTextLabel; + QProgressBar *m_progressBar; + QToolButton *m_stopButton; int m_progress; - QTimer* m_showProgressBarTimer; + QTimer *m_showProgressBarTimer; - QTimer* m_delayUpdateTimer; + QTimer *m_delayUpdateTimer; QTime m_textTimestamp; }; diff --git a/src/statusbar/mountpointobserver.cpp b/src/statusbar/mountpointobserver.cpp index 7dbe631b5..c24e9e244 100644 --- a/src/statusbar/mountpointobserver.cpp +++ b/src/statusbar/mountpointobserver.cpp @@ -10,16 +10,16 @@ #include <KIO/FileSystemFreeSpaceJob> -MountPointObserver::MountPointObserver(const QUrl& url, QObject* parent) : - QObject(parent), - m_url(url), - m_referenceCount(0) +MountPointObserver::MountPointObserver(const QUrl &url, QObject *parent) + : QObject(parent) + , m_url(url) + , m_referenceCount(0) { } -MountPointObserver* MountPointObserver::observerForUrl(const QUrl& url) +MountPointObserver *MountPointObserver::observerForUrl(const QUrl &url) { - MountPointObserver* observer = MountPointObserverCache::instance()->observerForUrl(url); + MountPointObserver *observer = MountPointObserverCache::instance()->observerForUrl(url); return observer; } @@ -28,12 +28,12 @@ void MountPointObserver::update() if (m_referenceCount == 0) { delete this; } else { - KIO::FileSystemFreeSpaceJob* job = KIO::fileSystemFreeSpace(m_url); + KIO::FileSystemFreeSpaceJob *job = KIO::fileSystemFreeSpace(m_url); connect(job, &KIO::FileSystemFreeSpaceJob::result, this, &MountPointObserver::freeSpaceResult); } } -void MountPointObserver::freeSpaceResult(KIO::Job* job, KIO::filesize_t size, KIO::filesize_t available) +void MountPointObserver::freeSpaceResult(KIO::Job *job, KIO::filesize_t size, KIO::filesize_t available) { if (!job->error()) { Q_EMIT spaceInfoChanged(size, available); diff --git a/src/statusbar/mountpointobserver.h b/src/statusbar/mountpointobserver.h index 9f5346d49..d26a0e7de 100644 --- a/src/statusbar/mountpointobserver.h +++ b/src/statusbar/mountpointobserver.h @@ -40,8 +40,10 @@ class MountPointObserver : public QObject { Q_OBJECT - explicit MountPointObserver(const QUrl& url, QObject* parent = nullptr); - ~MountPointObserver() override {} + explicit MountPointObserver(const QUrl &url, QObject *parent = nullptr); + ~MountPointObserver() override + { + } public: /** @@ -49,7 +51,10 @@ public: * internal reference count is increased then. When the observer is not needed any more, * deref() should be called, which decreases the reference count again. */ - void ref() { ++m_referenceCount; } + void ref() + { + ++m_referenceCount; + } /** * This function can be used to indicate that the caller does not need this MountPointObserver @@ -66,7 +71,7 @@ public: * Returns a MountPointObserver for the given \a url. If the caller intends to continue using * the returned object, it must call its ref() method. */ - static MountPointObserver* observerForUrl(const QUrl& url); + static MountPointObserver *observerForUrl(const QUrl &url); Q_SIGNALS: /** @@ -82,7 +87,7 @@ public Q_SLOTS: void update(); private Q_SLOTS: - void freeSpaceResult(KIO::Job* job, KIO::filesize_t size, KIO::filesize_t available); + void freeSpaceResult(KIO::Job *job, KIO::filesize_t size, KIO::filesize_t available); private: const QUrl m_url; diff --git a/src/statusbar/mountpointobservercache.cpp b/src/statusbar/mountpointobservercache.cpp index 9bab3d5f2..b0675d1f5 100644 --- a/src/statusbar/mountpointobservercache.cpp +++ b/src/statusbar/mountpointobservercache.cpp @@ -19,11 +19,10 @@ public: }; Q_GLOBAL_STATIC(MountPointObserverCacheSingleton, s_MountPointObserverCache) - -MountPointObserverCache::MountPointObserverCache() : - m_observerForMountPoint(), - m_mountPointForObserver(), - m_updateTimer(nullptr) +MountPointObserverCache::MountPointObserverCache() + : m_observerForMountPoint() + , m_mountPointForObserver() + , m_updateTimer(nullptr) { m_updateTimer = new QTimer(this); } @@ -32,12 +31,12 @@ MountPointObserverCache::~MountPointObserverCache() { } -MountPointObserverCache* MountPointObserverCache::instance() +MountPointObserverCache *MountPointObserverCache::instance() { return &s_MountPointObserverCache->instance; } -MountPointObserver* MountPointObserverCache::observerForUrl(const QUrl& url) +MountPointObserver *MountPointObserverCache::observerForUrl(const QUrl &url) { QUrl cachedObserverUrl; // If the url is a local path we can extract the root dir by checking the mount points. @@ -55,7 +54,7 @@ MountPointObserver* MountPointObserverCache::observerForUrl(const QUrl& url) cachedObserverUrl = url; } - MountPointObserver* observer = m_observerForMountPoint.value(cachedObserverUrl); + MountPointObserver *observer = m_observerForMountPoint.value(cachedObserverUrl); if (!observer) { observer = new MountPointObserver(cachedObserverUrl, this); m_observerForMountPoint.insert(cachedObserverUrl, observer); @@ -74,10 +73,10 @@ MountPointObserver* MountPointObserverCache::observerForUrl(const QUrl& url) return observer; } -void MountPointObserverCache::slotObserverDestroyed(QObject* observer) +void MountPointObserverCache::slotObserverDestroyed(QObject *observer) { Q_ASSERT(m_mountPointForObserver.contains(observer)); - const QUrl& url = m_mountPointForObserver.value(observer); + const QUrl &url = m_mountPointForObserver.value(observer); Q_ASSERT(m_observerForMountPoint.contains(url)); m_observerForMountPoint.remove(url); m_mountPointForObserver.remove(observer); diff --git a/src/statusbar/mountpointobservercache.h b/src/statusbar/mountpointobservercache.h index ab16fa760..92e1b6be3 100644 --- a/src/statusbar/mountpointobservercache.h +++ b/src/statusbar/mountpointobservercache.h @@ -21,23 +21,23 @@ class MountPointObserverCache : public QObject ~MountPointObserverCache() override; public: - static MountPointObserverCache* instance(); + static MountPointObserverCache *instance(); /** * Returns a MountPointObserver for the given \a url. A new observer is created if necessary. */ - MountPointObserver* observerForUrl(const QUrl& url); + MountPointObserver *observerForUrl(const QUrl &url); private Q_SLOTS: /** * Removes the given \a observer from the cache. */ - void slotObserverDestroyed(QObject* observer); + void slotObserverDestroyed(QObject *observer); private: - QHash<QUrl, MountPointObserver*> m_observerForMountPoint; - QHash<QObject*, QUrl> m_mountPointForObserver; - QTimer* m_updateTimer; + QHash<QUrl, MountPointObserver *> m_observerForMountPoint; + QHash<QObject *, QUrl> m_mountPointForObserver; + QTimer *m_updateTimer; friend class MountPointObserverCacheSingleton; }; diff --git a/src/statusbar/spaceinfoobserver.cpp b/src/statusbar/spaceinfoobserver.cpp index 457fe12ae..296371255 100644 --- a/src/statusbar/spaceinfoobserver.cpp +++ b/src/statusbar/spaceinfoobserver.cpp @@ -8,12 +8,12 @@ #include "mountpointobserver.h" -SpaceInfoObserver::SpaceInfoObserver(const QUrl& url, QObject* parent) : - QObject(parent), - m_mountPointObserver(nullptr), - m_hasData(false), - m_dataSize(0), - m_dataAvailable(0) +SpaceInfoObserver::SpaceInfoObserver(const QUrl &url, QObject *parent) + : QObject(parent) + , m_mountPointObserver(nullptr) + , m_hasData(false) + , m_dataSize(0) + , m_dataAvailable(0) { m_mountPointObserver = MountPointObserver::observerForUrl(url); m_mountPointObserver->ref(); @@ -39,9 +39,9 @@ quint64 SpaceInfoObserver::available() const return m_dataAvailable; } -void SpaceInfoObserver::setUrl(const QUrl& url) +void SpaceInfoObserver::setUrl(const QUrl &url) { - MountPointObserver* newObserver = MountPointObserver::observerForUrl(url); + MountPointObserver *newObserver = MountPointObserver::observerForUrl(url); if (newObserver != m_mountPointObserver) { if (m_mountPointObserver) { disconnect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); @@ -53,7 +53,7 @@ void SpaceInfoObserver::setUrl(const QUrl& url) m_mountPointObserver->ref(); connect(m_mountPointObserver, &MountPointObserver::spaceInfoChanged, this, &SpaceInfoObserver::spaceInfoChanged); - // If newObserver is cached it won't call update until the next timer update, + // If newObserver is cached it won't call update until the next timer update, // so update the observer now. m_mountPointObserver->update(); } diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h index 6c77316b1..f46c6cd6f 100644 --- a/src/statusbar/spaceinfoobserver.h +++ b/src/statusbar/spaceinfoobserver.h @@ -17,13 +17,13 @@ class SpaceInfoObserver : public QObject Q_OBJECT public: - explicit SpaceInfoObserver(const QUrl& url, QObject* parent = nullptr); + explicit SpaceInfoObserver(const QUrl &url, QObject *parent = nullptr); ~SpaceInfoObserver() override; quint64 size() const; quint64 available() const; - void setUrl(const QUrl& url); + void setUrl(const QUrl &url); public Q_SLOTS: void update(); @@ -38,9 +38,9 @@ private Q_SLOTS: void spaceInfoChanged(quint64 size, quint64 available); private: - MountPointObserver* m_mountPointObserver; + MountPointObserver *m_mountPointObserver; - bool m_hasData; + bool m_hasData; quint64 m_dataSize; quint64 m_dataAvailable; }; diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index 1debaec29..309e9d535 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -14,9 +14,9 @@ #include <KIO/Global> #include <QMouseEvent> -StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) : - KCapacityBar(KCapacityBar::DrawTextInline, parent), - m_observer(nullptr) +StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget *parent) + : KCapacityBar(KCapacityBar::DrawTextInline, parent) + , m_observer(nullptr) { setCursor(Qt::PointingHandCursor); } @@ -34,7 +34,7 @@ void StatusBarSpaceInfo::setShown(bool shown) } } -void StatusBarSpaceInfo::setUrl(const QUrl& url) +void StatusBarSpaceInfo::setUrl(const QUrl &url) { if (m_url != url) { m_url = url; @@ -58,7 +58,7 @@ void StatusBarSpaceInfo::update() } } -void StatusBarSpaceInfo::showEvent(QShowEvent* event) +void StatusBarSpaceInfo::showEvent(QShowEvent *event) { if (m_shown) { if (m_ready) { @@ -72,7 +72,7 @@ void StatusBarSpaceInfo::showEvent(QShowEvent* event) } } -void StatusBarSpaceInfo::hideEvent(QHideEvent* event) +void StatusBarSpaceInfo::hideEvent(QHideEvent *event) { if (m_ready) { m_observer.reset(); @@ -81,7 +81,7 @@ void StatusBarSpaceInfo::hideEvent(QHideEvent* event) KCapacityBar::hideEvent(event); } -void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event) +void StatusBarSpaceInfo::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { // Creates a menu with tools that help to find out more about free @@ -91,8 +91,7 @@ void StatusBarSpaceInfo::mousePressEvent(QMouseEvent* event) // the "Configure..." dialog KMoreToolsMenuFactory menuFactory(QStringLiteral("dolphin/statusbar-diskspace-menu")); menuFactory.setParentWidget(this); - auto menu = menuFactory.createMenuFromGroupingNames( - { "disk-usage", "more:", "disk-partitions" }, m_url); + auto menu = menuFactory.createMenuFromGroupingNames({"disk-usage", "more:", "disk-partitions"}, m_url); menu->exec(QCursor::pos()); } @@ -126,4 +125,3 @@ void StatusBarSpaceInfo::slotValuesChanged() update(); } } - diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 5b16942a4..932f09b7b 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -25,22 +25,22 @@ class StatusBarSpaceInfo : public KCapacityBar Q_OBJECT public: - explicit StatusBarSpaceInfo(QWidget* parent = nullptr); + explicit StatusBarSpaceInfo(QWidget *parent = nullptr); ~StatusBarSpaceInfo() override; /** * Use this to set the widget visibility as it can hide itself */ void setShown(bool); - void setUrl(const QUrl& url); + void setUrl(const QUrl &url); QUrl url() const; void update(); protected: - void showEvent(QShowEvent* event) override; - void hideEvent(QHideEvent* event) override; - void mousePressEvent(QMouseEvent* event) override; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; private Q_SLOTS: void slotValuesChanged(); |
