summaryrefslogtreecommitdiffstats
path: root/libk3b/plugin/k3bpluginfactory.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:35 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 19:51:35 -0600
commit267706e1270bedd77c0e36d8925ecba303d8725d (patch)
treeb7b5409e3c1eea4e95108d14d8a83620122f2260 /libk3b/plugin/k3bpluginfactory.h
parent9cc3e244ea10df42f7270494bd4662aa0f911378 (diff)
downloadk3b-267706e1270bedd77c0e36d8925ecba303d8725d.tar.gz
k3b-267706e1270bedd77c0e36d8925ecba303d8725d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/plugin/k3bpluginfactory.h')
-rw-r--r--libk3b/plugin/k3bpluginfactory.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libk3b/plugin/k3bpluginfactory.h b/libk3b/plugin/k3bpluginfactory.h
index 7892dfa..6e4da16 100644
--- a/libk3b/plugin/k3bpluginfactory.h
+++ b/libk3b/plugin/k3bpluginfactory.h
@@ -49,7 +49,7 @@ class K3bPluginFactory : public KLibFactory
s_self = 0;
}
- static KInstance* instance();
+ static TDEInstance* instance();
protected:
virtual void setupTranslations( void ) {
@@ -74,13 +74,13 @@ class K3bPluginFactory : public KLibFactory
TQCString m_instanceName;
bool m_catalogueInitialized;
- static KInstance* s_instance;
+ static TDEInstance* s_instance;
static K3bPluginFactory<T> *s_self;
};
template <class T>
-KInstance* K3bPluginFactory<T>::s_instance = 0;
+TDEInstance* K3bPluginFactory<T>::s_instance = 0;
template <class T>
@@ -88,10 +88,10 @@ K3bPluginFactory<T>* K3bPluginFactory<T>::s_self = 0;
template <class T>
-KInstance* K3bPluginFactory<T>::instance()
+TDEInstance* K3bPluginFactory<T>::instance()
{
if( !s_instance && s_self )
- s_instance = new KInstance( s_self->m_instanceName );
+ s_instance = new TDEInstance( s_self->m_instanceName );
return s_instance;
}