From: Ivailo Monev Date: Wed, 14 Jun 2023 21:38:45 +0000 (+0300) Subject: gwenview: remove unused Gwenview::MimeTypeUtils::urlMimeTypeByContent() function X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6f52fa63019622f937636e5897a943bd6d409fb6;p=kde%2Fkde-extraapps.git gwenview: remove unused Gwenview::MimeTypeUtils::urlMimeTypeByContent() function Signed-off-by: Ivailo Monev --- diff --git a/gwenview/lib/mimetypeutils.cpp b/gwenview/lib/mimetypeutils.cpp index 6267a9e6..f792a79b 100644 --- a/gwenview/lib/mimetypeutils.cpp +++ b/gwenview/lib/mimetypeutils.cpp @@ -19,7 +19,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "mimetypeutils.h" -#include "moc_mimetypeutils_p.cpp" // Qt #include @@ -131,21 +130,6 @@ QString urlMimeType(const KUrl& url) return mimeType; } -QString urlMimeTypeByContent(const KUrl& url) -{ - const int HEADER_SIZE = 30; - if (url.isLocalFile()) { - return KMimeType::findByFileContent(url.toLocalFile())->name(); - } - - KIO::TransferJob* job = KIO::get(url); - DataAccumulator accumulator(job); - while (!accumulator.finished() && accumulator.data().size() < HEADER_SIZE) { - qApp->processEvents(); - } - return KMimeType::findByContent(accumulator.data())->name(); -} - Kind mimeTypeKind(const QString& mimeType) { if (rasterImageMimeTypes().contains(mimeType)) { @@ -175,25 +159,5 @@ Kind urlKind(const KUrl& url) return mimeTypeKind(urlMimeType(url)); } -DataAccumulator::DataAccumulator(KIO::TransferJob* job) -: QObject() -, mFinished(false) -{ - connect(job, SIGNAL(data(KIO::Job*,QByteArray)), - SLOT(slotDataReceived(KIO::Job*,QByteArray))); - connect(job, SIGNAL(result(KJob*)), - SLOT(slotFinished())); -} - -void DataAccumulator::slotDataReceived(KIO::Job*, const QByteArray& data) -{ - mData += data; -} - -void DataAccumulator::slotFinished() -{ - mFinished = true; -} - } // namespace MimeTypeUtils } // namespace Gwenview diff --git a/gwenview/lib/mimetypeutils.h b/gwenview/lib/mimetypeutils.h index 034be56b..a761ff10 100644 --- a/gwenview/lib/mimetypeutils.h +++ b/gwenview/lib/mimetypeutils.h @@ -42,11 +42,6 @@ GWENVIEWLIB_EXPORT const QStringList& imageMimeTypes(); GWENVIEWLIB_EXPORT QString urlMimeType(const KUrl&); -/** - * Finds mimetype by downloading the beginning of the url - */ -GWENVIEWLIB_EXPORT QString urlMimeTypeByContent(const KUrl&); - enum Kind { KIND_UNKNOWN = 0, KIND_DIR = 1, diff --git a/gwenview/lib/mimetypeutils_p.h b/gwenview/lib/mimetypeutils_p.h deleted file mode 100644 index 09294be4..00000000 --- a/gwenview/lib/mimetypeutils_p.h +++ /dev/null @@ -1,71 +0,0 @@ -// vim: set tabstop=4 shiftwidth=4 expandtab: -/* -Gwenview: an image viewer -Copyright 2008 Aurélien Gâteau - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Cambridge, MA 02110-1301, USA. - -*/ -#ifndef MIMETYPEUTILS_P_H -#define MIMETYPEUTILS_P_H - -// Qt -#include -#include - -namespace KIO -{ -class Job; -class TransferJob; -} - -namespace Gwenview -{ - -namespace MimeTypeUtils -{ -/** - * A simple helper class used to determine mime type in some extreme cases - * where we need to download the url header - */ -class DataAccumulator : public QObject -{ - Q_OBJECT -public: - DataAccumulator(KIO::TransferJob* job); - - const QByteArray& data() const { - return mData; - } - - bool finished() const - { - return mFinished; - } - -private Q_SLOTS: - void slotDataReceived(KIO::Job*, const QByteArray& data); - void slotFinished(); - -private: - QByteArray mData; - bool mFinished; -}; - -} // namespace MimeTypeUtils - -} // namespace Gwenview - -#endif /* MIMETYPEUTILS_P_H */