From ea90ca4118295928dc2425d81cf9446a81e84299 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 24 Jun 2024 22:32:19 +0200
Subject: [PATCH] [partition] Avoid "shadowing" of fields by constructor
 parameters

Although the standard is clear about what this means, Clang
warns about it, so change names to avoid the warning (and make
it slightly easier to read).
---
 src/modules/partition/core/PartitionActions.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.h b/src/modules/partition/core/PartitionActions.h
index fdf56e56e..24969bb43 100644
--- a/src/modules/partition/core/PartitionActions.h
+++ b/src/modules/partition/core/PartitionActions.h
@@ -37,11 +37,11 @@ struct ReplacePartitionOptions
     ReplacePartitionOptions( const QString& pt,
                              const QString& fs,
                              Config::LuksGeneration luksFs,
-                             const QString& luksPassphrase )
+                             const QString& passphrase )
         : defaultPartitionTableType( pt )
         , defaultFsType( fs )
         , luksFsType( luksFs )
-        , luksPassphrase( luksPassphrase )
+        , luksPassphrase( passphrase )
     {
     }
 };
@@ -55,11 +55,11 @@ struct AutoPartitionOptions : ReplacePartitionOptions
     AutoPartitionOptions( const QString& pt,
                           const QString& fs,
                           Config::LuksGeneration luksFs,
-                          const QString& luksPassphrase,
+                          const QString& passphrase,
                           const QString& efi,
                           qint64 requiredBytes,
                           Config::SwapChoice s )
-        : ReplacePartitionOptions( pt, fs, luksFs, luksPassphrase )
+        : ReplacePartitionOptions( pt, fs, luksFs, passphrase )
         , efiPartitionMountPoint( efi )
         , requiredSpaceB( requiredBytes > 0 ? quint64( requiredBytes ) : 0U )
         , swap( s )