From 609724b5d29f25236bee59d0cb794602d391a96b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:13:30 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- konq-plugins/sidebar/metabar/src/metabar.cpp | 4 ++-- konq-plugins/sidebar/metabar/src/metabar.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'konq-plugins/sidebar/metabar/src') diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp index 0a7528f..9839fd0 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.cpp +++ b/konq-plugins/sidebar/metabar/src/metabar.cpp @@ -7,7 +7,7 @@ #include "metabar.h" #include "metabar.moc" -Metabar::Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +Metabar::Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { KImageIO::registerFormats(); @@ -52,7 +52,7 @@ extern "C" { extern "C" { - void* create_konqsidebar_metabar(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_metabar(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new Metabar(instance,par,widp,desktopname,name); } diff --git a/konq-plugins/sidebar/metabar/src/metabar.h b/konq-plugins/sidebar/metabar/src/metabar.h index aed2e69..29c8efa 100644 --- a/konq-plugins/sidebar/metabar/src/metabar.h +++ b/konq-plugins/sidebar/metabar/src/metabar.h @@ -16,7 +16,7 @@ class Metabar : public KonqSidebarPlugin public: - Metabar(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + Metabar(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); ~Metabar(); virtual TQWidget *getWidget(){ return widget; } -- cgit v1.2.1