diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/kernel/ntqabstractlayout.h | 54 | ||||
-rw-r--r-- | src/kernel/ntqt.h | 1 | ||||
-rw-r--r-- | src/kernel/qt_kernel.pri | 4 | ||||
-rw-r--r-- | src/kernel/tqabstractlayout.cpp (renamed from src/kernel/qabstractlayout.cpp) | 0 | ||||
-rw-r--r-- | src/kernel/tqlayoutengine_p.h | 4 | ||||
-rw-r--r-- | src/kernel/tqsizepolicy.h | 2 |
6 files changed, 3 insertions, 62 deletions
diff --git a/src/kernel/ntqabstractlayout.h b/src/kernel/ntqabstractlayout.h deleted file mode 100644 index a28406772..000000000 --- a/src/kernel/ntqabstractlayout.h +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Definition of layout classes -** -** Created : 960416 -** -** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the kernel module of the TQt 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 TQt 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.TQPL -** included in the packaging of this file. Licensees holding valid TQt -** Commercial licenses may use this file in accordance with the TQt -** 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 TQABSTRACTLAYOUT_H -#define TQABSTRACTLAYOUT_H - -/* - This header is provided for source compatibility only. -*/ - -#ifndef QT_H -#ifndef TQT_NO_COMPAT -#include "tqlayout.h" -#endif -#endif // QT_H - -#endif diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index 52caddc35..e7ee77271 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -191,7 +191,6 @@ #include <tqsimplerichtext.h> #include "tqwmatrix.h" #include <tqsizegrip.h> -#include <ntqabstractlayout.h> #include <tqsjiscodec.h> #include <tqslider.h> #include <tqsocket.h> diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index a31cab804..fbde927e1 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -2,7 +2,7 @@ kernel { KERNEL_P = kernel - HEADERS += $$KERNEL_H/ntqabstractlayout.h \ + HEADERS += \ $$KERNEL_H/ntqaccel.h \ $$KERNEL_P/qucomextra_p.h \ $$KERNEL_H/ntqapplication.h \ @@ -193,7 +193,7 @@ kernel { unix:SOURCES += $$KERNEL_CPP/tqprocess_unix.cpp \ $$KERNEL_CPP/tqthread_unix.cpp - SOURCES += $$KERNEL_CPP/qabstractlayout.cpp \ + SOURCES += $$KERNEL_CPP/tqabstractlayout.cpp \ $$KERNEL_CPP/qucomextra.cpp \ $$KERNEL_CPP/qaccel.cpp \ $$KERNEL_CPP/qapplication.cpp \ diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/tqabstractlayout.cpp index 3f881ddbb..3f881ddbb 100644 --- a/src/kernel/qabstractlayout.cpp +++ b/src/kernel/tqabstractlayout.cpp diff --git a/src/kernel/tqlayoutengine_p.h b/src/kernel/tqlayoutengine_p.h index 6c1a6aa0f..fd34dc73b 100644 --- a/src/kernel/tqlayoutengine_p.h +++ b/src/kernel/tqlayoutengine_p.h @@ -59,10 +59,6 @@ // -#ifndef QT_H -#include "ntqabstractlayout.h" -#endif // QT_H - #ifndef TQT_NO_LAYOUT struct TQLayoutStruct diff --git a/src/kernel/tqsizepolicy.h b/src/kernel/tqsizepolicy.h index f6fac3885..6bb8aa0cf 100644 --- a/src/kernel/tqsizepolicy.h +++ b/src/kernel/tqsizepolicy.h @@ -45,7 +45,7 @@ #include "tqglobal.h" #endif // QT_H -// Documentation is in qabstractlayout.cpp. +// Documentation is in tqabstractlayout.cpp. class TQ_EXPORT TQSizePolicy { |