From 57b3f979afe5dde48418b92a6c8e8e7ce6a2432f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:59:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- plugin/smb4k_konqplugin.cpp | 4 ++-- plugin/smb4k_konqplugin.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugin') diff --git a/plugin/smb4k_konqplugin.cpp b/plugin/smb4k_konqplugin.cpp index 21f9d8d..07e6af2 100644 --- a/plugin/smb4k_konqplugin.cpp +++ b/plugin/smb4k_konqplugin.cpp @@ -59,7 +59,7 @@ smb4kWidget::smb4kWidget( TQWidget * parent, const char * name, WFlags f ) // Nothing exciting to do ! } -KonqSidebar_Smb4K::KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +KonqSidebar_Smb4K::KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { @@ -106,7 +106,7 @@ KonqSidebar_Smb4K::~KonqSidebar_Smb4K() extern "C" { - void* create_konqsidebar_smb4k(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_smb4k(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { KGlobal::locale()->insertCatalogue("smb4k"); return new KonqSidebar_Smb4K(instance,par,widp,desktopname,name); diff --git a/plugin/smb4k_konqplugin.h b/plugin/smb4k_konqplugin.h index e15bde1..8e49512 100644 --- a/plugin/smb4k_konqplugin.h +++ b/plugin/smb4k_konqplugin.h @@ -65,7 +65,7 @@ public: * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - KonqSidebar_Smb4K(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + KonqSidebar_Smb4K(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~KonqSidebar_Smb4K(); -- cgit v1.2.1