tools: move FileCopier out of public headers, and remove unused bits.

Change-Id: Iccd052ae2587bb4448ecb5bc94aeba5dd2a2291e

tools/inc/tools-internal.hxx

+/* -*- 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 _TOOLS_INTERNAL_HXX
+#define _TOOLS_INTERNAL_HXX
+
+// This header contains classes we're trying to kill and use only
+// internally inside tools
+
+#include <tools/fsys.hxx>
+
+struct FileCopier_Impl;
+
+// FSysExact
+enum FSysExact
+{
+    FSYS_NOTEXACT,
+    FSYS_EXACT
+};
+
+// FileCopier (a private impl. detail of tools/)
+
+class FileCopier
+{
+    DirEntry            aSource;
+    DirEntry            aTarget;
+    sal_uIntPtr         nBytesTotal;
+    sal_uIntPtr         nBytesCopied;
+    Link                aProgressLink;
+    sal_uInt16          nBlockSize;
+    FileCopier_Impl*    pImp;
+
+private:
+    TOOLS_DLLPRIVATE FSysError DoCopy_Impl(
+        const DirEntry &rSource, const DirEntry &rTarget );
+
+protected:
+    virtual sal_Bool    Progress();
+    virtual ErrCode     Error( ErrCode eErr,
+                               const DirEntry *pSource, const DirEntry *pTarget );
+
+public:
+                        FileCopier( const DirEntry &rSource,
+                                    const DirEntry &rTarget );
+                        FileCopier( const FileCopier &rCopier );
+                        virtual ~FileCopier();
+
+    FileCopier&         operator =( const FileCopier &rCopier );
+
+    void                SetBlockSize( sal_uInt16 nBytes ) { nBlockSize = nBytes; }
+    sal_uInt16          GetBlockSize() const { return nBlockSize; }
+
+    sal_uIntPtr         GetBytesTotal() const { return nBytesTotal; }
+    sal_uIntPtr         GetBytesCopied() const { return nBytesCopied; }
+
+    void                SetSource( const DirEntry &rSource ) { aSource = rSource; }
+    void                SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; }
+    const DirEntry&     GetSource() const { return aSource; }
+    const DirEntry&     GetTarget() const { return aTarget; }
+
+    FSysError           Execute( FSysAction nActions = FSYS_ACTION_STANDARD );
+    FSysError           ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
+                                      FSysExact  eExact = FSYS_NOTEXACT);
+
+    void                SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
+    const Link&         GetProgressHdl() const { return aProgressLink; }
+};
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

tools/inc/tools/fsys.hxx

@@ -35,21 +35,12 @@
 // FSys-Types
 class DirEntry;
 class FileStat;
-struct FileCopier_Impl;
 class SvFileStream;
 class BigInt;
 
 typedef ::std::vector< DirEntry* > DirEntryList;
 typedef ::std::vector< FileStat* > FileStatList;
 
-#define FSYS_SHORTNAME_DELIMITER    '@'
-
-// FSysAccess
-typedef int FSysAccess;
-#define FSYS_ACCESS_FORCED          1
-#define FSYS_ACCESS_FLOPPY          FSYS_ACCESS_FORCED
-#define FSYS_ACCESS_CACHED          2
-
 // DirEntryKind
 typedef int DirEntryKind;
 #define FSYS_KIND_NONE              ((DirEntryKind)     0)
@@ -107,6 +98,12 @@ enum FSysPathStyle
     FSYS_STYLE_DETECT,
 };
 
+// FSysAccess
+typedef int FSysAccess;
+#define FSYS_ACCESS_CACHED          2
+#define FSYS_ACCESS_FORCED          1
+#define FSYS_ACCESS_FLOPPY          FSYS_ACCESS_FORCED
+
 // FSysAction
 typedef int FSysAction;
 #define FSYS_ACTION_COPYFILE        0x01    // not only create hardlink
@@ -124,13 +121,6 @@ typedef int FSysAction;
 
 typedef sal_uIntPtr FSysError;
 
-// FSysExact
-enum FSysExact
-{
-    FSYS_NOTEXACT,
-    FSYS_EXACT
-};
-
 // FileStat
 struct dirent;
 
@@ -249,10 +239,6 @@ public:
     void                SetExtension( const String& rExt, char cSep = '.' );
     String              GetExtension( char cSep = '.' ) const;
     void                SetName( const String& rName, FSysPathStyle eFormatter = FSYS_STYLE_HOST );
-    const String        GetNameDirect() const
-    {
-        return rtl::OStringToOUString(aName, osl_getThreadTextEncoding());
-    }
     String              GetName( FSysPathStyle eFormatter = FSYS_STYLE_HOST ) const;
     String              CutName( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
     String              GetBase(char cSep = '.' ) const;
@@ -309,54 +295,6 @@ public:
     static String       GetSearchDelimiter( FSysPathStyle eFormatter = FSYS_STYLE_HOST );
 };
 
-// FileCopier (a private impl. detail of tools/)
-
-class FileCopier
-{
-    DirEntry            aSource;
-    DirEntry            aTarget;
-    sal_uIntPtr         nBytesTotal;
-    sal_uIntPtr         nBytesCopied;
-    Link                aProgressLink;
-    sal_uInt16          nBlockSize;
-    FileCopier_Impl*    pImp;
-
-private:
-    TOOLS_DLLPRIVATE FSysError DoCopy_Impl(
-        const DirEntry &rSource, const DirEntry &rTarget );
-
-protected:
-    virtual sal_Bool    Progress();
-    virtual ErrCode     Error( ErrCode eErr,
-                               const DirEntry *pSource, const DirEntry *pTarget );
-
-public:
-                        FileCopier( const DirEntry &rSource,
-                                    const DirEntry &rTarget );
-                        FileCopier( const FileCopier &rCopier );
-                        virtual ~FileCopier();
-
-    FileCopier&         operator =( const FileCopier &rCopier );
-
-    void                SetBlockSize( sal_uInt16 nBytes ) { nBlockSize = nBytes; }
-    sal_uInt16          GetBlockSize() const { return nBlockSize; }
-
-    sal_uIntPtr         GetBytesTotal() const { return nBytesTotal; }
-    sal_uIntPtr         GetBytesCopied() const { return nBytesCopied; }
-
-    void                SetSource( const DirEntry &rSource ) { aSource = rSource; }
-    void                SetTarget( const DirEntry &rTarget ) { aTarget = rTarget; }
-    const DirEntry&     GetSource() const { return aSource; }
-    const DirEntry&     GetTarget() const { return aTarget; }
-
-    FSysError           Execute( FSysAction nActions = FSYS_ACTION_STANDARD );
-    FSysError           ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
-                                      FSysExact  eExact = FSYS_NOTEXACT);
-
-    void                SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
-    const Link&         GetProgressHdl() const { return aProgressLink; }
-};
-
 // Dir
 
 struct DirReader_Impl;

tools/source/fsys/comdep.hxx

@@ -19,7 +19,7 @@
 #ifndef _COMDEP_HXX
 #define _COMDEP_HXX
 
-#include <tools/fsys.hxx>
+#include "tools-internal.hxx"
 
 #define ACCESSDELIM(e)  ( ( e == FSYS_STYLE_NTFS ) ? "\\" : "/" )
 #define ACCESSDELIM_C(e)(char)\

tools/source/fsys/filecopy.cxx

@@ -33,7 +33,6 @@
 
 #include <stdio.h>
 #include "comdep.hxx"
-#include <tools/fsys.hxx>
 #include <tools/stream.hxx>
 #include <osl/file.hxx>