summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorcorvid <devnull@localhost>2014-08-10 00:00:47 +0000
committercorvid <devnull@localhost>2014-08-10 00:00:47 +0000
commitc43632b2a5b26a96b84e7d7cd8c5f8ecffe4aa32 (patch)
treeb5f1fce42eebbb7f574970f397719aaac8b5f027 /test
parent80e8bbb92e7425f4fec454348e0823039a07fac0 (diff)
trim spaces
...now that floats and grows are in the repo and I won't be making Sebastian's life difficult with a bunch of whitespace changes.
Diffstat (limited to 'test')
-rw-r--r--test/dw_float_test.cc14
-rw-r--r--test/dw_simple_container.cc4
-rw-r--r--test/dw_simple_container.hh2
-rw-r--r--test/dw_simple_container_test.cc4
4 files changed, 12 insertions, 12 deletions
diff --git a/test/dw_float_test.cc b/test/dw_float_test.cc
index 57d53340..807002b2 100644
--- a/test/dw_float_test.cc
+++ b/test/dw_float_test.cc
@@ -26,7 +26,7 @@ static void addTextToFloatTimeout (void *data)
firstFloat->addText(fWords[k], wordStyle);
firstFloat->addSpace(wordStyle);
}
-
+
firstFloat->flush();
Fl::repeat_timeout (2, addTextToFloatTimeout, NULL);
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
styleAttrs.width = createAbsLength(100);
styleAttrs.vloat = FLOAT_LEFT;
Style *leftFloatStyle = Style::create (&styleAttrs);
-
+
styleAttrs.width = createAbsLength(80);
styleAttrs.vloat = FLOAT_RIGHT;
Style *rightFloatStyle = Style::create (&styleAttrs);
@@ -98,14 +98,14 @@ int main(int argc, char **argv)
for(int j = 0; words[j]; j++) {
textblock->addText(words[j], wordStyle);
textblock->addSpace(wordStyle);
-
+
if ((i == 3 || i == 5) && j == 8) {
textblock->addText("[float]", wordStyle);
textblock->addSpace(wordStyle);
-
+
Textblock *vloat = new Textblock (false);
textblock->addWidget(vloat, i == 3 ? leftFloatStyle : rightFloatStyle);
-
+
const char *fWords[] = { "This", "is", "a", "float,", "which", "is",
"set", "aside", "from", "the", "main",
"text.", NULL };
@@ -117,9 +117,9 @@ int main(int argc, char **argv)
vloat->addText(fWords[k], wordStyle);
vloat->addSpace(wordStyle);
}
-
+
vloat->flush ();
-
+
if(i == 3)
firstFloat = vloat;
}
diff --git a/test/dw_simple_container.cc b/test/dw_simple_container.cc
index c4a1aa2a..e19511a6 100644
--- a/test/dw_simple_container.cc
+++ b/test/dw_simple_container.cc
@@ -65,7 +65,7 @@ int SimpleContainer::SimpleContainerIterator::index ()
int SimpleContainer::SimpleContainerIterator::compareTo
(lout::object::Comparable *other)
{
- return index () - ((SimpleContainerIterator*)other)->index ();
+ return index () - ((SimpleContainerIterator*)other)->index ();
}
bool SimpleContainer::SimpleContainerIterator::next ()
@@ -167,7 +167,7 @@ void SimpleContainer::sizeRequestImpl (Requisition *requisition)
child->sizeRequest (&childReq);
else
childReq.width = childReq.ascent = childReq.descent = 0;
-
+
requisition->width = childReq.width + boxDiffWidth ();
requisition->ascent = childReq.ascent + boxOffsetY ();
requisition->descent = childReq.descent + boxRestHeight ();
diff --git a/test/dw_simple_container.hh b/test/dw_simple_container.hh
index c8a629db..bb1a37af 100644
--- a/test/dw_simple_container.hh
+++ b/test/dw_simple_container.hh
@@ -30,7 +30,7 @@ private:
void unhighlight (int direction, core::HighlightLayer layer);
void getAllocation (int start, int end, core::Allocation *allocation);
};
-
+
Widget *child;
protected:
diff --git a/test/dw_simple_container_test.cc b/test/dw_simple_container_test.cc
index 20697dd6..83d0a77f 100644
--- a/test/dw_simple_container_test.cc
+++ b/test/dw_simple_container_test.cc
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
const char *words[] = { "This", "is", "only", "a", "short", "paragraph.",
NULL };
-
+
for(int j = 0; words[j]; j++) {
textblock2->addText(words[j], wordStyle);
textblock2->addSpace(wordStyle);
@@ -99,7 +99,7 @@ int main(int argc, char **argv)
textblockStyle1->unref();
textblockStyle2->unref();
containerStyle->unref();
- wordStyle->unref();
+ wordStyle->unref();
textblock1->flush ();
textblock2->flush ();