Differential D13814 Diff 37559 src/kitemviews/kfileitemmodel.cpp

Changeset View

Standalone View

src/kitemviews/kfileitemmodel.cpp

Context not available.
826	default:	826		default:
827	Q_UNREACHABLE();	827		Q_UNREACHABLE();
828	}	828		}
		829		// Workaround for bug https://bugreports.qt.io/browse/QTBUG-69361
		830		// Force the clean state of QCollator in single thread to avoid thread safety problems in sort
		831		m_collator.compare(QString(), QString());
829	}	832		}
830		833
831	void KFileItemModel::resortAllItems()	834		void KFileItemModel::resortAllItems()
Context not available.
1709	return (sortOrder() == Qt::AscendingOrder) ? result < 0 : result > 0;	1712		return (sortOrder() == Qt::AscendingOrder) ? result < 0 : result > 0;
1710	}	1713		}
1711		1714
1712	/**
1713	* Helper class for KFileItemModel::sort().
1714	*/
1715	class KFileItemModelLessThan
1716	{
1717	public:
1718	KFileItemModelLessThan(const KFileItemModel* model, const QCollator& collator) :
1719	m_model(model),
1720	m_collator(collator)
1721	{
1722	}
1723
1724	KFileItemModelLessThan(const KFileItemModelLessThan& other) :
1725	m_model(other.m_model),
1726	m_collator()
1727	{
1728	m_collator.setCaseSensitivity(other.m_collator.caseSensitivity());
1729	m_collator.setIgnorePunctuation(other.m_collator.ignorePunctuation());
1730	m_collator.setLocale(other.m_collator.locale());
1731	m_collator.setNumericMode(other.m_collator.numericMode());
1732	}
1733
1734	~KFileItemModelLessThan() = default;
1735	//We do not delete m_model as the pointer was passed from outside ant it will be deleted elsewhere.
1736
1737	KFileItemModelLessThan& operator=(const KFileItemModelLessThan& other)
1738	{
1739	m_model = other.m_model;
1740	m_collator = other.m_collator;
1741	return *this;
1742	}
1743
1744	bool operator()(const KFileItemModel::ItemData* a, const KFileItemModel::ItemData* b) const
1745	{
1746	return m_model->lessThan(a, b, m_collator);
1747	}
1748
1749	private:
1750	const KFileItemModel* m_model;
1751	QCollator m_collator;
1752	};
1753
1754	void KFileItemModel::sort(QList<KFileItemModel::ItemData*>::iterator begin,	1715		void KFileItemModel::sort(QList<KFileItemModel::ItemData*>::iterator begin,
			apolUnsubmitted Done it's "lambda". apol: it's "lambda".
1755	QList<KFileItemModel::ItemData*>::iterator end) const	1716		QList<KFileItemModel::ItemData*>::iterator end) const
1756	{	1717		{
1757	KFileItemModelLessThan lessThan(this, m_collator);	1718		auto lambdaLessThan = [&] (const KFileItemModel::ItemData* a, const KFileItemModel::ItemData* b)
		1719		{
		1720		return lessThan(a, b, m_collator);
		1721		};
1758		1722
1759	if (m_sortRole == NameRole) {	1723		if (m_sortRole == NameRole) {
1760	// Sorting by name can be expensive, in particular if natural sorting is	1724		// Sorting by name can be expensive, in particular if natural sorting is
1761	// enabled. Use all CPU cores to speed up the sorting process.	1725		// enabled. Use all CPU cores to speed up the sorting process.
1762	static const int numberOfThreads = QThread::idealThreadCount();	1726		static const int numberOfThreads = QThread::idealThreadCount();
1763	parallelMergeSort(begin, end, lessThan, numberOfThreads);	1727		parallelMergeSort(begin, end, lambdaLessThan, numberOfThreads);
1764	} else {	1728		} else {
1765	// Sorting by other roles is quite fast. Use only one thread to prevent	1729		// Sorting by other roles is quite fast. Use only one thread to prevent
1766	// problems caused by non-reentrant comparison functions, see	1730		// problems caused by non-reentrant comparison functions, see
1767	// https://bugs.kde.org/show_bug.cgi?id=312679	1731		// https://bugs.kde.org/show_bug.cgi?id=312679
1768	mergeSort(begin, end, lessThan);	1732		mergeSort(begin, end, lambdaLessThan);
1769	}	1733		}
1770	}	1734		}
1771		1735
Context not available.