diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:56:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:56:54 -0600 |
| commit | 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 (patch) | |
| tree | f78e2df40f61288477bbd160d7c795918ad298d5 /lib/plugin.cc | |
| parent | 8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff) | |
| download | kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'lib/plugin.cc')
| -rw-r--r-- | lib/plugin.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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; |