From 56160bf4dfe503631ef6373367b281f081bab2b4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:13 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 13281e2856a2ef43bbab78c5528470309c23aa77. --- tdecore/kcalendarsystemhebrew.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tdecore/kcalendarsystemhebrew.cpp') diff --git a/tdecore/kcalendarsystemhebrew.cpp b/tdecore/kcalendarsystemhebrew.cpp index 2824445bb..710e027d1 100644 --- a/tdecore/kcalendarsystemhebrew.cpp +++ b/tdecore/kcalendarsystemhebrew.cpp @@ -614,7 +614,7 @@ TQDate KCalendarSystemHebrew::addYears( const TQDate & date, int nyears ) const // Ok TQString KCalendarSystemHebrew::calendarName() const { - return TQString::fromLatin1("hebrew"); + return TQString::tqfromLatin1("hebrew"); } // Ok @@ -640,7 +640,7 @@ TQString KCalendarSystemHebrew::dayString(const TQDate & pDate, bool bShort) con TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(day(pDate), false); else sResult = KCalendarSystem::dayString(pDate, bShort); @@ -653,7 +653,7 @@ TQString KCalendarSystemHebrew::yearString(const TQDate & pDate, bool bShort) co TQString sResult; // Only use hebrew numbers if the hebrew setting is selected - if (locale()->language() == TQString::fromLatin1("he")) + if (locale()->language() == TQString::tqfromLatin1("he")) sResult = num2heb(year(pDate), !bShort); else sResult = KCalendarSystem::yearString(pDate, bShort); @@ -684,9 +684,9 @@ static int heb2num(const TQString& str, int & iLength) { { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D0) && s[pos + 1] <= TQChar(0x05EA)) - result += (c.unicode() - 0x05D0 + 1) * 1000; + result += (c.tqunicode() - 0x05D0 + 1) * 1000; else - result += c.unicode() - 0x05D0 + 1; + result += c.tqunicode() - 0x05D0 + 1; } else if (c == TQChar(0x05D8)) { @@ -702,11 +702,11 @@ static int heb2num(const TQString& str, int & iLength) { if (s.length() > pos && s[pos + 1] >= TQChar(0x05D9)) return -1; else - result += decadeValues[c.unicode() - 0x05D9]; + result += decadeValues[c.tqunicode() - 0x05D9]; } else if (c >= TQChar(0x05E7) && c <= TQChar(0x05EA)) { - result += (c.unicode() - 0x05E7 + 1) * 100; + result += (c.tqunicode() - 0x05E7 + 1) * 100; } else { -- cgit v1.2.1