diff --git a/mime/thumbnail-creator.cpp b/mime/thumbnail-creator.cpp --- a/mime/thumbnail-creator.cpp +++ b/mime/thumbnail-creator.cpp @@ -20,8 +20,8 @@ #include #include #include +#include #include -#include namespace Palapeli { @@ -47,8 +47,8 @@ KTar tar(path, "application/x-gzip"); if (!tar.open(QIODevice::ReadOnly)) return false; - KTempDir cache; - const QString cachePath = cache.name(); //note: includes trailing slash + QTemporaryDir cache; + const QString cachePath = cache.path() + QLatin1Char('/'); tar.directory()->copyTo(cachePath); tar.close(); //read image diff --git a/src/file-io/components-directorystorage.cpp b/src/file-io/components-directorystorage.cpp --- a/src/file-io/components-directorystorage.cpp +++ b/src/file-io/components-directorystorage.cpp @@ -22,27 +22,27 @@ #include #include #include -#include +#include Palapeli::DirectoryStorageComponent::DirectoryStorageComponent() - : m_dir(new KTempDir) + : m_dir(new QTemporaryDir) { } Palapeli::DirectoryStorageComponent::~DirectoryStorageComponent() { - m_dir->unlink(); + m_dir->remove(); delete m_dir; } QString Palapeli::DirectoryStorageComponent::directory() const { - return m_dir->name(); + return m_dir->path() + QLatin1Char('/'); } Palapeli::PuzzleComponent* Palapeli::DirectoryStorageComponent::cast(Palapeli::PuzzleComponent::Type type) const { - QDir dir(m_dir->name()); + QDir dir(m_dir->path()); //load metadata from directory if (type == Metadata) { diff --git a/src/file-io/components.h b/src/file-io/components.h --- a/src/file-io/components.h +++ b/src/file-io/components.h @@ -23,7 +23,7 @@ #include "puzzlestructs.h" class KConfigGroup; -class KTempDir; +class QTemporaryDir; #define COMPONENT_SUBCLASS(mytype) \ public: \ @@ -86,7 +86,7 @@ QString directory() const; Palapeli::PuzzleComponent* cast(Type type) const Q_DECL_OVERRIDE; private: - KTempDir* m_dir; + QTemporaryDir* m_dir; }; ///This is a valid mainComponent.