From 1d04439de0f3e30cd671cb3b8dadad124b6b4099 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:16:48 -0600
Subject: [PATCH] Rename many classes and header files to avoid conflicts with
 KDE4

---
 yakuake/src/first_run_dialog.cpp | 2 +-
 yakuake/src/main_window.h        | 6 +++---
 yakuake/src/skin_list_item.h     | 2 +-
 yakuake/src/skin_settings_ui.ui  | 2 +-
 yakuake/src/tab_bar.cpp          | 2 +-
 yakuake/src/tabbed_widget.cpp    | 6 +++---
 yakuake/src/title_bar.h          | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/yakuake/src/first_run_dialog.cpp b/yakuake/src/first_run_dialog.cpp
index a0609a5..a201292 100644
--- a/yakuake/src/first_run_dialog.cpp
+++ b/yakuake/src/first_run_dialog.cpp
@@ -14,7 +14,7 @@
 #include "first_run_dialog.moc"
 
 #include <kkeybutton.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kkeydialog.h>
 
 
diff --git a/yakuake/src/main_window.h b/yakuake/src/main_window.h
index e98a228..3e88ef3 100644
--- a/yakuake/src/main_window.h
+++ b/yakuake/src/main_window.h
@@ -29,14 +29,14 @@
 #include <tqwidgetstack.h>
 
 #include <twin.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twinmodule.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kapplication.h>
 #include <kglobalaccel.h>
 #include <kpassivepopup.h>
diff --git a/yakuake/src/skin_list_item.h b/yakuake/src/skin_list_item.h
index 5ea2c1f..4337d6c 100644
--- a/yakuake/src/skin_list_item.h
+++ b/yakuake/src/skin_list_item.h
@@ -14,7 +14,7 @@
 #define SKIN_LIST_ITEM_H
 
 
-#include "klistview.h"
+#include "tdelistview.h"
 
 
 #define MARGIN 3
diff --git a/yakuake/src/skin_settings_ui.ui b/yakuake/src/skin_settings_ui.ui
index c8df636..9fa244d 100644
--- a/yakuake/src/skin_settings_ui.ui
+++ b/yakuake/src/skin_settings_ui.ui
@@ -120,6 +120,6 @@
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/yakuake/src/tab_bar.cpp b/yakuake/src/tab_bar.cpp
index 641373b..ce97423 100644
--- a/yakuake/src/tab_bar.cpp
+++ b/yakuake/src/tab_bar.cpp
@@ -19,7 +19,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 
 TabBar::TabBar(TQWidget* parent, const char* name, bool translucency, const TQString & skin)
diff --git a/yakuake/src/tabbed_widget.cpp b/yakuake/src/tabbed_widget.cpp
index ed07869..c8bb440 100644
--- a/yakuake/src/tabbed_widget.cpp
+++ b/yakuake/src/tabbed_widget.cpp
@@ -18,9 +18,9 @@
 #include <tqcursor.h>
 #include <tqwhatsthis.h>
 
-#include <kaction.h>
-#include <kpopupmenu.h>
-#include <kmainwindow.h>
+#include <tdeaction.h>
+#include <tdepopupmenu.h>
+#include <tdemainwindow.h>
 #include <kiconloader.h>
 
 
diff --git a/yakuake/src/title_bar.h b/yakuake/src/title_bar.h
index 09d298e..ba30d16 100644
--- a/yakuake/src/title_bar.h
+++ b/yakuake/src/title_bar.h
@@ -27,7 +27,7 @@
 
 
 #include <tdeconfig.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kapplication.h>
 #include <kstandarddirs.h>