summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius ┼átikonas <[email protected]>2014-11-10 13:13:48 +0000
committerAndrius ┼átikonas <[email protected]>2014-11-10 13:13:48 +0000
commit0eae21a315b93a43fb4914ed418b2f2a1fe2c2c1 (patch)
tree91d3d1be13124edb97bdcee169146239103a6e53
parentf828e87792af1058ffc5de71b5b2cadcc764d603 (diff)
Fix linking and port some code away from KDebug.
-rw-r--r--plugins/cli7zplugin/CMakeLists.txt2
-rw-r--r--plugins/cli7zplugin/cliplugin.cpp13
-rw-r--r--plugins/clilhaplugin/CMakeLists.txt2
-rw-r--r--plugins/clilhaplugin/cliplugin.cpp2
4 files changed, 7 insertions, 12 deletions
diff --git a/plugins/cli7zplugin/CMakeLists.txt b/plugins/cli7zplugin/CMakeLists.txt
index b9b201a..ebbc0de 100644
--- a/plugins/cli7zplugin/CMakeLists.txt
+++ b/plugins/cli7zplugin/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kerfuffle_cli7z_SRCS cliplugin.cpp)
add_library(kerfuffle_cli7z MODULE ${kerfuffle_cli7z_SRCS})
-target_link_libraries(kerfuffle_cli7z KF5::KDELibs4Support KF5::KIOCore kerfuffle )
+target_link_libraries(kerfuffle_cli7z KF5::KIOCore kerfuffle )
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_cli7z.desktop.cmake
diff --git a/plugins/cli7zplugin/cliplugin.cpp b/plugins/cli7zplugin/cliplugin.cpp
index 6452d95..0d1416e 100644
--- a/plugins/cli7zplugin/cliplugin.cpp
+++ b/plugins/cli7zplugin/cliplugin.cpp
@@ -26,12 +26,11 @@
#include "kerfuffle_macro.h"
#include <QDateTime>
+#include <QDebug>
#include <QDir>
#include <QLatin1String>
#include <QString>
-#include <KDebug>
-
using namespace Kerfuffle;
CliPlugin::CliPlugin(QObject *parent, const QVariantList & args)
@@ -85,13 +84,13 @@ bool CliPlugin::readListLine(const QString& line)
switch (m_state) {
case ReadStateHeader:
if (line.startsWith(QLatin1String("Listing archive:"))) {
- kDebug() << "Archive name: "
+ qDebug() << "Archive name: "
<< line.right(line.size() - 16).trimmed();
} else if ((line == archiveInfoDelimiter1) ||
(line == archiveInfoDelimiter2)) {
m_state = ReadStateArchiveInformation;
} else if (line.contains(QLatin1String( "Error:" ))) {
- kDebug() << line.mid(6);
+ qDebug() << line.mid(6);
}
break;
@@ -100,7 +99,7 @@ bool CliPlugin::readListLine(const QString& line)
m_state = ReadStateEntryInformation;
} else if (line.startsWith(QLatin1String("Type ="))) {
const QString type = line.mid(7).trimmed();
- kDebug() << "Archive type: " << type;
+ qDebug() << "Archive type: " << type;
if (type == QLatin1String("7z")) {
m_archiveType = ArchiveType7z;
@@ -114,7 +113,7 @@ bool CliPlugin::readListLine(const QString& line)
m_archiveType = ArchiveTypeZip;
} else {
// Should not happen
- kWarning() << "Unsupported archive type";
+ qWarning() << "Unsupported archive type";
return false;
}
}
@@ -176,6 +175,4 @@ bool CliPlugin::readListLine(const QString& line)
return true;
}
-KERFUFFLE_EXPORT_PLUGIN(CliPlugin)
-
#include "cliplugin.moc"
diff --git a/plugins/clilhaplugin/CMakeLists.txt b/plugins/clilhaplugin/CMakeLists.txt
index 678ede3..54d3eb8 100644
--- a/plugins/clilhaplugin/CMakeLists.txt
+++ b/plugins/clilhaplugin/CMakeLists.txt
@@ -6,7 +6,7 @@ set(kerfuffle_cli_SRCS cliplugin.cpp)
add_library(kerfuffle_clilha MODULE ${kerfuffle_cli_SRCS})
-target_link_libraries(kerfuffle_clilha KF5::KDELibs4Support KF5::KIOCore kerfuffle )
+target_link_libraries(kerfuffle_clilha KF5::KIOCore kerfuffle )
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/kerfuffle_clilha.desktop.cmake
diff --git a/plugins/clilhaplugin/cliplugin.cpp b/plugins/clilhaplugin/cliplugin.cpp
index 0fd8f6f..9a04b1f 100644
--- a/plugins/clilhaplugin/cliplugin.cpp
+++ b/plugins/clilhaplugin/cliplugin.cpp
@@ -25,7 +25,6 @@
#include "kerfuffle_macro.h"
#include <QDate>
#include <QTime>
-#include <kdebug.h>
using namespace Kerfuffle;
@@ -141,5 +140,4 @@ bool CliPlugin::readListLine(const QString &line)
return true;
}
-KERFUFFLE_EXPORT_PLUGIN(CliPlugin)
#include "cliplugin.moc"