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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/utils
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-09-23 12:15:25
Message-ID: 20100923121525.97084AC888 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1178641 by mutz:

Kleo::Input/Kleo::Output: remove those wrapping QClipboard when QT_NO_CLIPBOARD is in \
effect

 M  +4 -0      input.cpp  
 M  +2 -0      input.h  
 M  +4 -0      output.cpp  
 M  +2 -0      output.h  


--- trunk/KDE/kdepim/kleopatra/utils/input.cpp #1178640:1178641
@@ -138,6 +138,7 @@
         QString m_fileName;
     };
 
+#ifndef QT_NO_CLIPBOARD
     class ClipboardInput : public Input {
     public:
         explicit ClipboardInput( QClipboard::Mode mode );
@@ -153,6 +154,7 @@
         const QClipboard::Mode m_mode;
         shared_ptr<QBuffer> m_buffer;
     };
+#endif // QT_NO_CLIPBOARD
 
 }
 
@@ -311,6 +313,7 @@
         return i18n( "Failed to execute %1: %2", m_command, m_proc->errorString() );
 }
 
+#ifndef QT_NO_CLIPBOARD
 shared_ptr<Input> Input::createFromClipboard() {
     return shared_ptr<Input>( new ClipboardInput( QClipboard::Clipboard ) );
 }
@@ -352,6 +355,7 @@
 unsigned int ClipboardInput::classification() const {
     return classifyContent( m_buffer->data() );
 }
+#endif // QT_NO_CLIPBOARD
 
 Input::~Input() {}
 
--- trunk/KDE/kdepim/kleopatra/utils/input.h #1178640:1178641
@@ -67,7 +67,9 @@
         static boost::shared_ptr<Input> createFromProcessStdOut( const QString & \
                command, const QByteArray & stdin_ );
         static boost::shared_ptr<Input> createFromProcessStdOut( const QString & \
command, const QStringList & args, const QByteArray & stdin_ );  static \
boost::shared_ptr<Input> createFromProcessStdOut( const QString & command, const \
QStringList & args, const QDir & workingDirectory, const QByteArray & stdin_ ); \
+#ifndef QT_NO_CLIPBOARD  static boost::shared_ptr<Input> createFromClipboard();
+#endif
     };
 }
 
--- trunk/KDE/kdepim/kleopatra/utils/output.cpp #1178640:1178641
@@ -272,6 +272,7 @@
         const shared_ptr<OverwritePolicy> m_policy;
     };
 
+#ifndef QT_NO_CLIPBOARD
     class ClipboardOutput : public OutputImplBase {
     public:
         explicit ClipboardOutput( QClipboard::Mode mode );
@@ -285,6 +286,7 @@
         const QClipboard::Mode m_mode;
         shared_ptr<QBuffer> m_buffer;
     };
+#endif // QT_NO_CLIPBOARD
 
 }
 
@@ -451,6 +453,7 @@
         return i18n( "Failed to execute %1: %2", m_command, m_proc->errorString() );
 }
 
+#ifndef QT_NO_CLIPBOARD
 shared_ptr<Output> Output::createFromClipboard() {
     return shared_ptr<Output>( new ClipboardOutput( QClipboard::Clipboard ) );
 }
@@ -487,6 +490,7 @@
         throw Exception( gpg_error( GPG_ERR_EIO ),
                          i18n( "Could not find clipboard" ) );
 }
+#endif // QT_NO_CLIPBOARD
 
 
 
--- trunk/KDE/kdepim/kleopatra/utils/output.h #1178640:1178641
@@ -86,7 +86,9 @@
         static boost::shared_ptr<Output> createFromProcessStdIn( const QString & \
                command );
         static boost::shared_ptr<Output> createFromProcessStdIn( const QString & \
                command, const QStringList & args );
         static boost::shared_ptr<Output> createFromProcessStdIn( const QString & \
command, const QStringList & args, const QDir & workingDirectory ); +#ifndef \
QT_NO_CLIPBOARD  static boost::shared_ptr<Output> createFromClipboard();
+#endif
     };
 }
 


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