-#ifndef __DALI_TOOLKIT_INTERNAL_BUILDER_H__
-#define __DALI_TOOLKIT_INTERNAL_BUILDER_H__
+#ifndef DALI_TOOLKIT_INTERNAL_BUILDER_H
+#define DALI_TOOLKIT_INTERNAL_BUILDER_H
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
#include <string>
#include <list>
#include <map>
-#include <dali/public-api/common/stage.h>
#include <dali/public-api/common/vector-wrapper.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/object/base-object.h>
#include <dali-toolkit/internal/builder/style.h>
// Warning messages usually displayed
-#define DALI_SCRIPT_WARNING(format, args...) \
- DALI_LOG_WARNING("Script:" format, ## args)
+#define DALI_SCRIPT_WARNING(format, ...) \
+ DALI_LOG_WARNING("Script:" format, ## __VA_ARGS__)
// Info messages are usually debug build
-#define DALI_SCRIPT_INFO(format, args...) \
- DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## args)
+#define DALI_SCRIPT_INFO(format, ...) \
+ DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::General, "Script:" format, ## __VA_ARGS__)
// Info Verbose need to be swiched on in gFilterScript filter constructor (by default set to General)
-#define DALI_SCRIPT_VERBOSE(format, args...) \
- DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## args)
+#define DALI_SCRIPT_VERBOSE(format, ...) \
+ DALI_LOG_INFO(Dali::Toolkit::Internal::gFilterScript, Debug::Verbose, "Script:" format, ## __VA_ARGS__)
namespace Dali
{
void CreateRenderTask( const std::string &name );
/**
- * @copydoc Toolkit::Builder::GetFrameBufferImage
- */
- FrameBufferImage GetFrameBufferImage( const std::string &name );
-
- /**
- * @copydoc Toolkit::Builder::GetFrameBufferImage
- */
- FrameBufferImage GetFrameBufferImage( const std::string &name, const Replacement& constant );
-
- /**
* @copydoc Toolkit::Builder::GetPath
*/
Path GetPath( const std::string &name );
protected:
- virtual ~Builder();
+ ~Builder() override;
private:
typedef std::vector<const char*> KeyStack;
typedef struct{ std::string name; Dali::PathConstrainer pathConstrainer; } PathConstrainerEntry;
typedef std::vector<PathConstrainerEntry> PathConstrainerLut;
typedef std::map<const std::string, Path> PathLut;
- typedef std::map<const std::string, FrameBufferImage> ImageLut;
private:
// Undefined
private:
Toolkit::JsonParser mParser;
- ImageLut mFrameBufferImageLut;
PathLut mPathLut;
PathConstrainerLut mPathConstrainerLut;
LinearConstrainerLut mLinearConstrainerLut;
} // namespace Dali
-#endif // __DALI_TOOLKIT_INTERNAL_BUILDER_H__
+#endif // DALI_TOOLKIT_INTERNAL_BUILDER_H