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

List:       kde-commits
Subject:    kdesupport/soprano
From:       Romain Pokrzywka <romain () kdab ! net>
Date:       2009-12-08 17:10:43
Message-ID: 1260292243.685747.7141.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1060364 by pokrzywka:

fix tabs

 M  +6 -6      backends/virtuoso/virtuosobackend.cpp  
 M  +15 -15    backends/virtuoso/virtuosocontroller.cpp  
 M  +7 -7      server/serverconnection.cpp  
 M  +9 -9      test/virtuosobackendtest.cpp  


--- trunk/kdesupport/soprano/backends/virtuoso/virtuosobackend.cpp #1060363:1060364
@@ -206,12 +206,12 @@
 QString Soprano::Virtuoso::BackendPlugin::findVirtuosoDriver() const
 {
 #ifdef Q_OS_WIN
-	QStringList virtuosoDirs;
-	const QString virtuosoHome = qgetenv("VIRTUOSO_HOME");
-	if ( !virtuosoHome.isEmpty() ) {
-		virtuosoDirs << (virtuosoHome + QDir::separator() + QLatin1String("bin"))
-				     << (virtuosoHome + QDir::separator() + QLatin1String("lib"));		
-	}
+    QStringList virtuosoDirs;
+    const QString virtuosoHome = qgetenv("VIRTUOSO_HOME");
+    if ( !virtuosoHome.isEmpty() ) {
+        virtuosoDirs << (virtuosoHome + QDir::separator() + QLatin1String("bin"))
+                     << (virtuosoHome + QDir::separator() + QLatin1String("lib"));
+    }
     return Soprano::findLibraryPath( "virtodbc", virtuosoDirs );
 #else
     return Soprano::findLibraryPath( "virtodbc_r", QStringList(), QStringList() << \
                QLatin1String( "virtuoso/plugins/" ) );
--- trunk/kdesupport/soprano/backends/virtuoso/virtuosocontroller.cpp \
#1060363:1060364 @@ -36,11 +36,11 @@
 Q_DECLARE_METATYPE( QProcess::ExitStatus )
 
 namespace {
-	
+    
 #ifdef Q_OS_WIN
-	QMutex portNumberMutex;
+    QMutex portNumberMutex;
 #endif
-	
+    
     quint16 getFreePortNumber() {
 //         QTcpServer server;
 //         if ( server.listen() ) {
@@ -51,9 +51,9 @@
 //             return 1111;
 //         }
 #ifdef Q_OS_WIN
-    	static quint16 p = 1111;
-    	QMutexLocker l(&portNumberMutex);
-    	return p++;
+        static quint16 p = 1111;
+        QMutexLocker l(&portNumberMutex);
+        return p++;
 #else
         int p = 1111;
         while ( QFile::exists( QString( "/tmp/virt_%1" ).arg( p ) ) ) {
@@ -71,8 +71,8 @@
       m_lastExitStatus( NormalExit ),
       m_initializationLoop( 0 )
 {
-	setObjectName("virtuoso_controller");
-	
+    setObjectName("virtuoso_controller");
+    
     connect( &m_virtuosoProcess, SIGNAL(finished(int,QProcess::ExitStatus)),
              this, SLOT(slotProcessFinished(int,QProcess::ExitStatus)) );
     connect( &m_virtuosoProcess, SIGNAL(readyReadStandardError()),
@@ -85,8 +85,8 @@
 
 Soprano::VirtuosoController::~VirtuosoController()
 {
-	if ( isRunning() )
-		shutdown();
+    if ( isRunning() )
+        shutdown();
 }
 
 
@@ -336,13 +336,13 @@
 // static
 QString Soprano::VirtuosoController::locateVirtuosoBinary()
 {
-	QStringList dirs = Soprano::exeDirs();
+    QStringList dirs = Soprano::exeDirs();
 #ifdef Q_OS_WIN
-	const QString virtuosoHome = qgetenv("VIRTUOSO_HOME");
-	if ( !virtuosoHome.isEmpty() )
-		dirs << (virtuosoHome + QDir::separator() + QLatin1String("bin"));
+    const QString virtuosoHome = qgetenv("VIRTUOSO_HOME");
+    if ( !virtuosoHome.isEmpty() )
+        dirs << (virtuosoHome + QDir::separator() + QLatin1String("bin"));
 #endif
-	
+    
     foreach( const QString& dir, dirs ) {
 #ifdef Q_OS_WIN
         QFileInfo info( dir + QDir::separator() + QLatin1String("virtuoso-t.exe") );
--- trunk/kdesupport/soprano/server/serverconnection.cpp #1060363:1060364
@@ -56,9 +56,9 @@
     ServerCore* core;
     ModelPool* modelPool;
     QIODevice* socket;
-	
-	quint16 currentCommand;
 
+    quint16 currentCommand;
+
     QHash<quint32, StatementIterator> openStatementIterators;
     QHash<quint32, NodeIterator> openNodeIterators;
     QHash<quint32, QueryResultIterator> openQueryIterators;
@@ -112,7 +112,7 @@
     d->core = core;
     d->modelPool = pool;
     d->socket = 0;
-	d->currentCommand = 0;
+    d->currentCommand = 0;
 }
 
 
@@ -180,13 +180,13 @@
 
 void Soprano::Server::ServerConnection::Private::_s_readNextCommand()
 {
-	if ( currentCommand != 0 )
-		return;
+    if ( currentCommand != 0 )
+        return;
 
     DataStream stream( socket );
     quint16 command = 0;
     stream.readUnsignedInt16( command );
-	currentCommand = command;
+    currentCommand = command;
     switch( command ) {
     case COMMAND_SUPPORTS_PROTOCOL_VERSION:
         supportsProtocolVersion();
@@ -284,7 +284,7 @@
         break;
     }
 
-	currentCommand = 0;
+    currentCommand = 0;
 }
 
 
--- trunk/kdesupport/soprano/test/virtuosobackendtest.cpp #1060363:1060364
@@ -64,17 +64,17 @@
 {
     const Soprano::Backend* b = Soprano::discoverBackendByName( "virtuosobackend" );
     if ( b ) {
-    	
+        
 #ifdef Q_OS_WIN
-    	// We need to shut down the server before we can remove the test files
-    	// However we don't have access to the controller, so use reflection to trigger \
                the shutdown
-    	// It's quite ugly I know, but it's ok for the unit tests imho
-    	QObject* controller = m->findChild<QObject*>( "virtuoso_controller" );
-    	if ( controller ) {
-    		QMetaObject::invokeMethod( controller, "shutdown" );
-    	}
+        // We need to shut down the server before we can remove the test files
+        // However we don't have access to the controller, so use reflection to \
trigger the shutdown +        // It's quite ugly I know, but it's ok for the unit \
tests imho +        QObject* controller = m->findChild<QObject*>( \
"virtuoso_controller" ); +        if ( controller ) {
+            QMetaObject::invokeMethod( controller, "shutdown" );
+        }
 #endif
-    	
+        
         b->deleteModelData( m_settingsHash[m] );
         
 #ifdef Q_OS_WIN


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