Build fixes

This commit is contained in:
Vinnie Falco
2013-09-27 05:14:59 -07:00
parent d5d37466e0
commit 1ef044d628
3 changed files with 8 additions and 10 deletions

View File

@@ -44,16 +44,16 @@ HTTPVersion& HTTPVersion::operator= (HTTPVersion const& other)
String HTTPVersion::toString () const
{
return String::fromNumber (major ()) + "." +
String::fromNumber (minor ());
return String::fromNumber (vmajor ()) + "." +
String::fromNumber (vminor ());
}
unsigned short HTTPVersion::major () const
unsigned short HTTPVersion::vmajor () const
{
return m_major;
}
unsigned short HTTPVersion::minor () const
unsigned short HTTPVersion::vminor () const
{
return m_minor;
}

View File

@@ -29,8 +29,8 @@ public:
HTTPVersion (HTTPVersion const& other);
HTTPVersion& operator= (HTTPVersion const& other);
String toString () const;
unsigned short major () const;
unsigned short minor () const;
unsigned short vmajor () const;
unsigned short vminor () const;
bool operator== (HTTPVersion const& rhs) const;
bool operator!= (HTTPVersion const& rhs) const;
bool operator> (HTTPVersion const& rhs) const;
@@ -40,7 +40,7 @@ public:
private:
unsigned short m_major;
unsigned short m_minor;;
unsigned short m_minor;
};
#endif

View File

@@ -329,9 +329,7 @@ bool Process::openDocument (const String& fileName, const String& parameters)
String cmdString (fileName.replace (" ", "\\ ",false));
cmdString << " " << parameters;
if (URL::isProbablyAWebsiteURL (fileName)
|| cmdString.startsWithIgnoreCase ("file:")
|| URL::isProbablyAnEmailAddress (fileName)
if ( cmdString.startsWithIgnoreCase ("file:")
|| File::createFileWithoutCheckingPath (fileName).isDirectory()
|| ! isFileExecutable (fileName))
{