Fixed svace issues

Change-Id: Ib231a7b1458bcde2ab93b12cccc041c6b8869575
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

diff --git a/.cproject b/.cproject
index 2173ec7..a728278 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -22,11 +22,11 @@
                                                        <targetPlatform binaryParser="org.eclipse.cdt.core.ELF" id="org.tizen.nativeide.target.sbi.gnu.platform.base.1078985799" osList="linux,win32" superClass="org.tizen.nativeide.target.sbi.gnu.platform.base"/>
                                                        <builder autoBuildTarget="all" buildPath="${workspace_loc:/message}/Debug" enableAutoBuild="true" id="org.tizen.nativecore.target.sbi.gnu.builder.2025850746" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Tizen Application Builder" superClass="org.tizen.nativecore.target.sbi.gnu.builder"/>
                                                        <tool id="org.tizen.nativecore.tool.sbi.gnu.archiver.18326482" name="Archiver" superClass="org.tizen.nativecore.tool.sbi.gnu.archiver"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1423898485" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
+                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler.1423898485" name="C++ Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.compiler">
                                                                <option id="gnu.cpp.compiler.option.optimization.level.1653852227" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.debugging.level.core.1490846576" name="Debug level" superClass="sbi.gnu.cpp.compiler.option.debugging.level.core" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.cpp.compiler.option.1319825360" name="Tizen-Target" superClass="sbi.gnu.cpp.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_gcc49.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.cpp.compiler.option.frameworks_inc.core.2127815365" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.cpp.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -178,11 +178,11 @@
                                                                <option id="gnu.cpp.compiler.option.dialect.std.1078481445" name="Language standard" superClass="gnu.cpp.compiler.option.dialect.std" value="gnu.cpp.compiler.dialect.c++11" valueType="enumerated"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1417905130" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
-                                                       <tool command="clang" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1387778936" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
+                                                       <tool command="arm-linux-gnueabi-gcc" id="org.tizen.nativecore.tool.sbi.gnu.c.compiler.1387778936" name="C Compiler" superClass="org.tizen.nativecore.tool.sbi.gnu.c.compiler">
                                                                <option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.1184990383" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.debugging.level.core.1010664246" name="Debug level" superClass="sbi.gnu.c.compiler.option.debugging.level.core" value="gnu.c.debugging.level.max" valueType="enumerated"/>
                                                                <option id="sbi.gnu.c.compiler.option.1648892250" name="Tizen-Target" superClass="sbi.gnu.c.compiler.option" valueType="userObjs">
-                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_llvm36.armel.core.app"/>
+                                                                       <listOptionValue builtIn="false" value="mobile-3.0-device.core.private_gcc49.armel.core.app"/>
                                                                </option>
                                                                <option id="sbi.gnu.c.compiler.option.frameworks_inc.core.1505824004" name="Tizen-Frameworks-Include-Path" superClass="sbi.gnu.c.compiler.option.frameworks_inc.core" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;${SBI_SYSROOT}/usr/include/libxml2&quot;"/>
@@ -305,10 +305,11 @@
                                                                        <listOptionValue builtIn="false" value=""/>
                                                                </option>
                                                                <option id="gnu.c.compiler.option.misc.other.1180439494" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0" valueType="string"/>
+                                                               <option id="gnu.c.compiler.option.dialect.std.1104421294" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1240601561" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
                                                        <tool id="org.tizen.nativeide.tool.sbi.gnu.c.linker.base.1212756061" name="C Linker" superClass="org.tizen.nativeide.tool.sbi.gnu.c.linker.base"/>
-                                                       <tool command="clang++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1174656272" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
+                                                       <tool command="arm-linux-gnueabi-g++" id="org.tizen.nativecore.tool.sbi.gnu.cpp.linker.1174656272" name="C++ Linker" superClass="org.tizen.nativecore.tool.sbi.gnu.cpp.linker">
                                                                <option id="sbi.gnu.cpp.linker.option.frameworks_lflags.core.56400147" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.core" valueType="stringList">
                                                                        <listOptionValue builtIn="false" value="${TC_LINKER_MISC}"/>
                                                                        <listOptionValue builtIn="false" value="${RS_LINKER_MISC}"/>

diff --git a/src/Conversation/ConvList/Controller/src/ConvList.cpp b/src/Conversation/ConvList/Controller/src/ConvList.cpp
index 30e84b1..fb1f12a 100644 (file)
--- a/src/Conversation/ConvList/Controller/src/ConvList.cpp
+++ b/src/Conversation/ConvList/Controller/src/ConvList.cpp
@@ -218,12 +218,12 @@ void ConvList::dateLineDelIfNec(ConvListItem *item)
     {
         ListItem *nextItem = m_pList->getNextItem(*item);
         needDelDateLine = nextItem ? dynamic_cast<DateLineItem*>(nextItem) != nullptr : true;
-    }
 
-    if(needDelDateLine)
-    {
-        m_DateLineItemSet.erase(prev->getDateLine());
-        m_pList->deleteItem(*prev);
+        if(needDelDateLine)
+        {
+            m_DateLineItemSet.erase(prev->getDateLine());
+            m_pList->deleteItem(*prev);
+        }
     }
 }
 

diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp
index 46e9020..f4c405b 100644 (file)
--- a/src/Conversation/Main/Controller/src/Conversation.cpp
+++ b/src/Conversation/Main/Controller/src/Conversation.cpp
@@ -110,8 +110,10 @@ void Conversation::execCmd(const AppControlComposeRef &cmd)
         m_pBody->execCmd(cmd);
     }
 
-    if(isRecipExists())
+    if(isRecipExists() && m_pBody)
+    {
         m_pBody->setFocus(true);
+    }
     else if(m_pRecipPanel)
         m_pRecipPanel->setEntryFocus(true);
 }

diff --git a/src/Viewer/Controller/src/SmilPage.cpp b/src/Viewer/Controller/src/SmilPage.cpp
index c21e087..4ab3721 100644 (file)
--- a/src/Viewer/Controller/src/SmilPage.cpp
+++ b/src/Viewer/Controller/src/SmilPage.cpp
@@ -132,23 +132,24 @@ void SmilPage::build(const MsgPage &page)
 
     // TODO: image/video, text order
 
-    bool hasVideo = getMedia(page, MsgMedia::VideoType) != nullptr;
-
-    if(hasVideo)
-        buildVideo(*getMedia(page, MsgMedia::VideoType));
-
-    if(!hasVideo)
+    const MsgMedia *video = getMedia(page, MsgMedia::VideoType);
+    if(video)
+        buildVideo(*video);
+    else
     {
-        if(const MsgMedia *image = getMedia(page, MsgMedia::ImageType))
+        const MsgMedia *image = getMedia(page, MsgMedia::ImageType);
+        if(image)
             buildImage(*image);
     }
 
-    if(const MsgMedia *text = getMedia(page, MsgMedia::TextType))
+    const MsgMedia *text = getMedia(page, MsgMedia::TextType);
+    if(text)
         buildText(*text);
 
-    if(!hasVideo)
+    if(!video)
     {
-        if(const MsgMedia *audio = getMedia(page, MsgMedia::AudioType))
+        const MsgMedia *audio = getMedia(page, MsgMedia::AudioType);
+        if(audio)
             buildAudio(*audio);
     }
 

diff --git a/src/Viewer/View/src/SmilVideoItemView.cpp b/src/Viewer/View/src/SmilVideoItemView.cpp
index cdb5ddc..e3db136 100644 (file)
--- a/src/Viewer/View/src/SmilVideoItemView.cpp
+++ b/src/Viewer/View/src/SmilVideoItemView.cpp
@@ -62,11 +62,6 @@ namespace
             w = contentW * canvasHeight / contentH;
             h = canvasHeight;
         }
-        else
-        {
-            w = contentW;
-            h = contentH;
-        }
 
         // Uncomment if needed:
         #if 0