Several changes:

 - UpdatePasswordWidget does not delete itself when done but emit a signal. (It is useful when the widget is not in a dialog)
 - int role was still used in some places (instead of ItemDataRole)
 - refactorings and changes for JWt 4
 - Fixing access modifiers that Java is stricter about

Author: RockinRoel

examples/treeview-dragdrop/CsvUtil.C

@@ -18,7 +18,7 @@ public:
     return std::unique_ptr<NumericItem>(cpp14::make_unique<NumericItem>());
   }
 
-  virtual void setData(const cpp17::any &data, int role = ItemDataRole::User) {
+  virtual void setData(const cpp17::any &data, ItemDataRole role = ItemDataRole::User) {
     cpp17::any dt;
 
     if (role == ItemDataRole::Edit) {

examples/widgetgallery/examples/GitModel.cpp

@@ -8,7 +8,11 @@ class GitModel : public Wt::WAbstractItemModel
     /*
      * A custom role for the file contents of a Git BLOB object.
      */
+#ifndef WT_TARGET_JAVA
     static constexpr Wt::ItemDataRole ContentsRole = Wt::ItemDataRole::User + 1;
+#else
+    static constexpr Wt::ItemDataRole ContentsRole = Wt::ItemDataRole::User.value() + 1;
+#endif
 
     GitModel(const std::string& repository)
         : WAbstractItemModel()

examples/widgetgallery/examples/PieChart.cpp

@@ -21,7 +21,7 @@ namespace {
             return cpp14::make_unique<NumericItem>();
 	}
 
-        virtual void setData(const cpp17::any &data, int role = ItemDataRole::User) {
+        virtual void setData(const cpp17::any &data, ItemDataRole role = ItemDataRole::User) {
     if (role == ItemDataRole::Edit) {
       cpp17::any dt;
 

examples/widgetgallery/examples/VirtualModel.cpp

@@ -27,14 +27,13 @@ class VirtualModel : public Wt::WAbstractTableModel
 
   virtual Wt::cpp17::any data(const Wt::WModelIndex& index, Wt::ItemDataRole role = Wt::ItemDataRole::Display) const
   {
-    switch (role.value()) {
-    case Wt::ItemDataRole::Display:
+    if (role == Wt::ItemDataRole::Display) {
       if (index.column() == 0)
         return Wt::WString("Row {1}").arg(index.row());
       else
         return Wt::WString("Item row {1}, col {2}")
 	  .arg(index.row()).arg(index.column());
-    default:
+    } else {
       return Wt::cpp17::any();
     }
   }
@@ -44,10 +43,9 @@ class VirtualModel : public Wt::WAbstractTableModel
                                 Wt::ItemDataRole role = Wt::ItemDataRole::Display) const
   {
     if (orientation == Wt::Orientation::Horizontal) {
-      switch (role.value()) {
-      case Wt::ItemDataRole::Display:
+      if (role == Wt::ItemDataRole::Display) {
         return Wt::WString("Column {1}").arg(section);
-      default:
+      } else {
         return Wt::cpp17::any();
       }
     } else

src/Wt/Auth/LostPasswordWidget.C

@@ -13,9 +13,6 @@
 #include "Wt/WPushButton.h"
 
 namespace {
-  void deleteBox(Wt::WMessageBox *box) {
-    Wt::WApplication::instance()->removeChild(box);
-  }
 }
 
 namespace Wt {
@@ -59,7 +56,8 @@ void LostPasswordWidget::send()
                      Icon::None, StandardButton::Ok));
   box->show();
 
-  box->buttonClicked().connect(std::bind(&deleteBox, box.get()));
+  WMessageBox *const boxPtr = box.get();
+  box->buttonClicked().connect(this, std::bind(&LostPasswordWidget::deleteBox, this, boxPtr));
   WApplication::instance()->addChild(std::move(box));
 }
 
@@ -68,5 +66,10 @@ void LostPasswordWidget::cancel()
   removeFromParent();
 }
 
+void LostPasswordWidget::deleteBox(Wt::WMessageBox *box) const
+{
+  Wt::WApplication::instance()->removeChild(box);
+}
+
   }
 }

src/Wt/Auth/LostPasswordWidget.h

@@ -41,6 +41,8 @@ class WT_API LostPasswordWidget : public WTemplate
 private:
   AbstractUserDatabase& users_;
   const AuthService& baseAuth_;
+
+  void deleteBox(Wt::WMessageBox *box) const;
 };
 
   }

src/Wt/Auth/OidcService.C

@@ -35,7 +35,7 @@ LOGGER("Auth.OidcService");
     httpClient_->setTimeout(std::chrono::seconds(15));
     httpClient_->setMaximumResponseSize(10 * 1024);
 
-    httpClient_->done().connect(std::bind(&OidcProcess::handleResponse,
+    httpClient_->done().connect(this, std::bind(&OidcProcess::handleResponse,
                                        this, std::placeholders::_1, std::placeholders::_2));
 
     std::vector<Http::Message::Header> headers;

src/Wt/Auth/UpdatePasswordWidget.C

@@ -84,7 +84,7 @@ UpdatePasswordWidget
     password->setFocus(true);
 
   okButton->clicked().connect(this, &UpdatePasswordWidget::doUpdate);
-  cancelButton->clicked().connect(this, &UpdatePasswordWidget::close);
+  cancelButton->clicked().connect(this, &UpdatePasswordWidget::cancel);
 }
 
 std::unique_ptr<WWidget> UpdatePasswordWidget
@@ -165,13 +165,13 @@ void UpdatePasswordWidget::doUpdate()
     registrationModel_->passwordAuth()->updatePassword(user_, password);
     registrationModel_->login().login(user_);
 
-    close();
+    updated_.emit();
   }
 }
 
-void UpdatePasswordWidget::close()
+void UpdatePasswordWidget::cancel()
 {
-  removeFromParent();
+  canceled_.emit();
 }
 
   }

src/Wt/Auth/UpdatePasswordWidget.h

@@ -41,6 +41,14 @@ class WT_API UpdatePasswordWidget : public WTemplateFormView
 		       std::unique_ptr<RegistrationModel> registrationModel,
 		       const std::shared_ptr<AuthModel>& authModel);
 
+  /*! \brief Signal emitted when the password was updated.
+   */
+  Signal<>& updated() { return updated_; }
+
+  /*! \brief Signal emitted when cancel clicked.
+   */
+  Signal<>& canceled() { return canceled_; }
+
 protected:
   virtual std::unique_ptr<WWidget> createFormWidget(WFormModel::Field field)
     override;
@@ -50,12 +58,14 @@ class WT_API UpdatePasswordWidget : public WTemplateFormView
 
   std::unique_ptr<RegistrationModel> registrationModel_;
   std::shared_ptr<AuthModel> authModel_;
+  Signal<> updated_;
+  Signal<> canceled_;
 
   void checkPassword();
   void checkPassword2();
   bool validate();
   void doUpdate();
-  void close();
+  void cancel();
 };
 
   }

src/Wt/Chart/WAbstractDataSeries3D.C

@@ -158,7 +158,7 @@ void WAbstractDataSeries3D::setHidden(bool enabled)
 WGLWidget::Texture WAbstractDataSeries3D::colorTexture()
 {
   std::unique_ptr<WPaintDevice> cpd;
-  if (colormap_ == 0) {
+  if (!colormap_) {
     cpd = chart_->createPaintDevice(WLength(1),WLength(1));
     WColor seriesColor = chartpaletteColor();
     WPainter painter(cpd.get());