Merged branches from BRANCH_1_0

1 files changed, 51 insertions, 5 deletions

diff --git a/library/calendar.cpp b/library/calendar.cpp
index b9ef585..c7536c3 100644
--- a/library/calendar.cpp
+++ b/library/calendar.cpp
@@ -17,44 +17,90 @@
 ** not clear to you.
 **
 **********************************************************************/
 #include "calendar.h"
 
 #include <qdatetime.h>
+#include <qobject.h>
+
+/*! \class Calendar calendar.html
+
+  \brief The Calendar class provides programmers with an easy to calculate
+  and get information about dates, months and years.
+
+  \ingroup qtopiaemb
+*/
+
+
+
+static void never_called_tr_function_um_libqpe_ts_etwas_unter_zu_jubeln() {
+    (void)QObject::tr("Jan");
+    (void)QObject::tr("Feb");
+    (void)QObject::tr("Mar");
+    (void)QObject::tr("Apr");
+    (void)QObject::tr("May");
+    (void)QObject::tr("Jun");
+    (void)QObject::tr("Jul");
+    (void)QObject::tr("Aug");
+    (void)QObject::tr("Sep");
+    (void)QObject::tr("Oct");
+    (void)QObject::tr("Nov");
+    (void)QObject::tr("Dec");
+    (void)QObject::tr("Mon");
+    (void)QObject::tr("Tue");
+    (void)QObject::tr("Wed");
+    (void)QObject::tr("Thu");
+    (void)QObject::tr("Fri");
+    (void)QObject::tr("Sat");
+    (void)QObject::tr("Sun");
+}
+
+
+
+/*!
+    Returns the name of the month for \a m.
+    Equivalent to QDate::monthName().
+*/
 
 QString Calendar::nameOfMonth( int m )
 {
     QDate d;
-    return d.monthName( m );
+    qDebug( d.monthName( m ) );
+    return QObject::tr( d.monthName( m ) );
 }
 
+/*!
+    Returns the name of the day for \a d.
+    Equivalent to QDate::dayName().
+*/
 QString Calendar::nameOfDay( int d )
 {
     QDate dt;
-    return dt.dayName( d );
+    return QObject::tr( dt.dayName( d ) );
 }
 
+/*! \obsolete */
 QValueList<Calendar::Day> Calendar::daysOfMonth( int year, int month,
                                                  bool startWithMonday )
 {
     QDate temp;
     temp.setYMD( year, month, 1 );
     int firstDay = temp.dayOfWeek();
     int i;
     QDate prev;
-    QValueList<Day> days;    
+    QValueList<Day> days;
 
     if ( startWithMonday )
         i = 1;
     else
         i = 0;
-    
+
     if ( month > 1 )
             prev.setYMD( year, month - 1, 1 );
     else
-                prev.setYMD( year - 1, 12, 1 );
+        prev.setYMD( year - 1, 12, 1 );
     for ( ; i < firstDay; i++ ) {
         days.append( Day( prev.daysInMonth() - ( firstDay - i - 1 ),
                           Day::PrevMonth, FALSE ) );
     }
     for ( i = 1; i <= temp.daysInMonth(); i++ )
         days.append( Day( i, Day::ThisMonth, FALSE ) );