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/kstandarddirs.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/kstandarddirs.cpp')
| -rw-r--r-- | tdecore/kstandarddirs.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/kstandarddirs.cpp b/tdecore/kstandarddirs.cpp index a7cdd3659..1f948653e 100644 --- a/tdecore/kstandarddirs.cpp +++ b/tdecore/kstandarddirs.cpp @@ -1687,19 +1687,19 @@ TQString KStandardDirs::localxdgconfdir() const // just to make code more readable without macros TQString locate( const char *type, - const TQString& filename, const KInstance* inst ) + const TQString& filename, const TDEInstance* inst ) { return inst->dirs()->findResource(type, filename); } TQString locateLocal( const char *type, - const TQString& filename, const KInstance* inst ) + const TQString& filename, const TDEInstance* inst ) { return locateLocal(type, filename, true, inst); } TQString locateLocal( const char *type, - const TQString& filename, bool createDir, const KInstance* inst ) + const TQString& filename, bool createDir, const TDEInstance* inst ) { // try to find slashes. If there are some, we have to // create the subdir first |