summaryrefslogtreecommitdiffstats
path: root/kate/part/katefactory.h
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kate/part/katefactory.h
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kate/part/katefactory.h')
-rw-r--r--kate/part/katefactory.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/kate/part/katefactory.h b/kate/part/katefactory.h
index 0fd939ce3..79d3ac011 100644
--- a/kate/part/katefactory.h
+++ b/kate/part/katefactory.h
@@ -87,7 +87,7 @@ class KateFactory
* public accessor to the instance
* @return instance
*/
- inline KInstance *instance () { return &m_instance; };
+ inline TDEInstance *instance () { return &m_instance; };
/**
* register document at the factory
@@ -221,12 +221,12 @@ class KateFactory
/**
* about data (authors and more)
*/
- KAboutData m_aboutData;
+ TDEAboutData m_aboutData;
/**
* our kinstance
*/
- KInstance m_instance;
+ TDEInstance m_instance;
/**
* registered docs