Rename and re-factor test and unotest to compile and run again

3 files changed, 6 insertions, 6 deletions

diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx
index 4fe11147bc16..bc4ad1b68782 100644
--- a/unotest/inc/unotest/gettestargument.hxx
+++ b/unotest/inc/unotest/gettestargument.hxx
@@ -31,7 +31,7 @@
 
 #include "sal/config.h"
 
-#include "test/detail/testdllapi.hxx"
+#include "unotest/detail/unotestdllapi.hxx"
 
 namespace rtl { class OUString; }
 
@@ -39,7 +39,7 @@ namespace test {
 
 // Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
 // bootstrap variable):
-OOO_DLLPUBLIC_TEST bool getTestArgument(
+OOO_DLLPUBLIC_UNOTEST bool getTestArgument(
     rtl::OUString const & name, rtl::OUString * value);
 
 }
diff --git a/unotest/inc/unotest/officeconnection.hxx b/unotest/inc/unotest/officeconnection.hxx
index e5250ce6aedf..f79e0de110d2 100644
--- a/unotest/inc/unotest/officeconnection.hxx
+++ b/unotest/inc/unotest/officeconnection.hxx
@@ -32,7 +32,7 @@
 #include "boost/noncopyable.hpp"
 #include "com/sun/star/uno/Reference.hxx"
 #include "osl/process.h"
-#include "test/detail/testdllapi.hxx"
+#include "unotest/detail/unotestdllapi.hxx"
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
@@ -42,7 +42,7 @@ namespace test {
 
 // Start up and shut down an OOo instance (details about the OOo instance are
 // tunneled in via "arg-..." bootstrap variables):
-class OOO_DLLPUBLIC_TEST OfficeConnection: private boost::noncopyable {
+class OOO_DLLPUBLIC_UNOTEST OfficeConnection: private boost::noncopyable {
 public:
     OfficeConnection();
 
diff --git a/unotest/inc/unotest/uniquepipename.hxx b/unotest/inc/unotest/uniquepipename.hxx
index b66492ce271a..0a9b2c1ff466 100644
--- a/unotest/inc/unotest/uniquepipename.hxx
+++ b/unotest/inc/unotest/uniquepipename.hxx
@@ -31,14 +31,14 @@
 
 #include "sal/config.h"
 
-#include "test/detail/testdllapi.hxx"
+#include "unotest/detail/unotestdllapi.hxx"
 
 namespace rtl { class OUString; }
 
 namespace test {
 
 // Create a system-wide unique name (for use with osl::Pipe):
-OOO_DLLPUBLIC_TEST rtl::OUString uniquePipeName(rtl::OUString const & name);
+OOO_DLLPUBLIC_UNOTEST rtl::OUString uniquePipeName(rtl::OUString const & name);
 
 }