Differential D6681 Diff 16655 src/imagefoldermodel.cpp

Changeset View

Standalone View

src/imagefoldermodel.cpp

Context not available.
28	#include <QDebug>	28		#include <QDebug>
29	#include <QMimeDatabase>	29		#include <QMimeDatabase>
30	#include <QStandardPaths>	30		#include <QStandardPaths>
31	#include <QFileInfo>	31		#include <QDir>
32		32
33	#include <kdirlister.h>	33		#include <kdirlister.h>
34	#include <KIO/EmptyTrashJob>	34		#include <KIO/EmptyTrashJob>
Context not available.
76	return dirLister()->url().toString();	76		return dirLister()->url().toString();
77	}	77		}
78		78
79	void ImageFolderModel::setUrl(const QString& url)	79		void ImageFolderModel::setUrl(QString& url)
80	{	80		{
		81		qDebug() << "setting url" << url;
81	if (url.isEmpty()) {	82		if (url.isEmpty()) {
82	return;	83		return;
83	}	84		}
84		85
		86		if( url.startsWith("file://")) {
			martUnsubmitted Not Done construct a QUrl immediately, then use it to check isLocalFile() mart: construct a QUrl immediately, then use it to check isLocalFile()
		87		url = url.remove(0,7);
			martUnsubmitted Not Done QUrl::path() mart: QUrl::path()
		88		}
		89
			martUnsubmitted Not Done drop that if then else and simply do: Q_ASSERT(QUrl(url).isLocalFile()) url = QUrl(url).path(); also, if you are asserting here, you need to check beforehand that url is local mart: drop that if then else and simply do: Q_ASSERT(QUrl(url).isLocalFile()) url = QUrl(url).path()…
85	QString directoryUrl;	90		QString directoryUrl;
86		91
87	if( !QFileInfo(url).isDir()) {	92		if( QDir(url).exists()) {
		93		directoryUrl = "file://" + url;
			martUnsubmitted Not Done you can prettyfy those as well: QUrl::fromLocalFile(url) mart: you can prettyfy those as well: QUrl::fromLocalFile(url)
		94		} else {
88	m_imagePath = url;	95		m_imagePath = url;
89	directoryUrl = url.left(url.lastIndexOf('/'));	96		directoryUrl = "file://" + url.left(url.lastIndexOf('/'));
			martUnsubmitted Not Done here too mart: here too
90	emit showImageViewer( indexForUrl(m_imagePath));	97		emit showImageViewer( indexForUrl(m_imagePath));
91	} else {
92	directoryUrl = "file://" + url;
93	}	98		}
94		99
95	if (dirLister()->url().path() == directoryUrl) {	100		if (dirLister()->url().path() == directoryUrl) {
Context not available.