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 /conduits/abbrowserconduit | |
| parent | 8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff) | |
| download | kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'conduits/abbrowserconduit')
| -rw-r--r-- | conduits/abbrowserconduit/abbrowser-setup.cc | 6 | ||||
| -rw-r--r-- | conduits/abbrowserconduit/abbrowser-setup.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conduits/abbrowserconduit/abbrowser-setup.cc b/conduits/abbrowserconduit/abbrowser-setup.cc index b275d3b..1f30edb 100644 --- a/conduits/abbrowserconduit/abbrowser-setup.cc +++ b/conduits/abbrowserconduit/abbrowser-setup.cc @@ -42,13 +42,13 @@ -static KAboutData *createAbout() +static TDEAboutData *createAbout() { - KAboutData *fAbout = new KAboutData("abbrowserconduit", + TDEAboutData *fAbout = new TDEAboutData("abbrowserconduit", I18N_NOOP("Abbrowser Conduit for KPilot"), KPILOT_VERSION, I18N_NOOP("Configures the Abbrowser Conduit for KPilot"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2001, Dan Pilone\n(C) 2002-2003, Reinhold Kainhofer"); fAbout->addAuthor("Greg Stern", I18N_NOOP("Primary Author")); diff --git a/conduits/abbrowserconduit/abbrowser-setup.h b/conduits/abbrowserconduit/abbrowser-setup.h index 47eff1c..4960620 100644 --- a/conduits/abbrowserconduit/abbrowser-setup.h +++ b/conduits/abbrowserconduit/abbrowser-setup.h @@ -33,7 +33,7 @@ #include "plugin.h" class AbbrowserWidget; -class KAboutData; +class TDEAboutData; class AbbrowserWidgetSetup : public ConduitConfigBase { @@ -45,7 +45,7 @@ public: static ConduitConfigBase *create(TQWidget *,const char *); private: AbbrowserWidget *fConfigWidget; - KAboutData *fAbout; + TDEAboutData *fAbout; } ; #endif |