From 3432398a9e06d9dc7708936ffba26914ca94ab51 Mon Sep 17 00:00:00 2001
From: "Bocklage, Jens" <Jens_Bocklage@mentor.com>
Date: Tue, 20 Dec 2016 15:00:58 +0100
Subject: [PATCH] Merge of src and src2 folder

This is just a merge of 2 folders

Signed-off-by: Bocklage, Jens <Jens_Bocklage@mentor.com>
---
 HomeScreen/HomeScreen.pro                        | 28 ++++++++++--------------
 HomeScreen/{src2 => src}/appinfo.cpp             |  0
 HomeScreen/{src2 => src}/appinfo.h               |  0
 HomeScreen/{src2 => src}/applicationlauncher.cpp |  0
 HomeScreen/{src2 => src}/applicationlauncher.h   |  0
 HomeScreen/{src2 => src}/applicationmodel.cpp    |  0
 HomeScreen/{src2 => src}/applicationmodel.h      |  0
 HomeScreen/src/main.cpp                          |  6 ++---
 HomeScreen/{src2 => src}/statusbarmodel.cpp      |  0
 HomeScreen/{src2 => src}/statusbarmodel.h        |  0
 HomeScreen/{src2 => src}/statusbarserver.cpp     |  0
 HomeScreen/{src2 => src}/statusbarserver.h       |  0
 12 files changed, 15 insertions(+), 19 deletions(-)
 rename HomeScreen/{src2 => src}/appinfo.cpp (100%)
 rename HomeScreen/{src2 => src}/appinfo.h (100%)
 rename HomeScreen/{src2 => src}/applicationlauncher.cpp (100%)
 rename HomeScreen/{src2 => src}/applicationlauncher.h (100%)
 rename HomeScreen/{src2 => src}/applicationmodel.cpp (100%)
 rename HomeScreen/{src2 => src}/applicationmodel.h (100%)
 rename HomeScreen/{src2 => src}/statusbarmodel.cpp (100%)
 rename HomeScreen/{src2 => src}/statusbarmodel.h (100%)
 rename HomeScreen/{src2 => src}/statusbarserver.cpp (100%)
 rename HomeScreen/{src2 => src}/statusbarserver.h (100%)

diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro
index b2afdd3..783c17b 100644
--- a/HomeScreen/HomeScreen.pro
+++ b/HomeScreen/HomeScreen.pro
@@ -23,29 +23,25 @@ include(../ivi_layermanagement_api.pri)
 SOURCES += \
     src/main.cpp \
     src/homescreencontrolinterface.cpp \
-    src/layouthandler.cpp
+    src/layouthandler.cpp \
+    src/applicationmodel.cpp \
+    src/appinfo.cpp \
+    src/statusbarmodel.cpp \
+    src/statusbarserver.cpp \
+    src/applicationlauncher.cpp
 
 HEADERS  += \
     src/homescreencontrolinterface.h \
-    src/layouthandler.h
+    src/layouthandler.h \
+    src/statusbarmodel.h \
+    src/statusbarserver.h \
+    src/applicationlauncher.h \
+    src/applicationmodel.h \
+    src/appinfo.h
 
 OTHER_FILES += \
     README.md
 
-HEADERS += \
-    src2/statusbarmodel.h \
-    src2/statusbarserver.h \
-    src2/applicationlauncher.h \
-    src2/applicationmodel.h \
-    src2/appinfo.h
-
-SOURCES += \
-    src2/applicationmodel.cpp \
-    src2/appinfo.cpp \
-    src2/statusbarmodel.cpp \
-    src2/statusbarserver.cpp \
-    src2/applicationlauncher.cpp
-
 RESOURCES += \
     qml/images/Home/home.qrc \
     qml/images/MediaPlayer/mediaplayer.qrc \
diff --git a/HomeScreen/src2/appinfo.cpp b/HomeScreen/src/appinfo.cpp
similarity index 100%
rename from HomeScreen/src2/appinfo.cpp
rename to HomeScreen/src/appinfo.cpp
diff --git a/HomeScreen/src2/appinfo.h b/HomeScreen/src/appinfo.h
similarity index 100%
rename from HomeScreen/src2/appinfo.h
rename to HomeScreen/src/appinfo.h
diff --git a/HomeScreen/src2/applicationlauncher.cpp b/HomeScreen/src/applicationlauncher.cpp
similarity index 100%
rename from HomeScreen/src2/applicationlauncher.cpp
rename to HomeScreen/src/applicationlauncher.cpp
diff --git a/HomeScreen/src2/applicationlauncher.h b/HomeScreen/src/applicationlauncher.h
similarity index 100%
rename from HomeScreen/src2/applicationlauncher.h
rename to HomeScreen/src/applicationlauncher.h
diff --git a/HomeScreen/src2/applicationmodel.cpp b/HomeScreen/src/applicationmodel.cpp
similarity index 100%
rename from HomeScreen/src2/applicationmodel.cpp
rename to HomeScreen/src/applicationmodel.cpp
diff --git a/HomeScreen/src2/applicationmodel.h b/HomeScreen/src/applicationmodel.h
similarity index 100%
rename from HomeScreen/src2/applicationmodel.h
rename to HomeScreen/src/applicationmodel.h
diff --git a/HomeScreen/src/main.cpp b/HomeScreen/src/main.cpp
index ef7a015..a4235de 100644
--- a/HomeScreen/src/main.cpp
+++ b/HomeScreen/src/main.cpp
@@ -23,9 +23,9 @@
 
 #include "layouthandler.h"
 #include "homescreencontrolinterface.h"
-#include "../src2/applicationlauncher.h"
-#include "../src2/statusbarmodel.h"
-#include "../src2/applicationmodel.h"
+#include "applicationlauncher.h"
+#include "statusbarmodel.h"
+#include "applicationmodel.h"
 
 void noOutput(QtMsgType, const QMessageLogContext &, const QString &)
 {
diff --git a/HomeScreen/src2/statusbarmodel.cpp b/HomeScreen/src/statusbarmodel.cpp
similarity index 100%
rename from HomeScreen/src2/statusbarmodel.cpp
rename to HomeScreen/src/statusbarmodel.cpp
diff --git a/HomeScreen/src2/statusbarmodel.h b/HomeScreen/src/statusbarmodel.h
similarity index 100%
rename from HomeScreen/src2/statusbarmodel.h
rename to HomeScreen/src/statusbarmodel.h
diff --git a/HomeScreen/src2/statusbarserver.cpp b/HomeScreen/src/statusbarserver.cpp
similarity index 100%
rename from HomeScreen/src2/statusbarserver.cpp
rename to HomeScreen/src/statusbarserver.cpp
diff --git a/HomeScreen/src2/statusbarserver.h b/HomeScreen/src/statusbarserver.h
similarity index 100%
rename from HomeScreen/src2/statusbarserver.h
rename to HomeScreen/src/statusbarserver.h
-- 
2.16.6