summaryrefslogtreecommitdiff
path: root/basctl/source/basicide/layout.hxx
diff options
context:
space:
mode:
authorUray M. János <uray.janos@gmail.com>2012-08-25 12:43:27 +0200
committerAndras Timar <atimar@suse.com>2012-08-29 20:48:28 +0000
commitc20f15c1ebf648c3ed71de0ac4771029c9bb59bb (patch)
treeda9f3dddc80492e7ea2435aa6e0bf02e8d40153e /basctl/source/basicide/layout.hxx
parentcda156257003df673fa853a0a5ffcd1cb4848d43 (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.hxx')
-rw-r--r--basctl/source/basicide/layout.hxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index 2f733f852348..6adaeebde151 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -28,14 +28,15 @@
#include <boost/shared_ptr.hpp>
class DockingWindow;
-class BasicDockingWindow;
-class IDEBaseWindow;
class SfxRequest;
class SfxItemSet;
namespace basctl
{
+class DockingWindow;
+class BaseWindow;
+
//
// Layout -- the common base of ModulLayout and DialogLayout.
// Handles the splitting lines and the dockable windows.
@@ -46,7 +47,7 @@ public:
void DockaWindow (DockingWindow*);
void ArrangeWindows ();
- virtual void Activating (IDEBaseWindow&);
+ virtual void Activating (BaseWindow&);
virtual void Deactivating ();
virtual void GetState (SfxItemSet&, unsigned nWhich) = 0;
virtual void UpdateDebug (bool bBasicStopped ) = 0;
@@ -55,8 +56,8 @@ protected:
Layout (Window* pParent);
virtual ~Layout ();
- void AddToLeft (BasicDockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
- void AddToBottom (BasicDockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); }
+ void AddToLeft (DockingWindow* pWin, Size const& rSize) { aLeftSide.Add(pWin, rSize); }
+ void AddToBottom (DockingWindow* pWin, Size const& rSize) { aBottomSide.Add(pWin, rSize); }
protected:
// Window:
@@ -67,7 +68,7 @@ protected:
private:
// the main child window (either ModulWindow or DialogWindow)
- IDEBaseWindow* pChild;
+ BaseWindow* pChild;
// when this window has at first (nonempty) size
bool bFirstSize;
@@ -78,7 +79,7 @@ private:
public:
enum Side {Right, Top, Left, Bottom};
SplittedSide (Layout*, Side);
- void Add (BasicDockingWindow*, Size const&);
+ void Add (DockingWindow*, Size const&);
bool IsEmpty () const;
int GetSize () const;
void ArrangeIn (Rectangle const&);
@@ -101,7 +102,7 @@ private:
// the main splitting line
Splitter aSplitter;
// the dockable windows
- std::vector<BasicDockingWindow*> vWindows;
+ std::vector<DockingWindow*> vWindows;
// splitting lines between the docking windows (vWindows.size() - 1)
std::vector<boost::shared_ptr<Splitter> > vSplitters;