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/trash | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/trash')
| -rw-r--r-- | kioslave/trash/kio_trash.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp index edd0c372e..8b033abd4 100644 --- a/kioslave/trash/kio_trash.cpp +++ b/kioslave/trash/kio_trash.cpp @@ -52,7 +52,7 @@ static const KCmdLineOptions options[] = extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - //KInstance instance( "kio_trash" ); + //TDEInstance instance( "kio_trash" ); // TDEApplication is necessary to use kio_file putenv(strdup("SESSION_MANAGER=")); TDEApplication::disableAutoDcopRegistration(); |