| author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
| commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (side-by-side diff) | |
| tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qpedialog.cpp | |
| parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
| download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 | |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
| -rw-r--r-- | library/qpedialog.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/library/qpedialog.cpp b/library/qpedialog.cpp index 06b0c94..0db161b 100644 --- a/library/qpedialog.cpp +++ b/library/qpedialog.cpp @@ -1,7 +1,7 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** -** This file is part of Qtopia Environment. +** 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 @@ -18,11 +18,12 @@ ** **********************************************************************/ -#include "qpedialog.h" -#include "qpeapplication.h" - #define protected public #include <qdialog.h> +#undef protected + +#include "qpedialog.h" +#include "qpeapplication.h" QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) { @@ -33,7 +34,7 @@ QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) QPEDialogListener::~QPEDialogListener() {} -void QPEDialogListener::appMessage( const QCString &msg, const QByteArray &data ) +void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & ) { if (!dialog) return; |