diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2017-05-03 08:41:53 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2017-05-03 08:41:53 +0200 |
| commit | 764a29e801951bf0091f9605e925f7bbbcc74ef2 (patch) | |
| tree | ff0cdfaca1e202698b6be4b40411149c2af2a896 | |
| parent | 9d4236a7e08a70a683ee2f97f2bc2b3fe963c96e (diff) | |
revert msvc utf-8 source file encoding
cf. https://github.com/opentrack/opentrack/issues/605#issuecomment-298637288
| -rw-r--r-- | cmake/opentrack-platform.cmake | 3 | ||||
| -rw-r--r-- | filter-accela/ftnoir_filter_accela_dialog.cpp | 4 | ||||
| -rw-r--r-- | gui/mapping-window.cpp | 2 | ||||
| -rw-r--r-- | tracker-rs/ftnoir_tracker_rs.cpp | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 05566237..ab3a5f8b 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -49,9 +49,6 @@ if(MSVC) foreach (i SHARED MODULE EXE) set(CMAKE_${i}_LINKER_FLAGS "-DYNAMICBASE -NXCOMPAT ${CMAKE_${i}_LINKER_FLAGS} ") endforeach() - - #C4828: The file contains a character starting at offset 0x2763 that is illegal in the current source character set (codepage 65001). - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -source-charset:UTF-8 -wd4828") endif() if(WIN32) diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp index e8af130d..b9eef5a1 100644 --- a/filter-accela/ftnoir_filter_accela_dialog.cpp +++ b/filter-accela/ftnoir_filter_accela_dialog.cpp @@ -27,10 +27,10 @@ dialog_accela::dialog_accela() tie_setting(s.pos_deadzone, ui.trans_dz_slider); tie_setting(s.rot_nonlinearity, ui.rot_nl_slider); - tie_setting(s.rot_sensitivity, ui.rot_gain, tr(u8"%1°"), 0, 'g', 4); + tie_setting(s.rot_sensitivity, ui.rot_gain, tr("%1°"), 0, 'g', 4); tie_setting(s.pos_sensitivity, ui.trans_gain, tr("%1mm")); tie_setting(s.ewma, ui.ewma_label, tr("%1ms")); - tie_setting(s.rot_deadzone, ui.rot_dz, tr(u8"%1°"), 0, 'g', 4); + tie_setting(s.rot_deadzone, ui.rot_dz, tr("%1°"), 0, 'g', 4); tie_setting(s.pos_deadzone, ui.trans_dz, tr("%1mm")); tie_setting(s.rot_nonlinearity, ui.rot_nl, tr("<html><head/><body>" diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp index fdd9be03..0ee8c562 100644 --- a/gui/mapping-window.cpp +++ b/gui/mapping-window.cpp @@ -62,7 +62,7 @@ void MapWidget::load() for (QComboBox* x : { ui.max_yaw_rotation, ui.max_pitch_rotation, ui.max_roll_rotation }) for (a y : { a::r180, a::r90, a::r60, a::r45, a::r30, a::r25, a::r20, a::r15, a::r10 }) - x->addItem(tr(u8"%1°").arg(y), y); + x->addItem(tr("%1°").arg(y), y); for (QComboBox* x : { ui.max_x_translation, ui.max_y_translation, ui.max_z_translation }) for (a y : { a::t30, a::t20, a::t15, a::t10, a::t100 }) diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index cfbf7ff0..89659086 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -145,7 +145,7 @@ RSTracker::~RSTracker() { } QString RSTrackerMetaData::name() { - return QString(QCoreApplication::translate(u8"RSTrackerMetaData", u8"Intel® RealSense™ Technology")); + return QString(QCoreApplication::translate("RSTrackerMetaData", "Intel® RealSense™ Technology")); } QIcon RSTrackerMetaData::icon() { |