Commit cacad269 authored by Rolf Eike Beer's avatar Rolf Eike Beer
Browse files

clean up includes

parent 01dea734
......@@ -19,7 +19,7 @@ find_package( KdepimLibs REQUIRED )
add_subdirectory( icons )
add_subdirectory( doc )
include_directories( ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR} core editor model transactions )
include_directories( ${KDE4_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIR} )
option(KGPG_DEBUG_TRANSACTIONS "show commands and results of gpg calls in debug log" Off)
......
/*
* Copyright (C) 2009,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2009,2010,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*/
/***************************************************************************
......@@ -14,7 +14,15 @@
#include "caff.h"
#include "caff_p.h"
#include <QDir>
#include "kgpginterface.h"
#include "kgpgsettings.h"
#include "core/KGpgKeyNode.h"
#include "core/KGpgSignableNode.h"
#include "transactions/kgpgdeluid.h"
#include "transactions/kgpgencrypt.h"
#include "transactions/kgpgexport.h"
#include "transactions/kgpgimport.h"
#include "transactions/kgpgsignuid.h"
#include <KDebug>
#include <KLocale>
......@@ -22,16 +30,7 @@
#include <KTempDir>
#include <KTemporaryFile>
#include <KToolInvocation>
#include "kgpgdeluid.h"
#include "kgpgencrypt.h"
#include "kgpgexport.h"
#include "kgpgimport.h"
#include "kgpginterface.h"
#include "KGpgKeyNode.h"
#include "kgpgsettings.h"
#include "KGpgSignableNode.h"
#include "kgpgsignuid.h"
#include <QDir>
KGpgCaffPrivate::KGpgCaffPrivate(KGpgCaff *parent, const KGpgSignableNode::List &ids, const QStringList &signers,
const KGpgCaff::OperationFlags flags, const KGpgSignTransactionHelper::carefulCheck checklevel)
......
/*
* Copyright (C) 2009,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2009,2010,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*/
/***************************************************************************
......@@ -14,9 +14,9 @@
#ifndef _KGPGCAFF_H
#define _KGPGCAFF_H
#include <QObject>
#include "core/KGpgSignableNode.h"
#include <KGpgSignableNode.h>
#include <QObject>
class QStringList;
......
/*
* Copyright (C) 2009,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2009,2010,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*/
/***************************************************************************
......@@ -14,15 +14,15 @@
#ifndef _KGPGCAFF_P_H
#define _KGPGCAFF_P_H
#include "caff.h"
#include "core/KGpgSignableNode.h"
#include "transactions/kgpgsigntransactionhelper.h"
#include <QList>
#include <QObject>
#include <QString>
#include <QStringList>
#include "caff.h"
#include "KGpgSignableNode.h"
#include "kgpgsigntransactionhelper.h"
class KTempDir;
class KGpgTextInterface;
......
......@@ -41,4 +41,5 @@ void Encryption::allow_custom_option_toggled(bool isOn)
{
kcfg_CustomEncryptionOptions->setEnabled(isOn);
}
#include "conf_encryption.moc"
/* Copyright 2008,2009 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -18,10 +18,11 @@
*/
#include "KGpgExpandableNode.h"
#include <KLocale>
#include "kgpgsettings.h"
#include "convert.h"
#include "kgpgitemmodel.h"
#include "core/convert.h"
#include "model/kgpgitemmodel.h"
#include <KLocale>
KGpgExpandableNode::KGpgExpandableNode(KGpgExpandableNode *parent)
: KGpgNode(parent)
......
/* Copyright 2008,2009 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -19,7 +19,7 @@
#ifndef KGPGEXPANDABLENODE_H
#define KGPGEXPANDABLENODE_H
#include <KGpgNode.h>
#include "KGpgNode.h"
class KGpgSubkeyNode;
class KGpgRefNode;
......
/* Copyright 2008,2009,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2010,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -18,17 +18,17 @@
*/
#include "KGpgKeyNode.h"
#include <KLocale>
#include "convert.h"
#include "KGpgGroupMemberNode.h"
#include "kgpginterface.h"
#include "kgpgitemmodel.h"
#include "kgpgsettings.h"
#include "KGpgRootNode.h"
#include "KGpgSubkeyNode.h"
#include "KGpgUatNode.h"
#include "KGpgUidNode.h"
#include "convert.h"
#include "kgpginterface.h"
#include "kgpgsettings.h"
#include "model/kgpgitemmodel.h"
#include <KLocale>
KGpgKeyNode::KGpgKeyNode(KGpgRootNode *parent, const KgpgCore::KgpgKey &k)
: KGpgSignableNode(parent),
......
/* Copyright 2008,2009 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -18,16 +18,16 @@
*/
#include "KGpgNode.h"
#include <KLocale>
#include "KGpgGroupMemberNode.h"
#include "KGpgGroupNode.h"
#include "kgpgitemmodel.h"
#include "KGpgOrphanNode.h"
#include "KGpgRootNode.h"
#include "KGpgSubkeyNode.h"
#include "KGpgUatNode.h"
#include "KGpgUidNode.h"
#include "model/kgpgitemmodel.h"
#include <KLocale>
KGpgNode::KGpgNode(KGpgExpandableNode *parent)
: QObject(), m_parent(parent)
......
/* Copyright 2008,2009 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -19,7 +19,7 @@
#ifndef KGPGORPHANNODE_H
#define KGPGORPHANNODE_H
#include <KGpgNode.h>
#include "KGpgNode.h"
#include "kgpgkey.h"
......
/* Copyright 2008,2009 Rolf Eike Beer <kde@opensource.sf-tec.de>
/* Copyright 2008,2009,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
......@@ -19,8 +19,8 @@
#ifndef KGPGSIGNABLENODE_H
#define KGPGSIGNABLENODE_H
#include <KGpgExpandableNode.h>
#include <KGpgSignNode.h>
#include "KGpgExpandableNode.h"
#include "KGpgSignNode.h"
/**
* @brief An object that may have KGpgSignNode children
......
/***************************************************************************
detailledconsole.cpp - description
detailedconsole.cpp - description
-------------------
begin : Mon Jul 8 2002
copyright : (C) 2002 by Jean-Baptiste Mardelle
......@@ -17,12 +17,8 @@
#include "detailedconsole.h"
#include <QVBoxLayout>
#include <QGroupBox>
#include <QLabel>
#include <KMessageBox>
#include <KLocale>
#include <KMessageBox>
KgpgDetailedInfo::KgpgDetailedInfo(QWidget *parent, const QString &boxLabel, const QString &errormessage,
const QStringList &keysList, const QString &caption)
......@@ -38,3 +34,5 @@ KgpgDetailedInfo::KgpgDetailedInfo(QWidget *parent, const QString &boxLabel, con
KMessageBox::createKMessageBox(this, QMessageBox::Information, // krazy:exclude=qtclasses
boxLabel, keysList, QString(), NULL, 0, errormessage);
}
#include "detailedconsole.moc"
......@@ -14,48 +14,47 @@
#include "kgpgeditor.h"
#include <QTextStream>
#include <QTextCodec>
#include <QPainter>
#include <QtDBus/QtDBus>
#include <QtGui/QPrinter>
#include <QtGui/QPrintDialog>
#include <QVBoxLayout>
#include <QWidget>
#include <KToggleAction>
#include <KStandardAction>
#include <KActionCollection>
#include <KIcon>
#include <KFindDialog>
#include <KFind>
#include <KMenuBar>
#include <KShortcut>
#include <KEncodingFileDialog>
#include <kio/netaccess.h>
#include <kio/renamedialog.h>
#include <KMessageBox>
#include <KTemporaryFile>
#include <KAction>
#include <KLocale>
#include <KDebug>
#include <KRecentFilesAction>
#include <KToolBar>
#include "detailedconsole.h"
#include "selectsecretkey.h"
#include "kgpgmd5widget.h"
#include "kgpgsettings.h"
#include "keyservers.h"
#include "sourceselect.h"
#include "kgpgtextedit.h"
#include "kgpg.h"
#include "kgpgtextinterface.h"
#include "kgpgkeyservergettransaction.h"
#include "keysmanager.h"
#include "editor/kgpgtextedit.h"
#include "transactions/kgpgdecrypt.h"
#include "transactions/kgpgkeyservergettransaction.h"
#include "transactions/kgpgsigntext.h"
#include <KAction>
#include <KActionCollection>
#include <KDebug>
#include <KEncodingFileDialog>
#include <KFind>
#include <KFindDialog>
#include <KIcon>
#include <KLocale>
#include <KMenuBar>
#include <KMessageBox>
#include <KRecentFilesAction>
#include <KShortcut>
#include <KStandardAction>
#include <KTemporaryFile>
#include <KToggleAction>
#include <KToolBar>
#include <QPainter>
#include <QTextCodec>
#include <QTextStream>
#include <QVBoxLayout>
#include <QWidget>
#include <QtDBus/QtDBus>
#include <QtGui/QPrintDialog>
#include <QtGui/QPrinter>
#include <kio/netaccess.h>
#include <kio/renamedialog.h>
class KgpgView : public QWidget {
public:
KgpgView(QWidget *parent, KgpgTextEdit *editor, KToolBar *toolbar);
......
......@@ -14,29 +14,28 @@
#include "kgpgtextedit.h"
#include <QDragEnterEvent>
#include <QTextStream>
#include <QTextCodec>
#include <QDropEvent>
#include <QFile>
#include <kio/netaccess.h>
#include <KMessageBox>
#include <KLocale>
#include "selectsecretkey.h"
#include "kgpgsettings.h"
#include "kgpgtextinterface.h"
#include "keyservers.h"
#include "kgpgeditor.h"
#include "selectpublickeydialog.h"
#include "detailedconsole.h"
#include "kgpgdecrypt.h"
#include "kgpgencrypt.h"
#include "kgpgimport.h"
#include "keysmanager.h"
#include "editor/kgpgeditor.h"
#include "transactions/kgpgdecrypt.h"
#include "transactions/kgpgencrypt.h"
#include "transactions/kgpgimport.h"
#include "transactions/kgpgsigntext.h"
#include <KLocale>
#include <KMessageBox>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QFile>
#include <QTextCodec>
#include <QTextStream>
#include <kio/netaccess.h>
#define SIGNEDMESSAGE_BEGIN QLatin1String( "-----BEGIN PGP SIGNED MESSAGE-----" )
#define SIGNEDMESSAGE_END QLatin1String( "-----END PGP SIGNATURE-----" )
......
......@@ -13,17 +13,16 @@
#include "foldercompressjob.h"
#include <QDir>
#include <QMetaObject>
#include <QTimer>
#include "transactions/kgpgencrypt.h"
#include <KArchive>
#include <KLocale>
#include <KTar>
#include <KTemporaryFile>
#include <KZip>
#include "transactions/kgpgencrypt.h"
#include <QDir>
#include <QMetaObject>
#include <QTimer>
FolderCompressJob::FolderCompressJob(QObject *parent, const KUrl &source, const KUrl &dest, KTemporaryFile *tempfile, const QStringList &keys, const QStringList &options, const KGpgEncrypt::EncryptOptions encOptions)
: KJob(parent),
......
/*
* Copyright (C) 2007,2010 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2007,2008,2009,2010,2011,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*/
/***************************************************************************
......
/*
* Copyright (C) 2002 Jean-Baptiste Mardelle <bj@altern.org>
* Copyright (C) 2007,2008 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2007,2008,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
*/
/***************************************************************************
......@@ -13,14 +13,16 @@
***************************************************************************/
#include "groupedit.h"
#include <QHeaderView>
#include <QSortFilterProxyModel>
#include "kgpgsettings.h"
#include "core/kgpgkey.h"
#include "model/groupeditproxymodel.h"
#include "model/kgpgitemmodel.h"
#include <KAction>
#include <KActionCollection>
#include "groupeditproxymodel.h"
#include "kgpgitemmodel.h"
#include "kgpgkey.h"
#include "kgpgsettings.h"
#include <QHeaderView>
#include <QSortFilterProxyModel>
groupEdit::groupEdit(QWidget *parent, QList<KGpgNode *> *ids)
: QWidget(parent),
......@@ -138,3 +140,5 @@ groupEdit::groupRemove(const QModelIndex &index)
m_in->invalidate();
m_out->invalidate();
}
#include "groupedit.moc"
/*
* Copyright (C) 2002 Jean-Baptiste Mardelle <bj@altern.org>
* Copyright (C) 2007 Jimmy Gilles <jimmygilles@gmail.com>
* Copyright (C) 2008,2009,2010,2011 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2008,2009,2010,2011,2012 Rolf Eike Beer <kde@opensource.sf-tec.de>
* Copyright (C) 2011 Philip Greggory Lee <rocketman768@gmail.com>
*/
......@@ -16,33 +16,32 @@
#include "keyinfodialog.h"
#include <QGridLayout>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QFormLayout>
#include <QGroupBox>
#include <QCheckBox>
#include <QPixmap>
#include <QImage>
#include <QApplication>
#include "kgpgchangekey.h"
#include "selectexpirydate.h"
#include "core/convert.h"
#include "core/images.h"
#include "core/kgpgkey.h"
#include "model/kgpgitemmodel.h"
#include "model/kgpgitemnode.h"
#include "transactions/kgpgchangepass.h"
#include <KToolInvocation>
#include <KPassivePopup>
#include <KPushButton>
#include <KComboBox>
#include <KDatePicker>
#include <KLocale>
#include <KMessageBox>
#include <KPassivePopup>
#include <KPushButton>
#include <KToolInvocation>
#include <KUrlLabel>
#include <KComboBox>
#include <KLocale>
#include "kgpgkey.h"
#include "convert.h"
#include "images.h"
#include "kgpgchangekey.h"
#include "kgpgchangepass.h"
#include "kgpgitemnode.h"
#include "kgpgitemmodel.h"
#include "selectexpirydate.h"
#include <QApplication>
#include <QCheckBox>
#include <QFormLayout>
#include <QGridLayout>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QImage>
#include <QPixmap>
#include <QVBoxLayout>
using namespace KgpgCore;
......
......@@ -14,27 +14,26 @@
#include "keyservers.h"
#include <QCursor>
#include <QLabel>
#include <QTextCodec>
#include "core/convert.h"
#include "detailedconsole.h"
#include "gpgproc.h"
#include "kgpgsettings.h"
#include "model/keylistproxymodel.h"
#include "model/kgpgitemmodel.h"
#include "model/kgpgsearchresultmodel.h"
#include "transactions/kgpgimport.h"
#include "transactions/kgpgkeyservergettransaction.h"
#include "transactions/kgpgkeyserversearchtransaction.h"
#include "transactions/kgpgsendkeys.h"
#include <KConfig>
#include <KMessageBox>
#include <KLocale>
#include <KDebug>
#include <KDateTime>
#include "keylistproxymodel.h"
#include "kgpgitemmodel.h"
#include "kgpgsearchresultmodel.h"
#include "kgpgsettings.h"
#include "detailedconsole.h"
#include "convert.h"
#include "gpgproc.h"
#include "kgpgkeyservergettransaction.h"
#include "kgpgkeyserversearchtransaction.h"
#include "kgpgsendkeys.h"
#include "kgpgimport.h"
#include <KDebug>
#include <KLocale>
#include <KMessageBox>
#include <QCursor>
#include <QLabel>
#include <QTextCodec>
KeyServer::KeyServer(QWidget *parent, KGpgItemModel *model, const bool autoclose)
: KDialog(parent),
......
......@@ -16,102 +16,100 @@
#include "keysmanager.h"
#include <QApplication>
#include <QDesktopWidget>
#include <QKeySequence>
#include <QTextStream>
#include <QClipboard>
#include <QMetaObject>
#include <QPainter>
#include <QPrinter>
#include <QPrintDialog>
#include <QWidget>
#include <QLabel>
#include <QEvent>
#include <QList>
#include <QFile>
#include <QDir>
#include <QtDBus/QtDBus>
#include <QProcess>
#include "caff.h"
#include "core/images.h"
#include "core/kgpgkey.h"
#include "detailedconsole.h"
#include "groupedit.h"
#include "keyadaptor.h"
#include "keyexport.h"
#include "keyinfodialog.h"
#include "keyservers.h"
#include "keytreeview.h"
#include "kgpg.h"
#include "kgpgchangekey.h"
#include "kgpginterface.h"
#include "kgpgkeygenerate.h"
#include "kgpgoptions.h"
#include "kgpgrevokewidget.h"
#include "kgpgsettings.h"
#include "newkey.h"
#include "selectpublickeydialog.h"
#include "selectsecretkey.h"
#include "sourceselect.h"
#include "editor/kgpgeditor.h"
#include "editor/kgpgtextedit.h"
#include "model/keylistproxymodel.h"
#include "transactions/kgpgaddphoto.h"
#include "transactions/kgpgadduid.h"
#include "transactions/kgpgdecrypt.h"
#include "transactions/kgpgdelkey.h"
#include "transactions/kgpgdelsign.h"
#include "transactions/kgpgdeluid.h"
#include "transactions/kgpgencrypt.h"
#include "transactions/kgpgexport.h"
#include "transactions/kgpggeneratekey.h"
#include "transactions/kgpggeneraterevoke.h"
#include "transactions/kgpgimport.h"
#include "transactions/kgpgkeyservergettransaction.h"
#include "transactions/kgpgprimaryuid.h"
#include "transactions/kgpgsignkey.h"
#include "transactions/kgpgsignuid.h"
#include "transactions/kgpgtransactionjob.h"
#include <kabc/addresseedialog.h>
#include <kabc/stdaddressbook.h>
#include <solid/networking.h>
#include <KToolInvocation>
#include <KStandardDirs>
#include <KInputDialog>
#include <KAction>
#include <KActionCollection>
#include <KDebug>
#include <KFileDialog>
#include <KMessageBox>
#include <KFind>
#include <KFindDialog>
#include <KService>
#include <KMimeTypeTrader>
#include <KIcon>
#include <KInputDialog>
#include <KLineEdit>
#include <KLocale>
#include <KMenu>
#include <KMessageBox>
#include <KMimeType>
#include <KMimeTypeTrader>
#include <KProcess>
#include <KRecentFilesAction>
#include <KSelectAction>
#include <KService>
#include <KShortcut>
#include <KStandardAction>
#include <KStandardDirs>
#include <KStandardShortcut>
#include <KLocale>