diff --git a/kdeplasma-addons/applets/qalculate/qalculate_engine.cpp b/kdeplasma-addons/applets/qalculate/qalculate_engine.cpp index f00a4c69..d2b6161b 100644 --- a/kdeplasma-addons/applets/qalculate/qalculate_engine.cpp +++ b/kdeplasma-addons/applets/qalculate/qalculate_engine.cpp @@ -77,7 +77,6 @@ void QalculateEngine::evaluate(const QString& expression) QString input = expression; QByteArray ba = input.replace(QChar(0xA3), "GBP").replace(QChar(0xA5), "JPY").replace('$', "USD").replace(QChar(0x20AC), "EUR").toLatin1(); - const char *ctext = ba.data(); EvaluationOptions eo; @@ -115,7 +114,7 @@ void QalculateEngine::evaluate(const QString& expression) break; } - MathStructure result = CALCULATOR->calculate(ctext, eo); + MathStructure result = CALCULATOR->calculate(ba.constData(), eo); PrintOptions po; switch (m_settings->fractionDisplay()) { diff --git a/kdeplasma-addons/applets/qalculate/qalculate_settings.h b/kdeplasma-addons/applets/qalculate/qalculate_settings.h index 75706b0f..2726d228 100644 --- a/kdeplasma-addons/applets/qalculate/qalculate_settings.h +++ b/kdeplasma-addons/applets/qalculate/qalculate_settings.h @@ -25,9 +25,10 @@ #include "qalculate_applet.h" #include -class KComboBox; #include +class KComboBox; + class QalculateSettings : public QObject { Q_OBJECT diff --git a/kdeplasma-addons/runners/converter/converterrunner.cpp b/kdeplasma-addons/runners/converter/converterrunner.cpp index d085fa6f..1dfccac3 100644 --- a/kdeplasma-addons/runners/converter/converterrunner.cpp +++ b/kdeplasma-addons/runners/converter/converterrunner.cpp @@ -124,7 +124,7 @@ ConverterRunner::ConverterRunner(QObject* parent, const QVariantList &args) setObjectName(QLatin1String( "Converter" )); m_separators << QString( CONVERSION_CHAR ); - m_separators << i18nc("list of words that can used as amount of 'unit1' [in|to|as] 'unit2'", + m_separators << i18nc("list of words that can be used as amount of 'unit1' [in|to|as] 'unit2'", "in;to;as").split(QLatin1Char( ';' )); //can not ignore commands: we have things like m4