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

List:       kde-commits
Subject:    Re: KDE/kdepim/kleopatra/uiserver
From:       Marc Mutz <marc () kdab ! net>
Date:       2008-02-01 8:23:42
Message-ID: 200802010923.43609.marc () kdab ! net
[Download RAW message or body]

On Thursday January 31 2008 20:44, Frank Osterfeld wrote:
> SVN commit 769184 by osterfeld:
>
> build with mingw,too
>
>  M  +4 -0      assuanserverconnection.cpp
>  M  +33 -29    uiserver_p.h
>
>
> --- trunk/KDE/kdepim/kleopatra/uiserver/assuanserverconnection.cpp
> #769183:769184 @@ -669,6 +669,8 @@
>  //
>  //
>
> +namespace Kleo {
> +

Hmm? This code is unchanged for weeks, if not months...?

>  class InquiryHandler : public QObject {
>      Q_OBJECT
>  public:
> @@ -720,6 +722,8 @@
>      void signal( int rc, const QByteArray & data, const QByteArray &
> keyword ); };
>
> +} // namespace Kleo
> +
>  class AssuanCommand::Private {
>  public:
>      Private() : done( false ), nohup( false ) {}
> --- trunk/KDE/kdepim/kleopatra/uiserver/uiserver_p.h #769183:769184
> @@ -63,35 +63,39 @@
>      }
>  }
>
> -class Kleo::UiServer::Private : public QTcpServer {
> -    Q_OBJECT
> -    friend class ::Kleo::UiServer;
> -    UiServer * const q;
> -public:
> -    explicit Private( UiServer * qq );
> -    static bool isStaleAssuanSocket( const QString& socketName );
> +namespace Kleo {
> +
> +	class UiServer::Private : public QTcpServer {
> +	    Q_OBJECT
> +	    friend class ::Kleo::UiServer;
> +	    UiServer * const q;
> +	public:
> +	    explicit Private( UiServer * qq );
> +	    static bool isStaleAssuanSocket( const QString& socketName );
> +
> +	private:
> +	    void makeListeningSocket();
> +	    // platform-specific creation impl for makeListeningSocket():
> +	    void doMakeListeningSocket( const QByteArray & encodedFileName );
> +	    QString makeFileName( const QString & hint=QString() ) const;
> +
> +	protected:
> +	    /* reimp */ void incomingConnection( int fd );
> +
> +	private Q_SLOTS:
> +	    void slotConnectionClosed( Kleo::AssuanServerConnection * conn );
> +
> +	private:
> +	    KTempDir tmpDir;
> +	    QFile file;
> +	    std::vector< boost::shared_ptr<AssuanCommandFactory> > factories;
> +	    std::vector< boost::shared_ptr<AssuanServerConnection> > connections;
> +	    QString suggestedSocketName;
> +	    QString actualSocketName;
> +	    assuan_sock_nonce_t nonce;
> +	    const WSAStarter _wsastarter;
> +	};
>
> -private:
> -    void makeListeningSocket();
> -    // platform-specific creation impl for makeListeningSocket():
> -    void doMakeListeningSocket( const QByteArray & encodedFileName );
> -    QString makeFileName( const QString & hint=QString() ) const;
> +}
>
> -protected:
> -    /* reimp */ void incomingConnection( int fd );
> -
> -private Q_SLOTS:
> -    void slotConnectionClosed( Kleo::AssuanServerConnection * conn );
> -
> -private:
> -    KTempDir tmpDir;
> -    QFile file;
> -    std::vector< boost::shared_ptr<AssuanCommandFactory> > factories;
> -    std::vector< boost::shared_ptr<AssuanServerConnection> > connections;
> -    QString suggestedSocketName;
> -    QString actualSocketName;
> -    assuan_sock_nonce_t nonce;
> -    const Kleo::WSAStarter _wsastarter;
> -};
> -
>  #endif /* __KLEOPATRA_UISERVER_UISERVER_P_H__ */

-- 
Marc Mutz - marc@kdab.com, mutz@kde.org - Klarälvdalens Datakonsult AB
Platform-independent software solutions - www.kdab.com info@kdab.com

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