Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some build warnings
  • Loading branch information
nyalldawson committed Jan 26, 2023
1 parent 5259409 commit 263e065
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/core/settings/qgssettingsregistry.cpp
Expand Up @@ -120,7 +120,9 @@ void QgsSettingsRegistry::removeSubRegistry( const QgsSettingsRegistry *settings
mSettingsRegistryChildList.removeAll( settingsRegistry );
}

Q_NOWARN_DEPRECATED_PUSH
QList<const QgsSettingsRegistry *> QgsSettingsRegistry::subRegistries() const
{
return mSettingsRegistryChildList;
}
Q_NOWARN_DEPRECATED_POP
2 changes: 1 addition & 1 deletion src/plugins/topology/rulesDialog.ui
Expand Up @@ -88,7 +88,7 @@
</layout>
</item>
<item>
<widget class="QLabel" name="label">
<widget class="QLabel" name="label1">
<property name="text">
<string>Current Rules</string>
</property>
Expand Down
5 changes: 3 additions & 2 deletions tests/src/core/testqgssettingsregistry.cpp
Expand Up @@ -16,13 +16,12 @@

#include "qgssettingsentry.h"
#include "qgssettingsregistry.h"
#include "qgsunittypes.h"
#include "qgsmaplayerproxymodel.h"
#include "qgstest.h"

/**
* This is a helper class to test protected methods of QgsSettingsRegistry
*/
Q_NOWARN_DEPRECATED_PUSH
class SettingsRegistryTest : public QgsSettingsRegistry
{
public:
Expand All @@ -32,6 +31,8 @@ class SettingsRegistryTest : public QgsSettingsRegistry
QgsSettingsRegistry::addSettingsEntry( settingsEntry );
}
};
Q_NOWARN_DEPRECATED_POP


/**
* \ingroup UnitTests
Expand Down

0 comments on commit 263e065

Please sign in to comment.