diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kview/kviewviewer/kviewviewer.cpp | |
| parent | e5ce3b4175f2e72788b49b9ed46c722784218dad (diff) | |
| download | tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.tar.gz tdegraphics-f71394031a5e1c3b315081a98000f242b461ca8c.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kview/kviewviewer/kviewviewer.cpp')
| -rw-r--r-- | kview/kviewviewer/kviewviewer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index b9e8af7d..dbfa1c92 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -167,11 +167,11 @@ KViewViewer::~KViewViewer() delete m_pBuffer; } -KAboutData * KViewViewer::createAboutData() +TDEAboutData * KViewViewer::createAboutData() { - KAboutData * aboutData = new KAboutData( "kviewviewer", I18N_NOOP( "KView" ), + TDEAboutData * aboutData = new TDEAboutData( "kviewviewer", I18N_NOOP( "KView" ), KVIEW_VERSION, I18N_NOOP( "TDE Image Viewer Part" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1997-2002, The KView Developers") ); aboutData->addAuthor( "Matthias Kretz", I18N_NOOP( "Maintainer" ), "[email protected]" ); aboutData->addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "[email protected]" ); @@ -743,7 +743,7 @@ void KViewViewer::slotDel() class PopupGUIClient : public KXMLGUIClient { public: - PopupGUIClient( KInstance *inst, const TQString &doc ) + PopupGUIClient( TDEInstance *inst, const TQString &doc ) { setInstance( inst ); setXML( doc ); |