summaryrefslogtreecommitdiffabout
path: root/microkde/kcalendarsystemgregorian.cpp
authorzautrix <zautrix>2005-01-24 09:57:42 (UTC)
committer zautrix <zautrix>2005-01-24 09:57:42 (UTC)
commit485a6b28e3be6437742852970fdd122ba071b726 (patch) (side-by-side diff)
tree2ff605dbd72c91fa5d693056cf7dd0c746c0e2e3 /microkde/kcalendarsystemgregorian.cpp
parentec69f34e62250f95a1f8757c5d58da0bf330678a (diff)
downloadkdepimpi-485a6b28e3be6437742852970fdd122ba071b726.zip
kdepimpi-485a6b28e3be6437742852970fdd122ba071b726.tar.gz
kdepimpi-485a6b28e3be6437742852970fdd122ba071b726.tar.bz2
chaned qt version comparison
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
@@ -49,17 +49,17 @@ 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);
@@ -67,17 +67,17 @@ int KCalendarSystemGregorian::weeksInYear(int year) const
#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
@@ -226,31 +226,31 @@ bool KCalendarSystemGregorian::setYMD(QDate & date, int y, int m, int d) const
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;