summaryrefslogtreecommitdiffabout
path: root/kmicromail/libmailwrapper/mailwrapper.cpp
Side-by-side diff
Diffstat (limited to 'kmicromail/libmailwrapper/mailwrapper.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/libmailwrapper/mailwrapper.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/kmicromail/libmailwrapper/mailwrapper.cpp b/kmicromail/libmailwrapper/mailwrapper.cpp
index 2ee1ab3..9c299e8 100644
--- a/kmicromail/libmailwrapper/mailwrapper.cpp
+++ b/kmicromail/libmailwrapper/mailwrapper.cpp
@@ -5,6 +5,8 @@
#include <fcntl.h>
#include <string.h>
#include <qdir.h>
+//Added by qt3to4:
+#include <Q3CString>
#include "mailwrapper.h"
//#include "logindialog.h"
@@ -81,8 +83,8 @@ QString IMAPFolder::decodeFolderName( const QString &name )
unsigned long ucs4, utf16, bitbuf;
unsigned char base64[256], utf8[6];
unsigned long srcPtr = 0;
- QCString dst = "";
- QCString src = name.ascii();
+ Q3CString dst = "";
+ Q3CString src = name.ascii();
/* initialize modified base64 decoding table */
memset(base64, UNDEFINED, sizeof(base64));
@@ -92,9 +94,9 @@ QString IMAPFolder::decodeFolderName( const QString &name )
/* loop until end of string */
while (srcPtr < src.length ()) {
- c = src[srcPtr++];
+ c = src.at(srcPtr++);
/* deal with literal characters and &- */
- if (c != '&' || src[srcPtr] == '-') {
+ if (c != '&' || src.at(srcPtr) == '-') {
/* encode literally */
dst += c;
/* skip over the '-' if this is an &- sequence */
@@ -105,7 +107,7 @@ QString IMAPFolder::decodeFolderName( const QString &name )
bitbuf = 0;
bitcount = 0;
ucs4 = 0;
- while ((c = base64[(unsigned char) src[srcPtr]]) != UNDEFINED) {
+ while ((c = base64[(unsigned char) src.at(srcPtr)]) != UNDEFINED) {
++srcPtr;
bitbuf = (bitbuf << 6) | c;
bitcount += 6;
@@ -149,7 +151,7 @@ QString IMAPFolder::decodeFolderName( const QString &name )
}
}
/* skip over trailing '-' in modified UTF-7 encoding */
- if (src[srcPtr] == '-')
+ if (src.at(srcPtr) == '-')
++srcPtr;
}
}