summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-04-07 21:25:48 +0200
committerMurray Cumming <murrayc@murrayc.com>2017-04-07 21:28:08 +0200
commit17ce66a0155dc7a310ff32c8d9b0904902961bc9 (patch)
tree6ad20e348c0a4d08a4023b99585dc99f31edb51b
parent650453a800e6c3ad0c934ce2675298a7d90cc6b8 (diff)
downloadglibmm-17ce66a0155dc7a310ff32c8d9b0904902961bc9.tar.gz
tests: glibmm_value: Move code to main.cc
Which was previously almost empty.
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/glibmm_value/glibmm_value.cc32
-rw-r--r--tests/glibmm_value/main.cc33
3 files changed, 32 insertions, 35 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1955a427..47c1b114 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -106,7 +106,7 @@ glibmm_object_move_test_SOURCES = glibmm_object_move/main.cc
glibmm_objectbase_move_test_SOURCES = glibmm_objectbase_move/main.cc
glibmm_ustring_compose_test_SOURCES = glibmm_ustring_compose/main.cc
glibmm_ustring_format_test_SOURCES = glibmm_ustring_format/main.cc
-glibmm_value_test_SOURCES = glibmm_value/glibmm_value.cc glibmm_value/main.cc
+glibmm_value_test_SOURCES = glibmm_value/main.cc
glibmm_variant_test_SOURCES = glibmm_variant/main.cc
glibmm_vector_test_SOURCES = glibmm_vector/main.cc
glibmm_vector_test_LDADD = $(giomm_ldadd)
diff --git a/tests/glibmm_value/glibmm_value.cc b/tests/glibmm_value/glibmm_value.cc
deleted file mode 100644
index 1f598a3e..00000000
--- a/tests/glibmm_value/glibmm_value.cc
+++ /dev/null
@@ -1,32 +0,0 @@
-
-#include <glibmm.h>
-
-struct Foo
-{
- int bar;
-};
-
-namespace Gtk
-{
-class Widget;
-}
-
-void
-some_method()
-{
- // custom copyable
- Glib::Value<Foo> value_foo;
-
- // custom pointer
- Glib::Value<Foo*> value_foo_pointer;
- Glib::Value<const Foo*> value_foo_const_pointer;
-
- // Glib::Object pointer
- Glib::Value<Gtk::Widget*> value_widget_pointer;
- Glib::Value<const Gtk::Widget*> value_widget_const_pointer;
-}
-
-// Glib::Object RefPtr<>
-
-// template Glib::Value< Glib::RefPtr<Gdk::Pixbuf> >;
-// template Glib::Value< Glib::RefPtr<const Gdk::Pixbuf> >;
diff --git a/tests/glibmm_value/main.cc b/tests/glibmm_value/main.cc
index 7682ffd0..515a79e2 100644
--- a/tests/glibmm_value/main.cc
+++ b/tests/glibmm_value/main.cc
@@ -1,8 +1,37 @@
#include <glibmm.h>
-int
-main(int, char**)
+struct Foo
{
+ int bar;
+};
+
+namespace Gtk
+{
+class Widget;
+}
+
+void
+some_method()
+{
+ // custom copyable
+ Glib::Value<Foo> value_foo;
+
+ // custom pointer
+ Glib::Value<Foo*> value_foo_pointer;
+ Glib::Value<const Foo*> value_foo_const_pointer;
+
+ // Glib::Object pointer
+ Glib::Value<Gtk::Widget*> value_widget_pointer;
+ Glib::Value<const Gtk::Widget*> value_widget_const_pointer;
+}
+
+// Glib::Object RefPtr<>
+
+// template Glib::Value< Glib::RefPtr<Gdk::Pixbuf> >;
+// template Glib::Value< Glib::RefPtr<const Gdk::Pixbuf> >;
+//
+
+int main() {
return EXIT_SUCCESS;
}