diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:50 -0600 |
commit | 3a044decb0a5d7be822c888b2d5374573d7df96e (patch) | |
tree | ddf4681e0233c25203fc927596aa7b3bdb5f2efa /languages/cpp/app_templates/konqnavpanel | |
parent | 5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff) | |
download | tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'languages/cpp/app_templates/konqnavpanel')
-rw-r--r-- | languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp | 4 | ||||
-rw-r--r-- | languages/cpp/app_templates/konqnavpanel/konqnavpanel.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp index ae9a85a6..48876c9a 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.cpp @@ -7,7 +7,7 @@ #include "%{APPNAMELC}.h" #include "%{APPNAMELC}.moc" -%{APPNAME}::%{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): +%{APPNAME}::%{APPNAME}(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name): KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name) { widget=new TQLabel("Init Value",widgetParent); @@ -27,7 +27,7 @@ void %{APPNAME}::handleURL(const KURL &url) extern "C" { - void* create_konqsidebar_%{APPNAME}(KInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) + void* create_konqsidebar_%{APPNAME}(TDEInstance *instance,TQObject *par,TQWidget *widp,TQString &desktopname,const char *name) { return new %{APPNAME}(instance,par,widp,desktopname,name); } diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h index a2a8082d..c54c096a 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.h @@ -26,7 +26,7 @@ public: * @param desktopName The filename of the configuration file. * @param name A TQt object name for your plugin. **/ - %{APPNAME}(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); + %{APPNAME}(TDEInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0); /** destructor */ ~%{APPNAME}(); |