[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/crypto
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-09-23 12:12:48
Message-ID: 20100923121248.B3617AC88C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178638 by mutz:

crypto/: comment code that needs QProgressDialog, QDirModel or QWizard

 M  +10 -0     createchecksumscontroller.cpp  
 M  +5 -0      decryptverifyemailcontroller.cpp  
 M  +4 -0      decryptverifyemailcontroller.h  
 M  +4 -0      gui/newresultpage.cpp  
 M  +4 -0      gui/newresultpage.h  
 M  +4 -0      gui/newsignencryptfileswizard.cpp  
 M  +4 -0      gui/newsignencryptfileswizard.h  
 M  +4 -0      gui/verifychecksumsdialog.cpp  
 M  +4 -0      gui/verifychecksumsdialog.h  
 M  +3 -1      newsignencryptemailcontroller.cpp  
 M  +4 -0      newsignencryptemailcontroller.h  
 M  +4 -0      verifychecksumscontroller.cpp  
 M  +4 -0      verifychecksumscontroller.h  


--- trunk/KDE/kdepim/kleopatra/crypto/createchecksumscontroller.cpp #1178637:1178638
@@ -185,10 +185,12 @@
 
 private:
     void slotOperationFinished() {
+#ifndef QT_NO_PROGRESSDIALOG
         if ( progressDialog ) {
             progressDialog->setValue( progressDialog->maximum() );
             progressDialog->close();
         }
+#endif // QT_NO_PROGRESSDIALOG
         ResultDialog * const dlg = new ResultDialog( created, errors );
         q->bringToForeground( dlg );
         if ( !errors.empty() )
@@ -198,18 +200,22 @@
     }
     void slotProgress( int current, int total, const QString & what ) {
         qDebug( "progress: %d/%d: %s", current, total, qPrintable( what ) );
+#ifndef QT_NO_PROGRESSDIALOG
         if ( !progressDialog )
             return;
         progressDialog->setMaximum( total );
         progressDialog->setValue( current );
         progressDialog->setLabelText( what );
+#endif // QT_NO_PROGRESSDIALOG
     }
 
 private:
     /* reimp */ void run();
 
 private:
+#ifndef QT_NO_PROGRESSDIALOG
     QPointer<QProgressDialog> progressDialog;
+#endif
     mutable QMutex mutex;
     const std::vector< shared_ptr<ChecksumDefinition> > checksumDefinitions;
     shared_ptr<ChecksumDefinition> checksumDefinition;
@@ -221,7 +227,9 @@
 
 CreateChecksumsController::Private::Private( CreateChecksumsController * qq )
     : q( qq ),
+#ifndef QT_NO_PROGRESSDIALOG
       progressDialog(),
+#endif
       mutex(),
       checksumDefinitions( ChecksumDefinition::getChecksumDefinitions() ),
       checksumDefinition( ChecksumDefinition::getDefaultChecksumDefinition( checksumDefinitions ) ),
@@ -284,12 +292,14 @@
     {
         const QMutexLocker locker( &d->mutex );
 
+#ifndef QT_NO_PROGRESSDIALOG
         d->progressDialog = new QProgressDialog( i18n("Initializing..."), i18n("Cancel"), 0, 0 );
         applyWindowID( d->progressDialog );
         d->progressDialog->setAttribute( Qt::WA_DeleteOnClose );
         d->progressDialog->setMinimumDuration( 1000 );
         d->progressDialog->setWindowTitle( i18nc("@title:window","Create Checksum Progress") );
         connect( d->progressDialog, SIGNAL(canceled()), this, SLOT(cancel()) );
+#endif // QT_NO_PROGRESSDIALOG
 
         d->canceled = false;
         d->errors.clear();
--- trunk/KDE/kdepim/kleopatra/crypto/decryptverifyemailcontroller.cpp #1178637:1178638
@@ -33,6 +33,9 @@
 #include <config-kleopatra.h>
 
 #include "decryptverifyemailcontroller.h"
+
+#ifndef QT_NO_WIZARD
+
 #include "emailoperationspreferences.h"
 
 #include <crypto/gui/newresultpage.h>
@@ -486,3 +489,5 @@
 
 #include "decryptverifyemailcontroller.moc"
 #include "moc_decryptverifyemailcontroller.cpp"
+
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/crypto/decryptverifyemailcontroller.h #1178637:1178638
@@ -45,6 +45,8 @@
 
 #include <vector>
 
+#ifndef QT_NO_WIZARD
+
 class QFile;
 
 namespace KMime {
@@ -115,4 +117,6 @@
 
 Q_DECLARE_METATYPE( GpgME::VerificationResult )
 
+#endif // QT_NO_WIZARD
+
 #endif // __KLEOPATRA_CTYPTO_DECRYPTVERIFYEMAILCONTROLLER_H__
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newresultpage.cpp #1178637:1178638
@@ -34,6 +34,8 @@
 
 #include "newresultpage.h"
 
+#ifndef QT_NO_WIZARD
+
 #include "resultlistwidget.h"
 #include "resultitemwidget.h"
 
@@ -236,3 +238,5 @@
 
 
 #include "newresultpage.moc"
+
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newresultpage.h #1178637:1178638
@@ -35,6 +35,8 @@
 
 #include <QWizardPage>
 
+#ifndef QT_NO_WIZARD
+
 #include <utils/pimpl_ptr.h>
 
 namespace boost {
@@ -85,4 +87,6 @@
 }
 }
 
+#endif // QT_NO_WIZARD
+
 #endif // __KLEOPATRA_CRYPTO_GUI_NEWRESULTPAGE_H__
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.cpp #1178637:1178638
@@ -34,6 +34,8 @@
 
 #include "newsignencryptfileswizard.h"
 
+#ifndef QT_NO_WIZARD
+
 #include "newresultpage.h"
 #include "signingcertificateselectionwidget.h"
 
@@ -1112,3 +1114,5 @@
 
 #include "moc_newsignencryptfileswizard.cpp"
 #include "newsignencryptfileswizard.moc"
+
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/crypto/gui/newsignencryptfileswizard.h #1178637:1178638
@@ -35,6 +35,8 @@
 
 #include <QWizard>
 
+#ifndef QT_NO_WIZARD
+
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
@@ -120,4 +122,6 @@
 }
 }
 
+#endif // QT_NO_WIZARD
+
 #endif /* __KLEOPATRA_CRYPTO_GUI_NEWSIGNENCRYPTFILESWIZARD_H__ */
--- trunk/KDE/kdepim/kleopatra/crypto/gui/verifychecksumsdialog.cpp #1178637:1178638
@@ -34,6 +34,8 @@
 
 #include "verifychecksumsdialog.h"
 
+#ifndef QT_NO_DIRMODEL
+
 #include <KDebug>
 #include <KLocalizedString>
 #include <KMessageBox>
@@ -362,3 +364,5 @@
 
 #include "verifychecksumsdialog.moc"
 #include "moc_verifychecksumsdialog.cpp"
+
+#endif // QT_NO_DIRMODEL
--- trunk/KDE/kdepim/kleopatra/crypto/gui/verifychecksumsdialog.h #1178637:1178638
@@ -36,6 +36,8 @@
 #include <QDialog>
 #include <QMetaType>
 
+#ifndef QT_NO_DIRMODEL
+
 #include <utils/pimpl_ptr.h>
 
 namespace Kleo {
@@ -78,4 +80,6 @@
 
 Q_DECLARE_METATYPE( Kleo::Crypto::Gui::VerifyChecksumsDialog::Status )
 
+#endif // QT_NO_DIRMODEL
+
 #endif // __KLEOPATRA_CRYPTO_GUI_RESULTITEMWIDGET_H__
--- trunk/KDE/kdepim/kleopatra/crypto/newsignencryptemailcontroller.cpp #1178637:1178638
@@ -34,6 +34,8 @@
 
 #include "newsignencryptemailcontroller.h"
 
+#ifndef QT_NO_WIZARD
+
 #include "encryptemailtask.h"
 #include "signemailtask.h"
 #include "taskcollection.h"
@@ -568,4 +570,4 @@
 
 #include "moc_newsignencryptemailcontroller.cpp"
 
-
+#endif // QT_NO_WIZARD
--- trunk/KDE/kdepim/kleopatra/crypto/newsignencryptemailcontroller.h #1178637:1178638
@@ -42,6 +42,8 @@
 #include <vector>
 #include <utility>
 
+#ifndef QT_NO_WIZARD
+
 namespace KMime {
 namespace Types {
     class Mailbox;
@@ -123,5 +125,7 @@
 } // Crypto
 } // Kleo
 
+#endif // QT_NO_WIZARD
+
 #endif /* __KLEOPATRA_CRYPTO_NEWSIGNENCRYPTEMAILCONTROLLER_H__ */
 
--- trunk/KDE/kdepim/kleopatra/crypto/verifychecksumscontroller.cpp #1178637:1178638
@@ -34,6 +34,8 @@
 
 #include "verifychecksumscontroller.h"
 
+#ifndef QT_NO_DIRMODEL
+
 #include <crypto/gui/verifychecksumsdialog.h>
 
 #include <utils/input.h>
@@ -641,3 +643,5 @@
 
 #include "moc_verifychecksumscontroller.cpp"
 #include "verifychecksumscontroller.moc"
+
+#endif // QT_NO_DIRMODEL
--- trunk/KDE/kdepim/kleopatra/crypto/verifychecksumscontroller.h #1178637:1178638
@@ -35,6 +35,8 @@
 
 #include <crypto/controller.h>
 
+#ifndef QT_NO_DIRMODEL
+
 #include <utils/pimpl_ptr.h>
 
 #include <gpgme++/global.h>
@@ -70,5 +72,7 @@
 }
 }
 
+#endif // QT_NO_DIRMODEL
+
 #endif /* __KLEOPATRA_UISERVER_VERIFYCHECKSUMSCONTROLLER_H__ */
 
[prev in list] [next in list] [prev in thread] [next in thread]