diff options
| author | Uray M. János <uray.janos@gmail.com> | 2012-08-25 12:43:27 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-08-29 20:48:28 +0000 |
| commit | c20f15c1ebf648c3ed71de0ac4771029c9bb59bb (patch) | |
| tree | da9f3dddc80492e7ea2435aa6e0bf02e8d40153e /basctl/source/basicide/layout.cxx | |
| parent | cda156257003df673fa853a0a5ffcd1cb4848d43 (diff) | |
Basic IDE: namespace basctl
Now all names in basctl are in namespace 'basctl'.
There were lots of names that included the word 'Basic' or 'BasicIDE' in
it, e.g. BasicIDEData, BasicDocumentEntry, BasicTreeListBox,
BasicIDEModule, IDEBaseWindow etc. This information is now stored in the
namespace name, so the names could be shortened: basctl::DocumentEntry,
basctl::TreeListBox, basctl::Module, basctl::BaseWindow etc.
Some other minor changes:
* LibInfos, LibInfoItem, LibInfoKey ->
LibInfos, LibInfos::Item, LibInfos::Key
* The header guards are now uniformly BASCTL_FILENAME_HXX, instead of
e.g. _FILENAME_HXX, which is undefined behaviour because of the '_'.
* namespace BasicIDE, BasicIDEGlobals, basicide -> namespace basctl
* BASICIDE_TYPE_MODULE, ... -> basctl::TYPE_MODULE, ...
Change-Id: I2a9b493562d0d8a2510d569798fbe9e1161b7c9b
Reviewed-on: https://gerrit.libreoffice.org/501
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>
Diffstat (limited to 'basctl/source/basicide/layout.cxx')
| -rw-r--r-- | basctl/source/basicide/layout.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/basctl/source/basicide/layout.cxx b/basctl/source/basicide/layout.cxx index fdc234553ce1..5d1be2e2f278 100644 --- a/basctl/source/basicide/layout.cxx +++ b/basctl/source/basicide/layout.cxx @@ -33,7 +33,7 @@ static int const nSplitThickness = 3; } // namespace // ctor for derived classes -// pParent: the parent window (BasicIDEShell) +// pParent: the parent window (Shell) Layout::Layout (Window* pParent) : Window(pParent, WB_CLIPCHILDREN), pChild(0), @@ -91,10 +91,10 @@ void Layout::DockaWindow (DockingWindow*) ArrangeWindows(); } -void Layout::Activating (IDEBaseWindow& rIdeWindow) +void Layout::Activating (BaseWindow& rWindow) { // first activation - pChild = &rIdeWindow; + pChild = &rWindow; ArrangeWindows(); Show(); pChild->Activating(); @@ -154,7 +154,7 @@ Layout::SplittedSide::SplittedSide (Layout* pParent, Side eSide) : // Add() -- adds a new window to the side (after construction) -void Layout::SplittedSide::Add (BasicDockingWindow* pWin, Size const& rSize) +void Layout::SplittedSide::Add (DockingWindow* pWin, Size const& rSize) { int const nSize1 = (bVertical ? rSize.Width() : rSize.Height()) + nSplitThickness; int const nSize2 = bVertical ? rSize.Height() : rSize.Width(); @@ -245,7 +245,7 @@ void Layout::SplittedSide::ArrangeIn (Rectangle const& rRect) for (unsigned i = 0; i != vWindows.size(); ++i) { // window - BasicDockingWindow& rWin = *vWindows[i]; + DockingWindow& rWin = *vWindows[i]; bool const bDocked = rWin.IsVisible() && !rWin.IsFloatingMode(); // The window is docked between nStartPos and nEndPos along. int const nEndPos = i == vWindows.size() - 1 ? |