diff options
| -rw-r--r-- | ConfigureChecks.cmake | 1 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | src/ldapcontroller.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/certconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmfinishpage.cpp | 2 | ||||
| -rw-r--r-- | src/primaryrealmwizard/realmintropage.cpp | 2 | ||||
| -rw-r--r-- | src/secondaryrealmwizard/certconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/secondaryrealmwizard/realmconfigpage.cpp | 2 | ||||
| -rw-r--r-- | src/secondaryrealmwizard/realmfinishpage.cpp | 2 | ||||
| -rw-r--r-- | src/secondaryrealmwizard/realmintropage.cpp | 2 | ||||
| -rw-r--r-- | src/sha1.cpp | 6 |
12 files changed, 9 insertions, 19 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 427373c..c5febab 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -28,7 +28,6 @@ endif( WITH_GCC_VISIBILITY ) ##### check for headers check_include_file( "slapi-plugin.h" HAVE_SLAPI_PLUGIN_H ) -check_include_file( "sys/bitypes.h" HAVE_SYS_BITYPES_H ) check_include_file( "sys/types.h" HAVE_SYS_TYPES_H ) check_include_file( "stdint.h" HAVE_STDINT_H ) diff --git a/config.h.cmake b/config.h.cmake index 24119f3..8566bc3 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -10,9 +10,6 @@ /* Defined to 1 if you have the <slapi-plugin.h> header */ #cmakedefine HAVE_SLAPI_PLUGIN_H @HAVE_SLAPI_PLUGIN_H@ -/* Define to 1 if you have the <sys/bitypes.h> header */ -#cmakedefine HAVE_SYS_BITYPES_H 1 - /* Define to 1 if you have the <sys/types.h> header */ #cmakedefine HAVE_SYS_TYPES_H 1 diff --git a/src/ldapcontroller.cpp b/src/ldapcontroller.cpp index a358235..dd19e22 100644 --- a/src/ldapcontroller.cpp +++ b/src/ldapcontroller.cpp @@ -44,7 +44,7 @@ #include <tdemessagebox.h> #include <tqcheckbox.h> #include <ktempdir.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <knuminput.h> #include <tdesu/process.h> #include <libtdeldap.h> diff --git a/src/primaryrealmwizard/certconfigpage.cpp b/src/primaryrealmwizard/certconfigpage.cpp index f1b37f8..cb64a1c 100644 --- a/src/primaryrealmwizard/certconfigpage.cpp +++ b/src/primaryrealmwizard/certconfigpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/primaryrealmwizard/realmconfigpage.cpp b/src/primaryrealmwizard/realmconfigpage.cpp index c99afaa..226c3a9 100644 --- a/src/primaryrealmwizard/realmconfigpage.cpp +++ b/src/primaryrealmwizard/realmconfigpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/primaryrealmwizard/realmfinishpage.cpp b/src/primaryrealmwizard/realmfinishpage.cpp index 40fa257..f7ab212 100644 --- a/src/primaryrealmwizard/realmfinishpage.cpp +++ b/src/primaryrealmwizard/realmfinishpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/primaryrealmwizard/realmintropage.cpp b/src/primaryrealmwizard/realmintropage.cpp index 422c6e7..ee94d67 100644 --- a/src/primaryrealmwizard/realmintropage.cpp +++ b/src/primaryrealmwizard/realmintropage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "realmintropage.h" diff --git a/src/secondaryrealmwizard/certconfigpage.cpp b/src/secondaryrealmwizard/certconfigpage.cpp index ce07a08..66b1b50 100644 --- a/src/secondaryrealmwizard/certconfigpage.cpp +++ b/src/secondaryrealmwizard/certconfigpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/secondaryrealmwizard/realmconfigpage.cpp b/src/secondaryrealmwizard/realmconfigpage.cpp index 614491a..db46b84 100644 --- a/src/secondaryrealmwizard/realmconfigpage.cpp +++ b/src/secondaryrealmwizard/realmconfigpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/secondaryrealmwizard/realmfinishpage.cpp b/src/secondaryrealmwizard/realmfinishpage.cpp index 4bbdd71..7a8f602 100644 --- a/src/secondaryrealmwizard/realmfinishpage.cpp +++ b/src/secondaryrealmwizard/realmfinishpage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <klineedit.h> #include <ktextedit.h> #include <kwizard.h> diff --git a/src/secondaryrealmwizard/realmintropage.cpp b/src/secondaryrealmwizard/realmintropage.cpp index 7c3d12f..826d46e 100644 --- a/src/secondaryrealmwizard/realmintropage.cpp +++ b/src/secondaryrealmwizard/realmintropage.cpp @@ -29,7 +29,7 @@ #include <kstandarddirs.h> #include <kiconloader.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "realmintropage.h" diff --git a/src/sha1.cpp b/src/sha1.cpp index 3f5dbd9..1ed4e8b 100644 --- a/src/sha1.cpp +++ b/src/sha1.cpp @@ -24,12 +24,6 @@ #include <sys/types.h> #endif #ifdef HAVE_STDINT_H -#include <stdint.h> /* For uintXX_t on OSX */ -#endif -#ifdef HAVE_SYS_BITYPES_H -#include <sys/bitypes.h> /* For uintXX_t on Tru64 */ -#endif -#ifdef HAVE_STDINT_H #include <stdint.h> #endif |