From 488d98aa93634a9b03449021153ca73e5d9a64e8 Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Thu, 28 Jun 2018 01:08:13 +0300 Subject: [PATCH] Refactor code --- src/qonlinetranslator.cpp | 29 ++++++++++++++--------------- src/qonlinetranslator.h | 4 ++-- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/qonlinetranslator.cpp b/src/qonlinetranslator.cpp index 8bc0334..5e5446d 100755 --- a/src/qonlinetranslator.cpp +++ b/src/qonlinetranslator.cpp @@ -89,7 +89,7 @@ void QOnlineTranslator::translate(const QString &text, const QString &translatio // Wait for the response QEventLoop event; - QObject::connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); + connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); event.exec(); // Check for network error @@ -165,7 +165,6 @@ QList QOnlineTranslator::sourceMedia() const #endif mediaList.append(apiUrl); - // Remove the said part from the next saying unparsedText = unparsedText.mid(splitIndex); } @@ -231,6 +230,11 @@ QList QOnlineTranslator::translationOptionsList() const return m_translationOptionsList; } +QList QOnlineTranslator::definitionsList() const +{ + return m_definitionsList; +} + bool QOnlineTranslator::error() const { return m_error; @@ -238,12 +242,12 @@ bool QOnlineTranslator::error() const QStringList QOnlineTranslator::languages() const { - return languageNames; + return m_languageNames; } QStringList QOnlineTranslator::codes() const { - return languageCodes; + return m_languageCodes; } QString QOnlineTranslator::translateText(const QString &text, QString translationLanguage, QString sourceLanguage) @@ -275,7 +279,7 @@ QString QOnlineTranslator::translateText(const QString &text, QString translatio // Wait for the response QEventLoop event; - QObject::connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); + connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); event.exec(); // Check for network error @@ -304,14 +308,14 @@ QString QOnlineTranslator::translateText(const QString &text, QString translatio QString QOnlineTranslator::codeToLanguage(const QString &code) const { - int index = languageCodes.indexOf(code); - return languageNames.at(index); + int index = m_languageCodes.indexOf(code); + return m_languageNames.at(index); } QString QOnlineTranslator::languageToCode(const QString &language) const { - int index = languageNames.indexOf(language); - return languageCodes.at(index); + int index = m_languageNames.indexOf(language); + return m_languageCodes.at(index); } QString QOnlineTranslator::defaultLocaleToCode() @@ -335,7 +339,7 @@ QList QOnlineTranslator::media(const QString &text, QString langu // Wait for the response QEventLoop event; - QObject::connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); + connect(reply, &QNetworkReply::finished, &event, &QEventLoop::quit); event.exec(); if (reply->error() != QNetworkReply::NoError) { @@ -395,8 +399,3 @@ int QOnlineTranslator::getSplitIndex(const QString &untranslatedText, int limit) // If the text has not passed any check and is most likely garbage return limit; } - -QList QOnlineTranslator::definitionsList() const -{ - return m_definitionsList; -} diff --git a/src/qonlinetranslator.h b/src/qonlinetranslator.h index 0c339e6..03d94f7 100755 --- a/src/qonlinetranslator.h +++ b/src/qonlinetranslator.h @@ -76,7 +76,7 @@ class QOnlineTranslator : public QObject QList m_definitionsList; bool m_error = false; - QStringList languageNames = { tr("Automatically detect"), tr("Afrikaans"), tr("Albanian"), tr("Amharic"), tr("Arabic"), tr("Armenian"), + QStringList m_languageNames = { tr("Automatically detect"), tr("Afrikaans"), tr("Albanian"), tr("Amharic"), tr("Arabic"), tr("Armenian"), tr("Azeerbaijani"), tr("Basque"), tr("Belarusian"), tr("Bengali"), tr("Bosnian"), tr("Bulgarian"), tr("Catalan"), tr("Cebuano"), tr("Chinese (Simplified)"), tr("Chinese (Traditional)"), tr("Corsican"), tr("Croatian"), tr("Czech"), tr("Danish"), tr("Dutch"), tr("English"), tr("Esperanto"), tr("Estonian"), tr("Finnish"), tr("French"), tr("Frisian"), @@ -91,7 +91,7 @@ class QOnlineTranslator : public QObject tr("Swedish"), tr("Tagalog"), tr("Tajik"), tr("Tamil"), tr("Telugu"), tr("Thai"), tr("Turkish"), tr("Ukrainian"), tr("Urdu"), tr("Uzbek"), tr("Vietnamese"), tr("Welsh"), tr("Xhosa"), tr("Yiddish"), tr("Yoruba"), tr("Zulu") }; - QStringList languageCodes = { "auto", "af", "sq", "am", "ar", "hy", "az", "eu", "be", "bn", "bs", "bg", "ca", "ceb", "zh-CN", "zh-TW", "co", "hr", "cs", + QStringList m_languageCodes = { "auto", "af", "sq", "am", "ar", "hy", "az", "eu", "be", "bn", "bs", "bg", "ca", "ceb", "zh-CN", "zh-TW", "co", "hr", "cs", "da", "nl", "en", "eo", "et", "fi", "fr", "fy", "gl", "ka", "de", "el", "gu", "ht", "ha", "haw", "iw", "hi", "hmn", "hu", "is", "ig", "id", "ga", "it", "ja", "jw", "kn", "kk", "km", "ko", "ku", "ky", "lo", "la", "lv", "lt", "lb", "mk", "mg", "ms", "ml", "mt", "mi", "mr", "mn", "my", "ne", "no", "ny", "ps", "fa", "pl", "pt", "pa", "ro", "ru", "sm", "gd", "sr",