Clean source codes

Change-Id: Ib658635d06f4971415c78d48d94dcb4bae062225
Signed-off-by: Kim Tae Soo <taesoo46.kim@samsung.com>

diff --git a/src/data/AlbumStorage.cpp b/src/data/AlbumStorage.cpp
index 045018c..8e454a1 100644 (file)
--- a/src/data/AlbumStorage.cpp
+++ b/src/data/AlbumStorage.cpp
@@ -19,11 +19,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"

diff --git a/src/data/CategoryStorage.cpp b/src/data/CategoryStorage.cpp
index 11cbed3..e0e9c83 100644 (file)
--- a/src/data/CategoryStorage.cpp
+++ b/src/data/CategoryStorage.cpp
@@ -18,11 +18,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"

diff --git a/src/data/FolderStorage.cpp b/src/data/FolderStorage.cpp
index 53f6c98..2cabd5e 100644 (file)
--- a/src/data/FolderStorage.cpp
+++ b/src/data/FolderStorage.cpp
@@ -14,15 +14,13 @@
  * limitations under the License.
  */
 
-
 #include <media_content.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"

diff --git a/src/data/SongStorage.cpp b/src/data/SongStorage.cpp
index a80f5ac..cb0e953 100644 (file)
--- a/src/data/SongStorage.cpp
+++ b/src/data/SongStorage.cpp
@@ -18,10 +18,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"

diff --git a/src/data/album_info.cpp b/src/data/album_info.cpp
index 27490a2..b210da4 100644 (file)
--- a/src/data/album_info.cpp
+++ b/src/data/album_info.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "album_info.h"
 
 

diff --git a/src/data/bus.cpp b/src/data/bus.cpp
index bfcbe0a..577577b 100644 (file)
--- a/src/data/bus.cpp
+++ b/src/data/bus.cpp
@@ -16,14 +16,13 @@
 
 #include <gio/gio.h>
 #include <stdlib.h>
+#include <AppCommon.h>
 
-#include <MacroDefine.h>
-
-#define BUS_NAME        "org.tizen.tv.homescreen.music"
-#define BUS_OBJECT_PATH "/org/tizen/tv/music"
-#define BUS_INTERFACE   "org.tizen.tv.homescreen.dynamicbox"
+#define BUS_NAME          "org.tizen.tv.homescreen.music"
+#define BUS_OBJECT_PATH   "/org/tizen/tv/music"
+#define BUS_INTERFACE     "org.tizen.tv.homescreen.dynamicbox"
 #define BUS_SIGNAL_UPDATE "Update"
-#define BUS_TYPE G_BUS_TYPE_SYSTEM
+#define BUS_TYPE          G_BUS_TYPE_SYSTEM
 
 static void _proxy_cb(GObject *obj, GAsyncResult *res, gpointer data)
 {

diff --git a/src/data/category_info.cpp b/src/data/category_info.cpp
index edf40f8..507f8a5 100644 (file)
--- a/src/data/category_info.cpp
+++ b/src/data/category_info.cpp
@@ -16,9 +16,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "i18n.h"
-
 #include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "category_info.h"
 

diff --git a/src/data/folder_info.cpp b/src/data/folder_info.cpp
index 3b44ee2..0319fbe 100644 (file)
--- a/src/data/folder_info.cpp
+++ b/src/data/folder_info.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "folder_info.h"
 
 

diff --git a/src/data/mediadata.cpp b/src/data/mediadata.cpp
index 83bbfe4..b45fae2 100644 (file)
--- a/src/data/mediadata.cpp
+++ b/src/data/mediadata.cpp
@@ -18,10 +18,9 @@
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "song_info.h"
 #include "album_info.h"
 #include "category_info.h"
@@ -33,10 +32,10 @@
 #include "mediadata.h"
 #include "common.h"
 
-#define MEDIA_CONDITION_MUSIC          "(MEDIA_TYPE=3)"
-#define MEDIA_CONDITION_INTERNAL       "(MEDIA_STORAGE_TYPE=0)"
-#define MEDIA_CONDITION_EXTERNAL       "(MEDIA_STORAGE_TYPE=1)"
-#define MUSIC_STR_UNKNOWN              N_("Unknown")
+#define MEDIA_CONDITION_MUSIC    "(MEDIA_TYPE=3)"
+#define MEDIA_CONDITION_INTERNAL "(MEDIA_STORAGE_TYPE=0)"
+#define MEDIA_CONDITION_EXTERNAL "(MEDIA_STORAGE_TYPE=1)"
+#define MUSIC_STR_UNKNOWN        N_("Unknown")
 
 
 struct SMediadata {

diff --git a/src/data/song_info.cpp b/src/data/song_info.cpp
index d4e5361..20f9391 100644 (file)
--- a/src/data/song_info.cpp
+++ b/src/data/song_info.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "song_info.h"
 
 

diff --git a/src/main.cpp b/src/main.cpp
index 1ec108c..ec5e952 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,7 +15,6 @@
  */
 
 #include <AppCommon.h>
-
 #include "song_info.h"
 #include "album_info.h"
 #include "define.h"
@@ -25,10 +24,10 @@
 #include "playback-view.h"
 #include "context-view.h"
 
-#define PARAM_ALBUM    "album_id"
-#define PARAM_URI      "uri"
-#define PARAM_SOURCE   "source"
-#define MUSIC_WIN_TITLE        "Music Player"
+#define PARAM_ALBUM     "album_id"
+#define PARAM_URI       "uri"
+#define PARAM_SOURCE    "source"
+#define MUSIC_WIN_TITLE "Music Player"
 
 
 SET_TAG("org.tizen.music-player-tv-ref");
@@ -83,8 +82,6 @@ protected:
        {
                Evas_Object *win;
 
-               // To fix ghost phenomenon
-               //win = elm_win_add(NULL, name, ELM_WIN_BASIC);
                win = elm_win_util_standard_add(name, NULL);
                if (!win)
                        return NULL;
@@ -231,7 +228,6 @@ public:
 
        virtual int Run(int argc, char **argv) {
                memset(&ad, 0x00, sizeof(_appdata));
-               //ad.name = PACKAGE;
 
                return CBaseApp::Run(argc, argv);
        }
@@ -245,41 +241,3 @@ int main(int argc, char **argv)
        
        return 0;
 }
-#if 0
-static int depth = 0;
-const char* szDepth[] = {
-       "  ",
-       "    ",
-       "      ",
-       "        ",
-       "          ",
-       "            ",
-       "              ",
-       "                ",
-       "                  ",
-       "                    ",
-       "                      ",
-};
-
-void __cyg_profile_func_enter(void *this_fn, void *call_site) __attribute__((no_instrument_function));
-void __cyg_profile_func_enter(void *this_fn, void *call_site)
-{
-       if (depth <= 10) {
-               printf("%s", szDepth[depth]);
-               _DBG("%s>%p/%p", szDepth[depth], call_site, this_fn);
-       }
-       printf(">%p/%p\n", call_site, this_fn);
-       depth++;
-}
-/* __cyg_profile_func_enter */
-void __cyg_profile_func_exit(void *this_fn, void *call_site) __attribute__((no_instrument_function));
-void __cyg_profile_func_exit(void *this_fn, void *call_site)
-{
-       depth--;
-       if (depth <= 10) {
-               printf("%s", szDepth[depth]);
-               _DBG("%s<%p/%p", szDepth[depth], call_site, this_fn);
-       }
-       printf("<%p/%p\n", call_site, this_fn);
-} /* __cyg_profile_func_enter */
-#endif

diff --git a/src/playback/MusicControllerImpl.cpp b/src/playback/MusicControllerImpl.cpp
index b5d98f9..6d8e083 100644 (file)
--- a/src/playback/MusicControllerImpl.cpp
+++ b/src/playback/MusicControllerImpl.cpp
@@ -16,9 +16,8 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include "i18n.h"
 #include <AppCommon.h>
-
+#include "i18n.h"
 #include "song_info.h"
 #include "album_info.h"
 #include "folder_info.h"

diff --git a/src/playback/music-controller.cpp b/src/playback/music-controller.cpp
index c4b012c..66e16fb 100644 (file)
--- a/src/playback/music-controller.cpp
+++ b/src/playback/music-controller.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
+
 #include <string.h>
 #include <stdlib.h>
 #include <AppCommon.h>

diff --git a/src/playback/playback-mgr.cpp b/src/playback/playback-mgr.cpp
index f18fa38..4f802f2 100644 (file)
--- a/src/playback/playback-mgr.cpp
+++ b/src/playback/playback-mgr.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <stdlib.h>
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "playback-mgr.h"
 
 

diff --git a/src/playback/playlist-mgr.cpp b/src/playback/playlist-mgr.cpp
index 60cf351..91ca518 100644 (file)
--- a/src/playback/playlist-mgr.cpp
+++ b/src/playback/playlist-mgr.cpp
@@ -16,8 +16,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "song_info.h"
 #include "playlist-mgr.h"
 #include "time.h"

diff --git a/src/playback/volume-control.cpp b/src/playback/volume-control.cpp
index b9a23cd..8c11e3b 100644 (file)
--- a/src/playback/volume-control.cpp
+++ b/src/playback/volume-control.cpp
@@ -16,13 +16,14 @@
 
 #include <stdlib.h>
 #include <media/sound_manager.h>
-#include <volume-control.h>
 #include <AppCommon.h>
+#include "volume-control.h"
 
 
 #define VOLUME_MUTE    1
 #define VOLUME_UNMUTE  0
 
+
 struct SVolumeController {
        int currentVolume;
        bool flagMute;

diff --git a/src/views/ErrorPopupWindow.cpp b/src/views/ErrorPopupWindow.cpp
index 352de4f..824ba76 100644 (file)
--- a/src/views/ErrorPopupWindow.cpp
+++ b/src/views/ErrorPopupWindow.cpp
@@ -1,22 +1,22 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
 #include "common.h"
 #include "ErrorPopupWindow.h"
 

diff --git a/src/views/HandleVolume.cpp b/src/views/HandleVolume.cpp
index ec0abdc..a16f26f 100644 (file)
--- a/src/views/HandleVolume.cpp
+++ b/src/views/HandleVolume.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "define.h"
 #include <AppCommon.h>
+#include "define.h"
 #include "common.h"
 #include "common-ui.h"
 #include "HandleVolume.h"

diff --git a/src/views/Info.cpp b/src/views/Info.cpp
index 0c09e22..0ac9801 100644 (file)
--- a/src/views/Info.cpp
+++ b/src/views/Info.cpp
@@ -1,24 +1,24 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "Info.h"
-#include <AppCommon.h>
 
 
 struct SInfo {
@@ -30,6 +30,7 @@ struct SInfo {
 
 static SInfo g_info;
 
+
 void CInfo::SetSourceType(int type)
 {
        g_info.sourceType = type;

diff --git a/src/views/PlayListCtxPopup.cpp b/src/views/PlayListCtxPopup.cpp
index 124192e..09a0d39 100644 (file)
--- a/src/views/PlayListCtxPopup.cpp
+++ b/src/views/PlayListCtxPopup.cpp
@@ -1,22 +1,22 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
 #include "common.h"
 #include "Info.h"
 #include "PlayListCtxPopup.h"

diff --git a/src/views/PlaySettingCtxPopup.cpp b/src/views/PlaySettingCtxPopup.cpp
index 097361f..2bfdd01 100644 (file)
--- a/src/views/PlaySettingCtxPopup.cpp
+++ b/src/views/PlaySettingCtxPopup.cpp
@@ -1,26 +1,27 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "Info.h"
-#include <AppCommon.h>
 #include "PlaySettingCtxPopup.h"
 
+
 #define TOTAL_SETTING_BTNS 2
 
 const char *settingText[TOTAL_SETTING_BTNS] = {
@@ -33,6 +34,7 @@ const char *settingBtnId[TOTAL_SETTING_BTNS] = {
        "clear"
 };
 
+
 void CPlaySettingCtxPopup::t_OnConfiguration(void)
 {
        t_SetList(settingText, TOTAL_SETTING_BTNS, 0,

diff --git a/src/views/PlaybackController.cpp b/src/views/PlaybackController.cpp
index 7628753..a606020 100644 (file)
--- a/src/views/PlaybackController.cpp
+++ b/src/views/PlaybackController.cpp
@@ -1,33 +1,31 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
-#include <AppCommon.h>
-
 #include "song_info.h"
 #include "music-controller.h"
-#include "i18n.h"
 #include "common-ui.h"
 #include "PlaySettingCtxPopup.h"
 #include "ErrorPopupWindow.h"
 #include "Info.h"
 #include "PlaybackController.h"
 
-
 #define TOTAL_CONTROL_BTNS 6
 #define TOTAL_EDIT_BTNS    3
 #define LP_INTERVAL        0.5   /* seconds */

diff --git a/src/views/RemovePopupWindow.cpp b/src/views/RemovePopupWindow.cpp
index 8b19d0b..9afc293 100644 (file)
--- a/src/views/RemovePopupWindow.cpp
+++ b/src/views/RemovePopupWindow.cpp
@@ -1,22 +1,22 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
 #include "common.h"
 #include "RemovePopupWindow.h"
 

diff --git a/src/views/SliderWidget.cpp b/src/views/SliderWidget.cpp
index 5eb87d1..51d570c 100644 (file)
--- a/src/views/SliderWidget.cpp
+++ b/src/views/SliderWidget.cpp
@@ -1,26 +1,25 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
-#include <AppCommon.h>
-
 #include "song_info.h"
 #include "music-controller.h"
-#include "i18n.h"
 #include "common-ui.h"
 #include "SliderWidget.h"
 

diff --git a/src/views/SortCtxPopup.cpp b/src/views/SortCtxPopup.cpp
index 62003ad..566d15a 100644 (file)
--- a/src/views/SortCtxPopup.cpp
+++ b/src/views/SortCtxPopup.cpp
@@ -1,26 +1,26 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
-
 #include "Info.h"
 #include "SortCtxPopup.h"
 
+
 const char *sortTextSong[] = {
        N_("Title A-Z"),
        N_("Title Z-A"),

diff --git a/src/views/SourceCtxPopup.cpp b/src/views/SourceCtxPopup.cpp
index 1d79e81..d79ec74 100644 (file)
--- a/src/views/SourceCtxPopup.cpp
+++ b/src/views/SourceCtxPopup.cpp
@@ -1,26 +1,27 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "Info.h"
-#include <AppCommon.h>
 #include "SourceCtxPopup.h"
 
+
 const char *sourceText[] = {
        N_("All Source"),
        N_("TV"),

diff --git a/src/views/Timer.cpp b/src/views/Timer.cpp
index 0c447c5..28d4ed2 100644 (file)
--- a/src/views/Timer.cpp
+++ b/src/views/Timer.cpp
@@ -1,23 +1,22 @@
 /*
-* Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
-*
-* Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
-*
-* 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.
-*/
-
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ * Licensed under the Apache License, Version 2.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://www.apache.org/licenses/LICENSE-2.0
+ *
+ * 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.
+ */
 
+#include <AppCommon.h>
 #include "define.h"
 #include "common.h"
-#include <AppCommon.h>
 #include "Timer.h"
 
 

diff --git a/src/views/album-layout.cpp b/src/views/album-layout.cpp
index e89e374..1d9dc89 100644 (file)
--- a/src/views/album-layout.cpp
+++ b/src/views/album-layout.cpp
@@ -12,7 +12,7 @@
  * 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.
-*/
+ */
 
 #include <AppCommon.h>
 #include "i18n.h"

diff --git a/src/views/album-songs-layout.cpp b/src/views/album-songs-layout.cpp
index 4e327f2..2d73eba 100644 (file)
--- a/src/views/album-songs-layout.cpp
+++ b/src/views/album-songs-layout.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "song_info.h"

diff --git a/src/views/artist-layout.cpp b/src/views/artist-layout.cpp
index 32efc3a..4367429 100644 (file)
--- a/src/views/artist-layout.cpp
+++ b/src/views/artist-layout.cpp
@@ -17,7 +17,6 @@
 #include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
 #include "common.h"
 #include "category_info.h"
 #include "album_info.h"

diff --git a/src/views/base-view.cpp b/src/views/base-view.cpp
index d5c943c..98f9b4e 100644 (file)
--- a/src/views/base-view.cpp
+++ b/src/views/base-view.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
-
 #include "common.h"
 #include "song_info.h"
 #include "album_info.h"

diff --git a/src/views/category-layout.cpp b/src/views/category-layout.cpp
index 827fc28..8cd5831 100644 (file)
--- a/src/views/category-layout.cpp
+++ b/src/views/category-layout.cpp
@@ -17,7 +17,6 @@
 #include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
 #include "common.h"
 #include "category_info.h"
 #include "album_info.h"

diff --git a/src/views/category-songs-layout.cpp b/src/views/category-songs-layout.cpp
index 6294f43..9d9214c 100644 (file)
--- a/src/views/category-songs-layout.cpp
+++ b/src/views/category-songs-layout.cpp
@@ -14,9 +14,8 @@
 * limitations under the License.
 */
 
-#include "i18n.h"
 #include <AppCommon.h>
-
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "song_info.h"

diff --git a/src/views/common-ui.cpp b/src/views/common-ui.cpp
index af07e9c..d1eae37 100644 (file)
--- a/src/views/common-ui.cpp
+++ b/src/views/common-ui.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
-#include <AppCommon.h>
 #include "common.h"
 #include "common-ui.h"
 #include "song_info.h"

diff --git a/src/views/context-view.cpp b/src/views/context-view.cpp
index a99cba3..933ee5b 100644 (file)
--- a/src/views/context-view.cpp
+++ b/src/views/context-view.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "i18n.h"
 #include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "song_info.h"
 #include "album_info.h"

diff --git a/src/views/entry-popup.cpp b/src/views/entry-popup.cpp
index 8395295..1d052b0 100644 (file)
--- a/src/views/entry-popup.cpp
+++ b/src/views/entry-popup.cpp
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
+#include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-#include <AppCommon.h>
-
 #include "common.h"
 #include "common-ui.h"
 #include "entry-popup.h"

diff --git a/src/views/folder-layout.cpp b/src/views/folder-layout.cpp
index 237905c..8b7fc6b 100644 (file)
--- a/src/views/folder-layout.cpp
+++ b/src/views/folder-layout.cpp
@@ -17,7 +17,6 @@
 #include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
 #include "common.h"
 #include "folder_info.h"
 #include "song_info.h"

diff --git a/src/views/genre-layout.cpp b/src/views/genre-layout.cpp
index 36ebff2..5ea77a2 100644 (file)
--- a/src/views/genre-layout.cpp
+++ b/src/views/genre-layout.cpp
@@ -17,7 +17,6 @@
 #include <AppCommon.h>
 #include "i18n.h"
 #include "define.h"
-
 #include "common.h"
 #include "category_info.h"
 #include "album_info.h"
@@ -32,7 +31,6 @@
 
 
 struct SGenreLayout {
-
 };
 
 

diff --git a/src/views/playback-view.cpp b/src/views/playback-view.cpp
index 077fd2b..97ef925 100644 (file)
--- a/src/views/playback-view.cpp
+++ b/src/views/playback-view.cpp
@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
+#include <AppCommon.h>
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
-#include <AppCommon.h>
-
 #include "Timer.h"
 #include "song_info.h"
 #include "album_info.h"
 #include "music-controller.h"
 #include "volume-control.h"
-#include "i18n.h"
 #include "common-ui.h"
 #include "playback-view.h"
 #include "context-view.h"

diff --git a/src/views/playlist-layout.cpp b/src/views/playlist-layout.cpp
index f55c086..1404220 100644 (file)
--- a/src/views/playlist-layout.cpp
+++ b/src/views/playlist-layout.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include "i18n.h"
 #include <AppCommon.h>
-
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "category_info.h"

diff --git a/src/views/song-layout.cpp b/src/views/song-layout.cpp
index d212091..1cd0321 100644 (file)
--- a/src/views/song-layout.cpp
+++ b/src/views/song-layout.cpp
@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#include "i18n.h"
 #include <AppCommon.h>
-
+#include "i18n.h"
 #include "define.h"
 #include "common.h"
 #include "song_info.h"