summaryrefslogtreecommitdiffstats
path: root/kioslave/file
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:20:05 -0600
commitb19ddece21e102b8e4b292037ca7578f60b128fe (patch)
tree6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kioslave/file
parente729c6d549f12e27b358a1dad04ff254c033ac71 (diff)
downloadtdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz
tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/file')
-rw-r--r--kioslave/file/file.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/file/file.cc b/kioslave/file/file.cc
index 2deeb3535..4e3865837 100644
--- a/kioslave/file/file.cc
+++ b/kioslave/file/file.cc
@@ -113,7 +113,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); }
int kdemain( int argc, char **argv )
{
KLocale::setMainCatalogue("tdelibs");
- KInstance instance( "kio_file" );
+ TDEInstance instance( "kio_file" );
( void ) KGlobal::locale();
kdDebug(7101) << "Starting " << getpid() << endl;