diff options
author | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kioslave/trash/ktrash.cpp | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/trash/ktrash.cpp')
-rw-r--r-- | kioslave/trash/ktrash.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kioslave/trash/ktrash.cpp b/kioslave/trash/ktrash.cpp index 41980b060..630b8e314 100644 --- a/kioslave/trash/ktrash.cpp +++ b/kioslave/trash/ktrash.cpp @@ -37,14 +37,14 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init( argc, argv, "ktrash", I18N_NOOP( "ktrash" ), I18N_NOOP( "Helper program to handle the TDE trash can\n" "Note: to move files to the trash, do not use ktrash, but \"kfmclient move 'url' trash:/\"" ), TDE_VERSION_STRING ); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app; + TDEApplication app; TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); if ( args->isSet( "empty" ) ) { |