From 77d6a28b1ccddd28a0ac938298b73f3440b63869 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 8 Nov 2011 00:35:14 -0600
Subject: Fix accidental conversion of dockwin (part 2 of 2)

---
 tdeui/kdockwindow.h | 41 +++++++++++++++++++++++++++++++++++++++++
 tdeui/kdoctwindow.h | 41 -----------------------------------------
 2 files changed, 41 insertions(+), 41 deletions(-)
 create mode 100644 tdeui/kdockwindow.h
 delete mode 100644 tdeui/kdoctwindow.h

(limited to 'tdeui')

diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h
new file mode 100644
index 000000000..4b7a34049
--- /dev/null
+++ b/tdeui/kdockwindow.h
@@ -0,0 +1,41 @@
+/* This file is part of the KDE libraries
+   Copyright (C) 1999 Matthias Ettrich <ettrich@kde.org>
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License version 2 as published by the Free Software Foundation.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public License
+   along with this library; see the file COPYING.LIB.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef KDOCKWINDOW_H
+#define KDOCKWINDOW_H
+
+#include <tqlabel.h>
+#include <ksystemtray.h>
+
+#ifndef KDE_NO_COMPAT
+/**
+ * \brief Obsolete system tray support
+ *
+ * @deprecated
+ * This class is obsolete, it is provided for compatibility only.
+ * Use KSystemTray instead.
+ */
+class KDE_DEPRECATED KDockWindow : public KSystemTray
+{
+    Q_OBJECT
+public:
+    KDockWindow( TQWidget* parent = 0, const char* name  = 0 )
+	: KSystemTray( parent, name ) {}
+    ~KDockWindow() {}
+};
+#endif
+#endif
diff --git a/tdeui/kdoctwindow.h b/tdeui/kdoctwindow.h
deleted file mode 100644
index 4b7a34049..000000000
--- a/tdeui/kdoctwindow.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* This file is part of the KDE libraries
-   Copyright (C) 1999 Matthias Ettrich <ettrich@kde.org>
-
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   This library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
-
-   You should have received a copy of the GNU Library General Public License
-   along with this library; see the file COPYING.LIB.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef KDOCKWINDOW_H
-#define KDOCKWINDOW_H
-
-#include <tqlabel.h>
-#include <ksystemtray.h>
-
-#ifndef KDE_NO_COMPAT
-/**
- * \brief Obsolete system tray support
- *
- * @deprecated
- * This class is obsolete, it is provided for compatibility only.
- * Use KSystemTray instead.
- */
-class KDE_DEPRECATED KDockWindow : public KSystemTray
-{
-    Q_OBJECT
-public:
-    KDockWindow( TQWidget* parent = 0, const char* name  = 0 )
-	: KSystemTray( parent, name ) {}
-    ~KDockWindow() {}
-};
-#endif
-#endif
-- 
cgit v1.2.3