diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /tdecore/kmimesourcefactory.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kmimesourcefactory.cpp')
| -rw-r--r-- | tdecore/kmimesourcefactory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/kmimesourcefactory.cpp b/tdecore/kmimesourcefactory.cpp index 37745d398..ed4265835 100644 --- a/tdecore/kmimesourcefactory.cpp +++ b/tdecore/kmimesourcefactory.cpp @@ -41,7 +41,7 @@ public: } KIconLoader *m_iconLoader; - KInstance *m_instance; + TDEInstance *m_instance; }; KMimeSourceFactory::KMimeSourceFactory (KIconLoader* loader) @@ -96,7 +96,7 @@ TQString KMimeSourceFactory::makeAbsolute (const TQString& absOrRelName, const T return result; } -void KMimeSourceFactory::setInstance(KInstance *instance) +void KMimeSourceFactory::setInstance(TDEInstance *instance) { d->m_instance = instance; } |