From 0c755846fe8e759cbd9aaec32670bb28701a5047 Mon Sep 17 00:00:00 2001 From: thez3ro Date: Wed, 22 Mar 2017 00:04:36 +0100 Subject: [PATCH] fix camel case --- src/core/PassphraseGenerator.cpp | 6 +++--- src/core/PassphraseGenerator.h | 4 ++-- src/gui/PasswordGeneratorWidget.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp index 6585809b..ba403389 100644 --- a/src/core/PassphraseGenerator.cpp +++ b/src/core/PassphraseGenerator.cpp @@ -29,7 +29,7 @@ PassphraseGenerator::PassphraseGenerator() , m_separator(' ') { const QString path = filePath()->dataPath("wordlists/eff_large.wordlist"); - setWordlist(path); + setWordList(path); } double PassphraseGenerator::calculateEntropy(QString passphrase) @@ -54,7 +54,7 @@ void PassphraseGenerator::setWordCount(int wordCount) } -void PassphraseGenerator::setWordlist(QString path) +void PassphraseGenerator::setWordList(QString path) { m_wordlist.clear(); @@ -75,7 +75,7 @@ void PassphraseGenerator::setWordlist(QString path) } } -void PassphraseGenerator::setWordseparator(QString separator) { +void PassphraseGenerator::setWordSeparator(QString separator) { m_separator = separator; } diff --git a/src/core/PassphraseGenerator.h b/src/core/PassphraseGenerator.h index be1c1e67..e814a587 100644 --- a/src/core/PassphraseGenerator.h +++ b/src/core/PassphraseGenerator.h @@ -29,8 +29,8 @@ public: double calculateEntropy(QString passphrase); void setWordCount(int wordCount); - void setWordlist(QString path); - void setWordseparator(QString separator); + void setWordList(QString path); + void setWordSeparator(QString separator); bool isValid() const; QString generatePassphrase() const; diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp index 52fb4ab3..1f5606cf 100644 --- a/src/gui/PasswordGeneratorWidget.cpp +++ b/src/gui/PasswordGeneratorWidget.cpp @@ -363,9 +363,9 @@ void PasswordGeneratorWidget::updateGenerator() m_dicewareGenerator->setWordCount(m_ui->spinBoxWordCount->value()); if (!m_ui->comboBoxWordList->currentText().isEmpty()) { QString path = filePath()->dataPath("wordlists/" + m_ui->comboBoxWordList->currentText()); - m_dicewareGenerator->setWordlist(path); + m_dicewareGenerator->setWordList(path); } - m_dicewareGenerator->setWordseparator(m_ui->editWordSeparator->text()); + m_dicewareGenerator->setWordSeparator(m_ui->editWordSeparator->text()); if (m_dicewareGenerator->isValid()) { m_ui->buttonGenerate->setEnabled(true);