projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Random simplifications, cosmetics/whitespace/consistency fixes.
[pulseview.git]
/
pv
/
binding
/
binding.cpp
diff --git
a/pv/binding/binding.cpp
b/pv/binding/binding.cpp
index f2a28d3972b2b59c77f0f98142957a5888c5e5bb..79ce90a3e7eed7b1e6f4548a838e850e80c0edd5 100644
(file)
--- 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
* 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>
*/
#include <cassert>
@@
-27,11
+26,13
@@
#include "binding.hpp"
using std::shared_ptr;
#include "binding.hpp"
using std::shared_ptr;
+using std::string;
+using std::vector;
namespace pv {
namespace binding {
namespace pv {
namespace binding {
-const
std::vector< std::
shared_ptr<prop::Property> >& Binding::properties()
+const
vector<
shared_ptr<prop::Property> >& Binding::properties()
{
return properties_;
}
{
return properties_;
}
@@
-79,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(
s = QString::fromStdString("(null)");
else if (gvar.is_of_type(Glib::VariantType("s")))
s = QString::fromStdString(
- Glib::VariantBase::cast_dynamic<Glib::Variant<st
d::st
ring>>(
+ Glib::VariantBase::cast_dynamic<Glib::Variant<string>>(
gvar).get());
else
s = QString::fromStdString(gvar.print());
gvar).get());
else
s = QString::fromStdString(gvar.print());