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 /tdeinit | |
| parent | d41050ea3f6904e5156d35f664346b816b9e4d12 (diff) | |
| download | tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.tar.gz tdebase-e4e0479220e9e9616b68b2a11e42cff7a8af7b3d.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdeinit')
| -rw-r--r-- | tdeinit/displayconfig.cpp | 4 | ||||
| -rw-r--r-- | tdeinit/phase1.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index b09608afb..9f0086ef5 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -57,8 +57,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication::disableAutoDcopRegistration(); - KApplication app; + TDEApplication::disableAutoDcopRegistration(); + TDEApplication app; #ifdef WITH_XRANDR // Load up user specific display settings diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 7eb8add78..6b4479c6c 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -53,8 +53,8 @@ int main(int argc, char **argv) TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); - KApplication::disableAutoDcopRegistration(); - KApplication app; + TDEApplication::disableAutoDcopRegistration(); + TDEApplication app; KConfig config("twinrc", true); config.setGroup( "ThirdPartyWM" ); |