Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-24 14:40:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Coding style fixes.

Browse source
This commit is contained in:
Felix Geyer 2013-10-13 18:08:50 +02:00
parent ef3d7b7772
commit 5daf0853c9
7 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/core/ArgumentParser.h
View file

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef KEEPASSX_ARGUMENT_PARSER_H #ifndef KEEPASSX_ARGUMENTPARSER_H
#define KEEPASSX_ARGUMENT_PARSER_H #define KEEPASSX_ARGUMENTPARSER_H
#include "core/Global.h" #include "core/Global.h"
@ -25,7 +25,6 @@
class ArgumentParser class ArgumentParser
{ {
public: public:
static QHash<QString, QString> parseArguments(const QStringList& args); static QHash<QString, QString> parseArguments(const QStringList& args);
@ -35,4 +34,4 @@ private:
static const QStringList ArgumentKeys; static const QStringList ArgumentKeys;
}; };
#endif // KEEPASSX_ARGUMENT_PARSER_H #endif // KEEPASSX_ARGUMENTPARSER_H

2
src/crypto/Random.h
View file

@ -48,7 +48,7 @@ public:
static void createWithBackend(RandomBackend* backend); static void createWithBackend(RandomBackend* backend);
private: private:
Random(RandomBackend* backend); explicit Random(RandomBackend* backend);
QScopedPointer<RandomBackend> m_backend; QScopedPointer<RandomBackend> m_backend;
static Random* m_instance; static Random* m_instance;

6
src/gui/MainWindow.cpp
View file

@ -402,7 +402,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool(); bool openPreviousDatabasesOnStartup = config()->get("OpenPreviousDatabasesOnStartup").toBool();
if (openPreviousDatabasesOnStartup) { if (openPreviousDatabasesOnStartup) {
connect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)), this, SLOT(rememberOpenDatabases(QString))); connect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)),
this, SLOT(rememberOpenDatabases(QString)));
} }
if (!m_ui->tabWidget->closeAllDatabases()) { if (!m_ui->tabWidget->closeAllDatabases()) {
@ -413,7 +414,8 @@ void MainWindow::closeEvent(QCloseEvent* event)
} }
if (openPreviousDatabasesOnStartup) { if (openPreviousDatabasesOnStartup) {
disconnect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)), this, SLOT(rememberOpenDatabases(QString))); disconnect(m_ui->tabWidget, SIGNAL(databaseWithFileClosed(QString)),
this, SLOT(rememberOpenDatabases(QString)));
config()->set("LastOpenedDatabases", m_openDatabases); config()->set("LastOpenedDatabases", m_openDatabases);
} }
} }

1
src/gui/MessageBox.cpp
View file

@ -83,4 +83,3 @@ void MessageBox::setNextAnswer(QMessageBox::StandardButton button)
{ {
m_nextAnswer = button; m_nextAnswer = button;
} }

3
src/gui/SettingsWidget.cpp
View file

@ -53,7 +53,8 @@ SettingsWidget::~SettingsWidget()
void SettingsWidget::loadSettings() void SettingsWidget::loadSettings()
{ {
m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool()); m_generalUi->rememberLastDatabasesCheckBox->setChecked(config()->get("RememberLastDatabases").toBool());
m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(config()->get("OpenPreviousDatabasesOnStartup").toBool()); m_generalUi->openPreviousDatabasesOnStartupCheckBox->setChecked(
config()->get("OpenPreviousDatabasesOnStartup").toBool());
m_generalUi->modifiedExpandedChangedCheckBox->setChecked(config()->get("ModifiedOnExpandedStateChanges").toBool()); m_generalUi->modifiedExpandedChangedCheckBox->setChecked(config()->get("ModifiedOnExpandedStateChanges").toBool());
m_generalUi->autoSaveAfterEveryChangeCheckBox->setChecked(config()->get("AutoSaveAfterEveryChange").toBool()); m_generalUi->autoSaveAfterEveryChangeCheckBox->setChecked(config()->get("AutoSaveAfterEveryChange").toBool());
m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool()); m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool());

3
tests/TestArgumentParser.cpp
View file

@ -55,7 +55,8 @@ void TestArgumentParser::testFilename()
void TestArgumentParser::testMultipleArguments() void TestArgumentParser::testMultipleArguments()
{ {
parse(QStringList() << "--config" << "myconfig.ini" << "--filename" << "myfilename" << "--password" << "mypassword"); parse(QStringList() << "--config" << "myconfig.ini" << "--filename" << "myfilename"
<< "--password" << "mypassword");
QCOMPARE(argumentMap.size(), 3); QCOMPARE(argumentMap.size(), 3);
QCOMPARE(argumentMap.value("config"), QString("myconfig.ini")); QCOMPARE(argumentMap.value("config"), QString("myconfig.ini"));

7
tests/TestArgumentParser.h
View file

@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef KEEPASSX_TEST_ARGUMENT_PARSER_H #ifndef KEEPASSX_TESTARGUMENTPARSER_H
#define KEEPASSX_TEST_ARGUMENT_PARSER_H #define KEEPASSX_TESTARGUMENTPARSER_H
#include <QHash> #include <QHash>
#include <QObject> #include <QObject>
@ -37,7 +37,6 @@ private:
void parse(const QStringList& arguments); void parse(const QStringList& arguments);
QHash<QString, QString> argumentMap; QHash<QString, QString> argumentMap;
}; };
#endif // KEEPASSX_TEST_ARGUMENT_PARSER_H #endif // KEEPASSX_TESTARGUMENTPARSER_H