rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated parts of the code (#2419)

Browse Source 
Performing a dev build against the latest version of Qt failed
because of some deprecated members. They have been replaced
according to the Qt documentation.

Further, Q_OS_MACOS is now the only macro available to identify a
machine running macOS, the others are now deprecated.
See https://doc.qt.io/qt-5/qtglobal.html#Q_OS_OSX and
https://doc.qt.io/qt-5/qtglobal.html#Q_OS_MAC.
This commit is contained in:
Gianluca Recchia
2018-10-26 15:19:04 +02:00
committed by Janek Bevendorff
parent efdb43dc53
commit f31d65bdaf
26 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/autotype/AutoType.cpp
View File

@@ -142,7 +142,7 @@ QStringList AutoType::windowTitles()
void AutoType::raiseWindow()
{
#if defined(Q_OS_MAC)
#if defined(Q_OS_MACOS)
m_plugin->raiseOwnWindow();
#endif
}
@@ -213,7 +213,7 @@ void AutoType::executeAutoTypeActions(const Entry* entry, QWidget* hideWindow, c
}
if (hideWindow) {
#if defined(Q_OS_MAC)
#if defined(Q_OS_MACOS)
m_plugin->raiseLastActiveWindow();
#else
hideWindow->showMinimized();
@@ -327,7 +327,7 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
connect(selectDialog, SIGNAL(rejected()), SLOT(autoTypeRejectedFromGlobal()));
selectDialog->setMatchList(matchList);
#if defined(Q_OS_MAC)
#if defined(Q_OS_MACOS)
m_plugin->raiseOwnWindow();
Tools::wait(500);
#endif