diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 4fb93bb1c6..df26a9a9a6 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -1,5 +1,6 @@ -from PyQt5.QtCore import QObject, pyqtSlot, QUrl +from PyQt5.QtCore import QObject, QUrl from PyQt5.QtGui import QDesktopServices +from UM.FlameProfiler import pyqtSlot from UM.Event import CallFunctionEvent from UM.Application import Application diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2ab7837352..01b1cc331d 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -45,7 +45,8 @@ from . import MachineActionManager import cura.Settings -from PyQt5.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS +from PyQt5.QtCore import QUrl, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS +from UM.FlameProfiler import pyqtSlot from PyQt5.QtGui import QColor, QIcon from PyQt5.QtWidgets import QMessageBox from PyQt5.QtQml import qmlRegisterUncreatableType, qmlRegisterSingletonType, qmlRegisterType diff --git a/cura/MachineActionManager.py b/cura/MachineActionManager.py index 6061a2e49b..74b1d3bd08 100644 --- a/cura/MachineActionManager.py +++ b/cura/MachineActionManager.py @@ -6,7 +6,8 @@ from UM.PluginRegistry import PluginRegistry # So MachineAction can be added as from UM.Settings.ContainerRegistry import ContainerRegistry from UM.Settings.DefinitionContainer import DefinitionContainer -from PyQt5.QtCore import QObject, pyqtSlot +from PyQt5.QtCore import QObject +from UM.FlameProfiler import pyqtSlot ## Raised when trying to add an unknown machine action as a required action class UnknownMachineActionError(Exception): diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index b65101ecc7..24316829ef 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -1,7 +1,8 @@ # Copyright (c) 2015 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot +from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty +from UM.FlameProfiler import pyqtSlot from UM.Application import Application from UM.Qt.Duration import Duration diff --git a/cura/Settings/ContainerManager.py b/cura/Settings/ContainerManager.py index 93caa89106..4646961adb 100644 --- a/cura/Settings/ContainerManager.py +++ b/cura/Settings/ContainerManager.py @@ -4,7 +4,8 @@ import os.path import urllib -from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal, QUrl, QVariant +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal, QUrl, QVariant +from UM.FlameProfiler import pyqtSlot from PyQt5.QtWidgets import QMessageBox import UM.PluginRegistry diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index e98386a908..81579f74d0 100644 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -1,7 +1,8 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import pyqtSignal, pyqtProperty, pyqtSlot, QObject, QVariant #For communicating data and events to Qt. +from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject, QVariant #For communicating data and events to Qt. +from UM.FlameProfiler import pyqtSlot import UM.Application #To get the global container stack to find the current machine. import UM.Logger diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 6bc407928b..329bf90b7a 100644 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1,7 +1,8 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal +from UM.FlameProfiler import pyqtSlot from PyQt5.QtWidgets import QMessageBox from UM import Util diff --git a/cura/Settings/SettingInheritanceManager.py b/cura/Settings/SettingInheritanceManager.py index 735feeee99..2b1201fb37 100644 --- a/cura/Settings/SettingInheritanceManager.py +++ b/cura/Settings/SettingInheritanceManager.py @@ -1,7 +1,8 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import QObject, pyqtSlot, pyqtProperty, pyqtSignal +from PyQt5.QtCore import QObject, pyqtProperty, pyqtSignal +from UM.FlameProfiler import pyqtSlot import UM.Settings from UM.Application import Application import cura.Settings diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index c26f0707f6..8e16404b0a 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -1,7 +1,8 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot, QObject, pyqtProperty, QCoreApplication +from PyQt5.QtCore import Qt, QUrl, pyqtSignal, QObject, pyqtProperty, QCoreApplication +from UM.FlameProfiler import pyqtSlot from PyQt5.QtQml import QQmlComponent, QQmlContext from UM.PluginRegistry import PluginRegistry from UM.Application import Application diff --git a/plugins/ImageReader/ImageReaderUI.py b/plugins/ImageReader/ImageReaderUI.py index 68a0c8df09..dc8d7015b6 100644 --- a/plugins/ImageReader/ImageReaderUI.py +++ b/plugins/ImageReader/ImageReaderUI.py @@ -4,9 +4,9 @@ import os import threading -from PyQt5.QtCore import Qt, QUrl, pyqtSignal, pyqtSlot, QObject +from PyQt5.QtCore import Qt, QUrl, pyqtSignal, QObject from PyQt5.QtQml import QQmlComponent, QQmlContext - +from UM.FlameProfiler import pyqtSlot from UM.Application import Application from UM.PluginRegistry import PluginRegistry from UM.Logger import Logger diff --git a/plugins/LayerView/LayerViewProxy.py b/plugins/LayerView/LayerViewProxy.py index e9319ef6e1..dd5ba5e2e0 100644 --- a/plugins/LayerView/LayerViewProxy.py +++ b/plugins/LayerView/LayerViewProxy.py @@ -1,4 +1,5 @@ -from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty +from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty +from UM.FlameProfiler import pyqtSlot from UM.Application import Application import LayerView diff --git a/plugins/MachineSettingsAction/MachineSettingsAction.py b/plugins/MachineSettingsAction/MachineSettingsAction.py index 6364a69ce7..7141099416 100644 --- a/plugins/MachineSettingsAction/MachineSettingsAction.py +++ b/plugins/MachineSettingsAction/MachineSettingsAction.py @@ -1,7 +1,8 @@ # Copyright (c) 2016 Ultimaker B.V. # Cura is released under the terms of the AGPLv3 or higher. -from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot +from PyQt5.QtCore import pyqtProperty, pyqtSignal +from UM.FlameProfiler import pyqtSlot from cura.MachineAction import MachineAction diff --git a/plugins/UltimakerMachineActions/BedLevelMachineAction.py b/plugins/UltimakerMachineActions/BedLevelMachineAction.py index 117b2c99e2..04b6cf1acc 100644 --- a/plugins/UltimakerMachineActions/BedLevelMachineAction.py +++ b/plugins/UltimakerMachineActions/BedLevelMachineAction.py @@ -1,7 +1,7 @@ from cura.MachineAction import MachineAction from cura.PrinterOutputDevice import PrinterOutputDevice -from PyQt5.QtCore import pyqtSlot +from UM.FlameProfiler import pyqtSlot from UM.Application import Application from UM.i18n import i18nCatalog