From d198c88625c3163238050277967ef967ad9df359 Mon Sep 17 00:00:00 2001 From: Gres Date: Sun, 26 Jan 2020 22:01:08 +0300 Subject: [PATCH] Rename sources and put them to src dir --- Recources.qrc => recources.qrc | 0 ScreenTranslator.pro => screentranslator.pro | 83 ++++++++++--------- .../globalactionhelper.cpp | 2 +- .../globalactionhelper.h | 0 .../imageprocessing.cpp | 4 +- ImageProcessing.h => src/imageprocessing.h | 0 LanguageHelper.cpp => src/languagehelper.cpp | 6 +- LanguageHelper.h => src/languagehelper.h | 0 main.cpp => src/main.cpp | 4 +- Manager.cpp => src/manager.cpp | 30 +++---- Manager.h => src/manager.h | 2 +- ProcessingItem.cpp => src/processingitem.cpp | 2 +- ProcessingItem.h => src/processingitem.h | 0 Recognizer.cpp => src/recognizer.cpp | 10 +-- Recognizer.h => src/recognizer.h | 2 +- .../recognizerhelper.cpp | 2 +- RecognizerHelper.h => src/recognizerhelper.h | 0 ResultDialog.cpp => src/resultdialog.cpp | 8 +- ResultDialog.h => src/resultdialog.h | 2 +- ResultDialog.ui => src/resultdialog.ui | 0 .../selectiondialog.cpp | 8 +- SelectionDialog.h => src/selectiondialog.h | 2 +- SelectionDialog.ui => src/selectiondialog.ui | 0 Settings.h => src/settings.h | 0 SettingsEditor.cpp => src/settingseditor.cpp | 26 +++--- SettingsEditor.h => src/settingseditor.h | 0 SettingsEditor.ui => src/settingseditor.ui | 0 StAssert.h => src/stassert.h | 0 .../translatorhelper.cpp | 4 +- TranslatorHelper.h => src/translatorhelper.h | 0 Updater.cpp => src/updater.cpp | 8 +- Updater.h => src/updater.h | 0 Utils.cpp => src/utils.cpp | 2 +- Utils.h => src/utils.h | 0 WebTranslator.cpp => src/webtranslator.cpp | 20 ++--- WebTranslator.h => src/webtranslator.h | 2 +- .../webtranslatorproxy.cpp | 4 +- .../webtranslatorproxy.h | 0 38 files changed, 118 insertions(+), 115 deletions(-) rename Recources.qrc => recources.qrc (100%) rename ScreenTranslator.pro => screentranslator.pro (51%) rename GlobalActionHelper.cpp => src/globalactionhelper.cpp (99%) rename GlobalActionHelper.h => src/globalactionhelper.h (100%) rename ImageProcessing.cpp => src/imageprocessing.cpp (98%) rename ImageProcessing.h => src/imageprocessing.h (100%) rename LanguageHelper.cpp => src/languagehelper.cpp (99%) rename LanguageHelper.h => src/languagehelper.h (100%) rename main.cpp => src/main.cpp (94%) rename Manager.cpp => src/manager.cpp (97%) rename Manager.h => src/manager.h (98%) rename ProcessingItem.cpp => src/processingitem.cpp (92%) rename ProcessingItem.h => src/processingitem.h (100%) rename Recognizer.cpp => src/recognizer.cpp (95%) rename Recognizer.h => src/recognizer.h (96%) rename RecognizerHelper.cpp => src/recognizerhelper.cpp (98%) rename RecognizerHelper.h => src/recognizerhelper.h (100%) rename ResultDialog.cpp => src/resultdialog.cpp (97%) rename ResultDialog.h => src/resultdialog.h (97%) rename ResultDialog.ui => src/resultdialog.ui (100%) rename SelectionDialog.cpp => src/selectiondialog.cpp (97%) rename SelectionDialog.h => src/selectiondialog.h (96%) rename SelectionDialog.ui => src/selectiondialog.ui (100%) rename Settings.h => src/settings.h (100%) rename SettingsEditor.cpp => src/settingseditor.cpp (96%) rename SettingsEditor.h => src/settingseditor.h (100%) rename SettingsEditor.ui => src/settingseditor.ui (100%) rename StAssert.h => src/stassert.h (100%) rename TranslatorHelper.cpp => src/translatorhelper.cpp (97%) rename TranslatorHelper.h => src/translatorhelper.h (100%) rename Updater.cpp => src/updater.cpp (98%) rename Updater.h => src/updater.h (100%) rename Utils.cpp => src/utils.cpp (96%) rename Utils.h => src/utils.h (100%) rename WebTranslator.cpp => src/webtranslator.cpp (92%) rename WebTranslator.h => src/webtranslator.h (97%) rename WebTranslatorProxy.cpp => src/webtranslatorproxy.cpp (89%) rename WebTranslatorProxy.h => src/webtranslatorproxy.h (100%) diff --git a/Recources.qrc b/recources.qrc similarity index 100% rename from Recources.qrc rename to recources.qrc diff --git a/ScreenTranslator.pro b/screentranslator.pro similarity index 51% rename from ScreenTranslator.pro rename to screentranslator.pro index 22856fc..24ddd9a 100644 --- a/ScreenTranslator.pro +++ b/screentranslator.pro @@ -26,49 +26,52 @@ LIBS += -ltesseract -llept include(3rd-party/qtsingleapplication/qtsingleapplication.pri) -SOURCES += main.cpp\ - Manager.cpp \ - SettingsEditor.cpp \ - SelectionDialog.cpp \ - GlobalActionHelper.cpp \ - Recognizer.cpp \ - ResultDialog.cpp \ - ProcessingItem.cpp \ - ImageProcessing.cpp \ - LanguageHelper.cpp \ - WebTranslator.cpp \ - WebTranslatorProxy.cpp \ - TranslatorHelper.cpp \ - RecognizerHelper.cpp \ - Utils.cpp \ - Updater.cpp +INCLUDEPATH += src -HEADERS += \ - Manager.h \ - SettingsEditor.h \ - SelectionDialog.h \ - GlobalActionHelper.h \ - Recognizer.h \ - Settings.h \ - ProcessingItem.h \ - ResultDialog.h \ - ImageProcessing.h \ - LanguageHelper.h \ - WebTranslator.h \ - WebTranslatorProxy.h \ - StAssert.h \ - TranslatorHelper.h \ - RecognizerHelper.h \ - Utils.h \ - Updater.h +SOURCES += \ + src/main.cpp \ + src/manager.cpp \ + src/settingseditor.cpp \ + src/selectiondialog.cpp \ + src/globalactionhelper.cpp \ + src/recognizer.cpp \ + src/resultdialog.cpp \ + src/processingitem.cpp \ + src/imageprocessing.cpp \ + src/languagehelper.cpp \ + src/webtranslator.cpp \ + src/webtranslatorproxy.cpp \ + src/translatorhelper.cpp \ + src/recognizerhelper.cpp \ + src/utils.cpp \ + src/updater.cpp -FORMS += \ - SettingsEditor.ui \ - SelectionDialog.ui \ - ResultDialog.ui +HEADERS += \ + src/manager.h \ + src/settingseditor.h \ + src/selectiondialog.h \ + src/globalactionhelper.h \ + src/recognizer.h \ + src/settings.h \ + src/processingitem.h \ + src/resultdialog.h \ + src/imageprocessing.h \ + src/languagehelper.h \ + src/webtranslator.h \ + src/webtranslatorproxy.h \ + src/stassert.h \ + src/translatorhelper.h \ + src/recognizerhelper.h \ + src/utils.h \ + src/updater.h + +FORMS += \ + src/settingseditor.ui \ + src/selectiondialog.ui \ + src/resultdialog.ui RESOURCES += \ - Recources.qrc + recources.qrc TRANSLATIONS += \ translations/translation_en.ts \ @@ -81,7 +84,7 @@ OTHER_FILES += \ distr/* \ version.json \ README.md \ - uncrustify.cfg\ + uncrustify.cfg \ .travis.yml \ TODO.md diff --git a/GlobalActionHelper.cpp b/src/globalactionhelper.cpp similarity index 99% rename from GlobalActionHelper.cpp rename to src/globalactionhelper.cpp index 22eac9f..4361178 100644 --- a/GlobalActionHelper.cpp +++ b/src/globalactionhelper.cpp @@ -1,4 +1,4 @@ -#include "GlobalActionHelper.h" +#include "globalactionhelper.h" #include #include diff --git a/GlobalActionHelper.h b/src/globalactionhelper.h similarity index 100% rename from GlobalActionHelper.h rename to src/globalactionhelper.h diff --git a/ImageProcessing.cpp b/src/imageprocessing.cpp similarity index 98% rename from ImageProcessing.cpp rename to src/imageprocessing.cpp index 59d2573..6e5084f 100644 --- a/ImageProcessing.cpp +++ b/src/imageprocessing.cpp @@ -2,8 +2,8 @@ #include -#include "ImageProcessing.h" -#include "StAssert.h" +#include "imageprocessing.h" +#include "stassert.h" #if defined(Q_OS_LINUX) # include diff --git a/ImageProcessing.h b/src/imageprocessing.h similarity index 100% rename from ImageProcessing.h rename to src/imageprocessing.h diff --git a/LanguageHelper.cpp b/src/languagehelper.cpp similarity index 99% rename from LanguageHelper.cpp rename to src/languagehelper.cpp index 811ce29..734e0c5 100644 --- a/LanguageHelper.cpp +++ b/src/languagehelper.cpp @@ -1,9 +1,9 @@ #include #include -#include "LanguageHelper.h" -#include "Settings.h" -#include "StAssert.h" +#include "languagehelper.h" +#include "settings.h" +#include "stassert.h" LanguageHelper::LanguageHelper () { init (); diff --git a/LanguageHelper.h b/src/languagehelper.h similarity index 100% rename from LanguageHelper.h rename to src/languagehelper.h diff --git a/main.cpp b/src/main.cpp similarity index 94% rename from main.cpp rename to src/main.cpp index 01a9f1e..d3fd62a 100644 --- a/main.cpp +++ b/src/main.cpp @@ -7,8 +7,8 @@ #include -#include -#include +#include +#include int main (int argc, char *argv[]) { QtSingleApplication a (argc, argv); diff --git a/Manager.cpp b/src/manager.cpp similarity index 97% rename from Manager.cpp rename to src/manager.cpp index 5121154..9dc967d 100644 --- a/Manager.cpp +++ b/src/manager.cpp @@ -1,4 +1,4 @@ -#include "Manager.h" +#include "manager.h" #include #include @@ -13,17 +13,17 @@ #include #include -#include "Settings.h" -#include "SettingsEditor.h" -#include "SelectionDialog.h" -#include "GlobalActionHelper.h" -#include "Recognizer.h" -#include "WebTranslator.h" -#include "ResultDialog.h" -#include "LanguageHelper.h" -#include "StAssert.h" -#include "Utils.h" -#include "Updater.h" +#include "settings.h" +#include "settingseditor.h" +#include "selectiondialog.h" +#include "globalactionhelper.h" +#include "recognizer.h" +#include "webtranslator.h" +#include "resultdialog.h" +#include "languagehelper.h" +#include "stassert.h" +#include "utils.h" +#include "updater.h" Manager::Manager (QObject *parent) : QObject (parent), @@ -246,13 +246,13 @@ void Manager::capture () { QList screens = QApplication::screens (); foreach (QScreen * screen, screens) { QRect geometry = screen->availableGeometry (); - #if QT_VERSION >= QT_VERSION_CHECK(5,10,0) +#if QT_VERSION >= QT_VERSION_CHECK (5,10,0) QPixmap pixmap = screen->grabWindow (0, 0, 0, geometry.width (), geometry.height ()); - #else +#else QPixmap pixmap = screen->grabWindow (0, geometry.x (), geometry.y (), geometry.width (), geometry.height ()); - #endif +#endif QString name = screen->name (); if (!selections_.contains (name)) { diff --git a/Manager.h b/src/manager.h similarity index 98% rename from Manager.h rename to src/manager.h index 74bb66a..90e4714 100644 --- a/Manager.h +++ b/src/manager.h @@ -5,7 +5,7 @@ #include #include -#include "ProcessingItem.h" +#include "processingitem.h" class QAction; class QMenu; diff --git a/ProcessingItem.cpp b/src/processingitem.cpp similarity index 92% rename from ProcessingItem.cpp rename to src/processingitem.cpp index df08fb1..5759491 100644 --- a/ProcessingItem.cpp +++ b/src/processingitem.cpp @@ -1,4 +1,4 @@ -#include "ProcessingItem.h" +#include "processingitem.h" ProcessingItem::ProcessingItem () : swapLanguages_ (false) { diff --git a/ProcessingItem.h b/src/processingitem.h similarity index 100% rename from ProcessingItem.h rename to src/processingitem.h diff --git a/Recognizer.cpp b/src/recognizer.cpp similarity index 95% rename from Recognizer.cpp rename to src/recognizer.cpp index 3111711..e7ae271 100644 --- a/Recognizer.cpp +++ b/src/recognizer.cpp @@ -1,14 +1,14 @@ -#include "Recognizer.h" +#include "recognizer.h" #include #include #include -#include "Settings.h" -#include "ImageProcessing.h" -#include "StAssert.h" -#include "RecognizerHelper.h" +#include "settings.h" +#include "imageprocessing.h" +#include "stassert.h" +#include "recognizerhelper.h" Recognizer::Recognizer (QObject *parent) : QObject (parent), diff --git a/Recognizer.h b/src/recognizer.h similarity index 96% rename from Recognizer.h rename to src/recognizer.h index b7e5760..529f061 100644 --- a/Recognizer.h +++ b/src/recognizer.h @@ -4,7 +4,7 @@ #include #include "QPixmap" -#include "ProcessingItem.h" +#include "processingitem.h" namespace tesseract { class TessBaseAPI; diff --git a/RecognizerHelper.cpp b/src/recognizerhelper.cpp similarity index 98% rename from RecognizerHelper.cpp rename to src/recognizerhelper.cpp index 8510e14..2ddde69 100644 --- a/RecognizerHelper.cpp +++ b/src/recognizerhelper.cpp @@ -4,7 +4,7 @@ #include #include -#include "RecognizerHelper.h" +#include "recognizerhelper.h" RecognizerHelper::RecognizerHelper () : fileName_ ("st_subs.csv") { diff --git a/RecognizerHelper.h b/src/recognizerhelper.h similarity index 100% rename from RecognizerHelper.h rename to src/recognizerhelper.h diff --git a/ResultDialog.cpp b/src/resultdialog.cpp similarity index 97% rename from ResultDialog.cpp rename to src/resultdialog.cpp index 3ed3420..ac1cf49 100644 --- a/ResultDialog.cpp +++ b/src/resultdialog.cpp @@ -1,7 +1,7 @@ -#include "ResultDialog.h" -#include "ui_ResultDialog.h" -#include "StAssert.h" -#include "LanguageHelper.h" +#include "resultdialog.h" +#include "ui_resultdialog.h" +#include "stassert.h" +#include "languagehelper.h" #include #include diff --git a/ResultDialog.h b/src/resultdialog.h similarity index 97% rename from ResultDialog.h rename to src/resultdialog.h index efb54d4..4b6be88 100644 --- a/ResultDialog.h +++ b/src/resultdialog.h @@ -4,7 +4,7 @@ #include #include -#include "ProcessingItem.h" +#include "processingitem.h" namespace Ui { class ResultDialog; diff --git a/ResultDialog.ui b/src/resultdialog.ui similarity index 100% rename from ResultDialog.ui rename to src/resultdialog.ui diff --git a/SelectionDialog.cpp b/src/selectiondialog.cpp similarity index 97% rename from SelectionDialog.cpp rename to src/selectiondialog.cpp index 56daed3..edb51d7 100644 --- a/SelectionDialog.cpp +++ b/src/selectiondialog.cpp @@ -1,7 +1,7 @@ -#include "SelectionDialog.h" -#include "ui_SelectionDialog.h" -#include "LanguageHelper.h" -#include "StAssert.h" +#include "selectiondialog.h" +#include "ui_selectiondialog.h" +#include "languagehelper.h" +#include "stassert.h" #include #include diff --git a/SelectionDialog.h b/src/selectiondialog.h similarity index 96% rename from SelectionDialog.h rename to src/selectiondialog.h index b126658..4826713 100644 --- a/SelectionDialog.h +++ b/src/selectiondialog.h @@ -5,7 +5,7 @@ #include #include -#include "ProcessingItem.h" +#include "processingitem.h" namespace Ui { class SelectionDialog; diff --git a/SelectionDialog.ui b/src/selectiondialog.ui similarity index 100% rename from SelectionDialog.ui rename to src/selectiondialog.ui diff --git a/Settings.h b/src/settings.h similarity index 100% rename from Settings.h rename to src/settings.h diff --git a/SettingsEditor.cpp b/src/settingseditor.cpp similarity index 96% rename from SettingsEditor.cpp rename to src/settingseditor.cpp index 17246c1..c24fa45 100644 --- a/SettingsEditor.cpp +++ b/src/settingseditor.cpp @@ -1,10 +1,10 @@ -#include "SettingsEditor.h" -#include "ui_SettingsEditor.h" -#include "LanguageHelper.h" -#include "TranslatorHelper.h" -#include "RecognizerHelper.h" -#include "StAssert.h" -#include "Utils.h" +#include "settingseditor.h" +#include "ui_settingseditor.h" +#include "languagehelper.h" +#include "translatorhelper.h" +#include "recognizerhelper.h" +#include "stassert.h" +#include "utils.h" #include #include @@ -12,7 +12,7 @@ #include #include -#include "Settings.h" +#include "settings.h" SettingsEditor::SettingsEditor (const LanguageHelper &dictionary, QWidget *parent) : QDialog (parent), @@ -29,11 +29,11 @@ SettingsEditor::SettingsEditor (const LanguageHelper &dictionary, QWidget *paren ui->updateCombo->addItems (updateTypes); connect (ui->tessdataButton, SIGNAL (clicked ()), SLOT (openTessdataDialog ())); - connect (ui->tessdataEdit, SIGNAL (textChanged (const QString &)), - SLOT (initOcrLangCombo (const QString &))); + connect (ui->tessdataEdit, SIGNAL (textChanged (const QString&)), + SLOT (initOcrLangCombo (const QString&))); - connect (ui->recognizerFixTable, SIGNAL (itemChanged (QTableWidgetItem *)), - SLOT (recognizerFixTableItemChanged (QTableWidgetItem *))); + connect (ui->recognizerFixTable, SIGNAL (itemChanged (QTableWidgetItem*)), + SLOT (recognizerFixTableItemChanged (QTableWidgetItem*))); ui->translateLangCombo->addItems (dictionary_.translateLanguagesUi ()); @@ -196,7 +196,7 @@ void SettingsEditor::loadSettings () { RecognizerHelper::Subs subs = recognizerHelper_->subs (); ui->recognizerFixTable->setRowCount (subs.size ()); int row = 0; - foreach (const RecognizerHelper::Sub & sub, subs) { + foreach (const RecognizerHelper::Sub &sub, subs) { if (!initSubsTableRow (row, sub.language)) { continue; } diff --git a/SettingsEditor.h b/src/settingseditor.h similarity index 100% rename from SettingsEditor.h rename to src/settingseditor.h diff --git a/SettingsEditor.ui b/src/settingseditor.ui similarity index 100% rename from SettingsEditor.ui rename to src/settingseditor.ui diff --git a/StAssert.h b/src/stassert.h similarity index 100% rename from StAssert.h rename to src/stassert.h diff --git a/TranslatorHelper.cpp b/src/translatorhelper.cpp similarity index 97% rename from TranslatorHelper.cpp rename to src/translatorhelper.cpp index fcae228..eb0bb92 100644 --- a/TranslatorHelper.cpp +++ b/src/translatorhelper.cpp @@ -3,8 +3,8 @@ #include #include -#include "TranslatorHelper.h" -#include "Settings.h" +#include "translatorhelper.h" +#include "settings.h" TranslatorHelper::TranslatorHelper () : translatorsDir_ ("translators"), currentIndex_ (0), triesLeft_ (0) { diff --git a/TranslatorHelper.h b/src/translatorhelper.h similarity index 100% rename from TranslatorHelper.h rename to src/translatorhelper.h diff --git a/Updater.cpp b/src/updater.cpp similarity index 98% rename from Updater.cpp rename to src/updater.cpp index c4fa829..31ae2c3 100644 --- a/Updater.cpp +++ b/src/updater.cpp @@ -7,8 +7,8 @@ #include #include -#include "Updater.h" -#include "StAssert.h" +#include "updater.h" +#include "stassert.h" namespace { #define FIELD(NAME) const QString _ ## NAME = #NAME @@ -47,8 +47,8 @@ Updater::Updater (QObject *parent) componentsUpdating_ (0) { updatesFileName_ = QApplication::applicationDirPath () + QDir::separator () + "updates.json"; backupSuffix_ = "_backup"; - connect (network_, SIGNAL (finished (QNetworkReply *)), - SLOT (replyFinished (QNetworkReply *))); + connect (network_, SIGNAL (finished (QNetworkReply*)), + SLOT (replyFinished (QNetworkReply*))); getCurrentVersion (); updateCurrentVersion (); diff --git a/Updater.h b/src/updater.h similarity index 100% rename from Updater.h rename to src/updater.h diff --git a/Utils.cpp b/src/utils.cpp similarity index 96% rename from Utils.cpp rename to src/utils.cpp index 1af0e1d..d56fb61 100644 --- a/Utils.cpp +++ b/src/utils.cpp @@ -1,6 +1,6 @@ #include -#include "Utils.h" +#include "utils.h" QString encode (const QString &source) { if (source.isEmpty ()) { diff --git a/Utils.h b/src/utils.h similarity index 100% rename from Utils.h rename to src/utils.h diff --git a/WebTranslator.cpp b/src/webtranslator.cpp similarity index 92% rename from WebTranslator.cpp rename to src/webtranslator.cpp index a1ba04b..3d36115 100644 --- a/WebTranslator.cpp +++ b/src/webtranslator.cpp @@ -4,12 +4,12 @@ #include #include -#include "WebTranslator.h" -#include "ProcessingItem.h" -#include "Settings.h" -#include "StAssert.h" -#include "WebTranslatorProxy.h" -#include "TranslatorHelper.h" +#include "webtranslator.h" +#include "processingitem.h" +#include "settings.h" +#include "stassert.h" +#include "webtranslatorproxy.h" +#include "translatorhelper.h" WebTranslator::WebTranslator () : QObject (), @@ -25,11 +25,11 @@ WebTranslator::WebTranslator () connect (view_, SIGNAL (loadFinished (bool)), SLOT (loadFinished (bool))); connect (view_->page ()->mainFrame (), SIGNAL (javaScriptWindowObjectCleared ()), this, SLOT (addProxyToView ())); - connect (view_->page ()->networkAccessManager (), SIGNAL (finished (QNetworkReply *)), - this, SLOT (replyFinished (QNetworkReply *))); + connect (view_->page ()->networkAccessManager (), SIGNAL (finished (QNetworkReply*)), + this, SLOT (replyFinished (QNetworkReply*))); connect (view_->page ()->networkAccessManager (), - SIGNAL (sslErrors (QNetworkReply *, QList)), - this, SLOT (handleSslErrors (QNetworkReply *, QList))); + SIGNAL (sslErrors (QNetworkReply*,QList)), + this, SLOT (handleSslErrors (QNetworkReply*,QList))); translationTimeout_.setSingleShot (true); connect (&translationTimeout_, SIGNAL (timeout ()), SLOT (abortTranslation ())); diff --git a/WebTranslator.h b/src/webtranslator.h similarity index 97% rename from WebTranslator.h rename to src/webtranslator.h index 8ddc462..b423a72 100644 --- a/WebTranslator.h +++ b/src/webtranslator.h @@ -5,7 +5,7 @@ #include #include -#include "ProcessingItem.h" +#include "processingitem.h" class QWebView; class QNetworkReply; diff --git a/WebTranslatorProxy.cpp b/src/webtranslatorproxy.cpp similarity index 89% rename from WebTranslatorProxy.cpp rename to src/webtranslatorproxy.cpp index b298baa..f2ea9e7 100644 --- a/WebTranslatorProxy.cpp +++ b/src/webtranslatorproxy.cpp @@ -1,5 +1,5 @@ -#include "WebTranslatorProxy.h" -#include "ProcessingItem.h" +#include "webtranslatorproxy.h" +#include "processingitem.h" WebTranslatorProxy::WebTranslatorProxy (QObject *parent) : QObject (parent) { diff --git a/WebTranslatorProxy.h b/src/webtranslatorproxy.h similarity index 100% rename from WebTranslatorProxy.h rename to src/webtranslatorproxy.h