diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:21:16 -0600 |
| commit | ef71f46965855308db367f74956513eccc71bc46 (patch) | |
| tree | 71f1aca189b7beda22f9e95b19608dccfa4f3050 /knewsticker | |
| parent | bdf47e8ffbf1c94f4852d9aa2eb535a9ec176658 (diff) | |
| download | tdenetwork-ef71f46965855308db367f74956513eccc71bc46.tar.gz tdenetwork-ef71f46965855308db367f74956513eccc71bc46.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'knewsticker')
| -rw-r--r-- | knewsticker/knewsticker.cpp | 6 | ||||
| -rw-r--r-- | knewsticker/knewsticker.h | 8 | ||||
| -rw-r--r-- | knewsticker/knewstickerstub/knewstickerstub.cpp | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp index 89c78232..46930a5a 100644 --- a/knewsticker/knewsticker.cpp +++ b/knewsticker/knewsticker.cpp @@ -37,14 +37,14 @@ KNewsTicker::KNewsTicker(const TQString &cfgFile, Type t, int actions, TQWidget *parent, const char *name) : ConfigIface(), DCOPObject("KNewsTicker"), KPanelApplet(cfgFile, t, actions, parent, name), - m_instance(new KInstance("knewsticker")), + m_instance(new TDEInstance("knewsticker")), m_dcopClient(new DCOPClient()), m_cfg(new ConfigAccess(config())), m_newsTimer(new TQTimer(this)), m_updateTimer(new TQTimer(this)), m_newsIconMgr(NewsIconMgr::self()), - m_aboutData(new KAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2", - I18N_NOOP("A news ticker applet."), KAboutData::License_BSD, + m_aboutData(new TDEAboutData("knewsticker", I18N_NOOP("KNewsTicker"), "v0.2", + I18N_NOOP("A news ticker applet."), TDEAboutData::License_BSD, I18N_NOOP("(c) 2000, 2001 The KNewsTicker developers"))) { TQHBoxLayout *layout = new TQHBoxLayout(this); 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; diff --git a/knewsticker/knewstickerstub/knewstickerstub.cpp b/knewsticker/knewstickerstub/knewstickerstub.cpp index 8263c202..a50e8244 100644 --- a/knewsticker/knewstickerstub/knewstickerstub.cpp +++ b/knewsticker/knewstickerstub/knewstickerstub.cpp @@ -36,8 +36,8 @@ int main(int argc, char **argv) { KLocale::setMainCatalogue("knewsticker"); - KAboutData aboutData(name, verbname, version, description, - KAboutData::License_BSD, copyright); + TDEAboutData aboutData(name, verbname, version, description, + TDEAboutData::License_BSD, copyright); aboutData.addAuthor("Frerich Raabe", I18N_NOOP("Author"), "raabe@kde.org"); TDECmdLineArgs::init(argc, argv, &aboutData); |