diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:51:20 -0600 |
| commit | 9c8d64b5e7f2552116b0dc9c3070dc7529118432 (patch) | |
| tree | 7869ba3a44dd108ce44ecea2526a3dbffded9511 /src/gvimagepart/gvimagepart.cpp | |
| parent | 9be8a1a36d76dd6f4c5114fa51d4a5d18f98948b (diff) | |
| download | gwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.tar.gz gwenview-9c8d64b5e7f2552116b0dc9c3070dc7529118432.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'src/gvimagepart/gvimagepart.cpp')
| -rw-r--r-- | src/gvimagepart/gvimagepart.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp index 69c1d64..64453b8 100644 --- a/src/gvimagepart/gvimagepart.cpp +++ b/src/gvimagepart/gvimagepart.cpp @@ -150,10 +150,10 @@ void GVImagePart::guiActivateEvent( KParts::GUIActivateEvent* event) { } -KAboutData* GVImagePart::createAboutData() { - KAboutData* aboutData = new KAboutData( "gvimagepart", I18N_NOOP("GVImagePart"), +TDEAboutData* GVImagePart::createAboutData() { + TDEAboutData* aboutData = new TDEAboutData( "gvimagepart", I18N_NOOP("GVImagePart"), "0.1", I18N_NOOP("Image Viewer"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(c) 2004, Jonathan Riddell <jr@jriddell.org>"); return aboutData; } @@ -407,7 +407,7 @@ void DataUploader::slotJobFinished(KIO::Job* job) { */ class PopupGUIClient : public KXMLGUIClient { public: - PopupGUIClient( KInstance *inst, const TQString &doc ) { + PopupGUIClient( TDEInstance *inst, const TQString &doc ) { setInstance( inst ); setXML( doc ); } |