[onering-desktop] push by hongqn - try to fix encoding problem on 2011-02-16 08:49 GMT

[onering...@googlecode.com]

Revision: eae68b8425
Author: Qiangning Hong <hon...@gmail.com>
Date: Wed Feb 16 00:49:38 2011
Log: try to fix encoding problem
http://code.google.com/p/onering-desktop/source/detail?r=eae68b8425

Modified:
/src/app.cpp
/src/app.h
/src/application.cpp
/src/appreply.cpp
/src/jsapi.cpp

=======================================
--- /src/app.cpp Mon Feb 14 18:48:49 2011
+++ /src/app.cpp Wed Feb 16 00:49:38 2011
@@ -28,7 +28,7 @@
return g_apps.contains(appname);
}

-QByteArray call_app(const char* method, const QUrl &url, const char* body)
+QByteArray call_app(const QString &method, const QUrl &url, const QString
&body)
{
QString appname = url.host();
const char * response;
@@ -43,7 +43,7 @@
path_query += surl.mid(surl.indexOf('?'));
}

- response_handle = g_apps[appname].first(qPrintable(appname), method,
path_query, body, &response, &response_len);
+ response_handle = g_apps[appname].first(qPrintable(appname),
qPrintable(method), path_query, body.toUtf8().constData(), &response,
&response_len);
retval.append(response, response_len);
// free response
g_apps[appname].second(qPrintable(appname), response_handle);
@@ -52,7 +52,7 @@
return retval;
}

-QByteArray call_app_body(const char* method, const QUrl &url, const char*
body)
+QByteArray call_app_body(const QString &method, const QUrl &url, const
QString &body)
{
QByteArray response = call_app(method, url, body);

@@ -93,7 +93,7 @@

QByteArray* res = new QByteArray();

- QVariantMap param = Json::parse(QString::fromLocal8Bit(body)).toMap();
+ QVariantMap param = Json::parse(QString::fromUtf8(body)).toMap();
*res = processCall(path.mid(1), param);

*response = res->constData();
=======================================
--- /src/app.h Mon Feb 14 18:48:49 2011
+++ /src/app.h Wed Feb 16 00:49:38 2011
@@ -11,8 +11,8 @@

int is_appname_registered(const QString &appname);

-QByteArray call_app(const char* method, const QUrl &url, const char*
body=NULL);
-QByteArray call_app_body(const char* method, const QUrl &url, const char*
body=NULL);
+QByteArray call_app(const QString& method, const QUrl &url, const QString
&body);
+QByteArray call_app_body(const QString &method, const QUrl &url, const
QString &body);

class App : public QObject
{
=======================================
--- /src/application.cpp Thu Feb 10 00:14:14 2011
+++ /src/application.cpp Wed Feb 16 00:49:38 2011
@@ -81,7 +81,7 @@
initurl.setScheme("onering");
initurl.setHost(appname);
initurl.setPath("/init");
- QByteArray response = call_app_body("GET", initurl);
+ QByteArray response = call_app_body("GET", initurl, "");

QVariantMap props = Json::parse(QString::fromLocal8Bit(response)).toMap();

=======================================
--- /src/appreply.cpp Tue Jan 4 00:25:13 2011
+++ /src/appreply.cpp Wed Feb 16 00:49:38 2011
@@ -41,7 +41,7 @@

void AppReply::parseResponse()
{
- content = call_app(method.toUtf8().constData(), url, body);
+ content = call_app(method, url, body);
offset = 0;

open(ReadOnly | Unbuffered);
=======================================
--- /src/jsapi.cpp Tue Feb 15 23:51:16 2011
+++ /src/jsapi.cpp Wed Feb 16 00:49:38 2011
@@ -89,7 +89,7 @@
{
qDebug() << "JsApi::call" << method << url << body;
QUrl absurl = frame->baseUrl().resolved(url);
- QString response = call_app_body(qPrintable(method), absurl,
qPrintable(body));
+ QString response = call_app_body(method, absurl, body);
if (response.isEmpty()) {
response = "null";
}
@@ -103,7 +103,7 @@

qDebug() << "JsApi::ajax" << type << url << body << callback;
QUrl absurl = frame->baseUrl().resolved(url);
- QByteArray response = call_app_body(qPrintable(type), absurl,
qPrintable(body));
+ QByteArray response = call_app_body(type, absurl, body);
invokeCallback(callback, response);
}