diff options
| author | Aschwin Marsman <gitkraken@aynik.com> | 2019-10-19 01:36:47 +0200 |
|---|---|---|
| committer | Aschwin Marsman <gitkraken@aynik.com> | 2019-10-19 01:36:47 +0200 |
| commit | 86af8c10a14c7310ccfc10f6c3ec84b2cd8fbf30 (patch) | |
| tree | f9ee72e9ffc9fd80e5111d5ed242086f7c78d412 | |
| parent | 0f706ea2a8f43cbeab7b18a8202b67edde897184 (diff) | |
Correct different argument names between declaration and definition
| -rw-r--r-- | src/configdialog.h | 2 | ||||
| -rw-r--r-- | src/imitatepass.h | 4 | ||||
| -rw-r--r-- | src/pass.h | 2 | ||||
| -rw-r--r-- | src/qtpass.h | 2 | ||||
| -rw-r--r-- | src/realpass.h | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/configdialog.h b/src/configdialog.h index 24e2f047..a0f162b0 100644 --- a/src/configdialog.h +++ b/src/configdialog.h @@ -34,7 +34,7 @@ public: QHash<QString, QString> getProfiles(); void wizard(); void genKey(QString, QDialog *); - void useTrayIcon(bool useTrayIdon); + void useTrayIcon(bool useSystray); void useGit(bool useGit); void useOtp(bool useOtp); void useQrencode(bool useQrencode); diff --git a/src/imitatepass.h b/src/imitatepass.h index b00c08bb..4bfd3a94 100644 --- a/src/imitatepass.h +++ b/src/imitatepass.h @@ -52,10 +52,10 @@ public: virtual void GitPush() Q_DECL_OVERRIDE; virtual void Show(QString file) Q_DECL_OVERRIDE; virtual void OtpGenerate(QString file) Q_DECL_OVERRIDE; - virtual void Insert(QString file, QString value, + virtual void Insert(QString file, QString newValue, bool overwrite = false) Q_DECL_OVERRIDE; virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE; - virtual void Init(QString path, const QList<UserInfo> &list) Q_DECL_OVERRIDE; + virtual void Init(QString path, const QList<UserInfo> &users) Q_DECL_OVERRIDE; void reencryptPath(const QString &dir); signals: @@ -54,7 +54,7 @@ public: virtual QString Generate_b(unsigned int length, const QString &charset); void GenerateGPGKeys(QString batch); - QList<UserInfo> listKeys(QStringList keystring, bool secret = false); + QList<UserInfo> listKeys(QStringList keystrings, bool secret = false); QList<UserInfo> listKeys(QString keystring = "", bool secret = false); void updateEnv(); static QStringList getRecipientList(QString for_file); diff --git a/src/qtpass.h b/src/qtpass.h index 064edfce..07e36839 100644 --- a/src/qtpass.h +++ b/src/qtpass.h @@ -54,7 +54,7 @@ private slots: void onKeyGenerationComplete(const QString &p_output, const QString &p_errout); - void showInTextBrowser(QString toShow, QString prefix = QString(), + void showInTextBrowser(QString output, QString prefix = QString(), QString postfix = QString()); }; diff --git a/src/realpass.h b/src/realpass.h index abf96f1a..3fe8cdda 100644 --- a/src/realpass.h +++ b/src/realpass.h @@ -8,7 +8,7 @@ \brief Wrapper for executing pass to handle the password-store */ class RealPass : public Pass { - void executePass(PROCESS id, const QStringList &arg, + void executePass(PROCESS id, const QStringList &args, QString input = QString(), bool readStdout = true, bool readStderr = true); @@ -21,7 +21,7 @@ public: virtual void GitPush() Q_DECL_OVERRIDE; virtual void Show(QString file) Q_DECL_OVERRIDE; virtual void OtpGenerate(QString file) Q_DECL_OVERRIDE; - virtual void Insert(QString file, QString value, + virtual void Insert(QString file, QString newValue, bool overwrite = false) Q_DECL_OVERRIDE; virtual void Remove(QString file, bool isDir = false) Q_DECL_OVERRIDE; virtual void Init(QString path, const QList<UserInfo> &users) Q_DECL_OVERRIDE; |