diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:15:55 -0600 |
commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kioslave/tar | |
parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/tar')
-rw-r--r-- | kioslave/tar/ktartest.cpp | 2 | ||||
-rw-r--r-- | kioslave/tar/tar.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/tar/ktartest.cpp b/kioslave/tar/ktartest.cpp index bfbb216d4..efb1e42fe 100644 --- a/kioslave/tar/ktartest.cpp +++ b/kioslave/tar/ktartest.cpp @@ -35,7 +35,7 @@ int main( int argc, char** argv ) usage(); return 1; } - KInstance instance("ktartest"); + TDEInstance instance("ktartest"); TQString command = argv[1]; kdDebug() << "main: command=" << command << endl; diff --git a/kioslave/tar/tar.cc b/kioslave/tar/tar.cc index 2c3de0215..9af5062ab 100644 --- a/kioslave/tar/tar.cc +++ b/kioslave/tar/tar.cc @@ -32,7 +32,7 @@ extern "C" { int KDE_EXPORT kdemain(int argc, char **argv); } int kdemain( int argc, char **argv ) { - KInstance instance( "kio_tar" ); + TDEInstance instance( "kio_tar" ); kdDebug(7109) << "Starting " << getpid() << endl; |