mirror of
https://github.com/keepassxreboot/keepassxc.git
synced 2025-01-14 08:50:08 -05:00
Coding style fixes.
This commit is contained in:
parent
f89a2a4045
commit
739f4d97a6
@ -377,7 +377,7 @@ QList<Entry*> Group::entriesRecursive(bool includeHistoryItems)
|
|||||||
return entryList;
|
return entryList;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Group::addEntry(Entry *entry)
|
void Group::addEntry(Entry* entry)
|
||||||
{
|
{
|
||||||
Q_ASSERT(entry);
|
Q_ASSERT(entry);
|
||||||
Q_ASSERT(!m_entries.contains(entry));
|
Q_ASSERT(!m_entries.contains(entry));
|
||||||
|
@ -134,7 +134,7 @@ private:
|
|||||||
|
|
||||||
friend void Database::setRootGroup(Group* group);
|
friend void Database::setRootGroup(Group* group);
|
||||||
friend Entry::~Entry();
|
friend Entry::~Entry();
|
||||||
friend void Entry::setGroup(Group *group);
|
friend void Entry::setGroup(Group* group);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // KEEPASSX_GROUP_H
|
#endif // KEEPASSX_GROUP_H
|
||||||
|
@ -605,7 +605,7 @@ Entry* KeePass2XmlReader::parseEntry(bool history)
|
|||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeePass2XmlReader::parseEntryString(Entry *entry)
|
void KeePass2XmlReader::parseEntryString(Entry* entry)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "String");
|
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "String");
|
||||||
|
|
||||||
@ -638,7 +638,7 @@ void KeePass2XmlReader::parseEntryString(Entry *entry)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeePass2XmlReader::parseEntryBinary(Entry *entry)
|
void KeePass2XmlReader::parseEntryBinary(Entry* entry)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binary");
|
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Binary");
|
||||||
|
|
||||||
@ -696,7 +696,7 @@ void KeePass2XmlReader::parseAutoType(Entry* entry)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void KeePass2XmlReader::parseAutoTypeAssoc(Entry *entry)
|
void KeePass2XmlReader::parseAutoTypeAssoc(Entry* entry)
|
||||||
{
|
{
|
||||||
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Association");
|
Q_ASSERT(m_xml.isStartElement() && m_xml.name() == "Association");
|
||||||
|
|
||||||
|
@ -26,7 +26,7 @@ DialogyWidget::DialogyWidget(QWidget* parent)
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void DialogyWidget::keyPressEvent(QKeyEvent *e)
|
void DialogyWidget::keyPressEvent(QKeyEvent* e)
|
||||||
{
|
{
|
||||||
#ifdef Q_WS_MAC
|
#ifdef Q_WS_MAC
|
||||||
if (e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_Period) {
|
if (e->modifiers() == Qt::ControlModifier && e->key() == Qt::Key_Period) {
|
||||||
|
@ -29,7 +29,7 @@ public:
|
|||||||
explicit DialogyWidget(QWidget* parent = 0);
|
explicit DialogyWidget(QWidget* parent = 0);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void keyPressEvent(QKeyEvent *e);
|
virtual void keyPressEvent(QKeyEvent* e);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
bool clickButton(QDialogButtonBox::StandardButton standardButton);
|
bool clickButton(QDialogButtonBox::StandardButton standardButton);
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
class CategoryListViewDelegate : public QStyledItemDelegate
|
class CategoryListViewDelegate : public QStyledItemDelegate
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
explicit CategoryListViewDelegate(QObject *parent) : QStyledItemDelegate(parent) {}
|
explicit CategoryListViewDelegate(QObject* parent) : QStyledItemDelegate(parent) {}
|
||||||
|
|
||||||
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
|
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const
|
||||||
{
|
{
|
||||||
|
@ -170,7 +170,7 @@ void MainWindow::showAboutDialog()
|
|||||||
aboutDialog->show();
|
aboutDialog->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::closeEvent(QCloseEvent *event) {
|
void MainWindow::closeEvent(QCloseEvent* event) {
|
||||||
if (!m_ui->tabWidget->closeAllDatabases()) {
|
if (!m_ui->tabWidget->closeAllDatabases()) {
|
||||||
event->ignore();
|
event->ignore();
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
void openDatabase(const QString& fileName, const QString& pw, const QString& keyFile);
|
void openDatabase(const QString& fileName, const QString& pw, const QString& keyFile);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void closeEvent(QCloseEvent *event);
|
void closeEvent(QCloseEvent* event);
|
||||||
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);
|
void setMenuActionState(DatabaseWidget::Mode mode = DatabaseWidget::None);
|
||||||
|
@ -215,7 +215,7 @@ QByteArray FileKey::loadXmlKey(QXmlStreamReader& xmlReader)
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileKey::loadBinary(QIODevice *device)
|
bool FileKey::loadBinary(QIODevice* device)
|
||||||
{
|
{
|
||||||
if (device->size() != 32) {
|
if (device->size() != 32) {
|
||||||
return false;
|
return false;
|
||||||
@ -225,7 +225,7 @@ bool FileKey::loadBinary(QIODevice *device)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileKey::loadHex(QIODevice *device)
|
bool FileKey::loadHex(QIODevice* device)
|
||||||
{
|
{
|
||||||
if (device->size() != 64) {
|
if (device->size() != 64) {
|
||||||
return false;
|
return false;
|
||||||
@ -247,7 +247,7 @@ bool FileKey::loadHex(QIODevice *device)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool FileKey::loadHashed(QIODevice *device)
|
bool FileKey::loadHashed(QIODevice* device)
|
||||||
{
|
{
|
||||||
CryptoHash cryptoHash(CryptoHash::Sha256);
|
CryptoHash cryptoHash(CryptoHash::Sha256);
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@
|
|||||||
#include "keys/CompositeKey.h"
|
#include "keys/CompositeKey.h"
|
||||||
#include "keys/PasswordKey.h"
|
#include "keys/PasswordKey.h"
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char** argv)
|
||||||
{
|
{
|
||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
// don't set applicationName or organizationName as that changes
|
// don't set applicationName or organizationName as that changes
|
||||||
|
Loading…
Reference in New Issue
Block a user