reduce <vector> include from 73 to 3

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21909 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2fbef702a4bf229adeb8b2e0d53a11aba60a9d32..9eabc12967ac35f252c91c007346d4c2e127dc90 100644 (file)
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -91,6 +91,7 @@
 #include "support/Path.h"
 #include "support/textutils.h"
 #include "support/types.h"
+#include "support/FileZipListDir.h"
 
 #if !defined (HAVE_FORK)
 # define fork() -1

diff --git a/src/Converter.cpp b/src/Converter.cpp
index fc82114308018ffbb6d284c006800b2f2e52d9ab..e6f67460feabad06070e499345cef7e7ba95fd5f 100644 (file)
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -33,6 +33,7 @@
 #include "support/Package.h"
 #include "support/Path.h"
 #include "support/Systemcall.h"
+#include "support/FileZipListDir.h"
 
 using std::find_if;
 using std::string;

diff --git a/src/EmbeddedFiles.cpp b/src/EmbeddedFiles.cpp
index e5d56e24370acde7d7ae78a127440c72a8f18c47..5ef9da5792d8cdde7458725bd588415107cd378e 100644 (file)
--- a/src/EmbeddedFiles.cpp
+++ b/src/EmbeddedFiles.cpp
@@ -32,6 +32,7 @@
 #include "support/convert.h"
 #include "support/lyxlib.h"
 #include "support/lstrings.h"
+#include "support/FileZipListDir.h"
 
 #include <sstream>
 #include <fstream>

diff --git a/src/support/FileZipListDir.h b/src/support/FileZipListDir.h
new file mode 100644 (file)
index 0000000..d49e050
--- /dev/null
+++ b/src/support/FileZipListDir.h
@@ -0,0 +1,42 @@
+// -*- C++ -*-
+/**
+ * \file FileZipDir.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Lars Gullik Bjønnes
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef LYX_FILEZIPDIR_H
+#define LYX_FILEZIPDIR_H
+
+#include "support/docstring.h"
+#include "support/filetools.h"
+
+#include <vector>
+#include <utility>
+#include <string>
+
+namespace lyx {
+namespace support {
+
+/// \return list other files in the directory having optional extension 'ext'.
+std::vector<FileName> dirList(FileName const & filename, std::string const & ext);
+
+
+} // namespace support
+} // namespace lyx
+
+/// The following functions are implemented in minizip/zipunzip.cpp, and are not in
+/// the lyx::support namespace
+
+/// zip several files to a zipfile. In-zip filenames are also specified
+bool zipFiles(std::string const & zipfile, std::vector<std::pair<std::string, std::string> > const & files);
+
+/// Unzip a zip file to a directory
+bool unzipToDir(std::string const & zipfile, std::string const & path);
+
+
+#endif

diff --git a/src/support/filetools.h b/src/support/filetools.h
index dce6e6979d06d8164ca12faf4201859ad4be7985..2ea500a8aaa73858c28fc4343615f7004596f89f 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -15,7 +15,6 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 
-#include <vector>
 #include <utility>
 #include <string>
 
@@ -275,21 +274,10 @@ typedef std::pair<int, std::string> cmd_ret;
 
 cmd_ret const runCommand(std::string const & cmd);
 
-/// \return list other files in the directory having optional extension 'ext'.
-std::vector<FileName> dirList(FileName const & filename, std::string const & ext);
-
 
 } // namespace support
 } // namespace lyx
 
-/// The following functions are implemented in minizip/zipunzip.cpp, and are not in
-/// the lyx::support namespace
-
-/// zip several files to a zipfile. In-zip filenames are also specified
-bool zipFiles(std::string const & zipfile, std::vector<std::pair<std::string, std::string> > const & files);
-
-/// Unzip a zip file to a directory
-bool unzipToDir(std::string const & zipfile, std::string const & path);
 
 
 #endif