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 --- kview/kviewviewer/kviewviewer.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kview/kviewviewer/kviewviewer.h') diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index 1cc26f32..06fb17bc 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -35,7 +35,7 @@ class KAction; class KActionMenu; class KToggleAction; class KSelectAction; -class KAboutData; +class TDEAboutData; class TQBuffer; class TQSize; class KDirWatch; @@ -54,7 +54,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } - static KAboutData * createAboutData(); + static TDEAboutData * createAboutData(); virtual void setReadWrite( bool readwrite = true ); KParts::BrowserExtension * browserExtension() const { return m_pExtension; } -- cgit v1.2.1