MAke use of QSettingsWrapper. Remove from original source.

1 files changed, 0 insertions, 244 deletions

diff --git a/installerbuilder/libinstaller/fsengineclient.cpp b/installerbuilder/libinstaller/fsengineclient.cpp
index 0abd1ec63..2e13fbdfd 100644
--- a/installerbuilder/libinstaller/fsengineclient.cpp
+++ b/installerbuilder/libinstaller/fsengineclient.cpp
@@ -32,8 +32,6 @@
 **************************************************************************/
 #include "fsengineclient.h"
 
-#undef QSettings
-
 #include "adminauthorization.h"
 #include "templates.cpp"
 
@@ -889,246 +887,4 @@ void FSEngineClientHandler::Private::maybeStopServer()
     serverStarted = false;
 }
 
-class QSettingsWrapper::Private
-{
-public:
-    Private( const QString& organization, const QString& application )
-        : native( true ),  
-          settings( organization, application ),
-          socket( 0 )
-    {
-    }
-    Private( QSettings::Scope scope, const QString& organization, const QString& application )
-        : native( true ),
-          settings( scope, organization, application ),
-          socket( 0 )
-    {
-    }
-    Private( QSettings::Format format, QSettings::Scope scope, const QString& organization, const QString& application )
-        : native( format == QSettings::NativeFormat ),
-          settings( format, scope, organization, application ),
-          socket( 0 )
-    {
-    }
-    Private( const QString& fileName, QSettings::Format format )
-        : native( format == QSettings::NativeFormat ),
-          fileName( fileName ),
-          settings( fileName, format ),
-          socket( 0 )
-    {
-    }
-    Private()
-        : native( true ),
-          socket( 0 )
-    {
-    }
-
-    bool createSocket()
-    {
-        if( !native || !FSEngineClientHandler::instance()->isActive() )
-            return false;
-        if( socket != 0 && socket->state() == static_cast< int >( QLocalSocket::ConnectedState ) )
-            return true;
-        if( socket != 0 )
-            delete socket;
-#ifdef FSENGINE_TCP
-        socket = new QTcpSocket;
-#else
-        socket = new QLocalSocket;
-#endif
-        if( !FSEngineClientHandler::instance()->connect( socket ) )
-            return false;
-        stream.setDevice( socket );
-        stream.setVersion( QDataStream::Qt_4_2 );
-
-        stream << QString::fromLatin1( "createQSettings" );
-        stream << this->fileName;
-        socket->flush();
-        stream.device()->waitForReadyRead( -1 );
-        quint32 test;
-        stream >> test;
-        stream.device()->readAll();
-        return true;
-    }
-
-    const bool native;
-    const QString fileName;
-    QSettings settings;
-#ifdef FSENGINE_TCP
-    mutable QTcpSocket* socket;
-#else
-    mutable QLocalSocket* socket;
-#endif
-    mutable QDataStream stream;
-};
-
-QSettingsWrapper::QSettingsWrapper( const QString& organization, const QString& application, QObject* parent )
-    : QObject( parent ), 
-     d( new Private( organization, application ) )
-{
-}
-
-QSettingsWrapper::QSettingsWrapper( QSettingsWrapper::Scope scope, const QString& organization, const QString& application, QObject* parent )
-    : QObject( parent ), 
-     d( new Private( static_cast< QSettings::Scope >( scope ), organization, application ) )
-{
-}
-
-QSettingsWrapper::QSettingsWrapper( QSettingsWrapper::Format format, QSettingsWrapper::Scope scope, const QString& organization, const QString& application, QObject* parent )
-    : QObject( parent ), 
-     d( new Private( static_cast< QSettings::Format >( format ), static_cast< QSettings::Scope >( scope ), organization, application ) )
-{
-}
-
-QSettingsWrapper::QSettingsWrapper( const QString& fileName, QSettingsWrapper::Format format, QObject* parent )
-    : QObject( parent ), 
-     d( new Private( fileName, static_cast< QSettings::Format >( format ) ) )
-{
-}
-
-QSettingsWrapper::QSettingsWrapper( QObject* parent )
-    : QObject( parent ), 
-     d( new Private )
-{
-}
-
-QSettingsWrapper::~QSettingsWrapper()
-{
-    if( d->socket != 0 )
-    {
-        d->stream << QString::fromLatin1( "destroyQSettings" );
-        d->socket->flush();
-        quint32 result;
-        d->stream >> result;
-
-        if( QThread::currentThread() == d->socket->thread() )
-        {
-            d->socket->close();
-            delete d->socket;
-        }
-        else
-        {
-            d->socket->deleteLater();
-        }
-    }
-    delete d;
-}
-
-#define RETURN_NO_ARGS_CONST( RESULT, NAME ) \
-RESULT QSettingsWrapper::NAME() const       \
-{ \
-    if( d->createSocket() ) \
-        return callRemoteMethod< RESULT >( d->stream, QLatin1String( "QSettings::"#NAME ) ); \
-    else \
-        return static_cast< RESULT >( d->settings.NAME() ); \
-}
-
-#define RETURN_ONE_ARG( RESULT, NAME, TYPE1 ) \
-RESULT QSettingsWrapper::NAME( TYPE1 param1 ) \
-{ \
-    if( d->createSocket() ) \
-        return callRemoteMethod< RESULT >( d->stream, QLatin1String( "QSettings::"#NAME ), param1 ); \
-    else \
-        return d->settings.NAME( param1 ); \
-}
-
-#define RETURN_ONE_ARG_CONST( RESULT, NAME, TYPE1 ) \
-RESULT QSettingsWrapper::NAME( TYPE1 param1 ) const \
-{ \
-    if( d->createSocket() ) \
-        return callRemoteMethod< RESULT >( d->stream, QLatin1String( "QSettings::"#NAME ), param1 ); \
-    else \
-        return d->settings.NAME( param1 ); \
-}
-
-#define RETURN_TWO_ARGS_CONST( RESULT, NAME, TYPE1, TYPE2 ) \
-RESULT QSettingsWrapper::NAME( TYPE1 param1, TYPE2 param2 ) const \
-{ \
-    if( d->createSocket() ) \
-        return callRemoteMethod< RESULT >( d->stream, QLatin1String( "QSettings::"#NAME ), param1, param2 ); \
-    else \
-        return d->settings.NAME( param1, param2 ); \
-}
-
-#define VOID_NO_ARGS( NAME ) \
-void QSettingsWrapper::NAME() \
-{ \
-    if( d->createSocket() ) \
-        callRemoteVoidMethod<void>( d->stream, QLatin1String( "QSettings::"#NAME ) ); \
-    else \
-        d->settings.NAME(); \
-}
-
-#define VOID_ONE_ARG( NAME, TYPE1 ) \
-void QSettingsWrapper::NAME( TYPE1 param1 ) \
-{ \
-    if( d->createSocket() ) \
-        callRemoteVoidMethod( d->stream, QLatin1String( "QSettings::"#NAME ), param1 ); \
-    else \
-        d->settings.NAME( param1 ); \
-}
-
-#define VOID_TWO_ARGS( NAME, TYPE1, TYPE2 ) \
-void QSettingsWrapper::NAME( TYPE1 param1, TYPE2 param2 ) \
-{ \
-    if( d->createSocket() ) \
-        callRemoteVoidMethod( d->stream, QLatin1String( "QSettings::"#NAME ), param1, param2 ); \
-    else \
-        d->settings.NAME( param1, param2 ); \
-}
-
-RETURN_NO_ARGS_CONST( QStringList, allKeys )
-RETURN_NO_ARGS_CONST( QString, applicationName )
-VOID_ONE_ARG( beginGroup, const QString& )
-RETURN_ONE_ARG( int, beginReadArray, const QString& )
-VOID_TWO_ARGS( beginWriteArray, const QString&, int )
-RETURN_NO_ARGS_CONST( QStringList, childGroups )
-RETURN_NO_ARGS_CONST( QStringList, childKeys )
-VOID_NO_ARGS( clear )
-RETURN_ONE_ARG_CONST( bool, contains, const QString& )
-VOID_NO_ARGS( endArray )
-VOID_NO_ARGS( endGroup )
-RETURN_NO_ARGS_CONST( bool, fallbacksEnabled )
-RETURN_NO_ARGS_CONST( QString, fileName )
-
-QSettingsWrapper::Format QSettingsWrapper::format() const
-{
-    return static_cast< QSettingsWrapper::Format >( d->settings.format() );
-}
-
-RETURN_NO_ARGS_CONST( QString, group )
-
-QTextCodec* QSettingsWrapper::iniCodec() const
-{
-    return d->settings.iniCodec();
-}
-
-RETURN_NO_ARGS_CONST( bool, isWritable )
-RETURN_NO_ARGS_CONST( QString, organizationName )
-VOID_ONE_ARG( remove, const QString& )
-
-QSettingsWrapper::Scope QSettingsWrapper::scope() const
-{
-    return static_cast< QSettingsWrapper::Scope >( d->settings.scope() );
-}
-
-VOID_ONE_ARG( setArrayIndex, int )
-VOID_ONE_ARG( setFallbacksEnabled, bool )
-
-void QSettingsWrapper::setIniCodec( QTextCodec* codec )
-{
-    d->settings.setIniCodec( codec );
-}
-
-void QSettingsWrapper::setIniCodec( const char* codecName )
-{
-    d->settings.setIniCodec( codecName );
-}
-
-VOID_TWO_ARGS( setValue, const QString&, const QVariant& )
-RETURN_NO_ARGS_CONST( QSettingsWrapper::Status, status );
-VOID_NO_ARGS( sync )
-RETURN_TWO_ARGS_CONST( QVariant, value, const QString&, const QVariant& )
-
-#include "moc_fsengineclient.cpp"
 #include "fsengineclient.moc"