History

Replace Application::getInstance() with qApp

Atlante45 committed 11 years ago

Commit cf3b33a1 parent 2c276bb37 files · +197 −181Browse files

Showing the changes to interface/src/ui/RunningScriptsWidget.cpp (1 of 37 files). Show all

Unified · Split

interface/src/ui/RunningScriptsWidget.cpp+14−14
@@ -57,15 +57,15 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) : · 56 unmodified lines
57 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);57 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
58 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);58 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
59 59
60 connect(ui->reloadAllButton, &QPushButton::clicked, Application::getInstance(), &Application::reloadAllScripts);60 connect(ui->reloadAllButton, &QPushButton::clicked, qApp, &Application::reloadAllScripts);
61 connect(ui->stopAllButton, &QPushButton::clicked, this, &RunningScriptsWidget::allScriptsStopped);61 connect(ui->stopAllButton, &QPushButton::clicked, this, &RunningScriptsWidget::allScriptsStopped);
62 connect(ui->loadScriptFromDiskButton, &QPushButton::clicked, Application::getInstance(), &Application::loadDialog);62 connect(ui->loadScriptFromDiskButton, &QPushButton::clicked, qApp, &Application::loadDialog);
63 connect(ui->loadScriptFromURLButton, &QPushButton::clicked, Application::getInstance(), &Application::loadScriptURLDialog);63 connect(ui->loadScriptFromURLButton, &QPushButton::clicked, qApp, &Application::loadScriptURLDialog);
64 connect(&_reloadSignalMapper, static_cast<void(QSignalMapper::*)(const QString&)>(&QSignalMapper::mapped),64 connect(&_reloadSignalMapper, static_cast<void(QSignalMapper::*)(const QString&)>(&QSignalMapper::mapped),
65 Application::getInstance(), &Application::reloadOneScript);65 qApp, &Application::reloadOneScript);
66 66
67 connect(&_stopSignalMapper, static_cast<void(QSignalMapper::*)(const QString&)>(&QSignalMapper::mapped),67 connect(&_stopSignalMapper, static_cast<void(QSignalMapper::*)(const QString&)>(&QSignalMapper::mapped),
68 [](const QString& script) { Application::getInstance()->stopScript(script); });68 [](const QString& script) { qApp->stopScript(script); });
69 69
70 UIUtil::scaleWidgetFontSizes(this);70 UIUtil::scaleWidgetFontSizes(this);
71}71}
@@ -83,7 +83,7 @@ void RunningScriptsWidget::updateFileFilter(const QString& filter) { · 11 unmodified lines
83 83
84void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {84void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
85 QVariant scriptFile = _scriptsModelFilter.data(index, ScriptsModel::ScriptPath);85 QVariant scriptFile = _scriptsModelFilter.data(index, ScriptsModel::ScriptPath);
86 Application::getInstance()->loadScript(scriptFile.toString());86 qApp->loadScript(scriptFile.toString());
87}87}
88 88
89void RunningScriptsWidget::loadSelectedScript() {89void RunningScriptsWidget::loadSelectedScript() {
@@ -172,7 +172,7 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) { · 82 unmodified lines
172 ui->filterLineEdit->setFocus();172 ui->filterLineEdit->setFocus();
173 }173 }
174 174
175 QRect parentGeometry = Application::getInstance()->getDesirableApplicationGeometry();175 QRect parentGeometry = qApp->getDesirableApplicationGeometry();
176 int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);176 int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
177 int topMargin = titleBarHeight;177 int topMargin = titleBarHeight;
178 178
@@ -217,13 +217,13 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) { · 38 unmodified lines
217}217}
218 218
219void RunningScriptsWidget::allScriptsStopped() {219void RunningScriptsWidget::allScriptsStopped() {
220 Application::getInstance()->stopAllScripts();220 qApp->stopAllScripts();
221}221}
222 222
223QVariantList RunningScriptsWidget::getRunning() {223QVariantList RunningScriptsWidget::getRunning() {
224 const int WINDOWS_DRIVE_LETTER_SIZE = 1;224 const int WINDOWS_DRIVE_LETTER_SIZE = 1;
225 QVariantList result;225 QVariantList result;
226 foreach(const QString& runningScript, Application::getInstance()->getRunningScripts()) {226 foreach(const QString& runningScript, qApp->getRunningScripts()) {
227 QUrl runningScriptURL = QUrl(runningScript);227 QUrl runningScriptURL = QUrl(runningScript);
228 if (runningScriptURL.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {228 if (runningScriptURL.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {
229 runningScriptURL = QUrl::fromLocalFile(runningScriptURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded)));229 runningScriptURL = QUrl::fromLocalFile(runningScriptURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded)));
@@ -245,7 +245,7 @@ QVariantList RunningScriptsWidget::getPublic() { · 15 unmodified lines
245 245
246QVariantList RunningScriptsWidget::getPublicChildNodes(TreeNodeFolder* parent) {246QVariantList RunningScriptsWidget::getPublicChildNodes(TreeNodeFolder* parent) {
247 QVariantList result;247 QVariantList result;
248 QList<TreeNodeBase*> treeNodes = Application::getInstance()->getRunningScriptsWidget()->getScriptsModel()248 QList<TreeNodeBase*> treeNodes = qApp->getRunningScriptsWidget()->getScriptsModel()
249 ->getFolderNodes(parent);249 ->getFolderNodes(parent);
250 for (int i = 0; i < treeNodes.size(); i++) {250 for (int i = 0; i < treeNodes.size(); i++) {
251 TreeNodeBase* node = treeNodes.at(i);251 TreeNodeBase* node = treeNodes.at(i);
@@ -273,7 +273,7 @@ QVariantList RunningScriptsWidget::getPublicChildNodes(TreeNodeFolder* parent) { · 21 unmodified lines
273 273
274QVariantList RunningScriptsWidget::getLocal() {274QVariantList RunningScriptsWidget::getLocal() {
275 QVariantList result;275 QVariantList result;
276 QList<TreeNodeBase*> treeNodes = Application::getInstance()->getRunningScriptsWidget()->getScriptsModel()276 QList<TreeNodeBase*> treeNodes = qApp->getRunningScriptsWidget()->getScriptsModel()
277 ->getFolderNodes(NULL);277 ->getFolderNodes(NULL);
278 for (int i = 0; i < treeNodes.size(); i++) {278 for (int i = 0; i < treeNodes.size(); i++) {
279 TreeNodeBase* node = treeNodes.at(i);279 TreeNodeBase* node = treeNodes.at(i);
@@ -293,14 +293,14 @@ QVariantList RunningScriptsWidget::getLocal() { · 13 unmodified lines
293}293}
294 294
295bool RunningScriptsWidget::stopScriptByName(const QString& name) {295bool RunningScriptsWidget::stopScriptByName(const QString& name) {
296 foreach (const QString& runningScript, Application::getInstance()->getRunningScripts()) {296 foreach (const QString& runningScript, qApp->getRunningScripts()) {
297 if (QUrl(runningScript).fileName().toLower() == name.trimmed().toLower()) {297 if (QUrl(runningScript).fileName().toLower() == name.trimmed().toLower()) {
298 return Application::getInstance()->stopScript(runningScript, false);298 return qApp->stopScript(runningScript, false);
299 }299 }
300 }300 }
301 return false;301 return false;
302}302}
303 303
304bool RunningScriptsWidget::stopScript(const QString& name, bool restart) {304bool RunningScriptsWidget::stopScript(const QString& name, bool restart) {
305 return Application::getInstance()->stopScript(name, restart);305 return qApp->stopScript(name, restart);
306}306}