[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdepim/kleopatra/commands
From: Marc Mutz <mutz () kde ! org>
Date: 2010-09-23 12:10:31
Message-ID: 20100923121031.4C598AC88F () svn ! kde ! org
[Download RAW message or body]
SVN commit 1178636 by mutz:
commands/: remove commands that need QWizard or QDirModel; make the rest compile with \
QT_NO_FILEDIALOG
M +4 -0 certifycertificatecommand.cpp
M +4 -0 certifycertificatecommand.h
M +4 -0 decryptverifyclipboardcommand.cpp
M +4 -0 decryptverifyclipboardcommand.h
M +4 -0 encryptclipboardcommand.cpp
M +4 -0 encryptclipboardcommand.h
M +4 -1 importcertificatefromclipboardcommand.cpp
M +4 -0 importcertificatefromclipboardcommand.h
M +5 -0 importcertificatefromfilecommand.cpp
M +4 -0 importcrlcommand.cpp
M +4 -0 newcertificatecommand.cpp
M +4 -0 newcertificatecommand.h
M +10 -0 selftestcommand.cpp
M +4 -0 signclipboardcommand.cpp
M +4 -0 signclipboardcommand.h
--- trunk/KDE/kdepim/kleopatra/commands/certifycertificatecommand.cpp \
#1178635:1178636 @@ -33,6 +33,8 @@
#include "certifycertificatecommand.h"
+#ifndef QT_NO_WIZARD
+
#include "command_p.h"
#include "exportopenpgpcertstoservercommand.h"
@@ -280,3 +282,5 @@
#undef q
#include "moc_certifycertificatecommand.cpp"
+
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/commands/certifycertificatecommand.h #1178635:1178636
@@ -35,6 +35,8 @@
#include <commands/command.h>
+#ifndef QT_NO_WIZARD
+
namespace GpgME {
class UserID;
}
@@ -78,4 +80,6 @@
}
}
+#endif // QT_NO_WIZARD
+
#endif // __KLEOPATRA_COMMANDS_SIGNCERTIFICATECOMMAND_H__
--- trunk/KDE/kdepim/kleopatra/commands/decryptverifyclipboardcommand.cpp \
#1178635:1178636 @@ -34,6 +34,8 @@
#include "decryptverifyclipboardcommand.h"
+#ifndef QT_NO_CLIPBOARD
+
#include "command_p.h"
#include <crypto/decryptverifyemailcontroller.h>
@@ -170,3 +172,5 @@
#undef q
#include "moc_decryptverifyclipboardcommand.cpp"
+
+#endif // QT_NO_CLIPBOARD
--- trunk/KDE/kdepim/kleopatra/commands/decryptverifyclipboardcommand.h \
#1178635:1178636 @@ -35,6 +35,8 @@
#include <commands/command.h>
+#ifndef QT_NO_CLIPBOARD
+
#include <utils/types.h>
namespace Kleo {
@@ -64,4 +66,6 @@
}
}
+#endif // QT_NO_CLIPBOARD
+
#endif // __KLEOPATRA_COMMMANDS_DECRYPTVERIFYCLIPBOARDCOMMAND_H__
--- trunk/KDE/kdepim/kleopatra/commands/encryptclipboardcommand.cpp #1178635:1178636
@@ -34,6 +34,8 @@
#include "encryptclipboardcommand.h"
+#ifndef QT_NO_CLIPBOARD
+
#include "command_p.h"
#include <crypto/encryptemailcontroller.h>
@@ -169,3 +171,5 @@
#undef q
#include "moc_encryptclipboardcommand.cpp"
+
+#endif // QT_NO_CLIPBOARD
--- trunk/KDE/kdepim/kleopatra/commands/encryptclipboardcommand.h #1178635:1178636
@@ -35,6 +35,8 @@
#include <commands/command.h>
+#ifndef QT_NO_CLIPBOARD
+
#include <utils/types.h>
namespace Kleo {
@@ -65,4 +67,6 @@
}
}
+#endif // QT_NO_CLIPBOARD
+
#endif // __KLEOPATRA_COMMMANDS_ENCRYPTCLIPBOARDCOMMAND_H__
--- trunk/KDE/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.cpp \
#1178635:1178636 @@ -33,6 +33,9 @@
#include <config-kleopatra.h>
#include "importcertificatefromclipboardcommand.h"
+
+#ifndef QT_NO_CLIPBOARD
+
#include "importcertificatescommand_p.h"
#include "utils/classify.h"
@@ -136,4 +139,4 @@
#include "moc_importcertificatefromclipboardcommand.cpp"
-
+#endif // QT_NO_CLIPBOARD
--- trunk/KDE/kdepim/kleopatra/commands/importcertificatefromclipboardcommand.h \
#1178635:1178636 @@ -35,6 +35,8 @@
#include "importcertificatescommand.h"
+#ifndef QT_NO_CLIPBOARD
+
class QStringList;
namespace Kleo {
@@ -58,6 +60,8 @@
};
}
+#endif // QT_NO_CLIPBOARD
+
#endif // __KLEOPATRA_IMPORTCERTIFICATEFROMCLIPBOARDCOMMAND_H__
--- trunk/KDE/kdepim/kleopatra/commands/importcertificatefromfilecommand.cpp \
#1178635:1178636 @@ -149,6 +149,7 @@
d->setWaitForMoreJobs( false );
}
+#ifndef QT_NO_FILEDIALOG
static QStringList get_file_name( QWidget * parent ) {
const QString certificateFilter = i18n("Certificates") + " (*.asc *.cer *.cert \
*.crt *.der *.pem *.gpg *.p7c *.p12 *.pfx *.pgp)"; const QString anyFilesFilter = \
i18n("Any files") + " (*)"; @@ -157,6 +158,7 @@
const KConfigGroup group( config, "Import Certificate" );
previousDir = group.readPathEntry( "last-open-file-directory", \
QDir::homePath() ); }
+ // ### use Kleo::FileDialog?
const QStringList files = QFileDialog::getOpenFileNames( parent, i18n( "Select \
Certificate File" ), previousDir, certificateFilter + ";;" + anyFilesFilter ); if ( \
!files.empty() ) if ( const KSharedConfig::Ptr config = KGlobal::config() ) {
@@ -165,11 +167,14 @@
}
return files;
}
+#endif QT_NO_FILEDIALOG
bool ImportCertificateFromFileCommand::Private::ensureHaveFile()
{
+#ifndef QT_NO_FILEDIALOG
if ( files.empty() )
files = get_file_name( parentWidgetOrView() );
+#endif // QT_NO_FILEDIALOG
return !files.empty();
}
--- trunk/KDE/kdepim/kleopatra/commands/importcrlcommand.cpp #1178635:1178636
@@ -63,6 +63,7 @@
private:
void init();
+#ifndef QT_NO_FILEDIALOG
QStringList getFileNames() {
// loadcrl can only work with DER encoded files
// (verified with dirmngr 1.0.3)
@@ -70,6 +71,7 @@
return QFileDialog::getOpenFileNames( parentWidgetOrView(), i18n("Select CRL \
File to Import"), QString(), filter );
}
+#endif // QT_NO_FILEDIALOG
private:
void slotProcessFinished( int, QProcess::ExitStatus );
@@ -142,8 +144,10 @@
void ImportCrlCommand::doStart() {
+#ifndef QT_NO_FILEDIALOG
if ( d->files.empty() )
d->files = d->getFileNames();
+#endif // QT_NO_FILEDIALOG
if ( d->files.empty() ) {
emit canceled();
d->finished();
--- trunk/KDE/kdepim/kleopatra/commands/newcertificatecommand.cpp #1178635:1178636
@@ -33,6 +33,8 @@
#include "newcertificatecommand.h"
+#ifndef QT_NO_WIZARD
+
#include "command_p.h"
#include <newcertificatewizard/newcertificatewizard.h>
@@ -151,3 +153,5 @@
#undef q
#include "moc_newcertificatecommand.cpp"
+
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/commands/newcertificatecommand.h #1178635:1178636
@@ -35,6 +35,8 @@
#include <commands/command.h>
+#ifndef QT_NO_WIZARD
+
#include <gpgme++/global.h>
namespace Kleo {
@@ -65,4 +67,6 @@
}
}
+#endif // QT_NO_WIZARD
+
#endif // __KLEOPATRA_COMMANDS_NEWCERTIFICATECOMMAND_H__
--- trunk/KDE/kdepim/kleopatra/commands/selftestcommand.cpp #1178635:1178636
@@ -110,8 +110,10 @@
dialog->raise();
else
dialog->show();
+#ifndef QT_NO_SPLASHSCREEN
if ( splash )
splash->finish( dialog );
+#endif // QT_NO_SPLASHSCREEN
}
bool runAtStartUp() const {
@@ -181,7 +183,9 @@
}
private:
+#ifndef QT_NO_SPLASHSCREEN
QPointer<KSplashScreen> splash;
+#endif // QT_NO_SPLASHSCREEN
QPointer<SelfTestDialog> dialog;
bool canceled;
bool automatic;
@@ -195,7 +199,9 @@
SelfTestCommand::Private::Private( SelfTestCommand * qq, KeyListController * c )
: Command::Private( qq, c ),
+#ifndef QT_NO_SPLASHSCREEN
splash(),
+#endif // QT_NO_SPLASHSCREEN
dialog(),
canceled( false ),
automatic( false )
@@ -232,7 +238,11 @@
}
void SelfTestCommand::setSplashScreen( KSplashScreen * splash ) {
+#ifndef QT_NO_SPLASHSCREEN
d->splash = splash;
+#else
+ Q_UNUSED( splash );
+#endif // QT_NO_SPLASHSCREEN
}
bool SelfTestCommand::isCanceled() const {
--- trunk/KDE/kdepim/kleopatra/commands/signclipboardcommand.cpp #1178635:1178636
@@ -34,6 +34,8 @@
#include "signclipboardcommand.h"
+#ifndef QT_NO_CLIPBOARD
+
#include "command_p.h"
#include <crypto/signemailcontroller.h>
@@ -172,3 +174,5 @@
#undef q
#include "moc_signclipboardcommand.cpp"
+
+#endif // QT_NO_CLIPBOARD
--- trunk/KDE/kdepim/kleopatra/commands/signclipboardcommand.h #1178635:1178636
@@ -35,6 +35,8 @@
#include <commands/command.h>
+#ifndef QT_NO_CLIPBOARD
+
#include <utils/types.h>
#include <gpgme++/global.h>
@@ -67,4 +69,6 @@
}
}
+#endif // QT_NO_CLIPBOARD
+
#endif // __KLEOPATRA_COMMMANDS_SIGNCLIPBOARDCOMMAND_H__
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic