Gui: move QuiLoader for MinGW to global namespace
This commit is contained in:
@@ -203,7 +203,6 @@ Py::Object PySideUicModule::createCustomWidget(const Py::Tuple& args)
|
||||
// ----------------------------------------------------
|
||||
|
||||
#if !defined (HAVE_QT_UI_TOOLS)
|
||||
namespace Gui {
|
||||
QUiLoader::QUiLoader(QObject* parent)
|
||||
{
|
||||
Base::PyGILStateLocker lock;
|
||||
@@ -482,7 +481,6 @@ QString QUiLoader::errorString() const
|
||||
return QString();
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------
|
||||
|
||||
@@ -46,21 +46,6 @@ class QWidget;
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
||||
namespace Gui {
|
||||
|
||||
class PySideUicModule : public Py::ExtensionModule<PySideUicModule>
|
||||
{
|
||||
|
||||
public:
|
||||
PySideUicModule();
|
||||
virtual ~PySideUicModule() {}
|
||||
|
||||
private:
|
||||
Py::Object loadUiType(const Py::Tuple& args);
|
||||
Py::Object loadUi(const Py::Tuple& args);
|
||||
Py::Object createCustomWidget(const Py::Tuple&);
|
||||
};
|
||||
|
||||
#if !defined (HAVE_QT_UI_TOOLS)
|
||||
class QUiLoader : public QObject
|
||||
{
|
||||
@@ -98,6 +83,21 @@ private:
|
||||
};
|
||||
#endif
|
||||
|
||||
namespace Gui {
|
||||
|
||||
class PySideUicModule : public Py::ExtensionModule<PySideUicModule>
|
||||
{
|
||||
|
||||
public:
|
||||
PySideUicModule();
|
||||
virtual ~PySideUicModule() {}
|
||||
|
||||
private:
|
||||
Py::Object loadUiType(const Py::Tuple& args);
|
||||
Py::Object loadUi(const Py::Tuple& args);
|
||||
Py::Object createCustomWidget(const Py::Tuple&);
|
||||
};
|
||||
|
||||
/**
|
||||
* The UiLoader class provides the abitlity to use the widget factory
|
||||
* framework of FreeCAD within the framework provided by Qt. This class
|
||||
|
||||
Reference in New Issue
Block a user