From a4318d1113643d5dea2952cf1b34dfd9febda97f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:45:40 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- src/ldapcontroller.cpp | 8 ++++---- src/ldapcontroller.h | 2 +- src/primaryrealmwizard/certconfigpage.cpp | 2 +- src/primaryrealmwizard/primaryrealmwizard.cpp | 8 ++++---- src/primaryrealmwizard/realmconfigpage.cpp | 2 +- src/primaryrealmwizard/realmfinishpage.cpp | 2 +- src/primaryrealmwizard/realmintropage.cpp | 2 +- src/processingdialog.cpp | 2 +- src/secondaryrealmwizard/certconfigpage.cpp | 2 +- src/secondaryrealmwizard/realmconfigpage.cpp | 2 +- src/secondaryrealmwizard/realmfinishpage.cpp | 2 +- src/secondaryrealmwizard/realmintropage.cpp | 2 +- src/secondaryrealmwizard/secondaryrealmwizard.cpp | 8 ++++---- 13 files changed, 22 insertions(+), 22 deletions(-) (limited to 'src') diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index a58fe5e..315afef 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -25,11 +25,11 @@ #include -#include -#include +#include +#include #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ldapcontroller.h b/src/ldapcontroller.h index 31eee4d..c52caad 100644 --- a/src/ldapcontroller.h +++ b/src/ldapcontroller.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/certconfigpage.cpp b/src/primaryrealmwizard/certconfigpage.cpp index 224ccad..c9c3a8e 100644 --- a/src/primaryrealmwizard/certconfigpage.cpp +++ b/src/primaryrealmwizard/certconfigpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp index 2fd69a7..bfd96cd 100644 --- a/src/primaryrealmwizard/primaryrealmwizard.cpp +++ b/src/primaryrealmwizard/primaryrealmwizard.cpp @@ -32,14 +32,14 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/realmconfigpage.cpp b/src/primaryrealmwizard/realmconfigpage.cpp index 62caa25..39a91b3 100644 --- a/src/primaryrealmwizard/realmconfigpage.cpp +++ b/src/primaryrealmwizard/realmconfigpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/realmfinishpage.cpp b/src/primaryrealmwizard/realmfinishpage.cpp index 140197c..3c74ca1 100644 --- a/src/primaryrealmwizard/realmfinishpage.cpp +++ b/src/primaryrealmwizard/realmfinishpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/realmintropage.cpp b/src/primaryrealmwizard/realmintropage.cpp index 501c261..422c6e7 100644 --- a/src/primaryrealmwizard/realmintropage.cpp +++ b/src/primaryrealmwizard/realmintropage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/processingdialog.cpp b/src/processingdialog.cpp index bcf230a..8afe40a 100644 --- a/src/processingdialog.cpp +++ b/src/processingdialog.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/secondaryrealmwizard/certconfigpage.cpp b/src/secondaryrealmwizard/certconfigpage.cpp index 60070a1..d93cfc7 100644 --- a/src/secondaryrealmwizard/certconfigpage.cpp +++ b/src/secondaryrealmwizard/certconfigpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/secondaryrealmwizard/realmconfigpage.cpp b/src/secondaryrealmwizard/realmconfigpage.cpp index 9f06dea..3deac8b 100644 --- a/src/secondaryrealmwizard/realmconfigpage.cpp +++ b/src/secondaryrealmwizard/realmconfigpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/secondaryrealmwizard/realmfinishpage.cpp b/src/secondaryrealmwizard/realmfinishpage.cpp index fbef103..d251d6f 100644 --- a/src/secondaryrealmwizard/realmfinishpage.cpp +++ b/src/secondaryrealmwizard/realmfinishpage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/secondaryrealmwizard/realmintropage.cpp b/src/secondaryrealmwizard/realmintropage.cpp index b687e95..7c3d12f 100644 --- a/src/secondaryrealmwizard/realmintropage.cpp +++ b/src/secondaryrealmwizard/realmintropage.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/secondaryrealmwizard/secondaryrealmwizard.cpp b/src/secondaryrealmwizard/secondaryrealmwizard.cpp index c7d3fcb..99d0dda 100644 --- a/src/secondaryrealmwizard/secondaryrealmwizard.cpp +++ b/src/secondaryrealmwizard/secondaryrealmwizard.cpp @@ -32,14 +32,14 @@ #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include -#include +#include #include #include #include -- cgit v1.2.3