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

---
 konq-plugins/sidebar/newsticker/nspanel.cpp          | 2 +-
 konq-plugins/sidebar/newsticker/nspanel.h            | 2 +-
 konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'konq-plugins/sidebar/newsticker')

diff --git a/konq-plugins/sidebar/newsticker/nspanel.cpp b/konq-plugins/sidebar/newsticker/nspanel.cpp
index 22bb3a7..f3a704a 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.cpp
+++ b/konq-plugins/sidebar/newsticker/nspanel.cpp
@@ -26,7 +26,7 @@
 #include <tqfontmetrics.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include "nspanel.h"
 
 
diff --git a/konq-plugins/sidebar/newsticker/nspanel.h b/konq-plugins/sidebar/newsticker/nspanel.h
index 36b503e..7da5818 100644
--- a/konq-plugins/sidebar/newsticker/nspanel.h
+++ b/konq-plugins/sidebar/newsticker/nspanel.h
@@ -31,7 +31,7 @@
 #include <dcopref.h>
 #include <dcopobject.h>
 #include <tdeio/job.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 
 class TQBuffer;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 12be5c7..f06c876 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -36,7 +36,7 @@
 #include <kdebug.h>
 #include <kaboutdata.h>
 #include <kaboutapplication.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <kapplication.h>
-- 
cgit v1.2.1