From e4e0479220e9e9616b68b2a11e42cff7a8af7b3d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:17:06 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kioslave/home/kio_home.cpp | 4 ++-- kioslave/home/testhome.cpp | 4 ++-- kioslave/man/kio_man_test.cpp | 2 +- kioslave/media/kio_media.cpp | 4 ++-- kioslave/media/mounthelper/kio_media_mounthelper.cpp | 6 +++--- kioslave/media/mounthelper/kio_media_mounthelper.h | 2 +- kioslave/media/testmedia.cpp | 4 ++-- kioslave/remote/kio_remote.cpp | 4 ++-- kioslave/remote/testremote.cpp | 4 ++-- kioslave/system/kio_system.cpp | 4 ++-- kioslave/system/testsystem.cpp | 4 ++-- kioslave/thumbnail/thumbnail.cpp | 10 +++++----- kioslave/trash/kio_trash.cpp | 6 +++--- kioslave/trash/ktrash.cpp | 4 ++-- kioslave/trash/testtrash.cpp | 4 ++-- 15 files changed, 33 insertions(+), 33 deletions(-) (limited to 'kioslave') diff --git a/kioslave/home/kio_home.cpp b/kioslave/home/kio_home.cpp index eb9acd15a..3f307f6fd 100644 --- a/kioslave/home/kio_home.cpp +++ b/kioslave/home/kio_home.cpp @@ -40,11 +40,11 @@ static const KCmdLineOptions options[] = extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - // KApplication is necessary to use other ioslaves + // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); TDECmdLineArgs::init(argc, argv, "kio_home", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); diff --git a/kioslave/home/testhome.cpp b/kioslave/home/testhome.cpp index e35b443c7..66b2df126 100644 --- a/kioslave/home/testhome.cpp +++ b/kioslave/home/testhome.cpp @@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testhome", 0, 0, 0, 0); - KApplication app; + TDEApplication app; TestHome test; test.setup(); diff --git a/kioslave/man/kio_man_test.cpp b/kioslave/man/kio_man_test.cpp index 44623cb9f..03a7ee12e 100644 --- a/kioslave/man/kio_man_test.cpp +++ b/kioslave/man/kio_man_test.cpp @@ -27,7 +27,7 @@ protected: int main(int argc, char **argv) { - KApplication a( argc, argv , "p2"); + TDEApplication a( argc, argv , "p2"); MANProtocol testproto("/tmp/kiotest.in", "/tmp/kiotest.out"); testproto.showIndex("3"); diff --git a/kioslave/media/kio_media.cpp b/kioslave/media/kio_media.cpp index dc9542cd1..113d1b311 100644 --- a/kioslave/media/kio_media.cpp +++ b/kioslave/media/kio_media.cpp @@ -42,11 +42,11 @@ static const KCmdLineOptions options[] = extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - // KApplication is necessary to use other ioslaves + // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); TDECmdLineArgs::init(argc, argv, "kio_media", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.cpp b/kioslave/media/mounthelper/kio_media_mounthelper.cpp index 6289a85fc..23a207fab 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.cpp +++ b/kioslave/media/mounthelper/kio_media_mounthelper.cpp @@ -61,7 +61,7 @@ const Medium MountHelper::findMedium(const KURL &url) } } -MountHelper::MountHelper() : KApplication() +MountHelper::MountHelper() : TDEApplication() { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -269,10 +269,10 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); KGlobal::locale()->setMainCatalogue("kio_media"); - KApplication::addCmdLineOptions(); + TDEApplication::addCmdLineOptions(); if (TDECmdLineArgs::parsedArgs()->count()==0) TDECmdLineArgs::usage(); - KApplication *app = new MountHelper(); + TDEApplication *app = new MountHelper(); KStartupInfo::appStarted(); app->dcopClient()->attach(); diff --git a/kioslave/media/mounthelper/kio_media_mounthelper.h b/kioslave/media/mounthelper/kio_media_mounthelper.h index 4779c75ec..ffb5d1dba 100644 --- a/kioslave/media/mounthelper/kio_media_mounthelper.h +++ b/kioslave/media/mounthelper/kio_media_mounthelper.h @@ -30,7 +30,7 @@ class Dialog; -class MountHelper : public KApplication +class MountHelper : public TDEApplication { Q_OBJECT public: diff --git a/kioslave/media/testmedia.cpp b/kioslave/media/testmedia.cpp index 9bc8ac071..eb0871f6f 100644 --- a/kioslave/media/testmedia.cpp +++ b/kioslave/media/testmedia.cpp @@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testmedia", 0, 0, 0, 0); - KApplication app; + TDEApplication app; TestMedia test; test.setup(); diff --git a/kioslave/remote/kio_remote.cpp b/kioslave/remote/kio_remote.cpp index 985593bb0..f4b71086d 100644 --- a/kioslave/remote/kio_remote.cpp +++ b/kioslave/remote/kio_remote.cpp @@ -40,11 +40,11 @@ static const KCmdLineOptions options[] = extern "C" { int KDE_EXPORT kdemain( int argc, char **argv ) { - // KApplication is necessary to use other ioslaves + // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); TDECmdLineArgs::init(argc, argv, "kio_remote", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); diff --git a/kioslave/remote/testremote.cpp b/kioslave/remote/testremote.cpp index f493da2f4..d091c5bc4 100644 --- a/kioslave/remote/testremote.cpp +++ b/kioslave/remote/testremote.cpp @@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testremote", 0, 0, 0, 0); - KApplication app; + TDEApplication app; TestRemote test; test.setup(); diff --git a/kioslave/system/kio_system.cpp b/kioslave/system/kio_system.cpp index c9815ff7b..c64706d8d 100644 --- a/kioslave/system/kio_system.cpp +++ b/kioslave/system/kio_system.cpp @@ -41,11 +41,11 @@ static const KCmdLineOptions options[] = extern "C" { KDE_EXPORT int kdemain( int argc, char **argv ) { - // KApplication is necessary to use other ioslaves + // TDEApplication is necessary to use other ioslaves putenv(strdup("SESSION_MANAGER=")); TDECmdLineArgs::init(argc, argv, "kio_system", 0, 0, 0, 0); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); // We want to be anonymous even if we use DCOP app.dcopClient()->attach(); diff --git a/kioslave/system/testsystem.cpp b/kioslave/system/testsystem.cpp index c3cc84c6e..7be993ff8 100644 --- a/kioslave/system/testsystem.cpp +++ b/kioslave/system/testsystem.cpp @@ -46,9 +46,9 @@ static bool check(const TQString& txt, TQString a, TQString b) int main(int argc, char *argv[]) { - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); TDECmdLineArgs::init(argc,argv,"testsystem", 0, 0, 0, 0); - KApplication app; + TDEApplication app; TestSystem test; test.setup(); diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp index 6e81b61d3..b73528610 100644 --- a/kioslave/thumbnail/thumbnail.cpp +++ b/kioslave/thumbnail/thumbnail.cpp @@ -53,7 +53,7 @@ #include "thumbnail.h" #include -// Use correctly KInstance instead of KApplication (but then no TQPixmap) +// Use correctly KInstance instead of TDEApplication (but then no TQPixmap) #undef USE_KINSTANCE // Fix thumbnail: protocol #define THUMBNAIL_HACK (1) @@ -98,16 +98,16 @@ int kdemain(int argc, char **argv) #ifdef USE_KINSTANCE KInstance instance("kio_thumbnail"); #else - // creating KApplication in a slave in not a very good idea, + // creating TDEApplication in a slave in not a very good idea, // as dispatchLoop() doesn't allow it to process its messages, // so it for example wouldn't reply to ksmserver - on the other // hand, this slave uses QPixmaps for some reason, and they // need QApplication - // and HTML previews need even KApplication :( + // and HTML previews need even TDEApplication :( putenv(strdup("SESSION_MANAGER=")); - KApplication::disableAutoDcopRegistration(); + TDEApplication::disableAutoDcopRegistration(); - KApplication app(argc, argv, "kio_thumbnail", false, true); + TDEApplication app(argc, argv, "kio_thumbnail", false, true); #endif if (argc != 4) 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(); -- cgit v1.2.1