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>

1 files changed, 19 insertions, 16 deletions

diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index 05d511e8df47..262afb10e06c 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -17,16 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "basidectrlr.hxx"
+
+#include "basidesh.hxx"
 
-#include <basidectrlr.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <vcl/syswin.hxx>
 
-#include <basidesh.hxx>
-
+namespace basctl
+{
 
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -39,7 +41,7 @@ using namespace com::sun::star::beans;
 
 //----------------------------------------------------------------------------
 
-BasicIDEController::BasicIDEController( BasicIDEShell* pViewShell )
+Controller::Controller (Shell* pViewShell)
     :OPropertyContainer( m_aBHelper )
     ,SfxBaseController( pViewShell )
     ,m_nIconId( ICON_MACROLIBRARY )
@@ -49,14 +51,13 @@ BasicIDEController::BasicIDEController( BasicIDEShell* pViewShell )
 
 //----------------------------------------------------------------------------
 
-BasicIDEController::~BasicIDEController()
-{
-}
+Controller::~Controller()
+{ }
 
 // XInterface
 //----------------------------------------------------------------------------
 
-Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(RuntimeException)
+Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException)
 {
     Any aReturn = SfxBaseController::queryInterface( rType );
     if ( !aReturn.hasValue() )
@@ -67,14 +68,14 @@ Any SAL_CALL BasicIDEController::queryInterface( const Type & rType ) throw(Runt
 
 //----------------------------------------------------------------------------
 
-void SAL_CALL BasicIDEController::acquire() throw()
+void SAL_CALL Controller::acquire() throw()
 {
     SfxBaseController::acquire();
 }
 
 //----------------------------------------------------------------------------
 
-void SAL_CALL BasicIDEController::release() throw()
+void SAL_CALL Controller::release() throw()
 {
     SfxBaseController::release();
 }
@@ -83,19 +84,19 @@ void SAL_CALL BasicIDEController::release() throw()
 // XTypeProvider ( ::SfxBaseController )
 //----------------------------------------------------------------------------
 
-Sequence< Type > SAL_CALL BasicIDEController::getTypes() throw(RuntimeException)
+Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException)
 {
     Sequence< Type > aTypes = ::comphelper::concatSequences(
         SfxBaseController::getTypes(),
         OPropertyContainer::getTypes()
-        );
+    );
 
     return aTypes;
 }
 
 //----------------------------------------------------------------------------
 
-Sequence< sal_Int8 > SAL_CALL BasicIDEController::getImplementationId() throw(RuntimeException)
+Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException)
 {
     static ::cppu::OImplementationId * pId = 0;
     if ( !pId )
@@ -113,7 +114,7 @@ Sequence< sal_Int8 > SAL_CALL BasicIDEController::getImplementationId() throw(Ru
 // XPropertySet
 //----------------------------------------------------------------------------
 
-Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySetInfo() throw(RuntimeException)
+Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException)
 {
     Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
     return xInfo;
@@ -122,7 +123,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
 // OPropertySetHelper
 //----------------------------------------------------------------------------
 
-::cppu::IPropertyArrayHelper& BasicIDEController::getInfoHelper()
+::cppu::IPropertyArrayHelper& Controller::getInfoHelper()
 {
     return *getArrayHelper();
 }
@@ -130,7 +131,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
 // OPropertyArrayUsageHelper
 //----------------------------------------------------------------------------
 
-::cppu::IPropertyArrayHelper* BasicIDEController::createArrayHelper( ) const
+::cppu::IPropertyArrayHelper* Controller::createArrayHelper( ) const
 {
     Sequence< Property > aProps;
     describeProperties( aProps );
@@ -139,4 +140,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL BasicIDEController::getPropertySet
 
 //----------------------------------------------------------------------------
 
+} // namespace basctl
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */