summaryrefslogtreecommitdiffabout
path: root/microkde/kcalendarsystemgregorian.cpp
Side-by-side diff
Diffstat (limited to 'microkde/kcalendarsystemgregorian.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--microkde/kcalendarsystemgregorian.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/microkde/kcalendarsystemgregorian.cpp b/microkde/kcalendarsystemgregorian.cpp
index 7c5b62a..cc12b9f 100644
--- a/microkde/kcalendarsystemgregorian.cpp
+++ b/microkde/kcalendarsystemgregorian.cpp
@@ -33,67 +33,67 @@ KCalendarSystemGregorian::KCalendarSystemGregorian(const KLocale * locale)
: KCalendarSystem(locale)
{
kdDebug(5400) << "Created gregorian calendar" << endl;
}
KCalendarSystemGregorian::~KCalendarSystemGregorian()
{
}
int KCalendarSystemGregorian::year(const QDate& date) const
{
// kdDebug(5400) << "Gregorian year..." << endl;
return date.year();
}
int KCalendarSystemGregorian::monthsInYear( const QDate & ) const
{
// kdDebug(5400) << "Gregorian monthsInYear" << endl;
return 12;
}
int KCalendarSystemGregorian::weeksInYear(int year) const
{
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
QDate temp;
temp.setYMD(year, 12, 31);
// If the last day of the year is in the first week, we have to check the
// week before
if ( temp.weekNumber() == 1 )
temp.addDays(-7);
return temp.weekNumber();
#else
return 52;
#endif
}
int KCalendarSystemGregorian::weekNumber(const QDate& date,
int * yearNum) const
{
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
return date.weekNumber(yearNum);
#else
return 1;
#endif
}
QString KCalendarSystemGregorian::monthName(const QDate& date,
bool shortName) const
{
return monthName(month(date), shortName);
}
QString KCalendarSystemGregorian::monthNamePossessive(const QDate& date, bool shortName) const
{
return monthNamePossessive(month(date), shortName);
}
QString KCalendarSystemGregorian::monthName(int month, bool shortName) const
{
// kdDebug(5400) << "Gregorian getMonthName" << endl;
if ( shortName )
switch ( month )
{
@@ -210,63 +210,63 @@ QString KCalendarSystemGregorian::monthNamePossessive(int month,
return locale()->translate("of September");
case 10:
return locale()->translate("of October");
case 11:
return locale()->translate("of November");
case 12:
return locale()->translate("of December");
}
return QString::null;
}
bool KCalendarSystemGregorian::setYMD(QDate & date, int y, int m, int d) const
{
// We don't want Qt to add 1900 to them
if ( y >= 0 && y <= 99 )
return false;
// QDate supports gregorian internally
return date.setYMD(y, m, d);
}
QDate KCalendarSystemGregorian::addYears(const QDate & date, int nyears) const
{
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
return date.addYears(nyears);
#else
int year = date.year() + nyears;
int month = date.month();
int day = date.day();
QDate newDate( year, month, 1 );
if ( day > newDate.daysInMonth() ) day = newDate.daysInMonth();
return QDate( year, month, day );
#endif
}
QDate KCalendarSystemGregorian::addMonths(const QDate & date, int nmonths) const
{
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
return date.addMonths(nmonths);
#else
int month = date.month();
int nyears;
if ( nmonths >= 0 ) {
month += nmonths;
nyears = ( month - 1 ) / 12;
month = ( ( month - 1 ) % 12 ) + 1;
} else {
nyears = nmonths / 12;
// nmonths += nyears * 12;
nmonths = nmonths % 12;
month += nmonths;
if ( month <= 0 ) {
month += 12;
--nyears;
}
}
int year = date.year() + nyears;
int day = date.day();
QDate newDate( year, month, 1 );
if ( day > newDate.daysInMonth() ) day = newDate.daysInMonth();
return QDate( year, month, day );
#endif