← Back to branch summary

~kubuntu-members/kgpg/4.11

« back to all changes in this revision

Viewing changes to kgpgfirstassistant.cpp

  • Committer: Rolf Eike Beer
  • Date: 2012-03-05 18:13:58 UTC
  • Revision ID: git-v1:959df3853f00f245c0d70cd9b6193aed28dbb42d
move functions to query GnuPG properties to class GPGProc

Show diffs side-by-side

added added

removed removed

Lines of Context:
kgpgfirstassistant.cpp
19
19
 
20
20
#include "kgpgfirstassistant.h"
21
21
 
 
22
#include "gpgproc.h"
 
23
#include "kgpginterface.h"
 
24
#include "kgpgkey.h"
 
25
 
22
26
#include <QCheckBox>
23
27
#include <QGridLayout>
24
28
#include <QHBoxLayout>
32
36
#include <KMessageBox>
33
37
#include <KUrlRequester>
34
38
 
35
 
#include "kgpginterface.h"
36
 
#include "kgpgkey.h"
37
 
 
38
39
using namespace KgpgCore;
39
40
 
40
41
KGpgFirstAssistant::KGpgFirstAssistant(QWidget *parent)
233
234
void
234
235
KGpgFirstAssistant::findConfigPath()
235
236
{
236
 
        QString gpgHome(KgpgInterface::getGpgHome(binURL->url().path()));
 
237
        const QString gpgHome = GPGProc::getGpgHome(binURL->url().path());
237
238
        QString confPath = gpgHome + QLatin1String( "gpg.conf" );
238
239
 
239
240
        if (!QFile(confPath).exists()) {
356
357
                return;
357
358
        }
358
359
 
359
 
        m_gpgVersion = KgpgInterface::gpgVersionString(binary);
 
360
        m_gpgVersion = GPGProc::gpgVersionString(binary);
360
361
        setValid(page_binary, !m_gpgVersion.isEmpty());
361
362
        if (!m_gpgVersion.isEmpty()) {
362
 
                int gpgver = KgpgInterface::gpgVersion(m_gpgVersion);
 
363
                const int gpgver = GPGProc::gpgVersion(m_gpgVersion);
363
364
 
364
365
                if (gpgver < 0x10400) {
365
366
                        txtGpgVersion->setText(i18n("Your GnuPG version (%1) seems to be too old.<br />Compatibility with versions before 1.4.0 is no longer guaranteed.", m_gpgVersion));