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

List:       kde-commits
Subject:    [Soprano] 8f6b3d1: stderr is #defined on osx, apparently; rename it
From:       Benjamin Reed <ranger () befunk ! com>
Date:       2010-10-26 12:01:45
Message-ID: 20101026120145.D4E2FA63C7 () git ! kde ! org
[Download RAW message or body]

commit 8f6b3d1d043aa1c70bfdf801a9bf9e7947cce574
branch 2.3
Author: Benjamin Reed <ranger@befunk.com>
Date:   Mon Jun 1 18:46:37 2009 +0000

    stderr is #defined on osx, apparently; rename it
    
    svn path=/trunk/kdesupport/soprano/; revision=976466

diff --git a/backends/virtuoso/virtuosobackend.cpp b/backends/virtuoso/virtuosobackend.cpp
index 4c568a3..8878b73 100644
--- a/backends/virtuoso/virtuosobackend.cpp
+++ b/backends/virtuoso/virtuosobackend.cpp
@@ -163,11 +163,11 @@ Soprano::BackendFeatures Soprano::Virtuoso::BackendPlugin::supportedFeatures() c
 
 namespace {
     QString parseVirtuosoVersion( const QByteArray& data ) {
-        QString stderr = QString::fromLocal8Bit( data );
-        int vp = stderr.indexOf( QLatin1String("Version" ) );
+        QString erroutput = QString::fromLocal8Bit( data );
+        int vp = erroutput.indexOf( QLatin1String("Version" ) );
         if ( vp > 0 ) {
             vp += 8;
-            return stderr.mid( vp, stderr.indexOf( ' ', vp ) - vp );
+            return erroutput.mid( vp, erroutput.indexOf( ' ', vp ) - vp );
         }
         return QString();
     }
[prev in list] [next in list] [prev in thread] [next in thread]