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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepim/libkleo/kleo
From:       Marc Mutz <mutz () kde ! org>
Date:       2010-07-28 13:15:36
Message-ID: 20100728131536.2833FAC7BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1156039 by mutz:

ChecksumDefinition: fix searching in QStringList

(we need "contained in list elements", not "...in list" here)

 M  +1 -1      checksumdefinition.cpp  


--- branches/kdepim/enterprise4/kdepim/libkleo/kleo/checksumdefinition.cpp \
#1156038:1156039 @@ -137,7 +137,7 @@
            .replace( INSTALLPATH_PLACEHOLDER, QLatin1String("__path_goes_here__") );
     l = KShell::splitArgs( cmdline, KShell::AbortOnMeta|KShell::TildeExpand, &errors \
                );
     l = l.replaceInStrings( QLatin1String("__files_go_here__"), FILE_PLACEHOLDER );
-    if ( l.contains( QLatin1String("__path_goes_here__") ) )
+    if ( l.indexOf( QRegExp( QLatin1String(".*__path_goes_here__.*") ) ) >= 0 )
         l = l.replaceInStrings( QLatin1String("__path_goes_here__"), \
ChecksumDefinition::installPath() );  if ( errors == KShell::BadQuoting )
         throw ChecksumDefinitionError( id, i18n("Quoting error in '%1' entry", \
whichCommand) );


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