diff options
author | Timothy Pearson <[email protected]> | 2013-02-15 21:58:20 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-02-15 21:58:20 -0600 |
commit | 6915c95d7c4a42d19ebbec3c87c1e308b20ec272 (patch) | |
tree | 027fb6e879e17c2d65cbea9eab5c9da028618972 /kscd/docking.cpp | |
parent | 9d63b7d4600a5822f26793062dd2eca819bcfb1d (diff) | |
download | tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.tar.gz tdemultimedia-6915c95d7c4a42d19ebbec3c87c1e308b20ec272.zip |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kscd/docking.cpp')
-rw-r--r-- | kscd/docking.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kscd/docking.cpp b/kscd/docking.cpp index 830e92ca..8d6cb859 100644 --- a/kscd/docking.cpp +++ b/kscd/docking.cpp @@ -30,8 +30,8 @@ #include <tdeaboutdata.h> #include <tdeactioncollection.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kpassivepopup.h> |