dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace assert with Q_ASSERT

Browse Source
This commit is contained in:
Jonas Kvinge
2021-09-27 19:09:18 +02:00
parent 35db157617
commit 62e53b53f0
8 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/collection/collectionbackend.cpp
View File

@@ -21,8 +21,6 @@
#include "config.h" #include "config.h"
#include <cassert>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
#include <QApplication> #include <QApplication>
@@ -93,7 +91,7 @@ void CollectionBackend::ExitAsync() {
void CollectionBackend::Exit() { void CollectionBackend::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();

3
src/collection/collectionwatcher.cpp
View File

@@ -23,7 +23,6 @@
#include <utility> #include <utility>
#include <chrono> #include <chrono>
#include <cassert>
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>
@@ -125,7 +124,7 @@ void CollectionWatcher::ExitAsync() {
void CollectionWatcher::Exit() { void CollectionWatcher::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
Stop(); Stop();
if (backend_) backend_->Close(); if (backend_) backend_->Close();

3
src/core/database.cpp
View File

@@ -22,7 +22,6 @@
#include "config.h" #include "config.h"
#include <cstddef> #include <cstddef>
#include <cassert>
#include <sqlite3.h> #include <sqlite3.h>
#include <boost/scope_exit.hpp> #include <boost/scope_exit.hpp>
@@ -102,7 +101,7 @@ void Database::ExitAsync() {
void Database::Exit() { void Database::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
Close(); Close();
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();

3
src/core/tagreaderclient.cpp
View File

@@ -22,7 +22,6 @@
#include "config.h" #include "config.h"
#include <string> #include <string>
#include <cassert>
#include <QtGlobal> #include <QtGlobal>
#include <QObject> #include <QObject>
@@ -60,7 +59,7 @@ void TagReaderClient::ExitAsync() {
void TagReaderClient::Exit() { void TagReaderClient::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();

2
src/covermanager/albumcoverloader.cpp
View File

@@ -84,7 +84,7 @@ void AlbumCoverLoader::ExitAsync() {
void AlbumCoverLoader::Exit() { void AlbumCoverLoader::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();

4
src/device/devicedatabasebackend.cpp
View File

@@ -21,8 +21,6 @@
#include "config.h" #include "config.h"
#include <cassert>
#include <QObject> #include <QObject>
#include <QThread> #include <QThread>
#include <QMutex> #include <QMutex>
@@ -67,7 +65,7 @@ void DeviceDatabaseBackend::ExitAsync() {
void DeviceDatabaseBackend::Exit() { void DeviceDatabaseBackend::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
Close(); Close();
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();

4
src/device/filesystemdevice.cpp
View File

@@ -21,8 +21,6 @@
#include "config.h" #include "config.h"
#include <cassert>
#include <QThread> #include <QThread>
#include <QString> #include <QString>
#include <QUrl> #include <QUrl>
@@ -90,7 +88,7 @@ void FilesystemDevice::CloseAsync() {
void FilesystemDevice::Close() { void FilesystemDevice::Close() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
wait_for_exit_ << backend_ << watcher_; wait_for_exit_ << backend_ << watcher_;

3
src/playlist/playlistbackend.cpp
View File

@@ -23,7 +23,6 @@
#include <memory> #include <memory>
#include <functional> #include <functional>
#include <cassert>
#include <QObject> #include <QObject>
#include <QApplication> #include <QApplication>
@@ -84,7 +83,7 @@ void PlaylistBackend::ExitAsync() {
void PlaylistBackend::Exit() { void PlaylistBackend::Exit() {
assert(QThread::currentThread() == thread()); Q_ASSERT(QThread::currentThread() == thread());
moveToThread(original_thread_); moveToThread(original_thread_);
emit ExitFinished(); emit ExitFinished();