From 8856e75c203aa69be210b2fee1095ab9761aca7e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:23:08 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- charselectapplet/charselectapplet.cpp | 4 ++-- charselectapplet/charselectapplet.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'charselectapplet') diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 1608b45..4d773f9 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -139,11 +139,11 @@ void CharSelectApplet::preferences() void CharSelectApplet::about() { if(!_aboutData) { - _aboutData = new KAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0", + _aboutData = new TDEAboutData("kcharselectapplet", I18N_NOOP("KCharSelectApplet"), "1.0", I18N_NOOP("A character picker applet.\n" "Used to copy single characters to the X11 clipboard.\n" "You can paste them to an application with the middle mouse button."), - KAboutData::License_BSD, "(c) 2001, Matthias Elter"); + TDEAboutData::License_BSD, "(c) 2001, Matthias Elter"); _aboutData->addAuthor("Matthias Elter", 0, "elter@kde.org"); } diff --git a/charselectapplet/charselectapplet.h b/charselectapplet/charselectapplet.h index 4343660..aa23ed3 100644 --- a/charselectapplet/charselectapplet.h +++ b/charselectapplet/charselectapplet.h @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. class TQSpinBox; class KLineEdit; -class KAboutData; +class TDEAboutData; class ConfigDialog : public KDialogBase { @@ -111,7 +111,7 @@ public: private: CharTable *_table; - KAboutData *_aboutData; + TDEAboutData *_aboutData; ConfigDialog *_configDialog; }; -- cgit v1.2.1