kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Remove all PyQt references

Browse Source
This commit is contained in:
Pesc0
2023-03-31 00:13:47 +02:00
committed by 0penBrain
parent 53aa302d8b
commit 99e13d9529
8 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake
View File

@@ -25,7 +25,6 @@ macro(InitializeFreeCADBuildOptions)
option(FREECAD_RELEASE_PDB "Create PDB files for Release version." ON)
option(FREECAD_RELEASE_SEH "Enable Structured Exception Handling for Release version." ON)
option(FREECAD_LIBPACK_USE "Use the LibPack to Build FreeCAD (only Win32 so far)." ON)
option(FREECAD_LIBPACK_USEPYSIDE "Use PySide in LibPack rather to PyQt and Swig." ON)
option(FREECAD_USE_PCH "Activate precompiled headers where it's used." ON)
if (DEFINED ENV{FREECAD_LIBPACK_DIR})

1
ci/Dockerfile
View File

@@ -88,7 +88,6 @@ RUN apt-get install -y \
python3-matplotlib \
python3-pivy \
python3-ply \
python3-pyqt5 \
python3-pyside2.* \
python3-pyside2.qtcore \
python3-pyside2.qtgui \

17
src/Gui/PythonWrapper.cpp
View File

@@ -547,11 +547,6 @@ QObject* PythonWrapper::toQObject(const Py::Object& pyobject)
return static_cast<QObject*>(ptr);
#endif
#ifdef HAVE_PYQT // Unwrapping using sip/PyQt
void* ptr = qt_getCppPointer(pyobject, "sip", "unwrapinstance");
return static_cast<QObject*>(ptr);
#endif
return nullptr;
}
@@ -668,9 +663,6 @@ Py::Object PythonWrapper::fromQPrinter(QPrinter* printer)
//
return qt_wrapInstance<QPrinter*>(printer, "QPrinter", shiboken, PySide + ".QtCore", "wrapInstance");
#endif
#ifdef HAVE_PYQT // Unwrapping using sip/PyQt
return qt_wrapInstance<QPrinter*>(printer, "QPrinter", "sip", "PyQt5.QtCore", "wrapinstance");
#endif
}
Py::Object PythonWrapper::fromQObject(QObject* object, const char* className)
@@ -702,10 +694,6 @@ Py::Object PythonWrapper::fromQObject(QObject* object, const char* className)
//
return qt_wrapInstance<QObject*>(object, className, shiboken, PySide + ".QtCore", "wrapInstance");
#endif
#ifdef HAVE_PYQT // Unwrapping using sip/PyQt
Q_UNUSED(className);
return qt_wrapInstance<QObject*>(object, "QObject", "sip", "PyQt5.QtCore", "wrapinstance");
#endif
}
Py::Object PythonWrapper::fromQWidget(QWidget* widget, const char* className)
@@ -736,11 +724,6 @@ Py::Object PythonWrapper::fromQWidget(QWidget* widget, const char* className)
//
return qt_wrapInstance<QWidget*>(widget, className, shiboken, PySide + ".QtWidgets", "wrapInstance");
#endif
#ifdef HAVE_PYQT // Unwrapping using sip/PyQt
Q_UNUSED(className);
return qt_wrapInstance<QWidget*>(widget, "QWidget", "sip", "PyQt5.QtWidgets", "wrapinstance");
#endif
}
const char* PythonWrapper::getWrapperName(QObject* obj) const

2
src/Mod/PartDesign/FeatureHole/HoleGui.py
View File

@@ -22,7 +22,7 @@
import FreeCAD, FreeCADGui
import PartDesignGui
from PyQt4 import QtCore, QtGui
from PySide import QtCore, QtGui
from TaskHole import TaskHole
from FeatureHole import Hole
from ViewProviderHole import ViewProviderHole

2
src/Mod/PartDesign/FeatureHole/TaskHole.py
View File

@@ -22,7 +22,7 @@
import FreeCAD, FreeCADGui
import Part, PartDesignGui
from PyQt4 import QtCore, QtGui
from PySide import QtCore, QtGui
import Standards
import os

8
src/Mod/Plot/Plot.py
View File

@@ -30,13 +30,7 @@ try:
import matplotlib
matplotlib.use('Qt5Agg')
# Force matplotlib to use PySide backend by temporarily unloading PyQt
if 'PyQt5.QtCore' in sys.modules:
del sys.modules['PyQt5.QtCore']
import matplotlib.pyplot as plt
import PyQt5.QtCore
else:
import matplotlib.pyplot as plt
import matplotlib.pyplot as plt
from matplotlib.backends.backend_qt5agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt5agg import NavigationToolbar2QT as NavigationToolbar

20
src/Mod/Sandbox/Gui/Command.cpp
View File

@@ -358,23 +358,23 @@ void CmdSandboxPythonNolockThread::activated(int)
// -------------------------------------------------------------------------------
DEF_STD_CMD(CmdSandboxPyQtThread)
DEF_STD_CMD(CmdSandboxPySideThread)
CmdSandboxPyQtThread::CmdSandboxPyQtThread()
:Command("Sandbox_PyQtThread")
CmdSandboxPySideThread::CmdSandboxPySideThread()
:Command("Sandbox_PySideThread")
{
sAppModule = "Sandbox";
sGroup = QT_TR_NOOP("Sandbox");
sMenuText = QT_TR_NOOP("PyQt threads");
sToolTipText = QT_TR_NOOP("Use PyQt's thread module");
sWhatsThis = "Sandbox_PyQtThread";
sStatusTip = QT_TR_NOOP("Use PyQt's thread module");
sMenuText = QT_TR_NOOP("PySide threads");
sToolTipText = QT_TR_NOOP("Use PySide's thread module");
sWhatsThis = "Sandbox_PySideThread";
sStatusTip = QT_TR_NOOP("Use PySide's thread module");
}
void CmdSandboxPyQtThread::activated(int)
void CmdSandboxPySideThread::activated(int)
{
doCommand(Doc,
"from PyQt4 import QtCore; import Sandbox\n"
"from PySide import QtCore; import Sandbox\n"
"class Thread(QtCore.QThread):\n"
" def run(self):\n"
" dp=Sandbox.DocumentProtector(doc)\n"
@@ -1432,7 +1432,7 @@ void CreateSandboxCommands()
rcCmdMgr.addCommand(new CmdSandboxWorkerThread());
rcCmdMgr.addCommand(new CmdSandboxPythonLockThread());
rcCmdMgr.addCommand(new CmdSandboxPythonNolockThread());
rcCmdMgr.addCommand(new CmdSandboxPyQtThread());
rcCmdMgr.addCommand(new CmdSandboxPySideThread());
rcCmdMgr.addCommand(new CmdSandboxPythonThread());
rcCmdMgr.addCommand(new CmdSandboxPythonMainThread());
rcCmdMgr.addCommand(new CmdSandboxDocThreadWithDialog());

2
src/Mod/Sandbox/Gui/Workbench.cpp
View File

@@ -84,7 +84,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
Gui::MenuItem* threads = new Gui::MenuItem;
threads->setCommand("Python Threads");
*threads << "Sandbox_PythonLockThread" << "Sandbox_NolockPython"
<< "Sandbox_PyQtThread" << "Sandbox_PythonThread" << "Sandbox_PythonMainThread";
<< "Sandbox_PySideThread" << "Sandbox_PythonThread" << "Sandbox_PythonMainThread";
test->setCommand("Threads");
*test << "Sandbox_Thread" << "Sandbox_TestThread" << "Sandbox_SaveThread"
<< "Sandbox_WorkerThread" << "Sandbox_SeqThread"