Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(518)

Unified Diff: webrtc/base/pathutils.h

Issue 2877023002: Move webrtc/{base => rtc_base} (Closed)
Patch Set: update presubmit.py and DEPS include rules Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/base/optionsfile_unittest.cc ('k') | webrtc/base/pathutils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/pathutils.h
diff --git a/webrtc/base/pathutils.h b/webrtc/base/pathutils.h
index ff0906938b2e4798bd9cf8bdc4571c099ad4e38a..b45ca04f7c173b6f59fc1bac28286605e2d35d4d 100644
--- a/webrtc/base/pathutils.h
+++ b/webrtc/base/pathutils.h
@@ -8,86 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_BASE_PATHUTILS_H__
-#define WEBRTC_BASE_PATHUTILS_H__
+#ifndef WEBRTC_BASE_PATHUTILS_H_
+#define WEBRTC_BASE_PATHUTILS_H_
-#include <string>
-#include "webrtc/base/checks.h"
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/pathutils.h"
-namespace rtc {
-
-///////////////////////////////////////////////////////////////////////////////
-// Pathname - parsing of pathnames into components, and vice versa.
-//
-// To establish consistent terminology, a filename never contains a folder
-// component. A folder never contains a filename. A pathname may include
-// a folder and/or filename component. Here are some examples:
-//
-// pathname() /home/john/example.txt
-// folder() /home/john/
-// filename() example.txt
-// parent_folder() /home/
-// folder_name() john/
-// basename() example
-// extension() .txt
-//
-// Basename may begin, end, and/or include periods, but no folder delimiters.
-// If extension exists, it consists of a period followed by zero or more
-// non-period/non-delimiter characters, and basename is non-empty.
-///////////////////////////////////////////////////////////////////////////////
-
-class Pathname {
-public:
- // Folder delimiters are slash and backslash
- static bool IsFolderDelimiter(char ch);
- static char DefaultFolderDelimiter();
-
- Pathname();
- Pathname(const Pathname&);
- Pathname(Pathname&&);
- Pathname(const std::string& pathname);
- Pathname(const std::string& folder, const std::string& filename);
-
- Pathname& operator=(const Pathname&);
- Pathname& operator=(Pathname&&);
-
- // Normalize changes all folder delimiters to folder_delimiter()
- void Normalize();
-
- // Reset to the empty pathname
- void clear();
-
- // Returns true if the pathname is empty. Note: this->pathname().empty()
- // is always false.
- bool empty() const;
-
- // Returns the folder and filename components. If the pathname is empty,
- // returns a string representing the current directory (as a relative path,
- // i.e., ".").
- std::string pathname() const;
- void SetPathname(const std::string& pathname);
- void SetPathname(const std::string& folder, const std::string& filename);
-
- std::string folder() const;
- std::string parent_folder() const;
- // SetFolder and AppendFolder will append a folder delimiter, if needed.
- void SetFolder(const std::string& folder);
- void AppendFolder(const std::string& folder);
-
- bool SetBasename(const std::string& basename);
-
- // SetExtension will prefix a period, if needed.
- bool SetExtension(const std::string& extension);
-
- std::string filename() const;
- bool SetFilename(const std::string& filename);
-
-private:
- std::string folder_, basename_, extension_;
- char folder_delimiter_;
-};
-
-} // namespace rtc
-
-#endif // WEBRTC_BASE_PATHUTILS_H__
+#endif // WEBRTC_BASE_PATHUTILS_H_
« no previous file with comments | « webrtc/base/optionsfile_unittest.cc ('k') | webrtc/base/pathutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698