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

List:       kde-commits
Subject:    kdesupport/soprano/backends/virtuoso
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2010-02-10 10:16:32
Message-ID: 1265796992.456604.5268.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1088139 by trueg:

Moved some code around for less ifdefs. Removed symlink check for virtuoso-t.

 M  +4 -12     virtuosocontroller.cpp  


--- trunk/kdesupport/soprano/backends/virtuoso/virtuosocontroller.cpp #1088138:1088139
@@ -36,11 +36,6 @@
 Q_DECLARE_METATYPE( QProcess::ExitStatus )
 
 namespace {
-
-#ifdef Q_OS_WIN
-    QMutex portNumberMutex;
-#endif
-
     quint16 getFreePortNumber() {
 //         QTcpServer server;
 //         if ( server.listen() ) {
@@ -51,6 +46,7 @@
 //             return 1111;
 //         }
 #ifdef Q_OS_WIN
+        static QMutex portNumberMutex;
         static quint16 p = 1111;
         QMutexLocker l(&portNumberMutex);
         return p++;
@@ -115,14 +111,10 @@
             QFile::remove( lockFilePath );
 
         QStringList args;
-#ifdef Q_OS_WIN
         args << "+foreground"
-             << "+configfile" << QDir::toNativeSeparators(m_configFilePath);
-#else
-        args << "+foreground"
-             << "+config" << m_configFilePath
+             << "+configfile" << QDir::toNativeSeparators(m_configFilePath)
              << "+wait";
-#endif
+
         qDebug() << "Starting Virtuoso server:" << virtuosoExe << args;
 
         m_virtuosoProcess.start( virtuosoExe, args, QIODevice::ReadOnly );
@@ -348,7 +340,7 @@
 #else
         QFileInfo info( dir + QLatin1String("/virtuoso-t") );
 #endif
-        if ( info.isExecutable() && !info.isSymLink() ) {
+        if ( info.isExecutable() ) {
             return info.absoluteFilePath();
         }
     }
[prev in list] [next in list] [prev in thread] [next in thread]