summaryrefslogtreecommitdiffstats
path: root/knewsticker/knewsticker.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:21:16 -0600
commitef71f46965855308db367f74956513eccc71bc46 (patch)
tree71f1aca189b7beda22f9e95b19608dccfa4f3050 /knewsticker/knewsticker.h
parentbdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff)
downloadtdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz
tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'knewsticker/knewsticker.h')
-rw-r--r--knewsticker/knewsticker.h8
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;