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/libgui | |
| parent | 35b5bf688e0a6eff51db9cfcf348fd3d96661b26 (diff) | |
| download | piklab-e4de7e2686ddbd20a6bef471d2ea57fcefd58532.tar.gz piklab-e4de7e2686ddbd20a6bef471d2ea57fcefd58532.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/libgui')
| -rw-r--r-- | src/libgui/likeback.cpp | 10 | ||||
| -rw-r--r-- | src/libgui/likeback.h | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp index a012ec2..6740322 100644 --- a/src/libgui/likeback.cpp +++ b/src/libgui/likeback.cpp @@ -196,7 +196,7 @@ TQ_UINT16 LikeBack::s_hostPort = 16; int LikeBack::s_disabledCount = 0; LikeBack* LikeBack::s_instance = 0; KConfig* LikeBack::s_config = 0; -KAboutData* LikeBack::s_about = 0; +TDEAboutData* LikeBack::s_about = 0; LikeBack* LikeBack::instance() { @@ -223,7 +223,7 @@ TQ_UINT16 LikeBack::hostPort() return s_hostPort; } -KAboutData* LikeBack::about() +TDEAboutData* LikeBack::about() { return s_about; } @@ -403,7 +403,7 @@ void LikeBack::askEMail() setEmailAddress(email); } -// FIXME: Should be moved to KAboutData? Cigogne will also need it. +// FIXME: Should be moved to TDEAboutData? Cigogne will also need it. bool LikeBack::isDevelopmentVersion(const TQString &version) { TQString theVersion = (version.isEmpty() ? s_about->version() : version); @@ -415,7 +415,7 @@ bool LikeBack::isDevelopmentVersion(const TQString &version) theVersion.find("cvs", /*index=*/0, /*caseSensitive=*/false) != -1; } -void LikeBack::init(KConfig* config, KAboutData* about, Button buttons) +void LikeBack::init(KConfig* config, TDEAboutData* about, Button buttons) { s_config = config; s_about = about; @@ -432,7 +432,7 @@ void LikeBack::init(bool isDevelopmentVersion, Button buttons) if (s_config == 0) s_config = kapp->config(); if (s_about == 0) - s_about = (KAboutData*) kapp->aboutData(); + s_about = (TDEAboutData*) kapp->aboutData(); if (LikeBack::userWantToParticipate() && isDevelopmentVersion) new LikeBack(buttons); diff --git a/src/libgui/likeback.h b/src/libgui/likeback.h index e8db1d1..95046c3 100644 --- a/src/libgui/likeback.h +++ b/src/libgui/likeback.h @@ -28,7 +28,7 @@ class TQToolButton; class TQPushButton; class KProcess; class KConfig; -class KAboutData; +class TDEAboutData; /** * @author S�astien Laot <slaout@linux62.org> @@ -64,9 +64,9 @@ class LikeBack : public TQWidget static bool isDevelopmentVersion(const TQString &version = TQString()); /// << @Returns true if version is an alpha/beta/rc/svn/cvs version. Use kapp->aboutData()->version is @p version is empty static void init(Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if the application version is a development one. static void init(bool isDevelopmentVersion, Button buttons = AllButtons); /// << Initialize the LikeBack system: enable it if @p isDevelopmentVersion is true. - static void init(KConfig* config, KAboutData* about, Button buttons = AllButtons); + static void init(KConfig* config, TDEAboutData* about, Button buttons = AllButtons); static TQString activeWindowPath(); - static KAboutData* about(); + static TDEAboutData* about(); public slots: void iLike(); void iDoNotLike(); @@ -97,7 +97,7 @@ class LikeBack : public TQWidget static LikeBack *s_instance; static int s_disabledCount; static KConfig *s_config; - static KAboutData *s_about; + static TDEAboutData *s_about; }; class LikeBackDialog : public KDialog |