summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dpi/downloads.cc2
-rw-r--r--dw/findtext.cc2
-rw-r--r--dw/fltkplatform.hh2
-rw-r--r--dw/image.cc4
-rw-r--r--dw/layout.cc4
-rw-r--r--dw/layout.hh2
-rw-r--r--dw/selection.hh2
-rw-r--r--dw/table.cc2
-rw-r--r--lout/misc.hh2
-rw-r--r--src/cache.c2
-rw-r--r--src/capi.c2
-rw-r--r--src/colors.c2
-rw-r--r--src/css.hh2
-rw-r--r--src/decode.c2
-rw-r--r--src/gif.c4
-rw-r--r--src/html.cc10
-rw-r--r--src/klist.c2
-rw-r--r--src/styleengine.cc2
-rw-r--r--src/url.c10
-rw-r--r--src/web.cc2
20 files changed, 31 insertions, 31 deletions
diff --git a/dpi/downloads.cc b/dpi/downloads.cc
index 70acaa8a..771098e5 100644
--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@@ -68,7 +68,7 @@ protected:
void draw();
public:
ProgressBar(int x, int y, int w, int h, const char *lbl = 0);
- void range(double min, double max, double step = 1) {
+ void range(double min, double max, double step = 1) {
mMin = min; mMax = max; mStep = step;
};
void step(double step) { mPresent += step; redraw(); };
diff --git a/dw/findtext.cc b/dw/findtext.cc
index e9384917..94b963ea 100644
--- a/dw/findtext.cc
+++ b/dw/findtext.cc
@@ -221,7 +221,7 @@ bool FindtextState::unhighlight ()
return false;
}
-bool FindtextState::search0 (bool backwards, bool firstTrial)
+bool FindtextState::search0 (bool backwards, bool firstTrial)
{
if (iterator->getChar () == CharIterator::END)
return false;
diff --git a/dw/fltkplatform.hh b/dw/fltkplatform.hh
index 2fb95633..cbf3c6f9 100644
--- a/dw/fltkplatform.hh
+++ b/dw/fltkplatform.hh
@@ -149,7 +149,7 @@ public:
void attachView (core::View *view);
- void detachView (core::View *view);
+ void detachView (core::View *view);
int textWidth (core::style::Font *font, const char *text, int len);
char *textToUpper (const char *text, int len);
diff --git a/dw/image.cc b/dw/image.cc
index 11d2e97f..bd7c1ac9 100644
--- a/dw/image.cc
+++ b/dw/image.cc
@@ -213,10 +213,10 @@ void Image::sizeRequestImpl (core::Requisition *requisition)
// dimensions limited to 2^15?)
bool widthSpecified = getStyle()->width != core::style::LENGTH_AUTO ||
- getStyle()->minWidth != core::style::LENGTH_AUTO ||
+ getStyle()->minWidth != core::style::LENGTH_AUTO ||
getStyle()->maxWidth != core::style::LENGTH_AUTO;
bool heightSpecified = getStyle()->height != core::style::LENGTH_AUTO ||
- getStyle()->minHeight != core::style::LENGTH_AUTO ||
+ getStyle()->minHeight != core::style::LENGTH_AUTO ||
getStyle()->maxHeight != core::style::LENGTH_AUTO;
if (!widthSpecified && heightSpecified)
diff --git a/dw/layout.cc b/dw/layout.cc
index df22bb75..c87606dd 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -939,7 +939,7 @@ void Layout::resizeIdle ()
int currVThickness = currVScrollbarThickness();
if (!canvasHeightGreater &&
- canvasAscent + canvasDescent > viewportHeight - currHThickness) {
+ canvasAscent + canvasDescent > viewportHeight - currHThickness) {
canvasHeightGreater = true;
DBG_OBJ_SET_SYM ("canvasHeightGreater",
canvasHeightGreater ? "true" : "false");
@@ -1042,7 +1042,7 @@ bool Layout::buttonEvent (ButtonEventType type, View *view, int numPressed,
*
* Arguments are similar to dw::core::Layout::buttonPress.
*/
-bool Layout::motionNotify (View *view, int x, int y, ButtonState state)
+bool Layout::motionNotify (View *view, int x, int y, ButtonState state)
{
EventButton event;
diff --git a/dw/layout.hh b/dw/layout.hh
index efead388..16d19979 100644
--- a/dw/layout.hh
+++ b/dw/layout.hh
@@ -350,7 +350,7 @@ public:
button);
}
- bool motionNotify (View *view, int x, int y, ButtonState state);
+ bool motionNotify (View *view, int x, int y, ButtonState state);
void enterNotify (View *view, int x, int y, ButtonState state);
void leaveNotify (View *view, ButtonState state);
diff --git a/dw/selection.hh b/dw/selection.hh
index ef9df0e0..3004d2d4 100644
--- a/dw/selection.hh
+++ b/dw/selection.hh
@@ -178,7 +178,7 @@ namespace core {
class SelectionState
{
public:
- enum { END_OF_WORD = 1 << 30 };
+ enum { END_OF_WORD = 1 << 30 };
private:
Layout *layout;
diff --git a/dw/table.cc b/dw/table.cc
index c14ebf97..2d820035 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -839,7 +839,7 @@ void Table::forceCalcCellSizes (bool calcHeights)
// width for correction.
int corrWidth =
Table::getAdjustTableMinWidth () ? extremes.minWidthIntrinsic : 0;
- int totalWidth = misc::max (availWidth, corrWidth)
+ int totalWidth = misc::max (availWidth, corrWidth)
- ((numCols + 1) * getStyle()->hBorderSpacing + boxDiffWidth ());
DBG_OBJ_MSGF ("resize", 1,
diff --git a/lout/misc.hh b/lout/misc.hh
index 7edf83c1..b362fc2f 100644
--- a/lout/misc.hh
+++ b/lout/misc.hh
@@ -387,7 +387,7 @@ public:
this->startExtra = index;
resizeExtra ();
} else {
- if (index < startExtra) {
+ if (index < startExtra) {
consolidate ();
insert (index, numInsert);
} else if (index < startExtra + numExtra) {
diff --git a/src/cache.c b/src/cache.c
index 17ddbc25..ee424c58 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -498,7 +498,7 @@ const char *a_Cache_set_content_type(const DilloUrl *url, const char *ctype,
_MSG("a_Cache_set_content_type {%s} {%s}\n", ctype, URL_STR(url));
curr = Cache_current_content_type(entry);
- if (entry->TypeMeta || (*from == 'h' && entry->TypeHdr) ) {
+ if (entry->TypeMeta || (*from == 'h' && entry->TypeHdr) ) {
/* Type is already been set. Do nothing.
* BTW, META overrides TypeHdr */
} else {
diff --git a/src/capi.c b/src/capi.c
index bace1e0e..242ae294 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -345,7 +345,7 @@ static char *Capi_dpi_build_cmd(DilloWeb *web, char *server)
/*
* Send the requested URL's source to the "view source" dpi
*/
-static void Capi_dpi_send_source(BrowserWindow *bw, DilloUrl *url)
+static void Capi_dpi_send_source(BrowserWindow *bw, DilloUrl *url)
{
char *p, *buf, *cmd, size_str[32], *server="vsource";
int buf_size;
diff --git a/src/colors.c b/src/colors.c
index fe3598eb..237e63a1 100644
--- a/src/colors.c
+++ b/src/colors.c
@@ -303,7 +303,7 @@ int32_t a_Color_parse (const char *str, int32_t default_color, int *err)
static int Color_distance(long c1, long c2)
{
return (labs((c1 & 0x0000ff) - (c2 & 0x0000ff)) +
- labs(((c1 & 0x00ff00) - (c2 & 0x00ff00)) >> 8) +
+ labs(((c1 & 0x00ff00) - (c2 & 0x00ff00)) >> 8) +
labs(((c1 & 0xff0000) - (c2 & 0xff0000)) >> 16)) / 75;
}
#endif
diff --git a/src/css.hh b/src/css.hh
index 22e7e700..c2a28770 100644
--- a/src/css.hh
+++ b/src/css.hh
@@ -133,7 +133,7 @@ inline float CSS_LENGTH_VALUE (CssLength l) {
case CSS_LENGTH_TYPE_EX:
case CSS_LENGTH_TYPE_PERCENTAGE:
case CSS_LENGTH_TYPE_RELATIVE:
- return ((float)(l & ~7)) / (1 << 15);
+ return ((float)(l & ~7)) / (1 << 15);
case CSS_LENGTH_TYPE_AUTO:
return 0.0;
default:
diff --git a/src/decode.c b/src/decode.c
index 76dd6ef7..6d838d41 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -216,7 +216,7 @@ static Dstr *Decode_deflate(Decode *dc, const char *instr, int inlen)
dStr_free(output, 1);
(void)inflateEnd(zs);
dFree(dc->state);
- dc->state = zs = dNew(z_stream, 1);;
+ dc->state = zs = dNew(z_stream, 1);
zs->zalloc = NULL;
zs->zfree = NULL;
zs->next_in = NULL;
diff --git a/src/gif.c b/src/gif.c
index 34424d33..adc9f49d 100644
--- a/src/gif.c
+++ b/src/gif.c
@@ -800,8 +800,8 @@ static size_t Gif_do_img_desc(DilloGif *gif, void *Buf,
if (bsize < 10)
return 0;
- gif->Width = LM_to_uint(buf[4], buf[5]);
- gif->Height = LM_to_uint(buf[6], buf[7]);
+ gif->Width = LM_to_uint(buf[4], buf[5]);
+ gif->Height = LM_to_uint(buf[6], buf[7]);
/* check max image size */
if (gif->Width <= 0 || gif->Height <= 0 ||
diff --git a/src/html.cc b/src/html.cc
index 56af12a9..c17db53a 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -2106,8 +2106,8 @@ void a_Html_common_image_attrs(DilloHtml *html, const char *tag, int tagsize)
{
char *width_ptr, *height_ptr;
const char *attrbuf;
- CssLength l_w = CSS_CREATE_LENGTH(0.0, CSS_LENGTH_TYPE_AUTO);
- CssLength l_h = CSS_CREATE_LENGTH(0.0, CSS_LENGTH_TYPE_AUTO);
+ CssLength l_w = CSS_CREATE_LENGTH(0.0, CSS_LENGTH_TYPE_AUTO);
+ CssLength l_h = CSS_CREATE_LENGTH(0.0, CSS_LENGTH_TYPE_AUTO);
int w = 0, h = 0;
if (prefs.show_tooltip &&
@@ -2140,7 +2140,7 @@ void a_Html_common_image_attrs(DilloHtml *html, const char *tag, int tagsize)
*/
if (w < 0 || h < 0 ||
w > IMAGE_MAX_AREA || h > IMAGE_MAX_AREA ||
- (h > 0 && w > IMAGE_MAX_AREA / h)) {
+ (h > 0 && w > IMAGE_MAX_AREA / h)) {
dFree(width_ptr);
dFree(height_ptr);
width_ptr = height_ptr = NULL;
@@ -3660,10 +3660,10 @@ static int Html_needs_optional_close(int old_idx, int cur_idx)
} else if (old_idx == i_TR) {
/* TR closes TR */
return (cur_idx == i_TR);
- } else if (old_idx == i_DD) {
+ } else if (old_idx == i_DD) {
/* DD is closed by DD and DT */
return (cur_idx == i_DD || cur_idx == i_DT);
- } else if (old_idx == i_OPTION) {
+ } else if (old_idx == i_OPTION) {
return 1; // OPTION always needs close
}
diff --git a/src/klist.c b/src/klist.c
index 813269a3..e5e695e2 100644
--- a/src/klist.c
+++ b/src/klist.c
@@ -74,7 +74,7 @@ int a_Klist_insert(Klist_t **Klist, void *Data)
a_Klist_get_data((*Klist), (*Klist)->Counter));
Node = dNew(KlistNode_t, 1);
- Node->Key = (*Klist)->Counter;
+ Node->Key = (*Klist)->Counter;
Node->Data = Data;
dList_insert_sorted((*Klist)->List, Node, Klist_node_by_node_cmp);
return (*Klist)->Counter;
diff --git a/src/styleengine.cc b/src/styleengine.cc
index a660b175..4192a9ef 100644
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@@ -155,7 +155,7 @@ void StyleEngine::startElement (const char *tagname, BrowserWindow *bw) {
}
void StyleEngine::setId (const char *id) {
- DoctreeNode *dn = doctree->top ();
+ DoctreeNode *dn = doctree->top ();
assert (dn->id == NULL);
dn->id = dStrdup (id);
}
diff --git a/src/url.c b/src/url.c
index 4eacb7a4..c1a8396d 100644
--- a/src/url.c
+++ b/src/url.c
@@ -379,10 +379,10 @@ DilloUrl* a_Url_new(const char *url_str, const char *base_url)
for (i = 0; url_str[i]; ++i)
if (url_str[i] > 0x1F && url_str[i] < 0x7F && url_str[i] != ' ')
*p++ = url_str[i];
- else {
- *p++ = '%';
- *p++ = HEX[(url_str[i] >> 4) & 15];
- *p++ = HEX[url_str[i] & 15];
+ else {
+ *p++ = '%';
+ *p++ = HEX[(url_str[i] >> 4) & 15];
+ *p++ = HEX[url_str[i] & 15];
}
*p = 0;
urlstr = str1;
@@ -509,7 +509,7 @@ void a_Url_set_ismap_coords(DilloUrl *u, char *coord_str)
if (!u->ismap_url_len) {
/* Save base-url length (without coords) */
- u->ismap_url_len = URL_STR_(u) ? u->url_string->len : 0;
+ u->ismap_url_len = URL_STR_(u) ? u->url_string->len : 0;
a_Url_set_flags(u, URL_FLAGS(u) | URL_Ismap);
}
if (u->url_string) {
diff --git a/src/web.cc b/src/web.cc
index b835610c..a175ddb9 100644
--- a/src/web.cc
+++ b/src/web.cc
@@ -128,7 +128,7 @@ DilloWeb* a_Web_new(BrowserWindow *bw, const DilloUrl *url,
web->flags = 0;
web->Image = NULL;
web->filename = NULL;
- web->stream = NULL;
+ web->stream = NULL;
web->SavedBytes = 0;
web->bgColor = 0x000000; /* Dummy value will be overwritten
* in a_Web_dispatch_by_type. */