From c69fff52cc7e884a52d1a4556bc3f539406fd3ee Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 20 Apr 2020 17:49:06 +0200 Subject: [PATCH] Remove useless using std --- src/collection/collectiondirectorymodel.cpp | 2 -- src/collection/collectionview.cpp | 2 -- src/collection/collectionview.h | 2 -- src/core/player.cpp | 5 +---- src/core/player.h | 2 -- src/core/songloader.cpp | 3 --- src/covermanager/coversearchstatisticsdialog.cpp | 2 -- src/device/devicemanager.cpp | 4 +--- src/engine/gstengine.cpp | 13 +++++-------- src/engine/gstenginepipeline.h | 2 -- src/engine/xineengine.cpp | 2 -- src/engine/xineengine.h | 2 -- src/moodbar/moodbarloader.cpp | 2 -- src/musicbrainz/acoustidclient.cpp | 2 -- src/musicbrainz/musicbrainzclient.cpp | 3 --- src/organise/organiseerrordialog.cpp | 2 -- src/playlist/playlistbackend.cpp | 3 +-- src/playlistparsers/playlistparser.cpp | 2 -- src/queue/queue.cpp | 2 -- src/queue/queueview.cpp | 2 -- src/subsonic/subsonicservice.cpp | 2 -- src/subsonic/subsonicservice.h | 2 -- src/transcoder/transcodedialog.cpp | 2 -- src/transcoder/transcoder.cpp | 7 ++----- tests/src/playlist_test.cpp | 7 +++---- 25 files changed, 13 insertions(+), 66 deletions(-) diff --git a/src/collection/collectiondirectorymodel.cpp b/src/collection/collectiondirectorymodel.cpp index ebdeb5ec5..6cdc44771 100644 --- a/src/collection/collectiondirectorymodel.cpp +++ b/src/collection/collectiondirectorymodel.cpp @@ -34,8 +34,6 @@ #include "collectionbackend.h" #include "collectiondirectorymodel.h" -using std::shared_ptr; - CollectionDirectoryModel::CollectionDirectoryModel(CollectionBackend *backend, QObject *parent) : QStandardItemModel(parent), dir_icon_(IconLoader::Load("document-open-folder")), diff --git a/src/collection/collectionview.cpp b/src/collection/collectionview.cpp index 8209f8e7e..6ebb084b6 100644 --- a/src/collection/collectionview.cpp +++ b/src/collection/collectionview.cpp @@ -64,8 +64,6 @@ #include "organise/organisedialog.h" #include "settings/collectionsettingspage.h" -using std::unique_ptr; - CollectionView::CollectionView(QWidget *parent) : AutoExpandingTreeView(parent), app_(nullptr), diff --git a/src/collection/collectionview.h b/src/collection/collectionview.h index e4ee1afc0..f7e274874 100644 --- a/src/collection/collectionview.h +++ b/src/collection/collectionview.h @@ -47,8 +47,6 @@ class CollectionFilterWidget; class EditTagDialog; class OrganiseDialog; -using std::unique_ptr; - class CollectionView : public AutoExpandingTreeView { Q_OBJECT diff --git a/src/core/player.cpp b/src/core/player.cpp index d147c2795..d7d49dc84 100644 --- a/src/core/player.cpp +++ b/src/core/player.cpp @@ -75,9 +75,6 @@ #include "internet/internetservice.h" #include "scrobbler/audioscrobbler.h" -using std::shared_ptr; -using std::unique_ptr; - const char *Player::kSettingsGroup = "Player"; Player::Player(Application *app, QObject *parent) @@ -125,7 +122,7 @@ Engine::EngineType Player::CreateEngine(Engine::EngineType enginetype) { #ifdef HAVE_GSTREAMER case Engine::GStreamer:{ use_enginetype=Engine::GStreamer; - unique_ptr gst_engine(new GstEngine(app_->task_manager())); + std::unique_ptr gst_engine(new GstEngine(app_->task_manager())); gst_engine->SetStartup(gst_startup_); engine_.reset(gst_engine.release()); break; diff --git a/src/core/player.h b/src/core/player.h index b34088e95..d8c2df4e9 100644 --- a/src/core/player.h +++ b/src/core/player.h @@ -48,8 +48,6 @@ class Equalizer; class GstStartup; #endif -using std::unique_ptr; - namespace Engine { struct SimpleMetaBundle; } // namespace Engine diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp index 6924caa71..27026091b 100644 --- a/src/core/songloader.cpp +++ b/src/core/songloader.cpp @@ -66,9 +66,6 @@ #endif using std::placeholders::_1; -using std::bind; -using std::stable_sort; -using std::shared_ptr; QSet SongLoader::sRawUriSchemes; const int SongLoader::kDefaultTimeout = 5000; diff --git a/src/covermanager/coversearchstatisticsdialog.cpp b/src/covermanager/coversearchstatisticsdialog.cpp index fe01d6b79..f84fd59e3 100644 --- a/src/covermanager/coversearchstatisticsdialog.cpp +++ b/src/covermanager/coversearchstatisticsdialog.cpp @@ -37,8 +37,6 @@ #include "coversearchstatisticsdialog.h" #include "ui_coversearchstatisticsdialog.h" -using std::sort; - CoverSearchStatisticsDialog::CoverSearchStatisticsDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_CoverSearchStatisticsDialog) { diff --git a/src/device/devicemanager.cpp b/src/device/devicemanager.cpp index ff314eed4..3ec8bcd3a 100644 --- a/src/device/devicemanager.cpp +++ b/src/device/devicemanager.cpp @@ -87,8 +87,6 @@ # include "giolister.h" // Needs to be last because of #undef signals. #endif -using std::bind; - const int DeviceManager::kDeviceIconSize = 32; const int DeviceManager::kDeviceIconOverlaySize = 16; @@ -108,7 +106,7 @@ DeviceManager::DeviceManager(Application *app, QObject *parent) connect(this, SIGNAL(DeviceCreatedFromDB(DeviceInfo*)), SLOT(AddDeviceFromDB(DeviceInfo*))); // This reads from the database and contents on the database mutex, which can be very slow on startup. - ConcurrentRun::Run(&thread_pool_, bind(&DeviceManager::LoadAllDevices, this)); + ConcurrentRun::Run(&thread_pool_, std::bind(&DeviceManager::LoadAllDevices, this)); // This proxy model only shows connected devices connected_devices_model_ = new DeviceStateFilterModel(this); diff --git a/src/engine/gstengine.cpp b/src/engine/gstengine.cpp index 96489229e..34ed67b7c 100644 --- a/src/engine/gstengine.cpp +++ b/src/engine/gstengine.cpp @@ -58,9 +58,6 @@ #include "gstenginepipeline.h" #include "gstbufferconsumer.h" -using std::shared_ptr; -using std::vector; - const char *GstEngine::kAutoSink = "autoaudiosink"; const char *GstEngine::kALSASink = "alsasink"; const char *GstEngine::kOpenALSASink = "openalsink"; @@ -167,7 +164,7 @@ bool GstEngine::Load(const QUrl &stream_url, const QUrl &original_url, Engine::T return true; } - shared_ptr pipeline = CreatePipeline(gst_url, original_url, force_stop_at_end ? end_nanosec : 0); + std::shared_ptr pipeline = CreatePipeline(gst_url, original_url, force_stop_at_end ? end_nanosec : 0); if (!pipeline) return false; if (crossfade) StartFadeout(); @@ -749,11 +746,11 @@ void GstEngine::StopTimers() { } } -shared_ptr GstEngine::CreatePipeline() { +std::shared_ptr GstEngine::CreatePipeline() { EnsureInitialised(); - shared_ptr ret(new GstEnginePipeline(this)); + std::shared_ptr ret(new GstEnginePipeline(this)); ret->set_output_device(output_, device_); ret->set_volume_enabled(volume_control_); ret->set_stereo_balancer_enabled(stereo_balancer_enabled_); @@ -778,9 +775,9 @@ shared_ptr GstEngine::CreatePipeline() { } -shared_ptr GstEngine::CreatePipeline(const QByteArray &gst_url, const QUrl &original_url, const qint64 end_nanosec) { +std::shared_ptr GstEngine::CreatePipeline(const QByteArray &gst_url, const QUrl &original_url, const qint64 end_nanosec) { - shared_ptr ret = CreatePipeline(); + std::shared_ptr ret = CreatePipeline(); if (!ret->InitFromUrl(gst_url, original_url, end_nanosec)) ret.reset(); return ret; diff --git a/src/engine/gstenginepipeline.h b/src/engine/gstenginepipeline.h index e4404e14b..3b823ac1f 100644 --- a/src/engine/gstenginepipeline.h +++ b/src/engine/gstenginepipeline.h @@ -44,8 +44,6 @@ #include #include -using std::unique_ptr; - class QTimerEvent; class GstEngine; class GstBufferConsumer; diff --git a/src/engine/xineengine.cpp b/src/engine/xineengine.cpp index 97761bd25..67858b273 100644 --- a/src/engine/xineengine.cpp +++ b/src/engine/xineengine.cpp @@ -62,8 +62,6 @@ # include "xinescope.h" #endif -using std::shared_ptr; - #ifndef LLONG_MAX #define LLONG_MAX 9223372036854775807LL #endif diff --git a/src/engine/xineengine.h b/src/engine/xineengine.h index 70e3c840e..bef08b83d 100644 --- a/src/engine/xineengine.h +++ b/src/engine/xineengine.h @@ -39,8 +39,6 @@ #include "engine_fwd.h" #include "enginebase.h" -using std::shared_ptr; - class TaskManager; class PruneScopeThread; diff --git a/src/moodbar/moodbarloader.cpp b/src/moodbar/moodbarloader.cpp index 25f581f23..69ecc5821 100644 --- a/src/moodbar/moodbarloader.cpp +++ b/src/moodbar/moodbarloader.cpp @@ -50,8 +50,6 @@ # include #endif -using std::unique_ptr; - MoodbarLoader::MoodbarLoader(Application* app, QObject* parent) : QObject(parent), cache_(new QNetworkDiskCache(this)), diff --git a/src/musicbrainz/acoustidclient.cpp b/src/musicbrainz/acoustidclient.cpp index 106ff5371..a899ef262 100644 --- a/src/musicbrainz/acoustidclient.cpp +++ b/src/musicbrainz/acoustidclient.cpp @@ -49,8 +49,6 @@ #include "core/timeconstants.h" #include "core/logging.h" -using std::stable_sort; - const char *AcoustidClient::kClientId = "0qjUoxbowg"; const char *AcoustidClient::kUrl = "https://api.acoustid.org/v2/lookup"; const int AcoustidClient::kDefaultTimeout = 5000; // msec diff --git a/src/musicbrainz/musicbrainzclient.cpp b/src/musicbrainz/musicbrainzclient.cpp index 2898c8c65..5cc31ede9 100644 --- a/src/musicbrainz/musicbrainzclient.cpp +++ b/src/musicbrainz/musicbrainzclient.cpp @@ -51,9 +51,6 @@ #include "core/utilities.h" #include "musicbrainzclient.h" -using std::sort; -using std::stable_sort; - const char *MusicBrainzClient::kTrackUrl = "https://musicbrainz.org/ws/2/recording/"; const char *MusicBrainzClient::kDiscUrl = "https://musicbrainz.org/ws/2/discid/"; const char *MusicBrainzClient::kDateRegex = "^[12]\\d{3}"; diff --git a/src/organise/organiseerrordialog.cpp b/src/organise/organiseerrordialog.cpp index 77993e85e..05e73e085 100644 --- a/src/organise/organiseerrordialog.cpp +++ b/src/organise/organiseerrordialog.cpp @@ -36,8 +36,6 @@ #include "organiseerrordialog.h" #include "ui_organiseerrordialog.h" -using std::stable_sort; - OrganiseErrorDialog::OrganiseErrorDialog(QWidget *parent) : QDialog(parent), ui_(new Ui_OrganiseErrorDialog) { ui_->setupUi(this); diff --git a/src/playlist/playlistbackend.cpp b/src/playlist/playlistbackend.cpp index 1e05f00c8..be56d2443 100644 --- a/src/playlist/playlistbackend.cpp +++ b/src/playlist/playlistbackend.cpp @@ -57,7 +57,6 @@ #include "playlistparsers/cueparser.h" using std::placeholders::_1; -using std::shared_ptr; const int PlaylistBackend::kSongTableJoins = 2; @@ -346,7 +345,7 @@ void PlaylistBackend::SavePlaylist(int playlist, const PlaylistItemList &items, if (db_->CheckErrors(clear)) return; // Save the new ones - for (const PlaylistItemPtr item : items) { + for (PlaylistItemPtr item : items) { insert.bindValue(":playlist", playlist); item->BindToQuery(&insert); diff --git a/src/playlistparsers/playlistparser.cpp b/src/playlistparsers/playlistparser.cpp index 7e022b58b..34adae0d2 100644 --- a/src/playlistparsers/playlistparser.cpp +++ b/src/playlistparsers/playlistparser.cpp @@ -42,8 +42,6 @@ #include "wplparser.h" #include "xspfparser.h" -using std::stable_sort; - const int PlaylistParser::kMagicSize = 512; PlaylistParser::PlaylistParser(CollectionBackendInterface *collection, QObject *parent) diff --git a/src/queue/queue.cpp b/src/queue/queue.cpp index eafdcdfd2..47cb1f129 100644 --- a/src/queue/queue.cpp +++ b/src/queue/queue.cpp @@ -42,8 +42,6 @@ #include "playlist/playlistitem.h" #include "queue.h" -using std::stable_sort; - const char *Queue::kRowsMimetype = "application/x-strawberry-queue-rows"; Queue::Queue(Playlist *parent) : QAbstractProxyModel(parent), playlist_(parent), total_length_ns_(0) { diff --git a/src/queue/queueview.cpp b/src/queue/queueview.cpp index 4b7a8a6e2..441d061c3 100644 --- a/src/queue/queueview.cpp +++ b/src/queue/queueview.cpp @@ -40,8 +40,6 @@ #include "queueview.h" #include "ui_queueview.h" -using std::stable_sort; - QueueView::QueueView(QWidget *parent) : QWidget(parent), ui_(new Ui_QueueView), diff --git a/src/subsonic/subsonicservice.cpp b/src/subsonic/subsonicservice.cpp index 2763c4fd1..abba3a387 100644 --- a/src/subsonic/subsonicservice.cpp +++ b/src/subsonic/subsonicservice.cpp @@ -57,8 +57,6 @@ #include "settings/settingsdialog.h" #include "settings/subsonicsettingspage.h" -using std::shared_ptr; - const Song::Source SubsonicService::kSource = Song::Source_Subsonic; const char *SubsonicService::kClientName = "Strawberry"; const char *SubsonicService::kApiVersion = "1.11.0"; diff --git a/src/subsonic/subsonicservice.h b/src/subsonic/subsonicservice.h index 8c98fe610..69be2cd43 100644 --- a/src/subsonic/subsonicservice.h +++ b/src/subsonic/subsonicservice.h @@ -48,8 +48,6 @@ class SubsonicRequest; class CollectionBackend; class CollectionModel; -using std::shared_ptr; - class SubsonicService : public InternetService { Q_OBJECT diff --git a/src/transcoder/transcodedialog.cpp b/src/transcoder/transcodedialog.cpp index 87ffc6439..5882f90a3 100644 --- a/src/transcoder/transcodedialog.cpp +++ b/src/transcoder/transcodedialog.cpp @@ -70,8 +70,6 @@ #undef AddJob #endif -using std::sort; - const char *TranscodeDialog::kSettingsGroup = "Transcoder"; const int TranscodeDialog::kProgressInterval = 500; const int TranscodeDialog::kMaxDestinationItems = 10; diff --git a/src/transcoder/transcoder.cpp b/src/transcoder/transcoder.cpp index 57b14a7eb..53ba1a643 100644 --- a/src/transcoder/transcoder.cpp +++ b/src/transcoder/transcoder.cpp @@ -46,9 +46,6 @@ #include "core/signalchecker.h" #include "transcoder.h" -using std::shared_ptr; -using std::sort; - int Transcoder::JobFinishedEvent::sEventType = -1; TranscoderPreset::TranscoderPreset(Song::FileType type, const QString &name, const QString &extension, const QString &codec_mimetype, const QString &muxer_mimetype) @@ -414,7 +411,7 @@ void Transcoder::JobState::ReportError(GstMessage *msg) { bool Transcoder::StartJob(const Job &job) { - shared_ptr state(new JobState(job, this)); + std::shared_ptr state(new JobState(job, this)); emit LogLine(tr("Starting %1").arg(QDir::toNativeSeparators(job.input))); @@ -526,7 +523,7 @@ void Transcoder::Cancel() { // Stop the running ones JobStateList::iterator it = current_jobs_.begin(); while (it != current_jobs_.end()) { - shared_ptr state(*it); + std::shared_ptr state(*it); // Remove event handlers from the gstreamer pipeline so they don't get called after the pipeline is shutting down gst_bus_set_sync_handler(gst_pipeline_get_bus(GST_PIPELINE(state->pipeline_)), nullptr, nullptr, nullptr); diff --git a/tests/src/playlist_test.cpp b/tests/src/playlist_test.cpp index df3334f45..c88edde30 100644 --- a/tests/src/playlist_test.cpp +++ b/tests/src/playlist_test.cpp @@ -33,7 +33,6 @@ #include #include -using std::shared_ptr; using ::testing::Return; namespace { @@ -60,8 +59,8 @@ class PlaylistTest : public ::testing::Test { return ret; } - shared_ptr MakeMockItemP(const QString& title, const QString& artist = QString(), const QString& album = QString(), int length = 123) const { - return shared_ptr(MakeMockItem(title, artist, album, length)); + std::shared_ptr MakeMockItemP(const QString& title, const QString& artist = QString(), const QString& album = QString(), int length = 123) const { + return std::shared_ptr(MakeMockItem(title, artist, album, length)); } Playlist playlist_; @@ -76,7 +75,7 @@ TEST_F(PlaylistTest, Basic) { TEST_F(PlaylistTest, InsertItems) { MockPlaylistItem* item = MakeMockItem("Title", "Artist", "Album", 123); - shared_ptr item_ptr(item); + std::shared_ptr item_ptr(item); // Insert the item EXPECT_EQ(0, playlist_.rowCount(QModelIndex()));