summaryrefslogtreecommitdiffstats
path: root/kdecore/kcalendarsystemhebrew.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-13 08:32:36 +0000
commitf7e71d47719ab6094cf4a9fafffa5ea351973522 (patch)
tree30834aa632d442019e14f88685001d94657d060b /kdecore/kcalendarsystemhebrew.cpp
parentb31cfd9a1ee986fe2ae9a693f3afd7f171dd897c (diff)
downloadtdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.tar.gz
tdelibs-f7e71d47719ab6094cf4a9fafffa5ea351973522.zip
Initial conversion for TQt for Qt4 3.4.0 TP2
This will also compile with TQt for Qt3, and should not cause any problems with dependent modules such as kdebase. If it does then it needs to be fixed! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1214149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdecore/kcalendarsystemhebrew.cpp')
-rw-r--r--kdecore/kcalendarsystemhebrew.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kdecore/kcalendarsystemhebrew.cpp b/kdecore/kcalendarsystemhebrew.cpp
index ec39fc9ca..710e027d1 100644
--- a/kdecore/kcalendarsystemhebrew.cpp
+++ b/kdecore/kcalendarsystemhebrew.cpp
@@ -306,7 +306,7 @@ int KCalendarSystemHebrew::weeksInYear(int year) const
int nWeekNumber = weekNumber(temp);
if(nWeekNumber == 1) // last week belongs to next year
{
- temp = temp.addDays(-7);
+ temp = TQT_TQDATE_OBJECT(temp.addDays(-7));
nWeekNumber = weekNumber(temp);
}
@@ -574,7 +574,7 @@ int KCalendarSystemHebrew::weekDayOfPray() const
// Ok
TQDate KCalendarSystemHebrew::addDays( const TQDate & date, int ndays ) const
{
- return date.addDays( ndays );
+ return TQT_TQDATE_OBJECT(date.addDays( ndays ));
}
// Ok
@@ -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
{