From daabb53a2bc8c5ae6733d8ef3dbec55cd2420c6a Mon Sep 17 00:00:00 2001
From: Alexei Znamensky <103110+russoz@users.noreply.github.com>
Date: Mon, 20 Dec 2021 02:17:17 +1300
Subject: [PATCH] xfconf - using aggregated base class (#3919)

* xfconf - using aggregated base class

* added changelog fragment

* fixed typo
---
 changelogs/fragments/3919-xfconf-baseclass.yaml | 2 ++
 plugins/modules/system/xfconf.py                | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/fragments/3919-xfconf-baseclass.yaml

diff --git a/changelogs/fragments/3919-xfconf-baseclass.yaml b/changelogs/fragments/3919-xfconf-baseclass.yaml
new file mode 100644
index 0000000000..85625a769d
--- /dev/null
+++ b/changelogs/fragments/3919-xfconf-baseclass.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+    - xfconf - minor refactor on the base class for the module (https://github.com/ansible-collections/community.general/pull/3919).
diff --git a/plugins/modules/system/xfconf.py b/plugins/modules/system/xfconf.py
index 1fd0eb09e5..4e645df5c2 100644
--- a/plugins/modules/system/xfconf.py
+++ b/plugins/modules/system/xfconf.py
@@ -128,7 +128,7 @@ RETURN = '''
 '''
 
 from ansible_collections.community.general.plugins.module_utils.module_helper import (
-    ModuleHelper, CmdMixin, StateMixin, ArgFormat, ModuleHelperException
+    CmdStateModuleHelper, ArgFormat, ModuleHelperException
 )
 
 
@@ -151,7 +151,7 @@ class XFConfException(Exception):
     pass
 
 
-class XFConfProperty(CmdMixin, StateMixin, ModuleHelper):
+class XFConfProperty(CmdStateModuleHelper):
     change_params = 'value',
     diff_params = 'value',
     output_params = ('property', 'channel', 'value')