From ca822b5283bf7a1ef36c042f6b5576b674e36126 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Mon, 25 Mar 2013 04:07:21 +0000 Subject: [PATCH] Update License 2012 -> 2013 Change-Id: I02dc7b5af7467f0a6ae791c722ce51bbf90e3640 --- LICENSE | 2 +- include/CModule.h | 2 +- include/c-abi.h | 2 +- include/debug.h | 2 +- include/dlist.h | 2 +- include/livebox-cpp.h | 2 +- include/livebox-impl.h | 2 +- packaging/liblivebox-cpp.spec | 4 ++-- src/CModule.cpp | 11 +++++---- src/dlist.cpp | 2 +- src/livebox.cpp | 55 ++++++++++++++++++++++--------------------- 11 files changed, 44 insertions(+), 42 deletions(-) diff --git a/LICENSE b/LICENSE index 27daa90..009765e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ Flora License -Version 1.0, May, 2012 +Version 1.0, May, 2013 http://www.tizenopensource.org/license diff --git a/include/CModule.h b/include/CModule.h index baed1f6..eb44391 100644 --- a/include/CModule.h +++ b/include/CModule.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/include/c-abi.h b/include/c-abi.h index a8ae6af..ca233c3 100644 --- a/include/c-abi.h +++ b/include/c-abi.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/include/debug.h b/include/debug.h index 925dd47..5af77f5 100644 --- a/include/debug.h +++ b/include/debug.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/include/dlist.h b/include/dlist.h index a0ad1a0..71008f8 100644 --- a/include/dlist.h +++ b/include/dlist.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/include/livebox-cpp.h b/include/livebox-cpp.h index ba864b9..257dd7d 100644 --- a/include/livebox-cpp.h +++ b/include/livebox-cpp.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/include/livebox-impl.h b/include/livebox-impl.h index ddedc2a..b2d4fdd 100644 --- a/include/livebox-impl.h +++ b/include/livebox-impl.h @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/packaging/liblivebox-cpp.spec b/packaging/liblivebox-cpp.spec index 56a588d..4087701 100644 --- a/packaging/liblivebox-cpp.spec +++ b/packaging/liblivebox-cpp.spec @@ -1,8 +1,8 @@ Name: liblivebox-cpp Summary: C++ adaptor for a livebox -Version: 0.2.4 +Version: 0.2.6 Release: 1 -Group: main/app +Group: HomeTF/Livebox License: Flora License Source0: %{name}-%{version}.tar.gz BuildRequires: cmake, gettext-tools, coreutils diff --git a/src/CModule.cpp b/src/CModule.cpp index 511a74f..805a5ce 100644 --- a/src/CModule.cpp +++ b/src/CModule.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. @@ -22,6 +22,7 @@ #include #include +#include #include "debug.h" #include "livebox-cpp.h" @@ -121,7 +122,7 @@ int CModule::Unload(void) dlclose(m_pHandle); free(m_sPkgname); delete this; - return 0; + return LB_STATUS_SUCCESS; } int CModule::Create(const char *filename, const char *content, const char *cluster, const char *category) @@ -141,7 +142,7 @@ int CModule::Create(const char *filename, const char *content, const char *clust return 0; } - return -EFAULT; + return LB_STATUS_ERROR_FAULT; } int CModule::Destroy(CLiveBoxImpl *inst) @@ -150,11 +151,11 @@ int CModule::Destroy(CLiveBoxImpl *inst) l = dlist_find_data(m_pList, inst); if (!l) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; m_pList = dlist_remove(m_pList, l); delete inst; - return 0; + return LB_STATUS_SUCCESS; } CLiveBoxImpl *CModule::FindLiveBox(const char *filename) diff --git a/src/dlist.cpp b/src/dlist.cpp index f535d74..4e99e22 100644 --- a/src/dlist.cpp +++ b/src/dlist.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. diff --git a/src/livebox.cpp b/src/livebox.cpp index d68d030..d0755f1 100644 --- a/src/livebox.cpp +++ b/src/livebox.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2012 Samsung Electronics Co., Ltd + * Copyright 2013 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. @@ -19,6 +19,7 @@ #include #include +#include #include "livebox-cpp.h" #include "livebox-impl.h" @@ -33,13 +34,13 @@ EAPI int livebox_initialize(const char *pkgname) module = CModule::FindModule(pkgname); if (module) - return 0; + return LB_STATUS_SUCCESS; module = CModule::Load(pkgname); if (!module) - return -EFAULT; + return LB_STATUS_ERROR_FAULT; - return 0; + return LB_STATUS_SUCCESS; } EAPI int livebox_finalize(const char *pkgname) @@ -48,10 +49,10 @@ EAPI int livebox_finalize(const char *pkgname) module = CModule::FindModule(pkgname); if (!module) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; module->Unload(); - return 0; + return LB_STATUS_SUCCESS; } EAPI int livebox_create(const char *pkgname, const char *filename, const char *content, const char *cluster, const char *category) @@ -62,11 +63,11 @@ EAPI int livebox_create(const char *pkgname, const char *filename, const char *c module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (box) - return -EEXIST; + return LB_STATUS_ERROR_NOT_EXIST; ret = module->Create(filename, content, cluster, category); return ret; @@ -80,11 +81,11 @@ EAPI int livebox_destroy(const char *pkgname, const char *filename) module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; ret = module->Destroy(box); return ret; @@ -97,11 +98,11 @@ EAPI int livebox_need_to_update(const char *pkgname, const char *filename) module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->NeedToUpdate(); } @@ -113,11 +114,11 @@ EAPI int livebox_need_to_destroy(const char *pkgname, const char *filename) module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->NeedToDestroy(); } @@ -129,11 +130,11 @@ EAPI int livebox_update_content(const char *pkgname, const char *filename) module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->UpdateContent(); } @@ -145,11 +146,11 @@ EAPI int livebox_clicked(const char *pkgname, const char *filename, const char * module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->Clicked(event, timestamp, x, y); } @@ -161,11 +162,11 @@ EAPI int livebox_content_event(const char *pkgname, const char *filename, const module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->ContentEvent(emission, source, event_info); } @@ -177,11 +178,11 @@ EAPI int livebox_resize(const char *pkgname, const char *filename, int type) module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->Resize(type); } @@ -193,11 +194,11 @@ EAPI int livebox_change_group(const char *pkgname, const char *filename, const c module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->ChangeGroup(cluster, category); } @@ -209,11 +210,11 @@ EAPI int livebox_get_info(const char *pkgname, const char *filename, int *w, int module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; box = module->FindLiveBox(filename); if (!box) - return -ENOENT; + return LB_STATUS_ERROR_NOT_EXIST; return box->GetInfo(w, h, priority, content, title); } @@ -224,7 +225,7 @@ EAPI int livebox_need_to_create(const char *pkgname, const char *cluster, const module = CModule::FindModule(pkgname); if (!module) - return -EINVAL; + return LB_STATUS_ERROR_INVALID; return module->NeedToCreate(cluster, category); } -- 2.7.4