author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
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,5 +1,5 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
@@ -20,7 +20,8 @@ | |||
20 | 20 | ||
21 | #include "qpedialog.h" | ||
22 | #include "qpeapplication.h" | ||
23 | |||
24 | #define protected public | 21 | #define protected public |
25 | #include <qdialog.h> | 22 | #include <qdialog.h> |
23 | #undef protected | ||
24 | |||
25 | #include "qpedialog.h" | ||
26 | #include "qpeapplication.h" | ||
26 | 27 | ||
@@ -35,3 +36,3 @@ QPEDialogListener::~QPEDialogListener() {} | |||
35 | 36 | ||
36 | void QPEDialogListener::appMessage( const QCString &msg, const QByteArray &data ) | 37 | void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & ) |
37 | { | 38 | { |