From a7d9e081f01f3d248cba6deac19d0e9eca48ffc7 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Fri, 9 Mar 2018 10:20:28 +0100 Subject: [PATCH] guh-control -> mea --- README.md | 4 +- guh-control.pro | 7 - guh-control/connectionmanager.cpp | 129 ------------------ guh-control/connectionmanager.h | 82 ----------- .../libnymea-common.pro | 6 +- .../types/actiontype.cpp | 2 +- .../types/actiontype.h | 2 +- .../types/actiontypes.cpp | 2 +- .../types/actiontypes.h | 2 +- .../types/device.cpp | 2 +- .../types/device.h | 2 +- .../types/deviceclass.cpp | 2 +- .../types/deviceclass.h | 2 +- .../types/eventdescriptor.cpp | 0 .../types/eventdescriptor.h | 0 .../types/eventdescriptors.cpp | 0 .../types/eventdescriptors.h | 0 .../types/eventtype.cpp | 2 +- .../types/eventtype.h | 2 +- .../types/eventtypes.cpp | 2 +- .../types/eventtypes.h | 2 +- .../types/interface.cpp | 0 .../types/interface.h | 0 .../types/interfaces.cpp | 0 .../types/interfaces.h | 0 .../types/logentry.cpp | 0 .../types/logentry.h | 0 .../types/param.cpp | 2 +- .../types/param.h | 2 +- .../types/paramdescriptor.cpp | 0 .../types/paramdescriptor.h | 0 .../types/paramdescriptors.cpp | 0 .../types/paramdescriptors.h | 0 .../types/params.cpp | 2 +- .../types/params.h | 2 +- .../types/paramtype.cpp | 2 +- .../types/paramtype.h | 2 +- .../types/paramtypes.cpp | 2 +- .../types/paramtypes.h | 2 +- .../types/plugin.cpp | 2 +- .../types/plugin.h | 2 +- .../types/plugins.cpp | 2 +- .../types/plugins.h | 2 +- .../types/rule.cpp | 0 .../types/rule.h | 0 .../types/ruleaction.cpp | 0 .../types/ruleaction.h | 0 .../types/ruleactionparam.cpp | 0 .../types/ruleactionparam.h | 0 .../types/ruleactionparams.cpp | 0 .../types/ruleactionparams.h | 0 .../types/ruleactions.cpp | 0 .../types/ruleactions.h | 0 .../types/rules.cpp | 0 .../types/rules.h | 0 .../types/state.cpp | 2 +- .../types/state.h | 2 +- .../types/statedescriptor.cpp | 0 .../types/statedescriptor.h | 0 .../types/stateevaluator.cpp | 0 .../types/stateevaluator.h | 0 .../types/stateevaluators.cpp | 0 .../types/stateevaluators.h | 0 .../types/states.cpp | 2 +- .../types/states.h | 2 +- .../types/statesproxy.cpp | 2 +- .../types/statesproxy.h | 2 +- .../types/statetype.cpp | 2 +- .../types/statetype.h | 2 +- .../types/statetypes.cpp | 2 +- .../types/statetypes.h | 2 +- .../types/types.h | 2 +- .../types/vendor.cpp | 2 +- .../types/vendor.h | 2 +- .../types/vendors.cpp | 2 +- .../types/vendors.h | 2 +- guh-control.pri => mea.pri | 0 mea.pro | 7 + .../android/AndroidManifest.xml | 2 +- {guh-control => mea}/android/build.gradle | 0 .../android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {guh-control => mea}/android/gradlew | 0 {guh-control => mea}/android/gradlew.bat | 0 {guh-control => mea}/android/local.properties | 0 .../android/res/drawable-mdpi/icon.png | Bin .../android/res/values/libs.xml | 0 {guh-control => mea}/basicconfiguration.cpp | 0 {guh-control => mea}/basicconfiguration.h | 0 {guh-control => mea}/bluetoothinterface.cpp | 2 +- {guh-control => mea}/bluetoothinterface.h | 4 +- {guh-control => mea}/deviceclasses.cpp | 2 +- {guh-control => mea}/deviceclasses.h | 2 +- {guh-control => mea}/deviceclassesproxy.cpp | 2 +- {guh-control => mea}/deviceclassesproxy.h | 2 +- {guh-control => mea}/devicediscovery.cpp | 0 {guh-control => mea}/devicediscovery.h | 0 {guh-control => mea}/devicemanager.cpp | 8 +- {guh-control => mea}/devicemanager.h | 8 +- {guh-control => mea}/devices.cpp | 2 +- {guh-control => mea}/devices.h | 2 +- {guh-control => mea}/devicesproxy.cpp | 2 +- {guh-control => mea}/devicesproxy.h | 2 +- .../discovery/avahi/avahiserviceentry.cpp | 11 +- .../discovery/avahi/avahiserviceentry.h | 2 +- .../discovery/avahi/qt-watch.cpp | 0 .../discovery/avahi/qt-watch.h | 0 .../discovery/avahi/qtavahiclient.cpp | 2 +- .../discovery/avahi/qtavahiclient.h | 2 +- .../discovery/avahi/qtavahiservice.cpp | 8 +- .../discovery/avahi/qtavahiservice.h | 2 +- .../discovery/avahi/qtavahiservice_p.cpp | 2 +- .../discovery/avahi/qtavahiservice_p.h | 2 +- .../discovery/avahi/qtavahiservicebrowser.cpp | 10 +- .../discovery/avahi/qtavahiservicebrowser.h | 2 +- .../avahi/qtavahiservicebrowser_p.cpp | 2 +- .../discovery/avahi/qtavahiservicebrowser_p.h | 2 +- .../discovery/discoverydevice.cpp | 18 +-- .../discovery/discoverydevice.h | 14 +- .../discovery/discoverymodel.cpp | 14 +- .../discovery/discoverymodel.h | 10 +- .../discovery/nymeadiscovery.cpp | 10 +- .../discovery/nymeadiscovery.h | 10 +- .../discovery/nymeahost.cpp | 28 ++-- .../guhhost.h => mea/discovery/nymeahost.h | 18 +-- .../discovery/nymeahosts.cpp | 43 +++--- .../guhhosts.h => mea/discovery/nymeahosts.h | 28 ++-- .../discovery/upnpdiscovery.cpp | 20 +-- .../discovery/upnpdiscovery.h | 8 +- .../discovery/zeroconfdiscovery.cpp | 4 +- .../discovery/zeroconfdiscovery.h | 0 {guh-control => mea}/engine.cpp | 12 +- {guh-control => mea}/engine.h | 16 +-- {guh-control => mea}/guh-logo-256x256.png | Bin {guh-control => mea}/guh-logo.svg | 0 {guh-control => mea}/interfacesmodel.cpp | 0 {guh-control => mea}/interfacesmodel.h | 0 .../jsonrpc/actionhandler.cpp | 0 {guh-control => mea}/jsonrpc/jsonhandler.cpp | 8 +- {guh-control => mea}/jsonrpc/jsonhandler.h | 8 +- .../jsonrpc/jsonrpcclient.cpp | 18 +-- {guh-control => mea}/jsonrpc/jsonrpcclient.h | 16 +-- {guh-control => mea}/jsonrpc/jsontypes.cpp | 8 +- {guh-control => mea}/jsonrpc/jsontypes.h | 8 +- {guh-control => mea}/logmanager.cpp | 0 {guh-control => mea}/logmanager.h | 0 {guh-control => mea}/main.cpp | 24 ++-- guh-control/guh-control.pro => mea/mea.pro | 28 ++-- {guh-control => mea}/models/logsmodel.cpp | 0 {guh-control => mea}/models/logsmodel.h | 0 .../models/rulesfiltermodel.cpp | 0 .../models/rulesfiltermodel.h | 0 .../models/valuelogsproxymodel.cpp | 5 + .../models/valuelogsproxymodel.h | 0 .../nymeaconnection.cpp | 40 +++--- .../guhconnection.h => mea/nymeaconnection.h | 18 +-- .../nymeainterface.cpp | 12 +- .../guhinterface.h => mea/nymeainterface.h | 18 +-- {guh-control => mea}/pluginsproxy.cpp | 2 +- {guh-control => mea}/pluginsproxy.h | 2 +- {guh-control => mea}/resources.qrc | 0 {guh-control => mea}/rulemanager.cpp | 0 {guh-control => mea}/rulemanager.h | 0 {guh-control => mea}/tcpsocketinterface.cpp | 2 +- {guh-control => mea}/tcpsocketinterface.h | 4 +- {guh-control => mea}/ui/ConnectPage.qml | 16 +-- {guh-control => mea}/ui/DevicesPage.qml | 2 +- {guh-control => mea}/ui/EditDevicesPage.qml | 2 +- {guh-control => mea}/ui/LoginPage.qml | 12 +- {guh-control => mea}/ui/MagicPage.qml | 2 +- {guh-control => mea}/ui/MainPage.qml | 2 +- {guh-control => mea}/ui/NewDeviceWizard.qml | 2 +- {guh-control => mea}/ui/SettingsPage.qml | 2 +- {guh-control => mea}/ui/SystemInfoPage.qml | 2 +- .../ui/actiondelegates-ng/ActionDelegate.qml | 2 +- .../ui/actiondelegates/ActionDelegateBase.qml | 0 .../ui/actiondelegates/ActionDelegateBool.qml | 0 .../actiondelegates/ActionDelegateColor.qml | 0 .../ActionDelegateFallback.qml | 0 .../ActionDelegateNoParams.qml | 0 .../actiondelegates/ActionDelegateSlider.qml | 0 .../ActionDelegateStringFromStringList.qml | 0 .../ui/components/ColorIcon.qml | 0 .../ui/components/ColorPicker.qml | 0 .../ui/components/ColorPickerCt.qml | 0 .../ui/components/ErrorDialog.qml | 0 {guh-control => mea}/ui/components/Graph.qml | 2 +- .../ui/components/GuhHeader.qml | 0 .../ui/components/HeaderButton.qml | 0 .../ui/components/IconMenuItem.qml | 0 .../ui/components/InterfacesModels.qml | 0 .../ui/components/ThinDivider.qml | 0 .../ui/components/ThrottledSlider.qml | 0 .../ui/customviews/CustomViewBase.qml | 0 .../customviews/ExtendedVolumeController.qml | 2 +- .../ui/customviews/MediaControllerView.qml | 2 +- .../ui/customviews/NotificationsView.qml | 2 +- .../ui/customviews/SensorView.qml | 2 +- .../ui/customviews/WeatherView.qml | 0 .../devicelistpages/GenericDeviceListPage.qml | 2 +- .../devicelistpages/LightsDeviceListPage.qml | 2 +- .../ui/devicepages/ButtonDevicePage.qml | 2 +- .../ui/devicepages/ColorLightDevicePage.qml | 2 +- .../ui/devicepages/ConfigureThingPage.qml | 2 +- .../ui/devicepages/DevicePageBase.qml | 2 +- .../ui/devicepages/GenericDevicePage.qml | 2 +- .../GenericDeviceStateDetailsPage.qml | 2 +- .../ui/devicepages/MediaDevicePage.qml | 2 +- .../ui/devicepages/SensorDevicePage.qml | 2 +- .../ui/devicepages/WeatherDevicePage.qml | 2 +- {guh-control => mea}/ui/fonts/Ubuntu-B.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-BI.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-C.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-L.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-LI.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-M.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-MI.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-R.ttf | Bin {guh-control => mea}/ui/fonts/Ubuntu-RI.ttf | Bin {guh-control => mea}/ui/images/add.svg | 0 .../images/audio-speakers-muted-symbolic.svg | 0 .../ui/images/audio-speakers-symbolic.svg | 0 {guh-control => mea}/ui/images/back.svg | 0 .../ui/images/battery/battery-000.svg | 0 .../ui/images/battery/battery-010.svg | 0 .../ui/images/battery/battery-020.svg | 0 .../ui/images/battery/battery-030.svg | 0 .../ui/images/battery/battery-040.svg | 0 .../ui/images/battery/battery-050.svg | 0 .../ui/images/battery/battery-060.svg | 0 .../ui/images/battery/battery-070.svg | 0 .../ui/images/battery/battery-080.svg | 0 .../ui/images/battery/battery-090.svg | 0 .../ui/images/battery/battery-100.svg | 0 {guh-control => mea}/ui/images/close.svg | 0 {guh-control => mea}/ui/images/delete.svg | 0 .../ui/images/dialog-warning-symbolic.svg | 0 {guh-control => mea}/ui/images/go-down.svg | 0 {guh-control => mea}/ui/images/info.svg | 0 {guh-control => mea}/ui/images/magic.svg | 0 .../ui/images/media-playback-pause.svg | 0 .../ui/images/media-playback-start.svg | 0 .../ui/images/media-playback-stop.svg | 0 .../ui/images/media-preview-start.svg | 0 .../ui/images/media-seek-backward.svg | 0 .../ui/images/media-seek-forward.svg | 0 .../ui/images/media-skip-backward.svg | 0 .../ui/images/media-skip-forward.svg | 0 .../ui/images/mediaplayer-app-symbolic.svg | 0 .../ui/images/navigation-menu.svg | 0 .../ui/images/network-wired-symbolic.svg | 0 {guh-control => mea}/ui/images/next.svg | 0 .../ui/images/notification.svg | 0 {guh-control => mea}/ui/images/sensors.svg | 0 {guh-control => mea}/ui/images/settings.svg | 0 {guh-control => mea}/ui/images/share.svg | 0 {guh-control => mea}/ui/images/stock_link.svg | 0 .../ui/images/system-shutdown.svg | 0 .../ui/images/temperature.svg | 0 {guh-control => mea}/ui/images/tick.svg | 0 {guh-control => mea}/ui/images/torch-off.svg | 0 {guh-control => mea}/ui/images/torch-on.svg | 0 .../ui/images/view-collapse.svg | 0 .../ui/images/view-expand.svg | 0 .../ui/images/weather-app-symbolic.svg | 0 .../ui/images/weathericons/humidity.svg | 0 .../images/weathericons/weather-clear-day.svg | 0 .../weathericons/weather-clear-night.svg | 0 .../ui/images/weathericons/weather-clouds.svg | 0 .../weathericons/weather-few-clouds-day.svg | 0 .../weathericons/weather-few-clouds-night.svg | 0 .../ui/images/weathericons/weather-fog.svg | 0 .../weathericons/weather-light-rain.svg | 0 .../images/weathericons/weather-overcast.svg | 0 .../weathericons/weather-shower-rain.svg | 0 .../ui/images/weathericons/weather-snow.svg | 0 .../weathericons/weather-thunderstorm.svg | 0 .../ui/images/weathericons/wind.svg | 0 .../ui/magic/ComposeEventDescriptorPage.qml | 2 +- .../ui/magic/DeviceRulesPage.qml | 2 +- .../ui/magic/EditRulePage.qml | 2 +- .../ui/magic/EditStateEvaluatorPage.qml | 2 +- .../ui/magic/NewThingMagicPage.qml | 2 +- .../ui/magic/SelectActionPage.qml | 2 +- .../ui/magic/SelectEventDescriptorPage.qml | 2 +- .../magic/SelectEventDescriptorParamsPage.qml | 2 +- .../ui/magic/SelectRuleActionPage.qml | 2 +- .../ui/magic/SelectRuleActionParamsPage.qml | 2 +- .../ui/magic/SelectStateDescriptorPage.qml | 2 +- .../magic/SelectStateDescriptorParamsPage.qml | 2 +- .../ui/magic/SelectThingPage.qml | 2 +- .../ui/magic/SimpleStateEvaluatorDelegate.qml | 2 +- .../ui/magic/StateEvaluatorDelegate.qml | 2 +- {guh-control => mea}/ui/main.qml | 6 +- .../ui/paramdelegates-ng/ParamDelegate.qml | 2 +- .../ui/paramdelegates/BoolParamDelegate.qml | 0 .../ui/paramdelegates/DoubleParamDelegate.qml | 0 .../ui/paramdelegates/IntParamDelegate.qml | 0 .../ui/paramdelegates/ParamDelegate.qml | 0 .../ui/paramdelegates/ParamDelegateBase.qml | 0 .../ui/paramdelegates/StringParamDelegate.qml | 0 .../ParamDescriptorDelegateBase.qml | 2 +- .../ui/system/LogViewerPage.qml | 2 +- .../ui/system/PluginParamsPage.qml | 2 +- .../ui/system/PluginsPage.qml | 2 +- {guh-control => mea}/vendorsproxy.cpp | 2 +- {guh-control => mea}/vendorsproxy.h | 2 +- {guh-control => mea}/websocketinterface.cpp | 10 +- {guh-control => mea}/websocketinterface.h | 12 +- 310 files changed, 397 insertions(+), 625 deletions(-) delete mode 100644 guh-control.pro delete mode 100644 guh-control/connectionmanager.cpp delete mode 100644 guh-control/connectionmanager.h rename libguh-common/libguh-common.pro => libnymea-common/libnymea-common.pro (95%) rename {libguh-common => libnymea-common}/types/actiontype.cpp (96%) rename {libguh-common => libnymea-common}/types/actiontype.h (97%) rename {libguh-common => libnymea-common}/types/actiontypes.cpp (97%) rename {libguh-common => libnymea-common}/types/actiontypes.h (97%) rename {libguh-common => libnymea-common}/types/device.cpp (97%) rename {libguh-common => libnymea-common}/types/device.h (97%) rename {libguh-common => libnymea-common}/types/deviceclass.cpp (98%) rename {libguh-common => libnymea-common}/types/deviceclass.h (98%) rename {libguh-common => libnymea-common}/types/eventdescriptor.cpp (100%) rename {libguh-common => libnymea-common}/types/eventdescriptor.h (100%) rename {libguh-common => libnymea-common}/types/eventdescriptors.cpp (100%) rename {libguh-common => libnymea-common}/types/eventdescriptors.h (100%) rename {libguh-common => libnymea-common}/types/eventtype.cpp (96%) rename {libguh-common => libnymea-common}/types/eventtype.h (97%) rename {libguh-common => libnymea-common}/types/eventtypes.cpp (97%) rename {libguh-common => libnymea-common}/types/eventtypes.h (97%) rename {libguh-common => libnymea-common}/types/interface.cpp (100%) rename {libguh-common => libnymea-common}/types/interface.h (100%) rename {libguh-common => libnymea-common}/types/interfaces.cpp (100%) rename {libguh-common => libnymea-common}/types/interfaces.h (100%) rename {libguh-common => libnymea-common}/types/logentry.cpp (100%) rename {libguh-common => libnymea-common}/types/logentry.h (100%) rename {libguh-common => libnymea-common}/types/param.cpp (96%) rename {libguh-common => libnymea-common}/types/param.h (96%) rename {libguh-common => libnymea-common}/types/paramdescriptor.cpp (100%) rename {libguh-common => libnymea-common}/types/paramdescriptor.h (100%) rename {libguh-common => libnymea-common}/types/paramdescriptors.cpp (100%) rename {libguh-common => libnymea-common}/types/paramdescriptors.h (100%) rename {libguh-common => libnymea-common}/types/params.cpp (97%) rename {libguh-common => libnymea-common}/types/params.h (96%) rename {libguh-common => libnymea-common}/types/paramtype.cpp (98%) rename {libguh-common => libnymea-common}/types/paramtype.h (98%) rename {libguh-common => libnymea-common}/types/paramtypes.cpp (98%) rename {libguh-common => libnymea-common}/types/paramtypes.h (97%) rename {libguh-common => libnymea-common}/types/plugin.cpp (96%) rename {libguh-common => libnymea-common}/types/plugin.h (96%) rename {libguh-common => libnymea-common}/types/plugins.cpp (97%) rename {libguh-common => libnymea-common}/types/plugins.h (96%) rename {libguh-common => libnymea-common}/types/rule.cpp (100%) rename {libguh-common => libnymea-common}/types/rule.h (100%) rename {libguh-common => libnymea-common}/types/ruleaction.cpp (100%) rename {libguh-common => libnymea-common}/types/ruleaction.h (100%) rename {libguh-common => libnymea-common}/types/ruleactionparam.cpp (100%) rename {libguh-common => libnymea-common}/types/ruleactionparam.h (100%) rename {libguh-common => libnymea-common}/types/ruleactionparams.cpp (100%) rename {libguh-common => libnymea-common}/types/ruleactionparams.h (100%) rename {libguh-common => libnymea-common}/types/ruleactions.cpp (100%) rename {libguh-common => libnymea-common}/types/ruleactions.h (100%) rename {libguh-common => libnymea-common}/types/rules.cpp (100%) rename {libguh-common => libnymea-common}/types/rules.h (100%) rename {libguh-common => libnymea-common}/types/state.cpp (96%) rename {libguh-common => libnymea-common}/types/state.h (96%) rename {libguh-common => libnymea-common}/types/statedescriptor.cpp (100%) rename {libguh-common => libnymea-common}/types/statedescriptor.h (100%) rename {libguh-common => libnymea-common}/types/stateevaluator.cpp (100%) rename {libguh-common => libnymea-common}/types/stateevaluator.h (100%) rename {libguh-common => libnymea-common}/types/stateevaluators.cpp (100%) rename {libguh-common => libnymea-common}/types/stateevaluators.h (100%) rename {libguh-common => libnymea-common}/types/states.cpp (97%) rename {libguh-common => libnymea-common}/types/states.h (96%) rename {libguh-common => libnymea-common}/types/statesproxy.cpp (96%) rename {libguh-common => libnymea-common}/types/statesproxy.h (96%) rename {libguh-common => libnymea-common}/types/statetype.cpp (97%) rename {libguh-common => libnymea-common}/types/statetype.h (97%) rename {libguh-common => libnymea-common}/types/statetypes.cpp (98%) rename {libguh-common => libnymea-common}/types/statetypes.h (97%) rename {libguh-common => libnymea-common}/types/types.h (97%) rename {libguh-common => libnymea-common}/types/vendor.cpp (96%) rename {libguh-common => libnymea-common}/types/vendor.h (96%) rename {libguh-common => libnymea-common}/types/vendors.cpp (97%) rename {libguh-common => libnymea-common}/types/vendors.h (96%) rename guh-control.pri => mea.pri (100%) create mode 100644 mea.pro rename {guh-control => mea}/android/AndroidManifest.xml (96%) rename {guh-control => mea}/android/build.gradle (100%) rename {guh-control => mea}/android/gradle.properties (100%) rename {guh-control => mea}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename {guh-control => mea}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {guh-control => mea}/android/gradlew (100%) rename {guh-control => mea}/android/gradlew.bat (100%) rename {guh-control => mea}/android/local.properties (100%) rename {guh-control => mea}/android/res/drawable-mdpi/icon.png (100%) rename {guh-control => mea}/android/res/values/libs.xml (100%) rename {guh-control => mea}/basicconfiguration.cpp (100%) rename {guh-control => mea}/basicconfiguration.h (100%) rename {guh-control => mea}/bluetoothinterface.cpp (98%) rename {guh-control => mea}/bluetoothinterface.h (91%) rename {guh-control => mea}/deviceclasses.cpp (97%) rename {guh-control => mea}/deviceclasses.h (96%) rename {guh-control => mea}/deviceclassesproxy.cpp (97%) rename {guh-control => mea}/deviceclassesproxy.h (97%) rename {guh-control => mea}/devicediscovery.cpp (100%) rename {guh-control => mea}/devicediscovery.h (100%) rename {guh-control => mea}/devicemanager.cpp (97%) rename {guh-control => mea}/devicemanager.h (92%) rename {guh-control => mea}/devices.cpp (98%) rename {guh-control => mea}/devices.h (97%) rename {guh-control => mea}/devicesproxy.cpp (99%) rename {guh-control => mea}/devicesproxy.h (98%) rename {guh-control => mea}/discovery/avahi/avahiserviceentry.cpp (96%) rename {guh-control => mea}/discovery/avahi/avahiserviceentry.h (97%) rename {guh-control => mea}/discovery/avahi/qt-watch.cpp (100%) rename {guh-control => mea}/discovery/avahi/qt-watch.h (100%) rename {guh-control => mea}/discovery/avahi/qtavahiclient.cpp (98%) rename {guh-control => mea}/discovery/avahi/qtavahiclient.h (97%) rename {guh-control => mea}/discovery/avahi/qtavahiservice.cpp (97%) rename {guh-control => mea}/discovery/avahi/qtavahiservice.h (97%) rename {guh-control => mea}/discovery/avahi/qtavahiservice_p.cpp (98%) rename {guh-control => mea}/discovery/avahi/qtavahiservice_p.h (97%) rename {guh-control => mea}/discovery/avahi/qtavahiservicebrowser.cpp (95%) rename {guh-control => mea}/discovery/avahi/qtavahiservicebrowser.h (97%) rename {guh-control => mea}/discovery/avahi/qtavahiservicebrowser_p.cpp (99%) rename {guh-control => mea}/discovery/avahi/qtavahiservicebrowser_p.h (98%) rename {guh-control => mea}/discovery/discoverydevice.cpp (89%) rename {guh-control => mea}/discovery/discoverydevice.h (87%) rename {guh-control => mea}/discovery/discoverymodel.cpp (89%) rename {guh-control => mea}/discovery/discoverymodel.h (87%) rename guh-control/discovery/guhdiscovery.cpp => mea/discovery/nymeadiscovery.cpp (77%) rename guh-control/discovery/guhdiscovery.h => mea/discovery/nymeadiscovery.h (78%) rename guh-control/discovery/guhhost.cpp => mea/discovery/nymeahost.cpp (67%) rename guh-control/discovery/guhhost.h => mea/discovery/nymeahost.h (79%) rename guh-control/discovery/guhhosts.cpp => mea/discovery/nymeahosts.cpp (77%) rename guh-control/discovery/guhhosts.h => mea/discovery/nymeahosts.h (72%) rename {guh-control => mea}/discovery/upnpdiscovery.cpp (93%) rename {guh-control => mea}/discovery/upnpdiscovery.h (88%) rename {guh-control => mea}/discovery/zeroconfdiscovery.cpp (89%) rename {guh-control => mea}/discovery/zeroconfdiscovery.h (100%) rename {guh-control => mea}/engine.cpp (88%) rename {guh-control => mea}/engine.h (83%) rename {guh-control => mea}/guh-logo-256x256.png (100%) rename {guh-control => mea}/guh-logo.svg (100%) rename {guh-control => mea}/interfacesmodel.cpp (100%) rename {guh-control => mea}/interfacesmodel.h (100%) rename {guh-control => mea}/jsonrpc/actionhandler.cpp (100%) rename {guh-control => mea}/jsonrpc/jsonhandler.cpp (80%) rename {guh-control => mea}/jsonrpc/jsonhandler.h (82%) rename {guh-control => mea}/jsonrpc/jsonrpcclient.cpp (94%) rename {guh-control => mea}/jsonrpc/jsonrpcclient.h (89%) rename {guh-control => mea}/jsonrpc/jsontypes.cpp (98%) rename {guh-control => mea}/jsonrpc/jsontypes.h (91%) rename {guh-control => mea}/logmanager.cpp (100%) rename {guh-control => mea}/logmanager.h (100%) rename {guh-control => mea}/main.cpp (92%) rename guh-control/guh-control.pro => mea/mea.pro (87%) rename {guh-control => mea}/models/logsmodel.cpp (100%) rename {guh-control => mea}/models/logsmodel.h (100%) rename {guh-control => mea}/models/rulesfiltermodel.cpp (100%) rename {guh-control => mea}/models/rulesfiltermodel.h (100%) rename {guh-control => mea}/models/valuelogsproxymodel.cpp (97%) rename {guh-control => mea}/models/valuelogsproxymodel.h (100%) rename guh-control/guhconnection.cpp => mea/nymeaconnection.cpp (74%) rename guh-control/guhconnection.h => mea/nymeaconnection.h (73%) rename guh-control/guhinterface.cpp => mea/nymeainterface.cpp (76%) rename guh-control/guhinterface.h => mea/nymeainterface.h (79%) rename {guh-control => mea}/pluginsproxy.cpp (96%) rename {guh-control => mea}/pluginsproxy.h (96%) rename {guh-control => mea}/resources.qrc (100%) rename {guh-control => mea}/rulemanager.cpp (100%) rename {guh-control => mea}/rulemanager.h (100%) rename {guh-control => mea}/tcpsocketinterface.cpp (96%) rename {guh-control => mea}/tcpsocketinterface.h (89%) rename {guh-control => mea}/ui/ConnectPage.qml (87%) rename {guh-control => mea}/ui/DevicesPage.qml (99%) rename {guh-control => mea}/ui/EditDevicesPage.qml (98%) rename {guh-control => mea}/ui/LoginPage.qml (82%) rename {guh-control => mea}/ui/MagicPage.qml (99%) rename {guh-control => mea}/ui/MainPage.qml (99%) rename {guh-control => mea}/ui/NewDeviceWizard.qml (99%) rename {guh-control => mea}/ui/SettingsPage.qml (99%) rename {guh-control => mea}/ui/SystemInfoPage.qml (99%) rename {guh-control => mea}/ui/actiondelegates-ng/ActionDelegate.qml (99%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateBase.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateBool.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateColor.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateFallback.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateNoParams.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateSlider.qml (100%) rename {guh-control => mea}/ui/actiondelegates/ActionDelegateStringFromStringList.qml (100%) rename {guh-control => mea}/ui/components/ColorIcon.qml (100%) rename {guh-control => mea}/ui/components/ColorPicker.qml (100%) rename {guh-control => mea}/ui/components/ColorPickerCt.qml (100%) rename {guh-control => mea}/ui/components/ErrorDialog.qml (100%) rename {guh-control => mea}/ui/components/Graph.qml (99%) rename {guh-control => mea}/ui/components/GuhHeader.qml (100%) rename {guh-control => mea}/ui/components/HeaderButton.qml (100%) rename {guh-control => mea}/ui/components/IconMenuItem.qml (100%) rename {guh-control => mea}/ui/components/InterfacesModels.qml (100%) rename {guh-control => mea}/ui/components/ThinDivider.qml (100%) rename {guh-control => mea}/ui/components/ThrottledSlider.qml (100%) rename {guh-control => mea}/ui/customviews/CustomViewBase.qml (100%) rename {guh-control => mea}/ui/customviews/ExtendedVolumeController.qml (99%) rename {guh-control => mea}/ui/customviews/MediaControllerView.qml (99%) rename {guh-control => mea}/ui/customviews/NotificationsView.qml (99%) rename {guh-control => mea}/ui/customviews/SensorView.qml (99%) rename {guh-control => mea}/ui/customviews/WeatherView.qml (100%) rename {guh-control => mea}/ui/devicelistpages/GenericDeviceListPage.qml (99%) rename {guh-control => mea}/ui/devicelistpages/LightsDeviceListPage.qml (99%) rename {guh-control => mea}/ui/devicepages/ButtonDevicePage.qml (99%) rename {guh-control => mea}/ui/devicepages/ColorLightDevicePage.qml (99%) rename {guh-control => mea}/ui/devicepages/ConfigureThingPage.qml (98%) rename {guh-control => mea}/ui/devicepages/DevicePageBase.qml (99%) rename {guh-control => mea}/ui/devicepages/GenericDevicePage.qml (99%) rename {guh-control => mea}/ui/devicepages/GenericDeviceStateDetailsPage.qml (99%) rename {guh-control => mea}/ui/devicepages/MediaDevicePage.qml (98%) rename {guh-control => mea}/ui/devicepages/SensorDevicePage.qml (98%) rename {guh-control => mea}/ui/devicepages/WeatherDevicePage.qml (98%) rename {guh-control => mea}/ui/fonts/Ubuntu-B.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-BI.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-C.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-L.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-LI.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-M.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-MI.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-R.ttf (100%) rename {guh-control => mea}/ui/fonts/Ubuntu-RI.ttf (100%) rename {guh-control => mea}/ui/images/add.svg (100%) rename {guh-control => mea}/ui/images/audio-speakers-muted-symbolic.svg (100%) rename {guh-control => mea}/ui/images/audio-speakers-symbolic.svg (100%) rename {guh-control => mea}/ui/images/back.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-000.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-010.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-020.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-030.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-040.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-050.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-060.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-070.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-080.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-090.svg (100%) rename {guh-control => mea}/ui/images/battery/battery-100.svg (100%) rename {guh-control => mea}/ui/images/close.svg (100%) rename {guh-control => mea}/ui/images/delete.svg (100%) rename {guh-control => mea}/ui/images/dialog-warning-symbolic.svg (100%) rename {guh-control => mea}/ui/images/go-down.svg (100%) rename {guh-control => mea}/ui/images/info.svg (100%) rename {guh-control => mea}/ui/images/magic.svg (100%) rename {guh-control => mea}/ui/images/media-playback-pause.svg (100%) rename {guh-control => mea}/ui/images/media-playback-start.svg (100%) rename {guh-control => mea}/ui/images/media-playback-stop.svg (100%) rename {guh-control => mea}/ui/images/media-preview-start.svg (100%) rename {guh-control => mea}/ui/images/media-seek-backward.svg (100%) rename {guh-control => mea}/ui/images/media-seek-forward.svg (100%) rename {guh-control => mea}/ui/images/media-skip-backward.svg (100%) rename {guh-control => mea}/ui/images/media-skip-forward.svg (100%) rename {guh-control => mea}/ui/images/mediaplayer-app-symbolic.svg (100%) rename {guh-control => mea}/ui/images/navigation-menu.svg (100%) rename {guh-control => mea}/ui/images/network-wired-symbolic.svg (100%) rename {guh-control => mea}/ui/images/next.svg (100%) rename {guh-control => mea}/ui/images/notification.svg (100%) rename {guh-control => mea}/ui/images/sensors.svg (100%) rename {guh-control => mea}/ui/images/settings.svg (100%) rename {guh-control => mea}/ui/images/share.svg (100%) rename {guh-control => mea}/ui/images/stock_link.svg (100%) rename {guh-control => mea}/ui/images/system-shutdown.svg (100%) rename {guh-control => mea}/ui/images/temperature.svg (100%) rename {guh-control => mea}/ui/images/tick.svg (100%) rename {guh-control => mea}/ui/images/torch-off.svg (100%) rename {guh-control => mea}/ui/images/torch-on.svg (100%) rename {guh-control => mea}/ui/images/view-collapse.svg (100%) rename {guh-control => mea}/ui/images/view-expand.svg (100%) rename {guh-control => mea}/ui/images/weather-app-symbolic.svg (100%) rename {guh-control => mea}/ui/images/weathericons/humidity.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-clear-day.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-clear-night.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-clouds.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-few-clouds-day.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-few-clouds-night.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-fog.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-light-rain.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-overcast.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-shower-rain.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-snow.svg (100%) rename {guh-control => mea}/ui/images/weathericons/weather-thunderstorm.svg (100%) rename {guh-control => mea}/ui/images/weathericons/wind.svg (100%) rename {guh-control => mea}/ui/magic/ComposeEventDescriptorPage.qml (98%) rename {guh-control => mea}/ui/magic/DeviceRulesPage.qml (99%) rename {guh-control => mea}/ui/magic/EditRulePage.qml (99%) rename {guh-control => mea}/ui/magic/EditStateEvaluatorPage.qml (96%) rename {guh-control => mea}/ui/magic/NewThingMagicPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectActionPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectEventDescriptorPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectEventDescriptorParamsPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectRuleActionPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectRuleActionParamsPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectStateDescriptorPage.qml (99%) rename {guh-control => mea}/ui/magic/SelectStateDescriptorParamsPage.qml (98%) rename {guh-control => mea}/ui/magic/SelectThingPage.qml (98%) rename {guh-control => mea}/ui/magic/SimpleStateEvaluatorDelegate.qml (99%) rename {guh-control => mea}/ui/magic/StateEvaluatorDelegate.qml (99%) rename {guh-control => mea}/ui/main.qml (95%) rename {guh-control => mea}/ui/paramdelegates-ng/ParamDelegate.qml (99%) rename {guh-control => mea}/ui/paramdelegates/BoolParamDelegate.qml (100%) rename {guh-control => mea}/ui/paramdelegates/DoubleParamDelegate.qml (100%) rename {guh-control => mea}/ui/paramdelegates/IntParamDelegate.qml (100%) rename {guh-control => mea}/ui/paramdelegates/ParamDelegate.qml (100%) rename {guh-control => mea}/ui/paramdelegates/ParamDelegateBase.qml (100%) rename {guh-control => mea}/ui/paramdelegates/StringParamDelegate.qml (100%) rename {guh-control => mea}/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml (99%) rename {guh-control => mea}/ui/system/LogViewerPage.qml (99%) rename {guh-control => mea}/ui/system/PluginParamsPage.qml (99%) rename {guh-control => mea}/ui/system/PluginsPage.qml (98%) rename {guh-control => mea}/vendorsproxy.cpp (96%) rename {guh-control => mea}/vendorsproxy.h (96%) rename {guh-control => mea}/websocketinterface.cpp (89%) rename {guh-control => mea}/websocketinterface.h (82%) diff --git a/README.md b/README.md index b12b6694..013f2855 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -# guh-control -QtQuick guh client application +# mea +QtQuick nymea client application diff --git a/guh-control.pro b/guh-control.pro deleted file mode 100644 index f0371105..00000000 --- a/guh-control.pro +++ /dev/null @@ -1,7 +0,0 @@ -TEMPLATE=subdirs - -SUBDIRS = libguh-common guh-control -libguh-common.subdir = libguh-common -guh-control.subdir = guh-control - -guh-control.depends = libguh-common diff --git a/guh-control/connectionmanager.cpp b/guh-control/connectionmanager.cpp deleted file mode 100644 index 8c7b1f0a..00000000 --- a/guh-control/connectionmanager.cpp +++ /dev/null @@ -1,129 +0,0 @@ -#include "connectionmanager.h" - -#include -#include - -ConnectionManager::ConnectionManager(QObject *parent) : - QObject(parent), - m_discovery(new UpnpDiscovery(this)), - m_interface(0), - m_websocketInterface(new WebsocketInterface(this)), - m_bluetoothInterface(new BluetoothInterface(this)) -{ - -} - -GuhInterface *ConnectionManager::interface() -{ - return m_interface; -} - -UpnpDiscovery *ConnectionManager::upnpDiscovery() -{ - return m_discovery; -} - -WebsocketInterface *ConnectionManager::websocketInterface() -{ - return m_websocketInterface; -} - -BluetoothInterface *ConnectionManager::bluetoothInterface() -{ - return m_bluetoothInterface; -} - -QString ConnectionManager::currentInterfaceName() const -{ - return m_currentInterfaceName; -} - -QString ConnectionManager::currentStatusMessage() const -{ - return m_currentStatusMessage; -} - -void ConnectionManager::setInterface(GuhInterface *interface) -{ - if (m_interface) { - disconnect(m_interface, &GuhInterface::connectedChanged, this, &ConnectionManager::onConnectedChanged); - disconnect(m_interface, &GuhInterface::dataReady, this, &ConnectionManager::dataReady); - } - - m_interface = interface; - - connect(m_interface, &GuhInterface::connectedChanged, this, &ConnectionManager::onConnectedChanged); - connect(m_interface, &GuhInterface::dataReady, this, &ConnectionManager::dataReady); - emit interfaceChanged(); -} - -void ConnectionManager::setCurrentInterfaceName(const QString &name) -{ - m_currentInterfaceName = name; - emit currentInterfaceNameChanged(); -} - -void ConnectionManager::setCurrentStatusMessage(const QString &message) -{ - m_currentStatusMessage = message; - emit currentStatusMessageChanged(); -} - -void ConnectionManager::onConnectedChanged() -{ - if (m_interface->connected()) - emit connected(); - else - emit disconnect(); - - emit connectedChanged(); -} - -void ConnectionManager::onConnectingState() -{ - QSettings settings; - qDebug() << "Loading last connection" << settings.fileName(); - settings.beginGroup("Connections"); - QString url = settings.value("webSocketUrl").toString(); - settings.endGroup(); - - if (url.isEmpty()) { - qDebug() << "No stored websocket url"; - m_websocketInterface->connectionFailed(); - } - - m_websocketInterface->setUrl(url); - m_websocketInterface->enable(); -} - -void ConnectionManager::onUpnpDiscoveringState() -{ - upnpDiscovery()->discover(); -} - -void ConnectionManager::start(const ConnectionType &connectionType) -{ - switch (connectionType) { - case ConnectionTypeAuto: - setInterface(m_websocketInterface); - break; - case ConnectionTypeWebSocket: - setInterface(m_websocketInterface); - m_discovery->discover(); - break; - case ConnectionTypeCloud: - - break; - case ConnectionTypeBluetooth: - setInterface(m_bluetoothInterface); - break; - default: - setInterface(m_bluetoothInterface); - break; - } -} - -void ConnectionManager::stop() -{ - m_interface->disable(); -} diff --git a/guh-control/connectionmanager.h b/guh-control/connectionmanager.h deleted file mode 100644 index f032c954..00000000 --- a/guh-control/connectionmanager.h +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef CONNECTIONMANAGER_H -#define CONNECTIONMANAGER_H - -#include -#include - -#include "guhinterface.h" -#include "websocketinterface.h" -#include "bluetoothinterface.h" -#include "cloudconnection/cloudconnection.h" -#include "discovery/upnpdiscovery.h" - -class ConnectionManager : public QObject -{ - Q_OBJECT - Q_ENUMS(ConnectionType) - Q_PROPERTY(UpnpDiscovery *upnpDiscovery READ upnpDiscovery CONSTANT) - Q_PROPERTY(GuhInterface *interface READ interface NOTIFY interfaceChanged) - Q_PROPERTY(WebsocketInterface *websocketInterface READ websocketInterface CONSTANT) - Q_PROPERTY(BluetoothInterface *bluetoothInterface READ bluetoothInterface CONSTANT) - Q_PROPERTY(QString currentInterfaceName READ currentInterfaceName WRITE setCurrentInterfaceName NOTIFY currentInterfaceNameChanged) - Q_PROPERTY(QString currentStatusMessage READ currentStatusMessage WRITE setCurrentStatusMessage NOTIFY currentStatusMessageChanged) - -public: - enum ConnectionType { - ConnectionTypeAuto, - ConnectionTypeWebSocket, - ConnectionTypeCloud, - ConnectionTypeBluetooth - }; - - explicit ConnectionManager(QObject *parent = 0); - - GuhInterface *interface(); - UpnpDiscovery *upnpDiscovery(); - - WebsocketInterface *websocketInterface(); - BluetoothInterface *bluetoothInterface(); - - QString currentInterfaceName() const; - QString currentStatusMessage() const; - -private: - UpnpDiscovery *m_discovery; - GuhInterface *m_interface; - WebsocketInterface *m_websocketInterface; - BluetoothInterface *m_bluetoothInterface; - - QString m_currentInterfaceName; - QString m_currentStatusMessage; - - void setInterface(GuhInterface *interface); - void setCurrentInterfaceName(const QString &name); - void setCurrentStatusMessage(const QString &message); - -private slots: - void onConnectedChanged(); - - // State slots - void onConnectingState(); - void onUpnpDiscoveringState(); - -signals: - void connectedChanged(); - - void dataReady(const QVariantMap &data); - - void connected(); - void disconnected(); - - void interfaceChanged(); - void websocketInterfaceChanged(); - void currentInterfaceNameChanged(); - void currentStatusMessageChanged(); - -public slots: - void start(const ConnectionType &connectionType = ConnectionTypeAuto); - void stop(); - -}; - -#endif // CONNECTIONMANAGER_H diff --git a/libguh-common/libguh-common.pro b/libnymea-common/libnymea-common.pro similarity index 95% rename from libguh-common/libguh-common.pro rename to libnymea-common/libnymea-common.pro index 9d18748a..5b556f35 100644 --- a/libguh-common/libguh-common.pro +++ b/libnymea-common/libnymea-common.pro @@ -1,6 +1,6 @@ -include(../guh-control.pri) +include(../mea.pri) -TARGET = guh-common +TARGET = nymea-common TEMPLATE = lib QT += network @@ -84,7 +84,7 @@ SOURCES += types/vendor.cpp \ # install header file with relative subdirectory for(header, HEADERS) { - path = /usr/include/guh-common/$${dirname(header)} + path = /usr/include/nymea-common/$${dirname(header)} eval(headers_$${path}.files += $${header}) eval(headers_$${path}.path = $${path}) eval(INSTALLS *= headers_$${path}) diff --git a/libguh-common/types/actiontype.cpp b/libnymea-common/types/actiontype.cpp similarity index 96% rename from libguh-common/types/actiontype.cpp rename to libnymea-common/types/actiontype.cpp index dc6d1973..e6d8ba95 100644 --- a/libguh-common/types/actiontype.cpp +++ b/libnymea-common/types/actiontype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/actiontype.h b/libnymea-common/types/actiontype.h similarity index 97% rename from libguh-common/types/actiontype.h rename to libnymea-common/types/actiontype.h index e1cc7e05..0f06f1ed 100644 --- a/libguh-common/types/actiontype.h +++ b/libnymea-common/types/actiontype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/actiontypes.cpp b/libnymea-common/types/actiontypes.cpp similarity index 97% rename from libguh-common/types/actiontypes.cpp rename to libnymea-common/types/actiontypes.cpp index 9b1b953d..e956ffe0 100644 --- a/libguh-common/types/actiontypes.cpp +++ b/libnymea-common/types/actiontypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/actiontypes.h b/libnymea-common/types/actiontypes.h similarity index 97% rename from libguh-common/types/actiontypes.h rename to libnymea-common/types/actiontypes.h index 0ed019e6..3eec6cb1 100644 --- a/libguh-common/types/actiontypes.h +++ b/libnymea-common/types/actiontypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/device.cpp b/libnymea-common/types/device.cpp similarity index 97% rename from libguh-common/types/device.cpp rename to libnymea-common/types/device.cpp index abab10fa..bd64b33e 100644 --- a/libguh-common/types/device.cpp +++ b/libnymea-common/types/device.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/device.h b/libnymea-common/types/device.h similarity index 97% rename from libguh-common/types/device.h rename to libnymea-common/types/device.h index a302abd1..cac5fadd 100644 --- a/libguh-common/types/device.h +++ b/libnymea-common/types/device.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/deviceclass.cpp b/libnymea-common/types/deviceclass.cpp similarity index 98% rename from libguh-common/types/deviceclass.cpp rename to libnymea-common/types/deviceclass.cpp index 34473ec3..21a69c62 100644 --- a/libguh-common/types/deviceclass.cpp +++ b/libnymea-common/types/deviceclass.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/deviceclass.h b/libnymea-common/types/deviceclass.h similarity index 98% rename from libguh-common/types/deviceclass.h rename to libnymea-common/types/deviceclass.h index 716191ab..ef022cbc 100644 --- a/libguh-common/types/deviceclass.h +++ b/libnymea-common/types/deviceclass.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/eventdescriptor.cpp b/libnymea-common/types/eventdescriptor.cpp similarity index 100% rename from libguh-common/types/eventdescriptor.cpp rename to libnymea-common/types/eventdescriptor.cpp diff --git a/libguh-common/types/eventdescriptor.h b/libnymea-common/types/eventdescriptor.h similarity index 100% rename from libguh-common/types/eventdescriptor.h rename to libnymea-common/types/eventdescriptor.h diff --git a/libguh-common/types/eventdescriptors.cpp b/libnymea-common/types/eventdescriptors.cpp similarity index 100% rename from libguh-common/types/eventdescriptors.cpp rename to libnymea-common/types/eventdescriptors.cpp diff --git a/libguh-common/types/eventdescriptors.h b/libnymea-common/types/eventdescriptors.h similarity index 100% rename from libguh-common/types/eventdescriptors.h rename to libnymea-common/types/eventdescriptors.h diff --git a/libguh-common/types/eventtype.cpp b/libnymea-common/types/eventtype.cpp similarity index 96% rename from libguh-common/types/eventtype.cpp rename to libnymea-common/types/eventtype.cpp index 4cc70826..3c7c9513 100644 --- a/libguh-common/types/eventtype.cpp +++ b/libnymea-common/types/eventtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/eventtype.h b/libnymea-common/types/eventtype.h similarity index 97% rename from libguh-common/types/eventtype.h rename to libnymea-common/types/eventtype.h index a5ed6dbc..ec8b445b 100644 --- a/libguh-common/types/eventtype.h +++ b/libnymea-common/types/eventtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/eventtypes.cpp b/libnymea-common/types/eventtypes.cpp similarity index 97% rename from libguh-common/types/eventtypes.cpp rename to libnymea-common/types/eventtypes.cpp index dff06f12..66970d58 100644 --- a/libguh-common/types/eventtypes.cpp +++ b/libnymea-common/types/eventtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/eventtypes.h b/libnymea-common/types/eventtypes.h similarity index 97% rename from libguh-common/types/eventtypes.h rename to libnymea-common/types/eventtypes.h index 627fd408..fb1d28cc 100644 --- a/libguh-common/types/eventtypes.h +++ b/libnymea-common/types/eventtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/interface.cpp b/libnymea-common/types/interface.cpp similarity index 100% rename from libguh-common/types/interface.cpp rename to libnymea-common/types/interface.cpp diff --git a/libguh-common/types/interface.h b/libnymea-common/types/interface.h similarity index 100% rename from libguh-common/types/interface.h rename to libnymea-common/types/interface.h diff --git a/libguh-common/types/interfaces.cpp b/libnymea-common/types/interfaces.cpp similarity index 100% rename from libguh-common/types/interfaces.cpp rename to libnymea-common/types/interfaces.cpp diff --git a/libguh-common/types/interfaces.h b/libnymea-common/types/interfaces.h similarity index 100% rename from libguh-common/types/interfaces.h rename to libnymea-common/types/interfaces.h diff --git a/libguh-common/types/logentry.cpp b/libnymea-common/types/logentry.cpp similarity index 100% rename from libguh-common/types/logentry.cpp rename to libnymea-common/types/logentry.cpp diff --git a/libguh-common/types/logentry.h b/libnymea-common/types/logentry.h similarity index 100% rename from libguh-common/types/logentry.h rename to libnymea-common/types/logentry.h diff --git a/libguh-common/types/param.cpp b/libnymea-common/types/param.cpp similarity index 96% rename from libguh-common/types/param.cpp rename to libnymea-common/types/param.cpp index 12d97cd8..e69316f8 100644 --- a/libguh-common/types/param.cpp +++ b/libnymea-common/types/param.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/param.h b/libnymea-common/types/param.h similarity index 96% rename from libguh-common/types/param.h rename to libnymea-common/types/param.h index 8f6986d0..31521cc0 100644 --- a/libguh-common/types/param.h +++ b/libnymea-common/types/param.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/paramdescriptor.cpp b/libnymea-common/types/paramdescriptor.cpp similarity index 100% rename from libguh-common/types/paramdescriptor.cpp rename to libnymea-common/types/paramdescriptor.cpp diff --git a/libguh-common/types/paramdescriptor.h b/libnymea-common/types/paramdescriptor.h similarity index 100% rename from libguh-common/types/paramdescriptor.h rename to libnymea-common/types/paramdescriptor.h diff --git a/libguh-common/types/paramdescriptors.cpp b/libnymea-common/types/paramdescriptors.cpp similarity index 100% rename from libguh-common/types/paramdescriptors.cpp rename to libnymea-common/types/paramdescriptors.cpp diff --git a/libguh-common/types/paramdescriptors.h b/libnymea-common/types/paramdescriptors.h similarity index 100% rename from libguh-common/types/paramdescriptors.h rename to libnymea-common/types/paramdescriptors.h diff --git a/libguh-common/types/params.cpp b/libnymea-common/types/params.cpp similarity index 97% rename from libguh-common/types/params.cpp rename to libnymea-common/types/params.cpp index da03d10c..318fce51 100644 --- a/libguh-common/types/params.cpp +++ b/libnymea-common/types/params.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/params.h b/libnymea-common/types/params.h similarity index 96% rename from libguh-common/types/params.h rename to libnymea-common/types/params.h index 40cfb41d..9ff13989 100644 --- a/libguh-common/types/params.h +++ b/libnymea-common/types/params.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/paramtype.cpp b/libnymea-common/types/paramtype.cpp similarity index 98% rename from libguh-common/types/paramtype.cpp rename to libnymea-common/types/paramtype.cpp index ddc45cd5..025132ad 100644 --- a/libguh-common/types/paramtype.cpp +++ b/libnymea-common/types/paramtype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/paramtype.h b/libnymea-common/types/paramtype.h similarity index 98% rename from libguh-common/types/paramtype.h rename to libnymea-common/types/paramtype.h index 3c40476f..f3458556 100644 --- a/libguh-common/types/paramtype.h +++ b/libnymea-common/types/paramtype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/paramtypes.cpp b/libnymea-common/types/paramtypes.cpp similarity index 98% rename from libguh-common/types/paramtypes.cpp rename to libnymea-common/types/paramtypes.cpp index 9060a339..cf499330 100644 --- a/libguh-common/types/paramtypes.cpp +++ b/libnymea-common/types/paramtypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/paramtypes.h b/libnymea-common/types/paramtypes.h similarity index 97% rename from libguh-common/types/paramtypes.h rename to libnymea-common/types/paramtypes.h index 6f3f226b..0803c08c 100644 --- a/libguh-common/types/paramtypes.h +++ b/libnymea-common/types/paramtypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/plugin.cpp b/libnymea-common/types/plugin.cpp similarity index 96% rename from libguh-common/types/plugin.cpp rename to libnymea-common/types/plugin.cpp index 6d5d7333..2dc20d27 100644 --- a/libguh-common/types/plugin.cpp +++ b/libnymea-common/types/plugin.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/plugin.h b/libnymea-common/types/plugin.h similarity index 96% rename from libguh-common/types/plugin.h rename to libnymea-common/types/plugin.h index 716dd9d2..4d9685fc 100644 --- a/libguh-common/types/plugin.h +++ b/libnymea-common/types/plugin.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/plugins.cpp b/libnymea-common/types/plugins.cpp similarity index 97% rename from libguh-common/types/plugins.cpp rename to libnymea-common/types/plugins.cpp index 38e24d4a..524bfc75 100644 --- a/libguh-common/types/plugins.cpp +++ b/libnymea-common/types/plugins.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/plugins.h b/libnymea-common/types/plugins.h similarity index 96% rename from libguh-common/types/plugins.h rename to libnymea-common/types/plugins.h index c51c3964..281205f8 100644 --- a/libguh-common/types/plugins.h +++ b/libnymea-common/types/plugins.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/rule.cpp b/libnymea-common/types/rule.cpp similarity index 100% rename from libguh-common/types/rule.cpp rename to libnymea-common/types/rule.cpp diff --git a/libguh-common/types/rule.h b/libnymea-common/types/rule.h similarity index 100% rename from libguh-common/types/rule.h rename to libnymea-common/types/rule.h diff --git a/libguh-common/types/ruleaction.cpp b/libnymea-common/types/ruleaction.cpp similarity index 100% rename from libguh-common/types/ruleaction.cpp rename to libnymea-common/types/ruleaction.cpp diff --git a/libguh-common/types/ruleaction.h b/libnymea-common/types/ruleaction.h similarity index 100% rename from libguh-common/types/ruleaction.h rename to libnymea-common/types/ruleaction.h diff --git a/libguh-common/types/ruleactionparam.cpp b/libnymea-common/types/ruleactionparam.cpp similarity index 100% rename from libguh-common/types/ruleactionparam.cpp rename to libnymea-common/types/ruleactionparam.cpp diff --git a/libguh-common/types/ruleactionparam.h b/libnymea-common/types/ruleactionparam.h similarity index 100% rename from libguh-common/types/ruleactionparam.h rename to libnymea-common/types/ruleactionparam.h diff --git a/libguh-common/types/ruleactionparams.cpp b/libnymea-common/types/ruleactionparams.cpp similarity index 100% rename from libguh-common/types/ruleactionparams.cpp rename to libnymea-common/types/ruleactionparams.cpp diff --git a/libguh-common/types/ruleactionparams.h b/libnymea-common/types/ruleactionparams.h similarity index 100% rename from libguh-common/types/ruleactionparams.h rename to libnymea-common/types/ruleactionparams.h diff --git a/libguh-common/types/ruleactions.cpp b/libnymea-common/types/ruleactions.cpp similarity index 100% rename from libguh-common/types/ruleactions.cpp rename to libnymea-common/types/ruleactions.cpp diff --git a/libguh-common/types/ruleactions.h b/libnymea-common/types/ruleactions.h similarity index 100% rename from libguh-common/types/ruleactions.h rename to libnymea-common/types/ruleactions.h diff --git a/libguh-common/types/rules.cpp b/libnymea-common/types/rules.cpp similarity index 100% rename from libguh-common/types/rules.cpp rename to libnymea-common/types/rules.cpp diff --git a/libguh-common/types/rules.h b/libnymea-common/types/rules.h similarity index 100% rename from libguh-common/types/rules.h rename to libnymea-common/types/rules.h diff --git a/libguh-common/types/state.cpp b/libnymea-common/types/state.cpp similarity index 96% rename from libguh-common/types/state.cpp rename to libnymea-common/types/state.cpp index f088ebc0..d5814507 100644 --- a/libguh-common/types/state.cpp +++ b/libnymea-common/types/state.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/state.h b/libnymea-common/types/state.h similarity index 96% rename from libguh-common/types/state.h rename to libnymea-common/types/state.h index 821a5eae..ebe0f9ae 100644 --- a/libguh-common/types/state.h +++ b/libnymea-common/types/state.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statedescriptor.cpp b/libnymea-common/types/statedescriptor.cpp similarity index 100% rename from libguh-common/types/statedescriptor.cpp rename to libnymea-common/types/statedescriptor.cpp diff --git a/libguh-common/types/statedescriptor.h b/libnymea-common/types/statedescriptor.h similarity index 100% rename from libguh-common/types/statedescriptor.h rename to libnymea-common/types/statedescriptor.h diff --git a/libguh-common/types/stateevaluator.cpp b/libnymea-common/types/stateevaluator.cpp similarity index 100% rename from libguh-common/types/stateevaluator.cpp rename to libnymea-common/types/stateevaluator.cpp diff --git a/libguh-common/types/stateevaluator.h b/libnymea-common/types/stateevaluator.h similarity index 100% rename from libguh-common/types/stateevaluator.h rename to libnymea-common/types/stateevaluator.h diff --git a/libguh-common/types/stateevaluators.cpp b/libnymea-common/types/stateevaluators.cpp similarity index 100% rename from libguh-common/types/stateevaluators.cpp rename to libnymea-common/types/stateevaluators.cpp diff --git a/libguh-common/types/stateevaluators.h b/libnymea-common/types/stateevaluators.h similarity index 100% rename from libguh-common/types/stateevaluators.h rename to libnymea-common/types/stateevaluators.h diff --git a/libguh-common/types/states.cpp b/libnymea-common/types/states.cpp similarity index 97% rename from libguh-common/types/states.cpp rename to libnymea-common/types/states.cpp index e6fda16b..d347c591 100644 --- a/libguh-common/types/states.cpp +++ b/libnymea-common/types/states.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/states.h b/libnymea-common/types/states.h similarity index 96% rename from libguh-common/types/states.h rename to libnymea-common/types/states.h index dfe47f06..a5e53709 100644 --- a/libguh-common/types/states.h +++ b/libnymea-common/types/states.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statesproxy.cpp b/libnymea-common/types/statesproxy.cpp similarity index 96% rename from libguh-common/types/statesproxy.cpp rename to libnymea-common/types/statesproxy.cpp index 58d7bcbf..3a732179 100644 --- a/libguh-common/types/statesproxy.cpp +++ b/libnymea-common/types/statesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statesproxy.h b/libnymea-common/types/statesproxy.h similarity index 96% rename from libguh-common/types/statesproxy.h rename to libnymea-common/types/statesproxy.h index 6c994cda..79d2b0ee 100644 --- a/libguh-common/types/statesproxy.h +++ b/libnymea-common/types/statesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statetype.cpp b/libnymea-common/types/statetype.cpp similarity index 97% rename from libguh-common/types/statetype.cpp rename to libnymea-common/types/statetype.cpp index da33f16a..50c4dd80 100644 --- a/libguh-common/types/statetype.cpp +++ b/libnymea-common/types/statetype.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statetype.h b/libnymea-common/types/statetype.h similarity index 97% rename from libguh-common/types/statetype.h rename to libnymea-common/types/statetype.h index abaf2178..d4706723 100644 --- a/libguh-common/types/statetype.h +++ b/libnymea-common/types/statetype.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statetypes.cpp b/libnymea-common/types/statetypes.cpp similarity index 98% rename from libguh-common/types/statetypes.cpp rename to libnymea-common/types/statetypes.cpp index 3de0ad5b..e635217e 100644 --- a/libguh-common/types/statetypes.cpp +++ b/libnymea-common/types/statetypes.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/statetypes.h b/libnymea-common/types/statetypes.h similarity index 97% rename from libguh-common/types/statetypes.h rename to libnymea-common/types/statetypes.h index 6120d864..09fc7cd3 100644 --- a/libguh-common/types/statetypes.h +++ b/libnymea-common/types/statetypes.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/types.h b/libnymea-common/types/types.h similarity index 97% rename from libguh-common/types/types.h rename to libnymea-common/types/types.h index 043f6e45..611e84fa 100644 --- a/libguh-common/types/types.h +++ b/libnymea-common/types/types.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/vendor.cpp b/libnymea-common/types/vendor.cpp similarity index 96% rename from libguh-common/types/vendor.cpp rename to libnymea-common/types/vendor.cpp index 378aa782..5b9d25c5 100644 --- a/libguh-common/types/vendor.cpp +++ b/libnymea-common/types/vendor.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/vendor.h b/libnymea-common/types/vendor.h similarity index 96% rename from libguh-common/types/vendor.h rename to libnymea-common/types/vendor.h index 4730ab69..0d3afd9c 100644 --- a/libguh-common/types/vendor.h +++ b/libnymea-common/types/vendor.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/vendors.cpp b/libnymea-common/types/vendors.cpp similarity index 97% rename from libguh-common/types/vendors.cpp rename to libnymea-common/types/vendors.cpp index 0eb291dd..d8a79c27 100644 --- a/libguh-common/types/vendors.cpp +++ b/libnymea-common/types/vendors.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/libguh-common/types/vendors.h b/libnymea-common/types/vendors.h similarity index 96% rename from libguh-common/types/vendors.h rename to libnymea-common/types/vendors.h index 13d5fadc..12dfe8e0 100644 --- a/libguh-common/types/vendors.h +++ b/libnymea-common/types/vendors.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control.pri b/mea.pri similarity index 100% rename from guh-control.pri rename to mea.pri diff --git a/mea.pro b/mea.pro new file mode 100644 index 00000000..2ca35f8f --- /dev/null +++ b/mea.pro @@ -0,0 +1,7 @@ +TEMPLATE=subdirs + +SUBDIRS = libnymea-common mea +libnymea-common.subdir = libnymea-common +mea.subdir = mea + +mea.depends = libnymea-common diff --git a/guh-control/android/AndroidManifest.xml b/mea/android/AndroidManifest.xml similarity index 96% rename from guh-control/android/AndroidManifest.xml rename to mea/android/AndroidManifest.xml index b13db7df..3bcf725b 100644 --- a/guh-control/android/AndroidManifest.xml +++ b/mea/android/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/guh-control/android/build.gradle b/mea/android/build.gradle similarity index 100% rename from guh-control/android/build.gradle rename to mea/android/build.gradle diff --git a/guh-control/android/gradle.properties b/mea/android/gradle.properties similarity index 100% rename from guh-control/android/gradle.properties rename to mea/android/gradle.properties diff --git a/guh-control/android/gradle/wrapper/gradle-wrapper.jar b/mea/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from guh-control/android/gradle/wrapper/gradle-wrapper.jar rename to mea/android/gradle/wrapper/gradle-wrapper.jar diff --git a/guh-control/android/gradle/wrapper/gradle-wrapper.properties b/mea/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from guh-control/android/gradle/wrapper/gradle-wrapper.properties rename to mea/android/gradle/wrapper/gradle-wrapper.properties diff --git a/guh-control/android/gradlew b/mea/android/gradlew similarity index 100% rename from guh-control/android/gradlew rename to mea/android/gradlew diff --git a/guh-control/android/gradlew.bat b/mea/android/gradlew.bat similarity index 100% rename from guh-control/android/gradlew.bat rename to mea/android/gradlew.bat diff --git a/guh-control/android/local.properties b/mea/android/local.properties similarity index 100% rename from guh-control/android/local.properties rename to mea/android/local.properties diff --git a/guh-control/android/res/drawable-mdpi/icon.png b/mea/android/res/drawable-mdpi/icon.png similarity index 100% rename from guh-control/android/res/drawable-mdpi/icon.png rename to mea/android/res/drawable-mdpi/icon.png diff --git a/guh-control/android/res/values/libs.xml b/mea/android/res/values/libs.xml similarity index 100% rename from guh-control/android/res/values/libs.xml rename to mea/android/res/values/libs.xml diff --git a/guh-control/basicconfiguration.cpp b/mea/basicconfiguration.cpp similarity index 100% rename from guh-control/basicconfiguration.cpp rename to mea/basicconfiguration.cpp diff --git a/guh-control/basicconfiguration.h b/mea/basicconfiguration.h similarity index 100% rename from guh-control/basicconfiguration.h rename to mea/basicconfiguration.h diff --git a/guh-control/bluetoothinterface.cpp b/mea/bluetoothinterface.cpp similarity index 98% rename from guh-control/bluetoothinterface.cpp rename to mea/bluetoothinterface.cpp index cebcc98d..3576c1eb 100644 --- a/guh-control/bluetoothinterface.cpp +++ b/mea/bluetoothinterface.cpp @@ -4,7 +4,7 @@ #include BluetoothInterface::BluetoothInterface(QObject *parent) : - GuhInterface(parent), + NymeaInterface(parent), m_socket(0), m_discovery(new BluetoothDiscovery(this)) { diff --git a/guh-control/bluetoothinterface.h b/mea/bluetoothinterface.h similarity index 91% rename from guh-control/bluetoothinterface.h rename to mea/bluetoothinterface.h index c2abd3c1..5ae215b1 100644 --- a/guh-control/bluetoothinterface.h +++ b/mea/bluetoothinterface.h @@ -4,10 +4,10 @@ #include #include -#include "guhinterface.h" +#include "nymeainterface.h" #include "discovery/bluetoothdiscovery.h" -class BluetoothInterface : public GuhInterface +class BluetoothInterface : public NymeaInterface { Q_OBJECT Q_PROPERTY(BluetoothDiscovery *discovery READ discovery CONSTANT) diff --git a/guh-control/deviceclasses.cpp b/mea/deviceclasses.cpp similarity index 97% rename from guh-control/deviceclasses.cpp rename to mea/deviceclasses.cpp index e73c74f1..39c35c55 100644 --- a/guh-control/deviceclasses.cpp +++ b/mea/deviceclasses.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/deviceclasses.h b/mea/deviceclasses.h similarity index 96% rename from guh-control/deviceclasses.h rename to mea/deviceclasses.h index 8bf70369..8d65abf0 100644 --- a/guh-control/deviceclasses.h +++ b/mea/deviceclasses.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/deviceclassesproxy.cpp b/mea/deviceclassesproxy.cpp similarity index 97% rename from guh-control/deviceclassesproxy.cpp rename to mea/deviceclassesproxy.cpp index fa027dbd..898def00 100644 --- a/guh-control/deviceclassesproxy.cpp +++ b/mea/deviceclassesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/deviceclassesproxy.h b/mea/deviceclassesproxy.h similarity index 97% rename from guh-control/deviceclassesproxy.h rename to mea/deviceclassesproxy.h index 46caca10..1f02cecf 100644 --- a/guh-control/deviceclassesproxy.h +++ b/mea/deviceclassesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/devicediscovery.cpp b/mea/devicediscovery.cpp similarity index 100% rename from guh-control/devicediscovery.cpp rename to mea/devicediscovery.cpp diff --git a/guh-control/devicediscovery.h b/mea/devicediscovery.h similarity index 100% rename from guh-control/devicediscovery.h rename to mea/devicediscovery.h diff --git a/guh-control/devicemanager.cpp b/mea/devicemanager.cpp similarity index 97% rename from guh-control/devicemanager.cpp rename to mea/devicemanager.cpp index fc9f5447..3aeaffbc 100644 --- a/guh-control/devicemanager.cpp +++ b/mea/devicemanager.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/devicemanager.h b/mea/devicemanager.h similarity index 92% rename from guh-control/devicemanager.h rename to mea/devicemanager.h index 01a2bba7..1b32aef7 100644 --- a/guh-control/devicemanager.h +++ b/mea/devicemanager.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/devices.cpp b/mea/devices.cpp similarity index 98% rename from guh-control/devices.cpp rename to mea/devices.cpp index 1ff9f44a..592eafa2 100644 --- a/guh-control/devices.cpp +++ b/mea/devices.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/devices.h b/mea/devices.h similarity index 97% rename from guh-control/devices.h rename to mea/devices.h index 091185f8..212230c9 100644 --- a/guh-control/devices.h +++ b/mea/devices.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/devicesproxy.cpp b/mea/devicesproxy.cpp similarity index 99% rename from guh-control/devicesproxy.cpp rename to mea/devicesproxy.cpp index 9000cbf7..daaf42b8 100644 --- a/guh-control/devicesproxy.cpp +++ b/mea/devicesproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/devicesproxy.h b/mea/devicesproxy.h similarity index 98% rename from guh-control/devicesproxy.h rename to mea/devicesproxy.h index 0da8d96b..b5d23031 100644 --- a/guh-control/devicesproxy.h +++ b/mea/devicesproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/avahiserviceentry.cpp b/mea/discovery/avahi/avahiserviceentry.cpp similarity index 96% rename from guh-control/discovery/avahi/avahiserviceentry.cpp rename to mea/discovery/avahi/avahiserviceentry.cpp index 3bd0bc71..9015faa8 100644 --- a/guh-control/discovery/avahi/avahiserviceentry.cpp +++ b/mea/discovery/avahi/avahiserviceentry.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * @@ -20,15 +20,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/*! - \class AvahiServiceEntry - \brief Holds information about an avahi service entry. - - \ingroup types - \inmodule libguh - -*/ - #include "avahiserviceentry.h" /*! Constructs an empty invalid \l{AvahiServiceEntry}*/ diff --git a/guh-control/discovery/avahi/avahiserviceentry.h b/mea/discovery/avahi/avahiserviceentry.h similarity index 97% rename from guh-control/discovery/avahi/avahiserviceentry.h rename to mea/discovery/avahi/avahiserviceentry.h index 8c691162..6321931c 100644 --- a/guh-control/discovery/avahi/avahiserviceentry.h +++ b/mea/discovery/avahi/avahiserviceentry.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qt-watch.cpp b/mea/discovery/avahi/qt-watch.cpp similarity index 100% rename from guh-control/discovery/avahi/qt-watch.cpp rename to mea/discovery/avahi/qt-watch.cpp diff --git a/guh-control/discovery/avahi/qt-watch.h b/mea/discovery/avahi/qt-watch.h similarity index 100% rename from guh-control/discovery/avahi/qt-watch.h rename to mea/discovery/avahi/qt-watch.h diff --git a/guh-control/discovery/avahi/qtavahiclient.cpp b/mea/discovery/avahi/qtavahiclient.cpp similarity index 98% rename from guh-control/discovery/avahi/qtavahiclient.cpp rename to mea/discovery/avahi/qtavahiclient.cpp index 8a7dfde2..52527b75 100644 --- a/guh-control/discovery/avahi/qtavahiclient.cpp +++ b/mea/discovery/avahi/qtavahiclient.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiclient.h b/mea/discovery/avahi/qtavahiclient.h similarity index 97% rename from guh-control/discovery/avahi/qtavahiclient.h rename to mea/discovery/avahi/qtavahiclient.h index b81999a8..df6d6d27 100644 --- a/guh-control/discovery/avahi/qtavahiclient.h +++ b/mea/discovery/avahi/qtavahiclient.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservice.cpp b/mea/discovery/avahi/qtavahiservice.cpp similarity index 97% rename from guh-control/discovery/avahi/qtavahiservice.cpp rename to mea/discovery/avahi/qtavahiservice.cpp index bbcc1d2c..10e19464 100644 --- a/guh-control/discovery/avahi/qtavahiservice.cpp +++ b/mea/discovery/avahi/qtavahiservice.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * @@ -20,12 +20,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/*! - \class QtAvahiService - \brief Allows to publish an avahi service to the network. - - \inmodule libguh -*/ /*! \enum QtAvahiService::QtAvahiServiceState diff --git a/guh-control/discovery/avahi/qtavahiservice.h b/mea/discovery/avahi/qtavahiservice.h similarity index 97% rename from guh-control/discovery/avahi/qtavahiservice.h rename to mea/discovery/avahi/qtavahiservice.h index 116e0fa7..051fbb5d 100644 --- a/guh-control/discovery/avahi/qtavahiservice.h +++ b/mea/discovery/avahi/qtavahiservice.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservice_p.cpp b/mea/discovery/avahi/qtavahiservice_p.cpp similarity index 98% rename from guh-control/discovery/avahi/qtavahiservice_p.cpp rename to mea/discovery/avahi/qtavahiservice_p.cpp index caadcb32..f83c2c4c 100644 --- a/guh-control/discovery/avahi/qtavahiservice_p.cpp +++ b/mea/discovery/avahi/qtavahiservice_p.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservice_p.h b/mea/discovery/avahi/qtavahiservice_p.h similarity index 97% rename from guh-control/discovery/avahi/qtavahiservice_p.h rename to mea/discovery/avahi/qtavahiservice_p.h index 2b395dea..efd8b5bb 100644 --- a/guh-control/discovery/avahi/qtavahiservice_p.h +++ b/mea/discovery/avahi/qtavahiservice_p.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservicebrowser.cpp b/mea/discovery/avahi/qtavahiservicebrowser.cpp similarity index 95% rename from guh-control/discovery/avahi/qtavahiservicebrowser.cpp rename to mea/discovery/avahi/qtavahiservicebrowser.cpp index b8f3dd27..02bf6e47 100644 --- a/guh-control/discovery/avahi/qtavahiservicebrowser.cpp +++ b/mea/discovery/avahi/qtavahiservicebrowser.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * @@ -20,14 +20,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/*! - \class QtAvahiServiceBrowser - \brief Allows to browse avahi services in the local network. - - \ingroup hardware - \inmodule libguh -*/ - /*! \fn void QtAvahiServiceBrowser::serviceEntryAdded(const AvahiServiceEntry &entry); This signal will be emitted when a new \a entry was added to the current entry list. */ diff --git a/guh-control/discovery/avahi/qtavahiservicebrowser.h b/mea/discovery/avahi/qtavahiservicebrowser.h similarity index 97% rename from guh-control/discovery/avahi/qtavahiservicebrowser.h rename to mea/discovery/avahi/qtavahiservicebrowser.h index 92ffd4f3..a6695ede 100644 --- a/guh-control/discovery/avahi/qtavahiservicebrowser.h +++ b/mea/discovery/avahi/qtavahiservicebrowser.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservicebrowser_p.cpp b/mea/discovery/avahi/qtavahiservicebrowser_p.cpp similarity index 99% rename from guh-control/discovery/avahi/qtavahiservicebrowser_p.cpp rename to mea/discovery/avahi/qtavahiservicebrowser_p.cpp index 313b2572..265073e1 100644 --- a/guh-control/discovery/avahi/qtavahiservicebrowser_p.cpp +++ b/mea/discovery/avahi/qtavahiservicebrowser_p.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/avahi/qtavahiservicebrowser_p.h b/mea/discovery/avahi/qtavahiservicebrowser_p.h similarity index 98% rename from guh-control/discovery/avahi/qtavahiservicebrowser_p.h rename to mea/discovery/avahi/qtavahiservicebrowser_p.h index 8cffe896..a5cb6900 100644 --- a/guh-control/discovery/avahi/qtavahiservicebrowser_p.h +++ b/mea/discovery/avahi/qtavahiservicebrowser_p.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2016 Simon Stürz * * * - * This file is part of guh. * + * This file is part of mea. * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/discovery/discoverydevice.cpp b/mea/discovery/discoverydevice.cpp similarity index 89% rename from guh-control/discovery/discoverydevice.cpp rename to mea/discovery/discoverydevice.cpp index a2780eaf..7f9d5e18 100644 --- a/guh-control/discovery/discoverydevice.cpp +++ b/mea/discovery/discoverydevice.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -46,14 +46,14 @@ void DiscoveryDevice::setWebSocketUrl(const QString &webSocketUrl) m_webSocketUrl = webSocketUrl; } -QString DiscoveryDevice::guhRpcUrl() const +QString DiscoveryDevice::nymeaRpcUrl() const { - return m_guhRpcUrl; + return m_nymeaRpcUrl; } -void DiscoveryDevice::setGuhRpcUrl(const QString &guhRpcUrl) +void DiscoveryDevice::setNymeaRpcUrl(const QString &nymeaRpcUrl) { - m_guhRpcUrl = guhRpcUrl; + m_nymeaRpcUrl = nymeaRpcUrl; } QHostAddress DiscoveryDevice::hostAddress() const @@ -162,7 +162,7 @@ QDebug operator<<(QDebug debug, const DiscoveryDevice &DiscoveryDevice) debug << "UPnP device on " << QString("%1:%2").arg(DiscoveryDevice.hostAddress().toString()).arg(DiscoveryDevice.port()) << "\n"; debug << "location | " << DiscoveryDevice.location().toString() << "\n"; debug << "websocket | " << DiscoveryDevice.webSocketUrl() << "\n"; - debug << "guhrpc | " << DiscoveryDevice.guhRpcUrl() << "\n"; + debug << "nymearpc | " << DiscoveryDevice.nymeaRpcUrl() << "\n"; debug << "friendly name | " << DiscoveryDevice.friendlyName() << "\n"; debug << "manufacturer | " << DiscoveryDevice.manufacturer() << "\n"; debug << "manufacturer URL | " << DiscoveryDevice.manufacturerURL().toString() << "\n"; diff --git a/guh-control/discovery/discoverydevice.h b/mea/discovery/discoverydevice.h similarity index 87% rename from guh-control/discovery/discoverydevice.h rename to mea/discovery/discoverydevice.h index 8d9b40de..87582ad4 100644 --- a/guh-control/discovery/discoverydevice.h +++ b/mea/discovery/discoverydevice.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -36,8 +36,8 @@ public: QString webSocketUrl() const; void setWebSocketUrl(const QString &webSocketUrl); - QString guhRpcUrl() const; - void setGuhRpcUrl(const QString &guhRpcUrl); + QString nymeaRpcUrl() const; + void setNymeaRpcUrl(const QString &nymeaRpcUrl); QHostAddress hostAddress() const; void setHostAddress(const QHostAddress &hostAddress); @@ -75,7 +75,7 @@ public: private: QUrl m_location; QString m_webSocketUrl; - QString m_guhRpcUrl; + QString m_nymeaRpcUrl; QHostAddress m_hostAddress; int m_port; QString m_friendlyName; diff --git a/guh-control/discovery/discoverymodel.cpp b/mea/discovery/discoverymodel.cpp similarity index 89% rename from guh-control/discovery/discoverymodel.cpp rename to mea/discovery/discoverymodel.cpp index ca79f216..da04ac5a 100644 --- a/guh-control/discovery/discoverymodel.cpp +++ b/mea/discovery/discoverymodel.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -52,8 +52,8 @@ QVariant DiscoveryModel::data(const QModelIndex &index, int role) const return device.port(); } else if (role == VersionRole) { return device.modelNumber(); - } else if (role == GuhRpcUrlRole) { - return device.guhRpcUrl(); + } else if (role == NymeaRpcUrlRole) { + return device.nymeaRpcUrl(); } return QVariant(); } @@ -112,7 +112,7 @@ QHash DiscoveryModel::roleNames() const roles[NameRole] = "name"; roles[HostAddressRole] = "hostAddress"; roles[WebSocketUrlRole] = "webSocketUrl"; - roles[GuhRpcUrlRole] = "guhRpcUrl"; + roles[NymeaRpcUrlRole] = "nymeaRpcUrl"; roles[PortRole] = "port"; roles[VersionRole] = "version"; return roles; diff --git a/guh-control/discovery/discoverymodel.h b/mea/discovery/discoverymodel.h similarity index 87% rename from guh-control/discovery/discoverymodel.h rename to mea/discovery/discoverymodel.h index cdec68aa..f8c3ac36 100644 --- a/guh-control/discovery/discoverymodel.h +++ b/mea/discovery/discoverymodel.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -35,7 +35,7 @@ public: NameRole, HostAddressRole, WebSocketUrlRole, - GuhRpcUrlRole, + NymeaRpcUrlRole, PortRole, VersionRole }; diff --git a/guh-control/discovery/guhdiscovery.cpp b/mea/discovery/nymeadiscovery.cpp similarity index 77% rename from guh-control/discovery/guhdiscovery.cpp rename to mea/discovery/nymeadiscovery.cpp index 466f146c..389fcf19 100644 --- a/guh-control/discovery/guhdiscovery.cpp +++ b/mea/discovery/nymeadiscovery.cpp @@ -1,9 +1,9 @@ -#include "guhdiscovery.h" +#include "nymeadiscovery.h" #include "upnpdiscovery.h" #include "zeroconfdiscovery.h" -GuhDiscovery::GuhDiscovery(QObject *parent) : QObject(parent) +NymeaDiscovery::NymeaDiscovery(QObject *parent) : QObject(parent) { m_discoveryModel = new DiscoveryModel(this); @@ -11,12 +11,12 @@ GuhDiscovery::GuhDiscovery(QObject *parent) : QObject(parent) m_zeroConf = new ZeroconfDiscovery(m_discoveryModel, this); } -bool GuhDiscovery::discovering() const +bool NymeaDiscovery::discovering() const { return m_discovering; } -void GuhDiscovery::setDiscovering(bool discovering) +void NymeaDiscovery::setDiscovering(bool discovering) { if (m_discovering != discovering) { m_discovering = discovering; @@ -33,7 +33,7 @@ void GuhDiscovery::setDiscovering(bool discovering) } } -DiscoveryModel *GuhDiscovery::discoveryModel() const +DiscoveryModel *NymeaDiscovery::discoveryModel() const { return m_discoveryModel; } diff --git a/guh-control/discovery/guhdiscovery.h b/mea/discovery/nymeadiscovery.h similarity index 78% rename from guh-control/discovery/guhdiscovery.h rename to mea/discovery/nymeadiscovery.h index f32a057f..63a22188 100644 --- a/guh-control/discovery/guhdiscovery.h +++ b/mea/discovery/nymeadiscovery.h @@ -1,5 +1,5 @@ -#ifndef GUHDISCOVERY_H -#define GUHDISCOVERY_H +#ifndef NYMEADISCOVERY_H +#define NYMEADISCOVERY_H #include @@ -7,14 +7,14 @@ class DiscoveryModel; class UpnpDiscovery; class ZeroconfDiscovery; -class GuhDiscovery : public QObject +class NymeaDiscovery : public QObject { Q_OBJECT Q_PROPERTY(bool discovering READ discovering WRITE setDiscovering NOTIFY discoveringChanged) Q_PROPERTY(DiscoveryModel *discoveryModel READ discoveryModel CONSTANT) public: - explicit GuhDiscovery(QObject *parent = nullptr); + explicit NymeaDiscovery(QObject *parent = nullptr); bool discovering() const; void setDiscovering(bool discovering); @@ -32,4 +32,4 @@ private: ZeroconfDiscovery *m_zeroConf = nullptr; }; -#endif // GUHDISCOVERY_H +#endif // NYMEADISCOVERY_H diff --git a/guh-control/discovery/guhhost.cpp b/mea/discovery/nymeahost.cpp similarity index 67% rename from guh-control/discovery/guhhost.cpp rename to mea/discovery/nymeahost.cpp index bcd595ba..1c3bacb4 100644 --- a/guh-control/discovery/guhhost.cpp +++ b/mea/discovery/nymeahost.cpp @@ -2,65 +2,65 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhhost.h" +#include "nymeahost.h" -GuhHost::GuhHost(QObject *parent) : +NymeaHost::NymeaHost(QObject *parent) : QObject(parent) { } -QString GuhHost::name() const +QString NymeaHost::name() const { return m_name; } -void GuhHost::setName(const QString &name) +void NymeaHost::setName(const QString &name) { m_name = name; } -QString GuhHost::webSocketUrl() const +QString NymeaHost::webSocketUrl() const { return m_webSocketUrl; } -void GuhHost::setWebSocketUrl(const QString &webSocketUrl) +void NymeaHost::setWebSocketUrl(const QString &webSocketUrl) { m_webSocketUrl = webSocketUrl; } -QString GuhHost::hostAddress() const +QString NymeaHost::hostAddress() const { return m_hostAddress; } -void GuhHost::setHostAddress(const QString &hostAddress) +void NymeaHost::setHostAddress(const QString &hostAddress) { m_hostAddress = hostAddress; } -QUuid GuhHost::uuid() const +QUuid NymeaHost::uuid() const { return m_uuid; } -void GuhHost::setUuid(const QUuid &uuid) +void NymeaHost::setUuid(const QUuid &uuid) { m_uuid = uuid; } diff --git a/guh-control/discovery/guhhost.h b/mea/discovery/nymeahost.h similarity index 79% rename from guh-control/discovery/guhhost.h rename to mea/discovery/nymeahost.h index c7deada9..5aae431a 100644 --- a/guh-control/discovery/guhhost.h +++ b/mea/discovery/nymeahost.h @@ -2,34 +2,34 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef GUHHOST_H -#define GUHHOST_H +#ifndef NYMEAHOST_H +#define NYMEAHOST_H #include #include #include -class GuhHost : public QObject +class NymeaHost : public QObject { Q_OBJECT public: - explicit GuhHost(QObject *parent = 0); + explicit NymeaHost(QObject *parent = 0); QString name() const; void setName(const QString &name); @@ -51,4 +51,4 @@ private: }; -#endif // GuhHost_H +#endif // NYMEAHOST_H diff --git a/guh-control/discovery/guhhosts.cpp b/mea/discovery/nymeahosts.cpp similarity index 77% rename from guh-control/discovery/guhhosts.cpp rename to mea/discovery/nymeahosts.cpp index 6232de43..75fc8bd3 100644 --- a/guh-control/discovery/guhhosts.cpp +++ b/mea/discovery/nymeahosts.cpp @@ -2,29 +2,30 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhhosts.h" +#include "nymeahosts.h" +#include "nymeahost.h" #include #include #include -GuhHosts::GuhHosts(QObject *parent) : +NymeaHosts::NymeaHosts(QObject *parent) : QAbstractListModel(parent) { beginResetModel(); @@ -33,7 +34,7 @@ GuhHosts::GuhHosts(QObject *parent) : settings.beginGroup("Connections"); foreach (const QString &uuid, settings.childGroups()) { settings.beginGroup(uuid); - GuhHost *host = new GuhHost(this); + NymeaHost *host = new NymeaHost(this); host->setName(settings.value("name").toString()); host->setHostAddress(settings.value("hostAddress").toString()); host->setWebSocketUrl(settings.value("webSocketUrl").toString()); @@ -47,9 +48,9 @@ GuhHosts::GuhHosts(QObject *parent) : endResetModel(); } -GuhHost *GuhHosts::get(const QString &webSocketUrl) +NymeaHost *NymeaHosts::get(const QString &webSocketUrl) { - foreach (GuhHost *host, m_hosts) { + foreach (NymeaHost *host, m_hosts) { if (host->webSocketUrl() == webSocketUrl) { return host; } @@ -57,23 +58,23 @@ GuhHost *GuhHosts::get(const QString &webSocketUrl) return nullptr; } -QList GuhHosts::hosts() +QList NymeaHosts::hosts() { return m_hosts; } -int GuhHosts::rowCount(const QModelIndex &parent) const +int NymeaHosts::rowCount(const QModelIndex &parent) const { Q_UNUSED(parent) return m_hosts.count(); } -QVariant GuhHosts::data(const QModelIndex &index, int role) const +QVariant NymeaHosts::data(const QModelIndex &index, int role) const { if (index.row() < 0 || index.row() >= m_hosts.count()) return QVariant(); - GuhHost *host = m_hosts.at(index.row()); + NymeaHost *host = m_hosts.at(index.row()); if (role == NameRole) { return host->name(); } else if (role == HostAddressRole) { @@ -84,22 +85,22 @@ QVariant GuhHosts::data(const QModelIndex &index, int role) const return QVariant(); } -void GuhHosts::addHost(const QString &name, const QString &hostAddress, const QString &webSocketUrl) +void NymeaHosts::addHost(const QString &name, const QString &hostAddress, const QString &webSocketUrl) { // check if we allready have added this connection - foreach (GuhHost *host, m_hosts) { + foreach (NymeaHost *host, m_hosts) { if (host->webSocketUrl() == webSocketUrl) { return; } } - GuhHost *host = new GuhHost(this); + NymeaHost *host = new NymeaHost(this); host->setName(name); host->setHostAddress(hostAddress); host->setWebSocketUrl(webSocketUrl); host->setUuid(QUuid::createUuid()); - qDebug() << "GuhHosts: add connection" << host->webSocketUrl(); + qDebug() << "NymeaHosts: add connection" << host->webSocketUrl(); beginInsertRows(QModelIndex(), m_hosts.count(), m_hosts.count()); m_hosts.append(host); endInsertRows(); @@ -115,7 +116,7 @@ void GuhHosts::addHost(const QString &name, const QString &hostAddress, const QS qDebug() << "Connections: saved connection" << settings.fileName(); } -void GuhHosts::removeHost(GuhHost *host) +void NymeaHosts::removeHost(NymeaHost *host) { int index = m_hosts.indexOf(host); beginRemoveRows(QModelIndex(), index, index); @@ -130,16 +131,16 @@ void GuhHosts::removeHost(GuhHost *host) endRemoveRows(); } -void GuhHosts::clearModel() +void NymeaHosts::clearModel() { beginResetModel(); - qDebug() << "GuhHosts: delete all hosts"; + qDebug() << "NymeaHosts: delete all hosts"; qDeleteAll(m_hosts); m_hosts.clear(); endResetModel(); } -QHash GuhHosts::roleNames() const +QHash NymeaHosts::roleNames() const { QHash roles; roles[NameRole] = "name"; diff --git a/guh-control/discovery/guhhosts.h b/mea/discovery/nymeahosts.h similarity index 72% rename from guh-control/discovery/guhhosts.h rename to mea/discovery/nymeahosts.h index 24236da6..79aef0a0 100644 --- a/guh-control/discovery/guhhosts.h +++ b/mea/discovery/nymeahosts.h @@ -2,30 +2,30 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef GUHHOSTS_H -#define GUHHOSTS_H +#ifndef NYMEAHOSTS_H +#define NYMEAHOSTS_H #include -#include "guhhost.h" +class NymeaHost; -class GuhHosts : public QAbstractListModel +class NymeaHosts : public QAbstractListModel { Q_OBJECT public: @@ -35,16 +35,16 @@ public: WebSocketUrlRole }; - explicit GuhHosts(QObject *parent = 0); + explicit NymeaHosts(QObject *parent = 0); - Q_INVOKABLE GuhHost *get(const QString &webSocketUrl); - QList hosts(); + Q_INVOKABLE NymeaHost *get(const QString &webSocketUrl); + QList hosts(); int rowCount(const QModelIndex & parent = QModelIndex()) const; QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const; void addHost(const QString &name, const QString &hostAddress, const QString &webSocketUrl); - Q_INVOKABLE void removeHost(GuhHost *host); + Q_INVOKABLE void removeHost(NymeaHost *host); void clearModel(); @@ -52,8 +52,8 @@ protected: QHash roleNames() const; private: - QList m_hosts; + QList m_hosts; }; -#endif // GuhHosts_H +#endif // NYMEAHOSTS_H diff --git a/guh-control/discovery/upnpdiscovery.cpp b/mea/discovery/upnpdiscovery.cpp similarity index 93% rename from guh-control/discovery/upnpdiscovery.cpp rename to mea/discovery/upnpdiscovery.cpp index 16252913..04cbffce 100644 --- a/guh-control/discovery/upnpdiscovery.cpp +++ b/mea/discovery/upnpdiscovery.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -138,7 +138,7 @@ void UpnpDiscovery::readData() // if the data contains the HTTP OK header... if (data.contains("HTTP/1.1 200 OK")) { QUrl location; - bool isGuh = false; + bool isNymea = false; const QStringList lines = QString(data).split("\r\n"); foreach (const QString& line, lines) { @@ -150,7 +150,7 @@ void UpnpDiscovery::readData() if (key.contains("Server") || key.contains("SERVER")) { if (value.contains("nymea")) { qDebug() << " --> " << key << value; - isGuh = true; + isNymea = true; } } @@ -160,11 +160,11 @@ void UpnpDiscovery::readData() } } - if (isGuh) { - qDebug() << "Found guh device:" << location; + if (isNymea) { + qDebug() << "Found nymea device:" << location; } - if (!m_foundDevices.contains(location) && isGuh) { + if (!m_foundDevices.contains(location) && isNymea) { m_foundDevices.append(location); DiscoveryDevice discoveryDevice; discoveryDevice.setHostAddress(hostAddress); @@ -206,7 +206,7 @@ void UpnpDiscovery::networkReplyFinished(QNetworkReply *reply) if (xml.isStartElement()) { if (xml.name().toString() == "nymeaRpcURL") { - discoveryDevice.setGuhRpcUrl(xml.readElementText()); + discoveryDevice.setNymeaRpcUrl(xml.readElementText()); } } diff --git a/guh-control/discovery/upnpdiscovery.h b/mea/discovery/upnpdiscovery.h similarity index 88% rename from guh-control/discovery/upnpdiscovery.h rename to mea/discovery/upnpdiscovery.h index 8e25c27e..4c5c57a6 100644 --- a/guh-control/discovery/upnpdiscovery.h +++ b/mea/discovery/upnpdiscovery.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2015 Simon Stuerz * * * - * This file is part of guh-ubuntu. * + * This file is part of mea. * * * - * guh-ubuntu is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-ubuntu is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-ubuntu. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/discovery/zeroconfdiscovery.cpp b/mea/discovery/zeroconfdiscovery.cpp similarity index 89% rename from guh-control/discovery/zeroconfdiscovery.cpp rename to mea/discovery/zeroconfdiscovery.cpp index d1a4400e..4bd4eb0b 100644 --- a/guh-control/discovery/zeroconfdiscovery.cpp +++ b/mea/discovery/zeroconfdiscovery.cpp @@ -49,7 +49,7 @@ void ZeroconfDiscovery::serviceEntryAdded(const AvahiServiceEntry &entry) } DiscoveryDevice dev = m_discoveryModel->find(entry.hostAddress()); - if (dev.uuid() == uuid && dev.guhRpcUrl().startsWith("guhs") && !sslEnabled) { + if (dev.uuid() == uuid && dev.nymeaRpcUrl().startsWith("nymeas") && !sslEnabled) { // We already have this host and with a more secure configuration... skip this one... return; } @@ -57,7 +57,7 @@ void ZeroconfDiscovery::serviceEntryAdded(const AvahiServiceEntry &entry) dev.setHostAddress(entry.hostAddress()); dev.setPort(entry.port()); dev.setFriendlyName(entry.hostName()); - dev.setGuhRpcUrl(QString("%1://%2:%3").arg(sslEnabled ? "nymeas" : "nymea").arg(entry.hostAddress().toString()).arg(entry.port())); + dev.setNymeaRpcUrl(QString("%1://%2:%3").arg(sslEnabled ? "nymeas" : "nymea").arg(entry.hostAddress().toString()).arg(entry.port())); m_discoveryModel->addDevice(dev); // DiscoveryDevice *dev = new DiscoveryDevice(); diff --git a/guh-control/discovery/zeroconfdiscovery.h b/mea/discovery/zeroconfdiscovery.h similarity index 100% rename from guh-control/discovery/zeroconfdiscovery.h rename to mea/discovery/zeroconfdiscovery.h diff --git a/guh-control/engine.cpp b/mea/engine.cpp similarity index 88% rename from guh-control/engine.cpp rename to mea/engine.cpp index 153e3b68..ad9f34b5 100644 --- a/guh-control/engine.cpp +++ b/mea/engine.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -68,14 +68,14 @@ BasicConfiguration *Engine::basicConfiguration() const return m_basicConfiguration; } -GuhConnection *Engine::connection() const +NymeaConnection *Engine::connection() const { return m_connection; } Engine::Engine(QObject *parent) : QObject(parent), - m_connection(new GuhConnection(this)), + m_connection(new NymeaConnection(this)), m_jsonRpcClient(new JsonRpcClient(m_connection, this)), m_deviceManager(new DeviceManager(m_jsonRpcClient, this)), m_ruleManager(new RuleManager(m_jsonRpcClient, this)), diff --git a/guh-control/engine.h b/mea/engine.h similarity index 83% rename from guh-control/engine.h rename to mea/engine.h index a5f01380..4b476001 100644 --- a/guh-control/engine.h +++ b/mea/engine.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -26,7 +26,7 @@ #include #include "devicemanager.h" -#include "guhinterface.h" +#include "nymeainterface.h" #include "jsonrpc/jsonrpcclient.h" class RuleManager; @@ -36,7 +36,7 @@ class BasicConfiguration; class Engine : public QObject { Q_OBJECT - Q_PROPERTY(GuhConnection* connection READ connection CONSTANT) + Q_PROPERTY(NymeaConnection* connection READ connection CONSTANT) Q_PROPERTY(DeviceManager* deviceManager READ deviceManager CONSTANT) Q_PROPERTY(RuleManager* ruleManager READ ruleManager CONSTANT) Q_PROPERTY(JsonRpcClient* jsonRpcClient READ jsonRpcClient CONSTANT) @@ -49,7 +49,7 @@ public: bool connected() const; QString connectedHost() const; - GuhConnection *connection() const; + NymeaConnection *connection() const; DeviceManager *deviceManager() const; RuleManager *ruleManager() const; JsonRpcClient *jsonRpcClient() const; @@ -60,7 +60,7 @@ private: explicit Engine(QObject *parent = 0); static Engine *s_instance; - GuhConnection *m_connection; + NymeaConnection *m_connection; JsonRpcClient *m_jsonRpcClient; DeviceManager *m_deviceManager; RuleManager *m_ruleManager; diff --git a/guh-control/guh-logo-256x256.png b/mea/guh-logo-256x256.png similarity index 100% rename from guh-control/guh-logo-256x256.png rename to mea/guh-logo-256x256.png diff --git a/guh-control/guh-logo.svg b/mea/guh-logo.svg similarity index 100% rename from guh-control/guh-logo.svg rename to mea/guh-logo.svg diff --git a/guh-control/interfacesmodel.cpp b/mea/interfacesmodel.cpp similarity index 100% rename from guh-control/interfacesmodel.cpp rename to mea/interfacesmodel.cpp diff --git a/guh-control/interfacesmodel.h b/mea/interfacesmodel.h similarity index 100% rename from guh-control/interfacesmodel.h rename to mea/interfacesmodel.h diff --git a/guh-control/jsonrpc/actionhandler.cpp b/mea/jsonrpc/actionhandler.cpp similarity index 100% rename from guh-control/jsonrpc/actionhandler.cpp rename to mea/jsonrpc/actionhandler.cpp diff --git a/guh-control/jsonrpc/jsonhandler.cpp b/mea/jsonrpc/jsonhandler.cpp similarity index 80% rename from guh-control/jsonrpc/jsonhandler.cpp rename to mea/jsonrpc/jsonhandler.cpp index 98094494..2d7a384f 100644 --- a/guh-control/jsonrpc/jsonhandler.cpp +++ b/mea/jsonrpc/jsonhandler.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/jsonrpc/jsonhandler.h b/mea/jsonrpc/jsonhandler.h similarity index 82% rename from guh-control/jsonrpc/jsonhandler.h rename to mea/jsonrpc/jsonhandler.h index 00503637..d91b1ff6 100644 --- a/guh-control/jsonrpc/jsonhandler.h +++ b/mea/jsonrpc/jsonhandler.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/jsonrpc/jsonrpcclient.cpp b/mea/jsonrpc/jsonrpcclient.cpp similarity index 94% rename from guh-control/jsonrpc/jsonrpcclient.cpp rename to mea/jsonrpc/jsonrpcclient.cpp index c94df1f9..5726c12e 100644 --- a/guh-control/jsonrpc/jsonrpcclient.cpp +++ b/mea/jsonrpc/jsonrpcclient.cpp @@ -2,24 +2,24 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ #include "jsonrpcclient.h" -#include "guhconnection.h" +#include "nymeaconnection.h" #include "types/param.h" #include "types/params.h" @@ -30,13 +30,13 @@ #include #include -JsonRpcClient::JsonRpcClient(GuhConnection *connection, QObject *parent) : +JsonRpcClient::JsonRpcClient(NymeaConnection *connection, QObject *parent) : JsonHandler(parent), m_id(0), m_connection(connection) { - connect(m_connection, &GuhConnection::connectedChanged, this, &JsonRpcClient::onInterfaceConnectedChanged); - connect(m_connection, &GuhConnection::dataAvailable, this, &JsonRpcClient::dataReceived); + connect(m_connection, &NymeaConnection::connectedChanged, this, &JsonRpcClient::onInterfaceConnectedChanged); + connect(m_connection, &NymeaConnection::dataAvailable, this, &JsonRpcClient::dataReceived); } QString JsonRpcClient::nameSpace() const @@ -185,7 +185,7 @@ void JsonRpcClient::dataReceived(const QByteArray &data) QJsonParseError error; QJsonDocument jsonDoc = QJsonDocument::fromJson(m_receiveBuffer.left(splitIndex), &error); if (error.error != QJsonParseError::NoError) { - // qWarning() << "Could not parse json data from guh" << data << error.errorString(); + // qWarning() << "Could not parse json data from mea" << data << error.errorString(); return; } // qDebug() << "received response" << m_receiveBuffer.left(splitIndex); diff --git a/guh-control/jsonrpc/jsonrpcclient.h b/mea/jsonrpc/jsonrpcclient.h similarity index 89% rename from guh-control/jsonrpc/jsonrpcclient.h rename to mea/jsonrpc/jsonrpcclient.h index ece32fc3..2f292fe0 100644 --- a/guh-control/jsonrpc/jsonrpcclient.h +++ b/mea/jsonrpc/jsonrpcclient.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -24,7 +24,7 @@ #include #include -#include "guhconnection.h" +#include "nymeaconnection.h" #include "jsonhandler.h" class JsonRpcReply; @@ -39,7 +39,7 @@ class JsonRpcClient : public JsonHandler Q_PROPERTY(bool authenticationRequired READ authenticationRequired NOTIFY authenticationRequiredChanged) public: - explicit JsonRpcClient(GuhConnection *connection, QObject *parent = 0); + explicit JsonRpcClient(NymeaConnection *connection, QObject *parent = 0); QString nameSpace() const override; @@ -48,7 +48,7 @@ public: void sendCommand(const QString &method, const QVariantMap ¶ms, QObject *caller = nullptr, const QString &callbackMethod = QString()); void sendCommand(const QString &method, QObject *caller = nullptr, const QString &callbackMethod = QString()); - void setConnection(GuhConnection *connection); + void setConnection(NymeaConnection *connection); bool connected() const; bool initialSetupRequired() const; bool authenticationRequired() const; @@ -79,7 +79,7 @@ private: // < namespace, > QHash > m_notificationHandlers; QHash m_replies; - GuhConnection *m_connection = nullptr; + NymeaConnection *m_connection = nullptr; JsonRpcReply *createReply(const QString &method, const QVariantMap ¶ms, QObject *caller, const QString &callback); diff --git a/guh-control/jsonrpc/jsontypes.cpp b/mea/jsonrpc/jsontypes.cpp similarity index 98% rename from guh-control/jsonrpc/jsontypes.cpp rename to mea/jsonrpc/jsontypes.cpp index cd6549bd..bb3cf6f2 100644 --- a/guh-control/jsonrpc/jsontypes.cpp +++ b/mea/jsonrpc/jsontypes.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/jsonrpc/jsontypes.h b/mea/jsonrpc/jsontypes.h similarity index 91% rename from guh-control/jsonrpc/jsontypes.h rename to mea/jsonrpc/jsontypes.h index 4a5c7d33..f0318c5f 100644 --- a/guh-control/jsonrpc/jsontypes.h +++ b/mea/jsonrpc/jsontypes.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/guh-control/logmanager.cpp b/mea/logmanager.cpp similarity index 100% rename from guh-control/logmanager.cpp rename to mea/logmanager.cpp diff --git a/guh-control/logmanager.h b/mea/logmanager.h similarity index 100% rename from guh-control/logmanager.h rename to mea/logmanager.h diff --git a/guh-control/main.cpp b/mea/main.cpp similarity index 92% rename from guh-control/main.cpp rename to mea/main.cpp index 6632de61..79c69a1d 100644 --- a/guh-control/main.cpp +++ b/mea/main.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -30,7 +30,7 @@ #include "devicesproxy.h" #include "pluginsproxy.h" #include "devicediscovery.h" -#include "discovery/guhdiscovery.h" +#include "discovery/nymeadiscovery.h" #include "discovery/discoverymodel.h" #include "interfacesmodel.h" #include "rulemanager.h" @@ -63,8 +63,8 @@ int main(int argc, char *argv[]) { QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication application(argc, argv); - application.setApplicationName("guh-control"); - application.setOrganizationName("guh"); + application.setApplicationName("mea"); + application.setOrganizationName("nymea"); foreach (const QFileInfo &fi, QDir(":/ui/fonts/").entryInfoList()) { int id = QFontDatabase::addApplicationFont(fi.absoluteFilePath()); @@ -80,15 +80,15 @@ int main(int argc, char *argv[]) QQuickStyle::setStyle("Material"); - const char uri[] = "Guh"; + const char uri[] = "Mea"; qmlRegisterSingletonType(uri, 1, 0, "Engine", Engine::qmlInstance); qmlRegisterUncreatableType(uri, 1, 0, "DeviceManager", "Can't create this in QML. Get it from the Core."); qmlRegisterUncreatableType(uri, 1, 0, "JsonRpcClient", "Can't create this in QML. Get it from the Core."); - qmlRegisterUncreatableType(uri, 1, 0, "GuhConnection", "Can't create this in QML. Get it from the Core."); + qmlRegisterUncreatableType(uri, 1, 0, "NymeaConnection", "Can't create this in QML. Get it from the Core."); - // libguh-common + // libnymea-common qmlRegisterUncreatableType(uri, 1, 0, "Types", "Can't create this in QML. Get it from the Core."); qmlRegisterUncreatableType(uri, 1, 0, "ParamType", "Can't create this in QML. Get it from the ParamTypes."); @@ -147,8 +147,8 @@ int main(int argc, char *argv[]) qmlRegisterUncreatableType(uri, 1, 0, "BasicConfiguration", "Uncreatable"); - qmlRegisterType(uri, 1, 0, "GuhDiscovery"); - qmlRegisterUncreatableType(uri, 1, 0, "DiscoveryModel", "Get it from GuhDiscovery"); + qmlRegisterType(uri, 1, 0, "NymeaDiscovery"); + qmlRegisterUncreatableType(uri, 1, 0, "DiscoveryModel", "Get it from NymeaDiscovery"); qmlRegisterType(uri, 1, 0, "LogsModel"); qmlRegisterType(uri, 1, 0, "ValueLogsProxyModel"); diff --git a/guh-control/guh-control.pro b/mea/mea.pro similarity index 87% rename from guh-control/guh-control.pro rename to mea/mea.pro index 9ee099d9..4062b54d 100644 --- a/guh-control/guh-control.pro +++ b/mea/mea.pro @@ -1,22 +1,22 @@ TEMPLATE=app -TARGET=guh-control -include(../guh-control.pri) +TARGET=mea +include(../mea.pri) QT += qml quick quickcontrols2 websockets svg -INCLUDEPATH += $$top_srcdir/libguh-common -LIBS += -L$$top_builddir/libguh-common/ -lguh-common +INCLUDEPATH += $$top_srcdir/libnymea-common +LIBS += -L$$top_builddir/libnymea-common/ -lnymea-common HEADERS += engine.h \ - guhinterface.h \ + nymeainterface.h \ devicemanager.h \ websocketinterface.h \ jsonrpc/jsontypes.h \ jsonrpc/jsonrpcclient.h \ jsonrpc/jsonhandler.h \ - discovery/guhhost.h \ - discovery/guhhosts.h \ + discovery/nymeahost.h \ + discovery/nymeahosts.h \ discovery/upnpdiscovery.h \ devices.h \ devicesproxy.h \ @@ -26,7 +26,7 @@ HEADERS += engine.h \ vendorsproxy.h \ pluginsproxy.h \ tcpsocketinterface.h \ - guhconnection.h \ + nymeaconnection.h \ interfacesmodel.h \ discovery/zeroconfdiscovery.h \ discovery/discoverydevice.h \ @@ -35,21 +35,21 @@ HEADERS += engine.h \ models/rulesfiltermodel.h \ models/logsmodel.h \ models/valuelogsproxymodel.h \ - discovery/guhdiscovery.h \ + discovery/nymeadiscovery.h \ logmanager.h \ basicconfiguration.h SOURCES += main.cpp \ engine.cpp \ - guhinterface.cpp \ + nymeainterface.cpp \ devicemanager.cpp \ websocketinterface.cpp \ jsonrpc/jsontypes.cpp \ jsonrpc/jsonrpcclient.cpp \ jsonrpc/jsonhandler.cpp \ - discovery/guhhost.cpp \ - discovery/guhhosts.cpp \ + discovery/nymeahost.cpp \ + discovery/nymeahosts.cpp \ discovery/upnpdiscovery.cpp \ devices.cpp \ devicesproxy.cpp \ @@ -59,7 +59,7 @@ SOURCES += main.cpp \ vendorsproxy.cpp \ pluginsproxy.cpp \ tcpsocketinterface.cpp \ - guhconnection.cpp \ + nymeaconnection.cpp \ interfacesmodel.cpp \ discovery/zeroconfdiscovery.cpp \ discovery/discoverydevice.cpp \ @@ -68,7 +68,7 @@ SOURCES += main.cpp \ models/rulesfiltermodel.cpp \ models/logsmodel.cpp \ models/valuelogsproxymodel.cpp \ - discovery/guhdiscovery.cpp \ + discovery/nymeadiscovery.cpp \ logmanager.cpp \ basicconfiguration.cpp diff --git a/guh-control/models/logsmodel.cpp b/mea/models/logsmodel.cpp similarity index 100% rename from guh-control/models/logsmodel.cpp rename to mea/models/logsmodel.cpp diff --git a/guh-control/models/logsmodel.h b/mea/models/logsmodel.h similarity index 100% rename from guh-control/models/logsmodel.h rename to mea/models/logsmodel.h diff --git a/guh-control/models/rulesfiltermodel.cpp b/mea/models/rulesfiltermodel.cpp similarity index 100% rename from guh-control/models/rulesfiltermodel.cpp rename to mea/models/rulesfiltermodel.cpp diff --git a/guh-control/models/rulesfiltermodel.h b/mea/models/rulesfiltermodel.h similarity index 100% rename from guh-control/models/rulesfiltermodel.h rename to mea/models/rulesfiltermodel.h diff --git a/guh-control/models/valuelogsproxymodel.cpp b/mea/models/valuelogsproxymodel.cpp similarity index 97% rename from guh-control/models/valuelogsproxymodel.cpp rename to mea/models/valuelogsproxymodel.cpp index 17cc5812..00226597 100644 --- a/guh-control/models/valuelogsproxymodel.cpp +++ b/mea/models/valuelogsproxymodel.cpp @@ -53,14 +53,19 @@ void ValueLogsProxyModel::logsReply(const QVariantMap &data) switch (m_average) { case AverageMonth: stepSize *= 30; + // fall through case AverageDay: stepSize *= 8; + // fall through case AverageDayTime: stepSize *= 3; + // fall through case AverageHourly: stepSize *= 4; + // fall through case AverageQuarterHour: stepSize *= 15; + // fall through case AverageMinute: stepSize *= 60; } diff --git a/guh-control/models/valuelogsproxymodel.h b/mea/models/valuelogsproxymodel.h similarity index 100% rename from guh-control/models/valuelogsproxymodel.h rename to mea/models/valuelogsproxymodel.h diff --git a/guh-control/guhconnection.cpp b/mea/nymeaconnection.cpp similarity index 74% rename from guh-control/guhconnection.cpp rename to mea/nymeaconnection.cpp index 8d7b85de..260cc327 100644 --- a/guh-control/guhconnection.cpp +++ b/mea/nymeaconnection.cpp @@ -1,24 +1,24 @@ -#include "guhconnection.h" +#include "nymeaconnection.h" #include #include #include #include -#include "guhinterface.h" +#include "nymeainterface.h" #include "tcpsocketinterface.h" #include "websocketinterface.h" -GuhConnection::GuhConnection(QObject *parent) : QObject(parent) +NymeaConnection::NymeaConnection(QObject *parent) : QObject(parent) { - GuhInterface *iface = new TcpSocketInterface(this); + NymeaInterface *iface = new TcpSocketInterface(this); registerInterface(iface); iface = new WebsocketInterface(this); registerInterface(iface); } -void GuhConnection::connect(const QString &url) +void NymeaConnection::connect(const QString &url) { if (connected()) { qWarning() << "Already connected. Cannot connect multiple times"; @@ -34,7 +34,7 @@ void GuhConnection::connect(const QString &url) m_currentInterface->connect(m_currentUrl); } -void GuhConnection::disconnect() +void NymeaConnection::disconnect() { if (!m_currentInterface || !m_currentInterface->isConnected()) { qWarning() << "not connected, cannot disconnect"; @@ -43,7 +43,7 @@ void GuhConnection::disconnect() m_currentInterface->disconnect(); } -void GuhConnection::acceptCertificate(const QByteArray &fingerprint) +void NymeaConnection::acceptCertificate(const QByteArray &fingerprint) { QSettings settings; settings.beginGroup("acceptedCertificates"); @@ -52,17 +52,17 @@ void GuhConnection::acceptCertificate(const QByteArray &fingerprint) connect(m_currentUrl.toString()); } -bool GuhConnection::connected() +bool NymeaConnection::connected() { return m_currentInterface && m_currentInterface->isConnected(); } -QString GuhConnection::url() const +QString NymeaConnection::url() const { return m_currentUrl.toString(); } -void GuhConnection::sendData(const QByteArray &data) +void NymeaConnection::sendData(const QByteArray &data) { if (connected()) { // qDebug() << "sending data:" << data; @@ -72,7 +72,7 @@ void GuhConnection::sendData(const QByteArray &data) } } -void GuhConnection::onSslErrors(const QList &errors) +void NymeaConnection::onSslErrors(const QList &errors) { qDebug() << "ssl errors"; QList ignoredErrors; @@ -102,13 +102,13 @@ void GuhConnection::onSslErrors(const QList &errors) m_currentInterface->ignoreSslErrors(ignoredErrors); } -void GuhConnection::onError(QAbstractSocket::SocketError error) +void NymeaConnection::onError(QAbstractSocket::SocketError error) { qWarning() << "socket error" << error; emit connectionError(); } -void GuhConnection::onConnected() +void NymeaConnection::onConnected() { if (m_currentInterface != sender()) { qWarning() << "An inactive interface is emitting signals... ignoring."; @@ -118,7 +118,7 @@ void GuhConnection::onConnected() emit connectedChanged(true); } -void GuhConnection::onDisconnected() +void NymeaConnection::onDisconnected() { if (m_currentInterface != sender()) { qWarning() << "An inactive interface is emitting signals... ignoring."; @@ -129,15 +129,15 @@ void GuhConnection::onDisconnected() emit connectedChanged(false); } -void GuhConnection::registerInterface(GuhInterface *iface) +void NymeaConnection::registerInterface(NymeaInterface *iface) { - QObject::connect(iface, &GuhInterface::sslErrors, this, &GuhConnection::onSslErrors); - QObject::connect(iface, &GuhInterface::error, this, &GuhConnection::onError); - QObject::connect(iface, &GuhInterface::connected, this, &GuhConnection::onConnected); - QObject::connect(iface, &GuhInterface::disconnected, this, &GuhConnection::onDisconnected); + QObject::connect(iface, &NymeaInterface::sslErrors, this, &NymeaConnection::onSslErrors); + QObject::connect(iface, &NymeaInterface::error, this, &NymeaConnection::onError); + QObject::connect(iface, &NymeaInterface::connected, this, &NymeaConnection::onConnected); + QObject::connect(iface, &NymeaInterface::disconnected, this, &NymeaConnection::onDisconnected); // signal forwarding - QObject::connect(iface, &GuhInterface::dataReady, this, &GuhConnection::dataAvailable); + QObject::connect(iface, &NymeaInterface::dataReady, this, &NymeaConnection::dataAvailable); foreach (const QString &scheme, iface->supportedSchemes()) { m_interfaces[scheme] = iface; diff --git a/guh-control/guhconnection.h b/mea/nymeaconnection.h similarity index 73% rename from guh-control/guhconnection.h rename to mea/nymeaconnection.h index eb8a064c..3a2b546c 100644 --- a/guh-control/guhconnection.h +++ b/mea/nymeaconnection.h @@ -1,5 +1,5 @@ -#ifndef GUHCONNECTION_H -#define GUHCONNECTION_H +#ifndef NYMEACONNECTION_H +#define NYMEACONNECTION_H #include #include @@ -7,16 +7,16 @@ #include #include -class GuhInterface; +class NymeaInterface; -class GuhConnection : public QObject +class NymeaConnection : public QObject { Q_OBJECT Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged) Q_PROPERTY(QString url READ url NOTIFY connectedChanged) public: - explicit GuhConnection(QObject *parent = nullptr); + explicit NymeaConnection(QObject *parent = nullptr); Q_INVOKABLE void connect(const QString &url); Q_INVOKABLE void disconnect(); @@ -40,12 +40,12 @@ private slots: void onDisconnected(); private: - void registerInterface(GuhInterface *iface); + void registerInterface(NymeaInterface *iface); private: - QHash m_interfaces; - GuhInterface *m_currentInterface = nullptr; + QHash m_interfaces; + NymeaInterface *m_currentInterface = nullptr; QUrl m_currentUrl; }; -#endif // GUHCONNECTION_H +#endif // NYMEACONNECTION_H diff --git a/guh-control/guhinterface.cpp b/mea/nymeainterface.cpp similarity index 76% rename from guh-control/guhinterface.cpp rename to mea/nymeainterface.cpp index bc6b4f08..f83dcbe5 100644 --- a/guh-control/guhinterface.cpp +++ b/mea/nymeainterface.cpp @@ -2,26 +2,26 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhinterface.h" +#include "nymeainterface.h" #include -GuhInterface::GuhInterface(QObject *parent) : +NymeaInterface::NymeaInterface(QObject *parent) : QObject(parent) { diff --git a/guh-control/guhinterface.h b/mea/nymeainterface.h similarity index 79% rename from guh-control/guhinterface.h rename to mea/nymeainterface.h index b801db0a..358b4e00 100644 --- a/guh-control/guhinterface.h +++ b/mea/nymeainterface.h @@ -2,34 +2,34 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef GUHINTERFACE_H -#define GUHINTERFACE_H +#ifndef NYMEAINTERFACE_H +#define NYMEAINTERFACE_H #include #include #include -class GuhInterface : public QObject +class NymeaInterface : public QObject { Q_OBJECT public: - explicit GuhInterface(QObject *parent = 0); + explicit NymeaInterface(QObject *parent = 0); virtual QStringList supportedSchemes() const = 0; @@ -47,4 +47,4 @@ signals: void dataReady(const QByteArray &data); }; -#endif // GUHINTERFACE_H +#endif // NYMEAINTERFACE_H diff --git a/guh-control/pluginsproxy.cpp b/mea/pluginsproxy.cpp similarity index 96% rename from guh-control/pluginsproxy.cpp rename to mea/pluginsproxy.cpp index 603f5e3d..d5143910 100644 --- a/guh-control/pluginsproxy.cpp +++ b/mea/pluginsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/pluginsproxy.h b/mea/pluginsproxy.h similarity index 96% rename from guh-control/pluginsproxy.h rename to mea/pluginsproxy.h index f2abc419..5b3bc4cd 100644 --- a/guh-control/pluginsproxy.h +++ b/mea/pluginsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/resources.qrc b/mea/resources.qrc similarity index 100% rename from guh-control/resources.qrc rename to mea/resources.qrc diff --git a/guh-control/rulemanager.cpp b/mea/rulemanager.cpp similarity index 100% rename from guh-control/rulemanager.cpp rename to mea/rulemanager.cpp diff --git a/guh-control/rulemanager.h b/mea/rulemanager.h similarity index 100% rename from guh-control/rulemanager.h rename to mea/rulemanager.h diff --git a/guh-control/tcpsocketinterface.cpp b/mea/tcpsocketinterface.cpp similarity index 96% rename from guh-control/tcpsocketinterface.cpp rename to mea/tcpsocketinterface.cpp index 428f90b4..4d8de25e 100644 --- a/guh-control/tcpsocketinterface.cpp +++ b/mea/tcpsocketinterface.cpp @@ -2,7 +2,7 @@ #include -TcpSocketInterface::TcpSocketInterface(QObject *parent) : GuhInterface(parent) +TcpSocketInterface::TcpSocketInterface(QObject *parent) : NymeaInterface(parent) { QObject::connect(&m_socket, &QSslSocket::connected, this, &TcpSocketInterface::onConnected); QObject::connect(&m_socket, &QSslSocket::disconnected, this, &TcpSocketInterface::disconnected); diff --git a/guh-control/tcpsocketinterface.h b/mea/tcpsocketinterface.h similarity index 89% rename from guh-control/tcpsocketinterface.h rename to mea/tcpsocketinterface.h index c04cd6db..edfa7103 100644 --- a/guh-control/tcpsocketinterface.h +++ b/mea/tcpsocketinterface.h @@ -1,13 +1,13 @@ #ifndef TCPSOCKETINTERFACE_H #define TCPSOCKETINTERFACE_H -#include "guhinterface.h" +#include "nymeainterface.h" #include #include #include -class TcpSocketInterface : public GuhInterface +class TcpSocketInterface : public NymeaInterface { Q_OBJECT public: diff --git a/guh-control/ui/ConnectPage.qml b/mea/ui/ConnectPage.qml similarity index 87% rename from guh-control/ui/ConnectPage.qml rename to mea/ui/ConnectPage.qml index cd40b05c..f9ce233b 100644 --- a/guh-control/ui/ConnectPage.qml +++ b/mea/ui/ConnectPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "components" Page { @@ -51,8 +51,8 @@ Page { Label { Layout.fillWidth: true text: root.haveHosts ? - qsTr("There are %1 guh boxes in your network! Which one would you like to use?").arg(discovery.discoveryModel.count) - : qsTr("There doesn't seem to be a guh box installed in your network. Please make sure your guh box is correctly set up and connected.") + qsTr("There are %1 nymea boxes in your network! Which one would you like to use?").arg(discovery.discoveryModel.count) + : qsTr("There doesn't seem to be a nymea box installed in your network. Please make sure your nymea box is correctly set up and connected.") wrapMode: Text.WordWrap } } @@ -84,8 +84,8 @@ Page { } } onClicked: { - print("should connect to", model.guhRpcUrl) - Engine.connection.connect(model.guhRpcUrl) + print("should connect to", model.nymeaRpcUrl) + Engine.connection.connect(model.nymeaRpcUrl) pageStack.push(connectingPage) } } @@ -96,7 +96,7 @@ Page { visible: !root.haveHosts Label { - text: qsTr("Searching for guh boxes...") + text: qsTr("Searching for nymea boxes...") } BusyIndicator { @@ -136,7 +136,7 @@ Page { spacing: app.margins Label { - text: qsTr("Connecting to your guh box...") + text: qsTr("Connecting to your nymea box...") wrapMode: Text.WordWrap font.pixelSize: app.largeFont Layout.fillWidth: true @@ -170,7 +170,7 @@ Page { Label { Layout.fillWidth: true wrapMode: Text.WordWrap - text: "The authenticity of this guh box cannot be verified. Do you want to trust this device?" + text: "The authenticity of this nymea box cannot be verified. Do you want to trust this device?" } Label { Layout.fillWidth: true diff --git a/guh-control/ui/DevicesPage.qml b/mea/ui/DevicesPage.qml similarity index 99% rename from guh-control/ui/DevicesPage.qml rename to mea/ui/DevicesPage.qml index 7dcf62de..aa11ac6a 100644 --- a/guh-control/ui/DevicesPage.qml +++ b/mea/ui/DevicesPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Guh 1.0 +import Mea 1.0 import "components" GridView { diff --git a/guh-control/ui/EditDevicesPage.qml b/mea/ui/EditDevicesPage.qml similarity index 98% rename from guh-control/ui/EditDevicesPage.qml rename to mea/ui/EditDevicesPage.qml index 6c53f220..66f4e696 100644 --- a/guh-control/ui/EditDevicesPage.qml +++ b/mea/ui/EditDevicesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/LoginPage.qml b/mea/ui/LoginPage.qml similarity index 82% rename from guh-control/ui/LoginPage.qml rename to mea/ui/LoginPage.qml index a3df70be..f03e1337 100644 --- a/guh-control/ui/LoginPage.qml +++ b/mea/ui/LoginPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "components" Page { @@ -9,7 +9,7 @@ Page { signal backPressed(); header: GuhHeader { - text: "Welcome to guh!" + text: "Welcome to nymea!" backButtonVisible: true onBackPressed: root.backPressed() } @@ -21,8 +21,8 @@ Page { Label { Layout.fillWidth: true text: Engine.jsonRpcClient.initialSetupRequired ? - "In order to use your guh system, please enter your email address and set a password for your guh box." - : "In order to use your guh system, please log in." + "In order to use your nymea system, please enter your email address and set a password for your nymea box." + : "In order to use your nymea system, please log in." wrapMode: Text.WordWrap } @@ -53,8 +53,8 @@ Page { print("create user") Engine.jsonRpcClient.createUser(usernameTextField.text, passwordTextField.text); } else { - print("authenticate", usernameTextField.text, passwordTextField.text, "guh-control") - Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "guh-control"); + print("authenticate", usernameTextField.text, passwordTextField.text, "mea") + Engine.jsonRpcClient.authenticate(usernameTextField.text, passwordTextField.text, "mea"); } } } diff --git a/guh-control/ui/MagicPage.qml b/mea/ui/MagicPage.qml similarity index 99% rename from guh-control/ui/MagicPage.qml rename to mea/ui/MagicPage.qml index 963543cb..d9851b5e 100644 --- a/guh-control/ui/MagicPage.qml +++ b/mea/ui/MagicPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/MainPage.qml b/mea/ui/MainPage.qml similarity index 99% rename from guh-control/ui/MainPage.qml rename to mea/ui/MainPage.qml index f136675e..23b8a101 100644 --- a/guh-control/ui/MainPage.qml +++ b/mea/ui/MainPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 import "components" Page { diff --git a/guh-control/ui/NewDeviceWizard.qml b/mea/ui/NewDeviceWizard.qml similarity index 99% rename from guh-control/ui/NewDeviceWizard.qml rename to mea/ui/NewDeviceWizard.qml index 7de0ad47..55b756d2 100644 --- a/guh-control/ui/NewDeviceWizard.qml +++ b/mea/ui/NewDeviceWizard.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Guh 1.0 +import Mea 1.0 import "components" import "paramdelegates" diff --git a/guh-control/ui/SettingsPage.qml b/mea/ui/SettingsPage.qml similarity index 99% rename from guh-control/ui/SettingsPage.qml rename to mea/ui/SettingsPage.qml index 4f7943eb..e8c28ac7 100644 --- a/guh-control/ui/SettingsPage.qml +++ b/mea/ui/SettingsPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "components" Page { diff --git a/guh-control/ui/SystemInfoPage.qml b/mea/ui/SystemInfoPage.qml similarity index 99% rename from guh-control/ui/SystemInfoPage.qml rename to mea/ui/SystemInfoPage.qml index e9157ccb..15a99913 100644 --- a/guh-control/ui/SystemInfoPage.qml +++ b/mea/ui/SystemInfoPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/actiondelegates-ng/ActionDelegate.qml b/mea/ui/actiondelegates-ng/ActionDelegate.qml similarity index 99% rename from guh-control/ui/actiondelegates-ng/ActionDelegate.qml rename to mea/ui/actiondelegates-ng/ActionDelegate.qml index 256a4f97..f60cad94 100644 --- a/guh-control/ui/actiondelegates-ng/ActionDelegate.qml +++ b/mea/ui/actiondelegates-ng/ActionDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" ItemDelegate { diff --git a/guh-control/ui/actiondelegates/ActionDelegateBase.qml b/mea/ui/actiondelegates/ActionDelegateBase.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateBase.qml rename to mea/ui/actiondelegates/ActionDelegateBase.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateBool.qml b/mea/ui/actiondelegates/ActionDelegateBool.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateBool.qml rename to mea/ui/actiondelegates/ActionDelegateBool.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateColor.qml b/mea/ui/actiondelegates/ActionDelegateColor.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateColor.qml rename to mea/ui/actiondelegates/ActionDelegateColor.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateFallback.qml b/mea/ui/actiondelegates/ActionDelegateFallback.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateFallback.qml rename to mea/ui/actiondelegates/ActionDelegateFallback.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateNoParams.qml b/mea/ui/actiondelegates/ActionDelegateNoParams.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateNoParams.qml rename to mea/ui/actiondelegates/ActionDelegateNoParams.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateSlider.qml b/mea/ui/actiondelegates/ActionDelegateSlider.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateSlider.qml rename to mea/ui/actiondelegates/ActionDelegateSlider.qml diff --git a/guh-control/ui/actiondelegates/ActionDelegateStringFromStringList.qml b/mea/ui/actiondelegates/ActionDelegateStringFromStringList.qml similarity index 100% rename from guh-control/ui/actiondelegates/ActionDelegateStringFromStringList.qml rename to mea/ui/actiondelegates/ActionDelegateStringFromStringList.qml diff --git a/guh-control/ui/components/ColorIcon.qml b/mea/ui/components/ColorIcon.qml similarity index 100% rename from guh-control/ui/components/ColorIcon.qml rename to mea/ui/components/ColorIcon.qml diff --git a/guh-control/ui/components/ColorPicker.qml b/mea/ui/components/ColorPicker.qml similarity index 100% rename from guh-control/ui/components/ColorPicker.qml rename to mea/ui/components/ColorPicker.qml diff --git a/guh-control/ui/components/ColorPickerCt.qml b/mea/ui/components/ColorPickerCt.qml similarity index 100% rename from guh-control/ui/components/ColorPickerCt.qml rename to mea/ui/components/ColorPickerCt.qml diff --git a/guh-control/ui/components/ErrorDialog.qml b/mea/ui/components/ErrorDialog.qml similarity index 100% rename from guh-control/ui/components/ErrorDialog.qml rename to mea/ui/components/ErrorDialog.qml diff --git a/guh-control/ui/components/Graph.qml b/mea/ui/components/Graph.qml similarity index 99% rename from guh-control/ui/components/Graph.qml rename to mea/ui/components/Graph.qml index ba665d6c..8982944a 100644 --- a/guh-control/ui/components/Graph.qml +++ b/mea/ui/components/Graph.qml @@ -1,6 +1,6 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 -import Guh 1.0 +import Mea 1.0 Item { id: root diff --git a/guh-control/ui/components/GuhHeader.qml b/mea/ui/components/GuhHeader.qml similarity index 100% rename from guh-control/ui/components/GuhHeader.qml rename to mea/ui/components/GuhHeader.qml diff --git a/guh-control/ui/components/HeaderButton.qml b/mea/ui/components/HeaderButton.qml similarity index 100% rename from guh-control/ui/components/HeaderButton.qml rename to mea/ui/components/HeaderButton.qml diff --git a/guh-control/ui/components/IconMenuItem.qml b/mea/ui/components/IconMenuItem.qml similarity index 100% rename from guh-control/ui/components/IconMenuItem.qml rename to mea/ui/components/IconMenuItem.qml diff --git a/guh-control/ui/components/InterfacesModels.qml b/mea/ui/components/InterfacesModels.qml similarity index 100% rename from guh-control/ui/components/InterfacesModels.qml rename to mea/ui/components/InterfacesModels.qml diff --git a/guh-control/ui/components/ThinDivider.qml b/mea/ui/components/ThinDivider.qml similarity index 100% rename from guh-control/ui/components/ThinDivider.qml rename to mea/ui/components/ThinDivider.qml diff --git a/guh-control/ui/components/ThrottledSlider.qml b/mea/ui/components/ThrottledSlider.qml similarity index 100% rename from guh-control/ui/components/ThrottledSlider.qml rename to mea/ui/components/ThrottledSlider.qml diff --git a/guh-control/ui/customviews/CustomViewBase.qml b/mea/ui/customviews/CustomViewBase.qml similarity index 100% rename from guh-control/ui/customviews/CustomViewBase.qml rename to mea/ui/customviews/CustomViewBase.qml diff --git a/guh-control/ui/customviews/ExtendedVolumeController.qml b/mea/ui/customviews/ExtendedVolumeController.qml similarity index 99% rename from guh-control/ui/customviews/ExtendedVolumeController.qml rename to mea/ui/customviews/ExtendedVolumeController.qml index 9e959ead..7b5fc102 100644 --- a/guh-control/ui/customviews/ExtendedVolumeController.qml +++ b/mea/ui/customviews/ExtendedVolumeController.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" CustomViewBase { diff --git a/guh-control/ui/customviews/MediaControllerView.qml b/mea/ui/customviews/MediaControllerView.qml similarity index 99% rename from guh-control/ui/customviews/MediaControllerView.qml rename to mea/ui/customviews/MediaControllerView.qml index 44ad3267..bd89f311 100644 --- a/guh-control/ui/customviews/MediaControllerView.qml +++ b/mea/ui/customviews/MediaControllerView.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" CustomViewBase { diff --git a/guh-control/ui/customviews/NotificationsView.qml b/mea/ui/customviews/NotificationsView.qml similarity index 99% rename from guh-control/ui/customviews/NotificationsView.qml rename to mea/ui/customviews/NotificationsView.qml index 28d192da..39be6b70 100644 --- a/guh-control/ui/customviews/NotificationsView.qml +++ b/mea/ui/customviews/NotificationsView.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 CustomViewBase { id: root diff --git a/guh-control/ui/customviews/SensorView.qml b/mea/ui/customviews/SensorView.qml similarity index 99% rename from guh-control/ui/customviews/SensorView.qml rename to mea/ui/customviews/SensorView.qml index 1da2a975..5400f58f 100644 --- a/guh-control/ui/customviews/SensorView.qml +++ b/mea/ui/customviews/SensorView.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Guh 1.0 +import Mea 1.0 CustomViewBase { id: root diff --git a/guh-control/ui/customviews/WeatherView.qml b/mea/ui/customviews/WeatherView.qml similarity index 100% rename from guh-control/ui/customviews/WeatherView.qml rename to mea/ui/customviews/WeatherView.qml diff --git a/guh-control/ui/devicelistpages/GenericDeviceListPage.qml b/mea/ui/devicelistpages/GenericDeviceListPage.qml similarity index 99% rename from guh-control/ui/devicelistpages/GenericDeviceListPage.qml rename to mea/ui/devicelistpages/GenericDeviceListPage.qml index 9cabffa6..9ff8e900 100644 --- a/guh-control/ui/devicelistpages/GenericDeviceListPage.qml +++ b/mea/ui/devicelistpages/GenericDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" Page { diff --git a/guh-control/ui/devicelistpages/LightsDeviceListPage.qml b/mea/ui/devicelistpages/LightsDeviceListPage.qml similarity index 99% rename from guh-control/ui/devicelistpages/LightsDeviceListPage.qml rename to mea/ui/devicelistpages/LightsDeviceListPage.qml index 48473422..b594b9a1 100644 --- a/guh-control/ui/devicelistpages/LightsDeviceListPage.qml +++ b/mea/ui/devicelistpages/LightsDeviceListPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" Page { diff --git a/guh-control/ui/devicepages/ButtonDevicePage.qml b/mea/ui/devicepages/ButtonDevicePage.qml similarity index 99% rename from guh-control/ui/devicepages/ButtonDevicePage.qml rename to mea/ui/devicepages/ButtonDevicePage.qml index e604a878..befa1f41 100644 --- a/guh-control/ui/devicepages/ButtonDevicePage.qml +++ b/mea/ui/devicepages/ButtonDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" DevicePageBase { diff --git a/guh-control/ui/devicepages/ColorLightDevicePage.qml b/mea/ui/devicepages/ColorLightDevicePage.qml similarity index 99% rename from guh-control/ui/devicepages/ColorLightDevicePage.qml rename to mea/ui/devicepages/ColorLightDevicePage.qml index 761ac4e8..3ed44ed2 100644 --- a/guh-control/ui/devicepages/ColorLightDevicePage.qml +++ b/mea/ui/devicepages/ColorLightDevicePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 import QtQuick.Controls.Material 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" DevicePageBase { diff --git a/guh-control/ui/devicepages/ConfigureThingPage.qml b/mea/ui/devicepages/ConfigureThingPage.qml similarity index 98% rename from guh-control/ui/devicepages/ConfigureThingPage.qml rename to mea/ui/devicepages/ConfigureThingPage.qml index e293dd71..a4ad967a 100644 --- a/guh-control/ui/devicepages/ConfigureThingPage.qml +++ b/mea/ui/devicepages/ConfigureThingPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 import "../components" import "../paramdelegates-ng" diff --git a/guh-control/ui/devicepages/DevicePageBase.qml b/mea/ui/devicepages/DevicePageBase.qml similarity index 99% rename from guh-control/ui/devicepages/DevicePageBase.qml rename to mea/ui/devicepages/DevicePageBase.qml index 47268286..aa3dcb58 100644 --- a/guh-control/ui/devicepages/DevicePageBase.qml +++ b/mea/ui/devicepages/DevicePageBase.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" Page { diff --git a/guh-control/ui/devicepages/GenericDevicePage.qml b/mea/ui/devicepages/GenericDevicePage.qml similarity index 99% rename from guh-control/ui/devicepages/GenericDevicePage.qml rename to mea/ui/devicepages/GenericDevicePage.qml index 51f231e9..c08687d5 100644 --- a/guh-control/ui/devicepages/GenericDevicePage.qml +++ b/mea/ui/devicepages/GenericDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" DevicePageBase { diff --git a/guh-control/ui/devicepages/GenericDeviceStateDetailsPage.qml b/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml similarity index 99% rename from guh-control/ui/devicepages/GenericDeviceStateDetailsPage.qml rename to mea/ui/devicepages/GenericDeviceStateDetailsPage.qml index f816f7aa..3ebd947c 100644 --- a/guh-control/ui/devicepages/GenericDeviceStateDetailsPage.qml +++ b/mea/ui/devicepages/GenericDeviceStateDetailsPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" import "../paramdelegates" diff --git a/guh-control/ui/devicepages/MediaDevicePage.qml b/mea/ui/devicepages/MediaDevicePage.qml similarity index 98% rename from guh-control/ui/devicepages/MediaDevicePage.qml rename to mea/ui/devicepages/MediaDevicePage.qml index 08105fe8..6d1ed49e 100644 --- a/guh-control/ui/devicepages/MediaDevicePage.qml +++ b/mea/ui/devicepages/MediaDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" import "../customviews" diff --git a/guh-control/ui/devicepages/SensorDevicePage.qml b/mea/ui/devicepages/SensorDevicePage.qml similarity index 98% rename from guh-control/ui/devicepages/SensorDevicePage.qml rename to mea/ui/devicepages/SensorDevicePage.qml index 05ca412b..a36bcce1 100644 --- a/guh-control/ui/devicepages/SensorDevicePage.qml +++ b/mea/ui/devicepages/SensorDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" import "../customviews" diff --git a/guh-control/ui/devicepages/WeatherDevicePage.qml b/mea/ui/devicepages/WeatherDevicePage.qml similarity index 98% rename from guh-control/ui/devicepages/WeatherDevicePage.qml rename to mea/ui/devicepages/WeatherDevicePage.qml index f314bac4..fd88c0a8 100644 --- a/guh-control/ui/devicepages/WeatherDevicePage.qml +++ b/mea/ui/devicepages/WeatherDevicePage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" import "../customviews" diff --git a/guh-control/ui/fonts/Ubuntu-B.ttf b/mea/ui/fonts/Ubuntu-B.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-B.ttf rename to mea/ui/fonts/Ubuntu-B.ttf diff --git a/guh-control/ui/fonts/Ubuntu-BI.ttf b/mea/ui/fonts/Ubuntu-BI.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-BI.ttf rename to mea/ui/fonts/Ubuntu-BI.ttf diff --git a/guh-control/ui/fonts/Ubuntu-C.ttf b/mea/ui/fonts/Ubuntu-C.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-C.ttf rename to mea/ui/fonts/Ubuntu-C.ttf diff --git a/guh-control/ui/fonts/Ubuntu-L.ttf b/mea/ui/fonts/Ubuntu-L.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-L.ttf rename to mea/ui/fonts/Ubuntu-L.ttf diff --git a/guh-control/ui/fonts/Ubuntu-LI.ttf b/mea/ui/fonts/Ubuntu-LI.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-LI.ttf rename to mea/ui/fonts/Ubuntu-LI.ttf diff --git a/guh-control/ui/fonts/Ubuntu-M.ttf b/mea/ui/fonts/Ubuntu-M.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-M.ttf rename to mea/ui/fonts/Ubuntu-M.ttf diff --git a/guh-control/ui/fonts/Ubuntu-MI.ttf b/mea/ui/fonts/Ubuntu-MI.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-MI.ttf rename to mea/ui/fonts/Ubuntu-MI.ttf diff --git a/guh-control/ui/fonts/Ubuntu-R.ttf b/mea/ui/fonts/Ubuntu-R.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-R.ttf rename to mea/ui/fonts/Ubuntu-R.ttf diff --git a/guh-control/ui/fonts/Ubuntu-RI.ttf b/mea/ui/fonts/Ubuntu-RI.ttf similarity index 100% rename from guh-control/ui/fonts/Ubuntu-RI.ttf rename to mea/ui/fonts/Ubuntu-RI.ttf diff --git a/guh-control/ui/images/add.svg b/mea/ui/images/add.svg similarity index 100% rename from guh-control/ui/images/add.svg rename to mea/ui/images/add.svg diff --git a/guh-control/ui/images/audio-speakers-muted-symbolic.svg b/mea/ui/images/audio-speakers-muted-symbolic.svg similarity index 100% rename from guh-control/ui/images/audio-speakers-muted-symbolic.svg rename to mea/ui/images/audio-speakers-muted-symbolic.svg diff --git a/guh-control/ui/images/audio-speakers-symbolic.svg b/mea/ui/images/audio-speakers-symbolic.svg similarity index 100% rename from guh-control/ui/images/audio-speakers-symbolic.svg rename to mea/ui/images/audio-speakers-symbolic.svg diff --git a/guh-control/ui/images/back.svg b/mea/ui/images/back.svg similarity index 100% rename from guh-control/ui/images/back.svg rename to mea/ui/images/back.svg diff --git a/guh-control/ui/images/battery/battery-000.svg b/mea/ui/images/battery/battery-000.svg similarity index 100% rename from guh-control/ui/images/battery/battery-000.svg rename to mea/ui/images/battery/battery-000.svg diff --git a/guh-control/ui/images/battery/battery-010.svg b/mea/ui/images/battery/battery-010.svg similarity index 100% rename from guh-control/ui/images/battery/battery-010.svg rename to mea/ui/images/battery/battery-010.svg diff --git a/guh-control/ui/images/battery/battery-020.svg b/mea/ui/images/battery/battery-020.svg similarity index 100% rename from guh-control/ui/images/battery/battery-020.svg rename to mea/ui/images/battery/battery-020.svg diff --git a/guh-control/ui/images/battery/battery-030.svg b/mea/ui/images/battery/battery-030.svg similarity index 100% rename from guh-control/ui/images/battery/battery-030.svg rename to mea/ui/images/battery/battery-030.svg diff --git a/guh-control/ui/images/battery/battery-040.svg b/mea/ui/images/battery/battery-040.svg similarity index 100% rename from guh-control/ui/images/battery/battery-040.svg rename to mea/ui/images/battery/battery-040.svg diff --git a/guh-control/ui/images/battery/battery-050.svg b/mea/ui/images/battery/battery-050.svg similarity index 100% rename from guh-control/ui/images/battery/battery-050.svg rename to mea/ui/images/battery/battery-050.svg diff --git a/guh-control/ui/images/battery/battery-060.svg b/mea/ui/images/battery/battery-060.svg similarity index 100% rename from guh-control/ui/images/battery/battery-060.svg rename to mea/ui/images/battery/battery-060.svg diff --git a/guh-control/ui/images/battery/battery-070.svg b/mea/ui/images/battery/battery-070.svg similarity index 100% rename from guh-control/ui/images/battery/battery-070.svg rename to mea/ui/images/battery/battery-070.svg diff --git a/guh-control/ui/images/battery/battery-080.svg b/mea/ui/images/battery/battery-080.svg similarity index 100% rename from guh-control/ui/images/battery/battery-080.svg rename to mea/ui/images/battery/battery-080.svg diff --git a/guh-control/ui/images/battery/battery-090.svg b/mea/ui/images/battery/battery-090.svg similarity index 100% rename from guh-control/ui/images/battery/battery-090.svg rename to mea/ui/images/battery/battery-090.svg diff --git a/guh-control/ui/images/battery/battery-100.svg b/mea/ui/images/battery/battery-100.svg similarity index 100% rename from guh-control/ui/images/battery/battery-100.svg rename to mea/ui/images/battery/battery-100.svg diff --git a/guh-control/ui/images/close.svg b/mea/ui/images/close.svg similarity index 100% rename from guh-control/ui/images/close.svg rename to mea/ui/images/close.svg diff --git a/guh-control/ui/images/delete.svg b/mea/ui/images/delete.svg similarity index 100% rename from guh-control/ui/images/delete.svg rename to mea/ui/images/delete.svg diff --git a/guh-control/ui/images/dialog-warning-symbolic.svg b/mea/ui/images/dialog-warning-symbolic.svg similarity index 100% rename from guh-control/ui/images/dialog-warning-symbolic.svg rename to mea/ui/images/dialog-warning-symbolic.svg diff --git a/guh-control/ui/images/go-down.svg b/mea/ui/images/go-down.svg similarity index 100% rename from guh-control/ui/images/go-down.svg rename to mea/ui/images/go-down.svg diff --git a/guh-control/ui/images/info.svg b/mea/ui/images/info.svg similarity index 100% rename from guh-control/ui/images/info.svg rename to mea/ui/images/info.svg diff --git a/guh-control/ui/images/magic.svg b/mea/ui/images/magic.svg similarity index 100% rename from guh-control/ui/images/magic.svg rename to mea/ui/images/magic.svg diff --git a/guh-control/ui/images/media-playback-pause.svg b/mea/ui/images/media-playback-pause.svg similarity index 100% rename from guh-control/ui/images/media-playback-pause.svg rename to mea/ui/images/media-playback-pause.svg diff --git a/guh-control/ui/images/media-playback-start.svg b/mea/ui/images/media-playback-start.svg similarity index 100% rename from guh-control/ui/images/media-playback-start.svg rename to mea/ui/images/media-playback-start.svg diff --git a/guh-control/ui/images/media-playback-stop.svg b/mea/ui/images/media-playback-stop.svg similarity index 100% rename from guh-control/ui/images/media-playback-stop.svg rename to mea/ui/images/media-playback-stop.svg diff --git a/guh-control/ui/images/media-preview-start.svg b/mea/ui/images/media-preview-start.svg similarity index 100% rename from guh-control/ui/images/media-preview-start.svg rename to mea/ui/images/media-preview-start.svg diff --git a/guh-control/ui/images/media-seek-backward.svg b/mea/ui/images/media-seek-backward.svg similarity index 100% rename from guh-control/ui/images/media-seek-backward.svg rename to mea/ui/images/media-seek-backward.svg diff --git a/guh-control/ui/images/media-seek-forward.svg b/mea/ui/images/media-seek-forward.svg similarity index 100% rename from guh-control/ui/images/media-seek-forward.svg rename to mea/ui/images/media-seek-forward.svg diff --git a/guh-control/ui/images/media-skip-backward.svg b/mea/ui/images/media-skip-backward.svg similarity index 100% rename from guh-control/ui/images/media-skip-backward.svg rename to mea/ui/images/media-skip-backward.svg diff --git a/guh-control/ui/images/media-skip-forward.svg b/mea/ui/images/media-skip-forward.svg similarity index 100% rename from guh-control/ui/images/media-skip-forward.svg rename to mea/ui/images/media-skip-forward.svg diff --git a/guh-control/ui/images/mediaplayer-app-symbolic.svg b/mea/ui/images/mediaplayer-app-symbolic.svg similarity index 100% rename from guh-control/ui/images/mediaplayer-app-symbolic.svg rename to mea/ui/images/mediaplayer-app-symbolic.svg diff --git a/guh-control/ui/images/navigation-menu.svg b/mea/ui/images/navigation-menu.svg similarity index 100% rename from guh-control/ui/images/navigation-menu.svg rename to mea/ui/images/navigation-menu.svg diff --git a/guh-control/ui/images/network-wired-symbolic.svg b/mea/ui/images/network-wired-symbolic.svg similarity index 100% rename from guh-control/ui/images/network-wired-symbolic.svg rename to mea/ui/images/network-wired-symbolic.svg diff --git a/guh-control/ui/images/next.svg b/mea/ui/images/next.svg similarity index 100% rename from guh-control/ui/images/next.svg rename to mea/ui/images/next.svg diff --git a/guh-control/ui/images/notification.svg b/mea/ui/images/notification.svg similarity index 100% rename from guh-control/ui/images/notification.svg rename to mea/ui/images/notification.svg diff --git a/guh-control/ui/images/sensors.svg b/mea/ui/images/sensors.svg similarity index 100% rename from guh-control/ui/images/sensors.svg rename to mea/ui/images/sensors.svg diff --git a/guh-control/ui/images/settings.svg b/mea/ui/images/settings.svg similarity index 100% rename from guh-control/ui/images/settings.svg rename to mea/ui/images/settings.svg diff --git a/guh-control/ui/images/share.svg b/mea/ui/images/share.svg similarity index 100% rename from guh-control/ui/images/share.svg rename to mea/ui/images/share.svg diff --git a/guh-control/ui/images/stock_link.svg b/mea/ui/images/stock_link.svg similarity index 100% rename from guh-control/ui/images/stock_link.svg rename to mea/ui/images/stock_link.svg diff --git a/guh-control/ui/images/system-shutdown.svg b/mea/ui/images/system-shutdown.svg similarity index 100% rename from guh-control/ui/images/system-shutdown.svg rename to mea/ui/images/system-shutdown.svg diff --git a/guh-control/ui/images/temperature.svg b/mea/ui/images/temperature.svg similarity index 100% rename from guh-control/ui/images/temperature.svg rename to mea/ui/images/temperature.svg diff --git a/guh-control/ui/images/tick.svg b/mea/ui/images/tick.svg similarity index 100% rename from guh-control/ui/images/tick.svg rename to mea/ui/images/tick.svg diff --git a/guh-control/ui/images/torch-off.svg b/mea/ui/images/torch-off.svg similarity index 100% rename from guh-control/ui/images/torch-off.svg rename to mea/ui/images/torch-off.svg diff --git a/guh-control/ui/images/torch-on.svg b/mea/ui/images/torch-on.svg similarity index 100% rename from guh-control/ui/images/torch-on.svg rename to mea/ui/images/torch-on.svg diff --git a/guh-control/ui/images/view-collapse.svg b/mea/ui/images/view-collapse.svg similarity index 100% rename from guh-control/ui/images/view-collapse.svg rename to mea/ui/images/view-collapse.svg diff --git a/guh-control/ui/images/view-expand.svg b/mea/ui/images/view-expand.svg similarity index 100% rename from guh-control/ui/images/view-expand.svg rename to mea/ui/images/view-expand.svg diff --git a/guh-control/ui/images/weather-app-symbolic.svg b/mea/ui/images/weather-app-symbolic.svg similarity index 100% rename from guh-control/ui/images/weather-app-symbolic.svg rename to mea/ui/images/weather-app-symbolic.svg diff --git a/guh-control/ui/images/weathericons/humidity.svg b/mea/ui/images/weathericons/humidity.svg similarity index 100% rename from guh-control/ui/images/weathericons/humidity.svg rename to mea/ui/images/weathericons/humidity.svg diff --git a/guh-control/ui/images/weathericons/weather-clear-day.svg b/mea/ui/images/weathericons/weather-clear-day.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-clear-day.svg rename to mea/ui/images/weathericons/weather-clear-day.svg diff --git a/guh-control/ui/images/weathericons/weather-clear-night.svg b/mea/ui/images/weathericons/weather-clear-night.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-clear-night.svg rename to mea/ui/images/weathericons/weather-clear-night.svg diff --git a/guh-control/ui/images/weathericons/weather-clouds.svg b/mea/ui/images/weathericons/weather-clouds.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-clouds.svg rename to mea/ui/images/weathericons/weather-clouds.svg diff --git a/guh-control/ui/images/weathericons/weather-few-clouds-day.svg b/mea/ui/images/weathericons/weather-few-clouds-day.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-few-clouds-day.svg rename to mea/ui/images/weathericons/weather-few-clouds-day.svg diff --git a/guh-control/ui/images/weathericons/weather-few-clouds-night.svg b/mea/ui/images/weathericons/weather-few-clouds-night.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-few-clouds-night.svg rename to mea/ui/images/weathericons/weather-few-clouds-night.svg diff --git a/guh-control/ui/images/weathericons/weather-fog.svg b/mea/ui/images/weathericons/weather-fog.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-fog.svg rename to mea/ui/images/weathericons/weather-fog.svg diff --git a/guh-control/ui/images/weathericons/weather-light-rain.svg b/mea/ui/images/weathericons/weather-light-rain.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-light-rain.svg rename to mea/ui/images/weathericons/weather-light-rain.svg diff --git a/guh-control/ui/images/weathericons/weather-overcast.svg b/mea/ui/images/weathericons/weather-overcast.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-overcast.svg rename to mea/ui/images/weathericons/weather-overcast.svg diff --git a/guh-control/ui/images/weathericons/weather-shower-rain.svg b/mea/ui/images/weathericons/weather-shower-rain.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-shower-rain.svg rename to mea/ui/images/weathericons/weather-shower-rain.svg diff --git a/guh-control/ui/images/weathericons/weather-snow.svg b/mea/ui/images/weathericons/weather-snow.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-snow.svg rename to mea/ui/images/weathericons/weather-snow.svg diff --git a/guh-control/ui/images/weathericons/weather-thunderstorm.svg b/mea/ui/images/weathericons/weather-thunderstorm.svg similarity index 100% rename from guh-control/ui/images/weathericons/weather-thunderstorm.svg rename to mea/ui/images/weathericons/weather-thunderstorm.svg diff --git a/guh-control/ui/images/weathericons/wind.svg b/mea/ui/images/weathericons/wind.svg similarity index 100% rename from guh-control/ui/images/weathericons/wind.svg rename to mea/ui/images/weathericons/wind.svg diff --git a/guh-control/ui/magic/ComposeEventDescriptorPage.qml b/mea/ui/magic/ComposeEventDescriptorPage.qml similarity index 98% rename from guh-control/ui/magic/ComposeEventDescriptorPage.qml rename to mea/ui/magic/ComposeEventDescriptorPage.qml index 821ef326..079a7bbd 100644 --- a/guh-control/ui/magic/ComposeEventDescriptorPage.qml +++ b/mea/ui/magic/ComposeEventDescriptorPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/DeviceRulesPage.qml b/mea/ui/magic/DeviceRulesPage.qml similarity index 99% rename from guh-control/ui/magic/DeviceRulesPage.qml rename to mea/ui/magic/DeviceRulesPage.qml index 9bdbcddb..46544dea 100644 --- a/guh-control/ui/magic/DeviceRulesPage.qml +++ b/mea/ui/magic/DeviceRulesPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/EditRulePage.qml b/mea/ui/magic/EditRulePage.qml similarity index 99% rename from guh-control/ui/magic/EditRulePage.qml rename to mea/ui/magic/EditRulePage.qml index 7d96bb3e..1f26ac3e 100644 --- a/guh-control/ui/magic/EditRulePage.qml +++ b/mea/ui/magic/EditRulePage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.3 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/EditStateEvaluatorPage.qml b/mea/ui/magic/EditStateEvaluatorPage.qml similarity index 96% rename from guh-control/ui/magic/EditStateEvaluatorPage.qml rename to mea/ui/magic/EditStateEvaluatorPage.qml index b14224fa..52016453 100644 --- a/guh-control/ui/magic/EditStateEvaluatorPage.qml +++ b/mea/ui/magic/EditStateEvaluatorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 import "../components" Page { diff --git a/guh-control/ui/magic/NewThingMagicPage.qml b/mea/ui/magic/NewThingMagicPage.qml similarity index 99% rename from guh-control/ui/magic/NewThingMagicPage.qml rename to mea/ui/magic/NewThingMagicPage.qml index 0848eb4a..6428c440 100644 --- a/guh-control/ui/magic/NewThingMagicPage.qml +++ b/mea/ui/magic/NewThingMagicPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectActionPage.qml b/mea/ui/magic/SelectActionPage.qml similarity index 99% rename from guh-control/ui/magic/SelectActionPage.qml rename to mea/ui/magic/SelectActionPage.qml index 069953f6..3e200f7e 100644 --- a/guh-control/ui/magic/SelectActionPage.qml +++ b/mea/ui/magic/SelectActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.5 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import Guh 1.0 +import Mea 1.0 import "../components" import "../paramdelegates" diff --git a/guh-control/ui/magic/SelectEventDescriptorPage.qml b/mea/ui/magic/SelectEventDescriptorPage.qml similarity index 99% rename from guh-control/ui/magic/SelectEventDescriptorPage.qml rename to mea/ui/magic/SelectEventDescriptorPage.qml index a9fa49e7..466cd552 100644 --- a/guh-control/ui/magic/SelectEventDescriptorPage.qml +++ b/mea/ui/magic/SelectEventDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectEventDescriptorParamsPage.qml b/mea/ui/magic/SelectEventDescriptorParamsPage.qml similarity index 99% rename from guh-control/ui/magic/SelectEventDescriptorParamsPage.qml rename to mea/ui/magic/SelectEventDescriptorParamsPage.qml index 046c8e09..752e657b 100644 --- a/guh-control/ui/magic/SelectEventDescriptorParamsPage.qml +++ b/mea/ui/magic/SelectEventDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../paramdescriptordelegates" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectRuleActionPage.qml b/mea/ui/magic/SelectRuleActionPage.qml similarity index 99% rename from guh-control/ui/magic/SelectRuleActionPage.qml rename to mea/ui/magic/SelectRuleActionPage.qml index 35206a87..46b49181 100644 --- a/guh-control/ui/magic/SelectRuleActionPage.qml +++ b/mea/ui/magic/SelectRuleActionPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectRuleActionParamsPage.qml b/mea/ui/magic/SelectRuleActionParamsPage.qml similarity index 99% rename from guh-control/ui/magic/SelectRuleActionParamsPage.qml rename to mea/ui/magic/SelectRuleActionParamsPage.qml index dd5ffba0..0d615c92 100644 --- a/guh-control/ui/magic/SelectRuleActionParamsPage.qml +++ b/mea/ui/magic/SelectRuleActionParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../paramdelegates-ng" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectStateDescriptorPage.qml b/mea/ui/magic/SelectStateDescriptorPage.qml similarity index 99% rename from guh-control/ui/magic/SelectStateDescriptorPage.qml rename to mea/ui/magic/SelectStateDescriptorPage.qml index 0bdec708..b5cce51d 100644 --- a/guh-control/ui/magic/SelectStateDescriptorPage.qml +++ b/mea/ui/magic/SelectStateDescriptorPage.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectStateDescriptorParamsPage.qml b/mea/ui/magic/SelectStateDescriptorParamsPage.qml similarity index 98% rename from guh-control/ui/magic/SelectStateDescriptorParamsPage.qml rename to mea/ui/magic/SelectStateDescriptorParamsPage.qml index cd6ca36e..12d97652 100644 --- a/guh-control/ui/magic/SelectStateDescriptorParamsPage.qml +++ b/mea/ui/magic/SelectStateDescriptorParamsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 import "../components" import "../paramdescriptordelegates" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SelectThingPage.qml b/mea/ui/magic/SelectThingPage.qml similarity index 98% rename from guh-control/ui/magic/SelectThingPage.qml rename to mea/ui/magic/SelectThingPage.qml index db1ad1d9..b0fdfcd0 100644 --- a/guh-control/ui/magic/SelectThingPage.qml +++ b/mea/ui/magic/SelectThingPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/magic/SimpleStateEvaluatorDelegate.qml b/mea/ui/magic/SimpleStateEvaluatorDelegate.qml similarity index 99% rename from guh-control/ui/magic/SimpleStateEvaluatorDelegate.qml rename to mea/ui/magic/SimpleStateEvaluatorDelegate.qml index 72c87e0a..f1bc59d7 100644 --- a/guh-control/ui/magic/SimpleStateEvaluatorDelegate.qml +++ b/mea/ui/magic/SimpleStateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 SwipeDelegate { id: root diff --git a/guh-control/ui/magic/StateEvaluatorDelegate.qml b/mea/ui/magic/StateEvaluatorDelegate.qml similarity index 99% rename from guh-control/ui/magic/StateEvaluatorDelegate.qml rename to mea/ui/magic/StateEvaluatorDelegate.qml index 373ad4d0..7e8de3de 100644 --- a/guh-control/ui/magic/StateEvaluatorDelegate.qml +++ b/mea/ui/magic/StateEvaluatorDelegate.qml @@ -1,7 +1,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 SwipeDelegate { diff --git a/guh-control/ui/main.qml b/mea/ui/main.qml similarity index 95% rename from guh-control/ui/main.qml rename to mea/ui/main.qml index 6f9623c2..09d645b4 100644 --- a/guh-control/ui/main.qml +++ b/mea/ui/main.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.2 import Qt.labs.settings 1.0 -import Guh 1.0 +import Mea 1.0 ApplicationWindow { id: app @@ -91,7 +91,7 @@ ApplicationWindow { initialItem: Page {} } - GuhDiscovery { + NymeaDiscovery { id: discovery } @@ -191,7 +191,7 @@ ApplicationWindow { font.pixelSize: app.largeFont } Label { - text: qsTr("Sorry, the version of the guh box you are trying to connect to is too old. This app requires at least version %1 but the guh box only supports %2").arg(popup.minimumVersion).arg(popup.actualVersion) + text: qsTr("Sorry, the version of the nymea box you are trying to connect to is too old. This app requires at least version %1 but the nymea box only supports %2").arg(popup.minimumVersion).arg(popup.actualVersion) wrapMode: Text.WordWrap Layout.fillWidth: true } diff --git a/guh-control/ui/paramdelegates-ng/ParamDelegate.qml b/mea/ui/paramdelegates-ng/ParamDelegate.qml similarity index 99% rename from guh-control/ui/paramdelegates-ng/ParamDelegate.qml rename to mea/ui/paramdelegates-ng/ParamDelegate.qml index b80ccc85..f93f69ae 100644 --- a/guh-control/ui/paramdelegates-ng/ParamDelegate.qml +++ b/mea/ui/paramdelegates-ng/ParamDelegate.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" ItemDelegate { diff --git a/guh-control/ui/paramdelegates/BoolParamDelegate.qml b/mea/ui/paramdelegates/BoolParamDelegate.qml similarity index 100% rename from guh-control/ui/paramdelegates/BoolParamDelegate.qml rename to mea/ui/paramdelegates/BoolParamDelegate.qml diff --git a/guh-control/ui/paramdelegates/DoubleParamDelegate.qml b/mea/ui/paramdelegates/DoubleParamDelegate.qml similarity index 100% rename from guh-control/ui/paramdelegates/DoubleParamDelegate.qml rename to mea/ui/paramdelegates/DoubleParamDelegate.qml diff --git a/guh-control/ui/paramdelegates/IntParamDelegate.qml b/mea/ui/paramdelegates/IntParamDelegate.qml similarity index 100% rename from guh-control/ui/paramdelegates/IntParamDelegate.qml rename to mea/ui/paramdelegates/IntParamDelegate.qml diff --git a/guh-control/ui/paramdelegates/ParamDelegate.qml b/mea/ui/paramdelegates/ParamDelegate.qml similarity index 100% rename from guh-control/ui/paramdelegates/ParamDelegate.qml rename to mea/ui/paramdelegates/ParamDelegate.qml diff --git a/guh-control/ui/paramdelegates/ParamDelegateBase.qml b/mea/ui/paramdelegates/ParamDelegateBase.qml similarity index 100% rename from guh-control/ui/paramdelegates/ParamDelegateBase.qml rename to mea/ui/paramdelegates/ParamDelegateBase.qml diff --git a/guh-control/ui/paramdelegates/StringParamDelegate.qml b/mea/ui/paramdelegates/StringParamDelegate.qml similarity index 100% rename from guh-control/ui/paramdelegates/StringParamDelegate.qml rename to mea/ui/paramdelegates/StringParamDelegate.qml diff --git a/guh-control/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml b/mea/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml similarity index 99% rename from guh-control/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml rename to mea/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml index 5b2bc078..63bd5e42 100644 --- a/guh-control/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml +++ b/mea/ui/paramdescriptordelegates/ParamDescriptorDelegateBase.qml @@ -1,7 +1,7 @@ import QtQuick 2.4 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.2 -import Guh 1.0 +import Mea 1.0 ItemDelegate { id: root diff --git a/guh-control/ui/system/LogViewerPage.qml b/mea/ui/system/LogViewerPage.qml similarity index 99% rename from guh-control/ui/system/LogViewerPage.qml rename to mea/ui/system/LogViewerPage.qml index 975dbec5..31208fe4 100644 --- a/guh-control/ui/system/LogViewerPage.qml +++ b/mea/ui/system/LogViewerPage.qml @@ -2,7 +2,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.2 import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 -import Guh 1.0 +import Mea 1.0 import "../components" Page { diff --git a/guh-control/ui/system/PluginParamsPage.qml b/mea/ui/system/PluginParamsPage.qml similarity index 99% rename from guh-control/ui/system/PluginParamsPage.qml rename to mea/ui/system/PluginParamsPage.qml index bb6b3aa5..9a4d833f 100644 --- a/guh-control/ui/system/PluginParamsPage.qml +++ b/mea/ui/system/PluginParamsPage.qml @@ -4,7 +4,7 @@ import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" import "../paramdelegates-ng" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/ui/system/PluginsPage.qml b/mea/ui/system/PluginsPage.qml similarity index 98% rename from guh-control/ui/system/PluginsPage.qml rename to mea/ui/system/PluginsPage.qml index f96d0ea9..da6c046d 100644 --- a/guh-control/ui/system/PluginsPage.qml +++ b/mea/ui/system/PluginsPage.qml @@ -3,7 +3,7 @@ import QtQuick.Controls 2.1 import QtQuick.Controls.Material 2.1 import QtQuick.Layouts 1.3 import "../components" -import Guh 1.0 +import Mea 1.0 Page { id: root diff --git a/guh-control/vendorsproxy.cpp b/mea/vendorsproxy.cpp similarity index 96% rename from guh-control/vendorsproxy.cpp rename to mea/vendorsproxy.cpp index 89c15973..71ec8969 100644 --- a/guh-control/vendorsproxy.cpp +++ b/mea/vendorsproxy.cpp @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/vendorsproxy.h b/mea/vendorsproxy.h similarity index 96% rename from guh-control/vendorsproxy.h rename to mea/vendorsproxy.h index b1c3363d..84d05809 100644 --- a/guh-control/vendorsproxy.h +++ b/mea/vendorsproxy.h @@ -2,7 +2,7 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control * + * This file is part of mea * * * * This library is free software; you can redistribute it and/or * * modify it under the terms of the GNU Lesser General Public * diff --git a/guh-control/websocketinterface.cpp b/mea/websocketinterface.cpp similarity index 89% rename from guh-control/websocketinterface.cpp rename to mea/websocketinterface.cpp index ec242e86..9d7fc15b 100644 --- a/guh-control/websocketinterface.cpp +++ b/mea/websocketinterface.cpp @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -27,7 +27,7 @@ #include WebsocketInterface::WebsocketInterface(QObject *parent) : - GuhInterface(parent) + NymeaInterface(parent) { m_socket = new QWebSocket(QGuiApplication::applicationName(), QWebSocketProtocol::Version13, this); diff --git a/guh-control/websocketinterface.h b/mea/websocketinterface.h similarity index 82% rename from guh-control/websocketinterface.h rename to mea/websocketinterface.h index 096d6160..0e7a5bb8 100644 --- a/guh-control/websocketinterface.h +++ b/mea/websocketinterface.h @@ -2,19 +2,19 @@ * * * Copyright (C) 2017 Simon Stuerz * * * - * This file is part of guh-control. * + * This file is part of mea. * * * - * guh-control is free software: you can redistribute it and/or modify * + * mea is free software: you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation, version 3 of the License. * * * - * guh-control is distributed in the hope that it will be useful, * + * mea is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * - * along with guh-control. If not, see . * + * along with mea. If not, see . * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -24,9 +24,9 @@ #include #include -#include "guhinterface.h" +#include "nymeainterface.h" -class WebsocketInterface : public GuhInterface +class WebsocketInterface : public NymeaInterface { Q_OBJECT public: