Merge pull request #15923 from sledgehammer999/misc_fixes

Misc fixes before v4.4.0

dist/mac/Info.plist

@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2021 The qBittorrent project</string>
+	<string>Copyright © 2006-2022 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/windows/options.nsi

@@ -51,7 +51,7 @@ XPStyle on
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2021 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2022 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

src/base/bittorrent/torrentcontentlayout.cpp

@@ -49,7 +49,7 @@ BitTorrent::TorrentContentLayout BitTorrent::detectContentLayout(const QStringLi
             : TorrentContentLayout::Subfolder);
 }
 
-void BitTorrent::applyContentLayout(QStringList &filePaths, const TorrentContentLayout contentLayout, const QString &rootFolder)
+void BitTorrent::applyContentLayout(QStringList &filePaths, const BitTorrent::TorrentContentLayout contentLayout, const QString &rootFolder)
 {
     Q_ASSERT(!filePaths.isEmpty());
 

src/gui/aboutdialog.cpp

@@ -64,7 +64,7 @@ AboutDialog::AboutDialog(QWidget *parent)
         "</table>"
         "</p>")
         .arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.")
-            , tr("Copyright %1 2006-2021 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT))
+            , tr("Copyright %1 2006-2022 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT))
             , tr("Home Page:")
             , tr("Forum:")
             , tr("Bug Tracker:"));

src/qbittorrent.rc

@@ -35,7 +35,7 @@ BEGIN
             VALUE "FileDescription",  "qBittorrent - A Bittorrent Client"
             VALUE "FileVersion",      VER_FILEVERSION_STR
             VALUE "InternalName",     "qbittorrent"
-            VALUE "LegalCopyright",   "Copyright ©2006-2021 The qBittorrent Project"
+            VALUE "LegalCopyright",   "Copyright ©2006-2022 The qBittorrent Project"
             VALUE "OriginalFilename", "qbittorrent.exe"
             VALUE "ProductName",      "qBittorrent"
             VALUE "ProductVersion",   VER_PRODUCTVERSION_STR

src/webui/www/private/views/about.html

@@ -5,7 +5,7 @@
         <h3 id="qbittorrentVersion"></h3>
     </div>
     <p>QBT_TR(An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.)QBT_TR[CONTEXT=AboutDialog]</p>
-    <p>Copyright © 2006-2021 The qBittorrent project</p>
+    <p>Copyright © 2006-2022 The qBittorrent project</p>
     <table>
         <tr>
             <td>QBT_TR(Home Page:)QBT_TR[CONTEXT=AboutDialog]</td>