diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:38:52 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-06 19:38:52 -0600 |
| commit | 5075b3a008195981bf4bea3e3e54df524883f06d (patch) | |
| tree | 0ec0a0ac83fb56b00d392a8217dd28f8b07cb834 /src/common/global | |
| parent | dca4b260f029db8fbb9a33bfb2b0a2aa9a28edf1 (diff) | |
| download | piklab-5075b3a008195981bf4bea3e3e54df524883f06d.tar.gz piklab-5075b3a008195981bf4bea3e3e54df524883f06d.zip | |
Rename KCmd to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
| -rw-r--r-- | src/common/global/about.cpp | 8 | ||||
| -rw-r--r-- | src/common/global/about.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp index e895f60..e0567dc 100644 --- a/src/common/global/about.cpp +++ b/src/common/global/about.cpp @@ -22,16 +22,16 @@ const char * const Piklab::URLS[Nb_UrlTypes] = { }; //----------------------------------------------------------------------------- -Piklab::OptionList::OptionList(const KCmdLineOptions *options) +Piklab::OptionList::OptionList(const TDECmdLineOptions *options) : _options(0) { for (uint i=0; options[i].name; i++) append(options[i]); } -const KCmdLineOptions *Piklab::OptionList::ptr() const +const TDECmdLineOptions *Piklab::OptionList::ptr() const { delete[] _options; - _options = new KCmdLineOptions[count()+1]; + _options = new TDECmdLineOptions[count()+1]; for (uint i=0; i<uint(count()); i++) { _options[i] = *at(i); Q_ASSERT( _options[i].name ); @@ -41,7 +41,7 @@ const KCmdLineOptions *Piklab::OptionList::ptr() const } //----------------------------------------------------------------------------- -void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options) +void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const TDECmdLineOptions *options) { Q_ASSERT(about); #if defined(NO_KDE) diff --git a/src/common/global/about.h b/src/common/global/about.h index adfa86b..920eabc 100644 --- a/src/common/global/about.h +++ b/src/common/global/about.h @@ -14,22 +14,22 @@ namespace Piklab { //----------------------------------------------------------------------------- -class OptionList : public TQValueList<KCmdLineOptions> +class OptionList : public TQValueList<TDECmdLineOptions> { public: OptionList() : _options(0) {} - OptionList(const KCmdLineOptions *options); + OptionList(const TDECmdLineOptions *options); virtual ~OptionList() { delete[] _options; } - const KCmdLineOptions *ptr() const; + const TDECmdLineOptions *ptr() const; private: - mutable KCmdLineOptions *_options; + mutable TDECmdLineOptions *_options; }; //--------------------------------------------------------------------------- enum UrlType { Homepage = 0, Support, BugReport, Nb_UrlTypes }; extern const char * const URLS[Nb_UrlTypes]; -extern void init(TDEAboutData *about, int argc, char **argv, bool gui, const KCmdLineOptions *options); +extern void init(TDEAboutData *about, int argc, char **argv, bool gui, const TDECmdLineOptions *options); //--------------------------------------------------------------------------- class AboutData : public TDEAboutData |