diff --git a/gwenview/app/mainwindow.cpp b/gwenview/app/mainwindow.cpp index 698a9264..4aa7f380 100644 --- a/gwenview/app/mainwindow.cpp +++ b/gwenview/app/mainwindow.cpp @@ -526,8 +526,7 @@ struct MainWindow::Private { mDirModel->setKindFilter( MimeTypeUtils::KIND_DIR - | MimeTypeUtils::KIND_RASTER_IMAGE - | MimeTypeUtils::KIND_SVG_IMAGE); + | MimeTypeUtils::KIND_IMAGE); connect(mDirModel, SIGNAL(rowsInserted(QModelIndex,int,int)), q, SLOT(slotDirModelNewItems())); @@ -1315,8 +1314,7 @@ void MainWindow::toggleSlideShow() KFileItem item = d->mDirModel->itemForIndex(index); MimeTypeUtils::Kind kind = MimeTypeUtils::fileItemKind(item); switch (kind) { - case MimeTypeUtils::KIND_SVG_IMAGE: - case MimeTypeUtils::KIND_RASTER_IMAGE: + case MimeTypeUtils::KIND_IMAGE: list << item.url(); break; default: diff --git a/gwenview/importer/documentdirfinder.cpp b/gwenview/importer/documentdirfinder.cpp index f09c11fe..70d9dd21 100644 --- a/gwenview/importer/documentdirfinder.cpp +++ b/gwenview/importer/documentdirfinder.cpp @@ -79,8 +79,7 @@ void DocumentDirFinder::slotItemsAdded(const KUrl& dir, const KFileItemList& lis } break; - case MimeTypeUtils::KIND_RASTER_IMAGE: - case MimeTypeUtils::KIND_SVG_IMAGE: + case MimeTypeUtils::KIND_IMAGE: finish(dir, DocumentDirFound); return; diff --git a/gwenview/importer/thumbnailpage.cpp b/gwenview/importer/thumbnailpage.cpp index 1a4c33d6..1adc0881 100644 --- a/gwenview/importer/thumbnailpage.cpp +++ b/gwenview/importer/thumbnailpage.cpp @@ -100,7 +100,7 @@ struct ThumbnailPagePrivate : public Ui_ThumbnailPage mRecursiveDirModel = new RecursiveDirModel(q); KindProxyModel* kindProxyModel = new KindProxyModel(q); - kindProxyModel->setKindFilter(MimeTypeUtils::KIND_RASTER_IMAGE | MimeTypeUtils::KIND_SVG_IMAGE); + kindProxyModel->setKindFilter(MimeTypeUtils::KIND_IMAGE); kindProxyModel->setSourceModel(mRecursiveDirModel); QSortFilterProxyModel *sortModel = new QSortFilterProxyModel(q); diff --git a/gwenview/lib/contextmanager.cpp b/gwenview/lib/contextmanager.cpp index e6abcaf5..17f4c24f 100644 --- a/gwenview/lib/contextmanager.cpp +++ b/gwenview/lib/contextmanager.cpp @@ -268,7 +268,7 @@ void Gwenview::ContextManager::slotRowsAboutToBeRemoved(const QModelIndex& /*par bool ContextManager::currentUrlIsRasterImage() const { - return MimeTypeUtils::urlKind(currentUrl()) == MimeTypeUtils::KIND_RASTER_IMAGE; + return MimeTypeUtils::urlKind(currentUrl()) == MimeTypeUtils::KIND_IMAGE; } KUrl ContextManager::urlToSelect() const diff --git a/gwenview/lib/document/loadingdocumentimpl.cpp b/gwenview/lib/document/loadingdocumentimpl.cpp index 1223b27f..e6a21d3d 100644 --- a/gwenview/lib/document/loadingdocumentimpl.cpp +++ b/gwenview/lib/document/loadingdocumentimpl.cpp @@ -111,8 +111,7 @@ struct LoadingDocumentImplPrivate q->setDocumentKind(kind); switch (kind) { - case MimeTypeUtils::KIND_RASTER_IMAGE: - case MimeTypeUtils::KIND_SVG_IMAGE: + case MimeTypeUtils::KIND_IMAGE: return false; default: @@ -130,8 +129,7 @@ struct LoadingDocumentImplPrivate Q_ASSERT(!mMetaInfoLoaded); switch (q->document()->kind()) { - case MimeTypeUtils::KIND_RASTER_IMAGE: - case MimeTypeUtils::KIND_SVG_IMAGE: + case MimeTypeUtils::KIND_IMAGE: // The hint is used to: // - Speed up loadMetaInfo(): QImageReader will try to decode the // image using plugins matching this format first. diff --git a/gwenview/lib/documentview/documentview.cpp b/gwenview/lib/documentview/documentview.cpp index 544d4a4d..69a40018 100644 --- a/gwenview/lib/documentview/documentview.cpp +++ b/gwenview/lib/documentview/documentview.cpp @@ -351,8 +351,7 @@ void DocumentView::createAdapterForDocument() } AbstractDocumentViewAdapter* adapter = 0; switch (documentKind) { - case MimeTypeUtils::KIND_RASTER_IMAGE: - case MimeTypeUtils::KIND_SVG_IMAGE: + case MimeTypeUtils::KIND_IMAGE: adapter = new RasterImageViewAdapter; break; case MimeTypeUtils::KIND_UNKNOWN: diff --git a/gwenview/lib/documentview/rasterimageviewadapter.h b/gwenview/lib/documentview/rasterimageviewadapter.h index f9ea537e..5f740e7d 100644 --- a/gwenview/lib/documentview/rasterimageviewadapter.h +++ b/gwenview/lib/documentview/rasterimageviewadapter.h @@ -47,7 +47,7 @@ public: virtual MimeTypeUtils::Kind kind() const { - return MimeTypeUtils::KIND_RASTER_IMAGE; + return MimeTypeUtils::KIND_IMAGE; } virtual bool canZoom() const diff --git a/gwenview/lib/mimetypeutils.cpp b/gwenview/lib/mimetypeutils.cpp index 0a2157bf..84baafe8 100644 --- a/gwenview/lib/mimetypeutils.cpp +++ b/gwenview/lib/mimetypeutils.cpp @@ -149,10 +149,10 @@ QString urlMimeTypeByContent(const KUrl& url) Kind mimeTypeKind(const QString& mimeType) { if (rasterImageMimeTypes().contains(mimeType)) { - return KIND_RASTER_IMAGE; + return KIND_IMAGE; } if (svgImageMimeTypes().contains(mimeType)) { - return KIND_SVG_IMAGE; + return KIND_IMAGE; } if (mimeType.startsWith(QLatin1String("inode/directory"))) { return KIND_DIR; diff --git a/gwenview/lib/mimetypeutils.h b/gwenview/lib/mimetypeutils.h index d9bc705d..034be56b 100644 --- a/gwenview/lib/mimetypeutils.h +++ b/gwenview/lib/mimetypeutils.h @@ -51,8 +51,7 @@ enum Kind { KIND_UNKNOWN = 0, KIND_DIR = 1, KIND_FILE = 1 << 2, - KIND_RASTER_IMAGE = 1 << 3, - KIND_SVG_IMAGE = 1 << 4 + KIND_IMAGE = 1 << 3 }; Q_DECLARE_FLAGS(Kinds, Kind) diff --git a/gwenview/tests/auto/documenttest.cpp b/gwenview/tests/auto/documenttest.cpp index b88487ad..2fc6ac88 100644 --- a/gwenview/tests/auto/documenttest.cpp +++ b/gwenview/tests/auto/documenttest.cpp @@ -109,7 +109,7 @@ void DocumentTest::testLoad() QCOMPARE(doc->kind(), expectedKind); QCOMPARE(doc->isAnimated(), expectedIsAnimated); QCOMPARE(spy.count(), doc->isAnimated() ? 1 : 0); - if (doc->kind() == MimeTypeUtils::KIND_RASTER_IMAGE) { + if (doc->kind() == MimeTypeUtils::KIND_IMAGE) { QImage image = doc->image(); if (maxHeight > -1) { QRect poiRect(0, 0, image.width(), maxHeight); @@ -124,7 +124,7 @@ void DocumentTest::testLoad() static void testLoad_newRow( const char* fileName, const QByteArray& format, - MimeTypeUtils::Kind kind = MimeTypeUtils::KIND_RASTER_IMAGE, + MimeTypeUtils::Kind kind = MimeTypeUtils::KIND_IMAGE, bool isAnimated = false, int maxHeight = -1 ) @@ -149,7 +149,7 @@ void DocumentTest::testLoad_data() testLoad_newRow("test.png", "png"); testLoad_newRow("160216_no_size_before_decoding.eps", "eps"); - testLoad_newRow("160382_corrupted.jpeg", "jpeg", MimeTypeUtils::KIND_RASTER_IMAGE, false, 55); + testLoad_newRow("160382_corrupted.jpeg", "jpeg", MimeTypeUtils::KIND_IMAGE, false, 55); testLoad_newRow("1x10k.png", "png"); testLoad_newRow("1x10k.jpg", "jpeg"); testLoad_newRow("test.xcf", "xcf"); @@ -159,18 +159,18 @@ void DocumentTest::testLoad_data() testLoad_newRow("jpg-with-gif-extension.gif", "jpeg"); // RAW preview - testLoad_newRow("CANON-EOS350D-02.CR2", "cr2", MimeTypeUtils::KIND_RASTER_IMAGE, false); - testLoad_newRow("dsc_0093.nef", "nef", MimeTypeUtils::KIND_RASTER_IMAGE, false); + testLoad_newRow("CANON-EOS350D-02.CR2", "cr2", MimeTypeUtils::KIND_IMAGE, false); + testLoad_newRow("dsc_0093.nef", "nef", MimeTypeUtils::KIND_IMAGE, false); // SVG - testLoad_newRow("test.svg", "", MimeTypeUtils::KIND_SVG_IMAGE); + testLoad_newRow("test.svg", "svg", MimeTypeUtils::KIND_IMAGE); // FIXME: Test svgz // Animated - testLoad_newRow("4frames.gif", "gif", MimeTypeUtils::KIND_RASTER_IMAGE, true); - testLoad_newRow("1frame.gif", "gif", MimeTypeUtils::KIND_RASTER_IMAGE, false); + testLoad_newRow("4frames.gif", "gif", MimeTypeUtils::KIND_IMAGE, true); + testLoad_newRow("1frame.gif", "gif", MimeTypeUtils::KIND_IMAGE, false); testLoad_newRow("185523_1frame_with_graphic_control_extension.gif", - "gif", MimeTypeUtils::KIND_RASTER_IMAGE, false); + "gif", MimeTypeUtils::KIND_IMAGE, false); } void DocumentTest::testLoadTwoPasses()