Unverified Commit e5ef3192 authored by Andre Heinecke's avatar Andre Heinecke
Browse files

Use gnupg-helper code from libkleo

The gnupg-helper was added to Libkleo some time ago.
Use it now to avoid duplicated code.
parent 3af0ec69
......@@ -64,7 +64,6 @@ endif()
ki18n_wrap_ui(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)
set(_kleopatra_SRCS
utils/gnupg-helper.cpp
utils/gui-helper.cpp
utils/filedialog.cpp
utils/kdpipeiodevice.cpp
......
......@@ -14,7 +14,7 @@
#include <Libkleo/KeyCache>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include "kleopatra_debug.h"
#include <KLocalizedString>
......
......@@ -10,7 +10,7 @@
#include <config-kleopatra.h>
#include "clearcrlcachecommand.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <KLocalizedString>
......
......@@ -13,7 +13,7 @@
#include "command_p.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <gpgme++/key.h>
......
......@@ -13,7 +13,7 @@
#include "command_p.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <KProcess>
#include <KMessageBox>
......
......@@ -13,7 +13,7 @@
#include "command_p.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <gpgme++/key.h>
......
......@@ -12,7 +12,7 @@
#include "exportpaperkeycommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <gpgme++/key.h>
......
......@@ -15,7 +15,7 @@
#include "command_p.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/filedialog.h>
#include <Libkleo/Classify>
......
......@@ -12,7 +12,7 @@
#include "genrevokecommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <Libkleo/Formatting>
......
......@@ -13,7 +13,7 @@
#include "command_p.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "kleopatra_debug.h"
#include <KLocalizedString>
......
......@@ -13,7 +13,7 @@
#include "command_p.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <QString>
#include <QByteArray>
......
......@@ -11,7 +11,7 @@
#include "importpaperkeycommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <gpgme++/key.h>
#include <gpgme++/importresult.h>
......
......@@ -15,7 +15,7 @@
#include <smartcard/readerstatus.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <gpgme++/key.h>
......
......@@ -15,7 +15,7 @@
#include "detailscommand.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <dialogs/lookupcertificatesdialog.h>
......
......@@ -11,7 +11,7 @@
#include "refreshopenpgpcertscommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <KLocalizedString>
#include <KMessageBox>
......
......@@ -11,7 +11,7 @@
#include "refreshx509certscommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <KLocalizedString>
#include <KMessageBox>
......
......@@ -23,7 +23,7 @@
#include "commands/decryptverifyfilescommand.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/path-helper.h>
#include <utils/input.h>
#include <utils/output.h>
......
......@@ -17,7 +17,7 @@
#include <crypto/decryptverifytask.h>
#include <crypto/taskcollection.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/input.h>
#include <utils/output.h>
#include <utils/kleo_assert.h>
......
......@@ -16,7 +16,7 @@
#include <crypto/decryptverifytask.h>
#include <crypto/taskcollection.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/path-helper.h>
#include <utils/input.h>
#include <utils/output.h>
......
......@@ -30,7 +30,7 @@
#include <utils/output.h>
#include <utils/kleo_assert.h>
#include <utils/auditlog.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <kmime/kmime_header_parsing.h>
......
......@@ -17,7 +17,7 @@
#include "dialogs/certificateselectiondialog.h"
#include "certificateselectionline.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "utils/gui-helper.h"
#include "utils/kleo_assert.h"
......
......@@ -25,7 +25,7 @@
#include <KMessageBox>
#include "kleopatra_debug.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <Libkleo/FileNameRequester>
#include <QWindow>
......
......@@ -27,7 +27,7 @@
#include <Libkleo/KeySelectionCombo>
#include <Libkleo/KeyListSortFilterProxyModel>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <KLocalizedString>
#include <KConfigGroup>
......
......@@ -23,7 +23,7 @@
#include "utils/input.h"
#include "utils/output.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "utils/kleo_assert.h"
#include <Libkleo/Stl_Util>
......
......@@ -14,7 +14,7 @@
#include <Libkleo/Exception>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/auditlog.h>
#include <gpgme++/exception.h>
......
......@@ -16,7 +16,7 @@
#include "task.h"
#include "kleopatra_debug.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <algorithm>
#include <map>
......
......@@ -8,7 +8,7 @@
*/
#include "updatenotification.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "kleopatra_debug.h"
......
......@@ -20,7 +20,7 @@
#include <smartcard/readerstatus.h>
#include <conf/configuredialog.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/kdpipeiodevice.h>
#include <utils/log.h>
......
......@@ -6,7 +6,6 @@ find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kwatchgnupg.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kwatchgnupg.h)
set(kwatchgnupg_SRCS
../utils/gnupg-helper.cpp
../utils/hex.cpp
../utils/kuniqueservice.cpp
../kleopatra_debug.cpp
......
......@@ -10,7 +10,7 @@
#define KWATCHGNUPG_H
#include <QString>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#define WATCHGNUPGBINARY QStringLiteral("watchgnupg")
#define WATCHGNUPGSOCKET QString( Kleo::gnupgHomeDirectory() + QLatin1String("/log-socket") )
......
......@@ -21,7 +21,7 @@
#include <commands/reloadkeyscommand.h>
#include <commands/selftestcommand.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/archivedefinition.h>
#include "utils/kuniqueservice.h"
......
......@@ -27,7 +27,7 @@
#include "commands/signencryptfilescommand.h"
#include "utils/detail_p.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "utils/action_data.h"
#include "utils/filedialog.h"
#include "utils/clipboardmenu.h"
......
......@@ -28,7 +28,7 @@
#include <utils/validation.h>
#include <utils/filedialog.h>
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <Libkleo/Stl_Util>
#include <Libkleo/Dn>
......
......@@ -10,7 +10,7 @@
#include <config-kleopatra.h>
#include "enginecheck.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "implementation_p.h"
......
......@@ -13,7 +13,7 @@
#include "implementation_p.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/hex.h>
#include "kleopatra_debug.h"
......
......@@ -15,7 +15,7 @@
#include "keypairinfo.h"
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <Libkleo/FileSystemWatcher>
#include <Libkleo/Stl_Util>
......
......@@ -22,7 +22,7 @@
#include <utils/input.h>
#include <utils/output.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <utils/detail_p.h>
#include <utils/hex.h>
#include <utils/log.h>
......
......@@ -15,7 +15,7 @@
#include "sessiondata.h"
#include <utils/detail_p.h>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <Libkleo/Stl_Util>
#include <Libkleo/Exception>
......
......@@ -11,7 +11,7 @@
#include "uiserver_p.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <KLocalizedString>
......
......@@ -11,7 +11,7 @@
#include "uiserver_p.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <KLocalizedString>
......
......@@ -10,7 +10,7 @@
#include "kleopatra_debug.h"
#include "gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <windows.h>
......
......@@ -19,7 +19,7 @@
#include "crypto/signencrypttask.h"
#include "crypto/decryptverifytask.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include "utils/input.h"
#include "utils/output.h"
......
......@@ -17,7 +17,7 @@
#include "smartcard/readerstatus.h"
#include "dialogs/gencardkeydialog.h"
#include "utils/gnupg-helper.h"
#include <Libkleo/GnuPG>
#include <QProgressDialog>
#include <QThread>
......
......@@ -22,7 +22,7 @@
#include <QPushButton>
#include <utils/gnupg-helper.h>
#include <Libkleo/GnuPG>
#include <qgpgme/keylistjob.h>
#include <qgpgme/protocol.h>
#include <gpgme++/keylistresult.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment