From da7b4b7925a4444e6f6a87a460c5346bfc9302ad Mon Sep 17 00:00:00 2001 From: sangsoo lee Date: Thu, 18 Apr 2013 22:11:37 +0900 Subject: [PATCH] fix duplicate definition error Change-Id: If7051430f3326152b2beb29afc451d34946b91ea --- inc/IstTypes.h | 55 ------------------------------------------------------- src/IstTypes.cpp | 44 -------------------------------------------- 2 files changed, 99 deletions(-) delete mode 100644 inc/IstTypes.h delete mode 100644 src/IstTypes.cpp diff --git a/inc/IstTypes.h b/inc/IstTypes.h deleted file mode 100644 index 8b4858e..0000000 --- a/inc/IstTypes.h +++ /dev/null @@ -1,55 +0,0 @@ -// -// Copyright (c) 2012 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. -// - -/** - * @file: IstTypes.h - * @brief: This file contains common enumerators, static constants used across the application - */ - -#ifndef _IST_TYPES_H_ -#define _IST_TYPES_H_ - -#include -#include - -using namespace Tizen::Graphics; - -static const int INSTALL_SUCCESS_EVENT = 2000; -static const int INSTALL_FAIL_STORAGE_FULL = 2001; -static const int INSTALL_FAIL_INVALID_PACKAGE = 2002; -static const int INSTALL_PROGRESS_VALUE = 2003; - -extern const wchar_t* HEADER_IMAGE; -extern const wchar_t* APP_NAME; -extern const wchar_t* FILE_URI_SCHEME; - -extern Tizen::Base::String __uriData; -extern Tizen::Base::String __packagePath; - -extern const int GAP_BETWEEN_FORM_POPUP; -extern const int X_POPUP_LABLE; -extern const int Y_POPUP_LABLE; -extern const int H_POPUP_LABLE; -extern const int GAP_BETWEEN_POPUP_LABEL; -extern const int GAP_BETWEEN_POPUP_BUTTON; -extern const int UI_H_POPUP; -extern const int UI_H_POPUP_BUTTON; -extern const int H_POPUP_TITLE; -extern const int H_TEXT_LINE; -extern const int GAP_BETWEEN_BUTTON; -extern const int X_CANCEL_BTN_ALONE; - -#endif /* _IST_TYPES_H_ */ diff --git a/src/IstTypes.cpp b/src/IstTypes.cpp deleted file mode 100644 index f8da658..0000000 --- a/src/IstTypes.cpp +++ /dev/null @@ -1,44 +0,0 @@ -// -// Copyright (c) 2012 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. -// - -/** - * @file: IstTypes.cpp - * @brief: This file contains common enumerators, static constants used across the application - */ - - -#include "IstTypes.h" - -const int GAP_BETWEEN_FORM_POPUP = 28; -const int X_POPUP_LABLE = 0; -const int Y_POPUP_LABLE = 0; -const int H_POPUP_LABLE = 300; -const int GAP_BETWEEN_POPUP_LABEL = 25; -const int GAP_BETWEEN_POPUP_BUTTON = GAP_BETWEEN_POPUP_LABEL; -const int UI_H_POPUP = 330; -const int UI_H_POPUP_BUTTON = 74; -const int H_POPUP_TITLE = 50; -const int H_TEXT_LINE = 150; -const int GAP_BETWEEN_BUTTON = 10; -const int X_CANCEL_BTN_ALONE = 160; - - -const wchar_t* HEADER_IMAGE = L"home_type3.png"; -const wchar_t* APP_NAME = L"Installer"; -const wchar_t* FILE_URI_SCHEME = L"file://"; - -Tizen::Base::String __uriData; -Tizen::Base::String __packagePath; -- 2.7.4