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
5757 connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
5858 connect(ui->scriptTreeView, &QTreeView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
5959
60− connect(ui->reloadAllButton, &QPushButton::clicked, Application::getInstance(), &Application::reloadAllScripts);
60+ connect(ui->reloadAllButton, &QPushButton::clicked, qApp, &Application::reloadAllScripts);
6161 connect(ui->stopAllButton, &QPushButton::clicked, this, &RunningScriptsWidget::allScriptsStopped);
62− connect(ui->loadScriptFromDiskButton, &QPushButton::clicked, Application::getInstance(), &Application::loadDialog);
63− connect(ui->loadScriptFromURLButton, &QPushButton::clicked, Application::getInstance(), &Application::loadScriptURLDialog);
62+ connect(ui->loadScriptFromDiskButton, &QPushButton::clicked, qApp, &Application::loadDialog);
63+ connect(ui->loadScriptFromURLButton, &QPushButton::clicked, qApp, &Application::loadScriptURLDialog);
6464 connect(&_reloadSignalMapper, static_cast<void(QSignalMapper::*)(const QString&)>(&QSignalMapper::mapped),
65− Application::getInstance(), &Application::reloadOneScript);
65+ qApp, &Application::reloadOneScript);
6666
6767 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); });
6969
7070 UIUtil::scaleWidgetFontSizes(this);
7171 }
@@ -83,7 +83,7 @@ void RunningScriptsWidget::updateFileFilter(const QString& filter) { · 11 unmodified lines
8383
8484 void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
8585 QVariant scriptFile = _scriptsModelFilter.data(index, ScriptsModel::ScriptPath);
86− Application::getInstance()->loadScript(scriptFile.toString());
86+ qApp->loadScript(scriptFile.toString());
8787 }
8888
8989 void RunningScriptsWidget::loadSelectedScript() {
@@ -172,7 +172,7 @@ void RunningScriptsWidget::showEvent(QShowEvent* event) { · 82 unmodified lines
172172 ui->filterLineEdit->setFocus();
173173 }
174174
175− QRect parentGeometry = Application::getInstance()->getDesirableApplicationGeometry();
175+ QRect parentGeometry = qApp->getDesirableApplicationGeometry();
176176 int titleBarHeight = UIUtil::getWindowTitleBarHeight(this);
177177 int topMargin = titleBarHeight;
178178
@@ -217,13 +217,13 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) { · 38 unmodified lines
217217 }
218218
219219 void RunningScriptsWidget::allScriptsStopped() {
220− Application::getInstance()->stopAllScripts();
220+ qApp->stopAllScripts();
221221 }
222222
223223 QVariantList RunningScriptsWidget::getRunning() {
224224 const int WINDOWS_DRIVE_LETTER_SIZE = 1;
225225 QVariantList result;
226− foreach(const QString& runningScript, Application::getInstance()->getRunningScripts()) {
226+ foreach(const QString& runningScript, qApp->getRunningScripts()) {
227227 QUrl runningScriptURL = QUrl(runningScript);
228228 if (runningScriptURL.scheme().size() <= WINDOWS_DRIVE_LETTER_SIZE) {
229229 runningScriptURL = QUrl::fromLocalFile(runningScriptURL.toDisplayString(QUrl::FormattingOptions(QUrl::FullyEncoded)));
@@ -245,7 +245,7 @@ QVariantList RunningScriptsWidget::getPublic() { · 15 unmodified lines
245245
246246 QVariantList RunningScriptsWidget::getPublicChildNodes(TreeNodeFolder* parent) {
247247 QVariantList result;
248− QList<TreeNodeBase*> treeNodes = Application::getInstance()->getRunningScriptsWidget()->getScriptsModel()
248+ QList<TreeNodeBase*> treeNodes = qApp->getRunningScriptsWidget()->getScriptsModel()
249249 ->getFolderNodes(parent);
250250 for (int i = 0; i < treeNodes.size(); i++) {
251251 TreeNodeBase* node = treeNodes.at(i);
@@ -273,7 +273,7 @@ QVariantList RunningScriptsWidget::getPublicChildNodes(TreeNodeFolder* parent) { · 21 unmodified lines
273273
274274 QVariantList RunningScriptsWidget::getLocal() {
275275 QVariantList result;
276− QList<TreeNodeBase*> treeNodes = Application::getInstance()->getRunningScriptsWidget()->getScriptsModel()
276+ QList<TreeNodeBase*> treeNodes = qApp->getRunningScriptsWidget()->getScriptsModel()
277277 ->getFolderNodes(NULL);
278278 for (int i = 0; i < treeNodes.size(); i++) {
279279 TreeNodeBase* node = treeNodes.at(i);
@@ -293,14 +293,14 @@ QVariantList RunningScriptsWidget::getLocal() { · 13 unmodified lines
293293 }
294294
295295 bool RunningScriptsWidget::stopScriptByName(const QString& name) {
296− foreach (const QString& runningScript, Application::getInstance()->getRunningScripts()) {
296+ foreach (const QString& runningScript, qApp->getRunningScripts()) {
297297 if (QUrl(runningScript).fileName().toLower() == name.trimmed().toLower()) {
298− return Application::getInstance()->stopScript(runningScript, false);
298+ return qApp->stopScript(runningScript, false);
299299 }
300300 }
301301 return false;
302302 }
303303
304304 bool RunningScriptsWidget::stopScript(const QString& name, bool restart) {
305− return Application::getInstance()->stopScript(name, restart);
305+ return qApp->stopScript(name, restart);
306306 }