From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:55:37 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kcontrol/kthememanager/knewthemedlg.cpp | 2 +- kcontrol/kthememanager/ktheme.cpp | 4 ++-- kcontrol/kthememanager/kthememanager.cpp | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'kcontrol/kthememanager') diff --git a/kcontrol/kthememanager/knewthemedlg.cpp b/kcontrol/kthememanager/knewthemedlg.cpp index 8ba59b680..ee18c31c7 100644 --- a/kcontrol/kthememanager/knewthemedlg.cpp +++ b/kcontrol/kthememanager/knewthemedlg.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include KNewThemeDlg::KNewThemeDlg( TQWidget * parent, const char * name ) : KDialogBase(parent, name, true, i18n("New Theme"), Ok|Cancel, Ok) diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 87d17806c..974ad88b6 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/kcontrol/kthememanager/ktheme.cpp @@ -31,12 +31,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index bcd73f186..aa04d8e56 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -27,13 +27,13 @@ #include #include #include -#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include -- cgit v1.2.1