1 files changed, 1 insertions, 54 deletions
diff --git a/usersdialog.h b/usersdialog.h
index 521bc935..de0c0b1b 100644
--- a/usersdialog.h
+++ b/usersdialog.h
@@ -1,6 +1,7 @@
 #ifndef USERSDIALOG_H_
 #define USERSDIALOG_H_
 
+#include "datahelpers.h"
 #include <QCloseEvent>
 #include <QDateTime>
 #include <QDialog>
@@ -14,60 +15,6 @@ class UsersDialog;
 class QListWidgetItem;
 
 /*!
-    \struct UserInfo
-    \brief Stores key info lines including validity, creation date and more.
- */
-struct UserInfo {
-  UserInfo() : validity('-'), have_secret(false), enabled(false) {}
-
-  /**
-   * @brief UserInfo::fullyValid when validity is f or u.
-   * http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob_plain;f=doc/DETAILS
-   */
-  bool fullyValid() { return validity == 'f' || validity == 'u'; }
-  /**
-   * @brief UserInfo::marginallyValid when validity is m.
-   * http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob_plain;f=doc/DETAILS
-   */
-  bool marginallyValid() { return validity == 'm'; }
-  /**
-   * @brief UserInfo::isValid when fullyValid or marginallyValid.
-   */
-  bool isValid() { return fullyValid() || marginallyValid(); }
-
-  /**
-   * @brief UserInfo::name full name
-   */
-  QString name;
-  /**
-   * @brief UserInfo::key_id hexadecimal representation
-   */
-  QString key_id;
-  /**
-   * @brief UserInfo::validity GnuPG representation of validity
-   * http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=blob_plain;f=doc/DETAILS
-   */
-  char validity;
-  /**
-   * @brief UserInfo::have_secret secret key is available
-   * (can decrypt with this key)
-   */
-  bool have_secret;
-  /**
-   * @brief UserInfo::enabled
-   */
-  bool enabled;
-  /**
-   * @brief UserInfo::expiry date/time key expires
-   */
-  QDateTime expiry;
-  /**
-   * @brief UserInfo::created date/time key was created
-   */
-  QDateTime created;
-};
-
-/*!
     \class UsersDialog
     \brief Handles listing and editing of GPG users.