X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fbinding%2Fbinding.cpp;h=00399c1db212ced92570957d45a3e0e984adf73d;hb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;hp=fccb96be54b83e6770a795d219aae7ac07125bae;hpb=61703a0124c7ace84caf415f7d491a3ad6f42599;p=pulseview.git

diff --git a/pv/binding/binding.cpp b/pv/binding/binding.cpp
index fccb96b..00399c1 100644
--- a/pv/binding/binding.cpp
+++ b/pv/binding/binding.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <cassert>
@@ -27,11 +26,13 @@
 #include "binding.hpp"
 
 using std::shared_ptr;
+using std::string;
+using std::vector;
 
 namespace pv {
 namespace binding {
 
-const std::vector< std::shared_ptr<prop::Property> >& Binding::properties()
+const vector< shared_ptr<prop::Property> >& Binding::properties()
 {
 	return properties_;
 }
@@ -49,8 +50,7 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 {
 	assert(layout);
 
-	for (shared_ptr<pv::prop::Property> p : properties_)
-	{
+	for (shared_ptr<pv::prop::Property> p : properties_) {
 		assert(p);
 
 		QWidget *const widget = p->get_widget(layout->parentWidget(),
@@ -80,7 +80,7 @@ QString Binding::print_gvariant(Glib::VariantBase gvar)
 		s = QString::fromStdString("(null)");
 	else if (gvar.is_of_type(Glib::VariantType("s")))
 		s = QString::fromStdString(
-			Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(
+			Glib::VariantBase::cast_dynamic<Glib::Variant<string>>(
 				gvar).get());
 	else
 		s = QString::fromStdString(gvar.print());
@@ -88,5 +88,5 @@ QString Binding::print_gvariant(Glib::VariantBase gvar)
 	return s;
 }
 
-} // binding
-} // pv
+}  // namespace binding
+}  // namespace pv