TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 4 insertions, 4 deletions

diff --git a/libkdeedu/extdate/extcalendarsystemgregorian.cpp b/libkdeedu/extdate/extcalendarsystemgregorian.cpp
index 47338f4b..0b167ce9 100644
--- a/libkdeedu/extdate/extcalendarsystemgregorian.cpp
+++ b/libkdeedu/extdate/extcalendarsystemgregorian.cpp
@@ -144,7 +144,7 @@ TQString ExtCalendarSystemGregorian::monthName(int month, int year, bool shortNa
         return locale()->translate("December");
       }
 
-  return TQString::null;
+  return TQString();
 }
 
 TQString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year,
@@ -209,7 +209,7 @@ TQString ExtCalendarSystemGregorian::monthNamePossessive(int month, int year,
         return locale()->translate("of December");
       }
 
-  return TQString::null;
+  return TQString();
 }
 
 bool ExtCalendarSystemGregorian::setYMD(ExtDate & date, int y, int m, int d) const
@@ -294,7 +294,7 @@ int ExtCalendarSystemGregorian::weekDayOfPray() const
 
 TQString ExtCalendarSystemGregorian::calendarName() const
 {
-  return TQString::fromLatin1("gregorian");
+  return TQString::tqfromLatin1("gregorian");
 }
 
 bool ExtCalendarSystemGregorian::isLunar() const
@@ -317,7 +317,7 @@ int ExtCalendarSystemGregorian::yearStringToInteger(const TQString & sNum, int &
   int iYear;
   iYear = ExtCalendarSystem::yearStringToInteger(sNum, iLength);
 
-  // Qt treats a year in the range 0-100 as 1900-1999.
+  // TQt treats a year in the range 0-100 as 1900-1999.
   // It is nicer for the user if we treat 0-68 as 2000-2068
   if (iYear < 69)
     iYear += 2000;