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/scripting/WindowScriptingInterface.cpp (1 of 37 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+18−18
@@ -32,8 +32,8 @@ WindowScriptingInterface::WindowScriptingInterface() : · 31 unmodified lines
3232 {
3333 const DomainHandler& domainHandler = DependencyManager::get<NodeList>()->getDomainHandler();
3434 connect(&domainHandler, &DomainHandler::connectedToDomain, this, &WindowScriptingInterface::domainChanged);
35− connect(Application::getInstance(), &Application::svoImportRequested, this, &WindowScriptingInterface::svoImportRequested);
36− connect(Application::getInstance(), &Application::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
35+ connect(qApp, &Application::svoImportRequested, this, &WindowScriptingInterface::svoImportRequested);
36+ connect(qApp, &Application::domainConnectionRefused, this, &WindowScriptingInterface::domainConnectionRefused);
3737 }
3838
3939 WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title, const QString& url, int width, int height, bool isToolWindow) {
@@ -41,13 +41,13 @@ WebWindowClass* WindowScriptingInterface::doCreateWebWindow(const QString& title · 1 unmodified line
4141 }
4242
4343 QScriptValue WindowScriptingInterface::hasFocus() {
44− return Application::getInstance()->hasFocus();
44+ return qApp->hasFocus();
4545 }
4646
4747 void WindowScriptingInterface::setFocus() {
4848 // It's forbidden to call focus() from another thread.
49− Application::getInstance()->postLambdaEvent([] {
50− auto window = Application::getInstance()->getWindow();
49+ qApp->postLambdaEvent([] {
50+ auto window = qApp->getWindow();
5151 window->activateWindow();
5252 window->setFocus();
5353 });
@@ -55,18 +55,18 @@ void WindowScriptingInterface::setFocus() { · 1 unmodified line
5555
5656 void WindowScriptingInterface::raiseMainWindow() {
5757 // It's forbidden to call raise() from another thread.
58− Application::getInstance()->postLambdaEvent([] {
59− Application::getInstance()->getWindow()->raise();
58+ qApp->postLambdaEvent([] {
59+ qApp->getWindow()->raise();
6060 });
6161 }
6262
6363 void WindowScriptingInterface::setCursorVisible(bool visible) {
64− QMetaObject::invokeMethod(Application::getInstance(), "setCursorVisible", Qt::BlockingQueuedConnection,
64+ QMetaObject::invokeMethod(qApp, "setCursorVisible", Qt::BlockingQueuedConnection,
6565 Q_ARG(bool, visible));
6666 }
6767
6868 bool WindowScriptingInterface::isCursorVisible() const {
69− return !Application::getInstance()->isMouseHidden();
69+ return !qApp->isMouseHidden();
7070 }
7171
7272 void WindowScriptingInterface::setCursorPosition(int x, int y) {
@@ -167,7 +167,7 @@ QScriptValue WindowScriptingInterface::peekNonBlockingFormResult(QScriptValue fo · 94 unmodified lines
167167 /// \param const QString& message message to display
168168 /// \return QScriptValue::UndefinedValue
169169 QScriptValue WindowScriptingInterface::showAlert(const QString& message) {
170− QMessageBox::warning(Application::getInstance()->getWindow(), "", message);
170+ QMessageBox::warning(qApp->getWindow(), "", message);
171171 return QScriptValue::UndefinedValue;
172172 }
173173
@@ -175,7 +175,7 @@ QScriptValue WindowScriptingInterface::showAlert(const QString& message) { · 1 unmodified line
175175 /// \param const QString& message message to display
176176 /// \return QScriptValue `true` if 'Yes' was clicked, `false` otherwise
177177 QScriptValue WindowScriptingInterface::showConfirm(const QString& message) {
178− QMessageBox::StandardButton response = QMessageBox::question(Application::getInstance()->getWindow(), "", message);
178+ QMessageBox::StandardButton response = QMessageBox::question(qApp->getWindow(), "", message);
179179 return QScriptValue(response == QMessageBox::Yes);
180180 }
181181
@@ -487,7 +487,7 @@ QScriptValue WindowScriptingInterface::showForm(const QString& title, QScriptVal · 305 unmodified lines
487487
488488
489489 QDialog* WindowScriptingInterface::createForm(const QString& title, QScriptValue form) {
490− QDialog* editDialog = new QDialog(Application::getInstance()->getWindow());
490+ QDialog* editDialog = new QDialog(qApp->getWindow());
491491 editDialog->setWindowTitle(title);
492492
493493 bool cancelButton = false;
@@ -597,7 +597,7 @@ QDialog* WindowScriptingInterface::createForm(const QString& title, QScriptValue · 103 unmodified lines
597597 /// \param const QString& defaultText default text in the text box
598598 /// \return QScriptValue string text value in text box if the dialog was accepted, `null` otherwise.
599599 QScriptValue WindowScriptingInterface::showPrompt(const QString& message, const QString& defaultText) {
600− QInputDialog promptDialog(Application::getInstance()->getWindow());
600+ QInputDialog promptDialog(qApp->getWindow());
601601 promptDialog.setWindowTitle("");
602602 promptDialog.setLabelText(message);
603603 promptDialog.setTextValue(defaultText);
@@ -627,7 +627,7 @@ QScriptValue WindowScriptingInterface::showBrowse(const QString& title, const QS · 23 unmodified lines
627627 path = fileInfo.filePath();
628628 }
629629
630− QFileDialog fileDialog(Application::getInstance()->getWindow(), title, path, nameFilter);
630+ QFileDialog fileDialog(qApp->getWindow(), title, path, nameFilter);
631631 fileDialog.setAcceptMode(acceptMode);
632632 QUrl fileUrl(directory);
633633 if (acceptMode == QFileDialog::AcceptSave) {
@@ -657,17 +657,17 @@ QScriptValue WindowScriptingInterface::showS3Browse(const QString& nameFilter) { · 23 unmodified lines
657657 }
658658
659659 int WindowScriptingInterface::getInnerWidth() {
660− return Application::getInstance()->getWindow()->geometry().width();
660+ return qApp->getWindow()->geometry().width();
661661 }
662662
663663 int WindowScriptingInterface::getInnerHeight() {
664− return Application::getInstance()->getWindow()->geometry().height();
664+ return qApp->getWindow()->geometry().height();
665665 }
666666
667667 int WindowScriptingInterface::getX() {
668− return Application::getInstance()->getWindow()->x();
668+ return qApp->getWindow()->x();
669669 }
670670
671671 int WindowScriptingInterface::getY() {
672− return Application::getInstance()->getWindow()->y();
672+ return qApp->getWindow()->y();
673673 }