Fix casts and other clang annotations

Don't use C-Style casts. CLang says it's frowned upon. Also use nullptr
instead of literal 0.

1 files changed, 8 insertions, 9 deletions

diff --git a/archivemodel.cpp b/archivemodel.cpp
index 7c5e46b..caa9842 100644
--- a/archivemodel.cpp
+++ b/archivemodel.cpp
@@ -676,7 +676,7 @@ void ArchiveModel::writeCache(int o, SmTreeItem *rItem){
     QDataStream stream(&cache);
     // write root id, no need to write data
     // it's invalid anyway, we just need it as an anchor
-    stream << (qint64)rItem;
+    stream << reinterpret_cast<qint64>(rItem);
     for(int i = 0; i < rItem->childCount(); ++i){
         writeRecursive(rItem->child(i), stream);
     }
@@ -685,13 +685,13 @@ void ArchiveModel::writeCache(int o, SmTreeItem *rItem){
 
 void ArchiveModel::writeRecursive(SmTreeItem *start, QDataStream &stream){
     if(start->childCount()){
-        stream << (qint64)start->parent() << (qint64)start;
+        stream << reinterpret_cast<qint64>(start->parent()) << reinterpret_cast<qint64>(start);
         writeItem(start, stream);
         for(int i = 0; i < start->childCount(); ++i){
             writeRecursive(start->child(i), stream);
         }
     }else{
-        stream << (qint64)start->parent() << (qint64)start;
+        stream << reinterpret_cast<qint64>(start->parent()) << reinterpret_cast<qint64>(start);
         writeItem(start, stream);
     }
 }
@@ -706,7 +706,7 @@ SmTreeItem *ArchiveModel::readCache(int o){
     QMutexLocker l(&mCacheMx);
     QFile cache(cacheFile(o));
     if(!cache.exists() || !cache.size()){
-        return 0;
+        return nullptr;
     }
     cache.open(QIODevice::ReadOnly);
     QDataStream stream(&cache);
@@ -720,7 +720,7 @@ SmTreeItem *ArchiveModel::readCache(int o){
     while(!stream.atEnd()){
         stream >> parentId >> myId;
         SmTreeItem *curItem = readItem(stream);
-        SmTreeItem *parentItem = idHash.value(parentId, 0);
+        SmTreeItem *parentItem = idHash.value(parentId, nullptr);
         Q_ASSERT(parentItem);
         curItem->setParent(parentItem);
         parentItem->appendChild(curItem);
@@ -991,7 +991,7 @@ void ArchiveFilesModel::populate(const QSet<int> &seriesPartIds){
                 QSqlQuery updDurQ = QSqlQuery(mDb);
                 updDurQ.prepare("UPDATE files SET iduration = :dur WHERE ifiles_id = :id");
                 // we have to cast this to int explicitly, otherwise Postgres will choke
-                int dur = m.value("duration").toDouble();
+                double dur = m.value("duration").toDouble();
                 updDurQ.bindValue(":dur", dur);
                 updDurQ.bindValue(":id", data.at(FileId));
                 if(updDurQ.exec()){
@@ -1078,7 +1078,7 @@ void ArchiveFilesModel::readConfig(){
 /*
  * ArchiveCollector BEGIN */
 
-ArchiveCollector::ArchiveCollector(int numFields, int order, QObject *parent) : QThread(parent), mRootItem(0), mNumFields(numFields), mSortOrder(order), mCancelled(false) {
+ArchiveCollector::ArchiveCollector(int numFields, int order, QObject *parent) : QThread(parent), mRootItem(nullptr), mNumFields(numFields), mSortOrder(order), mCancelled(false) {
     QString dbName = QString("%1").arg((qint64(this)));
     mDb = QSqlDatabase::cloneDatabase(QSqlDatabase::database("treedb"), dbName);
     mDb.open();
@@ -1086,7 +1086,7 @@ ArchiveCollector::ArchiveCollector(int numFields, int order, QObject *parent) :
 
 SmTreeItem *ArchiveCollector::rootItem(){
     mAccessMx.lock();
-    SmTreeItem *retval = copyRecursive(mRootItem, 0);
+    SmTreeItem *retval = copyRecursive(mRootItem, nullptr);
     mAccessMx.unlock();
     return retval;
 }
@@ -1238,7 +1238,6 @@ void ArchiveCollector::fetchSeries(const QVariant &id, SmTreeItem *parent){
             break;
         default:
             qFatal("ArchiveTreeModel::fetchSeries: invalid order!");
-            return;
     }
     if(!seriesIdQuery.exec()){
         qWarning("ArchiveTreeModel::fetchSeries: failed to exectue query!");