diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-21 19:05:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-21 19:05:31 +0900 |
commit | 03814b8bdda4b7f5cde4386f0aaef1119750fd10 (patch) | |
tree | c61a901810189b8e7cae74b5109a2715c4ef4f69 /src | |
parent | 36398097bfd3a8fd6024f24da805c6540961c394 (diff) | |
download | qt3-03814b8bdda4b7f5cde4386f0aaef1119750fd10.tar.gz qt3-03814b8bdda4b7f5cde4386f0aaef1119750fd10.zip |
Removed some obsolete code related to Qt1.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-rw-r--r-- | src/compat/qpaintd.h | 25 | ||||
-rw-r--r-- | src/compat/qpaintdc.h | 25 | ||||
-rw-r--r-- | src/kernel/q1xcompatibility.h | 49 | ||||
-rw-r--r-- | src/kernel/qpaintdevicedefs.h | 48 | ||||
-rw-r--r-- | src/kernel/qt_kernel.pri | 1 |
5 files changed, 0 insertions, 148 deletions
diff --git a/src/compat/qpaintd.h b/src/compat/qpaintd.h deleted file mode 100644 index 9ec7362..0000000 --- a/src/compat/qpaintd.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** -** -** Compatibility file - should only be included by legacy code. -** It #includes the file which obsoletes this one. -** -** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech ASA of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** Licensees holding valid Qt Professional Edition licenses may use this -** file in accordance with the Qt Professional Edition License Agreement -** provided with the Qt Professional Edition. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about the Professional Edition licensing, or see -** http://www.trolltech.com/qpl/ for QPL licensing information. -** -*****************************************************************************/ -#ifndef QPAINTD_H -#define QPAINTD_H -#include "qpaintdevice.h" -#endif diff --git a/src/compat/qpaintdc.h b/src/compat/qpaintdc.h deleted file mode 100644 index 60babce..0000000 --- a/src/compat/qpaintdc.h +++ /dev/null @@ -1,25 +0,0 @@ -/**************************************************************************** -** -** Compatibility file - should only be included by legacy code. -** It #includes the file which obsoletes this one. -** -** Copyright (C) 1998-2008 Trolltech ASA. All rights reserved. -** This file is part of the Qt GUI Toolkit. -** -** This file may be distributed under the terms of the Q Public License -** as defined by Trolltech ASA of Norway and appearing in the file -** LICENSE.QPL included in the packaging of this file. -** -** Licensees holding valid Qt Professional Edition licenses may use this -** file in accordance with the Qt Professional Edition License Agreement -** provided with the Qt Professional Edition. -** -** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for -** information about the Professional Edition licensing, or see -** http://www.trolltech.com/qpl/ for QPL licensing information. -** -*****************************************************************************/ -#ifndef QPAINTDC_H -#define QPAINTDC_H -#include "qpaintdevicedefs.h" -#endif diff --git a/src/kernel/q1xcompatibility.h b/src/kernel/q1xcompatibility.h deleted file mode 100644 index c28f33d..0000000 --- a/src/kernel/q1xcompatibility.h +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Various macros etc. to ease porting from Qt 1.x to 2.0. THIS FILE -** WILL CHANGE OR DISAPPEAR IN THE NEXT VERSION OF Qt. -** -** Created : 980824 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef Q1XCOMPATIBILITY_H -#define Q1XCOMPATIBILITY_H - -#error "Compatibility with Qt 1.x is no longer guaranteed. Please" -#error "update your code (for example using qt20fix script). We" -#error "apologize for any inconvenience." - -#endif // Q1XCOMPATIBILITY_H diff --git a/src/kernel/qpaintdevicedefs.h b/src/kernel/qpaintdevicedefs.h deleted file mode 100644 index 63027dc..0000000 --- a/src/kernel/qpaintdevicedefs.h +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Definition of QPaintDevice constants and flags -** -** Created : 940721 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the Qt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free Qt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -#ifndef QPAINTDEVICEDEFS_H -#define QPAINTDEVICEDEFS_H - -#error "this file is gone. the #defines it contained are in" -#error "q1xcompatibility.h; the functionality is in QPaintDevice" -#error "and QPaintDeviceMetrics." - -#endif // QPAINTDEVICEDEFS_H diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index 1b81a35..a106923 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -51,7 +51,6 @@ kernel { $$KERNEL_H/qobjectdict.h \ $$KERNEL_H/qobjectlist.h \ $$KERNEL_H/qpaintdevice.h \ - $$KERNEL_H/qpaintdevicedefs.h \ $$KERNEL_H/qpainter.h \ $$KERNEL_P/qpainter_p.h \ $$KERNEL_H/qpalette.h \ |