Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't use a deprecated method #491

Merged
merged 2 commits into from Oct 21, 2019
Merged

Don't use a deprecated method #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f706ea
Don't use a deprecated method
Oct 18, 2019
86af8c1
Correct different argument names between declaration and definition
Oct 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/configdialog.cpp
View file
Open in desktop
Expand Up @@ -527,7 +527,7 @@ void ConfigDialog::on_deleteButton_clicked() {
foreach (item, itemList)
selectedRows.insert(item->row());
// get a list, and sort it big to small
QList<int> rows = selectedRows.toList();
QList<int> rows = selectedRows.values();
std::sort(rows.begin(), rows.end());
// now actually do the removing:
foreach (int row, rows)
Expand Down
2 changes: 1 addition & 1 deletion src/configdialog.h
View file
Open in desktop
Expand Up @@ -34,7 +34,7 @@ class ConfigDialog : public QDialog {
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);
Expand Down
4 changes: 2 additions & 2 deletions src/imitatepass.h
View file
Open in desktop
Expand Up @@ -52,10 +52,10 @@ class ImitatePass : public Pass, private simpleTransaction {
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:
Expand Down
2 changes: 1 addition & 1 deletion src/pass.h
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ class Pass : public QObject {
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);
Expand Down
2 changes: 1 addition & 1 deletion src/qtpass.h
View file
Open in desktop
Expand Up @@ -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());
};

Expand Down
4 changes: 2 additions & 2 deletions src/realpass.h
View file
Open in desktop
Expand Up @@ -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);

Expand All @@ -21,7 +21,7 @@ class RealPass : public Pass {
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;
Expand Down