DocBook, InsetFloat: avoid a potential nullptr dereference when detecting the type...

[features.git] / src / insets / InsetInfo.cpp

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index b23255aafea8e7e2b03cbceed6e77801397e1ad2..61b39adc12719e826b90f107d171f3a714cc05e9 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -15,6 +15,8 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
+#include "Changes.h"
+#include "Cursor.h"
 #include "CutAndPaste.h"
 #include "Font.h"
 #include "FuncRequest.h"
@@ -25,7 +27,6 @@
 #include "LaTeXFeatures.h"
 #include "Language.h"
 #include "LayoutFile.h"
-#include "Length.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
@@ -45,6 +46,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/Length.h"
 #include "support/Messages.h"
 #include "support/lstrings.h"
 #include "support/qstring_helpers.h"
@@ -232,10 +234,8 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
        case MENU_INFO:
        case ICON_INFO: {
                result.push_back(make_pair("custom", _("Custom")));
-               LyXAction::const_iterator fit = lyxaction.func_begin();
-               LyXAction::const_iterator const fen = lyxaction.func_end();
-               for (; fit != fen; ++fit) {
-                       string const lfun = fit->first;
+               for (auto const & name_code : lyxaction) {
+                       string const lfun = name_code.first;
                        if (!lfun.empty())
                                result.push_back(make_pair(lfun, from_ascii(lfun)));
                }
@@ -297,7 +297,11 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
                string const dt = split(name, '@');
                QDate date;
                if (itype == "moddate")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       date = QDateTime::fromSecsSinceEpoch(buf->fileName().lastModified()).date();
+#else
                        date = QDateTime::fromTime_t(buf->fileName().lastModified()).date();
+#endif
                else if (itype == "fixdate" && !dt.empty()) {
                        QDate const gdate = QDate::fromString(toqstr(dt), Qt::ISODate);
                        date = (gdate.isValid()) ? gdate : QDate::currentDate();
@@ -323,7 +327,11 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
                string const tt = split(name, '@');
                QTime time;
                if (itype == "modtime")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       time = QDateTime::fromSecsSinceEpoch(buf->fileName().lastModified()).time();
+#else
                        time = QDateTime::fromTime_t(buf->fileName().lastModified()).time();
+#endif
                else if (itype == "fixtime" && !tt.empty()) {
                        QTime const gtime = QTime::fromString(toqstr(tt), Qt::ISODate);
                        time = (gtime.isValid()) ? gtime : QTime::currentTime();
@@ -455,12 +463,12 @@ string InsetInfoParams::infoType() const
 
 
 
-InsetInfo::InsetInfo(Buffer * buf, string const & name)
+InsetInfo::InsetInfo(Buffer * buf, string const & info)
        : InsetCollapsible(buf), initialized_(false)
 {
        params_.type = InsetInfoParams::UNKNOWN_INFO;
        params_.force_ltr = false;
-       setInfo(name);
+       setInfo(info);
        status_ = Collapsed;
 }
 
@@ -681,9 +689,9 @@ void InsetInfo::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
-void InsetInfo::setInfo(string const & name)
+void InsetInfo::setInfo(string const & info)
 {
-       if (name.empty())
+       if (info.empty())
                return;
 
        string saved_date_specifier;
@@ -692,7 +700,7 @@ void InsetInfo::setInfo(string const & name)
                saved_date_specifier = split(params_.name, '@');
        // info_type name
        string type;
-       params_.name = trim(split(name, type, ' '));
+       params_.name = trim(split(info, type, ' '));
        params_.type = nameTranslator().find(type);
        if (params_.name.empty())
                params_.name = defaultValueTranslator().find(params_.type);
@@ -759,6 +767,7 @@ bool InsetInfo::forceLocalFontSwitch() const
 {
        return params_.type == InsetInfoParams::MENU_INFO
                || params_.type == InsetInfoParams::SHORTCUTS_INFO
+               || params_.type == InsetInfoParams::SHORTCUT_INFO
                || params_.type == InsetInfoParams::L7N_INFO;
 }
 
@@ -818,8 +827,7 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                string const lcode = params_.lang->code();
                docstring trans;
                bool is_translated = sequence != seq_untranslated;
-               for (size_t n = 0; n < sequence.size(); ++n) {
-                       char_type const c = sequence[n];
+               for (char_type const c : sequence) {
                        switch(c) {
                        case 0x21b5://Return
                                gui = _("Return[[Key]]");
@@ -1078,6 +1086,10 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                igp.lyxscale = percent_scale;
                igp.scale = string();
                igp.width = Length(1, Length::EM);
+               if (contains(file.absoluteFilePath(), from_ascii("math"))
+                   || contains(file.absoluteFilePath(), from_ascii("ert-insert"))
+                   || suffixIs(file.onlyPath().absoluteFilePath(), from_ascii("ipa")))
+                       igp.darkModeSensitive = true;
                inset->setParams(igp);
                clear();
                Font const f(inherit_font, params_.lang);
@@ -1145,7 +1157,11 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                                ? split(params_.name, date_format, '@') : string();
                QDate date;
                if (params_.type == InsetInfoParams::MODDATE_INFO)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       date = QDateTime::fromSecsSinceEpoch(buffer().fileName().lastModified()).date();
+#else
                        date = QDateTime::fromTime_t(buffer().fileName().lastModified()).date();
+#endif
                else if (params_.type == InsetInfoParams::FIXDATE_INFO && !date_specifier.empty())
                        date = QDate::fromString(toqstr(date_specifier), Qt::ISODate);
                else
@@ -1162,7 +1178,11 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                                ? split(params_.name, time_format, '@') : string();
                QTime time;
                if (params_.type == InsetInfoParams::MODTIME_INFO)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       time = QDateTime::fromSecsSinceEpoch(buffer().fileName().lastModified()).time();
+#else
                        time = QDateTime::fromTime_t(buffer().fileName().lastModified()).time();
+#endif
                else if (params_.type == InsetInfoParams::FIXTIME_INFO && !time_specifier.empty())
                        time = QTime::fromString(toqstr(time_specifier), Qt::ISODate);
                else