Many small changes (refactorings) for JWt 4 conversion

Author: RockinRoel

examples/widgetgallery/DeferredWidget.h

@@ -35,13 +35,13 @@ std::unique_ptr<DeferredWidget<Function>> deferCreate(Function f)
   return Wt::cpp14::make_unique<DeferredWidget<Function>>(f);
 }
 #else
-class DeferredWidget : public WContainerWidget {
+class DeferredWidget : public Wt::WContainerWidget {
 public:
-  DeferredWidget(std::fuction<std::unique_ptr<WWidget>>() f) {}
+  DeferredWidget(std::bound f) {}
 };
-std::unique_ptr<DeferredWidget> deferCreate(std::function<std::unique_ptr<WWidget>> b)
+std::unique_ptr<DeferredWidget> deferCreate(std::bound b)
 {
-  return cpp14::make_unique<DeferredWidget>(b);
+  return Wt::cpp14::make_unique<DeferredWidget>(b);
 }
 
 #endif

examples/widgetgallery/EventsDemo.h

@@ -18,9 +18,9 @@ class EventsDemo : public TopicWidget
   void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> wKeyEvent();
-  std::unique_ptr<WWidget> wMouseEvent();
-  std::unique_ptr<WWidget> wDropEvent();
+  std::unique_ptr<Wt::WWidget> wKeyEvent();
+  std::unique_ptr<Wt::WWidget> wMouseEvent();
+  std::unique_ptr<Wt::WWidget> wDropEvent();
 
   void showKeyWentUp(const Wt::WKeyEvent &e);
   void showKeyWentDown(const Wt::WKeyEvent &e);

examples/widgetgallery/FormWidgets.C

@@ -8,6 +8,7 @@
 #include "DeferredWidget.h"
 
 #include <Wt/WMenu.h>
+#include <Wt/WString.h>
 
 FormWidgets::FormWidgets()
   : TopicWidget()

examples/widgetgallery/FormWidgets.h

@@ -12,6 +12,8 @@
 
 #include "Wt/WStandardItemModel.h"
 
+#include <memory>
+
 class EventDisplayer;
 
 class FormWidgets : public TopicWidget
@@ -22,21 +24,21 @@ class FormWidgets : public TopicWidget
   void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> introduction();
-  std::unique_ptr<WWidget> textEditors();
-  std::unique_ptr<WWidget> checkBox();
-  std::unique_ptr<WWidget> radioButton();
-  std::unique_ptr<WWidget> comboBox();
-  std::unique_ptr<WWidget> selectionBox();
-  std::unique_ptr<WWidget> autoComplete();
-  std::unique_ptr<WWidget> dateEntry();
-  std::unique_ptr<WWidget> inPlaceEdit();
-  std::unique_ptr<WWidget> slider();
-  std::unique_ptr<WWidget> progressBar();
-  std::unique_ptr<WWidget> fileUpload();
-  std::unique_ptr<WWidget> pushButton();
-  std::unique_ptr<WWidget> validation();
-  std::unique_ptr<WWidget> example();
+  std::unique_ptr<Wt::WWidget> introduction();
+  std::unique_ptr<Wt::WWidget> textEditors();
+  std::unique_ptr<Wt::WWidget> checkBox();
+  std::unique_ptr<Wt::WWidget> radioButton();
+  std::unique_ptr<Wt::WWidget> comboBox();
+  std::unique_ptr<Wt::WWidget> selectionBox();
+  std::unique_ptr<Wt::WWidget> autoComplete();
+  std::unique_ptr<Wt::WWidget> dateEntry();
+  std::unique_ptr<Wt::WWidget> inPlaceEdit();
+  std::unique_ptr<Wt::WWidget> slider();
+  std::unique_ptr<Wt::WWidget> progressBar();
+  std::unique_ptr<Wt::WWidget> fileUpload();
+  std::unique_ptr<Wt::WWidget> pushButton();
+  std::unique_ptr<Wt::WWidget> validation();
+  std::unique_ptr<Wt::WWidget> example();
 };
 
 #endif // FORMWIDGETS_H_

examples/widgetgallery/GraphicsWidgets.h

@@ -18,16 +18,16 @@ class GraphicsWidgets : public TopicWidget
   virtual void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> painting2d();
-  std::unique_ptr<WWidget> paintbrush();
-  std::unique_ptr<WWidget> categoryChart();
-  std::unique_ptr<WWidget> scatterPlot();
-  std::unique_ptr<WWidget> axisSliderWidget();
-  std::unique_ptr<WWidget> pieChart();
-  std::unique_ptr<WWidget> googleMap();
-  std::unique_ptr<WWidget> painting3d();
-  std::unique_ptr<WWidget> numCharts3d();
-  std::unique_ptr<WWidget> catCharts3d();
+  std::unique_ptr<Wt::WWidget> painting2d();
+  std::unique_ptr<Wt::WWidget> paintbrush();
+  std::unique_ptr<Wt::WWidget> categoryChart();
+  std::unique_ptr<Wt::WWidget> scatterPlot();
+  std::unique_ptr<Wt::WWidget> axisSliderWidget();
+  std::unique_ptr<Wt::WWidget> pieChart();
+  std::unique_ptr<Wt::WWidget> googleMap();
+  std::unique_ptr<Wt::WWidget> painting3d();
+  std::unique_ptr<Wt::WWidget> numCharts3d();
+  std::unique_ptr<Wt::WWidget> catCharts3d();
 
   Wt::WAbstractItemModel *readCsvFile(const std::string &fname,
 		  WContainerWidget *parent);

examples/widgetgallery/Layout.h

@@ -18,16 +18,16 @@ class Layout : public TopicWidget
   void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> containers();
-  std::unique_ptr<WWidget> templates();
-  std::unique_ptr<WWidget> text();
-  std::unique_ptr<WWidget> grouping();
-  std::unique_ptr<WWidget> layoutManagers();
-  std::unique_ptr<WWidget> dialogs();
-  std::unique_ptr<WWidget> images();
-  std::unique_ptr<WWidget> css();
-  std::unique_ptr<WWidget> themes();
-  WWidget *loadingIndicator();
+  std::unique_ptr<Wt::WWidget> containers();
+  std::unique_ptr<Wt::WWidget> templates();
+  std::unique_ptr<Wt::WWidget> text();
+  std::unique_ptr<Wt::WWidget> grouping();
+  std::unique_ptr<Wt::WWidget> layoutManagers();
+  std::unique_ptr<Wt::WWidget> dialogs();
+  std::unique_ptr<Wt::WWidget> images();
+  std::unique_ptr<Wt::WWidget> css();
+  std::unique_ptr<Wt::WWidget> themes();
+  Wt::WWidget *loadingIndicator();
   void loadingIndicatorSelected(Wt::WString indicator);
 };
 

examples/widgetgallery/Media.h

@@ -20,13 +20,13 @@ class Media : public TopicWidget
   void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> mediaPlayer();
-  std::unique_ptr<WWidget> sound();
-  std::unique_ptr<WWidget> audio();
-  std::unique_ptr<WWidget> video();
-  std::unique_ptr<WWidget> flashObject();
-  std::unique_ptr<WWidget> resources();
-  std::unique_ptr<WWidget> pdf();
+  std::unique_ptr<Wt::WWidget> mediaPlayer();
+  std::unique_ptr<Wt::WWidget> sound();
+  std::unique_ptr<Wt::WWidget> audio();
+  std::unique_ptr<Wt::WWidget> video();
+  std::unique_ptr<Wt::WWidget> flashObject();
+  std::unique_ptr<Wt::WWidget> resources();
+  std::unique_ptr<Wt::WWidget> pdf();
 };
 
 #endif // MEDIA_H_

examples/widgetgallery/Navigation.h

@@ -18,15 +18,15 @@ class Navigation : public TopicWidget
   void populateSubMenu(Wt::WMenu *menu);
 
 private:
-  std::unique_ptr<WWidget> internalPaths();
-  std::unique_ptr<WWidget> anchor();
-  std::unique_ptr<WWidget> stackedWidget();
-  std::unique_ptr<WWidget> tabWidget();
-  std::unique_ptr<WWidget> menuWidget();
-  std::unique_ptr<WWidget> navigationBar();
-  std::unique_ptr<WWidget> popupMenu();
-  std::unique_ptr<WWidget> splitButton();
-  std::unique_ptr<WWidget> toolBar();
+  std::unique_ptr<Wt::WWidget> internalPaths();
+  std::unique_ptr<Wt::WWidget> anchor();
+  std::unique_ptr<Wt::WWidget> stackedWidget();
+  std::unique_ptr<Wt::WWidget> tabWidget();
+  std::unique_ptr<Wt::WWidget> menuWidget();
+  std::unique_ptr<Wt::WWidget> navigationBar();
+  std::unique_ptr<Wt::WWidget> popupMenu();
+  std::unique_ptr<Wt::WWidget> splitButton();
+  std::unique_ptr<Wt::WWidget> toolBar();
 };
 
 #endif // NAVIGATION_H_

examples/widgetgallery/TopicWidget.C

@@ -6,6 +6,7 @@
 
 #include "TopicWidget.h"
 
+#include <Wt/WString.h>
 #include <Wt/WText.h>
 
 #include <sstream>
@@ -77,7 +78,7 @@ Wt::WText *TopicWidget::addText(const Wt::WString& s, Wt::WContainerWidget *pare
 #ifndef WT_TARGET_JAVA
   literal = s.literal();
 #else
-  literal = WString(s).literal();
+  literal = Wt::WString(s).literal();
 #endif
   if (!literal)
     text->setInternalPathEncoding(true);

examples/widgetgallery/TreesTables.h

@@ -22,13 +22,13 @@ class TreesTables : public TopicWidget
   std::shared_ptr<Wt::WSortFilterProxyModel> filteredCocktails;
   std::shared_ptr<Wt::WSortFilterProxyModel> filteredSortedCocktails;
 
-  std::unique_ptr<WWidget> tables();
-  std::unique_ptr<WWidget> trees();
-  std::unique_ptr<WWidget> treeTables();
-  std::unique_ptr<WWidget> tableViews();
-  std::unique_ptr<WWidget> treeViews();
-  std::unique_ptr<WWidget> itemModels();
-  std::unique_ptr<WWidget> proxyModels();
+  std::unique_ptr<Wt::WWidget> tables();
+  std::unique_ptr<Wt::WWidget> trees();
+  std::unique_ptr<Wt::WWidget> treeTables();
+  std::unique_ptr<Wt::WWidget> tableViews();
+  std::unique_ptr<Wt::WWidget> treeViews();
+  std::unique_ptr<Wt::WWidget> itemModels();
+  std::unique_ptr<Wt::WWidget> proxyModels();
 
   Wt::WStringListModel *stringList_;