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 /twin/useractions.cpp | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'twin/useractions.cpp')
| -rw-r--r-- | twin/useractions.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/twin/useractions.cpp b/twin/useractions.cpp index 292da2b99..e78652918 100644 --- a/twin/useractions.cpp +++ b/twin/useractions.cpp @@ -22,9 +22,9 @@ License. See the file "COPYING" for the exact licensing terms. #include <tqslider.h> #include <tqtooltip.h> #include <tqpopupmenu.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kglobalaccel.h> #include <tdeapplication.h> |