summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dpi/downloads.cc2
-rw-r--r--dw/findtext.cc2
-rw-r--r--dw/image.cc4
-rw-r--r--dw/layout.cc4
-rw-r--r--dw/table.cc2
-rw-r--r--dw/widget.cc2
-rw-r--r--src/html.cc10
-rw-r--r--src/styleengine.cc2
-rw-r--r--src/web.cc2
9 files changed, 15 insertions, 15 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/image.cc b/dw/image.cc
index 20460f33..d6c2ea9d 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 2845a8e9..c2a53d08 100644
--- a/dw/layout.cc
+++ b/dw/layout.cc
@@ -926,7 +926,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");
@@ -1029,7 +1029,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/table.cc b/dw/table.cc
index 661b8a11..30ee99c7 100644
--- a/dw/table.cc
+++ b/dw/table.cc
@@ -737,7 +737,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/dw/widget.cc b/dw/widget.cc
index 18748c4f..ed2c2b8e 100644
--- a/dw/widget.cc
+++ b/dw/widget.cc
@@ -1414,7 +1414,7 @@ void Widget::getPaddingArea (int *xPad, int *yPad, int *widthPad,
*yPad = allocation.y + style->margin.top + style->borderWidth.top;
*widthPad = allocation.width - style->margin.left - style->borderWidth.left
- style->margin.right - style->borderWidth.right;
- *heightPad = getHeight () - style->margin.top - style->borderWidth.top
+ *heightPad = getHeight () - style->margin.top - style->borderWidth.top
- style->margin.bottom - style->borderWidth.bottom;
}
diff --git a/src/html.cc b/src/html.cc
index 8fea74e9..0c1ac37b 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/styleengine.cc b/src/styleengine.cc
index 918e7460..98b02b69 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/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. */