diff --git a/blackberry-qnx/bb10/src/ButtonMap.h b/blackberry-qnx/bb10/src/ButtonMap.h index 3f8e5f9e1d..e779a7fe39 100644 --- a/blackberry-qnx/bb10/src/ButtonMap.h +++ b/blackberry-qnx/bb10/src/ButtonMap.h @@ -31,7 +31,7 @@ public: QString getLabel(int button); //pass in RARCH button enum for button, map to g_setting int mapNextButtonPressed(); - //Call in our emulator thread with seperate screen_cxt + //Call in our RetroArch thread with seperate screen_cxt int getButtonMapping(int player, int button); //Call from frontend int requestButtonMapping(screen_device_t device, int player, int button); diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp b/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp index 74d393c62f..ce4b12a3b7 100644 --- a/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp +++ b/blackberry-qnx/bb10/src/RetroArch-Cascades.cpp @@ -154,7 +154,7 @@ void RetroArch::run() RARCH_ERR("Screen join window group failed.\n"); } - char *win_id = "RetroArch_Emulator_Window"; + char *win_id = "RetroArch_Window"; screen_set_window_property_cv(screen_win, SCREEN_PROPERTY_ID_STRING, strlen(win_id), win_id); int z = 10; @@ -221,7 +221,7 @@ void RetroArch::onRotationCompleted() if (OrientationSupport::instance()->orientation() == UIOrientation::Landscape) { if (state == RETROARCH_START_REQUESTED) - startEmulator(); + start(); } } @@ -244,7 +244,7 @@ void RetroArch::onCoreSelected(QVariant value) /* * Functions */ -void RetroArch::startEmulator() +void RetroArch::start() { state = RETROARCH_START_REQUESTED; diff --git a/blackberry-qnx/bb10/src/RetroArch-Cascades.h b/blackberry-qnx/bb10/src/RetroArch-Cascades.h index c8bcc921e4..79fac89880 100644 --- a/blackberry-qnx/bb10/src/RetroArch-Cascades.h +++ b/blackberry-qnx/bb10/src/RetroArch-Cascades.h @@ -33,7 +33,7 @@ public: RetroArch(); ~ RetroArch(); - Q_INVOKABLE void startEmulator(); + Q_INVOKABLE void start(); Q_INVOKABLE void findDevices(); Q_INVOKABLE void discoverController(int player); void populateCores(core_info_list_t * info);