6 files changed, 40 insertions, 9 deletions
diff --git a/tdecore/libtdecore.nmcheck b/tdecore/libtdecore.nmcheck
index 7c017a6e4..92ec3ff8f 100644
--- a/tdecore/libtdecore.nmcheck
+++ b/tdecore/libtdecore.nmcheck
@@ -44,6 +44,8 @@ operator>>
 operator<<
 qt_qclipboard_bailout_hack
 kasciistricmp
+kasciitolower
+kasciitoupper
 
 # from libtldl
 lt_dl*
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index f90e8a42b..7a3dff0cf 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -30,8 +30,6 @@ class KCharsets;
 class DCOPClient;
 class DCOPObject;
 
-#include <tqtglobaldefines.h>
-
 typedef unsigned long Atom;
 #if !defined(TQ_WS_X11)
 typedef void Display;
diff --git a/tdecore/tdeglobal.cpp b/tdecore/tdeglobal.cpp
index 09f496034..aeac6f744 100644
--- a/tdecore/tdeglobal.cpp
+++ b/tdecore/tdeglobal.cpp
@@ -282,3 +282,20 @@ int kasciistricmp( const char *str1, const char *str2 )
     return *s1 ? res : (*s2 ? -1 : 0);
 }
 
+char* kasciitolower( char *s )
+{
+  if ( !s )
+    return 0;
+  for ( unsigned char *p = (unsigned char *) s; *p; ++p )
+    *p = ( *p >= 'A' && *p <= 'Z' ) ? (*p - 'A' + 'a') : *p;
+  return s;
+}
+
+char* kasciitoupper( char *s )
+{
+  if ( !s )
+    return 0;
+  for ( unsigned char *p = (unsigned char *) s; *p; ++p )
+    *p = ( *p >= 'a' && *p <= 'z' ) ? (*p - 'a' + 'A') : *p;
+  return s;
+}
diff --git a/tdecore/tdeglobal.h b/tdecore/tdeglobal.h
index 1269c36a9..d604a4244 100644
--- a/tdecore/tdeglobal.h
+++ b/tdecore/tdeglobal.h
@@ -234,7 +234,25 @@ inline const T& kClamp( const T& x, const T& low, const T& high )
  * tqstricmp fails with e.g. the Turkish locale where 'I'.lower() != 'i'
  * @since 3.4
  */
-int TDECORE_EXPORT kasciistricmp( const char *str1, const char *str2 );
+TDECORE_EXPORT int kasciistricmp( const char *str1, const char *str2 );
+
+/**
+  Locale-independent function to convert ASCII strings to lower case ASCII
+  strings. This means that it affects @em only the ASCII characters A-Z.
+
+  @param str  pointer to the string which should be converted to lower case
+  @return     pointer to the converted string (same as @a str)
+*/
+TDECORE_EXPORT char* kasciitolower( char *str );
+
+/**
+  Locale-independent function to convert ASCII strings to upper case ASCII
+  strings. This means that it affects @em only the ASCII characters a-z.
+
+  @param str  pointer to the string which should be converted to upper case
+  @return     pointer to the converted string (same as @a str)
+*/
+TDECORE_EXPORT char* kasciitoupper( char *str );
  
 
 /**
diff --git a/tdecore/tdehw/tdestoragedevice.h b/tdecore/tdehw/tdestoragedevice.h
index bcbcbacbc..9ccfe2a64 100644
--- a/tdecore/tdehw/tdestoragedevice.h
+++ b/tdecore/tdehw/tdestoragedevice.h
@@ -28,11 +28,7 @@ struct crypt_device;
 
 // Keep readDiskDeviceSubtypeFromString() in tdehardwaredevices.cpp in sync with this enum
 namespace TDEDiskDeviceType {
-#if __cplusplus >= 201103L
 enum TDEDiskDeviceType : unsigned long long {
-#else
-enum TDEDiskDeviceType {
-#endif
 	Null          = 0x0000000000000000ULL,
 	MediaDevice   = 0x0000000000000001ULL,
 	Floppy        = 0x0000000000000002ULL,
diff --git a/tdecore/tdeversion.h b/tdecore/tdeversion.h
index eced23016..a90e0ba61 100644
--- a/tdecore/tdeversion.h
+++ b/tdecore/tdeversion.h
@@ -32,10 +32,10 @@
     A new FEATURE REVISION level always resets the BUG AND SECURITY PATCHLEVEL.
     A new ABI version resets both the FEATURE REVISION and BUG AND SECURITY PATCH LEVEL.
 */
-#define TDE_VERSION_STRING "R14.1.3~[DEVELOPMENT]"
+#define TDE_VERSION_STRING "R14.1.4~[DEVELOPMENT]"
 #define TDE_VERSION_MAJOR 14
 #define TDE_VERSION_MINOR 1
-#define TDE_VERSION_RELEASE 3
+#define TDE_VERSION_RELEASE 4
 #define TDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 
 #define TDE_VERSION \