[Libreoffice-commits] core.git: l10ntools/inc l10ntools/source l10ntools/StaticLibrary_transex.mk
Zolnai Tamás
zolnaitamas2000 at gmail.com
Tue Mar 19 15:26:31 PDT 2013
l10ntools/StaticLibrary_transex.mk | 2
l10ntools/inc/directory.hxx | 69 ----------
l10ntools/inc/export.hxx | 5
l10ntools/inc/file.hxx | 43 ------
l10ntools/source/directory.cxx | 254 -------------------------------------
l10ntools/source/file.cxx | 42 ------
6 files changed, 415 deletions(-)
New commits:
commit 9d64e7f2b723a7bc711c2acc8da99944b30761ef
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Tue Mar 19 23:20:16 2013 +0100
These classes are not used
Classes with same function: osl::Directory, osl::File
Change-Id: I0e8d18bab6ee244da274c733b8f1f646897afc7d
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index a6f4d21..033358a 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -45,8 +45,6 @@ $(eval $(call gb_StaticLibrary_use_externals,transex,\
$(eval $(call gb_StaticLibrary_add_exception_objects,transex,\
l10ntools/source/export2 \
l10ntools/source/merge \
- l10ntools/source/file \
- l10ntools/source/directory \
l10ntools/source/po \
))
diff --git a/l10ntools/inc/directory.hxx b/l10ntools/inc/directory.hxx
deleted file mode 100644
index 2e6da89..0000000
--- a/l10ntools/inc/directory.hxx
+++ /dev/null
@@ -1,69 +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 .
- */
-
-#include <vector>
-#include <algorithm>
-#include <rtl/ustring.hxx>
-
-#ifdef WNT
-#else
-#include <dirent.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#endif
-
-#include <stdio.h>
-
-#ifndef L10NTOOLS_FILE_HXX
-#define L10NTOOLS_FILE_HXX
-#include "file.hxx"
-#endif
-
-namespace transex{
-
-class Directory
-{
- private:
- rtl::OUString sDirectoryName;
- rtl::OUString sFullName;
-
- std::vector<Directory> aDirVec;
- std::vector<File> aFileVec;
-
- public:
- std::vector<Directory> getSubDirectories() { return aDirVec; }
- std::vector<File> getFiles() { return aFileVec; }
-
- void readDirectory( const rtl::OUString& sFullpath );
- void scanSubDir( int nLevels = 0 );
-
- rtl::OUString getDirectoryName() { return sDirectoryName; }
- rtl::OUString getFullName() { return sFullName ; }
-
- void dump();
- Directory(){}
-
- Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry ) ;
-
- static bool lessDir ( const Directory& rKey1, const Directory& rKey2 ) ;
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx
index 050ded5..564e877 100644
--- a/l10ntools/inc/export.hxx
+++ b/l10ntools/inc/export.hxx
@@ -26,11 +26,6 @@
#include <cstddef>
#include <fstream>
-#ifndef L10NTOOLS_DIRECTORY_HXX
-#define L10NTOOLS_DIRECTORY_HXX
-#include "directory.hxx"
-#endif
-
#include <osl/file.hxx>
#include <osl/file.h>
diff --git a/l10ntools/inc/file.hxx b/l10ntools/inc/file.hxx
deleted file mode 100644
index 8c900dd..0000000
--- a/l10ntools/inc/file.hxx
+++ /dev/null
@@ -1,43 +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 .
- */
-
-#include "rtl/ustring.hxx"
-
-namespace transex
-{
-
-class File
-{
- private:
- rtl::OUString sFileName;
- rtl::OUString sFullName;
-
- public:
- rtl::OUString getFileName(){ return sFileName; }
- rtl::OUString getFullName(){ return sFullName; }
-
- File( const rtl::OUString sFullName , const rtl::OUString sFile );
-
- static bool lessFile ( const File& rKey1, const File& rKey2 );
-
-};
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/directory.cxx b/l10ntools/source/directory.cxx
deleted file mode 100644
index 9f6d73c..0000000
--- a/l10ntools/source/directory.cxx
+++ /dev/null
@@ -1,254 +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 .
- */
-
-
-
-#ifdef WNT
-#include <windows.h>
-#endif
-
-#include "directory.hxx"
-#include <rtl/ustring.hxx>
-#include <iostream>
-#include <vector>
-#include <algorithm>
-
-namespace transex
-{
-
-Directory::Directory( const rtl::OUString sFullPath , const rtl::OUString sEntry )
-{
- sFullName = sFullPath;
- sDirectoryName = sEntry;
-}
-
-bool Directory::lessDir ( const Directory& rKey1, const Directory& rKey2 )
-{
- rtl::OUString sName1( ( static_cast< Directory >( rKey1 ) ).getDirectoryName() );
- rtl::OUString sName2( ( static_cast< Directory >( rKey2 ) ).getDirectoryName() );
-
- return sName1.compareTo( sName2 ) < 0 ;
-}
-
-
-void Directory::dump()
-{
-
- for( std::vector< transex::File >::iterator iter = aFileVec.begin() ; iter != aFileVec.end() ; ++iter )
- {
- std::cout << "FILE " << rtl::OUStringToOString( (*iter).getFullName().getStr() , RTL_TEXTENCODING_UTF8 , (*iter).getFullName().getLength() ).getStr() << "\n";
- }
-
- for( std::vector< transex::Directory >::iterator iter = aDirVec.begin() ; iter != aDirVec.end() ; ++iter )
- {
- std::cout << "DIR " << rtl::OUStringToOString( (*iter).getFullName().getStr() , RTL_TEXTENCODING_UTF8 , (*iter).getFullName().getLength() ).getStr() << "\n";
- }
-
-}
-
-void Directory::scanSubDir( int nLevels )
-{
- readDirectory( sFullName );
- dump();
- if( nLevels > 0 ) {
- for( std::vector< transex::Directory >::iterator iter = aDirVec.begin() ; iter != aDirVec.end() && nLevels > 0 ; ++iter , nLevels-- )
- {
- ( *iter ).scanSubDir();
- }
- }
-}
-
-#ifdef WNT
-
-void Directory::readDirectory ( const rtl::OUString& sFullpath )
-{
- sal_Bool fFinished;
- HANDLE hList;
- TCHAR szDir[MAX_PATH+1];
- TCHAR szSubDir[MAX_PATH+1];
- WIN32_FIND_DATA FileData;
-
- rtl::OString sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 , sFullpath.getLength() );
- const char *dirname = sFullpathext.getStr();
-
- // Get the proper directory path
- sprintf(szDir, "%s\\*", dirname);
-
- // Get the first file
- hList = FindFirstFile(szDir, &FileData);
- if (hList == INVALID_HANDLE_VALUE)
- {
- //FindClose(hList);
- //printf("No files found %s\n", szDir ); return;
- }
- else
- {
- fFinished = sal_False;
- while (!fFinished)
- {
-
- sprintf(szSubDir, "%s\\%s", dirname, FileData.cFileName);
- rtl::OString myfile( FileData.cFileName );
- rtl::OString mydir( szSubDir );
-
- if (FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
- {
- if ( (strcmp(FileData.cFileName, ".") != 0 ) &&
- (strcmp(FileData.cFileName, "..") != 0 ) )
- {
- //sprintf(szSubDir, "%s\\%s", dirname, FileData.cFileName);
- transex::Directory aDir( rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
- rtl::OStringToOUString( myfile , RTL_TEXTENCODING_UTF8 , myfile.getLength() ) );
- aDirVec.push_back( aDir );
- }
- }
- else
- {
- transex::File aFile( rtl::OStringToOUString( mydir , RTL_TEXTENCODING_UTF8 , mydir.getLength() ),
- rtl::OStringToOUString( myfile , RTL_TEXTENCODING_UTF8 , myfile.getLength() ) );
- aFileVec.push_back( aFile );
- }
- if (!FindNextFile(hList, &FileData))
- {
- if (GetLastError() == ERROR_NO_MORE_FILES)
- {
- fFinished = sal_True;
- }
- }
- }
- }
-
- FindClose(hList);
-
- ::std::sort( aFileVec.begin() , aFileVec.end() , File::lessFile );
- ::std::sort( aDirVec.begin() , aDirVec.end() , Directory::lessDir );
-}
-
-#else
-
-class dirholder
-{
-private:
- DIR *mpDir;
-public:
- dirholder(DIR *pDir) : mpDir(pDir) {}
- int close() { int nRet = mpDir ? closedir(mpDir) : 0; mpDir = NULL; return nRet; }
- ~dirholder() { close(); }
-};
-
-void Directory::readDirectory( const rtl::OUString& sFullpath )
-{
- struct stat statbuf;
- struct stat statbuf2;
- struct dirent *dirp;
- DIR *dir;
-
- if(sFullpath.isEmpty()) return;
-
- rtl::OString sFullpathext = rtl::OUStringToOString( sFullpath , RTL_TEXTENCODING_UTF8 );
-
- // stat
- if( stat( sFullpathext.getStr(), &statbuf ) < 0 )
- {
- printf("warning: Cannot stat %s \n" , sFullpathext.getStr() );
- return;
- }
-
- if( S_ISDIR(statbuf.st_mode ) == 0 )
- return;
-
- if( (dir = opendir( sFullpathext.getStr() ) ) == NULL )
- {
- printf("read error 2 in %s \n",sFullpathext.getStr());
- return;
- }
-
- dirholder aHolder(dir);
-
- const rtl::OString sDot ( "." ) ;
- const rtl::OString sDDot( ".." );
-
- if ( chdir( sFullpathext.getStr() ) == -1 )
- {
- printf("chdir error in %s \n",sFullpathext.getStr());
- return;
- }
-
- sFullpathext += rtl::OString( "/" );
-
- while( ( dirp = readdir( dir ) ) != NULL )
- {
- rtl::OString sEntryName( dirp->d_name );
-
- if( sEntryName.equals( sDot ) || sEntryName.equals( sDDot ) )
- continue;
-
- // add dir entry
- rtl::OString sEntity = sFullpathext;
- sEntity += sEntryName;
-
- // stat new entry
- if( lstat( sEntity.getStr() , &statbuf2 ) < 0 )
- {
- printf("error on entry %s\n" , sEntity.getStr() ) ;
- continue;
- }
-
- // add file / dir to vector
- switch( statbuf2.st_mode & S_IFMT )
- {
- case S_IFREG:
- {
- transex::File aFile( rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
- rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
- );
-
- aFileVec.push_back( aFile ) ;
- break;
- }
- case S_IFLNK:
- case S_IFDIR:
- {
- transex::Directory aDir(
- rtl::OStringToOUString( sEntity , RTL_TEXTENCODING_UTF8 , sEntity.getLength() ) ,
- rtl::OStringToOUString( sEntryName , RTL_TEXTENCODING_UTF8 , sEntryName.getLength() )
- ) ;
- aDirVec.push_back( aDir ) ;
- break;
- }
- }
- }
- if ( chdir( ".." ) == -1 )
- {
- printf("chdir error in .. \n");
- return;
- }
-
- if ( aHolder.close() < 0 )
- return;
-
- std::sort( aFileVec.begin() , aFileVec.end() , File::lessFile );
- std::sort( aDirVec.begin() , aDirVec.end() , Directory::lessDir );
-
-}
-
-#endif
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/l10ntools/source/file.cxx b/l10ntools/source/file.cxx
deleted file mode 100644
index 9f8c003..0000000
--- a/l10ntools/source/file.cxx
+++ /dev/null
@@ -1,42 +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 .
- */
-
-
-#include "file.hxx"
-
-namespace transex
-{
-
-File::File( const rtl::OUString sFullPath , const rtl::OUString sFile )
-{
- sFileName = sFile;
- sFullName = sFullPath;
-}
-
-bool File::lessFile ( const File& rKey1, const File& rKey2 )
-{
- rtl::OUString sName1( ( static_cast< File >( rKey1 ) ).getFileName() );
- rtl::OUString sName2( ( static_cast< File >( rKey2 ) ).getFileName() );
-
- return sName1.compareTo( sName2 ) < 0 ;
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list