diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kdesktop/main.cc | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/main.cc')
| -rw-r--r-- | kdesktop/main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/main.cc b/kdesktop/main.cc index a12f241b8..17fc4addf 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -112,7 +112,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) signal(SIGHUP, signalHandler); { - if (KGlobalSettings::isMultiHead()) + if (TDEGlobalSettings::isMultiHead()) { Display *dpy = XOpenDisplay(NULL); if (! dpy) { @@ -156,7 +156,7 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv ) } } - KGlobal::locale()->setMainCatalogue("kdesktop"); + TDEGlobal::locale()->setMainCatalogue("kdesktop"); if (kdesktop_screen_number == 0) { kdesktop_name = "kdesktop"; |