summaryrefslogtreecommitdiff
path: root/basctl/source/inc/scriptdocument.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/inc/scriptdocument.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/inc/scriptdocument.hxx')
-rw-r--r--basctl/source/inc/scriptdocument.hxx31
1 files changed, 7 insertions, 24 deletions
diff --git a/basctl/source/inc/scriptdocument.hxx b/basctl/source/inc/scriptdocument.hxx
index e941222b21e3..1fa08cc69c88 100644
--- a/basctl/source/inc/scriptdocument.hxx
+++ b/basctl/source/inc/scriptdocument.hxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef SCRIPTDOCUMENT_HXX
-#define SCRIPTDOCUMENT_HXX
+#ifndef BASCTL_SCRIPTDOCUMENT_HXX
+#define BASCTL_SCRIPTDOCUMENT_HXX
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/frame/XModel.hpp>
@@ -28,9 +28,10 @@
#include <boost/shared_ptr.hpp>
#include <vector>
-class BasicManager;
class SfxListener;
+class BasicManager;
+
//........................................................................
namespace basctl
{
@@ -64,8 +65,6 @@ namespace basctl
//====================================================================
//= ScriptDocument
//====================================================================
- class ScriptDocument_Impl;
-
class ScriptDocument;
typedef ::std::vector< ScriptDocument > ScriptDocuments;
@@ -74,7 +73,8 @@ namespace basctl
class ScriptDocument
{
private:
- ::boost::shared_ptr< ScriptDocument_Impl > m_pImpl;
+ class Impl;
+ boost::shared_ptr<Impl> m_pImpl;
private:
/** creates a ScriptDocument instance which operates on the application-wide
@@ -507,23 +507,6 @@ namespace basctl
} // namespace basctl
//........................................................................
-// convenience ... better would be all classes in the project are in
-// the same namespace ...
-using ::basctl::ScriptDocument;
-using ::basctl::ScriptDocuments;
-using ::basctl::E_SCRIPTS;
-using ::basctl::E_DIALOGS;
-using ::basctl::LibraryLocation;
-using ::basctl::LIBRARY_LOCATION_UNKNOWN;
-using ::basctl::LIBRARY_LOCATION_USER;
-using ::basctl::LIBRARY_LOCATION_SHARE;
-using ::basctl::LIBRARY_LOCATION_DOCUMENT;
-using ::basctl::LibraryType;
-using ::basctl::LIBRARY_TYPE_UNKNOWN;
-using ::basctl::LIBRARY_TYPE_MODULE;
-using ::basctl::LIBRARY_TYPE_DIALOG;
-using ::basctl::LIBRARY_TYPE_ALL;
-
-#endif // SCRIPTDOCUMENT_HXX
+#endif // BASCTL_SCRIPTDOCUMENT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */