summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kdevdesigner/designer/mainwindow.cpp2
-rw-r--r--languages/cpp/debugger/dbgtoolbar.cpp6
-rw-r--r--languages/cpp/debugger/dbgtoolbar.h2
-rw-r--r--languages/cpp/debugger/gdbcontroller.cpp2
-rw-r--r--languages/cpp/doc/gnome1.toc2
-rw-r--r--languages/ruby/debugger/dbgtoolbar.cpp6
-rw-r--r--languages/ruby/debugger/dbgtoolbar.h2
-rw-r--r--parts/documentation/documentation_part.cpp2
-rw-r--r--src/newui/CMakeLists.txt2
-rw-r--r--src/newui/Makefile.am4
-rw-r--r--src/newui/ddockwindow.cpp4
-rw-r--r--src/newui/ddockwindow.h2
-rw-r--r--src/newui/dmainwindow.h2
-rw-r--r--src/simplemainwindow.cpp2
14 files changed, 20 insertions, 20 deletions
diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index dbc2b932..6b04e5c0 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -105,7 +105,7 @@
#include <tqwizard.h>
#include <tqtimer.h>
#include <tqlistbox.h>
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqstylefactory.h>
#include <tqvbox.h>
#include <tqprocess.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp
index 9a3f4e02..3209c615 100644
--- a/languages/cpp/debugger/dbgtoolbar.cpp
+++ b/languages/cpp/debugger/dbgtoolbar.cpp
@@ -17,13 +17,13 @@
#include "debuggerpart.h"
#include "dbgcontroller.h"
-#include <kdockwindow.h>
+#include <kdoctwindow.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
#include <tqapplication.h>
#include <tqcursor.h>
diff --git a/languages/cpp/debugger/dbgtoolbar.h b/languages/cpp/debugger/dbgtoolbar.h
index a163af0c..b9998fd3 100644
--- a/languages/cpp/debugger/dbgtoolbar.h
+++ b/languages/cpp/debugger/dbgtoolbar.h
@@ -19,7 +19,7 @@
class KWinModule;
#include <ksystemtray.h>
-#include <kwin.h> // needed for WId :(
+#include <twin.h> // needed for WId :(
#include <tqframe.h>
diff --git a/languages/cpp/debugger/gdbcontroller.cpp b/languages/cpp/debugger/gdbcontroller.cpp
index cff2635d..fce96961 100644
--- a/languages/cpp/debugger/gdbcontroller.cpp
+++ b/languages/cpp/debugger/gdbcontroller.cpp
@@ -31,7 +31,7 @@
#include <klocale.h>
#include <kmessagebox.h>
#include <kprocess.h>
-#include <kwin.h>
+#include <twin.h>
#include <tqdatetime.h>
#include <tqfileinfo.h>
diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc
index e6c13c48..ace302d5 100644
--- a/languages/cpp/doc/gnome1.toc
+++ b/languages/cpp/doc/gnome1.toc
@@ -225,7 +225,7 @@
<tocsect3 name="GtkVScrollbar" url="gtk/gtkvscrollbar.html"/>
<tocsect3 name="GtkVSeparator" url="gtk/gtkvseparator.html"/>
<tocsect3 name="GtkWidget" url="gtk/gtkwidget.html"/>
- <tocsect3 name="GtkWindow" url="gtk/gtkwindow.html"/>
+ <tocsect3 name="GtkWindow" url="gtk/gttwindow.html"/>
</tocsect2>
<tocsect2 name="Index" url="gtk/gtk-index.html">
<tocsect3 name="Object Hierarchy" url="gtk/gtk-index.html#AEN49629"/>
diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp
index 5f24ec46..e2024c87 100644
--- a/languages/ruby/debugger/dbgtoolbar.cpp
+++ b/languages/ruby/debugger/dbgtoolbar.cpp
@@ -23,13 +23,13 @@
#include "debuggerpart.h"
#include "dbgcontroller.h"
-#include <kdockwindow.h>
+#include <kdoctwindow.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kpopupmenu.h>
#include <kstandarddirs.h>
-#include <kwin.h>
-#include <kwinmodule.h>
+#include <twin.h>
+#include <twinmodule.h>
#include <tqapplication.h>
#include <tqcursor.h>
diff --git a/languages/ruby/debugger/dbgtoolbar.h b/languages/ruby/debugger/dbgtoolbar.h
index 907bda2a..8143875a 100644
--- a/languages/ruby/debugger/dbgtoolbar.h
+++ b/languages/ruby/debugger/dbgtoolbar.h
@@ -25,7 +25,7 @@
class KWinModule;
#include <ksystemtray.h>
-#include <kwin.h> // needed for WId :(
+#include <twin.h> // needed for WId :(
#include <tqframe.h>
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 1e9727d1..1e6ba171 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -45,7 +45,7 @@
#include <kinputdialog.h>
#include <kstringhandler.h>
#include <kconfig.h>
-#include <kwin.h>
+#include <twin.h>
#include <ktexteditor/document.h>
#include "kdevplugininfo.h"
diff --git a/src/newui/CMakeLists.txt b/src/newui/CMakeLists.txt
index b65bff6a..b70ecbfe 100644
--- a/src/newui/CMakeLists.txt
+++ b/src/newui/CMakeLists.txt
@@ -20,6 +20,6 @@ include_directories(
tde_add_library( d STATIC_PIC AUTOMOC
SOURCES
- dmainwindow.cpp buttonbar.cpp button.cpp ddockwindow.cpp
+ dmainwindow.cpp buttonbar.cpp button.cpp ddoctwindow.cpp
docksplitter.cpp dtabwidget.cpp
)
diff --git a/src/newui/Makefile.am b/src/newui/Makefile.am
index f0350311..842bc569 100644
--- a/src/newui/Makefile.am
+++ b/src/newui/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
lib_LTLIBRARIES = libd.la
libd_la_LDFLAGS = $(all_libraries)
-noinst_HEADERS = dmainwindow.h ddockwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h
+noinst_HEADERS = dmainwindow.h ddoctwindow.h buttonbar.h button.h comdefs.h docksplitter.h dtabwidget.h
libd_la_SOURCES = dmainwindow.cpp buttonbar.cpp \
- button.cpp ddockwindow.cpp docksplitter.cpp dtabwidget.cpp
+ button.cpp ddoctwindow.cpp docksplitter.cpp dtabwidget.cpp
libd_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI)
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index bf7cc627..eb76416f 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "ddockwindow.h"
+#include "ddoctwindow.h"
#include <tqtoolbutton.h>
#include <tqlayout.h>
@@ -410,4 +410,4 @@ void DDockWindow::moveToDock(DDockWindow::Position position )
}
}
-#include "ddockwindow.moc"
+#include "ddoctwindow.moc"
diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h
index d98aa375..ad18f525 100644
--- a/src/newui/ddockwindow.h
+++ b/src/newui/ddockwindow.h
@@ -20,7 +20,7 @@
#ifndef DDOCKWINDOW_H
#define DDOCKWINDOW_H
-#include <tqdockwindow.h>
+#include <tqdoctwindow.h>
#include <tqvaluelist.h>
class TQBoxLayout;
diff --git a/src/newui/dmainwindow.h b/src/newui/dmainwindow.h
index 28e0340f..325a282c 100644
--- a/src/newui/dmainwindow.h
+++ b/src/newui/dmainwindow.h
@@ -23,7 +23,7 @@
#include <kxmlguiclient.h>
#include <kparts/mainwindow.h>
-#include "ddockwindow.h"
+#include "ddoctwindow.h"
class DTabWidget;
namespace Ideal {
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index e98ce01c..94bda751 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -36,7 +36,7 @@
#include <kurldrag.h>
#include <kconfig.h>
-#include <ddockwindow.h>
+#include <ddoctwindow.h>
#include <dtabwidget.h>
#include <profile.h>
#include <profileengine.h>