diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:13:30 -0600 |
| commit | 609724b5d29f25236bee59d0cb794602d391a96b (patch) | |
| tree | 6a7cbc4d42a570e50e44ad782d9bc6cdee289edb /konq-plugins/sidebar/mediaplayer | |
| parent | da2af448849a961235925b69430584d0bfe94b1f (diff) | |
| download | tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.tar.gz tdeaddons-609724b5d29f25236bee59d0cb794602d391a96b.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/sidebar/mediaplayer')
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/mediaplayer.cpp | 4 | ||||
| -rw-r--r-- | konq-plugins/sidebar/mediaplayer/mediaplayer.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp index 305cc0b..ab6463b 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp @@ -27,7 +27,7 @@ #include <kdemacros.h> #include "mediawidget.h" -KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): +KonqSidebar_MediaPlayer::KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name): KonqSidebarPlugin(instance,parent,widgetParent,desktopName_,name) { widget=new KSB_MediaWidget(widgetParent); @@ -51,7 +51,7 @@ void KonqSidebar_MediaPlayer::handleURL(const KURL &/*url*/) extern "C" { - KDE_EXPORT void* create_konqsidebar_mediaplayer(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + KDE_EXPORT void* create_konqsidebar_mediaplayer(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("konqsidebar_mediaplayer"); return new KonqSidebar_MediaPlayer(instance,par,widp,desktopname,name); diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.h b/konq-plugins/sidebar/mediaplayer/mediaplayer.h index d37c432..ee1a299 100644 --- a/konq-plugins/sidebar/mediaplayer/mediaplayer.h +++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.h @@ -29,7 +29,7 @@ class KonqSidebar_MediaPlayer: public KonqSidebarPlugin Q_OBJECT public: - KonqSidebar_MediaPlayer(KInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); + KonqSidebar_MediaPlayer(TDEInstance *instance,TQObject *parent,TQWidget *widgetParent, TQString &desktopName_, const char* name=0); ~KonqSidebar_MediaPlayer(); virtual void *provides(const TQString &); void emitStatusBarText (const TQString &); |