Qtopia1-6 merge

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

1 files changed, 9 insertions, 11 deletions

diff --git a/library/backend/qfiledirect_p.h b/library/backend/qfiledirect_p.h
index 3ade622..976c69f 100644
--- a/library/backend/qfiledirect_p.h
+++ b/library/backend/qfiledirect_p.h
@@ -1,18 +1,17 @@
 /**********************************************************************

-** Copyright (C) 2001 Trolltech AS.  All rights reserved.

+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **

 ** This file is part of the Qtopia Environment.

 **

-** Licensees holding valid Qtopia Developer license may use this

-** file in accordance with the Qtopia Developer License Agreement

-** provided with the Software.

+** 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.

+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **

-** email sales@trolltech.com for information about Qtopia License

-** Agreements.

+** 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.

@@ -22,7 +21,7 @@
 #ifndef QFILE_DIRECT_H

 #define QFILE_DIRECT_H

 #include <qfile.h>

-#include <qpe/qpcglobal.h>

+#include <qtopia/private/qpcglobal.h>
 

 class QPC_EXPORT QFileDirect : public QFile

 {

@@ -34,4 +33,3 @@ public:
 };

 

 #endif

-