diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kdesktop/main.cc | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdesktop/main.cc')
| -rw-r--r-- | kdesktop/main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kdesktop/main.cc b/kdesktop/main.cc index 93b8d42c7..0cff73420 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -19,15 +19,15 @@ #include <config.h> #include <kuniqueapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <dcopclient.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kopenwith.h> #include <kcrash.h> #include <kdebug.h> -#include <kglobalsettings.h> -#include <kglobal.h> +#include <tdeglobalsettings.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <kmanagerselection.h> |