summaryrefslogtreecommitdiffstats
path: root/tdecore/klibloader.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2013-03-02 15:57:34 -0600
commit7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f (patch)
treec76702a7f6310fbe9d437e347535422e836e94e9 /tdecore/klibloader.cpp
parenta2a38be7600e2a2c2b49c66902d912ca036a2c0f (diff)
parent27bbee9a5f9dcda53d8eb23863ee670ad1360e41 (diff)
downloadtdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.tar.gz
tdelibs-7c0b0c9dc9fcbe9c198925bdc7ee18ac6be49f4f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/klibloader.cpp')
-rw-r--r--tdecore/klibloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index 2c75989d3..aed2c06af 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -25,11 +25,11 @@
#include <tqtimer.h>
#include <tqobjectdict.h>
-#include "kapplication.h"
+#include "tdeapplication.h"
#include "klibloader.h"
#include "kstandarddirs.h"
#include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "ltdl.h"
@@ -346,7 +346,7 @@ static inline TQCString makeLibName( const char* name )
}
//static
-TQString KLibLoader::findLibrary( const char * name, const KInstance * instance )
+TQString KLibLoader::findLibrary( const char * name, const TDEInstance * instance )
{
TQCString libname = makeLibName( name );