diff --git a/src/core/core.cpp b/src/core/core.cpp index c1ed679ca..9e473bb59 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp @@ -475,7 +475,6 @@ bool parseErr(Tox_Err_Conference_Delete error, int line) Core::Core(QThread* coreThread) : tox(nullptr) - , av(nullptr) , toxTimer{new QTimer{this}} , coreThread(coreThread) { diff --git a/src/core/core.h b/src/core/core.h index 0ec67cf53..1cafc8b84 100644 --- a/src/core/core.h +++ b/src/core/core.h @@ -251,7 +251,7 @@ private: // recursive, since we might call our own functions mutable QMutex coreLoopLock{QMutex::Recursive}; - std::unique_ptr coreThread = nullptr; + std::unique_ptr coreThread; }; #endif // CORE_HPP diff --git a/src/core/toxcall.h b/src/core/toxcall.h index 57baf4326..4bf16d0a0 100644 --- a/src/core/toxcall.h +++ b/src/core/toxcall.h @@ -84,7 +84,7 @@ protected: QMetaObject::Connection videoInConn; bool videoEnabled{false}; bool nullVideoBitrate{false}; - std::unique_ptr audioSource = nullptr; + std::unique_ptr audioSource; }; class ToxFriendCall : public ToxCall @@ -109,7 +109,7 @@ private slots: private: QMetaObject::Connection audioSinkInvalid; TOXAV_FRIEND_CALL_STATE state{TOXAV_FRIEND_CALL_STATE_NONE}; - std::unique_ptr sink = nullptr; + std::unique_ptr sink; uint32_t friendId; }; diff --git a/src/persistence/profile.cpp b/src/persistence/profile.cpp index 595bd2710..1d479e3d3 100644 --- a/src/persistence/profile.cpp +++ b/src/persistence/profile.cpp @@ -73,7 +73,7 @@ enum class CreateToxDataError std::unique_ptr loadToxData(const QString& password, const QString& filePath, QByteArray& data, LoadToxDataError& error) { - std::unique_ptr tmpKey = nullptr; + std::unique_ptr tmpKey; qint64 fileSize = 0; QFile saveFile(filePath); @@ -133,7 +133,7 @@ fail: std::unique_ptr createToxData(const QString& name, const QString& password, const QString& filePath, CreateToxDataError& error) { - std::unique_ptr newKey{nullptr}; + std::unique_ptr newKey; if (!password.isEmpty()) { newKey = ToxEncrypt::makeToxEncrypt(password); if (!newKey) { diff --git a/src/persistence/profile.h b/src/persistence/profile.h index a7f86d8fc..f50c5c577 100644 --- a/src/persistence/profile.h +++ b/src/persistence/profile.h @@ -109,9 +109,9 @@ private: void initCore(const QByteArray& toxsave, const ICoreSettings& s, bool isNewProfile); private: - std::unique_ptr core = nullptr; + std::unique_ptr core; QString name; - std::unique_ptr passkey = nullptr; + std::unique_ptr passkey; std::shared_ptr database; std::shared_ptr history; bool isRemoved; diff --git a/src/widget/form/settings/avform.h b/src/widget/form/settings/avform.h index d00aa1c30..c2d348ab5 100644 --- a/src/widget/form/settings/avform.h +++ b/src/widget/form/settings/avform.h @@ -104,8 +104,8 @@ private: IVideoSettings* videoSettings; bool subscribedToAudioIn; - std::unique_ptr audioSink = nullptr; - std::unique_ptr audioSrc = nullptr; + std::unique_ptr audioSink; + std::unique_ptr audioSrc; VideoSurface* camVideoSurface; CameraSource& camera; QVector> videoDeviceList; diff --git a/src/widget/widget.cpp b/src/widget/widget.cpp index 468aba099..fbda698bb 100644 --- a/src/widget/widget.cpp +++ b/src/widget/widget.cpp @@ -139,7 +139,6 @@ Widget* Widget::instance{nullptr}; Widget::Widget(IAudioControl& audio, QWidget* parent) : QMainWindow(parent) - , icon{nullptr} , trayMenu{nullptr} , ui(new Ui::MainWindow) , activeChatroomWidget{nullptr} diff --git a/src/widget/widget.h b/src/widget/widget.h index 23f10a633..252386e26 100644 --- a/src/widget/widget.h +++ b/src/widget/widget.h @@ -328,7 +328,7 @@ private: int icon_size; IAudioControl& audio; - std::unique_ptr audioNotification = nullptr; + std::unique_ptr audioNotification; Settings& settings; QMap friendWidgets;