From 9d72670b9edbac46413e67e097617ca14d2ebb60 Mon Sep 17 00:00:00 2001
From: Olivier Trichet <nive@nivalis.org>
Date: Fri, 14 Nov 2008 19:53:28 +0000
Subject: [PATCH] Ensure the singleton Kpgp::Module::kpgpObject is correctly
 instanciated  - Remove an unecessary call to Module() in kmail (used to
 initialize the singleton)  - Adapt knode

CCBUG: 174707

svn path=/trunk/KDE/kdepim/knode/; revision=884374
---
 kmkernel.cpp        | 2 --
 messagecomposer.cpp | 1 -
 messagecomposer.h   | 1 -
 3 files changed, 4 deletions(-)

diff --git a/kmkernel.cpp b/kmkernel.cpp
index fb00521fb..75ddc5b95 100644
--- a/kmkernel.cpp
+++ b/kmkernel.cpp
@@ -57,7 +57,6 @@ using KMail::TemplateParser;
 #include <kapplication.h>
 #include <ksystemtrayicon.h>
 #include <kconfiggroup.h>
-#include <libkpgp/kpgp.h>
 #include <kdebug.h>
 #include <kio/jobuidelegate.h>
 #include <kio/netaccess.h>
@@ -138,7 +137,6 @@ KMKernel::KMKernel (QObject *parent, const char *name) :
 
   mXmlGuiInstance = KComponentData();
 
-  new Kpgp::Module();
 
   netCodec = QTextCodec::codecForName( KGlobal::locale()->encoding() );
 
diff --git a/messagecomposer.cpp b/messagecomposer.cpp
index 7dca94b6b..5ca5d6c92 100644
--- a/messagecomposer.cpp
+++ b/messagecomposer.cpp
@@ -70,7 +70,6 @@
 #include <kmime/kmime_util.h>
 #include <kmime/kmime_codecs.h>
 
-#include <libkpgp/kpgpblock.h>
 #include <kconfiggroup.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/messagecomposer.h b/messagecomposer.h
index c1de55cb4..e55b40703 100644
--- a/messagecomposer.h
+++ b/messagecomposer.h
@@ -41,7 +41,6 @@
 
 #include <mimelib/mediatyp.h>
 #include "kleo/cryptobackend.h"
-#include <libkpgp/kpgp.h>
 
 #include <vector>