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/tdefontinst/kcmfontinst/KCmFontInst.cpp | 4 ++-- kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp | 6 +++--- kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp | 2 +- kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kcontrol/tdefontinst/kcmfontinst') diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index fb2c07163..9f939324a 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include "Misc.h" #include "KFileFontIconView.h" @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 55143369f..e393e238b 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp @@ -40,10 +40,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include diff --git a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp index afd9fa204..7e64e059d 100644 --- a/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/PrintDialog.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include namespace KFI { diff --git a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp index e555dc7fd..4840b7219 100644 --- a/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/SettingsDialog.cpp @@ -33,9 +33,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include -- cgit v1.2.1