-Add a QPEGLOBAL that adds define for 'weak', 'used' and unused symbols

Make use of the newly added qpeglobal.h to kill custom versions of
similiar macros

1 files changed, 3 insertions, 8 deletions

diff --git a/library/calendar.cpp b/library/calendar.cpp
index 70e764c..d281a14 100644
--- a/library/calendar.cpp
+++ b/library/calendar.cpp
@@ -1,117 +1,112 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "calendar.h"
+#include "qpeglobal.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
 */
 
-#ifdef Q_OS_MACX
-   #define ATTRIBUTE_UNUSED
-#else
-   #define ATTRIBUTE_UNUSED __attribute__((unused))
-#endif
-
-
-static void never_called_tr_function_um_libqpe_ts_etwas_unter_zu_jubeln() ATTRIBUTE_UNUSED;
+static void never_called_tr_function_um_libqpe_ts_etwas_unter_zu_jubeln() QPE_SYMBOL_UNUSED;
 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 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 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;
 
     if ( startWithMonday )
 	i = 1;
     else
 	i = 0;
 
     if ( month > 1 )
 	    prev.setYMD( year, month - 1, 1 );
     else
 	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 ) );
     i = 0;
     while ( days.count() < 6 * 7 )
 	days.append( Day( ++i, Day::NextMonth, FALSE ) );
 
     return days;
 }