QRouland/UTPassMirror
1
0
Fork 0
mirror of https://github.com/QRouland/UTPass.git synced 2024-09-18 19:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code style

Browse Source
This commit is contained in:
Quentin Rouland 2019-03-21 00:04:05 +01:00
parent 3cbd834787
commit aa4018c680
12 changed files with 166 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -62,19 +62,19 @@ file(GLOB_RECURSE I18N_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po qml/*.q
list(APPEND I18N_SRC_FILES ${DESKTOP_FILE_NAME}.in.h)
find_program(INTLTOOL_MERGE intltool-merge)
if(NOT INTLTOOL_MERGE)
if (NOT INTLTOOL_MERGE)
message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
endif()
endif ()
find_program(INTLTOOL_EXTRACT intltool-extract)
if(NOT INTLTOOL_EXTRACT)
if (NOT INTLTOOL_EXTRACT)
message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
endif()
endif ()
add_custom_target(${DESKTOP_FILE_NAME} ALL
COMMENT "Merging translations into ${DESKTOP_FILE_NAME}..."
COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${CMAKE_SOURCE_DIR}/${DESKTOP_FILE_NAME}.in ${DESKTOP_FILE_NAME}
COMMAND sed -i 's/${PROJECT_NAME}-//g' ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME}
)
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE_NAME} DESTINATION ${DATA_DIR})
@ -95,6 +95,6 @@ file(GLOB_RECURSE PROJECT_SRC_FILES
*.json.in
*.apparmor
*.desktop.in
)
)
add_custom_target(${PROJECT_NAME}_FILES ALL SOURCES ${PROJECT_SRC_FILES} )
add_custom_target(${PROJECT_NAME}_FILES ALL SOURCES ${PROJECT_SRC_FILES})

14
plugins/Gpg/gpg.cpp
View File

@ -1,7 +1,6 @@
#include <QDebug>
#include <QFile>
#include <QDir>
#include <QtCore/QDirIterator>
#include <QtCore/QStandardPaths>
#include "gpg.h"
@ -28,7 +27,8 @@ Gpg::Gpg() {
QString gnuhome = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).append("/gpghome");
QDir dir(gnuhome);
if (!dir.exists()) dir.mkpath(".");
if (!dir.exists())
dir.mkpath(".");
qputenv("GNUPGHOME", gnuhome.toStdString().c_str());
qDebug() << "GNUPGHOME is :" << qgetenv("GNUPGHOME");
@ -96,8 +96,6 @@ bool Gpg::encrypt_file(const QString str, const QString path) {
return true;*/
}
QString Gpg::get_key_id(QString uid) {
qDebug() << "Getting the key id " << uid;
auto *job = openpgp()->keyListJob(false, false, false);
@ -122,12 +120,12 @@ QStringList Gpg::get_all_keys_id() {
delete job;
if (keys.empty()) {
qDebug() << "No key found" ;
qDebug() << "No key found";
return QStringList();
}
auto r = QStringList();
for(const auto &key: keys) {
for (const auto &key: keys) {
r.append(QLatin1String(key.keyID()));
qDebug() << "Key" << QLatin1String(key.keyID());
}
@ -148,7 +146,7 @@ bool Gpg::import_key(QString path) {
delete job;
file.close();
if(result.error()) {
if (result.error()) {
qWarning() << "Import go wrong";
return false;
}
@ -159,7 +157,7 @@ bool Gpg::import_key(QString path) {
qDebug() << "Result null" << result.isNull();
qDebug() << "newUserIDs" << result.newUserIDs();
for(const auto &key: result.imports())
for (const auto &key: result.imports())
qDebug() << "Key" << key.fingerprint();
return true;

4
plugins/Gpg/gpg.h
View File

@ -3,10 +3,10 @@
#include <QObject>
class Gpg: public QObject {
class Gpg : public QObject {
Q_OBJECT
public:
public:
Gpg();
~Gpg() = default;

3
plugins/Gpg/plugin.cpp
View File

@ -1,10 +1,9 @@
#include <QtQml>
#include <QtQml/QQmlContext>
#include "plugin.h"
#include "gpg.h"
void FileSystemPlugin::registerTypes(const char *uri) {
//@uri Pass
qmlRegisterSingletonType<Gpg>(uri, 1, 0, "Gpg", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Gpg; });
qmlRegisterSingletonType<Gpg>(uri, 1, 0, "Gpg", [](QQmlEngine *, QJSEngine *) -> QObject * { return new Gpg; });
}

5
plugins/Gpg/plugin.h
View File

@ -5,9 +5,10 @@
class FileSystemPlugin : public QQmlExtensionPlugin {
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
Q_PLUGIN_METADATA(IID
"org.qt-project.Qt.QQmlExtensionInterface")
public:
public:
void registerTypes(const char *uri);
};

1
plugins/Pass/pass.cpp
View File

@ -3,7 +3,6 @@
#include "pass.h"
Pass::Pass() {
}

4
plugins/Pass/pass.h
View File

@ -3,11 +3,11 @@
#include <QObject>
class Pass: public QObject {
class Pass : public QObject {
Q_OBJECT
QString gpgHome;
public:
public:
Pass();
~Pass() override = default;

3
plugins/Pass/plugin.cpp
View File

@ -1,10 +1,9 @@
#include <QtQml>
#include <QtQml/QQmlContext>
#include "plugin.h"
#include "pass.h"
void PassPlugin::registerTypes(const char *uri) {
//@uri Pass
qmlRegisterSingletonType<Pass>(uri, 1, 0, "Pass", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Pass; });
qmlRegisterSingletonType<Pass>(uri, 1, 0, "Pass", [](QQmlEngine *, QJSEngine *) -> QObject * { return new Pass; });
}

5
plugins/Pass/plugin.h
View File

@ -5,9 +5,10 @@
class PassPlugin : public QQmlExtensionPlugin {
Q_OBJECT
Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
Q_PLUGIN_METADATA(IID
"org.qt-project.Qt.QQmlExtensionInterface")
public:
public:
void registerTypes(const char *uri) override;
};

2
po/utpass.qrouland.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: utpass.qrouland\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-03-20 22:15+0000\n"
"POT-Creation-Date: 2019-03-20 22:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"