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 | |
parent | df69025b8a75829757a755458400e648f15b8c86 (diff) | |
download | gtk-qt-engine-282bd68ced7547ae53f552b23c0ef3ad799aec5f.tar.gz gtk-qt-engine-282bd68ced7547ae53f552b23c0ef3ad799aec5f.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
-rw-r--r-- | kcm_gtk/kcmgtk.h | 4 | ||||
-rw-r--r-- | src/qt_qt_wrapper.cpp | 4 |
2 files changed, 4 insertions, 4 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; diff --git a/src/qt_qt_wrapper.cpp b/src/qt_qt_wrapper.cpp index 4ef9672..8448087 100644 --- a/src/qt_qt_wrapper.cpp +++ b/src/qt_qt_wrapper.cpp @@ -171,8 +171,8 @@ void createTQApp() argv[0] = (char*) malloc(sizeof(char) * 19); strncpy(argv[0], "gtk-qt-application", 19); - KAboutData aboutData("gtk-qt-engine", I18N_NOOP("gtk-qt-engine"), "v0.1", - "GTK Qt theme engine", KAboutData::License_GPL, + TDEAboutData aboutData("gtk-qt-engine", I18N_NOOP("gtk-qt-engine"), "v0.1", + "GTK Qt theme engine", TDEAboutData::License_GPL, "(c) 2011, Timothy Pearson", "message goes here", 0 /* TODO: Website */, "kb9vqf@pearsoncomputing.net"); TDECmdLineArgs::init(argc, argv, &aboutData); |