From f71394031a5e1c3b315081a98000f242b461ca8c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:18:35 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kviewshell/plugins/djvu/djvumultipage.cpp | 6 +++---
 kviewshell/plugins/djvu/djvumultipage.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kviewshell/plugins')

diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp
index edc7e256..591447db 100644
--- a/kviewshell/plugins/djvu/djvumultipage.cpp
+++ b/kviewshell/plugins/djvu/djvumultipage.cpp
@@ -89,12 +89,12 @@ DjVuMultiPage::~DjVuMultiPage()
 }
 
 
-KAboutData* DjVuMultiPage::createAboutData()
+TDEAboutData* DjVuMultiPage::createAboutData()
 {
   /* You obviously want to change this to match your setup */
-  KAboutData* about = new KAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1",
+  TDEAboutData* about = new TDEAboutData("djvumultipage", I18N_NOOP("KDjView"), "0.1",
                           I18N_NOOP("KViewshell DjVu Plugin."),
-                          KAboutData::License_GPL,
+                          TDEAboutData::License_GPL,
                           "Wilfried Huss",
                           I18N_NOOP("This program displays DjVu files."));
 
diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h
index d7c59b70..163bf474 100644
--- a/kviewshell/plugins/djvu/djvumultipage.h
+++ b/kviewshell/plugins/djvu/djvumultipage.h
@@ -119,7 +119,7 @@ public:
   This member returns a structure that contains information about the
   authors of the implementation
   */
-  static KAboutData* createAboutData();
+  static TDEAboutData* createAboutData();
 
   /** Re-implementation of the print method */
   virtual void print();
-- 
cgit v1.2.1