Change ItemFactory destructor to be not pure virtual

Change-Id: I171fda6c72a9ec33bb16406fb873d5c6d07c72ad

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp
deleted file mode 100644 (file)
index 4aec6f3..0000000
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2015 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.
- *
- */
-
-#include <dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h>
-
-namespace Dali
-{
-
-namespace Toolkit
-{
-
-ItemFactory::~ItemFactory()
-{
-}
-
-} // namespace Toolkit
-
-} // namespace Dali

diff --git a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
index 97d12f6..d018716 100644 (file)
--- a/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
+++ b/dali-toolkit/public-api/controls/scrollable/item-view/item-factory.h
@@ -40,7 +40,7 @@ public:
   /**
    * @brief Virtual destructor.
    */
-  DALI_EXPORT_API virtual ~ItemFactory() = 0;
+  DALI_EXPORT_API virtual ~ItemFactory() {};
 
   /**
    * @brief Query the number of items available from the factory.

diff --git a/dali-toolkit/public-api/file.list b/dali-toolkit/public-api/file.list
index d64c5d2..a7371c9 100755 (executable)
--- a/dali-toolkit/public-api/file.list
+++ b/dali-toolkit/public-api/file.list
@@ -11,7 +11,6 @@ public_api_src_files = \
   $(public_api_src_dir)/controls/default-controls/solid-color-actor.cpp \
   $(public_api_src_dir)/controls/scroll-bar/scroll-bar.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/default-item-layout.cpp \
-  $(public_api_src_dir)/controls/scrollable/item-view/item-factory.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-layout.cpp \
   $(public_api_src_dir)/controls/scrollable/item-view/item-view.cpp \
   $(public_api_src_dir)/controls/scrollable/scroll-view/scroll-view-constraints.cpp \