diff options
Diffstat (limited to 'debugger/QT')
-rw-r--r-- | debugger/QT/SkCanvasWidget.cpp | 8 | ||||
-rw-r--r-- | debugger/QT/SkCanvasWidget.h | 4 | ||||
-rw-r--r-- | debugger/QT/SkDebuggerGUI.cpp | 2 | ||||
-rw-r--r-- | debugger/QT/SkDebuggerGUI.h | 4 | ||||
-rw-r--r-- | debugger/QT/SkGLWidget.cpp | 2 | ||||
-rw-r--r-- | debugger/QT/SkGLWidget.h | 2 | ||||
-rw-r--r-- | debugger/QT/SkRasterWidget.cpp | 2 | ||||
-rw-r--r-- | debugger/QT/SkRasterWidget.h | 10 | ||||
-rw-r--r-- | debugger/QT/SkSettingsWidget.h | 4 |
9 files changed, 19 insertions, 19 deletions
diff --git a/debugger/QT/SkCanvasWidget.cpp b/debugger/QT/SkCanvasWidget.cpp index 49b1526531..03ba33ac5f 100644 --- a/debugger/QT/SkCanvasWidget.cpp +++ b/debugger/QT/SkCanvasWidget.cpp @@ -55,7 +55,7 @@ void SkCanvasWidget::drawTo(int index) { #if SK_SUPPORT_GPU fGLWidget.updateImage(); #endif - emit commandChanged(fDebugger->index()); + Q_EMIT commandChanged(fDebugger->index()); } void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) { @@ -69,7 +69,7 @@ void SkCanvasWidget::mouseMoveEvent(QMouseEvent* event) { void SkCanvasWidget::mousePressEvent(QMouseEvent* event) { fPreviousPoint.set(event->globalX(), event->globalY()); - emit hitChanged(fDebugger->getCommandAtPoint(event->x(), event->y(), + Q_EMIT hitChanged(fDebugger->getCommandAtPoint(event->x(), event->y(), fDebugger->index())); } @@ -117,7 +117,7 @@ void SkCanvasWidget::snapWidgetTransform() { void SkCanvasWidget::resetWidgetTransform() { fUserMatrix.reset(); fDebugger->setUserMatrix(fUserMatrix); - emit scaleFactorChanged(fUserMatrix.getScaleX()); + Q_EMIT scaleFactorChanged(fUserMatrix.getScaleX()); drawTo(fDebugger->index()); } @@ -141,7 +141,7 @@ void SkCanvasWidget::setGLSampleCount(int sampleCount) void SkCanvasWidget::zoom(float scale, int px, int py) { fUserMatrix.postScale(scale, scale, px, py); - emit scaleFactorChanged(fUserMatrix.getScaleX()); + Q_EMIT scaleFactorChanged(fUserMatrix.getScaleX()); fDebugger->setUserMatrix(fUserMatrix); drawTo(fDebugger->index()); } diff --git a/debugger/QT/SkCanvasWidget.h b/debugger/QT/SkCanvasWidget.h index 330861342f..45ab0a4f03 100644 --- a/debugger/QT/SkCanvasWidget.h +++ b/debugger/QT/SkCanvasWidget.h @@ -49,14 +49,14 @@ public: kIn_ZoomCommand, kOut_ZoomCommand, }; -public slots: +public Q_SLOTS: /** * Zooms in or out (see ZoomCommandTypes) by the standard zoom factor * with the transformation centered in the middle of the widget. */ void zoom(int zoomCommand); -signals: +Q_SIGNALS: void scaleFactorChanged(float newScaleFactor); void commandChanged(int newCommand); void hitChanged(int hit); diff --git a/debugger/QT/SkDebuggerGUI.cpp b/debugger/QT/SkDebuggerGUI.cpp index 0c369f6113..afb5c6dc5f 100644 --- a/debugger/QT/SkDebuggerGUI.cpp +++ b/debugger/QT/SkDebuggerGUI.cpp @@ -662,7 +662,7 @@ void SkDebuggerGUI::populateDirectoryWidget() { } // add any new files - foreach (QString f, files) { + Q_FOREACH (QString f, files) { if (f.contains(r) && fDirectoryWidget.findItems(f, Qt::MatchExactly).size() == 0) { fDirectoryWidget.addItem(f); } diff --git a/debugger/QT/SkDebuggerGUI.h b/debugger/QT/SkDebuggerGUI.h index 9f00efaa9e..871f7974b2 100644 --- a/debugger/QT/SkDebuggerGUI.h +++ b/debugger/QT/SkDebuggerGUI.h @@ -64,10 +64,10 @@ public: */ void openFile(const QString& filename); -signals: +Q_SIGNALS: void commandChanged(int command); -private slots: +private Q_SLOTS: /** Toggles breakpoint view in the list widget. */ diff --git a/debugger/QT/SkGLWidget.cpp b/debugger/QT/SkGLWidget.cpp index 55bf963b1a..dd78db57f3 100644 --- a/debugger/QT/SkGLWidget.cpp +++ b/debugger/QT/SkGLWidget.cpp @@ -79,7 +79,7 @@ void SkGLWidget::paintGL() { fDebugger->draw(fCanvas.get()); // TODO(chudy): Implement an optional flush button in Gui. fCanvas->flush(); - emit drawComplete(); + Q_EMIT drawComplete(); } } diff --git a/debugger/QT/SkGLWidget.h b/debugger/QT/SkGLWidget.h index baef126138..28cbcffd7c 100644 --- a/debugger/QT/SkGLWidget.h +++ b/debugger/QT/SkGLWidget.h @@ -35,7 +35,7 @@ public: } void setSampleCount(int sampleCount); -signals: +Q_SIGNALS: void drawComplete(); protected: diff --git a/debugger/QT/SkRasterWidget.cpp b/debugger/QT/SkRasterWidget.cpp index 203d98ee4e..b5ef492ca7 100644 --- a/debugger/QT/SkRasterWidget.cpp +++ b/debugger/QT/SkRasterWidget.cpp @@ -45,7 +45,7 @@ void SkRasterWidget::paintEvent(QPaintEvent* event) { fDebugger->draw(fSurface->getCanvas()); fSurface->getCanvas()->flush(); fNeedImageUpdate = false; - emit drawComplete(); + Q_EMIT drawComplete(); } SkImageInfo info; diff --git a/debugger/QT/SkRasterWidget.h b/debugger/QT/SkRasterWidget.h index 09b529c049..d3ddaa24b3 100644 --- a/debugger/QT/SkRasterWidget.h +++ b/debugger/QT/SkRasterWidget.h @@ -1,11 +1,11 @@ + /* - * SkRasterWidget.h + * Copyright 2016 Google Inc. * - * Created on: Jul 28, 2012 - * Author: chudy + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ - #ifndef SKRASTERWIDGET_H_ #define SKRASTERWIDGET_H_ @@ -22,7 +22,7 @@ public: void updateImage(); -signals: +Q_SIGNALS: void drawComplete(); protected: diff --git a/debugger/QT/SkSettingsWidget.h b/debugger/QT/SkSettingsWidget.h index 012abc0d12..dec938e650 100644 --- a/debugger/QT/SkSettingsWidget.h +++ b/debugger/QT/SkSettingsWidget.h @@ -81,9 +81,9 @@ public: return fPathOpsCheckBox.isChecked(); } -private slots: +private Q_SLOTS: -signals: +Q_SIGNALS: void visualizationsChanged(); void texFilterSettingsChanged(); #if SK_SUPPORT_GPU |