alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove some parameters

Browse Source
This commit is contained in:
Giorgos Tsiapaliwkas 2012-03-26 11:41:26 +03:00
parent f84c3642a6
commit 0c62466b99
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
declarativeimports/locale/locale.cpp
View File

@ -255,13 +255,15 @@ void Locale::setMainCatalog(const char *catalog)
KLocale::setMainCatalog(catalog); KLocale::setMainCatalog(catalog);
} }
double Locale::readNumber(const QString &_str, bool * ok) const double Locale::readNumber(const QString &_str) const
{ {
bool *ok;
return m_locale->readNumber(_str, ok); return m_locale->readNumber(_str, ok);
} }
double Locale::readMoney(const QString &_str, bool *ok) const double Locale::readMoney(const QString &_str) const
{ {
bool *ok;
return m_locale->readMoney(_str, ok); return m_locale->readMoney(_str, ok);
} }

7
declarativeimports/locale/locale.h
View File

@ -910,18 +910,15 @@ public:
* *
* @return The string converted to a double * @return The string converted to a double
*/ */
Q_INVOKABLE double readMoney(const QString &numStr, bool * ok = 0) const; Q_INVOKABLE double readMoney(const QString &numStr) const;
/** /**
* Converts a localized numeric string to a double. * Converts a localized numeric string to a double.
* *
* @param numStr the string we want to convert. * @param numStr the string we want to convert.
* @param ok the boolean that is set to false if it's not a number.
* If @p ok is 0, it will be ignored
*
* @return The string converted to a double * @return The string converted to a double
*/ */
Q_INVOKABLE double readNumber(const QString &numStr, bool * ok = 0) const; Q_INVOKABLE double readNumber(const QString &numStr) const;
/** /**
* Flags for readDate() * Flags for readDate()

1
declarativeimports/locale/tests/contents/code/klocaleqmltest.qml
View File

@ -186,7 +186,6 @@ Item {
console.log("readMoney:" + locale.readMoney("$ 21")) console.log("readMoney:" + locale.readMoney("$ 21"))
console.log("readNumber:" + locale.readNumber(locale.convertDigits(locale.digitSet, Locale.ArabicDigits)))
console.log("readNumber:" + locale.readNumber(10.0,3)) console.log("readNumber:" + locale.readNumber(10.0,3))
console.log("readDate:" + locale.readDate("2004-02-01", Locale.IsoFormat)) console.log("readDate:" + locale.readDate("2004-02-01", Locale.IsoFormat))