summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qtinterface/CMakeLists.txt4
-rw-r--r--qtinterface/Makefile.am4
-rwxr-xr-xqtinterface/convert_qt_tqt14
-rw-r--r--qtinterface/filelist.txt2
-rw-r--r--qtinterface/qt4/Qt/Qt3Support2
-rw-r--r--qtinterface/qt4/Qt/q3dockarea.h2
-rw-r--r--qtinterface/qt4/Qt/q3toolbar.h2
-rw-r--r--qtinterface/tqdockwindow.cpp2
-rw-r--r--qtinterface/tqdockwindow.h4
9 files changed, 13 insertions, 13 deletions
diff --git a/qtinterface/CMakeLists.txt b/qtinterface/CMakeLists.txt
index 64fbb38..08ece23 100644
--- a/qtinterface/CMakeLists.txt
+++ b/qtinterface/CMakeLists.txt
@@ -30,7 +30,7 @@ install( FILES
tqaction.h tqapplication.h tqasyncio.h tqbuttongroup.h tqbutton.h tqcanvas.h
tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h
tqcommonstyle.h tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h
- tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h
+ tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdoctwindow.h
tqdragobject.h tqerrormessage.h tqeventloop.h tqfiledialog.h tqfontdialog.h
tqframe.h tqftp.h tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h
tqguardedptr.h tqhbox.h tqhbuttongroup.h tqheader.h tqhgroupbox.h
@@ -138,7 +138,7 @@ tde_add_library( tqt SHARED
tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp
tqcommonstyle.cpp tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp
tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp
- tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp tqerrormessage.cpp
+ tqdockarea.cpp tqdoctwindow.cpp tqdragobject.cpp tqerrormessage.cpp
tqeventloop.cpp tqframe.cpp tqftp.cpp tqfiledialog.cpp tqfontdialog.cpp
tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp
tqguardedptr.cpp tqhbox.cpp tqhbuttongroup.cpp tqheader.cpp
diff --git a/qtinterface/Makefile.am b/qtinterface/Makefile.am
index 5c0083d..df4f410 100644
--- a/qtinterface/Makefile.am
+++ b/qtinterface/Makefile.am
@@ -32,7 +32,7 @@ lib_LTLIBRARIES = libtqt.la
libtqt_la_SOURCES = tqt.cpp tqaccel.cpp tqaccessible.cpp tqaction.cpp tqapplication.cpp tqasyncio.cpp \
tqbuttongroup.cpp tqbutton.cpp \
tqcanvas.cpp tqcdestyle.cpp tqcheckbox.cpp tqclipboard.cpp tqcolordialog.cpp tqcombobox.cpp tqcommonstyle.cpp \
-tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp tqdockarea.cpp tqdockwindow.cpp tqdragobject.cpp \
+tqdatabrowser.cpp tqdatatable.cpp tqdataview.cpp tqdatetimeedit.cpp tqdesktopwidget.cpp tqdial.cpp tqdialog.cpp tqdns.cpp tqdockarea.cpp tqdoctwindow.cpp tqdragobject.cpp \
tqerrormessage.cpp tqeventloop.cpp \
tqframe.cpp tqftp.cpp tqfiledialog.cpp tqfontdialog.cpp \
tqgl.cpp tqgplugin.cpp tqgrid.cpp tqgridview.cpp tqgroupbox.cpp tqguardedptr.cpp \
@@ -84,7 +84,7 @@ libtqt_la_LDFLAGS = $(KDE_RPATH) -version-info 6:0:2 -no-undefined $(all_librari
include_HEADERS = tqt.h tqtglobaldefines.h tqaccel.h tqaccessible.h tqaction.h tqapplication.h tqassistantclient.h tqasyncio.h \
tqbuttongroup.h tqbutton.h \
tqcanvas.h tqcdestyle.h tqcheckbox.h tqclipboard.h tqcolordialog.h tqcombobox.h tqcommonstyle.h \
-tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdockwindow.h tqdragobject.h \
+tqdatabrowser.h tqdatatable.h tqdataview.h tqdatetimeedit.h tqdesktopwidget.h tqdial.h tqdialog.h tqdns.h tqdockarea.h tqdoctwindow.h tqdragobject.h \
tqerrormessage.h tqeventloop.h \
tqfiledialog.h tqfontdialog.h tqframe.h tqftp.h \
tqgl.h tqgplugin.h tqgrid.h tqgridview.h tqgroupbox.h tqguardedptr.h \
diff --git a/qtinterface/convert_qt_tqt1 b/qtinterface/convert_qt_tqt1
index 1b36f80..2b1ffce 100755
--- a/qtinterface/convert_qt_tqt1
+++ b/qtinterface/convert_qt_tqt1
@@ -112,8 +112,8 @@ find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdns\.h/\1tqdns\.h/g' {} \
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qdns\.h/\1tqdns\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdockarea\.h/\1tqdockarea\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qdockarea\.h/\1tqdockarea\.h/g' {} \;
-find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdockwindow\.h/\1tqdockwindow\.h/g' {} \;
-find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qdockwindow\.h/\1tqdockwindow\.h/g' {} \;
+find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdoctwindow\.h/\1tqdoctwindow\.h/g' {} \;
+find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qdoctwindow\.h/\1tqdoctwindow\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdom\.h/\1tqdom\.h/g' {} \;
find ./ -type f -iname "*.h*" -exec sed -i 's/\([^t]\)qdom\.h/\1tqdom\.h/g' {} \;
find ./ -type f -iname "*.c*" -exec sed -i 's/\([^t]\)qdragobject\.h/\1tqdragobject\.h/g' {} \;
diff --git a/qtinterface/filelist.txt b/qtinterface/filelist.txt
index 4659bf5..9fe40b8 100644
--- a/qtinterface/filelist.txt
+++ b/qtinterface/filelist.txt
@@ -62,7 +62,7 @@ tqdict.h
tqdir.h
tqdns.h
tqdockarea.h
-tqdockwindow.h
+tqdoctwindow.h
tqdom.h
tqdragobject.h
tqdrawutil.h
diff --git a/qtinterface/qt4/Qt/Qt3Support b/qtinterface/qt4/Qt/Qt3Support
index 666f7a3..6f514ab 100644
--- a/qtinterface/qt4/Qt/Qt3Support
+++ b/qtinterface/qt4/Qt/Qt3Support
@@ -10,7 +10,7 @@
#include "q3combobox.h"
#include "q3datetimeedit.h"
#include "q3dockarea.h"
-#include "q3dockwindow.h"
+#include "q3doctwindow.h"
#include "q3frame.h"
#include "q3grid.h"
#include "q3gridview.h"
diff --git a/qtinterface/qt4/Qt/q3dockarea.h b/qtinterface/qt4/Qt/q3dockarea.h
index c506368..50d1187 100644
--- a/qtinterface/qt4/Qt/q3dockarea.h
+++ b/qtinterface/qt4/Qt/q3dockarea.h
@@ -44,7 +44,7 @@
#include <QtGui/qwidget.h>
#include <QtCore/qlist.h>
-#include <Qt3Support/q3dockwindow.h>
+#include <Qt3Support/q3doctwindow.h>
#include <QtGui/qlayout.h>
#include <QtCore/qpointer.h>
diff --git a/qtinterface/qt4/Qt/q3toolbar.h b/qtinterface/qt4/Qt/q3toolbar.h
index 096149c..21cef03 100644
--- a/qtinterface/qt4/Qt/q3toolbar.h
+++ b/qtinterface/qt4/Qt/q3toolbar.h
@@ -42,7 +42,7 @@
#ifndef Q3TOOLBAR_H
#define Q3TOOLBAR_H
-#include <Qt3Support/q3dockwindow.h>
+#include <Qt3Support/q3doctwindow.h>
QT_BEGIN_HEADER
diff --git a/qtinterface/tqdockwindow.cpp b/qtinterface/tqdockwindow.cpp
index 47ee368..fdaf1e7 100644
--- a/qtinterface/tqdockwindow.cpp
+++ b/qtinterface/tqdockwindow.cpp
@@ -20,4 +20,4 @@ Boston, MA 02110-1301, USA.
*/
#include <tqt.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
diff --git a/qtinterface/tqdockwindow.h b/qtinterface/tqdockwindow.h
index 569d3bd..752b38b 100644
--- a/qtinterface/tqdockwindow.h
+++ b/qtinterface/tqdockwindow.h
@@ -29,7 +29,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QDockWindow class
// For Qt3, no changes are needed
-#include <qdockwindow.h>
+#include <qdoctwindow.h>
#endif // USE_QT3
@@ -38,7 +38,7 @@ Boston, MA 02110-1301, USA.
// Reimplement the QDockWindow class
// For Qt4, some changes are needed
-#include <Qt/q3dockwindow.h>
+#include <Qt/q3doctwindow.h>
#endif // USE_QT4