diff options
Diffstat (limited to 'kspread/kspread_functions_datetime.cc')
| -rw-r--r-- | kspread/kspread_functions_datetime.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc index 0136d298c..b139057d9 100644 --- a/kspread/kspread_functions_datetime.cc +++ b/kspread/kspread_functions_datetime.cc @@ -32,8 +32,8 @@ using namespace KSpread; // prototypes, sorted -Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *); -Value func_currentDateTime (valVector args, ValueCalc *calc, FuncExtra *); +Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *); +Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_currentTime (valVector args, ValueCalc *calc, FuncExtra *); Value func_date (valVector args, ValueCalc *calc, FuncExtra *); Value func_datevalue (valVector args, ValueCalc *calc, FuncExtra *); @@ -77,10 +77,10 @@ void RegisterDateTimeFunctions() FunctionRepository* repo = FunctionRepository::self(); Function *f; - f = new Function ("CURRENTDATE", func_currentDate); + f = new Function ("CURRENTDATE", func_tqcurrentDate); f->setParamCount (0); repo->add (f); - f = new Function ("CURRENTDATETIME", func_currentDateTime); + f = new Function ("CURRENTDATETIME", func_tqcurrentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("CURRENTTIME", func_currentTime); @@ -140,7 +140,7 @@ void RegisterDateTimeFunctions() f = new Function ("MONTHS", func_months); f->setParamCount (3); repo->add (f); - f = new Function ("NOW", func_currentDateTime); + f = new Function ("NOW", func_tqcurrentDateTime); f->setParamCount (0); repo->add (f); f = new Function ("SECOND", func_second); @@ -154,7 +154,7 @@ void RegisterDateTimeFunctions() repo->add (f); f = new Function ("TIMEVALUE", func_timevalue); repo->add (f); - f = new Function ("TODAY", func_currentDate); + f = new Function ("TODAY", func_tqcurrentDate); f->setParamCount (0); repo->add (f); f = new Function ("WEEKDAY", func_weekday); @@ -519,7 +519,7 @@ Value func_monthname (valVector args, ValueCalc *calc, FuncExtra *) int number = calc->conv()->asInteger (args[0]).asInteger(); TQString monthName = calc->conv()->locale()->calendar()->monthName (number, - TQDate::currentDate().year()); + TQDate::tqcurrentDate().year()); if (monthName.isNull()) return Value::errorVALUE(); return Value (monthName); @@ -555,10 +555,10 @@ Value func_time (valVector args, ValueCalc *calc, FuncExtra *) return Value (TQTime (h, m, s)); } -// Function: currentDate -Value func_currentDate (valVector, ValueCalc *, FuncExtra *) +// Function: tqcurrentDate +Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDate::currentDate ()); + return Value (TQDate::tqcurrentDate ()); } // Function: currentTime @@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *) return Value (TQTime::currentTime ()); } -// Function: currentDateTime -Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *) +// Function: tqcurrentDateTime +Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDateTime::currentDateTime ()); + return Value (TQDateTime::tqcurrentDateTime ()); } // Function: dayOfYear |