remove SerfTypes.hxx

Change-Id: I189e7168562db2ca03fd64745eb1f826b6c9adc2

7 files changed, 10 insertions, 46 deletions

diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx
index 8bf3ca37614e..f7c2911e3982 100644
--- a/ucb/source/ucp/webdav/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav/DAVProperties.hxx
@@ -22,11 +22,12 @@
 #define _DAVPROPERTIES_HXX_
 
 #include <rtl/ustring.hxx>
-#include "SerfTypes.hxx"
 
 namespace http_dav_ucp
 {
 
+typedef struct { const char *nspace, *name; } SerfPropName;
+
 struct DAVProperties
 {
     static const OUString CREATIONDATE;
diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx
index eefd7b838a74..8205a208ee82 100644
--- a/ucb/source/ucp/webdav/SerfLockStore.hxx
+++ b/ucb/source/ucp/webdav/SerfLockStore.hxx
@@ -25,7 +25,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <SerfTypes.hxx>
 #include <SerfSession.hxx>
 
 namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index 2661e10522ee..8117b1b81221 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "SerfPropFindReqProcImpl.hxx"
-#include "SerfTypes.hxx"
 #include "DAVProperties.hxx"
 
 #include "webdavresponseparser.hxx"
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index 950eb16b74bd..06e539dafe70 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -23,7 +23,6 @@
 #include "UCBDeadPropertyValue.hxx"
 
 #include "SerfPropPatchReqProcImpl.hxx"
-#include "SerfTypes.hxx"
 
 namespace http_dav_ucp
 {
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 017b978df192..cff90beb3507 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -28,7 +28,6 @@
 #include <apr_strings.h>
 
 #include "DAVAuthListener.hxx"
-#include "SerfTypes.hxx"
 #include "SerfSession.hxx"
 #include "SerfUri.hxx"
 #include "SerfRequestProcessor.hxx"
@@ -193,7 +192,7 @@ serf_context_t* SerfSession::getSerfContext()
     return m_pSerfContext;
 }
 
-SerfConnection* SerfSession::getSerfConnection()
+serf_connection_t* SerfSession::getSerfConnection()
 {
     return m_pSerfConnection;
 }
diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx
index f580a4719e8f..92cecf79e321 100644
--- a/ucb/source/ucp/webdav/SerfSession.hxx
+++ b/ucb/source/ucp/webdav/SerfSession.hxx
@@ -26,9 +26,10 @@
 #include <boost/shared_ptr.hpp>
 #include <osl/mutex.hxx>
 #include "DAVSession.hxx"
-#include "SerfTypes.hxx"
 #include "SerfUri.hxx"
 
+#include <serf.h>
+
 namespace ucbhelper { class ProxyDecider; }
 
 namespace http_dav_ucp
@@ -51,7 +52,7 @@ private:
     OUString           m_aProxyName;
     sal_Int32               m_nProxyPort;
 
-    SerfConnection*         m_pSerfConnection;
+    serf_connection_t*      m_pSerfConnection;
     serf_context_t*         m_pSerfContext;
     serf_bucket_alloc_t*    m_pSerfBucket_Alloc;
     bool                    m_bIsHeadRequestInProgress;
@@ -104,7 +105,7 @@ public:
     apr_pool_t* getAprPool();
     serf_bucket_alloc_t* getSerfBktAlloc();
     serf_context_t* getSerfContext();
-    SerfConnection* getSerfConnection();
+    serf_connection_t* getSerfConnection();
 
     // DAVSession methods
     virtual sal_Bool CanUse( const OUString & inUri );
@@ -274,7 +275,7 @@ private:
 
     /*
     // low level GET implementation, used by public GET implementations
-    static int GET( SerfConnection * sess,
+    static int GET( serf_connection_t * sess,
                     const char * uri,
                     //ne_block_reader reader,
                     bool getheaders,
@@ -282,14 +283,14 @@ private:
 
     // Buffer-based PUT implementation. Serf only has file descriptor-
     // based API.
-    static int PUT( SerfConnection * sess,
+    static int PUT( serf_connection_t * sess,
                     const char * uri,
                     const char * buffer,
                     size_t size );
 
     // Buffer-based POST implementation. Serf only has file descriptor-
     // based API.
-    int POST( SerfConnection * sess,
+    int POST( serf_connection_t * sess,
               const char * uri,
               const char * buffer,
               //ne_block_reader reader,
diff --git a/ucb/source/ucp/webdav/SerfTypes.hxx b/ucb/source/ucp/webdav/SerfTypes.hxx
deleted file mode 100644
index 2393458c8ef4..000000000000
--- a/ucb/source/ucp/webdav/SerfTypes.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-
-#ifndef INCLUDED_SERFTYPES_HXX
-#define INCLUDED_SERFTYPES_HXX
-
-#include <serf.h>
-
-typedef serf_connection_t SerfConnection;
-
-// TODO, check if we need it later on
-typedef struct { const char *nspace, *name; } SerfPropName;
-
-#endif // INCLUDED_SERFTYPES_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */