X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBranches.cpp;h=c79a42def221ba4cc45b4d27325ff88ee1b8dad6;hb=59e0cb8f85f0d2f985b31532dd3308315659c662;hp=bf2c5242da7d257588522fc38572352f885f1740;hpb=29df3045280b3019ee4e8e0b404c7d3cf93aff63;p=lyx.git

diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp
index bf2c5242da..c79a42def2 100644
--- a/src/frontends/qt4/GuiBranches.cpp
+++ b/src/frontends/qt4/GuiBranches.cpp
@@ -70,6 +70,8 @@ GuiBranches::GuiBranches(QWidget * parent)
 		undef_, SLOT(accept()));
 	connect(undef_->cancelPB, SIGNAL(clicked()),
 		undef_, SLOT(reject()));
+
+	newBranchLE->setValidator(new NoNewLineValidator(newBranchLE));
 }
 
 void GuiBranches::update(BufferParams const & params)
@@ -104,7 +106,7 @@ void GuiBranches::updateView()
 			coloritem.fill(itemcolor);
 			newItem->setIcon(2, QIcon(coloritem));
 		}
-		newItem->setText(3, it->hasFilenameSuffix() ? qt_("Yes") : qt_("No"));
+		newItem->setText(3, it->hasFileNameSuffix() ? qt_("Yes") : qt_("No"));
 		// restore selected branch
 		if (bname == sel_branch) {
 			branchesTW->setCurrentItem(newItem);
@@ -287,7 +289,7 @@ void GuiBranches::toggleSuffix(QTreeWidgetItem * item)
 
 	Branch * branch = branchlist_.find(qstring_to_ucs4(sel_branch));
 	if (branch) {
-		branch->setFilenameSuffix(!branch->hasFilenameSuffix());
+		branch->setFileNameSuffix(!branch->hasFileNameSuffix());
 		newBranchLE->clear();
 		updateView();
 	}