Move the templates into there own source file.

1 files changed, 2 insertions, 140 deletions

diff --git a/installerbuilder/libinstaller/fsengineclient.cpp b/installerbuilder/libinstaller/fsengineclient.cpp
index 2c0977bb8..0abd1ec63 100644
--- a/installerbuilder/libinstaller/fsengineclient.cpp
+++ b/installerbuilder/libinstaller/fsengineclient.cpp
@@ -35,6 +35,7 @@
 #undef QSettings
 
 #include "adminauthorization.h"
+#include "templates.cpp"
 
 #include <QAbstractFileEngineHandler>
 #include <QCoreApplication>
@@ -1013,145 +1014,6 @@ QSettingsWrapper::~QSettingsWrapper()
     delete d;
 }
 
-void callRemoteVoidMethod( QDataStream& stream, const QString& name )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    stream.device()->readAll();
-    return;
-}
-
-template< typename T >
-void callRemoteVoidMethod( QDataStream& stream, const QString& name, const T& param1 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    stream.device()->readAll();
-    return;
-}
-
-template< typename T1, typename T2 >
-void callRemoteVoidMethod( QDataStream& stream, const QString& name, const T1& param1, const T2& param2 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream << param2;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    stream.device()->readAll();
-    return;
-}
-
-template< typename T1, typename T2, typename T3 >
-void callRemoteVoidMethod( QDataStream& stream, const QString& name, const T1& param1, const T2& param2, const T3& param3 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream << param2;
-    stream << param3;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    stream.device()->readAll();
-    return;
-}
-
-template< typename RESULT >
-RESULT callRemoteMethod( QDataStream& stream, const QString& name )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    RESULT result;
-    stream >> result;
-    stream.device()->readAll();
-    return result;
-}
-
-template< typename RESULT, typename T >
-RESULT callRemoteMethod( QDataStream& stream, const QString& name, const T& param1 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    RESULT result;
-    stream >> result;
-    stream.device()->readAll();
-    return result;
-}
-
-template< typename RESULT, typename T1, typename T2 >
-RESULT callRemoteMethod( QDataStream& stream, const QString& name, const T1& param1, const T2& param2 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream << param2;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    RESULT result;
-    stream >> result;
-    stream.device()->readAll();
-    return result;
-}
-
-template< typename RESULT, typename T1, typename T2, typename T3 >
-RESULT callRemoteMethod( QDataStream& stream, const QString& name, const T1& param1, const T2& param2, const T3& param3 )
-{
-    stream.device()->readAll();
-    stream << name;
-    stream << param1;
-    stream << param2;
-    stream << param3;
-    stream.device()->waitForBytesWritten( -1 );
-    if( !stream.device()->bytesAvailable() )
-        stream.device()->waitForReadyRead( -1 );
-    quint32 test;
-    stream >> test;
-    RESULT result;
-    stream >> result;
-    stream.device()->readAll();
-    return result;
-}
-
-static QDataStream& operator>>( QDataStream& stream, QSettingsWrapper::Status& status )
-{
-    int s;
-    stream >> s;
-    status = static_cast< QSettingsWrapper::Status >( s );
-    return stream;
-}
-
 #define RETURN_NO_ARGS_CONST( RESULT, NAME ) \
 RESULT QSettingsWrapper::NAME() const       \
 { \
@@ -1192,7 +1054,7 @@ RESULT QSettingsWrapper::NAME( TYPE1 param1, TYPE2 param2 ) const \
 void QSettingsWrapper::NAME() \
 { \
     if( d->createSocket() ) \
-        callRemoteVoidMethod( d->stream, QLatin1String( "QSettings::"#NAME ) ); \
+        callRemoteVoidMethod<void>( d->stream, QLatin1String( "QSettings::"#NAME ) ); \
     else \
         d->settings.NAME(); \
 }