X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FLengthCombo.cpp;h=8e57af1ca6958cbf5ac6a1ac32e440e252bc7016;hb=59e0cb8f85f0d2f985b31532dd3308315659c662;hp=ed4b653a0020fe3664c6e9bf34185b6dae0cbba7;hpb=5ba20465feb483d85ddc939aa98a3b7629d4a450;p=lyx.git

diff --git a/src/frontends/qt4/LengthCombo.cpp b/src/frontends/qt4/LengthCombo.cpp
index ed4b653a00..8e57af1ca6 100644
--- a/src/frontends/qt4/LengthCombo.cpp
+++ b/src/frontends/qt4/LengthCombo.cpp
@@ -27,14 +27,14 @@ 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 (QLatin1String(lyx::unit_name[i]) == "mu")
 			continue;
 		QComboBox::addItem(lyx::qt_(lyx::unit_name_gui[i]),
 			lyx::toqstr(lyx::unit_name[i]));
 	}
 
 	connect(this, SIGNAL(activated(int)),
-		this, SLOT(has_activated(int)));
+		this, SLOT(hasActivated(int)));
 }
 
 
@@ -45,7 +45,7 @@ lyx::Length::UNIT LengthCombo::currentLengthItem() const
 }
 
 
-void LengthCombo::has_activated(int)
+void LengthCombo::hasActivated(int)
 {
   // emit signal
 	selectionChanged(currentLengthItem());