Hello community, here is the log from the commit of package kgpg for openSUSE:Factory checked in at 2016-05-31 12:17:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgpg (Old) and /work/SRC/openSUSE:Factory/.kgpg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kgpg" Changes: -------- --- /work/SRC/openSUSE:Factory/kgpg/kgpg.changes 2016-03-26 15:15:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kgpg.new/kgpg.changes 2016-05-31 12:17:40.000000000 +0200 @@ -1,0 +2,29 @@ +Sat May 7 10:27:45 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:04:23 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:40:59 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- +Tue Apr 5 11:18:43 UTC 2016 - [email protected] + +- Fix filelist for 13.1, we don't install KF5 ServiceMenus there... + +------------------------------------------------------------------- Old: ---- kgpg-15.12.3.tar.xz New: ---- kgpg-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgpg.spec ++++++ --- /var/tmp/diff_new_pack.FlZa7n/_old 2016-05-31 12:17:41.000000000 +0200 +++ /var/tmp/diff_new_pack.FlZa7n/_new 2016-05-31 12:17:41.000000000 +0200 @@ -17,7 +17,7 @@ Name: kgpg -Version: 15.12.3 +Version: 16.04.1 Release: 0 Summary: Encryption Tool License: GPL-2.0+ @@ -77,7 +77,9 @@ %{_kde4_datadir}/dbus-1/interfaces/*.xml %{_kde4_iconsdir}/hicolor/*/*/*.png %{_kde4_servicesdir}/ServiceMenus/*.desktop +%if 0%{?suse_version} > 1310 %dir %{_kf5_servicesdir}/ServiceMenus/ %{_kf5_servicesdir}/ServiceMenus/*.desktop +%endif %changelog ++++++ kgpg-15.12.3.tar.xz -> kgpg-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/caff.cpp new/kgpg-16.04.1/caff.cpp --- old/kgpg-15.12.3/caff.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/caff.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -27,9 +27,7 @@ #include <KDebug> #include <KLocale> -#include <KProcess> #include <KTempDir> -#include <KTemporaryFile> #include <KToolInvocation> #include <KMessageBox> #include <QDir> @@ -385,6 +383,3 @@ d->reexportKey(d->m_allids.first()); } - -#include "caff.moc" -#include "caff_p.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/caff_p.h new/kgpg-16.04.1/caff_p.h --- old/kgpg-15.12.3/caff_p.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/caff_p.h 2016-03-08 18:48:12.000000000 +0100 @@ -18,7 +18,6 @@ #include "core/KGpgSignableNode.h" #include "transactions/kgpgsigntransactionhelper.h" -#include <QList> #include <QObject> #include <QScopedPointer> #include <QString> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/conf_encryption.cpp new/kgpg-16.04.1/conf_encryption.cpp --- old/kgpg-15.12.3/conf_encryption.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/conf_encryption.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -41,5 +41,3 @@ { kcfg_CustomEncryptionOptions->setEnabled(isOn); } - -#include "conf_encryption.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgExpandableNode.cpp new/kgpg-16.04.1/core/KGpgExpandableNode.cpp --- old/kgpg-15.12.3/core/KGpgExpandableNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgExpandableNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -22,8 +22,6 @@ #include "core/convert.h" #include "model/kgpgitemmodel.h" -#include <KLocale> - KGpgExpandableNode::KGpgExpandableNode(KGpgExpandableNode *parent) : KGpgNode(parent) { @@ -84,5 +82,3 @@ { children.removeAll(child); } - -#include "KGpgExpandableNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgGroupMemberNode.h new/kgpg-16.04.1/core/KGpgGroupMemberNode.h --- old/kgpg-15.12.3/core/KGpgGroupMemberNode.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgGroupMemberNode.h 2016-03-08 18:48:12.000000000 +0100 @@ -21,7 +21,6 @@ #include "KGpgRefNode.h" -#include <QPixmap> #include "kgpgkey.h" using namespace KgpgCore; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgKeyNode.cpp new/kgpg-16.04.1/core/KGpgKeyNode.cpp --- old/kgpg-15.12.3/core/KGpgKeyNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgKeyNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -365,5 +365,3 @@ emit expanded(); } - -#include "KGpgKeyNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgKeyNode.h new/kgpg-16.04.1/core/KGpgKeyNode.h --- old/kgpg-15.12.3/core/KGpgKeyNode.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgKeyNode.h 2016-03-08 18:48:12.000000000 +0100 @@ -24,7 +24,6 @@ #include "kgpgkey.h" -class KGpgExpandableNode; class KGpgRefNode; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgNode.cpp new/kgpg-16.04.1/core/KGpgNode.cpp --- old/kgpg-15.12.3/core/KGpgNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -331,5 +331,3 @@ { return m_parent; } - -#include "KGpgNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgNode.h new/kgpg-16.04.1/core/KGpgNode.h --- old/kgpg-15.12.3/core/KGpgNode.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgNode.h 2016-03-08 18:48:12.000000000 +0100 @@ -19,7 +19,6 @@ #ifndef KGPGNODE_H #define KGPGNODE_H -#include <QPixmap> #include "kgpgkey.h" class KGpgExpandableNode; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgRefNode.cpp new/kgpg-16.04.1/core/KGpgRefNode.cpp --- old/kgpg-15.12.3/core/KGpgRefNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgRefNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -147,5 +147,3 @@ { return m_keynode; } - -#include "KGpgRefNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgRootNode.cpp new/kgpg-16.04.1/core/KGpgRootNode.cpp --- old/kgpg-15.12.3/core/KGpgRootNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgRootNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -179,5 +179,3 @@ return this; } - -#include "KGpgRootNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgRootNode.h new/kgpg-16.04.1/core/KGpgRootNode.h --- old/kgpg-15.12.3/core/KGpgRootNode.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgRootNode.h 2016-03-08 18:48:12.000000000 +0100 @@ -22,9 +22,10 @@ #include "KGpgExpandableNode.h" #include "KGpgKeyNode.h" +#include <QStringList> + class KGpgGroupNode; class QString; -class QStringList; /** * @brief The parent of all key data objects diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgSignableNode.cpp new/kgpg-16.04.1/core/KGpgSignableNode.cpp --- old/kgpg-15.12.3/core/KGpgSignableNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgSignableNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -94,5 +94,3 @@ } } } - -#include "KGpgSignableNode.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgUatNode.cpp new/kgpg-16.04.1/core/KGpgUatNode.cpp --- old/kgpg-15.12.3/core/KGpgUatNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgUatNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -22,12 +22,12 @@ #include "KGpgKeyNode.h" #include <KLocale> -#include <KUrl> +#include <QDateTime> #include <QDir> #include <QFile> +#include <QFileInfo> #include <QPixmap> -#include <QDateTime> class KGpgUatNodePrivate { public: @@ -79,11 +79,11 @@ if (workProcess.readln(tmpfile) < 0) return pixmap; - KUrl url(tmpfile); - pixmap.load(url.path()); - QFile::remove(url.path()); + QFile fname(tmpfile); + pixmap.load(fname.fileName()); + fname.remove(); QDir dir; - dir.rmdir(url.directory()); + dir.rmdir(QFileInfo(fname).path()); return pixmap; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgUatNode.h new/kgpg-16.04.1/core/KGpgUatNode.h --- old/kgpg-15.12.3/core/KGpgUatNode.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgUatNode.h 2016-03-08 18:48:12.000000000 +0100 @@ -24,7 +24,6 @@ #include <QDateTime> #include <QPixmap> -class KGpgExpandableNode; class KGpgKeyNode; class QPixmap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/KGpgUidNode.cpp new/kgpg-16.04.1/core/KGpgUidNode.cpp --- old/kgpg-15.12.3/core/KGpgUidNode.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/KGpgUidNode.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -21,6 +21,8 @@ #include "KGpgKeyNode.h" #include "convert.h" +#include <QStringList> + class KGpgUidNodePrivate { public: KGpgUidNodePrivate(const unsigned int index, const QStringList &sl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/convert.h new/kgpg-16.04.1/core/convert.h --- old/kgpg-15.12.3/core/convert.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/convert.h 2016-03-08 18:48:12.000000000 +0100 @@ -27,7 +27,6 @@ #include <gpgme.h> class QString; -class QPixmap; namespace KgpgCore { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/emailvalidator.cpp new/kgpg-16.04.1/core/emailvalidator.cpp --- old/kgpg-15.12.3/core/emailvalidator.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/emailvalidator.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -20,8 +20,6 @@ #include "emailvalidator.h" -#include <QRegExp> - #include "kpimutils/email.h" namespace KgpgCore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/core/kgpgkey.cpp new/kgpg-16.04.1/core/kgpgkey.cpp --- old/kgpg-15.12.3/core/kgpgkey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/core/kgpgkey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -16,8 +16,6 @@ #include "convert.h" -#include <KLocale> - #include <QStringList> namespace KgpgCore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/detailedconsole.cpp new/kgpg-16.04.1/detailedconsole.cpp --- old/kgpg-15.12.3/detailedconsole.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/detailedconsole.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -25,14 +25,12 @@ : KDialog(parent) { if (!caption.isEmpty()) - setCaption(caption); + setWindowTitle(caption); else - setCaption(i18n("Info")); + setWindowTitle(i18n("Info")); setButtons(Details | Ok); setDefaultButton(Ok); setModal(true); KMessageBox::createKMessageBox(this, QMessageBox::Information, // krazy:exclude=qtclasses boxLabel, keysList, QString(), Q_NULLPTR, 0, errormessage); } - -#include "detailedconsole.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/editor/kgpgeditor.cpp new/kgpg-16.04.1/editor/kgpgeditor.cpp --- old/kgpg-15.12.3/editor/kgpgeditor.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/editor/kgpgeditor.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -31,9 +31,9 @@ #include <KAction> #include <KActionCollection> -#include <KDebug> #include <KEncodingFileDialog> #include <KFind> +#include <KFileDialog> #include <KFindDialog> #include <KIcon> #include <KLocale> @@ -50,9 +50,8 @@ #include <QTextStream> #include <QVBoxLayout> #include <QWidget> -#include <QtDBus/QtDBus> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrinter> +#include <QPrintDialog> +#include <QPrinter> #include <kio/netaccess.h> #include <kio/renamedialog.h> @@ -490,7 +489,7 @@ oldname.prepend(url.directory(KUrl::AppendTrailingSlash)); QPointer<KDialog> popn = new KDialog(this); - popn->setCaption( i18n("Decrypt File To") ); + popn->setWindowTitle(i18n("Decrypt File To")); popn->setButtons( KDialog::Ok | KDialog::Cancel ); popn->setDefaultButton( KDialog::Ok ); popn->setModal( true ); @@ -762,5 +761,3 @@ setCaption(i18n("Untitled"), false); slotResetEncoding(false); } - -#include "kgpgeditor.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/editor/kgpgmd5widget.cpp new/kgpg-16.04.1/editor/kgpgmd5widget.cpp --- old/kgpg-15.12.3/editor/kgpgmd5widget.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/editor/kgpgmd5widget.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -25,7 +25,7 @@ Md5Widget::Md5Widget(QWidget *parent, const KUrl &url) : KDialog(parent) { - setCaption(i18n("MD5 Checksum")); + setWindowTitle(i18n("MD5 Checksum")); setButtons(Apply | Close); setDefaultButton(Close); setButtonText(Apply, i18n("Compare MD5 with Clipboard")); @@ -97,5 +97,3 @@ } } } - -#include "kgpgmd5widget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/editor/kgpgtextedit.cpp new/kgpg-16.04.1/editor/kgpgtextedit.cpp --- old/kgpg-15.12.3/editor/kgpgtextedit.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/editor/kgpgtextedit.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -32,7 +32,6 @@ #include <QDragEnterEvent> #include <QDropEvent> #include <QFile> -#include <QTextCodec> #include <QTextStream> #include <kio/netaccess.h> @@ -356,5 +355,3 @@ { highlightWord(matchedlength, matchingindex); } - -#include "kgpgtextedit.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/foldercompressjob.cpp new/kgpg-16.04.1/foldercompressjob.cpp --- old/kgpg-15.12.3/foldercompressjob.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/foldercompressjob.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -180,5 +180,3 @@ return archives; } - -#include "foldercompressjob.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/gpgproc.cpp new/kgpg-16.04.1/gpgproc.cpp --- old/kgpg-15.12.3/gpgproc.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/gpgproc.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -394,5 +394,3 @@ KStandardDirs::makeDir(gpgHome, 0700); return gpgHome; } - -#include "gpgproc.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/groupedit.cpp new/kgpg-16.04.1/groupedit.cpp --- old/kgpg-15.12.3/groupedit.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/groupedit.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -19,8 +19,7 @@ #include "model/groupeditproxymodel.h" #include "model/kgpgitemmodel.h" -#include <KAction> -#include <KActionCollection> +#include <KIcon> #include <QHeaderView> #include <QSortFilterProxyModel> @@ -137,5 +136,3 @@ m_in->invalidate(); m_out->invalidate(); } - -#include "groupedit.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keyexport.cpp new/kgpg-16.04.1/keyexport.cpp --- old/kgpg-15.12.3/keyexport.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keyexport.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -22,7 +22,7 @@ { setupUi(this); setMainWidget(widget); - setCaption(i18n("Public Key Export")); + setWindowTitle(i18n("Public Key Export")); setButtons(KDialog::Ok | KDialog::Cancel); setDefaultButton(KDialog::Ok); newFilename->setWindowTitle(i18n("Save File")); @@ -48,5 +48,3 @@ QDialog::accept(); } - -#include "keyexport.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keyinfodialog.cpp new/kgpg-16.04.1/keyinfodialog.cpp --- old/kgpg-15.12.3/keyinfodialog.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keyinfodialog.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -26,23 +26,17 @@ #include "model/kgpgitemnode.h" #include "transactions/kgpgchangepass.h" -#include <KComboBox> -#include <KDatePicker> #include <KGlobal> #include <KLocale> #include <KMessageBox> #include <KPushButton> #include <KToolInvocation> -#include <KUrlLabel> #include <QApplication> #include <QCheckBox> #include <QFormLayout> -#include <QGridLayout> -#include <QGroupBox> #include <QHBoxLayout> #include <QImage> #include <QPixmap> -#include <QVBoxLayout> using namespace KgpgCore; @@ -171,7 +165,7 @@ void KgpgKeyInfo::displayKey() { const QString name = m_node->getName(); - setCaption(name); + setWindowTitle(name); m_name->setText(QLatin1String( "<qt><b>" ) + name + QLatin1String( "</b></qt>" )); const QString email = m_node->getEmail(); @@ -388,5 +382,3 @@ if (hasphoto) slotLoadPhoto(m_photoid->currentText()); } - -#include "keyinfodialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keyinfodialog.h new/kgpg-16.04.1/keyinfodialog.h --- old/kgpg-15.12.3/keyinfodialog.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keyinfodialog.h 2016-03-08 18:48:12.000000000 +0100 @@ -26,17 +26,9 @@ #include <kgpgcompiler.h> #include "ui_kgpgKeyInfo.h" -class QCheckBox; -class QGroupBox; - -class KPushButton; -class KUrlLabel; -class KComboBox; - class KGpgItemModel; class KGpgKeyNode; class KGpgChangeKey; -class KGpgChangePass; class KgpgTrustLabel : public QWidget { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keyservers.cpp new/kgpg-16.04.1/keyservers.cpp --- old/kgpg-15.12.3/keyservers.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keyservers.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -26,14 +26,9 @@ #include "transactions/kgpgkeyserversearchtransaction.h" #include "transactions/kgpgsendkeys.h" -#include <KConfig> -#include <KDateTime> -#include <KDebug> #include <KLocale> #include <KMessageBox> #include <QCursor> -#include <QLabel> -#include <QTextCodec> KeyServer::KeyServer(QWidget *parent, KGpgItemModel *model, const bool autoclose) : KDialog(parent), @@ -44,7 +39,7 @@ m_resultmodel(Q_NULLPTR), m_itemmodel(new KeyListProxyModel(this, KeyListProxyModel::SingleColumnIdFirst)) { - setCaption(i18n("Key Server")); + setWindowTitle(i18n("Key Server")); setButtons(Close); setModal(false); @@ -205,7 +200,7 @@ m_filtermodel.setFilterRegExp(QRegExp()); m_dialogserver = new KDialog(this ); - m_dialogserver->setCaption( i18n("Import Key From Keyserver") ); + m_dialogserver->setWindowTitle(i18n("Import Key From Keyserver")); m_dialogserver->setButtons( KDialog::Ok | KDialog::Close ); m_dialogserver->setDefaultButton( KDialog::Ok); m_dialogserver->setModal( true ); @@ -370,5 +365,3 @@ { m_filtermodel.setFilterRegExp(QRegExp(expression, Qt::CaseInsensitive, QRegExp::RegExp2)); } - -#include "keyservers.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keysmanager.cpp new/kgpg-16.04.1/keysmanager.cpp --- old/kgpg-15.12.3/keysmanager.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keysmanager.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -63,15 +63,12 @@ #include <KActionCollection> #include <KDebug> #include <KFileDialog> -#include <KFind> -#include <KFindDialog> #include <KIcon> #include <KInputDialog> #include <KLineEdit> #include <KLocale> #include <KMenu> #include <KMessageBox> -#include <KMimeType> #include <KMimeTypeTrader> #include <KProcess> #include <KRecentFilesAction> @@ -80,22 +77,17 @@ #include <KService> #include <KShortcut> #include <KStandardAction> -#include <KStandardDirs> +#include <KStandardGuiItem> #include <KStandardShortcut> #include <KStatusBar> #include <KStatusNotifierItem> #include <KToggleAction> -#include <KToolBar> #include <KToolInvocation> -#include <KUniqueApplication> #include <KUrl> -#include <KVBox> #include <QApplication> #include <QClipboard> -#include <QDesktopWidget> #include <QDir> #include <QEvent> -#include <QFile> #include <QKeySequence> #include <QLabel> #include <QList> @@ -104,9 +96,8 @@ #include <QPrintDialog> #include <QPrinter> #include <QProcess> -#include <QTextStream> #include <QWidget> -#include <QtDBus/QtDBus> +#include <QDBusConnection> #include <kabc/addresseelist.h> // #include <kabc/key.h> TODO #include <kio/global.h> @@ -592,7 +583,7 @@ updateStatusCounter(); QPointer<KDialog> keyCreated = new KDialog(this); - keyCreated->setCaption(i18n("New Key Pair Created")); + keyCreated->setWindowTitle(i18n("New Key Pair Created")); keyCreated->setButtons(KDialog::Ok); keyCreated->setDefaultButton(KDialog::Ok); keyCreated->setModal(true); @@ -887,7 +878,7 @@ } addUidWidget = new KDialog(this ); - addUidWidget->setCaption( i18n("Add New User Id") ); + addUidWidget->setWindowTitle(i18n("Add New User Id")); addUidWidget->setButtons( KDialog::Ok | KDialog::Cancel ); addUidWidget->setDefaultButton( KDialog::Ok ); addUidWidget->setModal( true ); @@ -1769,7 +1760,7 @@ return; KGpgGroupNode *gnd = nd->toGroupNode(); QPointer<KDialog> dialogGroupEdit = new KDialog(this ); - dialogGroupEdit->setCaption( i18n("Group Properties") ); + dialogGroupEdit->setWindowTitle(i18n("Group Properties")); dialogGroupEdit->setButtons( KDialog::Ok | KDialog::Cancel ); dialogGroupEdit->setDefaultButton( KDialog::Ok ); dialogGroupEdit->setModal( true ); @@ -2531,7 +2522,7 @@ void KeysManager::slotPreImportKey() { QPointer<KDialog> dial = new KDialog(this); - dial->setCaption(i18n("Key Import")); + dial->setWindowTitle(i18n("Key Import")); dial->setButtons(KDialog::Ok | KDialog::Cancel); dial->setDefaultButton(KDialog::Ok); dial->setModal(true); @@ -2857,5 +2848,3 @@ kgpgtxtedit->m_editor->signVerifyText(cliptext); kgpgtxtedit->show(); } - -#include "keysmanager.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keysmanager.h new/kgpg-16.04.1/keysmanager.h --- old/kgpg-15.12.3/keysmanager.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keysmanager.h 2016-03-08 18:48:12.000000000 +0100 @@ -33,7 +33,6 @@ class QEvent; class KSelectAction; -class KStatusBar; class KMenu; class KLineEdit; class KAction; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/keytreeview.cpp new/kgpg-16.04.1/keytreeview.cpp --- old/kgpg-15.12.3/keytreeview.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/keytreeview.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -27,9 +27,11 @@ #include <KConfigGroup> #include <KLocale> #include <KMessageBox> +#include <QDrag> #include <QDragMoveEvent> #include <QDropEvent> #include <QHeaderView> +#include <QMimeData> KeyTreeView::KeyTreeView(QWidget *parent, KeyListProxyModel *model) : QTreeView(parent), m_proxy(model) @@ -227,5 +229,3 @@ { return (state() == EditingState); } - -#include "keytreeview.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpg.cpp new/kgpg-16.04.1/kgpg.cpp --- old/kgpg-15.12.3/kgpg.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpg.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -29,8 +29,6 @@ #include <KMessageBox> #include <KWindowSystem> #include <KMimeType> -#include <QApplication> -#include <QtDBus/QtDBus> using namespace KgpgCore; @@ -189,5 +187,3 @@ return 0; } - -#include "kgpg.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpg.h new/kgpg-16.04.1/kgpg.h --- old/kgpg-15.12.3/kgpg.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpg.h 2016-03-08 18:48:12.000000000 +0100 @@ -20,10 +20,8 @@ #include <KUniqueApplication> #include <KShortcut> -#include <KUrl> #include <klocale.h> -class KCmdLineArgs; class KeysManager; class KGpgExternalActions; class QString; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgchangekey.cpp new/kgpg-16.04.1/kgpgchangekey.cpp --- old/kgpg-15.12.3/kgpgchangekey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgchangekey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -184,5 +184,3 @@ if (m_current != Q_NULLPTR) m_current->setParent(widget); } - -#include "kgpgchangekey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgexternalactions.cpp new/kgpg-16.04.1/kgpgexternalactions.cpp --- old/kgpg-15.12.3/kgpgexternalactions.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgexternalactions.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -35,12 +35,8 @@ #include <KActionCollection> #include <KMessageBox> -#include <KTar> #include <KTemporaryFile> #include <KToolInvocation> -#include <KUniqueApplication> -#include <KZip> -#include <QDesktopWidget> #include <QFont> #include <QProcess> #include <QStringListModel> @@ -493,5 +489,3 @@ { return qobject_cast<KAction *>(m_keysmanager->actionCollection()->action(QLatin1String( "go_default_key" )))->shortcut(); } - -#include "kgpgexternalactions.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgexternalactions.h new/kgpg-16.04.1/kgpgexternalactions.h --- old/kgpg-15.12.3/kgpgexternalactions.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgexternalactions.h 2016-03-08 18:48:12.000000000 +0100 @@ -25,11 +25,9 @@ class KeysManager; class KGpgFirstAssistant; class KGpgItemModel; -class KGpgTextInterface; class KJob; class KShortcut; class KTemporaryFile; -class QFont; class QString; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgfirstassistant.cpp new/kgpg-16.04.1/kgpgfirstassistant.cpp --- old/kgpg-15.12.3/kgpgfirstassistant.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgfirstassistant.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -27,6 +27,7 @@ #include <KLocale> #include <KMessageBox> #include <KStandardDirs> +#include <KUrl> #include <KUrlRequester> #include <QCheckBox> #include <QGridLayout> @@ -41,7 +42,7 @@ KGpgFirstAssistant::KGpgFirstAssistant(QWidget *parent) : KAssistantDialog(parent) { - setCaption(i18n("KGpg Assistant")); + setWindowTitle(i18n("KGpg Assistant")); QWidget *page = new QWidget(this); QGridLayout *gridLayout = new QGridLayout(page); @@ -371,5 +372,3 @@ } } } - -#include "kgpgfirstassistant.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpginterface.cpp new/kgpg-16.04.1/kgpginterface.cpp --- old/kgpg-15.12.3/kgpginterface.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpginterface.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -23,9 +23,6 @@ #include "core/KGpgUidNode.h" #include <gpgme.h> -#include <KConfig> -#include <KDebug> -#include <KGlobal> #include <KLocale> #include <KMessageBox> #include <KProcess> @@ -416,5 +413,3 @@ return result; } - -#include "kgpginterface.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgkeygenerate.cpp new/kgpg-16.04.1/kgpgkeygenerate.cpp --- old/kgpg-15.12.3/kgpgkeygenerate.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgkeygenerate.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -20,14 +20,10 @@ #include "kgpgsettings.h" #include <KComboBox> -#include <KDebug> #include <KHBox> -#include <KLineEdit> #include <KLocale> #include <KMessageBox> -#include <QGroupBox> #include <QIntValidator> -#include <QLabel> #include <QStringList> #include <QVBoxLayout> #include <QWhatsThis> @@ -253,5 +249,3 @@ return QString(); return m_comment->text(); } - -#include "kgpgkeygenerate.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgkeygenerate.h new/kgpg-16.04.1/kgpgkeygenerate.h --- old/kgpg-15.12.3/kgpgkeygenerate.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgkeygenerate.h 2016-03-08 18:48:12.000000000 +0100 @@ -22,7 +22,6 @@ #include <KDialog> class KComboBox; -class KLineEdit; class KgpgKeyGenerate : public KDialog, public Ui::kgpgKeyGenerate { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgoptions.cpp new/kgpg-16.04.1/kgpgoptions.cpp --- old/kgpg-15.12.3/kgpgoptions.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgoptions.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -31,11 +31,12 @@ #include <KMessageBox> #include <KProcess> #include <KStandardDirs> +#include <KDebug> +#include <KUrl> #include <QCheckBox> #include <QFile> #include <QTextStream> #include <QVBoxLayout> -#include <kdefakes.h> using namespace KgpgCore; @@ -605,5 +606,3 @@ { m_page7->kcfg_LeftClick->setEnabled(m_page7->kcfg_ShowSystray->isChecked()); } - -#include "kgpgoptions.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgoptions.h new/kgpg-16.04.1/kgpgoptions.h --- old/kgpg-15.12.3/kgpgoptions.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgoptions.h 2016-03-08 18:48:12.000000000 +0100 @@ -24,7 +24,6 @@ #include "core/kgpgkey.h" #include <QPixmap> -#include <QStringListModel> #include <QString> #include <KConfigDialog> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgrevokewidget.cpp new/kgpg-16.04.1/kgpgrevokewidget.cpp --- old/kgpg-15.12.3/kgpgrevokewidget.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgrevokewidget.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -18,6 +18,7 @@ #include "core/KGpgKeyNode.h" +#include <KUrl> #include <QDir> KgpgRevokeWidget::KgpgRevokeWidget(QWidget* parent) @@ -38,7 +39,7 @@ m_revWidget(new KgpgRevokeWidget(this)), m_id(node->getId()) { - setCaption(i18n("Create Revocation Certificate")); + setWindowTitle(i18n("Create Revocation Certificate")); setButtons(KDialog::Ok | KDialog::Cancel); setDefaultButton(KDialog::Ok); setModal(true); @@ -84,5 +85,3 @@ { return m_revWidget->cbPrint->isChecked(); } - -#include "kgpgrevokewidget.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgrevokewidget.h new/kgpg-16.04.1/kgpgrevokewidget.h --- old/kgpg-15.12.3/kgpgrevokewidget.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgrevokewidget.h 2016-03-08 18:48:12.000000000 +0100 @@ -23,6 +23,7 @@ #include "ui_kgpgrevokewidget.h" class KGpgKeyNode; +class KUrl; class KgpgRevokeWidget : public QWidget, public Ui_KgpgRevokeWidget { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/kgpgtextinterface.cpp new/kgpg-16.04.1/kgpgtextinterface.cpp --- old/kgpg-15.12.3/kgpgtextinterface.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/kgpgtextinterface.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -18,11 +18,8 @@ #include "gpgproc.h" #include "kgpgsettings.h" -#include <KLocale> -#include <QFile> #include <QString> #include <QStringList> -#include <QTextCodec> class KGpgTextInterfacePrivate { @@ -106,5 +103,3 @@ { emit fileSignFinished(); } - -#include "kgpgtextinterface.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/main.cpp new/kgpg-16.04.1/main.cpp --- old/kgpg-15.12.3/main.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/main.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -1,6 +1,6 @@ /* * Copyright (C) 2002 Jean-Baptiste Mardelle <[email protected]> - * Copyright (C) 2007,2008,2009,2010,2011,2012,2013,2014,2015 + * Copyright (C) 2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 * Rolf Eike Beer <[email protected]> */ @@ -23,7 +23,7 @@ static const char description[] = I18N_NOOP("KGpg - simple gui for gpg\n\nKGpg was designed to make gpg very easy to use.\nI tried to make it as secure as possible.\nHope you enjoy it."); -static const char version[] = "2.17.0"; +static const char version[] = "2.17.40"; int main(int argc, char *argv[]) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/model/groupeditproxymodel.cpp new/kgpg-16.04.1/model/groupeditproxymodel.cpp --- old/kgpg-15.12.3/model/groupeditproxymodel.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/model/groupeditproxymodel.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -21,7 +21,6 @@ #include "kgpgitemmodel.h" #include "core/kgpgkey.h" -#include <KDebug> #include <KLocale> #include <QIcon> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/model/keylistproxymodel.cpp new/kgpg-16.04.1/model/keylistproxymodel.cpp --- old/kgpg-15.12.3/model/keylistproxymodel.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/model/keylistproxymodel.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -591,5 +591,3 @@ return flags; } - -#include "keylistproxymodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/model/keylistproxymodel.h new/kgpg-16.04.1/model/keylistproxymodel.h --- old/kgpg-15.12.3/model/keylistproxymodel.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/model/keylistproxymodel.h 2016-03-08 18:48:12.000000000 +0100 @@ -23,7 +23,6 @@ #include "core/kgpgkey.h" class KGpgNode; -class KGpgExpandableNode; class KGpgItemModel; class KeyListProxyModelPrivate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/model/kgpgitemmodel.cpp new/kgpg-16.04.1/model/kgpgitemmodel.cpp --- old/kgpg-15.12.3/model/kgpgitemmodel.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/model/kgpgitemmodel.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -555,5 +555,3 @@ updateNodeTrustColor(echild, trust, color); } } - -#include "kgpgitemmodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/model/kgpgsearchresultmodel.cpp new/kgpg-16.04.1/model/kgpgsearchresultmodel.cpp --- old/kgpg-15.12.3/model/kgpgsearchresultmodel.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/model/kgpgsearchresultmodel.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -387,5 +387,3 @@ delete nkey; } } - -#include "kgpgsearchresultmodel.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/newkey.cpp new/kgpg-16.04.1/newkey.cpp --- old/kgpg-15.12.3/newkey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/newkey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -28,5 +28,3 @@ { kURLRequester1->setEnabled(isOn); } - -#include "newkey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/selectexpirydate.cpp new/kgpg-16.04.1/selectexpirydate.cpp --- old/kgpg-15.12.3/selectexpirydate.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/selectexpirydate.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -24,7 +24,7 @@ SelectExpiryDate::SelectExpiryDate(QWidget* parent, QDateTime date) : KDialog(parent) { - setCaption(i18n("Choose New Expiration")); + setWindowTitle(i18n("Choose New Expiration")); setButtons(Ok | Cancel); setDefaultButton(Ok); setModal(true); @@ -78,5 +78,3 @@ else slotCheckDate(m_datepicker->date()); } - -#include "selectexpirydate.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/selectpublickeydialog.cpp new/kgpg-16.04.1/selectpublickeydialog.cpp --- old/kgpg-15.12.3/selectpublickeydialog.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/selectpublickeydialog.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -29,7 +29,6 @@ #include <KVBox> #include <QCheckBox> #include <QLabel> -#include <QPainter> #include <QTableView> #include <QVBoxLayout> @@ -51,13 +50,13 @@ switch (fcount) { case 0: - setCaption(i18n("Select Public Key")); + setWindowTitle(i18n("Select Public Key")); break; case 1: - setCaption(i18n("Select Public Key for %1", files.first().fileName())); + setWindowTitle(i18n("Select Public Key for %1", files.first().fileName())); break; default: - setCaption(i18np("Select Public Key for %2 and one more file", "Select Public Key for %2 and %1 more files", files.count() - 1, files.first().fileName())); + setWindowTitle(i18np("Select Public Key for %2 and one more file", "Select Public Key for %2 and %1 more files", files.count() - 1, files.first().fileName())); } QWidget *page = new QWidget(this); @@ -239,5 +238,3 @@ QModelIndex pidx = iproxy->mapFromSource(sidx); m_keyslist->selectionModel()->setCurrentIndex(pidx, QItemSelectionModel::Clear | QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); } - -#include "selectpublickeydialog.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/selectpublickeydialog.h new/kgpg-16.04.1/selectpublickeydialog.h --- old/kgpg-15.12.3/selectpublickeydialog.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/selectpublickeydialog.h 2016-03-08 18:48:12.000000000 +0100 @@ -44,7 +44,7 @@ /* TODO: the goDefaultKey shortcut should be stored in a way it can be accessed from everywhere. So we don't have to pass it as an argument. */ - KgpgSelectPublicKeyDlg(QWidget *parent, KGpgItemModel *model, const KShortcut &goDefaultKey = KShortcut(QKeySequence(Qt::CTRL + Qt::Key_Home)), const bool hideasciioption = false, const KUrl::List &files = KUrl::List()); + KgpgSelectPublicKeyDlg(QWidget *parent, KGpgItemModel *model, const KShortcut &goDefaultKey, const bool hideasciioption, const KUrl::List &files = KUrl::List()); QStringList selectedKeys() const; QString getCustomOptions() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/selectsecretkey.cpp new/kgpg-16.04.1/selectsecretkey.cpp --- old/kgpg-15.12.3/selectsecretkey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/selectsecretkey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -31,7 +31,7 @@ m_signtrust(Q_NULLPTR), m_proxy(new SelectSecretKeyProxyModel(this)) { - setCaption(i18n("Private Key List")); + setWindowTitle(i18n("Private Key List")); setButtons(Ok | Cancel); setDefaultButton(Ok); QWidget *page = new QWidget(this); @@ -135,5 +135,3 @@ if (m_keyslist->selectionModel()->hasSelection()) slotButtonClicked(Ok); } - -#include "selectsecretkey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/sourceselect.cpp new/kgpg-16.04.1/sourceselect.cpp --- old/kgpg-15.12.3/sourceselect.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/sourceselect.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -16,7 +16,6 @@ ***************************************************************************/ #include "sourceselect.h" -#include "sourceselect.moc" SrcSelect::SrcSelect(QWidget *parent) : QWidget(parent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgaddphoto.cpp new/kgpg-16.04.1/transactions/kgpgaddphoto.cpp --- old/kgpg-15.12.3/transactions/kgpgaddphoto.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgaddphoto.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -56,5 +56,3 @@ { m_photourl = photourl; } - -#include "kgpgaddphoto.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgadduid.cpp new/kgpg-16.04.1/transactions/kgpgadduid.cpp --- old/kgpg-15.12.3/transactions/kgpgadduid.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgadduid.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -79,5 +79,3 @@ { m_comment = comment; } - -#include "kgpgadduid.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgchangedisable.cpp new/kgpg-16.04.1/transactions/kgpgchangedisable.cpp --- old/kgpg-15.12.3/transactions/kgpgchangedisable.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgchangedisable.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -51,5 +51,3 @@ { return KGpgEditKeyTransaction::nextLine(line); } - -#include "kgpgchangedisable.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgchangeexpire.cpp new/kgpg-16.04.1/transactions/kgpgchangeexpire.cpp --- old/kgpg-15.12.3/transactions/kgpgchangeexpire.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgchangeexpire.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -15,9 +15,6 @@ #include "detailedconsole.h" -#include <KLocale> -#include <KMessageBox> - KGpgChangeExpire::KGpgChangeExpire(QObject *parent, const QString &keyid, const QDateTime &date) : KGpgEditKeyTransaction(parent, keyid, QLatin1String( "expire" ), false) { @@ -55,5 +52,3 @@ { m_date = date; } - -#include "kgpgchangeexpire.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgchangepass.cpp new/kgpg-16.04.1/transactions/kgpgchangepass.cpp --- old/kgpg-15.12.3/transactions/kgpgchangepass.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgchangepass.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -81,5 +81,3 @@ setSuccess(TS_MSG_SEQUENCE); return false; } - -#include "kgpgchangepass.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgchangetrust.cpp new/kgpg-16.04.1/transactions/kgpgchangetrust.cpp --- old/kgpg-15.12.3/transactions/kgpgchangetrust.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgchangetrust.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -59,5 +59,3 @@ { m_trust = trust; } - -#include "kgpgchangetrust.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdecrypt.cpp new/kgpg-16.04.1/transactions/kgpgdecrypt.cpp --- old/kgpg-15.12.3/transactions/kgpgdecrypt.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdecrypt.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -137,5 +137,3 @@ return KGpgTextOrFileTransaction::nextLine(line); } - -#include "kgpgdecrypt.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdecrypt.h new/kgpg-16.04.1/transactions/kgpgdecrypt.h --- old/kgpg-15.12.3/transactions/kgpgdecrypt.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdecrypt.h 2016-03-08 18:48:12.000000000 +0100 @@ -20,7 +20,6 @@ #include "kgpgtextorfiletransaction.h" -class QProcess; class QStringList; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdelkey.cpp new/kgpg-16.04.1/transactions/kgpgdelkey.cpp --- old/kgpg-15.12.3/transactions/kgpgdelkey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdelkey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -88,5 +88,3 @@ m_argscount = getProcess()->program().count(); } - -#include "kgpgdelkey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdelsign.cpp new/kgpg-16.04.1/transactions/kgpgdelsign.cpp --- old/kgpg-15.12.3/transactions/kgpgdelsign.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdelsign.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -136,5 +136,3 @@ return KGpgTransaction::boolQuestion(line); } } - -#include "kgpgdelsign.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdeluid.cpp new/kgpg-16.04.1/transactions/kgpgdeluid.cpp --- old/kgpg-15.12.3/transactions/kgpgdeluid.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdeluid.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -191,5 +191,3 @@ if (!m_uids.isEmpty()) setSuccess(TS_MSG_SEQUENCE); } - -#include "kgpgdeluid.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgdeluid.h new/kgpg-16.04.1/transactions/kgpgdeluid.h --- old/kgpg-15.12.3/transactions/kgpgdeluid.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgdeluid.h 2016-03-08 18:48:12.000000000 +0100 @@ -22,7 +22,6 @@ #include <QObject> class KGpgKeyNode; -class KGpgUidNode; class KGpgDelUid: public KGpgUidTransaction { Q_OBJECT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgeditkeytransaction.cpp new/kgpg-16.04.1/transactions/kgpgeditkeytransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgeditkeytransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgeditkeytransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -102,5 +102,3 @@ { replaceArgument(m_cmdpos, cmd); } - -#include "kgpgeditkeytransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgencrypt.cpp new/kgpg-16.04.1/transactions/kgpgencrypt.cpp --- old/kgpg-15.12.3/transactions/kgpgencrypt.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgencrypt.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -138,5 +138,3 @@ else return QLatin1String( ".gpg" ); } - -#include "kgpgencrypt.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgencrypt.h new/kgpg-16.04.1/transactions/kgpgencrypt.h --- old/kgpg-15.12.3/transactions/kgpgencrypt.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgencrypt.h 2016-03-08 18:48:12.000000000 +0100 @@ -22,8 +22,6 @@ #include "kgpgtextorfiletransaction.h" -class QProcess; - /** * @brief encrypt the given text or files */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgexport.cpp new/kgpg-16.04.1/transactions/kgpgexport.cpp --- old/kgpg-15.12.3/transactions/kgpgexport.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgexport.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -193,5 +193,3 @@ addArguments(options); } - -#include "kgpgexport.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgexport.h new/kgpg-16.04.1/transactions/kgpgexport.h --- old/kgpg-15.12.3/transactions/kgpgexport.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgexport.h 2016-03-08 18:48:12.000000000 +0100 @@ -17,8 +17,6 @@ #include <QObject> #include <QStringList> -#include <KUrl> - #include "kgpgtransaction.h" class QProcess; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpggeneratekey.cpp new/kgpg-16.04.1/transactions/kgpggeneratekey.cpp --- old/kgpg-15.12.3/transactions/kgpggeneratekey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpggeneratekey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -16,7 +16,6 @@ #include "gpgproc.h" #include <KLocale> -#include <KMessageBox> #include <kpimutils/email.h> #include <QApplication> @@ -262,5 +261,3 @@ { return m_errorOutput; } - -#include "kgpggeneratekey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpggeneraterevoke.cpp new/kgpg-16.04.1/transactions/kgpggeneraterevoke.cpp --- old/kgpg-15.12.3/transactions/kgpggeneraterevoke.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpggeneraterevoke.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -15,7 +15,7 @@ #include <KDebug> #include <KLocale> -#include <QtCore/QFile> +#include <QFile> KGpgGenerateRevoke::KGpgGenerateRevoke(QObject *parent, const QString &keyID, const KUrl &revokeUrl, const int reason, const QString &description) : KGpgTransaction(parent), @@ -122,5 +122,3 @@ { return m_output; } - -#include "kgpggeneraterevoke.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgimport.cpp new/kgpg-16.04.1/transactions/kgpgimport.cpp --- old/kgpg-15.12.3/transactions/kgpgimport.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgimport.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -286,5 +286,3 @@ return 2; } - -#include "kgpgimport.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgimport.h new/kgpg-16.04.1/transactions/kgpgimport.h --- old/kgpg-15.12.3/transactions/kgpgimport.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgimport.h 2016-03-08 18:48:12.000000000 +0100 @@ -15,7 +15,6 @@ #define KGPGIMPORT_H #include <QObject> -#include <QList> #include <QString> #include <QStringList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgkeyservergettransaction.cpp new/kgpg-16.04.1/transactions/kgpgkeyservergettransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgkeyservergettransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgkeyservergettransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -96,5 +96,3 @@ { return QLatin1String( "--refresh-keys" ); } - -#include "kgpgkeyservergettransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgkeyserversearchtransaction.cpp new/kgpg-16.04.1/transactions/kgpgkeyserversearchtransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgkeyserversearchtransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgkeyserversearchtransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -74,5 +74,3 @@ { replaceArgument(m_patternPos, pattern); } - -#include "kgpgkeyserversearchtransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgkeyservertransaction.cpp new/kgpg-16.04.1/transactions/kgpgkeyservertransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgkeyservertransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgkeyservertransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -99,5 +99,3 @@ connect(m_progress, SIGNAL(cancelClicked()), SLOT(slotAbort())); } } - -#include "kgpgkeyservertransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgprimaryuid.cpp new/kgpg-16.04.1/transactions/kgpgprimaryuid.cpp --- old/kgpg-15.12.3/transactions/kgpgprimaryuid.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgprimaryuid.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -39,5 +39,3 @@ setSuccess(TS_OK); return KGpgTransaction::passphraseReceived(); } - -#include "kgpgprimaryuid.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgprimaryuid.h new/kgpg-16.04.1/transactions/kgpgprimaryuid.h --- old/kgpg-15.12.3/transactions/kgpgprimaryuid.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgprimaryuid.h 2016-03-08 18:48:12.000000000 +0100 @@ -14,7 +14,6 @@ #ifndef KGPGPRIMARYUID_H #define KGPGPRIMARYUID_H -#include <QList> #include <QObject> #include "kgpguidtransaction.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsendkeys.cpp new/kgpg-16.04.1/transactions/kgpgsendkeys.cpp --- old/kgpg-15.12.3/transactions/kgpgsendkeys.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsendkeys.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -81,5 +81,3 @@ replaceArgument(m_attrpos, m_attributeopt); } - -#include "kgpgsendkeys.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsignkey.cpp new/kgpg-16.04.1/transactions/kgpgsignkey.cpp --- old/kgpg-15.12.3/transactions/kgpgsignkey.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsignkey.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -83,5 +83,3 @@ { replaceCommand(cmd); } - -#include "kgpgsignkey.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsignkey.h new/kgpg-16.04.1/transactions/kgpgsignkey.h --- old/kgpg-15.12.3/transactions/kgpgsignkey.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsignkey.h 2016-03-08 18:48:12.000000000 +0100 @@ -14,7 +14,6 @@ #ifndef KGPGSIGNKEY_H #define KGPGSIGNKEY_H -#include <QList> #include <QObject> #include "kgpgeditkeytransaction.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsigntext.cpp new/kgpg-16.04.1/transactions/kgpgsigntext.cpp --- old/kgpg-15.12.3/transactions/kgpgsigntext.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsigntext.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -82,5 +82,3 @@ return result; } - -#include "kgpgsigntext.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsigntext.h new/kgpg-16.04.1/transactions/kgpgsigntext.h --- old/kgpg-15.12.3/transactions/kgpgsigntext.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsigntext.h 2016-03-08 18:48:12.000000000 +0100 @@ -21,8 +21,6 @@ #include <QString> #include <QStringList> -class QProcess; - /** * @brief sign the given text or files */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsigntransactionhelper.cpp new/kgpg-16.04.1/transactions/kgpgsigntransactionhelper.cpp --- old/kgpg-15.12.3/transactions/kgpgsigntransactionhelper.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsigntransactionhelper.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -140,5 +140,3 @@ asTransaction()->insertArguments(1, secringargs); } - -#include "kgpgsigntransactionhelper.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgsignuid.cpp new/kgpg-16.04.1/transactions/kgpgsignuid.cpp --- old/kgpg-15.12.3/transactions/kgpgsignuid.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgsignuid.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -126,5 +126,3 @@ { replaceArgument(m_cmdPos, cmd); } - -#include "kgpgsignuid.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgtextorfiletransaction.cpp new/kgpg-16.04.1/transactions/kgpgtextorfiletransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgtextorfiletransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgtextorfiletransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -17,7 +17,6 @@ #include <KDebug> #include <KIO/NetAccess> -#include <KLocale> #include <QRegExp> KGpgTextOrFileTransaction::KGpgTextOrFileTransaction(QObject *parent, const QString &text, const bool allowChaining) @@ -177,5 +176,3 @@ { return m_inpfiles; } - -#include "kgpgtextorfiletransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgtextorfiletransaction.h new/kgpg-16.04.1/transactions/kgpgtextorfiletransaction.h --- old/kgpg-15.12.3/transactions/kgpgtextorfiletransaction.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgtextorfiletransaction.h 2016-03-08 18:48:12.000000000 +0100 @@ -15,7 +15,6 @@ #define KGPGTEXTORFILETRANSACTION_H #include <QObject> -#include <QList> #include <QString> #include <QStringList> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgtransaction.cpp new/kgpg-16.04.1/transactions/kgpgtransaction.cpp --- old/kgpg-15.12.3/transactions/kgpgtransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgtransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -17,6 +17,7 @@ #include "kgpginterface.h" #include <KDebug> +#include <KDialog> #include <kio/renamedialog.h> #include <KPasswordDialog> #include <knewpassworddialog.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgtransaction.h new/kgpg-16.04.1/transactions/kgpgtransaction.h --- old/kgpg-15.12.3/transactions/kgpgtransaction.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgtransaction.h 2016-03-08 18:48:12.000000000 +0100 @@ -24,7 +24,6 @@ class KGpgTransactionPrivate; class KUrl; class QByteArray; -class QProcess; /** * @brief Process one GnuPG operation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgtransactionjob.cpp new/kgpg-16.04.1/transactions/kgpgtransactionjob.cpp --- old/kgpg-15.12.3/transactions/kgpgtransactionjob.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgtransactionjob.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -81,5 +81,3 @@ return true; } - -#include "kgpgtransactionjob.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpguidtransaction.cpp new/kgpg-16.04.1/transactions/kgpguidtransaction.cpp --- old/kgpg-15.12.3/transactions/kgpguidtransaction.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpguidtransaction.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -89,5 +89,3 @@ { setUid(QString::number(uid)); } - -#include "kgpguidtransaction.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgverify.cpp new/kgpg-16.04.1/transactions/kgpgverify.cpp --- old/kgpg-15.12.3/transactions/kgpgverify.cpp 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgverify.cpp 2016-03-08 18:48:12.000000000 +0100 @@ -197,5 +197,3 @@ { return m_missingId; } - -#include "kgpgverify.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kgpg-15.12.3/transactions/kgpgverify.h new/kgpg-16.04.1/transactions/kgpgverify.h --- old/kgpg-15.12.3/transactions/kgpgverify.h 2015-12-22 16:56:36.000000000 +0100 +++ new/kgpg-16.04.1/transactions/kgpgverify.h 2016-03-08 18:48:12.000000000 +0100 @@ -23,7 +23,6 @@ #include <KUrl> class KGpgItemModel; -class QProcess; /** * @brief verify the signature of the given text or files
