diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:18:35 -0600 |
| commit | f71394031a5e1c3b315081a98000f242b461ca8c (patch) | |
| tree | 54081035a0fdae2cadbf9d7df74a9a4e4cd46925 /kview/kviewviewer | |
| 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')
| -rw-r--r-- | kview/kviewviewer/kviewviewer.cpp | 8 | ||||
| -rw-r--r-- | kview/kviewviewer/kviewviewer.h | 4 | ||||
| -rw-r--r-- | kview/kviewviewer/test/main.cpp | 2 |
3 files changed, 7 insertions, 7 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" ), "kretz@kde.org" ); aboutData->addAuthor( "Sirtaj Singh Kang", I18N_NOOP( "started it all" ), "taj@kde.org" ); @@ -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 ); 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; } diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp index 499e75e5..5a562b08 100644 --- a/kview/kviewviewer/test/main.cpp +++ b/kview/kviewviewer/test/main.cpp @@ -17,7 +17,7 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, KAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org"); + TDEAboutData about("kviewviewertest", I18N_NOOP("KView Viewer Test"), version, description, TDEAboutData::License_GPL, "(C) 2001 Matthias Kretz", 0, 0, "kretz@kde.org"); about.addAuthor( "Matthias Kretz", 0, "kretz@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |