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

Unified · Split

interface/src/scripting/WebWindowClass.cpp+3−3
@@ -41,7 +41,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 40 unmodified lines
41 _isToolWindow(isToolWindow) {41 _isToolWindow(isToolWindow) {
42 42
43 if (_isToolWindow) {43 if (_isToolWindow) {
44 ToolWindow* toolWindow = Application::getInstance()->getToolWindow();44 ToolWindow* toolWindow = qApp->getToolWindow();
45 45
46 auto dockWidget = new QDockWidget(title, toolWindow);46 auto dockWidget = new QDockWidget(title, toolWindow);
47 dockWidget->setFeatures(QDockWidget::DockWidgetMovable);47 dockWidget->setFeatures(QDockWidget::DockWidgetMovable);
@@ -56,7 +56,7 @@ WebWindowClass::WebWindowClass(const QString& title, const QString& url, int wid · 8 unmodified lines
56 56
57 _windowWidget = dockWidget;57 _windowWidget = dockWidget;
58 } else {58 } else {
59 auto dialogWidget = new QDialog(Application::getInstance()->getWindow(), Qt::Window);59 auto dialogWidget = new QDialog(qApp->getWindow(), Qt::Window);
60 dialogWidget->setWindowTitle(title);60 dialogWidget->setWindowTitle(title);
61 dialogWidget->resize(width, height);61 dialogWidget->resize(width, height);
62 dialogWidget->installEventFilter(this);62 dialogWidget->installEventFilter(this);
@@ -120,7 +120,7 @@ void WebWindowClass::setVisible(bool visible) { · 57 unmodified lines
120 if (visible) {120 if (visible) {
121 if (_isToolWindow) {121 if (_isToolWindow) {
122 QMetaObject::invokeMethod(122 QMetaObject::invokeMethod(
123 Application::getInstance()->getToolWindow(), "setVisible", Qt::AutoConnection, Q_ARG(bool, visible));123 qApp->getToolWindow(), "setVisible", Qt::AutoConnection, Q_ARG(bool, visible));
124 } else {124 } else {
125 QMetaObject::invokeMethod(_windowWidget, "showNormal", Qt::AutoConnection);125 QMetaObject::invokeMethod(_windowWidget, "showNormal", Qt::AutoConnection);
126 QMetaObject::invokeMethod(_windowWidget, "raise", Qt::AutoConnection);126 QMetaObject::invokeMethod(_windowWidget, "raise", Qt::AutoConnection);