diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:17:06 -0600 |
commit | e4e0479220e9e9616b68b2a11e42cff7a8af7b3d (patch) | |
tree | 8e01571cdd132dad34ebec38b12c2dbc37d05bd9 /kioslave/system | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/system')
-rw-r--r-- | kioslave/system/kio_system.cpp | 4 | ||||
-rw-r--r-- | kioslave/system/testsystem.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
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(); |