Rename KInstance and KAboutData to avoid conflicts with KDE4

1 files changed, 4 insertions, 4 deletions

diff --git a/knewsticker/knewsticker.h b/knewsticker/knewsticker.h
index 739734e7..85c57ce3 100644
--- a/knewsticker/knewsticker.h
+++ b/knewsticker/knewsticker.h
@@ -25,13 +25,13 @@
 #include "configaccess.h"
 #include "newsengine.h"
 
-class KInstance;
+class TDEInstance;
 class NewsSource;
 class KArrowButton;
 class NewsIconMgr;
 class NewsScroller;
 class KNewsTickerMenu;
-class KAboutData;
+class TDEAboutData;
 class TQTimer;
 
 class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
@@ -104,7 +104,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
 	private:
 		void setupArrowButton();
 
-		KInstance            *m_instance;
+		TDEInstance            *m_instance;
 		DCOPClient           *m_dcopClient;
 		ConfigAccess         *m_cfg;
 		KArrowButton         *m_arrowButton;
@@ -112,7 +112,7 @@ class KNewsTicker : public KPanelApplet, virtual public ConfigIface,
 		TQTimer               *m_updateTimer;
 		NewsIconMgr          *m_newsIconMgr;
 		NewsScroller         *m_scroller;
-		KAboutData           *m_aboutData;
+		TDEAboutData           *m_aboutData;
 		KNewsTickerMenu      *m_contextMenu;
 		bool                 m_newNews;
 		NewsSourceBase::List m_newsSources;