summaryrefslogtreecommitdiff
path: root/library/qpedialog.cpp
authorzecke <zecke>2002-09-10 12:09:49 (UTC)
committer zecke <zecke>2002-09-10 12:09:49 (UTC)
commit6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff)
tree6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/qpedialog.cpp
parentd10cddb3c9ce75bc90b14add14bc133737fe35aa (diff)
downloadopie-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?
Diffstat (limited to 'library/qpedialog.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpedialog.cpp13
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 @@
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**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
@@ -18,11 +18,12 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
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
27QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di) 28QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di)
28{ 29{
@@ -33,7 +34,7 @@ QPEDialogListener::QPEDialogListener(QDialog *di ) : QObject(di)
33 34
34QPEDialogListener::~QPEDialogListener() {} 35QPEDialogListener::~QPEDialogListener() {}
35 36
36void QPEDialogListener::appMessage( const QCString &msg, const QByteArray &data ) 37void QPEDialogListener::appMessage( const QCString &msg, const QByteArray & )
37{ 38{
38 if (!dialog) 39 if (!dialog)
39 return; 40 return;