diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
| commit | 609724b5d29f25236bee59d0cb794602d391a96b (patch) | |
| tree | 6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /konq-plugins/sidebar/newsticker | |
| parent | da2af448849a961235925b69430584d0bfe94b1f (diff) | |
| download | tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/newsticker')
4 files changed, 7 insertions, 7 deletions
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp index edaa1f4..30aedb4 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp @@ -59,11 +59,11 @@ namespace KSB_News { pages.setAutoDelete(TRUE); // about dialog - m_aboutdata = new KAboutData("konq_sidebarnews", + m_aboutdata = new TDEAboutData("konq_sidebarnews", I18N_NOOP("Newsticker"), KDE::versionString(), I18N_NOOP("RSS Feed Viewer"), - KAboutData::License_LGPL, + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2002-2004, the Sidebar Newsticker developers")); m_aboutdata->addAuthor("Marcus Camen", I18N_NOOP("Maintainer"), "mcamen@mcamen.de"); diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h index 98b436e..53934f4 100644 --- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h +++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h @@ -36,7 +36,7 @@ class TQVBoxLayout; class TQPushButton; class TQStringList; class KPopupMenu; -class KAboutData; +class TDEAboutData; class KAboutApplication; class KBugReport; class KConfigDialog; @@ -77,7 +77,7 @@ namespace KSB_News { TQVBoxLayout *layout; TQWidget *currentPage; KPopupMenu *popup, *helpmenu; - KAboutData *m_aboutdata; + TDEAboutData *m_aboutdata; KAboutApplication *m_about; KBugReport *m_bugreport; TQPushButton *m_last_button_rightclicked; diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp index de6788f..1ba4f94 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp +++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp @@ -46,7 +46,7 @@ namespace KSB_News { - KonqSidebar_News::KonqSidebar_News(KInstance *inst, TQObject *parent, + KonqSidebar_News::KonqSidebar_News(TDEInstance *inst, TQObject *parent, TQWidget *widgetParent, TQString &desktopName, const char* name) : KonqSidebarPlugin(inst, parent, widgetParent, desktopName, name), @@ -252,7 +252,7 @@ namespace KSB_News { extern "C" { - KDE_EXPORT void* create_konq_sidebarnews(KInstance *instance, TQObject *par, + KDE_EXPORT void* create_konq_sidebarnews(TDEInstance *instance, TQObject *par, TQWidget *widp, TQString &desktopname, const char *name) { diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.h b/konq-plugins/sidebar/newsticker/sidebar_news.h index 84bbb27..048ead5 100644 --- a/konq-plugins/sidebar/newsticker/sidebar_news.h +++ b/konq-plugins/sidebar/newsticker/sidebar_news.h @@ -48,7 +48,7 @@ namespace KSB_News { K_DCOP public: - KonqSidebar_News(KInstance *instance, TQObject *parent, + KonqSidebar_News(TDEInstance *instance, TQObject *parent, TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_News(); |