summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dpip/dpip.c2
-rw-r--r--dw/fltkui.cc4
-rw-r--r--dw/hyphenator.cc4
-rw-r--r--lout/unicode.cc4
-rw-r--r--src/colors.c2
-rw-r--r--src/css.cc2
-rw-r--r--src/dialog.cc6
-rw-r--r--src/dillo.cc2
-rw-r--r--src/tipwin.cc2
-rw-r--r--src/uicmd.cc4
-rw-r--r--test/containers.cc12
-rw-r--r--test/unicode_test.cc2
12 files changed, 23 insertions, 23 deletions
diff --git a/dpip/dpip.c b/dpip/dpip.c
index e1908317..f4ce1bf0 100644
--- a/dpip/dpip.c
+++ b/dpip/dpip.c
@@ -452,7 +452,7 @@ char *a_Dpip_dsh_read_token(Dsh *dsh, int blocking)
} else if (dsh->mode & DPIP_RAW) {
/* Wait for data when the buffer is empty and there's no ERR/EOF */
- while (dsh->rdbuf->len == 0 &&
+ while (dsh->rdbuf->len == 0 &&
dsh->status != DPIP_ERROR && dsh->status != DPIP_EOF)
Dpip_dsh_read(dsh, 1);
}
diff --git a/dw/fltkui.cc b/dw/fltkui.cc
index d4eb09f2..7bfe64f6 100644
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@@ -1384,7 +1384,7 @@ void FltkListResource::pushGroup (const char *name, bool enabled)
// TODO: Proper disabling of item groups
newItem(name, en, selected);
-
+
if (currDepth < 3)
currDepth++;
}
@@ -1414,7 +1414,7 @@ void FltkListResource::sizeRequest (core::Requisition *requisition)
} else {
b->has_scrollbar(0);
}
-
+
requisition->descent = style->font->descent + 2;
requisition->ascent = rows * b->avg_height() - style->font->descent + 2;
} else {
diff --git a/dw/hyphenator.cc b/dw/hyphenator.cc
index 9e5e2b29..5cb16fff 100644
--- a/dw/hyphenator.cc
+++ b/dw/hyphenator.cc
@@ -1,7 +1,7 @@
/*
* Dillo Widget
*
- * Copyright 2012-2013 Sebastian Geerken <sgeerken@dillo.org>,
+ * Copyright 2012-2013 Sebastian Geerken <sgeerken@dillo.org>,
* Johannes Hofmann <Johannes.Hofmann@gmx.de>
*
* This program is free software; you can redistribute it and/or modify
@@ -253,7 +253,7 @@ int *Hyphenator::hyphenateWord(core::Platform *platform,
while (true) {
while (wordLc[start] && !isCharPartOfActualWord (wordLc + start))
start = platform->nextGlyph (wordLc, start);
-
+
if (wordLc[start] == 0)
break;
diff --git a/lout/unicode.cc b/lout/unicode.cc
index 77bd8077..4f0f0b3b 100644
--- a/lout/unicode.cc
+++ b/lout/unicode.cc
@@ -92,7 +92,7 @@ const char *nextUtf8Char (const char *s)
const char *r;
if (s == NULL || s[0] == 0)
- r = NULL;
+ r = NULL;
else if((s[0] & 0x80) == 0)
r = s + 1;
else if((s[0] & 0xe0) == 0xc0 && (s[1] & 0xc0) == 0x80)
@@ -118,7 +118,7 @@ const char *nextUtf8Char (const char *s, int len)
const char *r;
if (s == NULL || len <= 0)
- r = NULL;
+ r = NULL;
else if(len >= 1 && (s[0] & 0x80) == 0)
r = s + 1;
else if(len >= 2 && (s[0] & 0xe0) == 0xc0 && (s[1] & 0xc0) == 0x80)
diff --git a/src/colors.c b/src/colors.c
index 18bf6e09..fe3598eb 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -242,7 +242,7 @@ static int32_t Color_parse_hex (const char *s, int32_t default_color, int *err)
* Parsed color if successful,
* default_color on error.
*
- * "err" argument:
+ * "err" argument:
* 0 if a color beginning with '#' is successfully parsed
* or the color is a recognized word.
* 1 if the color is bare hex or can't be parsed at all.
diff --git a/src/css.cc b/src/css.cc
index fd97e01e..d4dc72ad 100644
--- a/src/css.cc
+++ b/src/css.cc
@@ -88,7 +88,7 @@ void CssPropertyList::apply (CssPropertyList *props) {
for (int i = 0; i < size (); i++) {
CssPropertyValue value = getRef (i)->value;
- if (props->ownerOfStrings &&
+ if (props->ownerOfStrings &&
(getRef (i)->type == CSS_TYPE_STRING ||
getRef (i)->type == CSS_TYPE_SYMBOL))
value.strVal = strdup(value.strVal);
diff --git a/src/dialog.cc b/src/dialog.cc
index 92b99041..2c2781b1 100644
--- a/src/dialog.cc
+++ b/src/dialog.cc
@@ -362,7 +362,7 @@ int a_Dialog_choice(const char *title, const char *msg, ...)
Fl_Group *ib = new Fl_Group(0, 0, window->w(), window->h());
ib->begin();
window->resizable(ib);
-
+
/* '?' Icon */
Fl_Box *o = new Fl_Box(10, (wh - bh - ih) / 2, ih, ih);
o->box(FL_THIN_UP_BOX);
@@ -372,14 +372,14 @@ int a_Dialog_choice(const char *title, const char *msg, ...)
o->labelcolor(FL_BLUE);
o->label("?");
o->show();
-
+
if (msg != NULL){
Fl_Box *box = new Fl_Box(60, 0, ww - 60, wh - bh, msg);
box->labelfont(FL_HELVETICA);
box->labelsize(14);
box->align(FL_ALIGN_WRAP);
}
-
+
int xpos = gap;
va_start(ap, msg);
for (i = 1; i <= n; i++) {
diff --git a/src/dillo.cc b/src/dillo.cc
index cef3e451..bf25d315 100644
--- a/src/dillo.cc
+++ b/src/dillo.cc
@@ -277,7 +277,7 @@ static void setColors()
setUIColorWdef(PREFS_UI_TAB_ACTIVE_FG_COLOR, prefs.ui_tab_active_fg_color,
Fl::get_color(FL_FOREGROUND_COLOR));
setUIColorWdef(PREFS_UI_TAB_FG_COLOR, prefs.ui_tab_fg_color,
- Fl::get_color(FL_FOREGROUND_COLOR));
+ Fl::get_color(FL_FOREGROUND_COLOR));
}
/*
diff --git a/src/tipwin.cc b/src/tipwin.cc
index 100eb1c0..c8463eb5 100644
--- a/src/tipwin.cc
+++ b/src/tipwin.cc
@@ -174,7 +174,7 @@ CustButton::CustButton(int x, int y, int w, int h, const char *l) :
TipWinButton(x,y,w,h,l)
{
norm_color = color();
- light_color = PREFS_UI_BUTTON_HIGHLIGHT_COLOR;
+ light_color = PREFS_UI_BUTTON_HIGHLIGHT_COLOR;
}
int CustButton::handle(int e)
diff --git a/src/uicmd.cc b/src/uicmd.cc
index f08c7e70..e286ee9c 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -124,7 +124,7 @@ class CustTabs : public Fl_Group {
for (int i = 0; i < num_tabs(); ++i)
btns[i] = (CustTabButton*)Pack->child(i);
qsort(btns, num_tabs(), sizeof(CustTabButton *), btn_cmp);
- focus_counter = 0;
+ focus_counter = 0;
for (int i = 0; i < num_tabs(); ++i)
btns[i]->focus_num(focus_counter++);
dFree(btns);
@@ -497,7 +497,7 @@ static void win_cb (Fl_Widget *w, void *cb_data) {
// (most likely with modifiers).
return;
}
-
+
if (prefs.show_quit_dialog && ntabs > 1)
choice = a_Dialog_choice("Dillo: Close window?",
"Window contains more than one tab.",
diff --git a/test/containers.cc b/test/containers.cc
index 40b2d8c8..993a299d 100644
--- a/test/containers.cc
+++ b/test/containers.cc
@@ -13,7 +13,7 @@ void testHashSet ()
h.put (new String ("one"));
h.put (new String ("two"));
h.put (new String ("three"));
-
+
puts (h.toString());
}
@@ -26,7 +26,7 @@ void testHashTable ()
h.put (new String ("one"), new Integer (1));
h.put (new String ("two"), new Integer (2));
h.put (new String ("three"), new Integer (3));
-
+
puts (h.toString());
h.put (new String ("one"), new Integer (4));
@@ -65,7 +65,7 @@ void testVector2 ()
v.insertSorted (new String ("three"));
puts (v.toString());
-
+
v.insertSorted (new String ("five"));
puts (v.toString());
@@ -78,14 +78,14 @@ void testVector2 ()
for (int b = 0; b < 2; b++) {
bool mustExist = b;
printf ("mustExist = %s\n", mustExist ? "true" : "false");
-
+
String k ("alpha");
printf (" '%s' -> %d\n", k.chars(), v.bsearch (&k, mustExist));
-
+
for (Iterator<String> it = v.iterator(); it.hasNext(); ) {
String *k1 = it.getNext();
printf (" '%s' -> %d\n", k1->chars(), v.bsearch (k1, mustExist));
-
+
char buf[64];
strcpy (buf, k1->chars());
strcat (buf, "-var");
diff --git a/test/unicode_test.cc b/test/unicode_test.cc
index 31ede6ba..7c079305 100644
--- a/test/unicode_test.cc
+++ b/test/unicode_test.cc
@@ -34,6 +34,6 @@ int main (int argc, char *argv[])
s - t2 < t2len && (s = fl_utf8fwd (s + 1, t2, t2 + t2len)))
printf ("%3d -> U+%04x\n", (int)(s - t2),
decodeUtf8(s, t2len - (s - t2)));
-
+
return 0;
}