derive Clipboard from Singleton template, fixed clang-tidy error

m0dB · Jul 22, 2023 · 6ba9b46 · 6ba9b46
1 parent 1cd0d05
commit 6ba9b46
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 17 deletions.
diff --git a/src/coreservices.cpp b/src/coreservices.cpp
@@ -28,6 +28,7 @@
 #endif
 #include "soundio/soundmanager.h"
 #include "sources/soundsourceproxy.h"
+#include "util/clipboard.h"
 #include "util/db/dbconnectionpooled.h"
 #include "util/font.h"
 #include "util/logger.h"
@@ -332,6 +333,7 @@ void CoreServices::initialize(QApplication* pApp) {
 
     emit initializationProgressUpdate(50, tr("library"));
     CoverArtCache::createInstance();
+    Clipboard::createInstance();
 
     m_pTrackCollectionManager = std::make_shared<TrackCollectionManager>(
             this,
@@ -588,6 +590,8 @@ void CoreServices::finalize() {
     // CoverArtCache is fairly independent of everything else.
     CoverArtCache::destroy();
 
+    Clipboard::destroy();
+
     // PlayerManager depends on Engine, SoundManager, VinylControlManager, and Config
     // The player manager has to be deleted before the library to ensure
     // that all modified track metadata of loaded tracks is saved.

diff --git a/src/library/basetracktablemodel.cpp b/src/library/basetracktablemodel.cpp
@@ -369,13 +369,13 @@ void BaseTrackTableModel::cutTracks(const QModelIndexList& indices) {
 }
 
 void BaseTrackTableModel::copyTracks(const QModelIndexList& indices) const {
-    Clipboard::begin();
+    Clipboard::start();
     for (const QModelIndex& index : indices) {
         if (index.isValid()) {
             Clipboard::add(QUrl::fromLocalFile(getTrackLocation(index)));
         }
     }
-    Clipboard::end();
+    Clipboard::finish();
 }
 
 int BaseTrackTableModel::pasteTracks(const QModelIndex& insertionIndex) {

diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp
@@ -3,21 +3,16 @@
 #include <QApplication>
 #include <QClipboard>
 
-QString& Clipboard::text() {
-    static QString s_text;
-    return s_text;
-}
-
-void Clipboard::begin() {
-    text() = "";
+void Clipboard::start() {
+    instance()->m_text.clear();
 }
 
 void Clipboard::add(const QUrl& url) {
-    text().append(url.toString() + "\n");
+    instance()->m_text.append(url.toString() + "\n");
 }
 
-void Clipboard::end() {
-    QApplication::clipboard()->setText(text());
+void Clipboard::finish() {
+    QApplication::clipboard()->setText(instance()->m_text);
 }
 
 QList<QUrl> Clipboard::urls() {
@@ -28,7 +23,7 @@ QList<QUrl> Clipboard::urls() {
     QStringList strings = text.split("\n", QString::SkipEmptyParts);
 #endif
     QList<QUrl> result;
-    for (QString string : strings) {
+    for (const QString& string : strings) {
         result.append(QUrl(string));
     }
     return result;

diff --git a/src/util/clipboard.h b/src/util/clipboard.h
@@ -3,12 +3,14 @@
 #include <QString>
 #include <QUrl>
 
-class Clipboard {
-    static QString& text();
+#include "util/singleton.h"
+
+class Clipboard : public Singleton<Clipboard> {
+    QString m_text;
 
   public:
     static QList<QUrl> urls();
-    static void begin();
-    static void end();
+    static void start();
+    static void finish();
     static void add(const QUrl& url);
 };