summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Grulich <[email protected]>2014-12-09 14:17:50 +0100
committerJan Grulich <[email protected]>2014-12-09 14:17:50 +0100
commit945f46a14ec3b896b7b06fba208071b00525d827 (patch)
tree6d5acce87383a5efdc7c61e898cb068beddb9b33
parente990972bdf3142121a2dc37ab1902aa094a826f0 (diff)
Fix some compilation errors
-rw-r--r--plugins/libarchive/CMakeLists.txt2
-rw-r--r--plugins/libarchive/libarchivehandler.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/libarchive/CMakeLists.txt b/plugins/libarchive/CMakeLists.txt
index 2322750..3d95f8b 100644
--- a/plugins/libarchive/CMakeLists.txt
+++ b/plugins/libarchive/CMakeLists.txt
@@ -28,7 +28,7 @@ set(kerfuffle_libarchive_SRCS libarchivehandler.cpp)
add_library(kerfuffle_libarchive MODULE ${kerfuffle_libarchive_SRCS})
-target_link_libraries(kerfuffle_libarchive KF5::KIOCore ${LIBARCHIVE_LIBRARY} kerfuffle )
+target_link_libraries(kerfuffle_libarchive KF5::KIOCore ${LIBARCHIVE_LIBRARY} kerfuffle )
install(TARGETS kerfuffle_libarchive DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/plugins/libarchive/libarchivehandler.cpp b/plugins/libarchive/libarchivehandler.cpp
index 139b4b2..6611d8c 100644
--- a/plugins/libarchive/libarchivehandler.cpp
+++ b/plugins/libarchive/libarchivehandler.cpp
@@ -35,7 +35,6 @@
#include <archive_entry.h>
#include <KLocalizedString>
-#include <kde_file.h>
#include <QDateTime>
#include <QDebug>
@@ -44,6 +43,7 @@
#include <QFile>
#include <QList>
#include <QStringList>
+#include <qplatformdefs.h>
struct LibArchiveInterface::ArchiveReadCustomDeleter
{
@@ -296,9 +296,9 @@ bool LibArchiveInterface::copyFiles(const QVariantList& files, const QString& de
//if there is an already existing directory:
if (entryIsDir && entryFI.exists()) {
if (entryFI.isWritable()) {
- qDebug(1601) << "Warning, existing, but writable dir";
+ qDebug() << "Warning, existing, but writable dir";
} else {
- qDebug(1601) << "Warning, existing, but non-writable dir. skipping";
+ qDebug() << "Warning, existing, but non-writable dir. skipping";
archive_entry_clear(entry);
archive_read_data_skip(arch.data());
continue;
@@ -750,8 +750,8 @@ bool LibArchiveInterface::writeFile(const QString& fileName, struct archive* arc
// or something may have caused it to follow symlinks, in
// which case stat() will be called. To avoid this, we
// call lstat() ourselves.
- KDE_struct_stat st;
- KDE_lstat(QFile::encodeName(fileName).constData(), &st);
+ QT_STATBUF st;
+ QT_LSTAT(QFile::encodeName(fileName).constData(), &st);
struct archive_entry *entry = archive_entry_new();
archive_entry_set_pathname(entry, QFile::encodeName(relativeName).constData());