diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:32:36 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-02 18:33:37 +0200 |
commit | 54e87df11faf697d3b2666198a3d20b3ee091419 (patch) | |
tree | 8cfe316f012a4969ca6980fa6ac2fdb3a9424118 /include/tools | |
parent | 3aac11a1233f679ea813fee8b8de134553d7db60 (diff) |
Change INetProtocol enumerators to CamelCase
...to avoid clashes with macros and poor warnings about hiding global FILE
Change-Id: I444e8b958f029201b228937e088efabc4b6d3050
Diffstat (limited to 'include/tools')
-rw-r--r-- | include/tools/urlobj.hxx | 82 |
1 files changed, 41 insertions, 41 deletions
diff --git a/include/tools/urlobj.hxx b/include/tools/urlobj.hxx index 50c5b5109b40..fd7dc2d76a88 100644 --- a/include/tools/urlobj.hxx +++ b/include/tools/urlobj.hxx @@ -66,41 +66,41 @@ enum // Schemes: enum class INetProtocol { - NOT_VALID, - FTP, - HTTP, - FILE, - MAILTO, - VND_SUN_STAR_WEBDAV, - NEWS, - PRIV_SOFFICE, - VND_SUN_STAR_HELP, - HTTPS, - SLOT, - MACRO, - JAVASCRIPT, - IMAP, - POP3, - DATA, - CID, - OUT, - VND_SUN_STAR_HIER, - VIM, - UNO, - COMPONENT, - VND_SUN_STAR_PKG, - LDAP, - DB, - VND_SUN_STAR_CMD, - TELNET, - VND_SUN_STAR_EXPAND, - VND_SUN_STAR_TDOC, - GENERIC, - SMB, - HID, - SFTP, - CMIS, - LAST = CMIS + NotValid, + Ftp, + Http, + File, + Mailto, + VndSunStarWebdav, + News, + PrivSoffice, + VndSunStarHelp, + Https, + Slot, + Macro, + Javascript, + Imap, + Pop3, + Data, + Cid, + Out, + VndSunStarHier, + Vim, + Uno, + Component, + VndSunStarPkg, + Ldap, + Db, + VndSunStarCmd, + Telnet, + VndSunStarExpand, + VndSunStarTdoc, + Generic, + Smb, + Hid, + Sftp, + Cmis, + LAST = Cmis }; class TOOLS_DLLPUBLIC SAL_WARN_UNUSED INetURLObject @@ -182,9 +182,9 @@ public: // General Structure: inline INetURLObject(): - m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP) {} + m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) {} - inline bool HasError() const { return m_eScheme == INetProtocol::NOT_VALID; } + inline bool HasError() const { return m_eScheme == INetProtocol::NotValid; } inline OUString GetMainURL(DecodeMechanism eMechanism, rtl_TextEncoding eCharset @@ -1234,7 +1234,7 @@ private: // Coding: static inline sal_Char getEscapePrefix(INetProtocol eTheScheme) - { return eTheScheme == INetProtocol::VIM ? '=' : '%'; } + { return eTheScheme == INetProtocol::Vim ? '=' : '%'; } inline sal_Char getEscapePrefix() const { return getEscapePrefix(m_eScheme); } @@ -1299,7 +1299,7 @@ inline OUString INetURLObject::decode(SubString const & rSubString, inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset): - m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP) + m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) { setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, false, FSysStyle(0)); @@ -1318,7 +1318,7 @@ inline INetURLObject::INetURLObject(OUString const & rTheAbsURIRef, EncodeMechanism eMechanism, rtl_TextEncoding eCharset, FSysStyle eStyle): - m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(eTheSmartScheme) + m_eScheme(INetProtocol::NotValid), m_eSmartScheme(eTheSmartScheme) { setAbsURIRef(rTheAbsURIRef, false, eMechanism, eCharset, true, eStyle); } @@ -1456,7 +1456,7 @@ inline bool INetURLObject::SetMark(OUString const & rTheFragment, inline INetURLObject::INetURLObject(OUString const & rFSysPath, FSysStyle eStyle): - m_eScheme(INetProtocol::NOT_VALID), m_eSmartScheme(INetProtocol::HTTP) + m_eScheme(INetProtocol::NotValid), m_eSmartScheme(INetProtocol::Http) { setFSysPath(rFSysPath, eStyle); } |