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/kpartplugin | |
| 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/kpartplugin')
| -rw-r--r-- | languages/cpp/app_templates/kpartplugin/plugin_app.cpp | 6 | ||||
| -rw-r--r-- | languages/cpp/app_templates/kpartplugin/plugin_app.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index 61e3ca0e..1812b5e2 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -88,10 +88,10 @@ TQObject* %{APPNAME}Factory::createObject( TQObject* parent, const char* name, c return new Plugin%{APPNAME}( parent, name ); } -KInstance *%{APPNAME}Factory::instance() +TDEInstance *%{APPNAME}Factory::instance() { if ( !s_instance ) - s_instance = new KInstance( "%{APPNAMELC}" ); + s_instance = new TDEInstance( "%{APPNAMELC}" ); return s_instance; } @@ -104,6 +104,6 @@ extern "C" } } -KInstance* %{APPNAME}Factory::s_instance = 0L; +TDEInstance* %{APPNAME}Factory::s_instance = 0L; #include "plugin_%{APPNAMELC}.moc" diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.h b/languages/cpp/app_templates/kpartplugin/plugin_app.h index 8423f56e..132ce724 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.h +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.h @@ -27,10 +27,10 @@ public: virtual TQObject* createObject( TQObject* parent = 0, const char* pname = 0, const char* name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList() ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; + static TDEInstance* s_instance; }; #endif // _PLUGIN_%{APPNAMEUC}_H_ |