Skip to content
Permalink
Browse files
Removed settings struct
  • Loading branch information
domi4484 committed Apr 15, 2021
1 parent 6516381 commit 2087a7f4f81771f202ea3eb2c9f3881aa678d247
Showing with 385 additions and 229 deletions.
  1. +1 −4 python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in
  2. +4 −7 python/core/auto_generated/network/qgsnewsfeedparser.sip.in
  3. +4 −7 python/core/auto_generated/processing/qgsprocessing.sip.in
  4. +5 −8 python/core/auto_generated/qgsapplication.sip.in
  5. +1 −4 python/core/auto_generated/qgsgeometryoptions.sip.in
  6. +1 −4 python/core/auto_generated/qgslocalizeddatapathregistry.sip.in
  7. +1 −5 python/core/auto_generated/qgsmaprendererjob.sip.in
  8. +199 −25 python/core/auto_generated/settings/qgssettingsentry.sip.in
  9. +52 −0 python/core/auto_generated/settings/qgssettingsregistry.sip.in
  10. +1 −0 python/core/core_auto.sip
  11. +6 −6 src/app/main.cpp
  12. +10 −10 src/app/options/qgsoptions.cpp
  13. +1 −1 src/app/qgsprojectproperties.cpp
  14. +2 −2 src/core/network/qgsnetworkaccessmanager.cpp
  15. +2 −9 src/core/network/qgsnetworkaccessmanager.h
  16. +7 −7 src/core/network/qgsnewsfeedparser.cpp
  17. +8 −15 src/core/network/qgsnewsfeedparser.h
  18. +8 −15 src/core/processing/qgsprocessing.h
  19. +1 −1 src/core/processing/qgsprocessingcontext.cpp
  20. +3 −3 src/core/processing/qgsprocessingutils.cpp
  21. +1 −1 src/core/project/qgsproject.cpp
  22. +4 −4 src/core/qgsapplication.cpp
  23. +10 −17 src/core/qgsapplication.h
  24. +1 −1 src/core/qgsgeometryoptions.cpp
  25. +2 −9 src/core/qgsgeometryoptions.h
  26. +2 −2 src/core/qgslocalizeddatapathregistry.cpp
  27. +2 −9 src/core/qgslocalizeddatapathregistry.h
  28. +1 −1 src/core/qgsmaprendererjob.cpp
  29. +2 −10 src/core/qgsmaprendererjob.h
  30. +1 −0 src/core/settings/qgssettingsentry.cpp
  31. +17 −17 src/core/settings/qgssettingsregistrycore.cpp
  32. +3 −3 src/gui/qgsconfigureshortcutsdialog.cpp
  33. +1 −1 src/gui/qgsgui.cpp
  34. +1 −1 src/gui/qgsmapcanvas.cpp
  35. +9 −9 tests/src/analysis/testqgsprocessing.cpp
  36. +1 −1 tests/src/core/testqgscompositionconverter.cpp
  37. +1 −1 tests/src/core/testqgsnetworkaccessmanager.cpp
  38. +5 −5 tests/src/core/testqgsnewsfeedparser.cpp
  39. +4 −4 tests/src/core/testqgstranslateproject.cpp
@@ -321,10 +321,7 @@ The contents of the reply will be returned after the request is completed or an
.. versionadded:: 3.6
%End

struct Settings
{
const QgsSettingsEntryInteger networkTimeout;
};
const QgsSettingsEntryInteger settingsNetworkTimeout;

signals:

@@ -93,13 +93,10 @@ Returns the authentication configuration for the parser.
Returns the settings key used for a feed with the given ``baseUrl``.
%End

struct Settings
{
const QgsSettingsEntryInteger feedLastFetchTime;
const QgsSettingsEntryString feedLanguage;
const QgsSettingsEntryDouble feedLatitude;
const QgsSettingsEntryDouble feedLongitude;
};
const QgsSettingsEntryInteger settingsFeedLastFetchTime;
const QgsSettingsEntryString settingsFeedLanguage;
const QgsSettingsEntryDouble settingsFeedLatitude;
const QgsSettingsEntryDouble settingsFeedLongitude;

public slots:

@@ -53,13 +53,10 @@ Converts a source ``type`` to a string representation.

static const QString TEMPORARY_OUTPUT;

struct Settings
{
const QgsSettingsEntryBool preferFilenameAsLayerName;
const QgsSettingsEntryString tempPath;
const QgsSettingsEntryInteger defaultOutputVectorLayerExt;
const QgsSettingsEntryInteger defaultOutputRasterLayerExt;
};
const QgsSettingsEntryBool settingsPreferFilenameAsLayerName;
const QgsSettingsEntryString settingsTempPath;
const QgsSettingsEntryInteger settingsDefaultOutputVectorLayerExt;
const QgsSettingsEntryInteger settingsDefaultOutputRasterLayerExt;
};

/************************************************************************
@@ -1004,14 +1004,11 @@ Emits the signal to collect all the strings of .qgs to be included in ts file
.. versionadded:: 3.4
%End

struct Settings
{
const QgsSettingsEntryString localeUserLocale;
const QgsSettingsEntryBool localeOverrideFlag;
const QgsSettingsEntryString localeGlobalLocale;
const QgsSettingsEntryBool localeShowGroupSeparator;
const QgsSettingsEntryStringList searchPathsForSVG;
};
const QgsSettingsEntryString settingsLocaleUserLocale;
const QgsSettingsEntryBool settingsLocaleOverrideFlag;
const QgsSettingsEntryString settingsLocaleGlobalLocale;
const QgsSettingsEntryBool settingsLocaleShowGroupSeparator;
const QgsSettingsEntryStringList settingsSearchPathsForSVG;

%If (ANDROID)
//dummy method to workaround sip generation issue
@@ -118,10 +118,7 @@ Read the geometry options from ``node``.
.. versionadded:: 3.4
%End

struct Settings
{
const QgsSettingsEntryString geometryValidationDefaultChecks;
};
const QgsSettingsEntryString settingsGeometryValidationDefaultChecks;

signals:

@@ -60,10 +60,7 @@ Since the paths are stored by order of preference, lower positions in the list t
Unregisters a localized path
%End

struct Settings
{
const QgsSettingsEntryStringList localizedDataPaths;
};
const QgsSettingsEntryStringList settingsLocalizedDataPaths;

private:
QgsLocalizedDataPathRegistry( const QgsLocalizedDataPathRegistry &other );
@@ -157,11 +157,7 @@ Returns map settings with which this job was started.




struct Settings
{
const QgsSettingsEntryBool logCanvasRefreshEvent;
};
const QgsSettingsEntryBool settingsLogCanvasRefreshEvent;

signals:

0 comments on commit 2087a7f

Please sign in to comment.