Skip to content

Commit d95b882

Browse files
committed
Fix can't use in Thai path.
1 parent 7e1aa93 commit d95b882

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

openstudiocore/src/litesql/library/sqlite3_backend.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "compatibility.hpp"
99
#include "sqlite3.hpp"
1010
#include "sqlite3.h"
11+
#include <QString>
1112

1213
#include <string>
1314
#ifdef HAVE_LIBSQLITE3
@@ -89,8 +90,9 @@ SQLite3::SQLite3(const string& connInfo) : db(NULL), transaction(false) {
8990
if (database.empty())
9091
throw DatabaseError("no database-param specified");
9192

92-
if (sqlite3_open(database.c_str(), &db)) {
93-
throw DatabaseError(sqlite3_errmsg(db));
93+
QString f8bit = QString::fromLocal8Bit(database.c_str());
94+
if (sqlite3_open(f8bit.toUtf8().constData(), &db)) {
95+
throw DatabaseError(sqlite3_errmsg(db));
9496
}
9597

9698
}

openstudiocore/src/openstudio_lib/OSDocument.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ OSDocument::OSDocument( openstudio::model::Model library,
286286
if (!m_simpleProject) {
287287
LOG(Debug, "Creating new project");
288288
m_simpleProject = openstudio::analysisdriver::SimpleProject::create(
289-
openstudio::toPath(m_modelTempDir) / openstudio::toPath("resources"),
289+
modelTempDir / openstudio::toPath("resources"),
290290
options,
291291
true);
292292

openstudiocore/src/utilities/core/Path.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ std::string toString(const path& p)
7979
/** path to QString. */
8080
QString toQString(const path& p)
8181
{
82-
return toQString(toString(p));
82+
return QString::fromLocal8Bit(p.string().c_str());
8383
}
8484

8585
/** UTF-8 encoded char* to path*/

openstudiocore/src/utilities/core/String.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ std::string toString(const std::wstring& w)
5252
/** QString to UTF-8 encoded std::string. */
5353
std::string toString(const QString& q)
5454
{
55-
const QByteArray& qb = q.toUtf8();
55+
const QByteArray& qb = q.toLocal8Bit();
5656
return std::string(qb.data());
5757
}
5858

0 commit comments

Comments
 (0)