mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compact namespace in testtools..toolkit

Browse Source 
Change-Id: Iae1a7d3e2f14ee98ad486b4423208d2c29039346
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93905
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2020-05-10 09:19:11 +02:00
parent c37fe8886d
commit 0823da8c70
14 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testtools/source/bridgetest/cli/cli_cs_multi.cs
View File

@@ -16,7 +16,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
namespace testtools { namespace bridgetest { namespace cli_cs { namespace testtools::bridgetest::cli_cs {
public class Multi: unoidl.test.testtools.bridgetest.XMulti public class Multi: unoidl.test.testtools.bridgetest.XMulti
{ {

4
testtools/source/bridgetest/currentcontextchecker.hxx
View File

@@ -30,7 +30,7 @@
#include "dllapi.hxx" #include "dllapi.hxx"
namespace testtools { namespace bridgetest { namespace testtools::bridgetest {
class LO_DLLPUBLIC_TESTTOOLS CurrentContextChecker : class LO_DLLPUBLIC_TESTTOOLS CurrentContextChecker :
public ::osl::DebugBase< CurrentContextChecker >, public ::osl::DebugBase< CurrentContextChecker >,
@@ -55,7 +55,7 @@ private:
::sal_Int32 setSteps, ::sal_Int32 checkSteps); ::sal_Int32 setSteps, ::sal_Int32 checkSteps);
}; };
} } }
#endif #endif

4
testtools/source/bridgetest/multi.hxx
View File

@@ -31,7 +31,7 @@
#include "dllapi.hxx" #include "dllapi.hxx"
namespace testtools { namespace bridgetest { namespace testtools::bridgetest {
class Multi: public cppu::WeakImplHelper< test::testtools::bridgetest::XMulti > class Multi: public cppu::WeakImplHelper< test::testtools::bridgetest::XMulti >
{ {
@@ -97,7 +97,7 @@ private:
LO_DLLPUBLIC_TESTTOOLS LO_DLLPUBLIC_TESTTOOLS
OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti > const & multi); OUString testMulti( css::uno::Reference< test::testtools::bridgetest::XMulti > const & multi);
} } }
#endif #endif

2
toolkit/inc/awt/vclxgraphics.hxx
View File

@@ -35,7 +35,7 @@
class OutputDevice; class OutputDevice;
namespace vcl { class Region; } namespace vcl { class Region; }
namespace com { namespace sun { namespace star { namespace graphic { class XGraphic; } } } } namespace com::sun::star::graphic { class XGraphic; }
enum class InitOutDevFlags enum class InitOutDevFlags

2
toolkit/inc/awt/vclxprinter.hxx
View File

@@ -32,7 +32,7 @@
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>
#include <vcl/jobset.hxx> #include <vcl/jobset.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XPrinter; } } } } namespace com::sun::star::awt { class XPrinter; }
namespace vcl { class OldStylePrintAdaptor; } namespace vcl { class OldStylePrintAdaptor; }
class Printer; class Printer;

6
toolkit/inc/controls/accessiblecontrolcontext.hxx
View File

@@ -26,9 +26,9 @@
#include <vcl/vclptr.hxx> #include <vcl/vclptr.hxx>
namespace vcl { class Window; } namespace vcl { class Window; }
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com::sun::star::awt { class XWindow; }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } } namespace com::sun::star::beans { class XPropertySet; }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } namespace com::sun::star::beans { class XPropertySetInfo; }
namespace toolkit namespace toolkit
{ {

4
toolkit/inc/controls/animatedimages.hxx
View File

@@ -24,8 +24,8 @@
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <memory> #include <memory>
namespace com { namespace sun { namespace star { namespace container { class XContainerListener; } } } } namespace com::sun::star::container { class XContainerListener; }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace com::sun::star::uno { class XComponentContext; }
namespace toolkit namespace toolkit
{ {

4
toolkit/inc/controls/controlmodelcontainerbase.hxx
View File

@@ -39,8 +39,8 @@
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <vector> #include <vector>
namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } } namespace com::sun::star::resource { class XStringResourceResolver; }
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace com::sun::star::uno { class XComponentContext; }
typedef UnoControlModel ControlModel_Base; typedef UnoControlModel ControlModel_Base;

2
toolkit/inc/controls/dialogcontrol.hxx
View File

@@ -25,7 +25,7 @@
#include <toolkit/helper/macros.hxx> #include <toolkit/helper/macros.hxx>
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XTopWindowListener; } } } } namespace com::sun::star::awt { class XTopWindowListener; }
typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase typedef ::cppu::AggImplInheritanceHelper2 < ControlContainerBase
, css::awt::XUnoControlDialog , css::awt::XUnoControlDialog

2
toolkit/inc/controls/formattedcontrol.hxx
View File

@@ -22,7 +22,7 @@
#include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/unocontrols.hxx>
#include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolmodel.hxx>
namespace com { namespace sun { namespace star { namespace util { class XNumberFormatter; } } } } namespace com::sun::star::util { class XNumberFormatter; }
namespace toolkit namespace toolkit

6
toolkit/inc/controls/geometrycontrolmodel.hxx
View File

@@ -28,13 +28,13 @@
#include <com/sun/star/script/XScriptEventsSupplier.hpp> #include <com/sun/star/script/XScriptEventsSupplier.hpp>
#include <comphelper/IdPropArrayHelper.hxx> #include <comphelper/IdPropArrayHelper.hxx>
namespace com { namespace sun { namespace star { namespace resource { class XStringResourceResolver; } } } } namespace com::sun::star::resource { class XStringResourceResolver; }
namespace com { namespace sun { namespace star { namespace com::sun::star {
namespace uno { namespace uno {
class XComponentContext; class XComponentContext;
} }
}}} }
// namespace toolkit // namespace toolkit

6
toolkit/inc/controls/stdtabcontroller.hxx
View File

@@ -27,9 +27,9 @@
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
namespace com { namespace sun { namespace star { namespace awt { class XWindow; } } } } namespace com::sun::star::awt { class XWindow; }
namespace com { namespace sun { namespace star { namespace awt { class XControl; } } } } namespace com::sun::star::awt { class XControl; }
namespace com { namespace sun { namespace star { namespace awt { class XControlContainer; } } } } namespace com::sun::star::awt { class XControlContainer; }
class StdTabController final : public css::awt::XTabController, class StdTabController final : public css::awt::XTabController,
public css::lang::XServiceInfo, public css::lang::XServiceInfo,

6
toolkit/inc/controls/tabpagecontainer.hxx
View File

@@ -28,9 +28,9 @@
#include <toolkit/helper/listenermultiplexer.hxx> #include <toolkit/helper/listenermultiplexer.hxx>
namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPage; } } } } } namespace com::sun::star::awt::tab { class XTabPage; }
namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageContainerListener; } } } } } namespace com::sun::star::awt::tab { class XTabPageContainerListener; }
namespace com { namespace sun { namespace star { namespace awt { namespace tab { class XTabPageModel; } } } } } namespace com::sun::star::awt::tab { class XTabPageModel; }
typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel typedef ::cppu::AggImplInheritanceHelper1 < UnoControlModel

6
toolkit/inc/controls/treecontrolpeer.hxx
View File

@@ -32,11 +32,7 @@
#include <map> #include <map>
namespace com { namespace sun { namespace star { namespace awt { namespace tree { namespace com::sun::star::awt::tree { class XTreeNode; }
class XTreeNode;
}}}}}
class UnoTreeListEntry; class UnoTreeListEntry;
class TreeControlPeer; class TreeControlPeer;