X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=main.cpp;h=0881c184a913d3c704abffca86e50485166e2da9;hp=97a61280ac5bc0462dc2da35d179ecd129a54ecf;hb=9cc264b4361acc503f156e90139c15cd6c324258;hpb=3e5bc2687fc23309ad46872fc5accde2af82ea87

diff --git a/main.cpp b/main.cpp
index 97a61280..0881c184 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
@@ -38,15 +37,16 @@
 #include "pv/mainwindow.hpp"
 #ifdef ANDROID
 #include <libsigrokandroidutils/libsigrokandroidutils.h>
+#include "android/assetreader.hpp"
 #include "android/loghandler.hpp"
 #endif
 
 #include "config.h"
 
 #ifdef _WIN32
-// The static qsvg lib is required for SVG graphics/icons (on Windows).
 #include <QtPlugin>
-Q_IMPORT_PLUGIN(qsvg)
+Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
+Q_IMPORT_PLUGIN(QSvgPlugin)
 #endif
 
 void usage()
@@ -77,17 +77,18 @@ int main(int argc, char *argv[])
 #ifdef ANDROID
 	srau_init_environment();
 	pv::AndroidLogHandler::install_callbacks();
+	pv::AndroidAssetReader asset_reader;
 #endif
 
 	// Parse arguments
 	while (1) {
 		static const struct option long_options[] = {
-			{"help", no_argument, 0, 'h'},
-			{"version", no_argument, 0, 'V'},
-			{"loglevel", required_argument, 0, 'l'},
-			{"input-file", required_argument, 0, 'i'},
-			{"input-format", required_argument, 0, 'I'},
-			{0, 0, 0, 0}
+			{"help", no_argument, nullptr, 'h'},
+			{"version", no_argument, nullptr, 'V'},
+			{"loglevel", required_argument, nullptr, 'l'},
+			{"input-file", required_argument, nullptr, 'i'},
+			{"input-format", required_argument, nullptr, 'I'},
+			{nullptr, 0, nullptr, 0}
 		};
 
 		const int c = getopt_long(argc, argv,
@@ -129,7 +130,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (argc - optind > 1) {
-		fprintf(stderr, "Only one file can be openened.\n");
+		fprintf(stderr, "Only one file can be opened.\n");
 		return 1;
 	} else if (argc - optind == 1) {
 		open_file = argv[argc - 1];
@@ -137,7 +138,9 @@ int main(int argc, char *argv[])
 
 	// Initialise libsigrok
 	context = sigrok::Context::create();
-
+#ifdef ANDROID
+	context->set_resource_reader(&asset_reader);
+#endif
 	do {
 
 #ifdef ENABLE_DECODE
@@ -179,7 +182,7 @@ int main(int argc, char *argv[])
 			// Run the application
 			ret = a.exec();
 
-		} catch(std::exception e) {
+		} catch (std::exception e) {
 			qDebug() << e.what();
 		}