From 3fde05a2853d1a37c41cdae953c901444781f473 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 8 Nov 2011 00:15:31 -0600
Subject: Fix accidental conversion of dockwin

---
 kate/ChangeLog                | 2 +-
 kstyles/asteroid/asteroid.cpp | 2 +-
 kstyles/plastik/plastik.cpp   | 2 +-
 tdeui/CMakeLists.txt          | 2 +-
 tdeui/Makefile.am             | 2 +-
 tdeui/ksystemtray.cpp         | 2 +-
 tdeui/ktoolbar.cpp            | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kate/ChangeLog b/kate/ChangeLog
index d36cab42f..21fc54ba5 100644
--- a/kate/ChangeLog
+++ b/kate/ChangeLog
@@ -336,7 +336,7 @@
   * kateconsole.* konsole/*     : add kateconsole widget
 
 2001-02-16 Anders Lund <anders@alweb.dk>
-  * katemainwindow.cpp  :fixing read/write options to use maindoctwindow functions.
+  * katemainwindow.cpp  :fixing read/write options to use maindockwindow functions.
 
 2001-02-15 Joseph Wenninger <jowenn@kde.org>
   * kateview.cpp    : Tab doesn't jump to next widget anymore, but inserts a tab into the text
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp
index 434cd6366..76a5c0d6c 100644
--- a/kstyles/asteroid/asteroid.cpp
+++ b/kstyles/asteroid/asteroid.cpp
@@ -30,7 +30,7 @@
 #include <tqtabbar.h>
 #include <tqgroupbox.h>
 #include <tqtoolbutton.h>
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
 #include <tqtooltip.h>
 #include <tqdrawutil.h>
 #include <tqlistview.h>
diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp
index 08c97b3c1..1c6f5cd6a 100644
--- a/kstyles/plastik/plastik.cpp
+++ b/kstyles/plastik/plastik.cpp
@@ -2689,7 +2689,7 @@ void PlastikStyle::tqdrawControl(TQ_ControlElement element,
             break;
         }
 
-    // Menu and doctwindow empty space
+    // Menu and dockwindow empty space
     //
         case CE_DockWindowEmptyArea:
             p->fillRect(r, cg.background());
diff --git a/tdeui/CMakeLists.txt b/tdeui/CMakeLists.txt
index ed6fca193..9ff7efc91 100644
--- a/tdeui/CMakeLists.txt
+++ b/tdeui/CMakeLists.txt
@@ -46,7 +46,7 @@ install( FILES
     kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h
     knuminput.h kseparator.h klineedit.h
     krestrictedline.h kcolorbutton.h kcolorbtn.h
-    ksystemtray.h kdoctwindow.h kbuttonbox.h
+    ksystemtray.h kdockwindow.h kbuttonbox.h
     keditcl.h kled.h keditlistbox.h
     kwizard.h kkeydialog.h kkeybutton.h
     kurllabel.h kruler.h kcursor.h
diff --git a/tdeui/Makefile.am b/tdeui/Makefile.am
index d85c952ff..821e2e682 100644
--- a/tdeui/Makefile.am
+++ b/tdeui/Makefile.am
@@ -43,7 +43,7 @@ include_HEADERS = kprogressbox.h kprogress.h kcolordlg.h \
 		kmainwindow.h kmainwindowiface.h ktoolbar.h kmenubar.h \
 		knuminput.h kseparator.h klineedit.h \
 		krestrictedline.h kcolorbutton.h kcolorbtn.h \
-		ksystemtray.h kdoctwindow.h kbuttonbox.h \
+		ksystemtray.h kdockwindow.h kbuttonbox.h \
 		keditcl.h kled.h keditlistbox.h \
 		kwizard.h kkeydialog.h kkeybutton.h \
 		kurllabel.h kruler.h kcursor.h \
diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp
index 063ffa0e1..1f3d010af 100644
--- a/tdeui/ksystemtray.cpp
+++ b/tdeui/ksystemtray.cpp
@@ -347,4 +347,4 @@ void KSystemTray::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
 #include "ksystemtray.moc"
-#include "kdoctwindow.moc"
+#include "kdockwindow.moc"
diff --git a/tdeui/ktoolbar.cpp b/tdeui/ktoolbar.cpp
index 8c890feb9..b3c383c4d 100644
--- a/tdeui/ktoolbar.cpp
+++ b/tdeui/ktoolbar.cpp
@@ -27,7 +27,7 @@
 
 #ifdef KDE_USE_FINAL
 #undef Always
-#include <tqdoctwindow.h>
+#include <tqdockwindow.h>
 #endif
 
 #include <string.h>
-- 
cgit v1.2.1