diff options
| -rw-r--r-- | dw/fltkimgbuf.cc | 4 | ||||
| -rw-r--r-- | dw/fltkplatform.cc | 2 | ||||
| -rw-r--r-- | dw/imgbuf.hh | 4 | ||||
| -rw-r--r-- | dw/layout.hh | 2 | ||||
| -rw-r--r-- | dw/platform.hh | 2 | ||||
| -rw-r--r-- | dw/selection.cc | 4 | ||||
| -rw-r--r-- | dw/style.cc | 4 | ||||
| -rw-r--r-- | lout/misc.hh | 2 | ||||
| -rw-r--r-- | src/cssparser.cc | 4 | ||||
| -rw-r--r-- | src/dillo.cc | 2 | ||||
| -rw-r--r-- | src/html.cc | 4 | ||||
| -rw-r--r-- | src/ui.hh | 2 |
12 files changed, 18 insertions, 18 deletions
diff --git a/dw/fltkimgbuf.cc b/dw/fltkimgbuf.cc index 97cbc1b4..4ede6c5b 100644 --- a/dw/fltkimgbuf.cc +++ b/dw/fltkimgbuf.cc @@ -228,12 +228,12 @@ void FltkImgbuf::getRowArea (int row, dw::core::Rectangle *area) } } -int FltkImgbuf::getRootWidth () +int FltkImgbuf::getRootWidth () { return root ? root->width : width; } -int FltkImgbuf::getRootHeight () +int FltkImgbuf::getRootHeight () { return root ? root->height : height; } diff --git a/dw/fltkplatform.cc b/dw/fltkplatform.cc index fecd76a7..d8e95a6e 100644 --- a/dw/fltkplatform.cc +++ b/dw/fltkplatform.cc @@ -493,7 +493,7 @@ void FltkPlatform::attachView (core::View *view) } -void FltkPlatform::detachView (core::View *view) +void FltkPlatform::detachView (core::View *view) { if (this->view != view) MSG_ERR("FltkPlatform::detachView: this->view: %p view: %p\n", diff --git a/dw/imgbuf.hh b/dw/imgbuf.hh index 150bf165..d6f41d21 100644 --- a/dw/imgbuf.hh +++ b/dw/imgbuf.hh @@ -175,8 +175,8 @@ public: virtual Imgbuf* getScaledBuf (int width, int height) = 0; virtual void getRowArea (int row, dw::core::Rectangle *area) = 0; - virtual int getRootWidth () = 0; - virtual int getRootHeight () = 0; + virtual int getRootWidth () = 0; + virtual int getRootHeight () = 0; /* * Reference counting. diff --git a/dw/layout.hh b/dw/layout.hh index 4b80456b..e3e89c52 100644 --- a/dw/layout.hh +++ b/dw/layout.hh @@ -334,7 +334,7 @@ public: inline style::Font *createFont (style::FontAttrs *attrs, bool tryEverything) { - return platform->createFont (attrs, tryEverything); + return platform->createFont (attrs, tryEverything); } inline bool fontExists (const char *name) diff --git a/dw/platform.hh b/dw/platform.hh index cb714583..c7eb37ee 100644 --- a/dw/platform.hh +++ b/dw/platform.hh @@ -44,7 +44,7 @@ public: * \brief This methods notifies the platform, that a view has been detached * from the related layout. */ - virtual void detachView (View *view) = 0; + virtual void detachView (View *view) = 0; /* * ----------------------------------- diff --git a/dw/selection.cc b/dw/selection.cc index 1552e80e..64a0b526 100644 --- a/dw/selection.cc +++ b/dw/selection.cc @@ -344,8 +344,8 @@ int SelectionState::correctCharPos (DeepIterator *it, int charPos) return misc::min(charPos, len); } -void SelectionState::highlight0 (bool fl, DeepIterator *from, int fromChar, - DeepIterator *to, int toChar, int dir) +void SelectionState::highlight0 (bool fl, DeepIterator *from, int fromChar, + DeepIterator *to, int toChar, int dir) { DeepIterator *a, *b, *i; int cmp, aChar, bChar; diff --git a/dw/style.cc b/dw/style.cc index 2a1d4088..c14f3123 100644 --- a/dw/style.cc +++ b/dw/style.cc @@ -173,8 +173,8 @@ int StyleAttrs::hashValue () { borderCollapse + (intptr_t) borderColor.top + (intptr_t) borderColor.right + - (intptr_t) borderColor.bottom + - (intptr_t) borderColor.left + + (intptr_t) borderColor.bottom + + (intptr_t) borderColor.left + borderStyle.top + borderStyle.right + borderStyle.bottom + diff --git a/lout/misc.hh b/lout/misc.hh index 437d229e..e5413f05 100644 --- a/lout/misc.hh +++ b/lout/misc.hh @@ -433,7 +433,7 @@ public: T *src = i < oldNumExtra ? this->arrayExtra1 + i : arrayMainI + (i - oldNumExtra); T *dest = i < diff ? - arrayMainI + i : arrayExtra2 + (i - diff); + arrayMainI + i : arrayExtra2 + (i - diff); *dest = *src; } diff --git a/src/cssparser.cc b/src/cssparser.cc index 8131372a..9428254f 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -697,7 +697,7 @@ bool CssParser::tokenMatchesProperty(CssPropertyName prop, CssValueType *type) case CSS_TYPE_LENGTH_PERCENTAGE: case CSS_TYPE_LENGTH_PERCENTAGE_NUMBER: case CSS_TYPE_LENGTH: - if (tval[0] == '-') + if (tval[0] == '-') return false; // Fall Through case CSS_TYPE_SIGNED_LENGTH: @@ -1059,7 +1059,7 @@ void CssParser::parseDeclaration(CssPropertyList * props, CssPropertyName prop; CssPropertyValue val, dir_vals[4]; - CssValueType dir_types[4]; + CssValueType dir_types[4]; bool found, weight; int sh_index, i, j, n; int dir_set[4][4] = { diff --git a/src/dillo.cc b/src/dillo.cc index 3599ca7a..135a9e45 100644 --- a/src/dillo.cc +++ b/src/dillo.cc @@ -148,7 +148,7 @@ static OptID getCmdOption(const CLI_options *options, int argc, char **argv, } if (state == O_FOUND) { int n_arg = options[i].opt_argc; - opt_id = options[i].id; + opt_id = options[i].id; /* Find the required/optional arguments of the option */ for (i = 0; *idx < argc && i < abs(n_arg) && argv[*idx][0] != '-'; i++) opt_argv[i] = argv[(*idx)++]; diff --git a/src/html.cc b/src/html.cc index 924154b8..059371a8 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1144,7 +1144,7 @@ static void Html_process_word(DilloHtml *html, const char *word, int size) dStr_append_l(html->Stash, word, size); } - if (parse_mode == DILLO_HTML_PARSE_MODE_STASH || + if (parse_mode == DILLO_HTML_PARSE_MODE_STASH || parse_mode == DILLO_HTML_PARSE_MODE_VERBATIM) { /* skip until the closing instructions */ @@ -3627,7 +3627,7 @@ static void Html_process_tag(DilloHtml *html, char *tag, int tagsize) /* Request immediate close for elements with forbidden close tag. */ /* TODO: XHTML always requires close tags. A simple implementation * of the commented clause below will make it work. */ - if (/* parsing HTML && */ Tags[ni].EndTag == 'F') + if (/* parsing HTML && */ Tags[ni].EndTag == 'F') html->ReqTagClose = true; /* Don't break! Open tags may also close themselves */ @@ -153,7 +153,7 @@ class UI : public CustGroupVertical { Fl_Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools, *Clear, *Search, *Help, *BugMeter, *FileButton; CustGroupHorizontal *LocBar, *NavBar, *StatusBar; - Fl_Input *Location; + Fl_Input *Location; CustProgressBox *PProg, *IProg; Fl_Group *Panel, *Main; Fl_Output *StatusOutput; |