From d8f44d1f46ecc198afc8accd5c32446cead1be1d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 7 Feb 2013 11:11:35 -0600 Subject: [PATCH] Rename KAbout to avoid conflicts with KDE4 --- kbabel/kbabeldict/aboutmoduledlg.cpp | 2 +- kbabel/kbabeldict/aboutmoduledlg.h | 2 +- kbabel/kbabeldict/kbabeldictbox.cpp | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kbabel/kbabeldict/aboutmoduledlg.cpp b/kbabel/kbabeldict/aboutmoduledlg.cpp index aaa4ca0f..693a3ac6 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.cpp +++ b/kbabel/kbabeldict/aboutmoduledlg.cpp @@ -36,7 +36,7 @@ #include AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent) - : KAboutApplication(aboutData, parent) + : TDEAboutApplication(aboutData, parent) , _aboutData(aboutData) { setHelpLinkText(i18n("Report Bug...")); diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h index 3b1abaa9..42fbb117 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.h +++ b/kbabel/kbabeldict/aboutmoduledlg.h @@ -38,7 +38,7 @@ #include -class AboutModuleDlg : public KAboutApplication +class AboutModuleDlg : public TDEAboutApplication { Q_OBJECT diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 9374e9d3..15d421b5 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -1223,12 +1223,12 @@ void KBabelDictBox::clearModuleResults() void KBabelDictBox::about() { - KAboutApplication *aboutDlg = new KAboutApplication(this); + TDEAboutApplication *aboutDlg = new TDEAboutApplication(this); SearchEngine *e; for(e = moduleList.first(); e != 0; e = moduleList.next()) { - KAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name()); + TDEAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name()); const TDEAboutData *aboutData = e->about(); if(aboutData) @@ -1272,7 +1272,7 @@ void KBabelDictBox::about() label = new TQLabel(text,0); page->addWidget(label); - TQValueList::ConstIterator it; + TQValueList::ConstIterator it; for(it = aboutData->authors().begin(); it != aboutData->authors().end(); ++it) { @@ -1287,7 +1287,7 @@ void KBabelDictBox::about() label = new TQLabel(text,0); page->addWidget(label); - TQValueList::ConstIterator it; + TQValueList::ConstIterator it; for(it = aboutData->credits().begin(); it != aboutData->credits().end(); ++it) {