From 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Tue, 10 Sep 2002 12:09:49 +0000
Subject: Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?
---
(limited to 'library/qpedialog.cpp')

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;
--
cgit v0.9.0.2