Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ project(${TARGET} LANGUAGES C CXX)

set(CMAKE_AUTOUIC_SEARCH_PATHS ui)
set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_SKIP_RPATH ON)

Expand Down
2 changes: 1 addition & 1 deletion src/crypto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ void MasterPassword::addIntToString(std::string& str, uint32_t val)

std::string MasterPassword::templateForType(MPSiteType type, uint8_t seed_byte)
{
if (!(type & MPSiteTypeClassGenerated)) {
if (!(type & ((MPSiteType)MPSiteTypeClassGenerated))) {
THROW(EINVALID_PARAMETER);
}

Expand Down
9 changes: 7 additions & 2 deletions src/main_window.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,13 @@ MainWindow::MainWindow(QWidget* parent)
#ifndef DISABLE_FILL_FORM_SHORTCUTS
m_table_shortcuts[(int)ShortcutAction::FillForm].push_back(QKeySequence(QKeySequence::Paste));
m_table_shortcuts[(int)ShortcutAction::FillForm].push_back(QKeySequence(Qt::Key_P));
m_table_shortcuts[(int)ShortcutAction::FillFormPasswordOnly].push_back(
QKeySequence(Qt::SHIFT | Qt::Key_P));
m_table_shortcuts[(int)ShortcutAction::FillFormPasswordOnly].push_back(QKeySequence(
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
Qt::SHIFT + ((Qt::Modifier)Qt::Key_P)
#else
QKeyCombination(Qt::SHIFT, Qt::Key_P)
#endif
));
#endif
m_table_shortcuts[(int)ShortcutAction::SelectFilter].push_back(QKeySequence(Qt::Key_Slash));
m_table_shortcuts[(int)ShortcutAction::PreviousItem].push_back(QKeySequence(Qt::Key_K));
Expand Down