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

---
 knewsticker/knewsticker.h                                  | 2 +-
 knewsticker/knewstickerconfig.cpp                          | 6 +++---
 knewsticker/knewstickerconfigwidget.ui                     | 6 +++---
 knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp      | 2 +-
 knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'knewsticker')

diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h
index c70f568b..057cec9b 100644
--- a/knewsticker/knewsticker.h
+++ b/knewsticker/knewsticker.h
@@ -19,7 +19,7 @@
 
 #include <tqtoolbutton.h>
 #include <kpanelapplet.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "configiface.h"
 #include "configaccess.h"
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 6bb6407c..8ec90bd8 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -18,13 +18,13 @@
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kfontdialog.h>
+#include <tdefontdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqcursor.h>
 #include <tqcheckbox.h>
diff --git a/knewsticker/knewstickerconfigwidget.ui b/knewsticker/knewstickerconfigwidget.ui
index 200144c7..dd28ddaf 100644
--- a/knewsticker/knewstickerconfigwidget.ui
+++ b/knewsticker/knewstickerconfigwidget.ui
@@ -1157,15 +1157,15 @@ Note that the filters are processed from the top to the bottom so that of two fi
     <include location="global" impldecl="in declaration">kcolorbutton.h</include>
     <include location="global" impldecl="in declaration">kcombobox.h</include>
     <include location="global" impldecl="in declaration">klineedit.h</include>
-    <include location="global" impldecl="in declaration">klistview.h</include>
+    <include location="global" impldecl="in declaration">tdelistview.h</include>
     <include location="global" impldecl="in declaration">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index a6927527..6f5f8532 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -18,7 +18,7 @@
 #include <loader.h>
 
 #include <kapplication.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <kurllabel.h>
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
index beb57001..177b751c 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlgwidget.ui
@@ -202,7 +202,7 @@
     </image>
 </images>
 <includes>
-    <include location="global" impldecl="in declaration">klistbox.h</include>
+    <include location="global" impldecl="in declaration">tdelistbox.h</include>
     <include location="global" impldecl="in declaration">kurllabel.h</include>
     <include location="global" impldecl="in declaration">kseparator.h</include>
 </includes>
@@ -210,6 +210,6 @@
 <includehints>
     <includehint>kurllabel.h</includehint>
     <includehint>kseparator.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
-- 
cgit v1.2.1