diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:12:30 -0600 |
| commit | 11191ef0b9908604d1d7aaca382b011ef22c454c (patch) | |
| tree | d38f0ccd8bfcc9756f5cfc42fb2ad1dad351e6aa /kspread/kspread_functions_datetime.cc | |
| parent | c9cb4f487428aad5d8cda5e3a4b9ad87390d7e54 (diff) | |
| download | koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.tar.gz koffice-11191ef0b9908604d1d7aaca382b011ef22c454c.zip | |
Rename old tq methods that no longer need a unique name
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 b139057d..0136d298 100644 --- a/kspread/kspread_functions_datetime.cc +++ b/kspread/kspread_functions_datetime.cc @@ -32,8 +32,8 @@ using namespace KSpread; // prototypes, sorted -Value func_tqcurrentDate (valVector args, ValueCalc *calc, FuncExtra *); -Value func_tqcurrentDateTime (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDate (valVector args, ValueCalc *calc, FuncExtra *); +Value func_currentDateTime (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_tqcurrentDate); + f = new Function ("CURRENTDATE", func_currentDate); f->setParamCount (0); repo->add (f); - f = new Function ("CURRENTDATETIME", func_tqcurrentDateTime); + f = new Function ("CURRENTDATETIME", func_currentDateTime); 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_tqcurrentDateTime); + f = new Function ("NOW", func_currentDateTime); 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_tqcurrentDate); + f = new Function ("TODAY", func_currentDate); 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::tqcurrentDate().year()); + TQDate::currentDate().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: tqcurrentDate -Value func_tqcurrentDate (valVector, ValueCalc *, FuncExtra *) +// Function: currentDate +Value func_currentDate (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDate::tqcurrentDate ()); + return Value (TQDate::currentDate ()); } // Function: currentTime @@ -567,10 +567,10 @@ Value func_currentTime (valVector, ValueCalc *, FuncExtra *) return Value (TQTime::currentTime ()); } -// Function: tqcurrentDateTime -Value func_tqcurrentDateTime (valVector, ValueCalc *, FuncExtra *) +// Function: currentDateTime +Value func_currentDateTime (valVector, ValueCalc *, FuncExtra *) { - return Value (TQDateTime::tqcurrentDateTime ()); + return Value (TQDateTime::currentDateTime ()); } // Function: dayOfYear |