diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:20:05 -0600 |
| commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
| tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kutils/kcmoduleproxy.cpp | |
| parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
| download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kutils/kcmoduleproxy.cpp')
| -rw-r--r-- | kutils/kcmoduleproxy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kutils/kcmoduleproxy.cpp b/kutils/kcmoduleproxy.cpp index 2323cd262..3528ae738 100644 --- a/kutils/kcmoduleproxy.cpp +++ b/kutils/kcmoduleproxy.cpp @@ -586,12 +586,12 @@ TQString KCModuleProxy::quickHelp() const } } -const KAboutData * KCModuleProxy::aboutData() const +const TDEAboutData * KCModuleProxy::aboutData() const { if( !d->rootMode ) return realModule() ? realModule()->aboutData() : 0; else - /* This needs fixing, perhaps cache a KAboutData copy + /* This needs fixing, perhaps cache a TDEAboutData copy * while in root mode? */ return 0; @@ -614,7 +614,7 @@ bool KCModuleProxy::useRootOnlyMsg() const return realModule() ? realModule()->useRootOnlyMsg() : true; } -KInstance * KCModuleProxy::instance() const +TDEInstance * KCModuleProxy::instance() const { return realModule() ? realModule()->instance() : 0; } |