From a5d36de72a70fe5f06faaeccfeb4539f35f51d8b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:10:52 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- src/bondwizard.cpp | 2 +- src/ldapbonding.cpp | 2 +- src/ldapbonding.h | 2 +- src/ldappasswddlg.cpp | 2 +- src/realmpropertiesdialog.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bondwizard.cpp b/src/bondwizard.cpp index c869447..3cf97b1 100644 --- a/src/bondwizard.cpp +++ b/src/bondwizard.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp index fc94f46..14bed6d 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ldapbonding.h b/src/ldapbonding.h index ff227ae..787cf07 100644 --- a/src/ldapbonding.h +++ b/src/ldapbonding.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ldappasswddlg.cpp b/src/ldappasswddlg.cpp index 03d4dcd..f018957 100644 --- a/src/ldappasswddlg.cpp +++ b/src/ldappasswddlg.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/realmpropertiesdialog.cpp b/src/realmpropertiesdialog.cpp index eaf09e2..c57cc4f 100644 --- a/src/realmpropertiesdialog.cpp +++ b/src/realmpropertiesdialog.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include