From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- tdecore/kstandarddirs.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tdecore/kstandarddirs.cpp') 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 -- cgit v1.2.1