diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:14 -0600 |
| commit | 282bd68ced7547ae53f552b23c0ef3ad799aec5f (patch) | |
| tree | 5a18e6614be6943224b34a5c80bd26701262790b /kcm_gtk | |
| parent | df69025b8a75829757a755458400e648f15b8c86 (diff) | |
| download | gtk-qt-engine-282bd68ced7547ae53f552b23c0ef3ad799aec5f.tar.gz gtk-qt-engine-282bd68ced7547ae53f552b23c0ef3ad799aec5f.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kcm_gtk')
| -rw-r--r-- | kcm_gtk/kcmgtk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kcm_gtk/kcmgtk.h b/kcm_gtk/kcmgtk.h index dee376b..7199d96 100644 --- a/kcm_gtk/kcmgtk.h +++ b/kcm_gtk/kcmgtk.h @@ -67,7 +67,7 @@ public: virtual void save(); virtual int buttons(); virtual TQString quickHelp() const; - virtual const KAboutData *aboutData()const + virtual const TDEAboutData *aboutData()const { return myAboutData; }; public slots: @@ -97,7 +97,7 @@ private: TQMap<TQString,TQString> themes; TQMap<TQString,TQString> gtk3Themes; GtkRcParser parser; - KAboutData *myAboutData; + TDEAboutData *myAboutData; TQFont font; TQMap<TQString,TQString> profiles; EmacsDetails* emacsDetailsDialog; |