Merge pull request #6358 from Chocobo1/coverity

Fix issues on coverity

src/base/utils/misc.cpp

@@ -440,21 +440,27 @@ QString Utils::Misc::userFriendlyDuration(qlonglong seconds)
 {
     if ((seconds < 0) || (seconds >= MAX_ETA))
         return QString::fromUtf8(C_INFINITY);
+
     if (seconds == 0)
         return "0";
+
     if (seconds < 60)
         return QCoreApplication::translate("misc", "< 1m", "< 1 minute");
-    int minutes = seconds / 60;
+
+    qlonglong minutes = seconds / 60;
     if (minutes < 60)
         return QCoreApplication::translate("misc", "%1m", "e.g: 10minutes").arg(QString::number(minutes));
-    int hours = minutes / 60;
+
-    minutes = minutes - hours * 60;
+    qlonglong hours = minutes / 60;
+    minutes -= hours * 60;
     if (hours < 24)
         return QCoreApplication::translate("misc", "%1h %2m", "e.g: 3hours 5minutes").arg(QString::number(hours)).arg(QString::number(minutes));
-    int days = hours / 24;
+
-    hours = hours - days * 24;
+    qlonglong days = hours / 24;
+    hours -= days * 24;
     if (days < 100)
         return QCoreApplication::translate("misc", "%1d %2h", "e.g: 2days 10hours").arg(QString::number(days)).arg(QString::number(hours));
+
     return QString::fromUtf8(C_INFINITY);
 }
 

src/base/utils/string.cpp

@@ -177,8 +177,12 @@ QString Utils::String::fromStdString(const std::string &str)
 
 std::string Utils::String::toStdString(const QString &str)
 {
+#ifdef QBT_USES_QT5
+    return str.toStdString();
+#else
     QByteArray utf8 = str.toUtf8();
     return std::string(utf8.constData(), utf8.length());
+#endif
 }
 
 // to send numbers instead of strings with suffixes

src/gui/optionsdlg.cpp

@@ -845,16 +845,21 @@ void OptionsDialog::loadOptions()
     case ProxyType::SOCKS4:
         m_ui->comboProxyType->setCurrentIndex(1);
         break;
+
     case ProxyType::SOCKS5_PW:
         useProxyAuth = true;
+        // fallthrough
     case ProxyType::SOCKS5:
         m_ui->comboProxyType->setCurrentIndex(2);
         break;
+
     case ProxyType::HTTP_PW:
         useProxyAuth = true;
+        // fallthrough
     case ProxyType::HTTP:
         m_ui->comboProxyType->setCurrentIndex(3);
         break;
+
     default:
         m_ui->comboProxyType->setCurrentIndex(0);
     }

src/gui/properties/speedplotview.cpp

@@ -37,6 +37,7 @@ SpeedPlotView::SpeedPlotView(QWidget *parent)
     , m_data5Min(MIN5_BUF_SIZE)
     , m_data30Min(MIN30_BUF_SIZE)
     , m_data6Hour(HOUR6_BUF_SIZE)
+    , m_period(MIN5)
     , m_viewablePointsCount(MIN5_SEC)
     , m_counter30Min(-1)
     , m_counter6Hour(-1)

src/gui/torrentcontentmodel.cpp

@@ -288,17 +288,18 @@ void TorrentContentModel::clear()
 void TorrentContentModel::setupModelData(const BitTorrent::TorrentInfo &info)
 {
     qDebug("setup model data called");
-    if (info.filesCount() <= 0)
+    const int filesCount = info.filesCount();
+    if (filesCount <= 0)
         return;
 
     emit layoutAboutToBeChanged();
     // Initialize files_index array
-    qDebug("Torrent contains %d files", info.filesCount());
+    qDebug("Torrent contains %d files", filesCount);
-    m_filesIndex.reserve(info.filesCount());
+    m_filesIndex.reserve(filesCount);
 
     TorrentContentModelFolder* currentParent;
     // Iterate over files
-    for (int i = 0; i < info.filesCount(); ++i) {
+    for (int i = 0; i < filesCount; ++i) {
         currentParent = m_rootItem;
         QString path = Utils::Fs::fromNativePath(info.filePath(i));
         // Iterate of parts of the path to create necessary folders