1 files changed, 6 insertions, 17 deletions
diff --git a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
index 2e5eb6f7..c9738f98 100644
--- a/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
+++ b/src/ui/dialog/keypair_details/KeySetExpireDateDialog.cpp
@@ -64,18 +64,12 @@ void KeySetExpireDateDialog::slot_confirm() {
                   ui_->dateEdit->date().toString().toStdString(),
                   ui_->timeEdit->time().toString().toStdString());
   auto datetime = QDateTime(ui_->dateEdit->date(), ui_->timeEdit->time());
-  std::unique_ptr<boost::posix_time::ptime> expires = nullptr;
+  std::unique_ptr<QDateTime> expires = nullptr;
   if (ui_->noExpirationCheckBox->checkState() == Qt::Unchecked) {
-#ifdef GPGFRONTEND_GUI_QT6
-    expires = std::make_unique<boost::posix_time::ptime>(
-        boost::posix_time::from_time_t(
-            datetime.toLocalTime().toSecsSinceEpoch()));
-#else
-    expires = std::make_unique<boost::posix_time::ptime>(
-        boost::posix_time::from_time_t(datetime.toLocalTime().toTime_t()));
-#endif
+    expires = std::make_unique<QDateTime>(datetime.toLocalTime());
+
     GF_UI_LOG_DEBUG("keyid: {}", m_key_.GetId(), m_subkey_,
-                    to_iso_string(*expires));
+                    expires->toSecsSinceEpoch());
   } else {
     GF_UI_LOG_DEBUG("keyid: {}", m_key_.GetId(), m_subkey_, "Non Expired");
   }
@@ -126,13 +120,8 @@ void KeySetExpireDateDialog::init() {
   ui_->dateEdit->setMinimumDateTime(min_date_time);
 
   // set default date time to expire date time
-#ifdef GPGFRONTEND_GUI_QT6
-  auto current_expire_time =
-      QDateTime::fromSecsSinceEpoch(to_time_t(m_key_.GetExpireTime()));
-#else
-  auto current_expire_time =
-      QDateTime::fromTime_t(to_time_t(m_key_.GetExpireTime()));
-#endif
+  auto current_expire_time = m_key_.GetExpireTime();
+
   ui_->dateEdit->setDateTime(current_expire_time);
   ui_->timeEdit->setDateTime(current_expire_time);