summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
authorDennis Brentjes <d.brentjes@gmail.com>2014-05-06 15:54:57 +0200
committerDennis Brentjes <d.brentjes@gmail.com>2014-05-06 15:54:57 +0200
commit6a1e6120c4efc46f1d192b0e5fabc06b780113cc (patch)
tree96966eb5723f60f225a6359777743ba540ed0534 /main.cpp
parent7f6f356e4498cf545209f4cb9ee5588d898ebb51 (diff)
downloadgeneric-gui-6a1e6120c4efc46f1d192b0e5fabc06b780113cc.tar.gz
generic-gui-6a1e6120c4efc46f1d192b0e5fabc06b780113cc.tar.bz2
generic-gui-6a1e6120c4efc46f1d192b0e5fabc06b780113cc.zip
Made fusion model interface strict and the API now bypasses the QtAdapter and instantiates widgets with models instead of adapters
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index e378fcb..3ff490e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,8 +42,8 @@ struct DataMapping :public fusion_model<std::map<std::string, Data>> {
struct CustomDataModelWidget : public WidgetType<DataModel>::type
{
- CustomDataModelWidget(std::shared_ptr<AdapterType<DataModel>::type> adapter)
- : WidgetType<DataModel>::type(adapter)
+ CustomDataModelWidget(std::shared_ptr<DataModel> model)
+ : WidgetType<DataModel>::type(model)
{}
};
@@ -67,11 +67,13 @@ int main()
MainWindow w;
- auto widget1 = make_qt_widget(model);
- auto widget2 = make_qt_widget(mapping);
+ auto widget1 = std::make_shared<CustomDataModelWidget>(model);
+ auto widget2 = make_qt_widget(model);
+ auto widget3 = make_qt_widget(mapping);
w.add_widget(widget1.get());
w.add_widget(widget2.get());
+ w.add_widget(widget3.get());
int ret = w.show_and_run();