Ver Fonte

Remove an unused/unsupported overload from webchannel API

The Qt webchannel API apparently does not support overloads, and
will silently call the first declared function. In this case, we
actually tried to call the second function.

Rename the first function. It's not quite clear whether we're
going to need it.
Vincent Lang há 8 anos atrás
pai
commit
e3659317a0
2 ficheiros alterados com 2 adições e 2 exclusões
  1. 1 1
      src/settings/SettingsComponent.cpp
  2. 1 1
      src/settings/SettingsComponent.h

+ 1 - 1
src/settings/SettingsComponent.cpp

@@ -369,7 +369,7 @@ void SettingsComponent::resetToDefault(const QString &sectionID)
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-void SettingsComponent::resetToDefault()
+void SettingsComponent::resetToDefaultAll()
 {
   for(SettingsSection *section : m_sections)
   {

+ 1 - 1
src/settings/SettingsComponent.h

@@ -52,7 +52,7 @@ public:
   //       declared in settings_descriptions.json. Also, sections are never removed, even if they
   //       remain empty.
   Q_INVOKABLE void removeValue(const QString& sectionOrKey);
-  Q_INVOKABLE void resetToDefault();
+  Q_INVOKABLE void resetToDefaultAll();
   Q_INVOKABLE void resetToDefault(const QString& sectionID);
   Q_INVOKABLE QVariantList settingDescriptions();
   Q_INVOKABLE QString getWebClientUrl();