Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qpedialog.h b/library/qpedialog.h
index 1fde09a..ed77720 100644
--- a/library/qpedialog.h
+++ b/library/qpedialog.h
@@ -1,44 +1,44 @@
 /**********************************************************************
-** 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
 ** 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.
 **
 **********************************************************************/
 #ifndef __QPE_DIALOG_H__
 #define __QPE_DIALOG_H__
 
 #include <qobject.h>
 
 class QPEDialogListenerData;
 
 class QPEDialogListener : public QObject
 {
     Q_OBJECT
 public:
     QPEDialogListener(QDialog *di);
     ~QPEDialogListener();
     
 private slots:
     void appMessage( const QCString &msg, const QByteArray &data );
 
 private:
 
     QDialog *dialog;
     QPEDialogListenerData *d;
 };
 
 #endif