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
wilder-work
Olivier Trichet 18 years ago
parent 1bf172030f
commit 9d72670b9e
  1. 2
      kmkernel.cpp
  2. 1
      messagecomposer.cpp
  3. 1
      messagecomposer.h

@ -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() );

@ -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>

@ -41,7 +41,6 @@
#include <mimelib/mediatyp.h>
#include "kleo/cryptobackend.h"
#include <libkpgp/kpgp.h>
#include <vector>

Loading…
Cancel
Save