summaryrefslogtreecommitdiffstats
path: root/kioslave/trash
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:17:06 -0600
commite4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch)
tree8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kioslave/trash
parentd41050ea3f6904e5156d35f664346b816b9e4d12 (diff)
downloadtdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz
tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/trash')
-rw-r--r--kioslave/trash/kio_trash.cpp6
-rw-r--r--kioslave/trash/ktrash.cpp4
-rw-r--r--kioslave/trash/testtrash.cpp4
3 files changed, 7 insertions, 7 deletions
diff --git a/kioslave/trash/kio_trash.cpp b/kioslave/trash/kio_trash.cpp
index e8bd00792..edd0c372e 100644
--- a/kioslave/trash/kio_trash.cpp
+++ b/kioslave/trash/kio_trash.cpp
@@ -53,12 +53,12 @@ extern "C" {
int KDE_EXPORT kdemain( int argc, char **argv )
{
//KInstance instance( "kio_trash" );
- // KApplication is necessary to use kio_file
+ // TDEApplication is necessary to use kio_file
putenv(strdup("SESSION_MANAGER="));
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc, argv, "kio_trash", 0, 0, 0, 0);
TDECmdLineArgs::addCmdLineOptions( options );
- KApplication app( false, false );
+ TDEApplication app( false, false );
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TrashProtocol slave( args->arg(0), args->arg(1), args->arg(2) );
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" ) ) {
diff --git a/kioslave/trash/testtrash.cpp b/kioslave/trash/testtrash.cpp
index 4819d8d55..d1efdf2cd 100644
--- a/kioslave/trash/testtrash.cpp
+++ b/kioslave/trash/testtrash.cpp
@@ -82,9 +82,9 @@ int main(int argc, char *argv[])
setenv( "XDG_DATA_HOME", TQFile::encodeName( TQDir::homeDirPath() + "/.local-testtrash" ), true );
setenv( "TDE_FORK_SLAVES", "yes", true );
- KApplication::disableAutoDcopRegistration();
+ TDEApplication::disableAutoDcopRegistration();
TDECmdLineArgs::init(argc,argv,"testtrash", 0, 0, 0, 0);
- KApplication app;
+ TDEApplication app;
TestTrash test;
test.setup();