summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/html/porting.html3
-rw-r--r--doc/html/tqglayoutiterator.html1
-rw-r--r--doc/html/tqlayout.html1
-rw-r--r--doc/html/tqlayoutitem.html1
-rw-r--r--doc/html/tqlayoutiterator.html1
-rw-r--r--doc/html/tqsizepolicy-h.html2
-rw-r--r--doc/html/tqsizepolicy.html1
-rw-r--r--doc/html/tqspaceritem.html1
-rw-r--r--doc/html/tqwidgetitem.html1
-rw-r--r--doc/porting3.doc5
l---------include/ntqabstractlayout.h1
-rw-r--r--src/kernel/ntqabstractlayout.h54
-rw-r--r--src/kernel/ntqt.h1
-rw-r--r--src/kernel/qt_kernel.pri4
-rw-r--r--src/kernel/tqabstractlayout.cpp (renamed from src/kernel/qabstractlayout.cpp)0
-rw-r--r--src/kernel/tqlayoutengine_p.h4
-rw-r--r--src/kernel/tqsizepolicy.h2
17 files changed, 7 insertions, 76 deletions
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 75e211e58..430fb117d 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 <tt>echo</tt> parameter.
<p> <h2> <a href="tqlayout.html">TQLayout</a> and Other Abstract Layout Classes
</h2>
-<a name="12"></a><p> The definitions of <a href="tqglayoutiterator.html">TQGLayoutIterator</a>, <a href="tqlayout.html">TQLayout</a>, <a href="tqlayoutitem.html">TQLayoutItem</a>, <a href="tqlayoutiterator.html">TQLayoutIterator</a>, <a href="tqspaceritem.html">TQSpacerItem</a> and <a href="tqwidgetitem.html">TQWidgetItem</a> have been moved from <tt>&lt;ntqabstractlayout.h&gt;</tt> to <tt>&lt;tqlayout.h&gt;</tt>. The header <tt>&lt;ntqabstractlayout.h&gt;</tt> now includes <tt>&lt;tqlayout.h&gt;</tt> for compatibility. It
-might be removed in a future version.
+<a name="12"></a><p> The definitions of <a href="tqglayoutiterator.html">TQGLayoutIterator</a>, <a href="tqlayout.html">TQLayout</a>, <a href="tqlayoutitem.html">TQLayoutItem</a>, <a href="tqlayoutiterator.html">TQLayoutIterator</a>, <a href="tqspaceritem.html">TQSpacerItem</a> and <a href="tqwidgetitem.html">TQWidgetItem</a> have been moved from <tt>&lt;tqabstractlayout.h&gt;</tt> to <tt>&lt;tqlayout.h&gt;</tt>. The header <tt>&lt;tqabstractlayout.h&gt;</tt> has been removed.
<p> <h2> <a href="tqlistviewitem.html">TQListViewItem</a>
</h2>
<a name="13"></a><p> 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 c01942cae..7bd940236 100644
--- a/doc/html/tqglayoutiterator.html
+++ b/doc/html/tqglayoutiterator.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:1521 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqlayout.html b/doc/html/tqlayout.html
index 542223108..b41c8aafd 100644
--- a/doc/html/tqlayout.html
+++ b/doc/html/tqlayout.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:560 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqlayoutitem.html b/doc/html/tqlayoutitem.html
index 2df5c2d4b..db733f02e 100644
--- a/doc/html/tqlayoutitem.html
+++ b/doc/html/tqlayoutitem.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:56 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqlayoutiterator.html b/doc/html/tqlayoutiterator.html
index b70fafe09..a9efa5a73 100644
--- a/doc/html/tqlayoutiterator.html
+++ b/doc/html/tqlayoutiterator.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:1569 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqsizepolicy-h.html b/doc/html/tqsizepolicy-h.html
index 63afd3fdc..61ee6e184 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 0b9016914..83cd2bc4f 100644
--- a/doc/html/tqsizepolicy.html
+++ b/doc/html/tqsizepolicy.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:1240 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqspaceritem.html b/doc/html/tqspaceritem.html
index 214f7aa19..b8b790e85 100644
--- a/doc/html/tqspaceritem.html
+++ b/doc/html/tqspaceritem.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:81 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/html/tqwidgetitem.html b/doc/html/tqwidgetitem.html
index 5274574f1..7b39e909e 100644
--- a/doc/html/tqwidgetitem.html
+++ b/doc/html/tqwidgetitem.html
@@ -1,5 +1,4 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qabstractlayout.cpp:92 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 6770743d0..955f47107 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
-<ntqabstractlayout.h> to \c <tqlayout.h>. The header \c
-<ntqabstractlayout.h> now includes \c <tqlayout.h> for compatibility. It
-might be removed in a future version.
+<tqabstractlayout.h> to \c <tqlayout.h>. The header \c
+<tqabstractlayout.h> has been removed.
\section1 TQListViewItem
diff --git a/include/ntqabstractlayout.h b/include/ntqabstractlayout.h
deleted file mode 120000
index edbdb9c79..000000000
--- 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 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
{
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 15:09:02 +0000