diff --git a/headers/libs/alm/BALMLayout.h b/headers/libs/alm/ALMLayout.h similarity index 92% rename from headers/libs/alm/BALMLayout.h rename to headers/libs/alm/ALMLayout.h index 41b77b1870..ca0e36942b 100644 --- a/headers/libs/alm/BALMLayout.h +++ b/headers/libs/alm/ALMLayout.h @@ -1,10 +1,9 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ -#ifndef BALM_LAYOUT_H -#define BALM_LAYOUT_H +#ifndef ALM_LAYOUT_H +#define ALM_LAYOUT_H #include #include @@ -105,4 +104,4 @@ private: using BALM::BALMLayout; -#endif // BALM_LAYOUT_H +#endif // ALM_LAYOUT_H diff --git a/headers/libs/alm/Area.h b/headers/libs/alm/Area.h index 993b1c375a..98ca676dae 100644 --- a/headers/libs/alm/Area.h +++ b/headers/libs/alm/Area.h @@ -1,9 +1,7 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ - #ifndef AREA_H #define AREA_H diff --git a/headers/libs/alm/Column.h b/headers/libs/alm/Column.h index 43852da47b..73f37e52aa 100644 --- a/headers/libs/alm/Column.h +++ b/headers/libs/alm/Column.h @@ -1,6 +1,5 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef COLUMN_H diff --git a/headers/libs/alm/Row.h b/headers/libs/alm/Row.h index 467f63880f..0fd332fa80 100644 --- a/headers/libs/alm/Row.h +++ b/headers/libs/alm/Row.h @@ -1,9 +1,7 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ - #ifndef ROW_H #define ROW_H diff --git a/headers/libs/alm/XTab.h b/headers/libs/alm/XTab.h index 80e147dc0b..c1c5a5354a 100644 --- a/headers/libs/alm/XTab.h +++ b/headers/libs/alm/XTab.h @@ -1,6 +1,5 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef X_TAB_H diff --git a/headers/libs/alm/YTab.h b/headers/libs/alm/YTab.h index 57f3bd7b14..ddd77cdb21 100644 --- a/headers/libs/alm/YTab.h +++ b/headers/libs/alm/YTab.h @@ -1,6 +1,5 @@ /* - * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz - * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2006 - 2010, Haiku, Inc. All rights reserved. * Distributed under the terms of the MIT License. */ #ifndef Y_TAB_H diff --git a/src/libs/alm/BALMLayout.cpp b/src/libs/alm/ALMLayout.cpp similarity index 99% rename from src/libs/alm/BALMLayout.cpp rename to src/libs/alm/ALMLayout.cpp index 84de83be42..847f245647 100644 --- a/src/libs/alm/BALMLayout.cpp +++ b/src/libs/alm/ALMLayout.cpp @@ -1,10 +1,11 @@ /* * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2010, Clemens Zeidler * Distributed under the terms of the MIT License. */ -#include "BALMLayout.h" +#include "ALMLayout.h" #include // for floor #include diff --git a/src/libs/alm/Jamfile b/src/libs/alm/Jamfile index d49f309726..ce79d1caf2 100644 --- a/src/libs/alm/Jamfile +++ b/src/libs/alm/Jamfile @@ -9,7 +9,7 @@ UsePrivateHeaders shared ; SharedLibrary libalm.so : Area.cpp Column.cpp - BALMLayout.cpp + ALMLayout.cpp Row.cpp XTab.cpp YTab.cpp diff --git a/src/tests/libs/alm/Areas.cpp b/src/tests/libs/alm/Areas.cpp index 7297f8cc2e..4fb1791ea6 100644 --- a/src/tests/libs/alm/Areas.cpp +++ b/src/tests/libs/alm/Areas.cpp @@ -3,7 +3,7 @@ #include #include -#include "BALMLayout.h" +#include "ALMLayout.h" class AreasWindow : public BWindow { diff --git a/src/tests/libs/alm/HelloWorld.cpp b/src/tests/libs/alm/HelloWorld.cpp index e9600cfce6..3459708741 100644 --- a/src/tests/libs/alm/HelloWorld.cpp +++ b/src/tests/libs/alm/HelloWorld.cpp @@ -1,13 +1,17 @@ +/* + * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz + * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2010, Clemens Zeidler + * Distributed under the terms of the MIT License. + */ + #include #include #include #include // include this for ALM -#include "XTab.h" -#include "YTab.h" -#include "Area.h" -#include "BALMLayout.h" +#include "ALMLayout.h" class HelloWorldWindow : public BWindow { @@ -24,10 +28,8 @@ public: // add an area containing the button // use the borders of the layout as the borders for the area - Area* a = fLayout->AddArea( - fLayout->Left(), fLayout->Top(), - fLayout->Right(), fLayout->Bottom(), - button1); + fLayout->AddArea(fLayout->Left(), fLayout->Top(), fLayout->Right(), + fLayout->Bottom(), button1); button1->SetExplicitMinSize(BSize(0, 50)); button1->SetExplicitMaxSize(BSize(500, 500)); diff --git a/src/tests/libs/alm/Pinwheel.cpp b/src/tests/libs/alm/Pinwheel.cpp index cacb25d6c8..59684d332f 100644 --- a/src/tests/libs/alm/Pinwheel.cpp +++ b/src/tests/libs/alm/Pinwheel.cpp @@ -1,3 +1,10 @@ +/* + * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz + * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2010, Clemens Zeidler + * Distributed under the terms of the MIT License. + */ + #include #include #include @@ -5,10 +12,7 @@ #include // include this for ALM -#include "XTab.h" -#include "YTab.h" -#include "Area.h" -#include "BALMLayout.h" +#include "ALMLayout.h" class PinwheelWindow : public BWindow { diff --git a/src/tests/libs/alm/TableDemo.cpp b/src/tests/libs/alm/TableDemo.cpp index 0b89bdfe26..f729fa0cd7 100644 --- a/src/tests/libs/alm/TableDemo.cpp +++ b/src/tests/libs/alm/TableDemo.cpp @@ -1,6 +1,7 @@ /* * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2010, Clemens Zeidler * Distributed under the terms of the MIT License. */ @@ -9,7 +10,7 @@ #include #include -#include "BALMLayout.h" +#include "ALMLayout.h" class TableDemoWindow : public BWindow { diff --git a/src/tests/libs/alm/TwoViews.cpp b/src/tests/libs/alm/TwoViews.cpp index 883f56cf02..b3509f9a7a 100644 --- a/src/tests/libs/alm/TwoViews.cpp +++ b/src/tests/libs/alm/TwoViews.cpp @@ -1,10 +1,17 @@ +/* + * Copyright 2007-2008, Christof Lutteroth, lutteroth@cs.auckland.ac.nz + * Copyright 2007-2008, James Kim, jkim202@ec.auckland.ac.nz + * Copyright 2010, Clemens Zeidler + * Distributed under the terms of the MIT License. + */ + #include #include #include #include #include -#include "BALMLayout.h" +#include "ALMLayout.h" class TwoViewsWindow : public BWindow {