diff --git a/misc/dist.sh b/misc/dist.sh index 9550b0f5d..e13b702f1 100644 --- a/misc/dist.sh +++ b/misc/dist.sh @@ -63,13 +63,6 @@ tinyxml_files="third_party/tinyxml/*.txt \ third_party/tinyxml/*.cpp \ third_party/tinyxml/*.h" -vaca_files="third_party/vaca/include/Vaca/*.h \ - third_party/vaca/src/*.cpp \ - third_party/vaca/src/allegro/*.h \ - third_party/vaca/src/std/*.h \ - third_party/vaca/src/unix/*.h \ - third_party/vaca/src/win32/*.h" - zlib_files="third_party/zlib/*.[ch] \ third_party/zlib/*.txt \ third_party/zlib/README" @@ -167,7 +160,6 @@ cp --parents \ $libpng_files \ $loadpng_files \ $tinyxml_files \ - $vaca_files \ $zlib_files \ $ase_files \ "$dir/$distdir" diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp index 9b1657706..8a57411c4 100644 --- a/src/gui/frame.cpp +++ b/src/gui/frame.cpp @@ -232,7 +232,7 @@ bool Frame::onProcessMessage(JMessage msg) case JM_CLOSE: // Fire Close signal { - Vaca::CloseEvent ev; + CloseEvent ev; Close(ev); } break; diff --git a/src/gui/frame.h b/src/gui/frame.h index c81aac3b6..826b6bbf3 100644 --- a/src/gui/frame.h +++ b/src/gui/frame.h @@ -10,9 +10,7 @@ #include "base/signal.h" #include "gui/widget.h" -namespace Vaca { - class CloseEvent { }; // TODO -} +class CloseEvent { }; // TODO class Frame : public Widget { @@ -54,7 +52,7 @@ public: bool is_wantfocus() const; // Signals - Signal1<void, Vaca::CloseEvent&> Close; + Signal1<void, CloseEvent&> Close; protected: bool onProcessMessage(JMessage msg); diff --git a/src/gui/widget.cpp b/src/gui/widget.cpp index 2a714fbb5..6c27b7ad6 100644 --- a/src/gui/widget.cpp +++ b/src/gui/widget.cpp @@ -1339,9 +1339,8 @@ Size Widget::getPreferredSize() This can have both attributes (width and height) in zero, which means that it'll behave same as #getPreferredSize(). If the width is great than zero the #onPreferredSize will try to - fit in that width (this is useful to fit @link Vaca::Label Label@endlink - or @link Vaca::Edit Edit@endlink controls in a specified width and - calculate the height it could occupy). + fit in that width (this is useful to fit Label or Edit controls + in a specified width and calculate the height it could occupy). @see getPreferredSize */