mozilla-kde.patch
changeset 762 f20576d5885a
parent 760 7c3ac3010cc6
child 766 e0b23b7851e9
equal deleted inserted replaced
748:72ba5129e5fd 762:f20576d5885a
  2717 +}
  2717 +}
  2718 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
  2718 diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler/unix/nsCommonRegistry.h
  2719 new file mode 100644
  2719 new file mode 100644
  2720 --- /dev/null
  2720 --- /dev/null
  2721 +++ b/uriloader/exthandler/unix/nsCommonRegistry.h
  2721 +++ b/uriloader/exthandler/unix/nsCommonRegistry.h
  2722 @@ -0,0 +1,23 @@
  2722 @@ -0,0 +1,28 @@
  2723 +/* This Source Code Form is subject to the terms of the Mozilla Public
  2723 +/* This Source Code Form is subject to the terms of the Mozilla Public
  2724 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  2724 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  2725 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  2725 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
       
  2726 +
       
  2727 +#ifndef nsCommonRegistry_h__
       
  2728 +#define nsCommonRegistry_h__
  2726 +
  2729 +
  2727 +#include "nsIURI.h"
  2730 +#include "nsIURI.h"
  2728 +#include "nsCOMPtr.h"
  2731 +#include "nsCOMPtr.h"
  2729 +
  2732 +
  2730 +class nsMIMEInfoBase;
  2733 +class nsMIMEInfoBase;
  2741 +
  2744 +
  2742 +  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt);
  2745 +  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const nsACString& aFileExt);
  2743 +
  2746 +
  2744 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
  2747 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
  2745 +};
  2748 +};
       
  2749 +
       
  2750 +#endif
  2746 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
  2751 diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
  2747 new file mode 100644
  2752 new file mode 100644
  2748 --- /dev/null
  2753 --- /dev/null
  2749 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
  2754 +++ b/uriloader/exthandler/unix/nsKDERegistry.cpp
  2750 @@ -0,0 +1,88 @@
  2755 @@ -0,0 +1,88 @@
  2838 +}
  2843 +}
  2839 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
  2844 diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/unix/nsKDERegistry.h
  2840 new file mode 100644
  2845 new file mode 100644
  2841 --- /dev/null
  2846 --- /dev/null
  2842 +++ b/uriloader/exthandler/unix/nsKDERegistry.h
  2847 +++ b/uriloader/exthandler/unix/nsKDERegistry.h
  2843 @@ -0,0 +1,29 @@
  2848 @@ -0,0 +1,34 @@
  2844 +/* This Source Code Form is subject to the terms of the Mozilla Public
  2849 +/* This Source Code Form is subject to the terms of the Mozilla Public
  2845 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  2850 + * License, v. 2.0. If a copy of the MPL was not distributed with this
  2846 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  2851 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
       
  2852 +
       
  2853 +#ifndef nsKDERegistry_h__
       
  2854 +#define nsKDERegistry_h__
  2847 +
  2855 +
  2848 +#include "nsIURI.h"
  2856 +#include "nsIURI.h"
  2849 +#include "nsCOMPtr.h"
  2857 +#include "nsCOMPtr.h"
  2850 +#include "nsTArray.h"
  2858 +#include "nsTArray.h"
  2851 +
  2859 +
  2868 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
  2876 +  static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
  2869 + private:
  2877 + private:
  2870 +  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
  2878 +  static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command);
  2871 +
  2879 +
  2872 +};
  2880 +};
       
  2881 +
       
  2882 +#endif //nsKDERegistry_h__
  2873 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2883 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2874 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2884 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2875 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2885 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
  2876 @@ -10,30 +10,33 @@
  2886 @@ -10,30 +10,33 @@
  2877  #include <QString>
  2887  #include <QString>