From f71394031a5e1c3b315081a98000f242b461ca8c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:18:35 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kdvi/kdvi_multipage.cpp | 6 +++--- kdvi/kdvi_multipage.h | 2 +- kdvi/main.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kdvi') diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index 18a3df78..b1c29b63 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/kdvi/kdvi_multipage.cpp @@ -96,11 +96,11 @@ KDVIMultiPage::~KDVIMultiPage() } -KAboutData* KDVIMultiPage::createAboutData() +TDEAboutData* KDVIMultiPage::createAboutData() { - KAboutData* about = new KAboutData("kdvi", I18N_NOOP("KDVI"), "1.3", + TDEAboutData* about = new TDEAboutData("kdvi", I18N_NOOP("KDVI"), "1.3", I18N_NOOP("A previewer for Device Independent files (DVI files) produced by the TeX typesetting system."), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "Markku Hinhala, Stephan Kebekus", I18N_NOOP("This program displays Device Independent (DVI) files which are produced by the TeX typesetting system.\n" "KDVI 1.3 is based on original code from KDVI version 0.43 and xdvik.")); diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h index 1d42faa3..a6c033b9 100644 --- a/kdvi/kdvi_multipage.h +++ b/kdvi/kdvi_multipage.h @@ -34,7 +34,7 @@ public: virtual void addConfigDialogs(KConfigDialog* configDialog); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); private: virtual DocumentWidget* createDocumentWidget(); diff --git a/kdvi/main.cpp b/kdvi/main.cpp index 2f3defbd..6b85af9d 100644 --- a/kdvi/main.cpp +++ b/kdvi/main.cpp @@ -31,8 +31,8 @@ static const char description[] = I18N_NOOP("A previewer for Device Independent int main(int argc, char** argv) { - KAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4", - description, KAboutData::License_GPL, + TDEAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4", + description, TDEAboutData::License_GPL, "Markku Hinhala, Stephan Kebekus", I18N_NOOP("This program displays Device Independent (DVI) files which are produced by the TeX typesetting system.\n" "This KDVI version is based on original code from KDVI version 0.43 and xdvik.")); -- cgit v1.2.1