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

List:       kde-commits
Subject:    kdenonbeta/krecipes/src
From:       Scott Wheeler <wheeler () kde ! org>
Date:       2004-04-12 1:49:31
Message-ID: 20040412014931.4F0569A31 () office ! kde ! org
[Download RAW message or body]

CVS commit by wheeler: 

build


  M +2 -1      exporters/htmlexporter.cpp   1.22
  M +2 -1      gui/setupdisplay.cpp   1.19


--- kdenonbeta/krecipes/src/exporters/htmlexporter.cpp  #1.21:1.22
@@ -322,5 +322,6 @@ int HTMLExporter::createBlocks( const Re
                 tmp_format.replace(QRegExp(QString::fromLatin1("%a")),amount_str);
                 tmp_format.replace(QRegExp(QString::fromLatin1("%u")),(*ing_it).units);
                
-                tmp_format.replace(QRegExp(QString::fromLatin1("%p")),((*ing_it).prepMethod.isEmpty()) \
? "" : "; "+(*ing_it).prepMethod); +                \
tmp_format.replace(QRegExp(QString::fromLatin1("%p")),((*ing_it).prepMethod.isEmpty()) \
? +                                   QString::fromLatin1("") : \
QString::fromLatin1("; ")+(*ing_it).prepMethod);  
                 ingredients_html += QString("<li>%1</li>").arg(tmp_format);

--- kdenonbeta/krecipes/src/gui/setupdisplay.cpp  #1.18:1.19
@@ -362,5 +362,6 @@ void SetupDisplay::createWidgets( const 
                 tmp_format.replace(QRegExp(QString::fromLatin1("%a")),amount_str);
                 tmp_format.replace(QRegExp(QString::fromLatin1("%u")),(*ing_it).units);
                
-                tmp_format.replace(QRegExp(QString::fromLatin1("%p")),((*ing_it).prepMethod.isEmpty()) \
? "" : "; "+(*ing_it).prepMethod); +                \
tmp_format.replace(QRegExp(QString::fromLatin1("%p")),((*ing_it).prepMethod.isEmpty()) \
? +                                   QString::fromLatin1("") : \
QString::fromLatin1("; ")+(*ing_it).prepMethod);  
                 ingredients += QString("<li>%1</li>").arg(tmp_format);


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