diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kdesktop/kdiconview.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/kdiconview.cc')
| -rw-r--r-- | kdesktop/kdiconview.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 68897eb94..e00fbada2 100644 --- a/kdesktop/kdiconview.cc +++ b/kdesktop/kdiconview.cc @@ -29,9 +29,9 @@ #include <kdebug.h> #include <kdesktopfile.h> #include <kdirlister.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kpropertiesdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <konqbookmarkmanager.h> #include <konq_defaults.h> #include <konq_drag.h> |