diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:59:38 -0600 |
| commit | cfb328d59024a251690b6e47c9f8d343fd8c241c (patch) | |
| tree | 7c11070cd07e5e023a26ddcfa41832c208c63732 /karm/tray.cpp | |
| parent | 38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff) | |
| download | tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'karm/tray.cpp')
| -rw-r--r-- | karm/tray.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/karm/tray.cpp b/karm/tray.cpp index 06d08af26..5187c7e49 100644 --- a/karm/tray.cpp +++ b/karm/tray.cpp @@ -17,10 +17,10 @@ #include <tqtooltip.h> #include <tdeaction.h> // actionPreferences() -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> // UserIcon -#include <klocale.h> // i18n +#include <tdelocale.h> // i18n #include <tdepopupmenu.h> // plug() #include <ksystemtray.h> |