From 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:56:54 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- lib/plugin.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/plugin.cc') diff --git a/lib/plugin.cc b/lib/plugin.cc index afa0fd5..0e61b32 100644 --- a/lib/plugin.cc +++ b/lib/plugin.cc @@ -108,7 +108,7 @@ ConduitConfigBase::~ConduitConfigBase() return true; } -TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) +TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, TDEAboutData *ad) { FUNCTIONSETUP; @@ -117,7 +117,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) TQString s; TQLabel *text; KIconLoader *l = KGlobal::iconLoader(); - const KAboutData *p = ad ? ad : KGlobal::instance()->aboutData(); + const TDEAboutData *p = ad ? ad : KGlobal::instance()->aboutData(); TQGridLayout *grid = new TQGridLayout(w, 5, 4, SPACING); @@ -251,7 +251,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad) } /* static */ void ConduitConfigBase::addAboutPage(TQTabWidget *tw, - KAboutData *ad) + TDEAboutData *ad) { FUNCTIONSETUP; -- cgit v1.2.3