summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Mollekopf <mollekopf@kolabsys.com>2012-08-15 09:48:45 (GMT)
committerChristian Mollekopf <mollekopf@kolabsys.com>2012-08-15 09:48:45 (GMT)
commit3d4a383a2e803fa1cf16fbe18019bb6e4d9b934d (patch)
treeafec78eecad75444799b40fc5f92961e8e6fe555
parent454ce87264c26acfaca410ed0000113a71067bcb (diff)
downloadkolab-utils-3d4a383a2e803fa1cf16fbe18019bb6e4d9b934d.tar.gz
Use utf-8, no double assignments.kolab-utils-3.0.2
-rw-r--r--upgradetool/imapupgradejob.cpp2
-rw-r--r--upgradetool/upgradetool.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/upgradetool/imapupgradejob.cpp b/upgradetool/imapupgradejob.cpp
index 2193a8f..ec8d1fd 100644
--- a/upgradetool/imapupgradejob.cpp
+++ b/upgradetool/imapupgradejob.cpp
@@ -147,7 +147,7 @@ void ImapUpgradeJob::onProbeDone(KJob* job)
Q_ASSERT(capabilitiesJob);
SequentialCompositeJob *seqJob = new SequentialCompositeJob(this);
- QMultiHash<QString, QString>::const_iterator it = capabilitiesJob->kolabFolders().constBegin();
+ QMultiHash<QString, QString>::const_iterator it;
QMultiHash<QString, QString>::const_iterator end = capabilitiesJob->kolabFolders().constEnd();
for (it = capabilitiesJob->kolabFolders().constBegin(); it != end; ++it) {
if (it.key() == QLatin1String(KOLAB_FOLDER_TYPE_FREEBUSY)) {
diff --git a/upgradetool/upgradetool.cpp b/upgradetool/upgradetool.cpp
index 52263d3..e13ce17 100644
--- a/upgradetool/upgradetool.cpp
+++ b/upgradetool/upgradetool.cpp
@@ -138,7 +138,9 @@ int main(int argc, char *argv[])
}
QTextStream s(stdout);
+ s.setCodec( "UTF-8" );
QTextStream stream(stdin);
+ stream.setCodec( "UTF-8" );
if (args->isSet("mime")) {
if (args->count() > 0) {
@@ -149,7 +151,7 @@ int main(int argc, char *argv[])
Q_ASSERT( !data.isEmpty() );
s << Kolab::Upgrade::upgradeMime(data, overrideType);
} else {
- s << Kolab::Upgrade::upgradeMime(stream.readAll().toLatin1(), overrideType);
+ s << Kolab::Upgrade::upgradeMime(stream.readAll().toUtf8(), overrideType);
}
}
if (Kolab::ErrorHandler::instance().error() >= Kolab::ErrorHandler::Error) {