ObjectService.cpp   ObjectService.cpp 
skipping to change at line 41 skipping to change at line 41
#include <QEventLoop> #include <QEventLoop>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonObject> #include <QJsonObject>
#include <QSettings> #include <QSettings>
#include <QMutex> #include <QMutex>
#include <QThreadPool> #include <QThreadPool>
#include <QRunnable> #include <QRunnable>
#include <QWaitCondition> #include <QWaitCondition>
ObjectService::ObjectService(const QByteArray &serviceName, QObject *parent ) : AbstractAPIService(serviceName,parent) ObjectService::ObjectService(QObject *parent) : AbstractAPIService(parent)
{ {
//this is run in the main thread //this is run in the main thread
core = StelApp::getInstance().getCore(); core = StelApp::getInstance().getCore();
objMgr = &StelApp::getInstance().getStelObjectMgr(); objMgr = &StelApp::getInstance().getStelObjectMgr();
useStartOfWords = StelApp::getInstance().getSettings()->value("searc h/flag_start_words", false).toBool(); useStartOfWords = StelApp::getInstance().getSettings()->value("searc h/flag_start_words", false).toBool();
} }
QStringList ObjectService::performSearch(const QString &text) QStringList ObjectService::performSearch(const QString &text)
{ {
//perform substitution greek text --> symbol //perform substitution greek text --> symbol
skipping to change at line 74 skipping to change at line 74
return matches; return matches;
} }
QString ObjectService::substituteGreek(const QString &text) QString ObjectService::substituteGreek(const QString &text)
{ {
//use the searchdialog static method for that //use the searchdialog static method for that
return SearchDialog::substituteGreek(text); return SearchDialog::substituteGreek(text);
} }
void ObjectService::getImpl(const QByteArray& operation, const APIParameter s &parameters, APIServiceResponse &response) void ObjectService::get(const QByteArray& operation, const APIParameters &p arameters, APIServiceResponse &response)
{ {
//make sure the object still "lives" in the main Stel thread, even t hough //make sure the object still "lives" in the main Stel thread, even t hough
//we may currently be in the HTTP thread //we may currently be in the HTTP thread
Q_ASSERT(this->thread() == objMgr->thread()); Q_ASSERT(this->thread() == objMgr->thread());
if(operation=="find") if(operation=="find")
{ {
//this may contain greek or other unicode letters //this may contain greek or other unicode letters
QString str = QString::fromUtf8(parameters.value("str")); QString str = QString::fromUtf8(parameters.value("str"));
str = str.trimmed().toLower(); str = str.trimmed().toLower();
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/