diff options
| author | Milosz Derezynski <mderezynski@gmail.com> | 2006-05-17 16:59:56 +0000 |
|---|---|---|
| committer | mderezynski <mderezynski@users.sourceforge.net> | 2006-05-17 16:59:56 +0000 |
| commit | 4e31f323abd9958b175d1da9ad3560eb28ab35b7 (patch) | |
| tree | 0171f37f12fe0bdaf57e8ddb7349409e6d56e872 /src/removeoverlap | |
| parent | * Modify SPFontSelector to use Inkscape::FontLister and GtkTreeView instead o... (diff) | |
| download | inkscape-4e31f323abd9958b175d1da9ad3560eb28ab35b7.tar.gz inkscape-4e31f323abd9958b175d1da9ad3560eb28ab35b7.zip | |
* Fix build for gcc 4.x (Remove additional class name qualifier inside class definition):
src/removeoverlap/constraint.h
src/removeoverlap/variable.h
* Add font-lister.h/font-lister.cpp:
src/libnrtype/Makefile_insert
src/libnrtype/font-lister.cpp
src/libnrtype/font-lister.h
* Modify dialog slightly in appearance (shadow for GtkScrolledWindow):
src/dialogs/text-edit.cpp
(bzr r866)
Diffstat (limited to 'src/removeoverlap')
| -rw-r--r-- | src/removeoverlap/constraint.h | 2 | ||||
| -rw-r--r-- | src/removeoverlap/variable.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/removeoverlap/constraint.h b/src/removeoverlap/constraint.h index b207932b2..3da7449cd 100644 --- a/src/removeoverlap/constraint.h +++ b/src/removeoverlap/constraint.h @@ -26,7 +26,7 @@ public: double lm; Constraint(Variable *left, Variable *right, double gap, bool equality=false); ~Constraint(); - inline double Constraint::slack() const { return right->position() - gap - left->position(); } + inline double slack() const { return right->position() - gap - left->position(); } long timeStamp; bool active; bool visited; diff --git a/src/removeoverlap/variable.h b/src/removeoverlap/variable.h index 86e16737e..b1ab66c95 100644 --- a/src/removeoverlap/variable.h +++ b/src/removeoverlap/variable.h @@ -39,7 +39,7 @@ public: , visited(false) { } - inline double Variable::position() const { + inline double position() const { return block->posn+offset; } //double position() const; |