diff options
Diffstat (limited to 'libkmime')
| -rw-r--r-- | libkmime/kmime_util.cpp | 8 | ||||
| -rw-r--r-- | libkmime/tests/test_dates.cpp | 2 | ||||
| -rw-r--r-- | libkmime/tests/test_kmime_header_parsing.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libkmime/kmime_util.cpp b/libkmime/kmime_util.cpp index d93c4990..1df85e61 100644 --- a/libkmime/kmime_util.cpp +++ b/libkmime/kmime_util.cpp @@ -149,20 +149,20 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, } beg = pos+2; end = beg; - valid = TRUE; + valid = true; // parse charset name declaredCS=""; for (i=2,pos+=2; i<maxLen && (*pos!='?'&&(ispunct(*pos)||isalnum(*pos))); i++) { declaredCS+=(*pos); pos++; } - if (*pos!='?' || i<4 || i>=maxLen) valid = FALSE; + if (*pos!='?' || i<4 || i>=maxLen) valid = false; else { // get encoding and check delimiting question marks encoding = toupper(pos[1]); if (pos[2]!='?' || (encoding!='Q' && encoding!='B')) - valid = FALSE; + valid = false; pos+=3; i+=3; } @@ -176,7 +176,7 @@ TQString decodeRFC2047String(const TQCString &src, const char **usedCS, pos++; } end = pos+2;//end now points to the first char after the encoded string - if (i>=maxLen || !*pos) valid = FALSE; + if (i>=maxLen || !*pos) valid = false; } if (valid) { diff --git a/libkmime/tests/test_dates.cpp b/libkmime/tests/test_dates.cpp index 47441adf..79b37766 100644 --- a/libkmime/tests/test_dates.cpp +++ b/libkmime/tests/test_dates.cpp @@ -1,7 +1,7 @@ #include <kmime_util.h> #include <kmime_header_parsing.h> #include <kdebug.h> -#include <kinstance.h> +#include <tdeinstance.h> using namespace KMime; diff --git a/libkmime/tests/test_kmime_header_parsing.cpp b/libkmime/tests/test_kmime_header_parsing.cpp index c272b006..bd908ad4 100644 --- a/libkmime/tests/test_kmime_header_parsing.cpp +++ b/libkmime/tests/test_kmime_header_parsing.cpp @@ -2,7 +2,7 @@ #include <../kmime_headers.h> #include <../kmime_header_parsing.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqfile.h> #include <tqcstring.h> |