diff --git a/src/Mod/Web/App/AppWeb.cpp b/src/Mod/Web/App/AppWeb.cpp index 6dc1b479be..41bc08c725 100644 --- a/src/Mod/Web/App/AppWeb.cpp +++ b/src/Mod/Web/App/AppWeb.cpp @@ -158,7 +158,7 @@ private: Py::Object pyobj(obj); if (pyobj.isNone()) - Web::Firewall::setInstance(0); + Web::Firewall::setInstance(nullptr); else Web::Firewall::setInstance(new Web::FirewallPython(pyobj)); diff --git a/src/Mod/Web/App/Server.cpp b/src/Mod/Web/App/Server.cpp index 1e2a3de8e1..f1ece0d26d 100644 --- a/src/Mod/Web/App/Server.cpp +++ b/src/Mod/Web/App/Server.cpp @@ -36,7 +36,7 @@ using namespace Web; -Firewall* Firewall::instance = 0; +Firewall* Firewall::instance = nullptr; Firewall* Firewall::getInstance() { diff --git a/src/Mod/Web/Gui/AppWebGui.cpp b/src/Mod/Web/Gui/AppWebGui.cpp index 6277307431..5fd356ae84 100644 --- a/src/Mod/Web/Gui/AppWebGui.cpp +++ b/src/Mod/Web/Gui/AppWebGui.cpp @@ -107,7 +107,7 @@ private: PyMem_Free(TabName); } - WebGui::BrowserView* pcBrowserView = 0; + WebGui::BrowserView* pcBrowserView = nullptr; pcBrowserView = new WebGui::BrowserView(Gui::getMainWindow()); pcBrowserView->resize(400, 300); pcBrowserView->setHtml(QString::fromUtf8(HtmlCode),QUrl(QString::fromLatin1(BaseUrl))); @@ -133,7 +133,7 @@ private: PyMem_Free(TabName); } - WebGui::BrowserView* pcBrowserView = 0; + WebGui::BrowserView* pcBrowserView = nullptr; pcBrowserView = new WebGui::BrowserView(Gui::getMainWindow()); pcBrowserView->resize(400, 300); pcBrowserView->setWindowTitle(QString::fromUtf8(EncodedName.c_str())); @@ -158,7 +158,7 @@ PyMOD_INIT_FUNC(WebGui) { if (!Gui::Application::Instance) { PyErr_SetString(PyExc_ImportError, "Cannot load Gui module in console application."); - PyMOD_Return(0); + PyMOD_Return(nullptr); } PyObject* mod = WebGui::initModule(); diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index c58f0c0e56..1d400fe34d 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -429,7 +429,7 @@ TYPESYSTEM_SOURCE_ABSTRACT(WebGui::BrowserView, Gui::MDIView) * name 'name'. */ BrowserView::BrowserView(QWidget* parent) - : MDIView(0,parent,Qt::WindowFlags()), + : MDIView(nullptr,parent,Qt::WindowFlags()), WindowParameter( "Browser" ), isLoading(false) { diff --git a/src/Mod/Web/Gui/BrowserView.h b/src/Mod/Web/Gui/BrowserView.h index 75f7640013..cb5b8dea00 100644 --- a/src/Mod/Web/Gui/BrowserView.h +++ b/src/Mod/Web/Gui/BrowserView.h @@ -54,7 +54,7 @@ class WebGuiExport WebView : public QWebView Q_OBJECT public: - WebView(QWidget *parent = 0); + WebView(QWidget *parent = nullptr); protected: void mousePressEvent(QMouseEvent *event); diff --git a/src/Mod/Web/Gui/CookieJar.h b/src/Mod/Web/Gui/CookieJar.h index 425612eb44..d79788b201 100644 --- a/src/Mod/Web/Gui/CookieJar.h +++ b/src/Mod/Web/Gui/CookieJar.h @@ -37,7 +37,7 @@ namespace WebGui { Q_OBJECT public: - FcCookieJar(QObject* parent = 0); + FcCookieJar(QObject* parent = nullptr); virtual ~FcCookieJar(); virtual bool setCookiesFromUrl(const QList&, const QUrl&);