summaryrefslogtreecommitdiff
path: root/libs/canvas/test
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-10-05 16:17:49 +0200
committerRobin Gareus <robin@gareus.org>2015-10-05 16:17:49 +0200
commit22b07e0233a29d9633ffa825a79503befaf2e16e (patch)
tree1d8b06056f8e12197158f5d906319767d3dedda5 /libs/canvas/test
parente11ba7b79d68bc1070b170236c22123966d7bcc3 (diff)
NOOP, remove trailing tabs/whitespace.
Diffstat (limited to 'libs/canvas/test')
-rw-r--r--libs/canvas/test/arrow.cc2
-rw-r--r--libs/canvas/test/group.cc10
-rw-r--r--libs/canvas/test/gtk_drag.cc6
-rw-r--r--libs/canvas/test/gtk_many.cc6
-rw-r--r--libs/canvas/test/gtk_movement.cc6
-rw-r--r--libs/canvas/test/gtk_scene.cc4
-rw-r--r--libs/canvas/test/gtk_viewport.cc8
-rw-r--r--libs/canvas/test/optimizing_lookup_table.cc8
-rw-r--r--libs/canvas/test/render.cc2
-rw-r--r--libs/canvas/test/types.cc2
-rw-r--r--libs/canvas/test/types.h2
-rw-r--r--libs/canvas/test/wave_view.cc20
-rw-r--r--libs/canvas/test/xml.cc2
-rw-r--r--libs/canvas/test/xml.h2
14 files changed, 40 insertions, 40 deletions
diff --git a/libs/canvas/test/arrow.cc b/libs/canvas/test/arrow.cc
index 9112b6f52a..ab973bcd2a 100644
--- a/libs/canvas/test/arrow.cc
+++ b/libs/canvas/test/arrow.cc
@@ -28,7 +28,7 @@ ArrowTest::bounding_box ()
arrow.set_outline_width (0);
boost::optional<Rect> bbox = arrow.bounding_box ();
-
+
CPPUNIT_ASSERT (bbox.is_initialized ());
CPPUNIT_ASSERT (bbox.get().x0 == -6);
CPPUNIT_ASSERT (bbox.get().y0 == 0);
diff --git a/libs/canvas/test/group.cc b/libs/canvas/test/group.cc
index 914b940c5e..31b7d13e49 100644
--- a/libs/canvas/test/group.cc
+++ b/libs/canvas/test/group.cc
@@ -87,7 +87,7 @@ GroupTest::layers ()
CPPUNIT_ASSERT (*i++ == &d);
/* Check raise by a number of levels */
-
+
a.raise (2);
i = canvas.root()->items().begin();
@@ -173,7 +173,7 @@ GroupTest::grandchildren_changing ()
/* Change the grandchild and check its parent and grandparent */
a.set (Rect (0, 0, 48, 48));
- bbox = canvas.root()->bounding_box ();
+ bbox = canvas.root()->bounding_box ();
CPPUNIT_ASSERT (bbox.is_initialized ());
CPPUNIT_ASSERT (bbox.get().x0 == 0);
CPPUNIT_ASSERT (bbox.get().y0 == 0);
@@ -193,7 +193,7 @@ void
GroupTest::add_items_at_point ()
{
ImageCanvas canvas;
-
+
Group gA (canvas.root());
gA.set_position (Duple (128, 64));
@@ -274,7 +274,7 @@ GroupTest::torture_add_items_at_point ()
if (canvas.root()->bounding_box() && canvas.root()->bounding_box().get().contains (test)) {
items_B.push_back (canvas.root());
}
-
+
for (list<Item*>::iterator j = rectangles.begin(); j != rectangles.end(); ++j) {
boost::optional<Rect> bbox = (*j)->bounding_box ();
assert (bbox);
@@ -293,4 +293,4 @@ GroupTest::torture_add_items_at_point ()
}
}
}
-
+
diff --git a/libs/canvas/test/gtk_drag.cc b/libs/canvas/test/gtk_drag.cc
index 8628c4cfd4..6e20352199 100644
--- a/libs/canvas/test/gtk_drag.cc
+++ b/libs/canvas/test/gtk_drag.cc
@@ -14,7 +14,7 @@ event (GdkEvent* ev)
{
static bool dragging = false;
static Duple offset;
-
+
if (ev->type == GDK_BUTTON_PRESS) {
GdkEventButton* b = reinterpret_cast<GdkEventButton*> (ev);
if (b->button == 1) {
@@ -38,7 +38,7 @@ event (GdkEvent* ev)
cout << "Move to " << (Duple (m->x, m->y) - offset) << "\n";
}
}
-
+
return true;
}
@@ -62,7 +62,7 @@ int main (int argc, char* argv[])
window.add (viewport);
canvas->show ();
window.show_all ();
-
+
Gtk::Main::run (window);
return 0;
}
diff --git a/libs/canvas/test/gtk_many.cc b/libs/canvas/test/gtk_many.cc
index e75ce05ac0..dda35e4714 100644
--- a/libs/canvas/test/gtk_many.cc
+++ b/libs/canvas/test/gtk_many.cc
@@ -20,20 +20,20 @@ int main (int argc, char* argv[])
double Ns = sqrt (N);
int max_x = 1024;
int max_y = 1024;
-
+
for (int x = 0; x < Ns; ++x) {
for (int y = 0; y < Ns; ++y) {
Rectangle* r = new Rectangle (canvas.root ());
r->set (Rect (x * max_x / Ns, y * max_y / Ns, (x + 1) * max_x / Ns, (y + 1) * max_y / Ns));
}
}
-
+
Gtk::ScrolledWindow scroller;
scroller.add (canvas);
window.add (scroller);
canvas.show ();
window.show_all ();
-
+
Gtk::Main::run (window);
return 0;
}
diff --git a/libs/canvas/test/gtk_movement.cc b/libs/canvas/test/gtk_movement.cc
index 24a517da71..aef29eb04b 100644
--- a/libs/canvas/test/gtk_movement.cc
+++ b/libs/canvas/test/gtk_movement.cc
@@ -69,7 +69,7 @@ int main (int argc, char* argv[])
overall_box.pack_start (scroller);
Gtk::HBox button_box;
-
+
Gtk::Button bigger ("Bigger");
bigger.signal_clicked().connect (sigc::ptr_fun (&bigger_clicked));
button_box.pack_start (bigger);
@@ -85,9 +85,9 @@ int main (int argc, char* argv[])
Gtk::Button right ("Right");
right.signal_clicked().connect (sigc::ptr_fun (&right_clicked));
button_box.pack_start (right);
-
+
overall_box.pack_start (button_box, false, false);
-
+
window.add (overall_box);
canvas.show ();
window.show_all ();
diff --git a/libs/canvas/test/gtk_scene.cc b/libs/canvas/test/gtk_scene.cc
index 95e9b9c299..8e30361d94 100644
--- a/libs/canvas/test/gtk_scene.cc
+++ b/libs/canvas/test/gtk_scene.cc
@@ -26,7 +26,7 @@ int main (int argc, char* argv[])
Gtk::VBox overall_vbox;
Gtk::HScrollbar h_scroll;
Gtk::VScrollbar v_scroll;
-
+
GtkCanvasViewport viewport (*h_scroll.get_adjustment(), *v_scroll.get_adjustment());
GtkCanvas* canvas = viewport.canvas ();
@@ -60,7 +60,7 @@ int main (int argc, char* argv[])
window.add (overall_vbox);
canvas->show ();
window.show_all ();
-
+
Gtk::Main::run (window);
return 0;
}
diff --git a/libs/canvas/test/gtk_viewport.cc b/libs/canvas/test/gtk_viewport.cc
index 90bf819d86..a9c326bc7a 100644
--- a/libs/canvas/test/gtk_viewport.cc
+++ b/libs/canvas/test/gtk_viewport.cc
@@ -37,7 +37,7 @@ int main (int argc, char* argv[])
b.set_outline_color (0x00ff00ff);
Gtk::HBox button_box;
-
+
Gtk::Button left ("Left");
left.signal_clicked().connect (sigc::ptr_fun (&left_clicked));
button_box.pack_start (left);
@@ -48,18 +48,18 @@ int main (int argc, char* argv[])
hadj = new Gtk::Adjustment (0, 0, 1e3);
vadj = new Gtk::Adjustment (0, 0, 1e3);
-
+
Gtk::Viewport viewport (*hadj, *vadj);
viewport.add (canvas);
Gtk::VBox overall_box;
overall_box.pack_start (viewport);
overall_box.pack_start (button_box, false, false);
-
+
window.add (overall_box);
canvas.show ();
window.show_all ();
-
+
Gtk::Main::run (window);
return 0;
}
diff --git a/libs/canvas/test/optimizing_lookup_table.cc b/libs/canvas/test/optimizing_lookup_table.cc
index 8449b26498..6022ff3797 100644
--- a/libs/canvas/test/optimizing_lookup_table.cc
+++ b/libs/canvas/test/optimizing_lookup_table.cc
@@ -23,7 +23,7 @@ OptimizingLookupTableTest::build_1 ()
Rectangle d (canvas.root(), Rect (33, 33, 64, 64));
d.set_outline_width (0);
OptimizingLookupTable table (*canvas.root(), 1);
-
+
CPPUNIT_ASSERT (table._items_per_cell == 1);
CPPUNIT_ASSERT (table._cell_size.x == 32);
CPPUNIT_ASSERT (table._cell_size.y == 32);
@@ -65,10 +65,10 @@ OptimizingLookupTableTest::get_small ()
Rectangle d (canvas.root(), Rect (33, 33, 64, 64));
d.set_outline_width (0);
OptimizingLookupTable table (*canvas.root(), 1);
-
+
vector<Item*> items = table.get (Rect (16, 16, 48, 48));
CPPUNIT_ASSERT (items.size() == 4);
-
+
items = table.get (Rect (32, 32, 33, 33));
CPPUNIT_ASSERT (items.size() == 1);
}
@@ -80,7 +80,7 @@ OptimizingLookupTableTest::get_big ()
double const s = 8;
int const N = 1024;
-
+
for (int x = 0; x < N; ++x) {
for (int y = 0; y < N; ++y) {
Rectangle* r = new Rectangle (canvas.root());
diff --git a/libs/canvas/test/render.cc b/libs/canvas/test/render.cc
index 96bd7eb166..043ed83d41 100644
--- a/libs/canvas/test/render.cc
+++ b/libs/canvas/test/render.cc
@@ -78,7 +78,7 @@ RenderTest::basics ()
text_group.set_position (Duple (128, 64));
Text text (&text_group);
text.set ("Hello world!");
-
+
canvas.render_to_image (Rect (0, 0, 256, 256));
canvas.write_to_png ("render_basics.png");
diff --git a/libs/canvas/test/types.cc b/libs/canvas/test/types.cc
index 69667466de..ba6baef149 100644
--- a/libs/canvas/test/types.cc
+++ b/libs/canvas/test/types.cc
@@ -44,7 +44,7 @@ TypesTest::extend ()
CPPUNIT_ASSERT (c.y1 == 130);
}
}
-
+
void
TypesTest::test_safe_add ()
{
diff --git a/libs/canvas/test/types.h b/libs/canvas/test/types.h
index 3a5c0dac9b..833b234579 100644
--- a/libs/canvas/test/types.h
+++ b/libs/canvas/test/types.h
@@ -15,4 +15,4 @@ public:
void test_safe_add ();
};
-
+
diff --git a/libs/canvas/test/wave_view.cc b/libs/canvas/test/wave_view.cc
index 9b95930cf1..de7118b90c 100644
--- a/libs/canvas/test/wave_view.cc
+++ b/libs/canvas/test/wave_view.cc
@@ -43,7 +43,7 @@ WaveViewTest::setUp ()
AudioEngine engine ("test", "");
MIDI::Manager::create (engine.jack ());
CPPUNIT_ASSERT (engine.start () == 0);
-
+
Session session (engine, "tmp_session", "tmp_session");
engine.set_session (&session);
@@ -70,7 +70,7 @@ void
WaveViewTest::make_canvas ()
{
/* this leaks various things, but hey ho */
-
+
_canvas = new ImageCanvas (Duple (256, 256));
_wave_view = new WaveView (_canvas->root(), _audio_region);
_wave_view->set_frames_per_pixel ((double) (44100 / 1000) / 64);
@@ -84,7 +84,7 @@ WaveViewTest::all ()
gets called once; there are various singletons etc. in Ardour which don't
like being recreated.
*/
-
+
render_all_at_once ();
render_in_pieces ();
cache ();
@@ -94,7 +94,7 @@ void
WaveViewTest::render_all_at_once ()
{
make_canvas ();
-
+
_canvas->render_to_image (Rect (0, 0, 256, 256));
_canvas->write_to_png ("waveview_1.png");
@@ -119,11 +119,11 @@ void
WaveViewTest::cache ()
{
make_canvas ();
-
+
/* Whole of the render area needs caching from scratch */
-
+
_wave_view->invalidate_whole_cache ();
-
+
Rect whole (0, 0, 256, 256);
_canvas->render_to_image (whole);
@@ -132,7 +132,7 @@ WaveViewTest::cache ()
CPPUNIT_ASSERT (_wave_view->_cache.front()->end() == 256);
_wave_view->invalidate_whole_cache ();
-
+
/* Render a bit in the middle */
Rect part1 (128, 0, 196, 256);
@@ -145,11 +145,11 @@ WaveViewTest::cache ()
/* Now render the whole thing and check that the cache sorts itself out */
_canvas->render_to_image (whole);
-
+
CPPUNIT_ASSERT (_wave_view->_cache.size() == 3);
list<WaveView::CacheEntry*>::iterator i = _wave_view->_cache.begin ();
-
+
CPPUNIT_ASSERT ((*i)->start() == 0);
CPPUNIT_ASSERT ((*i)->end() == 128);
++i;
diff --git a/libs/canvas/test/xml.cc b/libs/canvas/test/xml.cc
index ef6871dc76..5bc5dec2b7 100644
--- a/libs/canvas/test/xml.cc
+++ b/libs/canvas/test/xml.cc
@@ -29,7 +29,7 @@ XMLTest::get ()
g.set_position (Duple (64, 72));
Line l (&g);
l.set (Duple (41, 43), Duple (44, 46));
-
+
XMLTree* tree = canvas.get_state ();
tree->write ("test.xml");
diff --git a/libs/canvas/test/xml.h b/libs/canvas/test/xml.h
index fbe606c028..bf905b94bd 100644
--- a/libs/canvas/test/xml.h
+++ b/libs/canvas/test/xml.h
@@ -12,6 +12,6 @@ public:
void get ();
void set ();
-private:
+private:
void check (std::string const &);
};