diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:45:40 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:45:40 -0600 |
| commit | a4318d1113643d5dea2952cf1b34dfd9febda97f (patch) | |
| tree | d98e245baf6015aa6f2ccd13a543c7661ed3b936 /src/primaryrealmwizard | |
| parent | b62814d4c88772011cba25bb5b1f3dcddda95a8f (diff) | |
| download | kcmldapcontroller-a4318d1113643d5dea2952cf1b34dfd9febda97f.tar.gz kcmldapcontroller-a4318d1113643d5dea2952cf1b34dfd9febda97f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/primaryrealmwizard')
| -rw-r--r-- | src/primaryrealmwizard/certconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/primaryrealmwizard.cpp | 8 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmfinishpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmintropage.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
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 <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> 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 <tqradiobutton.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/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 <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> 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 <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> 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 <tdeapplication.h> #include <ksimpleconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kiconloader.h> |