From a5430e4b98efd05937bd3bfe78c56eb826f145fa Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:19:22 -0600 Subject: Rename many classes and header files to avoid conflicts with KDE4 --- kcontrol/icons/iconthemes.cpp | 2 +- kcontrol/icons/iconthemes.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kcontrol/icons') diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 802f1759d..cb0d23508 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -35,7 +35,7 @@ #undef Unsorted #include -#include +#include #include #include #include diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h index fde163127..ccb914846 100644 --- a/kcontrol/icons/iconthemes.h +++ b/kcontrol/icons/iconthemes.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include class TQPushButton; class DeviceManager; -- cgit v1.2.3