diff options
Diffstat (limited to 'libkholidays')
| -rw-r--r-- | libkholidays/holidays/holiday_br | 2 | ||||
| -rw-r--r-- | libkholidays/kholidays.cpp | 4 | ||||
| -rw-r--r-- | libkholidays/kholidays_version.h | 6 | ||||
| -rw-r--r-- | libkholidays/lunarphase.cpp | 10 | ||||
| -rw-r--r-- | libkholidays/lunarphase.h | 6 | ||||
| -rw-r--r-- | libkholidays/parseholiday.c | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/libkholidays/holidays/holiday_br b/libkholidays/holidays/holiday_br index 09bb15dcc..cf534a83b 100644 --- a/libkholidays/holidays/holiday_br +++ b/libkholidays/holidays/holiday_br @@ -179,7 +179,7 @@ small "Dia da Criança" on october 12 :small "Dia do Médico" on october 18 :small "Dia do Aviador" on october 23 :small "Dia da ONU" on october 24 -:small "Dia da Democracia" on october 25 +:small "Dia da Detqmocracia" on october 25 :small "Dia do Dentista" on october 25 :small "Dia do Funcionário Público" on october 28 :small "Dia do Livro" on october 29 diff --git a/libkholidays/kholidays.cpp b/libkholidays/kholidays.cpp index 686b438a0..3b4ec63a2 100644 --- a/libkholidays/kholidays.cpp +++ b/libkholidays/kholidays.cpp @@ -92,7 +92,7 @@ TQString KHolidays::shortText( const TQDate &date ) TQValueList<KHoliday> lst = getHolidays( date ); if ( !lst.isEmpty() ) return lst.first().text; - else return TQString::null; + else return TQString(); } bool KHolidays::parseFile( const TQDate &date ) @@ -118,7 +118,7 @@ TQString KHolidays::getHoliday( const TQDate &date ) TQValueList<KHoliday> lst = getHolidays( date ); if ( !lst.isEmpty() ) return lst.first().text; - else return TQString::null; + else return TQString(); } TQValueList<KHoliday> KHolidays::getHolidays( const TQDate &date ) diff --git a/libkholidays/kholidays_version.h b/libkholidays/kholidays_version.h index a36f42033..6054e01ec 100644 --- a/libkholidays/kholidays_version.h +++ b/libkholidays/kholidays_version.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/libkholidays/lunarphase.cpp b/libkholidays/lunarphase.cpp index 3dace7bc1..65e19562a 100644 --- a/libkholidays/lunarphase.cpp +++ b/libkholidays/lunarphase.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -98,7 +98,7 @@ TQString LunarPhase::phaseName( LunarPhase::Phase phase ) break; default: case None: - return( TQString::null ); + return( TQString() ); break; } } @@ -174,7 +174,7 @@ LunarPhase::Phase LunarPhase::phase( const TQDate &date ) const * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSETQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT diff --git a/libkholidays/lunarphase.h b/libkholidays/lunarphase.h index 98a94d751..695ed8cf4 100644 --- a/libkholidays/lunarphase.h +++ b/libkholidays/lunarphase.h @@ -18,11 +18,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/libkholidays/parseholiday.c b/libkholidays/parseholiday.c index c78d36050..1d5b84cf7 100644 --- a/libkholidays/parseholiday.c +++ b/libkholidays/parseholiday.c @@ -1127,7 +1127,7 @@ yystpcpy (yydest, yysrc) /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string - tqcontains an apostrophe, a comma, or backslash (other than + contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. If YYRES is null, do not copy; instead, return the length of what the result would have been. */ |