From 12e61b761bf71bd606cb2be4999ca95f348be1c6 Mon Sep 17 00:00:00 2001 From: FalsinSoft Date: Tue, 8 Jan 2019 22:39:51 +0100 Subject: [PATCH] Renamed some library sources --- ...iles.cpp => QAndroidApkExpansionFiles.cpp} | 0 ...ionFiles.h => QAndroidApkExpansionFiles.h} | 0 ...issions.cpp => QAndroidAppPermissions.cpp} | 0 ...Permissions.h => QAndroidAppPermissions.h} | 0 QtAndroidTools/QtAndroidTools.cpp | 32 ++++++++++++++++--- QtAndroidTools/QtAndroidTools.h | 23 +++++++++++++ QtAndroidTools/QtAndroidTools.pri | 14 ++++---- .../ApkExpansionDownloader.java | 0 .../ApkExpansionDownloaderAlarmReceiver.java | 0 .../ApkExpansionDownloaderService.java | 0 10 files changed, 56 insertions(+), 13 deletions(-) rename QtAndroidTools/{QtAndroidApkExpansionFiles.cpp => QAndroidApkExpansionFiles.cpp} (100%) rename QtAndroidTools/{QtAndroidApkExpansionFiles.h => QAndroidApkExpansionFiles.h} (100%) rename QtAndroidTools/{QtAndroidAppPermissions.cpp => QAndroidAppPermissions.cpp} (100%) rename QtAndroidTools/{QtAndroidAppPermissions.h => QAndroidAppPermissions.h} (100%) rename QtAndroidTools/src/com/falsinsoft/{QtAndroidTools => qtandroidtools}/ApkExpansionDownloader.java (100%) rename QtAndroidTools/src/com/falsinsoft/{QtAndroidTools => qtandroidtools}/ApkExpansionDownloaderAlarmReceiver.java (100%) rename QtAndroidTools/src/com/falsinsoft/{QtAndroidTools => qtandroidtools}/ApkExpansionDownloaderService.java (100%) diff --git a/QtAndroidTools/QtAndroidApkExpansionFiles.cpp b/QtAndroidTools/QAndroidApkExpansionFiles.cpp similarity index 100% rename from QtAndroidTools/QtAndroidApkExpansionFiles.cpp rename to QtAndroidTools/QAndroidApkExpansionFiles.cpp diff --git a/QtAndroidTools/QtAndroidApkExpansionFiles.h b/QtAndroidTools/QAndroidApkExpansionFiles.h similarity index 100% rename from QtAndroidTools/QtAndroidApkExpansionFiles.h rename to QtAndroidTools/QAndroidApkExpansionFiles.h diff --git a/QtAndroidTools/QtAndroidAppPermissions.cpp b/QtAndroidTools/QAndroidAppPermissions.cpp similarity index 100% rename from QtAndroidTools/QtAndroidAppPermissions.cpp rename to QtAndroidTools/QAndroidAppPermissions.cpp diff --git a/QtAndroidTools/QtAndroidAppPermissions.h b/QtAndroidTools/QAndroidAppPermissions.h similarity index 100% rename from QtAndroidTools/QtAndroidAppPermissions.h rename to QtAndroidTools/QAndroidAppPermissions.h diff --git a/QtAndroidTools/QtAndroidTools.cpp b/QtAndroidTools/QtAndroidTools.cpp index fb28075..b4e4dd2 100644 --- a/QtAndroidTools/QtAndroidTools.cpp +++ b/QtAndroidTools/QtAndroidTools.cpp @@ -1,7 +1,29 @@ - +/* + * MIT License + * + * Copyright (c) 2018 Fabio Falsini + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ #include -#include "QtAndroidAppPermissions.h" -#include "QtAndroidApkExpansionFiles.h" +#include "QAndroidAppPermissions.h" +#include "QAndroidApkExpansionFiles.h" #include "QtAndroidTools.h" QtAndroidTools::QtAndroidTools() @@ -10,6 +32,6 @@ QtAndroidTools::QtAndroidTools() void QtAndroidTools::InitializeQmlTools() { - qmlRegisterSingletonType("AndroidTools.AppPermissions", 1, 0, "QtAndroidAppPermissions", &QtAndroidAppPermissions::qmlInstance); - qmlRegisterSingletonType("AndroidTools.ApkExpansionFiles", 1, 0, "QtAndroidApkExpansionFiles", &QtAndroidApkExpansionFiles::qmlInstance); + qmlRegisterSingletonType("QtAndroidTools.AppPermissions", 1, 0, "QtAndroidAppPermissions", &QAndroidAppPermissions::qmlInstance); + qmlRegisterSingletonType("QtAndroidTools.ApkExpansionFiles", 1, 0, "QtAndroidApkExpansionFiles", &QAndroidApkExpansionFiles::qmlInstance); } diff --git a/QtAndroidTools/QtAndroidTools.h b/QtAndroidTools/QtAndroidTools.h index 0e138d4..4f6fffa 100644 --- a/QtAndroidTools/QtAndroidTools.h +++ b/QtAndroidTools/QtAndroidTools.h @@ -1,3 +1,26 @@ +/* + * MIT License + * + * Copyright (c) 2018 Fabio Falsini + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ #pragma once class QtAndroidTools diff --git a/QtAndroidTools/QtAndroidTools.pri b/QtAndroidTools/QtAndroidTools.pri index e76bd59..e28af97 100644 --- a/QtAndroidTools/QtAndroidTools.pri +++ b/QtAndroidTools/QtAndroidTools.pri @@ -4,16 +4,14 @@ QT += androidextras HEADERS += $$PWD/QtAndroidTools.h SOURCES += $$PWD/QtAndroidTools.cpp -HEADERS += $$PWD/QtAndroidAppPermissions.h -SOURCES += $$PWD/QtAndroidAppPermissions.cpp +HEADERS += $$PWD/QAndroidAppPermissions.h +SOURCES += $$PWD/QAndroidAppPermissions.cpp -HEADERS += $$PWD/QtAndroidApkExpansionFiles.h -SOURCES += $$PWD/QtAndroidApkExpansionFiles.cpp -OTHER_FILES += $$PWD/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloader.java \ - $$PWD/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderService.java \ - $$PWD/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderAlarmReceiver.java +HEADERS += $$PWD/QAndroidApkExpansionFiles.h +SOURCES += $$PWD/QAndroidApkExpansionFiles.cpp +OTHER_FILES += $$PWD/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloader.java -copy_src.commands = $(CHK_DIR_EXISTS) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/src/com/falsinsoft/QtAndroidTools) $(COPY_DIR) $$shell_path($$PWD/src) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/src) +copy_src.commands = $(CHK_DIR_EXISTS) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/src/com/falsinsoft/qtandroidtools) $(COPY_DIR) $$shell_path($$PWD/src) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/src) copy_aidl.commands = $(CHK_DIR_EXISTS) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/aidl/com/android/vending/licensing) $(COPY_DIR) $$shell_path($$PWD/aidl) $$shell_path($$ANDROID_PACKAGE_SOURCE_DIR/aidl) PRE_TARGETDEPS += copy_src copy_aidl QMAKE_EXTRA_TARGETS += copy_src copy_aidl diff --git a/QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloader.java b/QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloader.java similarity index 100% rename from QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloader.java rename to QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloader.java diff --git a/QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderAlarmReceiver.java b/QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloaderAlarmReceiver.java similarity index 100% rename from QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderAlarmReceiver.java rename to QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloaderAlarmReceiver.java diff --git a/QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderService.java b/QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloaderService.java similarity index 100% rename from QtAndroidTools/src/com/falsinsoft/QtAndroidTools/ApkExpansionDownloaderService.java rename to QtAndroidTools/src/com/falsinsoft/qtandroidtools/ApkExpansionDownloaderService.java