Mercurial > ldforge / file diff

--- a/src/AddObjectDialog.cc	Wed Mar 05 05:31:07 2014 +0200
+++ b/src/AddObjectDialog.cc	Wed Mar 05 12:47:00 2014 +0200
@@ -126,7 +126,7 @@
 				for (Primitive& prim : cat->prims)
 				{
 					SubfileListItem* item = new SubfileListItem (parentItem, &prim);
-					item->setText (0, fmt ("%1 - %2", prim.name, prim.title));
+					item->setText (0, format ("%1 - %2", prim.name, prim.title));
 					subfileItems << item;
 
 					// If this primitive is the one the current object points to,
@@ -152,11 +152,11 @@
 
 		default:
 		{
-			critical (fmt ("Unhandled LDObject type %1 (%2) in AddObjectDialog", (int) type, typeName));
+			critical (format ("Unhandled LDObject type %1 (%2) in AddObjectDialog", (int) type, typeName));
 		} return;
 	}
 
-	QPixmap icon = getIcon (fmt ("add-%1", typeName));
+	QPixmap icon = getIcon (format ("add-%1", typeName));
 	LDObject* defaults = LDObject::getDefault (type);
 
 	lb_typeIcon = new QLabel;
@@ -261,7 +261,7 @@
 	QWidget::connect (bbx_buttons, SIGNAL (rejected()), this, SLOT (reject()));
 	layout->addWidget (bbx_buttons, 5, 0, 1, 4);
 	setLayout (layout);
-	setWindowTitle (fmt (tr ("Edit %1"), typeName));
+	setWindowTitle (format (tr ("Edit %1"), typeName));
 
 	setWindowIcon (icon);
 	defaults->destroy();
@@ -277,7 +277,7 @@
 	button->setAutoFillBackground (true);
 
 	if (col)
-		button->setStyleSheet (fmt ("background-color: %1", col->hexcode));
+		button->setStyleSheet (format ("background-color: %1", col->hexcode));
 }
 
 // =============================================================================
@@ -412,7 +412,7 @@
 
 			if (!file)
 			{
-				critical (fmt ("Couldn't open `%1': %2", name, strerror (errno)));
+				critical (format ("Couldn't open `%1': %2", name, strerror (errno)));
 				return;
 			}