From ebdd2382d3451a1b579ee31ddb20dacf5ef7e0a9 Mon Sep 17 00:00:00 2001 From: Soyoung Kim Date: Wed, 17 Jul 2013 20:53:55 +0900 Subject: [PATCH] code cleanup [Issue#] N/A [Problem] N/A [Cause] N/A [Solution] unused code cleanup [SCMRequest] N/A Change-Id: I5277748a059a453103873a6373dfd729c6666a65 --- src/jobs/widget_install/task_widget_config.cpp | 8 -------- src/jobs/widget_install/task_widget_config.h | 8 -------- src/wrt-installer/wrt-installer.cpp | 9 --------- src/wrt-installer/wrt-installer.h | 1 - 4 files changed, 26 deletions(-) diff --git a/src/jobs/widget_install/task_widget_config.cpp b/src/jobs/widget_install/task_widget_config.cpp index 936e912..9544a31 100644 --- a/src/jobs/widget_install/task_widget_config.cpp +++ b/src/jobs/widget_install/task_widget_config.cpp @@ -67,11 +67,6 @@ const char WRT_WIDGETS_XML_SCHEMA[] = "/usr/etc/wrt-installer/widgets.xsd"; namespace Jobs { namespace WidgetInstall { -void InstallerTaskWidgetPopupData::PopupData::addWidgetInfo( - const DPL::String &info) -{ - widgetInfo = info; -} TaskWidgetConfig::TaskWidgetConfig(InstallerContext& installContext) : DPL::TaskDecl(this), @@ -521,9 +516,6 @@ void TaskWidgetConfig::StepVerifyFeatures() featureInfo += DPL::ToUTF8String(BR); } data.featuresList = newList; - if (!featureInfo.empty()) { - m_popupData.addWidgetInfo(DPL::FromUTF8String(featureInfo)); - } m_installContext.job->UpdateProgress( InstallerContext::INSTALL_WIDGET_CONFIG2, diff --git a/src/jobs/widget_install/task_widget_config.h b/src/jobs/widget_install/task_widget_config.h index 785d7fc..71b8a67 100755 --- a/src/jobs/widget_install/task_widget_config.h +++ b/src/jobs/widget_install/task_widget_config.h @@ -39,13 +39,6 @@ class InstallerContext; namespace Jobs { namespace WidgetInstall { -namespace InstallerTaskWidgetPopupData { -struct PopupData -{ - DPL::String widgetInfo; - void addWidgetInfo(const DPL::String &info); -}; -} // InstalllerTaskWidgetPopupData class TaskWidgetConfig : public DPL::TaskDecl @@ -63,7 +56,6 @@ class TaskWidgetConfig : InstallerContext& m_installContext; WrtDB::LocaleSet m_localeFolders; std::set m_processedIconSet; - InstallerTaskWidgetPopupData::PopupData m_popupData; void StepProcessConfigurationFile(); void ReadLocaleFolders(); diff --git a/src/wrt-installer/wrt-installer.cpp b/src/wrt-installer/wrt-installer.cpp index 4121d93..3913a62 100644 --- a/src/wrt-installer/wrt-installer.cpp +++ b/src/wrt-installer/wrt-installer.cpp @@ -1152,15 +1152,6 @@ int main(int argc, char *argv[]) LogError("getrlimit is fail!!"); } - // set evas backend type for emulator - // popup isn't showed in the emulator, - // if backend isn't set to SW backend - if (GlobalSettings::IsEmulator()) { - if (setenv("ELM_ENGINE", "x11", 1)) { - LogDebug("Enable backend"); - } - } - WrtInstaller app(argc, argv); int ret = app.Exec(); LogDebug("App returned: " << ret); diff --git a/src/wrt-installer/wrt-installer.h b/src/wrt-installer/wrt-installer.h index 4405a07..8f6a5bd 100644 --- a/src/wrt-installer/wrt-installer.h +++ b/src/wrt-installer/wrt-installer.h @@ -129,7 +129,6 @@ class WrtInstaller : void* userdata); void installNewPlugins(); - bool popupsEnabled() const; CSCConfiguration::dataMap parseCSCConfiguration(std::string str); void showErrorMsg(WrtErrStatus status, std::string tizenId, std::string printMsg); -- 2.7.4