-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, 2 insertions, 7 deletions

diff --git a/library/qpemessagebox.cpp b/library/qpemessagebox.cpp
index c38828a..1df108a 100644
--- a/library/qpemessagebox.cpp
+++ b/library/qpemessagebox.cpp
@@ -1,60 +1,55 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the 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 "qpemessagebox.h"
+#include "qpeglobal.h"
 #include <qtopia/stringutil.h>
 
 #include <qmessagebox.h>
 
-#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)QMessageBox::tr("Yes");
 (void)QMessageBox::tr("No");
 }
 
 
 /*!
   \class QPEMessageBox qpemessagebox.h
   \brief A message box that provides yes, no and cancel options.
 
   \ingroup qtopiaemb
  */
 
 /*!
   Displays a QMessageBox with parent \a parent and caption \a caption.
   The message displayed is "Are you sure you want to delete: ",
   followed by \a object.
  */
 bool QPEMessageBox::confirmDelete( QWidget *parent, const QString & caption,
                                const QString & object )
 {
     QString msg = QObject::tr("<qt>Are you sure you want to delete\n %1?</qt>").arg( Qtopia::escapeString( object ) ); // use <qt> an esacpe String....
     int r = QMessageBox::warning( parent, caption, msg, QMessageBox::Yes,
                                   QMessageBox::No|QMessageBox::Default|
                                   QMessageBox::Escape, 0 );
 
     return r == QMessageBox::Yes;
 }