Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00
Code Releases Activity

Support KDE Frameworks 6 integration.

Browse Source
This commit is contained in:
Tiernan Hubble 2023-04-12 21:53:12 -06:00 committed by Juraj Oravec
parent 0152a9cdeb
commit 405295b4e1
Signed by: SGOrava
GPG Key ID: 13660A3F1D9F093B
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/KDEFrameworksIntegration/CMakeLists.txt
View File

@ -20,11 +20,11 @@ add_library(KDEFrameworksIntegration MODULE ${KDEFrameworksIntegration_SRCS} ${R
install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR}) install(TARGETS KDEFrameworksIntegration DESTINATION ${FALKON_INSTALL_PLUGINDIR})
target_link_libraries(KDEFrameworksIntegration target_link_libraries(KDEFrameworksIntegration
FalkonPrivate FalkonPrivate
KF5::Wallet KF${KF_MAJOR_VERSION}::Wallet
KF5::KIOCore KF${KF_MAJOR_VERSION}::KIOCore
KF5::KIOWidgets KF${KF_MAJOR_VERSION}::KIOWidgets
KF5::Crash KF${KF_MAJOR_VERSION}::Crash
KF5::CoreAddons KF${KF_MAJOR_VERSION}::CoreAddons
KF5::PurposeWidgets KF${KF_MAJOR_VERSION}::PurposeWidgets
KF5::JobWidgets KF5::JobWidgets
) )

4
src/plugins/KDEFrameworksIntegration/kdeframeworksintegrationplugin.h
View File

@ -19,7 +19,11 @@
#include "plugininterface.h" #include "plugininterface.h"
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
#include <PurposeWidgets/Menu> #include <PurposeWidgets/Menu>
#else
#include <Purpose/Menu>
#endif
class KWalletPasswordBackend; class KWalletPasswordBackend;
class KIOSchemeHandler; class KIOSchemeHandler;

15
src/plugins/KDEFrameworksIntegration/kwalletpasswordbackend.cpp
View File

@ -84,6 +84,17 @@ QVector<PasswordEntry> KWalletPasswordBackend::getAllEntries()
return m_allEntries; return m_allEntries;
} }
// TODO QT6 - should we just start storing timestamps as 64-bit instead?
static uint Q_DATETIME_TOTIME_T(const QDateTime &dateTime)
{
if (!dateTime.isValid())
return uint(-1);
qint64 retval = dateTime.toMSecsSinceEpoch() / 1000;
if (quint64(retval) >= Q_UINT64_C(0xFFFFFFFF))
return uint(-1);
return uint(retval);
}
void KWalletPasswordBackend::addEntry(const PasswordEntry &entry) void KWalletPasswordBackend::addEntry(const PasswordEntry &entry)
{ {
initialize(); initialize();
@ -95,7 +106,7 @@ void KWalletPasswordBackend::addEntry(const PasswordEntry &entry)
PasswordEntry stored = entry; PasswordEntry stored = entry;
stored.id = QString("%1/%2").arg(entry.host, entry.username); stored.id = QString("%1/%2").arg(entry.host, entry.username);
stored.updated = QDateTime::currentDateTime().toTime_t(); stored.updated = Q_DATETIME_TOTIME_T(QDateTime::currentDateTime());
m_wallet->writeMap(stored.id.toString(), encodeEntry(stored)); m_wallet->writeMap(stored.id.toString(), encodeEntry(stored));
m_allEntries.append(stored); m_allEntries.append(stored);
@ -133,7 +144,7 @@ void KWalletPasswordBackend::updateLastUsed(PasswordEntry &entry)
m_wallet->removeEntry(entry.id.toString()); m_wallet->removeEntry(entry.id.toString());
entry.updated = QDateTime::currentDateTime().toTime_t(); entry.updated = Q_DATETIME_TOTIME_T(QDateTime::currentDateTime());
m_wallet->writeMap(entry.id.toString(), encodeEntry(entry)); m_wallet->writeMap(entry.id.toString(), encodeEntry(entry));