diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 19:56:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 19:56:54 -0600 |
| commit | 28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2 (patch) | |
| tree | f78e2df40f61288477bbd160d7c795918ad298d5 /conduits/timeconduit | |
| parent | 8ebd99fc2d3e2429a1030d60ce693b74b8832a40 (diff) | |
| download | kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.tar.gz kpilot-28879aa783655c1bb2b65e7761f8fe2a7cf8f7b2.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'conduits/timeconduit')
| -rw-r--r-- | conduits/timeconduit/time-setup.cc | 6 | ||||
| -rw-r--r-- | conduits/timeconduit/time-setup.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/conduits/timeconduit/time-setup.cc b/conduits/timeconduit/time-setup.cc index 409cdc3..8da1b7b 100644 --- a/conduits/timeconduit/time-setup.cc +++ b/conduits/timeconduit/time-setup.cc @@ -42,13 +42,13 @@ -static KAboutData *createAbout() +static TDEAboutData *createAbout() { - KAboutData *fAbout = new KAboutData("Timeconduit", + TDEAboutData *fAbout = new TDEAboutData("Timeconduit", I18N_NOOP("Time Synchronization Conduit for KPilot"), KPILOT_VERSION, I18N_NOOP("Synchronizes the Time on the Handheld and the PC"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2002, Reinhold Kainhofer"); fAbout->addAuthor("Reinhold Kainhofer", I18N_NOOP("Primary Author"), "[email protected]", "http://reinhold.kainhofer.com/"); diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h index 7089624..06f2522 100644 --- a/conduits/timeconduit/time-setup.h +++ b/conduits/timeconduit/time-setup.h @@ -32,7 +32,7 @@ #include "plugin.h" class TimeWidget; -class KAboutData; +class TDEAboutData; class TimeWidgetConfig : public ConduitConfigBase { @@ -45,7 +45,7 @@ public: static ConduitConfigBase *create(TQWidget *,const char *); protected: TimeWidget *fConfigWidget; - KAboutData *fAbout; + TDEAboutData *fAbout; } ; #endif |