diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:58:33 -0600 |
| commit | e4de7e2686ddbd20a6bef471d2ea57fcefd58532 (patch) | |
| tree | 5e1f0132426a228f8aef2803d000ce1d1bb7617f /src/common/global | |
| parent | 35b5bf688e0a6eff51db9cfcf348fd3d96661b26 (diff) | |
| download | piklab-e4de7e2686ddbd20a6bef471d2ea57fcefd58532.tar.gz piklab-e4de7e2686ddbd20a6bef471d2ea57fcefd58532.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
| -rw-r--r-- | src/common/global/about.cpp | 4 | ||||
| -rw-r--r-- | src/common/global/about.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp index cd470b4..e895f60 100644 --- a/src/common/global/about.cpp +++ b/src/common/global/about.cpp @@ -41,7 +41,7 @@ const KCmdLineOptions *Piklab::OptionList::ptr() const } //----------------------------------------------------------------------------- -void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options) +void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options) { Q_ASSERT(about); #if defined(NO_KDE) @@ -72,7 +72,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd //--------------------------------------------------------------------------- Piklab::AboutData::AboutData(const char *executable, const char *name, const char *description) - : KAboutData(executable, name, VERSION, description, KAboutData::License_GPL, + : TDEAboutData(executable, name, VERSION, description, TDEAboutData::License_GPL, "(c) 2005-2007 Nicolas Hadacek\n(c) 2002-2005 Alain Gibaud\n(c) 2003-2004 Stephen Landamore\n(c) 2005 Lorenz Möenlechner and Matthias Kranz\n(c) 2001-2005 Craig Franklin", 0, URLS[Homepage], URLS[BugReport]) { diff --git a/src/common/global/about.h b/src/common/global/about.h index 4d53914..adfa86b 100644 --- a/src/common/global/about.h +++ b/src/common/global/about.h @@ -29,10 +29,10 @@ private: //--------------------------------------------------------------------------- enum UrlType { Homepage = 0, Support, BugReport, Nb_UrlTypes }; extern const char * const URLS[Nb_UrlTypes]; -extern void init(KAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options); +extern void init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options); //--------------------------------------------------------------------------- -class AboutData : public KAboutData +class AboutData : public TDEAboutData { public: AboutData(const char *executable, const char *name, const char *description); |