Browse Source

Merge pull request #4590 from DonLakeFlyer/Settings

Settings fixes
QGC4.4
Don Gagne 8 years ago committed by GitHub
parent
commit
2b2784e581
  1. 2
      src/FactSystem/SettingsFact.cc
  2. 4
      src/Settings/VideoSettings.cc
  3. 2
      src/Settings/VideoSettings.h

2
src/FactSystem/SettingsFact.cc

@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
SettingsFact::SettingsFact(QObject* parent)
: Fact(parent)
{
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
}
SettingsFact::SettingsFact(QString settingGroup, FactMetaData* metaData, QObject* parent)

4
src/Settings/VideoSettings.cc

@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
#include <QQmlEngine>
#include <QtQml>
const char* VideoSettings::VideoSettingsGroupName = "video";
const char* VideoSettings::videoSettingsGroupName = "video";
VideoSettings::VideoSettings(QObject* parent)
: SettingsGroup(VideoSettingsGroupName, QString() /* root settings group */, parent)
: SettingsGroup(videoSettingsGroupName, QString() /* root settings group */, parent)
{
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
qmlRegisterUncreatableType<VideoSettings>("QGroundControl.SettingsManager", 1, 0, "VideoSettings", "Reference only");

2
src/Settings/VideoSettings.h

@ -19,7 +19,7 @@ class VideoSettings : public SettingsGroup @@ -19,7 +19,7 @@ class VideoSettings : public SettingsGroup
public:
VideoSettings(QObject* parent = NULL);
static const char* VideoSettingsGroupName;
static const char* videoSettingsGroupName;
private:
};

Loading…
Cancel
Save