diff --git a/krusader/Archive/abstractthreadedjob.h b/krusader/Archive/abstractthreadedjob.h --- a/krusader/Archive/abstractthreadedjob.h +++ b/krusader/Archive/abstractthreadedjob.h @@ -39,7 +39,7 @@ class AbstractJobThread; class QTemporaryDir; class UserEvent; -class KRarcObserver; +class KrArcObserver; class QTemporaryFile; class AbstractThreadedJob : public KIO::Job @@ -97,7 +97,7 @@ virtual ~AbstractJobThread(); void abort(); - KRarcObserver * observer(); + KrArcObserver * observer(); protected slots: virtual void slotStart() = 0; @@ -140,7 +140,7 @@ QEventLoop *_loop; QTemporaryDir *_downloadTempDir; - KRarcObserver *_observer; + KrArcObserver *_observer; QTemporaryFile *_tempFile; QString _tempFileName; diff --git a/krusader/Archive/abstractthreadedjob.cpp b/krusader/Archive/abstractthreadedjob.cpp --- a/krusader/Archive/abstractthreadedjob.cpp +++ b/krusader/Archive/abstractthreadedjob.cpp @@ -248,7 +248,7 @@ emit description(this, mytitle, field1, field2); } -class AbstractJobObserver : public KRarcObserver +class AbstractJobObserver : public KrArcObserver { protected: AbstractJobThread * _jobThread; @@ -519,7 +519,7 @@ delete calcSpaceFileSystem; } -KRarcObserver * AbstractJobThread::observer() +KrArcObserver * AbstractJobThread::observer() { if (_observer) return _observer; diff --git a/krusader/Archive/krarchandler.h b/krusader/Archive/krarchandler.h --- a/krusader/Archive/krarchandler.h +++ b/krusader/Archive/krarchandler.h @@ -35,11 +35,11 @@ class Wallet; } -class KRarcObserver : public QObject +class KrArcObserver : public QObject { Q_OBJECT public: - ~KRarcObserver() override = default; + ~KrArcObserver() override = default; virtual void processEvents() = 0; virtual void subJobStarted(const QString & jobTitle, int count) = 0; @@ -59,13 +59,13 @@ explicit KrArcHandler(QObject *parent = nullptr); // return the number of files in the archive - long arcFileCount(const QString& archive, const QString& type, const QString& password, KRarcObserver *observer); + long arcFileCount(const QString& archive, const QString& type, const QString& password, KrArcObserver *observer); // unpack an archive to destination directory - bool unpack(QString archive, const QString& type, const QString& password, const QString& dest, KRarcObserver *observer ); + bool unpack(QString archive, const QString& type, const QString& password, const QString& dest, KrArcObserver *observer ); // pack an archive to destination directory - bool pack(QStringList fileNames, QString type, const QString& dest, long count, QMap extraProps, KRarcObserver *observer ); + bool pack(QStringList fileNames, QString type, const QString& dest, long count, QMap extraProps, KrArcObserver *observer ); // test an archive - bool test(const QString& archive, const QString& type, const QString& password, KRarcObserver *observer, long count = 0L ); + bool test(const QString& archive, const QString& type, const QString& password, KrArcObserver *observer, long count = 0L ); // returns `true` if the right unpacker exist in the system static bool arcSupported(QString type); // return the list of supported packers diff --git a/krusader/Archive/krarchandler.cpp b/krusader/Archive/krarchandler.cpp --- a/krusader/Archive/krarchandler.cpp +++ b/krusader/Archive/krarchandler.cpp @@ -46,11 +46,11 @@ #include "../../krArc/krlinecountingprocess.h" #if 0 -class DefaultKRarcObserver : public KRarcObserver +class DefaultKrArcObserver : public KrArcObserver { public: - DefaultKRarcObserver() {} - virtual ~DefaultKRarcObserver() {} + DefaultKrArcObserver() {} + virtual ~DefaultKrArcObserver() {} virtual void processEvents() override { usleep(1000); @@ -195,7 +195,7 @@ || (type == "7z" && lst.contains("7z")); } -long KrArcHandler::arcFileCount(const QString& archive, const QString& type, const QString& password, KRarcObserver *observer) +long KrArcHandler::arcFileCount(const QString& archive, const QString& type, const QString& password, KrArcObserver *observer) { int divideWith = 1; @@ -274,7 +274,7 @@ return count / divideWith; } -bool KrArcHandler::unpack(QString archive, const QString& type, const QString& password, const QString& dest, KRarcObserver *observer) +bool KrArcHandler::unpack(QString archive, const QString& type, const QString& password, const QString& dest, KrArcObserver *observer) { KConfigGroup group(krConfig, "Archives"); if (group.readEntry("Test Before Unpack", _TestBeforeUnpack)) { @@ -374,9 +374,9 @@ // tell the user to wait observer->subJobStarted(i18n("Unpacking File(s)"), count); if (count != 0) { - connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KRarcObserver::incrementProgress); + connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KrArcObserver::incrementProgress); if (type == "rpm") - connect(&proc, &KrLinecountingProcess::newErrorLines, observer, &KRarcObserver::incrementProgress); + connect(&proc, &KrLinecountingProcess::newErrorLines, observer, &KrArcObserver::incrementProgress); } // start the unpacking process @@ -404,7 +404,7 @@ return true; // SUCCESS } -bool KrArcHandler::test(const QString& archive, const QString& type, const QString& password, KRarcObserver *observer, long count) +bool KrArcHandler::test(const QString& archive, const QString& type, const QString& password, KrArcObserver *observer, long count) { // choose the right packer for the job QStringList packer; @@ -448,7 +448,7 @@ // tell the user to wait observer->subJobStarted(i18n("Testing Archive"), count); if (count != 0) - connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KRarcObserver::incrementProgress); + connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KrArcObserver::incrementProgress); // start the unpacking process proc.start(); @@ -470,7 +470,7 @@ return true; // SUCCESS } -bool KrArcHandler::pack(QStringList fileNames, QString type, const QString& dest, long count, QMap extraProps, KRarcObserver *observer) +bool KrArcHandler::pack(QStringList fileNames, QString type, const QString& dest, long count, QMap extraProps, KrArcObserver *observer) { // set the right packer to do the job QStringList packer; @@ -575,7 +575,7 @@ // tell the user to wait observer->subJobStarted(i18n("Packing File(s)"), count); if (count != 0) - connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KRarcObserver::incrementProgress); + connect(&proc, &KrLinecountingProcess::newOutputLines, observer, &KrArcObserver::incrementProgress); // start the packing process proc.start();