From 22e13587b3d177b3b32077968befb3d0139f096d Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Mon, 16 Feb 2009 10:06:24 +0000 Subject: [PATCH] compilation warning: comparison of two char * git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28510 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiAbout.cpp | 2 +- src/frontends/qt4/LengthCombo.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiAbout.cpp b/src/frontends/qt4/GuiAbout.cpp index c5a484f081..f72479e4e8 100644 --- a/src/frontends/qt4/GuiAbout.cpp +++ b/src/frontends/qt4/GuiAbout.cpp @@ -98,7 +98,7 @@ static QString version() QString loc_release_date = loc.toString(release_date(), QLocale::LongFormat); if (loc_release_date.isEmpty()) { - if (lyx_release_date == "not released yet") + if (QString(lyx_release_date) == "not released yet") loc_release_date = qt_("not released yet"); else loc_release_date = toqstr(lyx_release_date); diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp index ed4b653a00..0ed1d64c4e 100644 --- a/src/frontends/qt4/LengthCombo.cpp +++ b/src/frontends/qt4/LengthCombo.cpp @@ -27,7 +27,7 @@ LengthCombo::LengthCombo(QWidget * parent) for (int i = 0; i < lyx::num_units; i++) { // mu does not make sense usually // so it must be added manually, if needed - if (lyx::unit_name[i] == "mu") + if (QString(lyx::unit_name[i]) == "mu") continue; QComboBox::addItem(lyx::qt_(lyx::unit_name_gui[i]), lyx::toqstr(lyx::unit_name[i]));