mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-19 15:07:22 -06:00
Don't implicitly cast iterator to const_iterator
It prevents detachments:
To illustrate:
QMap<QString, QString> map;
/* code compiles and works fine but find() returns the non-const
QMap::iterator that detaches!
*/
QMap<QString, QString>::const_iterator it = map.find("girish");
but also some subtle bugs:
QHash<int, int> wrong;
if (wrong.find(1) == wrong.cend()) {
qDebug() << "Not found";
} else {
/* find() detached the container before cend() was called, so it
prints "Found"
*/
qDebug() << "Found";
}
QHash<int, int> right;
if (right.constFind(1) == right.cend()) {
qDebug() << "Not found"; // This is correct now !
} else {
qDebug() << "Found";
}
Enforced by QT_STRICT_ITERATORS definition.
This commit is contained in:
@@ -340,7 +340,7 @@ void ScanFoldersModel::makePersistent()
|
|||||||
|
|
||||||
void ScanFoldersModel::configure()
|
void ScanFoldersModel::configure()
|
||||||
{
|
{
|
||||||
QVariantHash dirs = Preferences::instance()->getScanDirs();
|
const QVariantHash dirs = Preferences::instance()->getScanDirs();
|
||||||
|
|
||||||
for (QVariantHash::const_iterator i = dirs.begin(), e = dirs.end(); i != e; ++i) {
|
for (QVariantHash::const_iterator i = dirs.begin(), e = dirs.end(); i != e; ++i) {
|
||||||
if (i.value().type() == QVariant::Int)
|
if (i.value().type() == QVariant::Int)
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ void TorrentContentTreeView::keyPressEvent(QKeyEvent *event)
|
|||||||
Qt::CheckState state = (static_cast<Qt::CheckState>(value.toInt()) == Qt::Checked
|
Qt::CheckState state = (static_cast<Qt::CheckState>(value.toInt()) == Qt::Checked
|
||||||
? Qt::Unchecked : Qt::Checked);
|
? Qt::Unchecked : Qt::Checked);
|
||||||
|
|
||||||
QModelIndexList selection = selectionModel()->selectedRows(TorrentContentModelItem::COL_NAME);
|
const QModelIndexList selection = selectionModel()->selectedRows(TorrentContentModelItem::COL_NAME);
|
||||||
|
|
||||||
for (QModelIndexList::const_iterator i = selection.begin(); i != selection.end(); ++i) {
|
for (QModelIndexList::const_iterator i = selection.begin(); i != selection.end(); ++i) {
|
||||||
QModelIndex index = *i;
|
QModelIndex index = *i;
|
||||||
|
|||||||
@@ -57,6 +57,7 @@ include(../version.pri)
|
|||||||
DEFINES += QT_NO_CAST_TO_ASCII
|
DEFINES += QT_NO_CAST_TO_ASCII
|
||||||
# Efficient construction for QString & QByteArray (Qt >= 4.8)
|
# Efficient construction for QString & QByteArray (Qt >= 4.8)
|
||||||
DEFINES += QT_USE_QSTRINGBUILDER
|
DEFINES += QT_USE_QSTRINGBUILDER
|
||||||
|
DEFINES += QT_STRICT_ITERATORS
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ void AppController::preferencesAction()
|
|||||||
data["temp_path"] = Utils::Fs::toNativePath(session->tempPath());
|
data["temp_path"] = Utils::Fs::toNativePath(session->tempPath());
|
||||||
data["preallocate_all"] = session->isPreallocationEnabled();
|
data["preallocate_all"] = session->isPreallocationEnabled();
|
||||||
data["incomplete_files_ext"] = session->isAppendExtensionEnabled();
|
data["incomplete_files_ext"] = session->isAppendExtensionEnabled();
|
||||||
QVariantHash dirs = pref->getScanDirs();
|
const QVariantHash dirs = pref->getScanDirs();
|
||||||
QVariantMap nativeDirs;
|
QVariantMap nativeDirs;
|
||||||
for (QVariantHash::const_iterator i = dirs.begin(), e = dirs.end(); i != e; ++i) {
|
for (QVariantHash::const_iterator i = dirs.begin(), e = dirs.end(); i != e; ++i) {
|
||||||
if (i.value().type() == QVariant::Int)
|
if (i.value().type() == QVariant::Int)
|
||||||
@@ -240,7 +240,7 @@ void AppController::setPreferencesAction()
|
|||||||
if (m.contains("incomplete_files_ext"))
|
if (m.contains("incomplete_files_ext"))
|
||||||
session->setAppendExtensionEnabled(m["incomplete_files_ext"].toBool());
|
session->setAppendExtensionEnabled(m["incomplete_files_ext"].toBool());
|
||||||
if (m.contains("scan_dirs")) {
|
if (m.contains("scan_dirs")) {
|
||||||
QVariantMap nativeDirs = m["scan_dirs"].toMap();
|
const QVariantMap nativeDirs = m["scan_dirs"].toMap();
|
||||||
QVariantHash oldScanDirs = pref->getScanDirs();
|
QVariantHash oldScanDirs = pref->getScanDirs();
|
||||||
QVariantHash scanDirs;
|
QVariantHash scanDirs;
|
||||||
ScanFoldersModel *model = ScanFoldersModel::instance();
|
ScanFoldersModel *model = ScanFoldersModel::instance();
|
||||||
|
|||||||
Reference in New Issue
Block a user