Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix codestyle

Browse Source
This commit is contained in:
thez3ro 2017-11-08 17:21:56 +01:00
parent a02a49a184
commit 3d5ff723e9
No known key found for this signature in database
GPG Key ID: F628F9E41DD7C073
2 changed files with 104 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
src/autotype/AutoType.cpp
View File

@ -20,8 +20,8 @@
#include <QApplication>
#include <QPluginLoader>
#include <iostream>
#include <QtWidgets/QErrorMessage>
#include <iostream>
#include "config-keepassx.h"
@ -56,8 +56,7 @@ AutoType::AutoType(QObject* parent, bool test)
QString pluginName = "keepassx-autotype-";
if (!test) {
pluginName += QApplication::platformName();
}
else {
} else {
pluginName += "test";
}
@ -93,8 +92,7 @@ void AutoType::loadPlugin(const QString& pluginPath)
if (m_plugin->isAvailable()) {
m_executor = m_plugin->createExecutor();
connect(pluginInstance, SIGNAL(globalShortcutTriggered()), SIGNAL(globalShortcutTriggered()));
}
else {
} else {
unloadPlugin();
}
}
@ -140,8 +138,7 @@ void AutoType::_performAutoType(const Entry* entry, QWidget* hideWindow, const Q
QString sequence;
if (customSequence.isEmpty()) {
sequence = autoTypeSequence(entry);
}
else {
} else {
sequence = customSequence;
}
@ -223,16 +220,14 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
message.append("\n\n");
message.append(windowTitle);
MessageBox::information(nullptr, tr("Auto-Type - KeePassXC"), message);
}
else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
} else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
m_inAutoType = false;
performAutoType(entryList.first(), nullptr, sequenceHash[entryList.first()]);
}
else {
} else {
m_windowFromGlobal = m_plugin->activeWindow();
AutoTypeSelectDialog* selectDialog = new AutoTypeSelectDialog();
connect(selectDialog, SIGNAL(entryActivated(Entry*,QString)),
SLOT(performAutoTypeFromGlobal(Entry*,QString)));
connect(
selectDialog, SIGNAL(entryActivated(Entry*, QString)), SLOT(performAutoTypeFromGlobal(Entry*, QString)));
connect(selectDialog, SIGNAL(rejected()), SLOT(resetInAutoType()));
selectDialog->setEntries(entryList, sequenceHash);
#if defined(Q_OS_MAC)
@ -301,12 +296,10 @@ bool AutoType::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifie
m_currentGlobalKey = key;
m_currentGlobalModifiers = modifiers;
return true;
}
else {
} else {
return false;
}
}
else {
} else {
return true;
}
}
@ -338,8 +331,7 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
if (ch == '{') {
qWarning("Syntax error in auto-type sequence.");
return false;
}
else if (ch == '}') {
} else if (ch == '}') {
QList<AutoTypeAction*> autoType = createActionFromTemplate(tmpl, entry);
if (autoType.isEmpty()) {
return false;
@ -347,19 +339,15 @@ bool AutoType::parseActions(const QString& sequence, const Entry* entry, QList<A
actions.append(autoType);
inTmpl = false;
tmpl.clear();
}
else {
} else {
tmpl += ch;
}
}
else if (ch == '{') {
} else if (ch == '{') {
inTmpl = true;
}
else if (ch == '}') {
} else if (ch == '}') {
qWarning("Syntax error in auto-type sequence.");
return false;
}
else {
} else {
actions.append(new AutoTypeChar(ch));
}
}
@ -402,104 +390,72 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
if (tmplName.compare("tab", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Tab));
}
else if (tmplName.compare("enter", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("enter", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Enter));
}
else if (tmplName.compare("space", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("space", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Space));
}
else if (tmplName.compare("up", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("up", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Up));
}
else if (tmplName.compare("down", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("down", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Down));
}
else if (tmplName.compare("left", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("left", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Left));
}
else if (tmplName.compare("right", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("right", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Right));
}
else if (tmplName.compare("insert", Qt::CaseInsensitive) == 0 ||
} else if (tmplName.compare("insert", Qt::CaseInsensitive) == 0 ||
tmplName.compare("ins", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Insert));
}
else if (tmplName.compare("delete", Qt::CaseInsensitive) == 0 ||
} else if (tmplName.compare("delete", Qt::CaseInsensitive) == 0 ||
tmplName.compare("del", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Delete));
}
else if (tmplName.compare("home", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("home", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Home));
}
else if (tmplName.compare("end", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("end", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_End));
}
else if (tmplName.compare("pgup", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("pgup", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_PageUp));
}
else if (tmplName.compare("pgdown", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("pgdown", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_PageDown));
}
else if (tmplName.compare("backspace", Qt::CaseInsensitive) == 0 ||
tmplName.compare("bs", Qt::CaseInsensitive) == 0 ||
tmplName.compare("bksp", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("backspace", Qt::CaseInsensitive) == 0 ||
tmplName.compare("bs", Qt::CaseInsensitive) == 0 || tmplName.compare("bksp", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Backspace));
}
else if (tmplName.compare("break", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("break", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Pause));
}
else if (tmplName.compare("capslock", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("capslock", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_CapsLock));
}
else if (tmplName.compare("esc", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("esc", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Escape));
}
else if (tmplName.compare("help", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("help", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Help));
}
else if (tmplName.compare("numlock", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("numlock", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_NumLock));
}
else if (tmplName.compare("ptrsc", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("ptrsc", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_Print));
}
else if (tmplName.compare("scrolllock", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("scrolllock", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeKey(Qt::Key_ScrollLock));
}
// Qt doesn't know about keypad keys so use the normal ones instead
else if (tmplName.compare("add", Qt::CaseInsensitive) == 0 ||
tmplName.compare("+", Qt::CaseInsensitive) == 0) {
else if (tmplName.compare("add", Qt::CaseInsensitive) == 0 || tmplName.compare("+", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('+'));
}
else if (tmplName.compare("subtract", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("subtract", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('-'));
}
else if (tmplName.compare("multiply", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("multiply", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('*'));
}
else if (tmplName.compare("divide", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("divide", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('/'));
}
else if (tmplName.compare("^", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("^", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('^'));
}
else if (tmplName.compare("%", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("%", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('%'));
}
else if (tmplName.compare("~", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("~", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('~'));
}
else if (tmplName.compare("(", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("(", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('('));
}
else if (tmplName.compare(")", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare(")", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar(')'));
}
else if (tmplName.compare("leftbrace", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("leftbrace", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('{'));
}
else if (tmplName.compare("rightbrace", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("rightbrace", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeChar('}'));
}
@ -520,14 +476,11 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
return list;
}
if (tmplName.compare("delay", Qt::CaseInsensitive) == 0 && num > 0) {
list.append(new AutoTypeDelay(num));
}
else if (tmplName.compare("clearfield", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("clearfield", Qt::CaseInsensitive) == 0) {
list.append(new AutoTypeClearField());
}
else if (tmplName.compare("totp", Qt::CaseInsensitive) == 0) {
} else if (tmplName.compare("totp", Qt::CaseInsensitive) == 0) {
QString totp = entry->totp();
if (!totp.isEmpty()) {
for (const QChar& ch : totp) {
@ -546,11 +499,9 @@ QList<AutoTypeAction*> AutoType::createActionFromTemplate(const QString& tmpl, c
for (const QChar& ch : resolved) {
if (ch == '\n') {
list.append(new AutoTypeKey(Qt::Key_Enter));
}
else if (ch == '\t') {
} else if (ch == '\t') {
list.append(new AutoTypeKey(Qt::Key_Tab));
}
else {
} else {
list.append(new AutoTypeChar(ch));
}
}
@ -575,8 +526,7 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
if (windowMatches(windowTitle, window)) {
if (!assoc.sequence.isEmpty()) {
sequence = assoc.sequence;
}
else {
} else {
sequence = entry->defaultAutoTypeSequence();
}
match = true;
@ -584,14 +534,14 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
}
}
if (!match && config()->get("AutoTypeEntryTitleMatch").toBool()
&& windowMatchesTitle(windowTitle, entry->resolvePlaceholder(entry->title()))) {
if (!match && config()->get("AutoTypeEntryTitleMatch").toBool() &&
windowMatchesTitle(windowTitle, entry->resolvePlaceholder(entry->title()))) {
sequence = entry->defaultAutoTypeSequence();
match = true;
}
if (!match && config()->get("AutoTypeEntryURLMatch").toBool()
&& windowMatchesUrl(windowTitle, entry->resolvePlaceholder(entry->url()))) {
if (!match && config()->get("AutoTypeEntryURLMatch").toBool() &&
windowMatchesUrl(windowTitle, entry->resolvePlaceholder(entry->url()))) {
sequence = entry->defaultAutoTypeSequence();
match = true;
}
@ -599,8 +549,7 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
if (!match) {
return QString();
}
}
else {
} else {
sequence = entry->defaultAutoTypeSequence();
}
@ -609,8 +558,7 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
if (!enableSet) {
if (group->autoTypeEnabled() == Group::Disable) {
return QString();
}
else if (group->autoTypeEnabled() == Group::Enable) {
} else if (group->autoTypeEnabled() == Group::Enable) {
enableSet = true;
}
}
@ -622,15 +570,13 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
group = group->parentGroup();
} while (group && (!enableSet || sequence.isEmpty()));
if (sequence.isEmpty() && (!entry->resolvePlaceholder(entry->username()).isEmpty()
|| !entry->resolvePlaceholder(entry->password()).isEmpty())) {
if (sequence.isEmpty() && (!entry->resolvePlaceholder(entry->username()).isEmpty() ||
!entry->resolvePlaceholder(entry->password()).isEmpty())) {
if (entry->resolvePlaceholder(entry->username()).isEmpty()) {
sequence = "{PASSWORD}{ENTER}";
}
else if (entry->resolvePlaceholder(entry->password()).isEmpty()) {
} else if (entry->resolvePlaceholder(entry->password()).isEmpty()) {
sequence = "{USERNAME}{ENTER}";
}
else {
} else {
sequence = "{USERNAME}{TAB}{PASSWORD}{ENTER}";
}
}
@ -643,8 +589,7 @@ bool AutoType::windowMatches(const QString& windowTitle, const QString& windowPa
if (windowPattern.startsWith("//") && windowPattern.endsWith("//") && windowPattern.size() >= 4) {
QRegExp regExp(windowPattern.mid(2, windowPattern.size() - 4), Qt::CaseInsensitive, QRegExp::RegExp2);
return (regExp.indexIn(windowTitle) != -1);
}
else {
} else {
return WildcardMatcher(windowTitle).match(windowPattern);
}
}
@ -684,10 +629,8 @@ bool AutoType::checkSyntax(const QString &string)
QString shortcutKeys = "[\\^\\%~\\+@]";
QString fixedStrings = "[^\\^\\%~\\+@\\{\\}]*";
QRegExp autoTypeSyntax
("(" + shortcutKeys + "|" + fixedStrings + "|\\{(" + normalCommands + "|" + specialLiterals + "|"
+ functionKeys
+ "|" + numpad + "|" + delay + "|" + beep + "|" + vkey + ")\\})*");
QRegExp autoTypeSyntax("(" + shortcutKeys + "|" + fixedStrings + "|\\{(" + normalCommands + "|" + specialLiterals +
"|" + functionKeys + "|" + numpad + "|" + delay + "|" + beep + "|" + vkey + ")\\})*");
autoTypeSyntax.setCaseSensitivity(Qt::CaseInsensitive);
autoTypeSyntax.setPatternSyntax(QRegExp::RegExp);
return autoTypeSyntax.exactMatch(string);
@ -709,34 +652,30 @@ bool AutoType::checkHighRepetition(const QString &string)
return highRepetition.exactMatch(string);
}
void
AutoType::performAutoType(const Entry *entry, QWidget *hideWindow, const QString &customSequence, WId window)
void AutoType::performAutoType(const Entry* entry, QWidget* hideWindow, const QString& customSequence, WId window)
{
if (!AutoType::checkSyntax(entry->effectiveAutoTypeSequence())) {
QMessageBox messageBox;
messageBox.critical(0, "AutoType", tr("The Syntax of your AutoType statement is incorrect!"));
messageBox.critical(0, tr("AutoType"), tr("The Syntax of your AutoType statement is incorrect!"));
return;
}
else if (AutoType::checkHighDelay(entry->effectiveAutoTypeSequence())) {
} else if (AutoType::checkHighDelay(entry->effectiveAutoTypeSequence())) {
QMessageBox::StandardButton reply;
reply = QMessageBox::question(0,
"AutoType",
reply = QMessageBox::question(
0,
tr("AutoType"),
tr("This AutoType command contains a very long delay. Do you really want to execute it?"));
if (reply == QMessageBox::No) {
return;
}
}
else if (AutoType::checkHighRepetition(entry->effectiveAutoTypeSequence())) {
} else if (AutoType::checkHighRepetition(entry->effectiveAutoTypeSequence())) {
QMessageBox::StandardButton reply;
reply = QMessageBox::question(0,
"AutoType",
tr("This AutoType command contains arguments which are repeated very often. Do you really want to execute it?"));
reply = QMessageBox::question(0, tr("AutoType"), tr("This AutoType command contains arguments which are "
"repeated very often. Do you really want to execute it?"));
if (reply == QMessageBox::No) {
return;
}
}
_performAutoType(entry, hideWindow, customSequence, window);
}

19
src/autotype/AutoType.h
View File

@ -34,21 +34,25 @@ class AutoType : public QObject
{
Q_OBJECT
public:
QStringList windowTitles();
void _performAutoType(const Entry* entry, QWidget* hideWindow = nullptr,
const QString& customSequence = QString(), WId window = 0);
void _performAutoType(const Entry* entry,
QWidget* hideWindow = nullptr,
const QString& customSequence = QString(),
WId window = 0);
bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers);
void unregisterGlobalShortcut();
int callEventFilter(void* event);
static bool checkSyntax(const QString& string);
static bool checkHighRepetition(const QString& string);
static bool checkHighDelay(const QString& string);
void performAutoType(const Entry *entry, QWidget *hideWindow = nullptr,
const QString &customSequence = QString(), WId window = 0);
void performAutoType(const Entry* entry,
QWidget* hideWindow = nullptr,
const QString& customSequence = QString(),
WId window = 0);
inline bool isAvailable() {
inline bool isAvailable()
{
return m_plugin;
}
@ -91,7 +95,8 @@ private:
Q_DISABLE_COPY(AutoType)
};
inline AutoType* autoType() {
inline AutoType* autoType()
{
return AutoType::instance();
}