diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:45:38 -0600 |
| commit | 1e6dfca77736af9ac5e1f5ada6660cd077cd20b6 (patch) | |
| tree | d8116cf5489bc350755fae982805bdf2560b0228 | |
| parent | aec9b2b6276cf94ee9965a8b4cbb4f95626c634a (diff) | |
| download | kcmldap-1e6dfca7.tar.gz kcmldap-1e6dfca7.zip | |
Rename additional header files to avoid conflicts with KDE4
| -rw-r--r-- | src/bondfinishpage.cpp | 2 | ||||
| -rw-r--r-- | src/bondintropage.cpp | 2 | ||||
| -rw-r--r-- | src/bondrealmpage.cpp | 2 | ||||
| -rw-r--r-- | src/bondwizard.cpp | 8 | ||||
| -rw-r--r-- | src/ldapbonding.cpp | 8 | ||||
| -rw-r--r-- | src/ldapbonding.h | 2 | ||||
| -rw-r--r-- | src/ldappasswddlg.cpp | 2 | ||||
| -rw-r--r-- | src/realmpropertiesdialog.cpp | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/src/bondfinishpage.cpp b/src/bondfinishpage.cpp index e0a0969..697b2d5 100644 --- a/src/bondfinishpage.cpp +++ b/src/bondfinishpage.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/bondintropage.cpp b/src/bondintropage.cpp index 79214ba..e76fb1b 100644 --- a/src/bondintropage.cpp +++ b/src/bondintropage.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/bondrealmpage.cpp b/src/bondrealmpage.cpp index 758d222..fd56209 100644 --- a/src/bondrealmpage.cpp +++ b/src/bondrealmpage.cpp @@ -25,7 +25,7 @@ #include <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/bondwizard.cpp b/src/bondwizard.cpp index 2732697..a71fdaa 100644 --- a/src/bondwizard.cpp +++ b/src/bondwizard.cpp @@ -30,14 +30,14 @@ #include <tqspinbox.h> #include <ksimpleconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdelistview.h> #include <krun.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <knuminput.h> #include <klineedit.h> diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp index 14bed6d..e7ce4ab 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.cpp @@ -20,12 +20,12 @@ #include <tqlayout.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kcombobox.h> #include <tdeparts/genericfactory.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kstandarddirs.h> #include <kurlrequester.h> #include <tdelistview.h> @@ -37,7 +37,7 @@ #include <knuminput.h> #include <kpassdlg.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdesu/process.h> diff --git a/src/ldapbonding.h b/src/ldapbonding.h index 22f3715..7a8376c 100644 --- a/src/ldapbonding.h +++ b/src/ldapbonding.h @@ -26,7 +26,7 @@ #include <kpushbutton.h> #include <tdelistview.h> #include <tdefileitem.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tqpushbutton.h> #include <tqcombobox.h> #include <tqcheckbox.h> diff --git a/src/ldappasswddlg.cpp b/src/ldappasswddlg.cpp index f018957..1316c0d 100644 --- a/src/ldappasswddlg.cpp +++ b/src/ldappasswddlg.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ktextedit.h> #include <knuminput.h> diff --git a/src/realmpropertiesdialog.cpp b/src/realmpropertiesdialog.cpp index c57cc4f..ce6ebed 100644 --- a/src/realmpropertiesdialog.cpp +++ b/src/realmpropertiesdialog.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ktextedit.h> #include <knuminput.h> |