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 /ksplashml/main.cpp | |
parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/main.cpp')
-rw-r--r-- | ksplashml/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index daa07bd1a..e4f28855f 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -55,11 +55,11 @@ int main( int argc, char **argv ) TDECmdLineArgs *arg = TDECmdLineArgs::parsedArgs(); if ( !( arg->isSet( "dcop" ) ) ) - KApplication::disableAutoDcopRegistration(); - else if ( KApplication::dcopClient()->attach() ) - KApplication::dcopClient()->registerAs( "ksplash", false ); + TDEApplication::disableAutoDcopRegistration(); + else if ( TDEApplication::dcopClient()->attach() ) + TDEApplication::dcopClient()->registerAs( "ksplash", false ); - KApplication app; + TDEApplication app; KSplash wndMain("ksplash"); if ( arg->isSet( "steps" ) ) |