From e493dc35b1201462610750e281e3e770658caca9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:10:54 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- src/ldapcontroller.cpp | 2 +- src/ldapcontroller.h | 2 +- src/primaryrealmwizard/primaryrealmwizard.cpp | 2 +- src/secondaryrealmwizard/secondaryrealmwizard.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index ddde195..a58fe5e 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ldapcontroller.h b/src/ldapcontroller.h index ff49296..827c854 100644 --- a/src/ldapcontroller.h +++ b/src/ldapcontroller.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp index 8cf4345..7b28f90 100644 --- a/src/primaryrealmwizard/primaryrealmwizard.cpp +++ b/src/primaryrealmwizard/primaryrealmwizard.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/secondaryrealmwizard/secondaryrealmwizard.cpp b/src/secondaryrealmwizard/secondaryrealmwizard.cpp index 5c0c1aa..5b40899 100644 --- a/src/secondaryrealmwizard/secondaryrealmwizard.cpp +++ b/src/secondaryrealmwizard/secondaryrealmwizard.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include