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 /kioslave/ftp | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/ftp')
-rw-r--r-- | kioslave/ftp/ftp.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/ftp/ftp.cc b/kioslave/ftp/ftp.cc index 5f0f993bc..00fe94b2e 100644 --- a/kioslave/ftp/ftp.cc +++ b/kioslave/ftp/ftp.cc @@ -140,7 +140,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { KLocale::setMainCatalogue("tdelibs"); - KInstance instance( "kio_ftp" ); + TDEInstance instance( "kio_ftp" ); ( void ) KGlobal::locale(); kdDebug(7102) << "Starting " << getpid() << endl; |