diff --git a/doc/html/porting.html b/doc/html/porting.html index 75e211e5..430fb117 100644 --- a/doc/html/porting.html +++ b/doc/html/porting.html @@ -473,8 +473,7 @@ than the first two required parameters you will must add a value for the echo parameter.

TQLayout and Other Abstract Layout Classes

-

The definitions of TQGLayoutIterator, TQLayout, TQLayoutItem, TQLayoutIterator, TQSpacerItem and TQWidgetItem have been moved from <ntqabstractlayout.h> to <tqlayout.h>. The header <ntqabstractlayout.h> now includes <tqlayout.h> for compatibility. It -might be removed in a future version. +

The definitions of TQGLayoutIterator, TQLayout, TQLayoutItem, TQLayoutIterator, TQSpacerItem and TQWidgetItem have been moved from <tqabstractlayout.h> to <tqlayout.h>. The header <tqabstractlayout.h> has been removed.

TQListViewItem

The paintBranches() function in TQt 2.x had a GUIStyle parameter; this diff --git a/doc/html/tqglayoutiterator.html b/doc/html/tqglayoutiterator.html index c01942ca..7bd94023 100644 --- a/doc/html/tqglayoutiterator.html +++ b/doc/html/tqglayoutiterator.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqlayout.html b/doc/html/tqlayout.html index 54222310..b41c8aaf 100644 --- a/doc/html/tqlayout.html +++ b/doc/html/tqlayout.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqlayoutitem.html b/doc/html/tqlayoutitem.html index 2df5c2d4..db733f02 100644 --- a/doc/html/tqlayoutitem.html +++ b/doc/html/tqlayoutitem.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqlayoutiterator.html b/doc/html/tqlayoutiterator.html index b70fafe0..a9efa5a7 100644 --- a/doc/html/tqlayoutiterator.html +++ b/doc/html/tqlayoutiterator.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqsizepolicy-h.html b/doc/html/tqsizepolicy-h.html index 63afd3fd..61ee6e18 100644 --- a/doc/html/tqsizepolicy-h.html +++ b/doc/html/tqsizepolicy-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "tqglobal.h" #endif // QT_H -// Documentation is in qabstractlayout.cpp. +// Documentation is in tqabstractlayout.cpp. class TQ_EXPORT TQSizePolicy { diff --git a/doc/html/tqsizepolicy.html b/doc/html/tqsizepolicy.html index 0b901691..83cd2bc4 100644 --- a/doc/html/tqsizepolicy.html +++ b/doc/html/tqsizepolicy.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqspaceritem.html b/doc/html/tqspaceritem.html index 214f7aa1..b8b790e8 100644 --- a/doc/html/tqspaceritem.html +++ b/doc/html/tqspaceritem.html @@ -1,5 +1,4 @@ - diff --git a/doc/html/tqwidgetitem.html b/doc/html/tqwidgetitem.html index 5274574f..7b39e909 100644 --- a/doc/html/tqwidgetitem.html +++ b/doc/html/tqwidgetitem.html @@ -1,5 +1,4 @@ - diff --git a/doc/porting3.doc b/doc/porting3.doc index 6770743d..955f4710 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -444,9 +444,8 @@ for the \c echo parameter. The definitions of \l TQGLayoutIterator, \l TQLayout, \l TQLayoutItem, \l TQLayoutIterator, \l TQSpacerItem and \l TQWidgetItem have been moved from \c - to \c . The header \c - now includes \c for compatibility. It -might be removed in a future version. + to \c . The header \c + has been removed. \section1 TQListViewItem diff --git a/include/ntqabstractlayout.h b/include/ntqabstractlayout.h deleted file mode 120000 index edbdb9c7..00000000 --- a/include/ntqabstractlayout.h +++ /dev/null @@ -1 +0,0 @@ -../src/kernel/ntqabstractlayout.h \ No newline at end of file diff --git a/src/kernel/ntqabstractlayout.h b/src/kernel/ntqabstractlayout.h deleted file mode 100644 index a2840677..00000000 --- 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 52caddc3..e7ee7727 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -191,7 +191,6 @@ #include #include "tqwmatrix.h" #include -#include #include #include #include diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index a31cab80..fbde927e 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 similarity index 100% rename from src/kernel/qabstractlayout.cpp rename to src/kernel/tqabstractlayout.cpp diff --git a/src/kernel/tqlayoutengine_p.h b/src/kernel/tqlayoutengine_p.h index 6c1a6aa0..fd34dc73 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 f6fac388..6bb8aa0c 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 {