Merge pull request #16 from sailfishos/jb61927

Eliminate defects found by Coverity
sailfishos · Apr 15, 2024 · 8567aeb · 8567aeb
2 parents 3b4ac08 + 7d697d8
commit 8567aeb
Show file tree

Hide file tree

Showing 15 changed files with 47 additions and 93 deletions.
diff --git a/declarative/declarativetransfermodel.cpp b/declarative/declarativetransfermodel.cpp
@@ -52,16 +52,6 @@ class TransferDatabase : public QSqlDatabase
 TransferModel::TransferModel(QObject *parent)
     : QAbstractListModel(parent)
     , m_rows(new QVector<TransferDBRecord>())
-    , m_rowsIndex(0)
-    , m_asyncIndex(0)
-    , m_transfersInProgress(0)
-    , m_status(Null)
-    , m_asyncStatus(Null)
-    , m_asyncPending(false)
-    , m_asyncRunning(false)
-    , m_notified(false)
-    , m_complete(false)
-    , m_rowsChanges(false)
 {
     setAutoDelete(false);
 }
@@ -324,11 +314,11 @@ void TransferModel::run()
 
             locker.relock();
 
-            m_asyncRows = rows;
+            m_asyncRows = std::move(rows);
             m_asyncTransfersInProgress = activeTransfers;
 
             if (!m_asyncPending) {
-                m_asyncErrorString = errorString;
+                m_asyncErrorString = std::move(errorString);
                 m_asyncStatus = ok ? Finished : Error;
             }
         } else {

diff --git a/declarative/declarativetransfermodel.h b/declarative/declarativetransfermodel.h
@@ -117,26 +117,26 @@ public slots:
 
     QString m_asyncErrorString;
     QVector<TransferDBRecord> m_asyncRows;
-    QVector<TransferDBRecord> *m_rows;
+    QVector<TransferDBRecord> *m_rows = nullptr;
     QHash<int, QByteArray> m_roles;
 
     QMutex m_mutex;
     QWaitCondition m_condition;
 
-    int m_rowsIndex;
-    int m_asyncIndex;
-    int m_asyncTransfersInProgress;
-    int m_transfersInProgress;
+    int m_rowsIndex = 0;
+    int m_asyncIndex = 0;
+    int m_asyncTransfersInProgress = 0;
+    int m_transfersInProgress = 0;
 
-    Status m_status;
-    Status m_asyncStatus;
-    bool m_asyncPending;
-    bool m_asyncRunning;
-    bool m_notified;
-    bool m_complete;
-    bool m_rowsChanges;
+    Status m_status = Null;
+    Status m_asyncStatus = Null;
+    bool m_asyncPending = false;
+    bool m_asyncRunning = false;
+    bool m_notified = false;
+    bool m_complete = false;
+    bool m_rowsChanges = false;
 
-    TransferEngineInterface *m_client;
+    TransferEngineInterface *m_client = nullptr;
 };
 
 #endif
diff --git a/declarative/synchronizelists_p.h b/declarative/synchronizelists_p.h
@@ -163,7 +163,7 @@ class SynchronizeList
         }
     }
 
-    Agent * const agent;
+    Agent *const agent = nullptr;
     const CacheList &cache;
     int &c;
     const ReferenceList &reference;

diff --git a/lib/mediaitem.h b/lib/mediaitem.h
@@ -75,7 +75,7 @@ class MediaItem: public QObject
 
 
 private:
-    MediaItemPrivate *d_ptr;
+    MediaItemPrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(MediaItem)
     friend class TransferEngine;
     friend class TransferEnginePrivate;

diff --git a/lib/mediatransferinterface.cpp b/lib/mediatransferinterface.cpp
@@ -32,17 +32,10 @@
 class MediaTransferInterfacePrivate
 {
 public:
-    MediaTransferInterfacePrivate():
-        m_mediaItem(0),
-        m_status(MediaTransferInterface::NotStarted),
-        m_progress(0),
-        m_prevProgress(0)
-    {}
-
-    MediaItem *m_mediaItem;
-    MediaTransferInterface::TransferStatus m_status;
-    qreal m_progress;
-    qreal m_prevProgress;
+    MediaItem *m_mediaItem = nullptr;
+    MediaTransferInterface::TransferStatus m_status = MediaTransferInterface::NotStarted;
+    qreal m_progress = 0;
+    qreal m_prevProgress = 0;
 };
 
 

diff --git a/lib/mediatransferinterface.h b/lib/mediatransferinterface.h
@@ -71,7 +71,7 @@ public Q_SLOTS:
     void progressUpdated(qreal progress);
 
 private:
-    MediaTransferInterfacePrivate *d_ptr;
+    MediaTransferInterfacePrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(MediaTransferInterface)
     friend class TransferEngine;
     friend class TransferEnginePrivate;

diff --git a/lib/sharingmethodinfo.cpp b/lib/sharingmethodinfo.cpp
@@ -29,37 +29,16 @@
 class SharingMethodInfoPrivate
 {
 public:
-    SharingMethodInfoPrivate();
-    SharingMethodInfoPrivate(const SharingMethodInfoPrivate *other);
-
     QString displayName;
     QString subtitle;
     QString methodId;
     QString methodIcon;
-    quint32 accountId;
+    quint32 accountId = 0;
     QString shareUIPath;
     QStringList capabilities;
-    bool supportsMultipleFiles;
+    bool supportsMultipleFiles = false;
 };
 
-SharingMethodInfoPrivate::SharingMethodInfoPrivate()
-    : accountId(0)
-    , supportsMultipleFiles(false)
-{
-}
-
-SharingMethodInfoPrivate::SharingMethodInfoPrivate(const SharingMethodInfoPrivate *other)
-    : displayName(other->displayName)
-    , subtitle(other->subtitle)
-    , methodId(other->methodId)
-    , methodIcon(other->methodIcon)
-    , accountId(other->accountId)
-    , shareUIPath(other->shareUIPath)
-    , capabilities(other->capabilities)
-    , supportsMultipleFiles(other->supportsMultipleFiles)
-{
-}
-
 /*!
     \class SharingMethodInfo
     \brief The SharingMethodInfo class encapsulate information of a single transfer method.
@@ -98,23 +77,15 @@ SharingMethodInfo::SharingMethodInfo()
 */
 SharingMethodInfo &SharingMethodInfo::operator=(const SharingMethodInfo &other)
 {
-    Q_D(SharingMethodInfo);
-    d->displayName           = other.displayName();
-    d->subtitle              = other.subtitle();
-    d->methodId              = other.methodId();
-    d->methodIcon            = other.methodIcon();
-    d->accountId             = other.accountId();
-    d->shareUIPath           = other.shareUIPath();
-    d->capabilities          = other.capabilities();
-    d->supportsMultipleFiles = other.supportsMultipleFiles();
+    *d_ptr = *other.d_ptr;
     return *this;
 }
 
 /*!
     Copies \a other to this instance.
 */
 SharingMethodInfo::SharingMethodInfo(const SharingMethodInfo &other):
-    d_ptr(new SharingMethodInfoPrivate(other.d_ptr))
+    d_ptr(new SharingMethodInfoPrivate(*other.d_ptr))
 {
 }
 

diff --git a/lib/sharingmethodinfo.h b/lib/sharingmethodinfo.h
@@ -78,7 +78,7 @@ class SharingMethodInfo
     bool supportsMultipleFiles() const;
 
 private:
-    SharingMethodInfoPrivate *d_ptr;
+    SharingMethodInfoPrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(SharingMethodInfo);
 };
 

diff --git a/lib/sharingpluginloader.h b/lib/sharingpluginloader.h
@@ -46,7 +46,7 @@ class SharingPluginLoader : public QObject
     void pluginsLoaded();
 
 private:
-    SharingPluginLoaderPrivate *d_ptr;
+    SharingPluginLoaderPrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(SharingPluginLoader)
 };
 

diff --git a/lib/sharingpluginloader_p.h b/lib/sharingpluginloader_p.h
@@ -57,10 +57,10 @@ private slots:
 private:
     static QStringList pluginList();
 
-    SharingPluginLoader *q_ptr;
+    SharingPluginLoader *q_ptr = nullptr;
     Q_DECLARE_PUBLIC(SharingPluginLoader)
 
-    bool m_loading;
+    bool m_loading = false;
     Accounts::Manager m_accountManager;
     QTimer m_fileWatcherTimer;
     QFileSystemWatcher m_fileWatcher;

diff --git a/lib/transferdbrecord.h b/lib/transferdbrecord.h
@@ -71,11 +71,11 @@ class TransferDBRecord
 
 // TODO: Maybe this could use QVariantList internally to ease of pain of keeping thigs up to date
 //       when database structure / fields change
-    int     transfer_id;
-    int     transfer_type;
-    int     status;
-    qint64  size;
-    double  progress;
+    int     transfer_id = 0;
+    int     transfer_type = 0;
+    int     status = 0;
+    qint64  size = 0;
+    double  progress = 0;
     QString plugin_id;
     QString url;
     QString timestamp;
@@ -85,8 +85,8 @@ class TransferDBRecord
     QString service_icon;
     QString application_icon;
     QString thumbnail_icon;
-    bool    cancel_supported;
-    bool    restart_supported;
+    bool    cancel_supported = false;
+    bool    restart_supported = false;
 };
 
 bool operator ==(const TransferDBRecord &left, const TransferDBRecord &right);

diff --git a/lib/transferengineclient.cpp b/lib/transferengineclient.cpp
@@ -99,7 +99,7 @@ CallbackInterface::~CallbackInterface()
 class TransferEngineClientPrivate
 {
 public:
-    TransferEngineInterface *m_client;    
+    TransferEngineInterface *m_client = nullptr;
 };
 
 /*!

diff --git a/lib/transferengineclient.h b/lib/transferengineclient.h
@@ -39,7 +39,7 @@ class CallbackInterface {
     ~CallbackInterface();
 
 private:
-    CallbackInterfacePrivate *d_ptr;
+    CallbackInterfacePrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(CallbackInterface)
     friend class TransferEngineClient;
 };
@@ -85,7 +85,7 @@ class TransferEngineClient : public QObject
     bool notificationsEnabled() const;
 
 private:
-    TransferEngineClientPrivate *d_ptr;
+    TransferEngineClientPrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(TransferEngineClient)
 
     friend class DeclarativeTransferInterface;

diff --git a/src/transferengine.h b/src/transferengine.h
@@ -102,7 +102,7 @@ public Q_SLOTS:
     void activeTransfersChanged();
 
 private:
-    TransferEnginePrivate *d_ptr;
+    TransferEnginePrivate *d_ptr = nullptr;
     Q_DECLARE_PRIVATE(TransferEngine)
 };
 

diff --git a/src/transferengine_p.h b/src/transferengine_p.h
@@ -68,12 +68,12 @@ public Q_SLOTS:
     void checkActivity();
 
 Q_SIGNALS:
-    void transfersExpired(QList<int> transferIds);
+    void transfersExpired(const QList<int> &transferIds);
 
 private:
     // Map for transferId, timestamps
     QMap<int, quint32> m_activityMap;
-    QTimer *m_timer;
+    QTimer *m_timer = nullptr;
 };
 
 class TransferEnginePrivate: QObject
@@ -125,10 +125,10 @@ public Q_SLOTS:
 private:
     QMap <MediaTransferInterface*, int> m_plugins;
     QMap <int, TransferEngineData::TransferType> m_keyTypeCache;
-    bool m_notificationsEnabled;
-    QTimer *m_delayedExitTimer;
-    ClientActivityMonitor *m_activityMonitor;
-    TransferEngine *q_ptr;
+    bool m_notificationsEnabled = false;
+    QTimer *m_delayedExitTimer = nullptr;
+    ClientActivityMonitor *m_activityMonitor = nullptr;
+    TransferEngine *q_ptr = nullptr;
     QVariantList m_defaultActions;
     QVariant m_showTransfersAction;
     Q_DECLARE_PUBLIC(TransferEngine)