License conversion from Flora to Apache 2.0

[platform/core/uifw/dali-core.git] / dali / internal / event / text / font-metrics.h

diff --git a/dali/internal/event/text/font-metrics.h b/dali/internal/event/text/font-metrics.h
index e57b0b6..253af01 100644 (file)
--- a/dali/internal/event/text/font-metrics.h
+++ b/dali/internal/event/text/font-metrics.h
@@ -1,21 +1,22 @@
 #ifndef __DALI_INTERNAL_FONT_METRICS_H__
 #define __DALI_INTERNAL_FONT_METRICS_H__
 
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <string>
@@ -65,7 +66,6 @@ namespace Internal
 // Forward declarations.
 
 class FontMetrics;
-class ResourceClient;
 
 typedef IntrusivePtr<FontMetrics> FontMetricsIntrusivePtr;
 
@@ -88,15 +88,13 @@ public:
    * @param [in] fontId font id.
    * @param [in] fontFamily the font family
    * @param [in] fontStyle the font style
-   * @param [in] resourceClient resource client
    * @return An intrusive-pointer to the new instance.
    */
   static FontMetricsIntrusivePtr New( const Vector2& dpi,
                                       const std::size_t hashValue,
                                       const FontId fontId,
                                       const std::string& fontFamily,
-                                      const std::string& fontStyle,
-                                      ResourceClient& resourceClient );
+                                      const std::string& fontStyle );
 
 
   /**
@@ -291,8 +289,7 @@ private:
                const std::size_t hashValue,
                const FontId fontId,
                const std::string& fontFamily,
-               const std::string& fontStyle,
-               ResourceClient& resourceClient );
+               const std::string& fontStyle );
 
   /**
    * Virtual destructor.
@@ -317,7 +314,6 @@ private:
   unsigned int          mFontCount;             ///< How many font objects are using this font, used to know when it should be deleted from font factory
   bool                  mMetricsLoaded;         ///< Whether the metrics cache has been loaded
   Integration::PlatformAbstraction& mPlatform;  ///< platform abstraction
-  ResourceClient&       mResourceClient;        ///< resource client
 };
 
 } // namespace Internal