Differential D23780 Diff 65622 src/filewidgets/kurlnavigator.cpp

Changeset View

Standalone View

View Options

src/filewidgets/kurlnavigator.cpp

Context not available.
828 mime.inherits(QStringLiteral("application/x-tzo")) || // (not sure KTar supports those?) 828​ mime.inherits(QStringLiteral("application/x-tzo")) || // (not sure KTar supports those?)
829 mime.inherits(QStringLiteral("application/zip")) || 829​ mime.inherits(QStringLiteral("application/zip")) ||
830 mime.inherits(QStringLiteral("application/x-archive")) || 830​ mime.inherits(QStringLiteral("application/x-archive")) ||
831 mime.inherits(QStringLiteral("application/vnd.rar")) || // the following depends on krarc 831​ mime.inherits(QStringLiteral("application/x-7z-compressed")) || // the following depends on krarc
832 mime.inherits(QStringLiteral("application/x-7z-compressed")) || 832​ mime.inherits(QStringLiteral("application/vnd.rar")) ||
833 mime.inherits(QStringLiteral("application/x-ace")) || 833​ mime.inherits(QStringLiteral("application/x-ace")) ||
834 mime.inherits(QStringLiteral("application/x-arj")) || 834​ mime.inherits(QStringLiteral("application/x-arj")) ||
835 mime.inherits(QStringLiteral("application/x-cpio")) || 835​ mime.inherits(QStringLiteral("application/x-cpio")) ||
Context not available.
1052 // code locationUrl() and url become the same URLs 1052​ // code locationUrl() and url become the same URLs
1053 QUrl firstChildUrl = KIO::UrlUtil::firstChildUrl(locationUrl(), url); 1053​ QUrl firstChildUrl = KIO::UrlUtil::firstChildUrl(locationUrl(), url);
1054 1054​
1055 if ((url.scheme() == QLatin1String("tar")) || (url.scheme() == QLatin1String("zip")) || (url.scheme() == QLatin1String("krarc"))) { 1055​ if ((url.scheme() == QLatin1String("tar")) || (url.scheme() == QLatin1String("zip")) || (url.scheme() == QLatin1String("sevenz")) || (url.scheme() == QLatin1String("krarc"))) {
1056 // The URL represents a tar- or zip-file, or an archive file supported by krarc. 1056​ // The URL represents a tar-, zip- or 7z-file, or an archive file supported by krarc.
1057 // Check whether the URL is really part of the archive file, otherwise 1057​ // Check whether the URL is really part of the archive file, otherwise
1058 // replace it by the local path again. 1058​ // replace it by the local path again.
1059 bool insideCompressedPath = d->isCompressedPath(url); 1059​ bool insideCompressedPath = d->isCompressedPath(url);
Context not available.
1070 } 1070​ }
1071 } 1071​ }
1072 if (!insideCompressedPath) { 1072​ if (!insideCompressedPath) {
1073 // drop the tar: or zip: or krarc: protocol since we are not 1073​ // drop the tar:, zip:, sevenz: or krarc: protocol since we are not
1074 // inside the compressed path 1074​ // inside the compressed path
1075 url.setScheme(QStringLiteral("file")); 1075​ url.setScheme(QStringLiteral("file"));
1076 firstChildUrl.setScheme(QStringLiteral("file")); 1076​ firstChildUrl.setScheme(QStringLiteral("file"));
Context not available.