[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] tests/facesengine: polish
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2015-11-01 7:34:11
Message-ID: E1Zsn9X-0008CE-DR () scm ! kde ! org
[Download RAW message or body]

Git commit 376682a534081fa57ba7873c99f589bac9d3cb55 by Gilles Caulier.
Committed on 01/11/2015 at 07:32.
Pushed by cgilles into branch 'master'.

polish

M  +9    -9    tests/facesengine/CMakeLists.txt
R  +-    --    tests/facesengine/data/codingsprint2009-01.jpg [from: tests/=
facesengine/photos/codingsprint2009-01.jpg - 100% similarity]
R  +-    --    tests/facesengine/data/codingsprint2009-02.jpg [from: tests/=
facesengine/photos/codingsprint2009-02.jpg - 100% similarity]
R  +-    --    tests/facesengine/data/codingsprint2009-03.jpg [from: tests/=
facesengine/photos/codingsprint2009-03.jpg - 100% similarity]
R  +0    -0    tests/facesengine/demo/button.cpp [from: tests/facesengine/g=
ui/button.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/button.h [from: tests/facesengine/gui=
/button.h - 100% similarity]
R  +0    -0    tests/facesengine/demo/faceitem.cpp [from: tests/facesengine=
/gui/faceitem.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/faceitem.h [from: tests/facesengine/g=
ui/faceitem.h - 100% similarity]
R  +0    -0    tests/facesengine/demo/fancyrect.cpp [from: tests/facesengin=
e/gui/fancyrect.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/fancyrect.h [from: tests/facesengine/=
gui/fancyrect.h - 100% similarity]
R  +0    -0    tests/facesengine/demo/main.cpp [from: tests/facesengine/gui=
/main.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/mainwindow.cpp [from: tests/facesengi=
ne/gui/mainwindow.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/mainwindow.h [from: tests/facesengine=
/gui/mainwindow.h - 100% similarity]
R  +0    -0    tests/facesengine/demo/mainwindow.ui [from: tests/facesengin=
e/gui/mainwindow.ui - 100% similarity]
R  +0    -0    tests/facesengine/demo/marquee.cpp [from: tests/facesengine/=
gui/marquee.cpp - 100% similarity]
R  +0    -0    tests/facesengine/demo/marquee.h [from: tests/facesengine/gu=
i/marquee.h - 100% similarity]

http://commits.kde.org/digikam/376682a534081fa57ba7873c99f589bac9d3cb55

diff --git a/tests/facesengine/CMakeLists.txt b/tests/facesengine/CMakeList=
s.txt
index 39b4af9..7eac369 100644
--- a/tests/facesengine/CMakeLists.txt
+++ b/tests/facesengine/CMakeLists.txt
@@ -84,18 +84,18 @@ target_link_libraries(traindb
 =

 # ------------------------------------------------------------------------=
-----
 =

-set(kfacegui_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gui/main.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/gui/mainwindow.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/gui/faceitem.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/gui/button.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/gui/marquee.cpp
-                  ${CMAKE_CURRENT_SOURCE_DIR}/gui/fancyrect.cpp
+set(facesenginedemo_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/demo/main.cpp
+                         ${CMAKE_CURRENT_SOURCE_DIR}/demo/mainwindow.cpp
+                         ${CMAKE_CURRENT_SOURCE_DIR}/demo/faceitem.cpp
+                         ${CMAKE_CURRENT_SOURCE_DIR}/demo/button.cpp
+                         ${CMAKE_CURRENT_SOURCE_DIR}/demo/marquee.cpp
+                         ${CMAKE_CURRENT_SOURCE_DIR}/demo/fancyrect.cpp
 )
 =

-qt5_wrap_ui(kfacegui_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/gui/mainwindow.ui)
-add_executable(kfacegui ${kfacegui_SRCS})
+qt5_wrap_ui(facesenginedemo_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/demo/mainwind=
ow.ui)
+add_executable(facesenginedemo ${facesenginedemo_SRCS})
 =

-target_link_libraries(kfacegui
+target_link_libraries(facesenginedemo
                       digikamcore
                       digikamfacesengine
                       digikamdatabase
diff --git a/tests/facesengine/photos/codingsprint2009-01.jpg b/tests/faces=
engine/data/codingsprint2009-01.jpg
similarity index 100%
rename from tests/facesengine/photos/codingsprint2009-01.jpg
rename to tests/facesengine/data/codingsprint2009-01.jpg
diff --git a/tests/facesengine/photos/codingsprint2009-02.jpg b/tests/faces=
engine/data/codingsprint2009-02.jpg
similarity index 100%
rename from tests/facesengine/photos/codingsprint2009-02.jpg
rename to tests/facesengine/data/codingsprint2009-02.jpg
diff --git a/tests/facesengine/photos/codingsprint2009-03.jpg b/tests/faces=
engine/data/codingsprint2009-03.jpg
similarity index 100%
rename from tests/facesengine/photos/codingsprint2009-03.jpg
rename to tests/facesengine/data/codingsprint2009-03.jpg
diff --git a/tests/facesengine/gui/button.cpp b/tests/facesengine/demo/butt=
on.cpp
similarity index 100%
rename from tests/facesengine/gui/button.cpp
rename to tests/facesengine/demo/button.cpp
diff --git a/tests/facesengine/gui/button.h b/tests/facesengine/demo/button=
.h
similarity index 100%
rename from tests/facesengine/gui/button.h
rename to tests/facesengine/demo/button.h
diff --git a/tests/facesengine/gui/faceitem.cpp b/tests/facesengine/demo/fa=
ceitem.cpp
similarity index 100%
rename from tests/facesengine/gui/faceitem.cpp
rename to tests/facesengine/demo/faceitem.cpp
diff --git a/tests/facesengine/gui/faceitem.h b/tests/facesengine/demo/face=
item.h
similarity index 100%
rename from tests/facesengine/gui/faceitem.h
rename to tests/facesengine/demo/faceitem.h
diff --git a/tests/facesengine/gui/fancyrect.cpp b/tests/facesengine/demo/f=
ancyrect.cpp
similarity index 100%
rename from tests/facesengine/gui/fancyrect.cpp
rename to tests/facesengine/demo/fancyrect.cpp
diff --git a/tests/facesengine/gui/fancyrect.h b/tests/facesengine/demo/fan=
cyrect.h
similarity index 100%
rename from tests/facesengine/gui/fancyrect.h
rename to tests/facesengine/demo/fancyrect.h
diff --git a/tests/facesengine/gui/main.cpp b/tests/facesengine/demo/main.c=
pp
similarity index 100%
rename from tests/facesengine/gui/main.cpp
rename to tests/facesengine/demo/main.cpp
diff --git a/tests/facesengine/gui/mainwindow.cpp b/tests/facesengine/demo/=
mainwindow.cpp
similarity index 100%
rename from tests/facesengine/gui/mainwindow.cpp
rename to tests/facesengine/demo/mainwindow.cpp
diff --git a/tests/facesengine/gui/mainwindow.h b/tests/facesengine/demo/ma=
inwindow.h
similarity index 100%
rename from tests/facesengine/gui/mainwindow.h
rename to tests/facesengine/demo/mainwindow.h
diff --git a/tests/facesengine/gui/mainwindow.ui b/tests/facesengine/demo/m=
ainwindow.ui
similarity index 100%
rename from tests/facesengine/gui/mainwindow.ui
rename to tests/facesengine/demo/mainwindow.ui
diff --git a/tests/facesengine/gui/marquee.cpp b/tests/facesengine/demo/mar=
quee.cpp
similarity index 100%
rename from tests/facesengine/gui/marquee.cpp
rename to tests/facesengine/demo/marquee.cpp
diff --git a/tests/facesengine/gui/marquee.h b/tests/facesengine/demo/marqu=
ee.h
similarity index 100%
rename from tests/facesengine/gui/marquee.h
rename to tests/facesengine/demo/marquee.h
[prev in list] [next in list] [prev in thread] [next in thread]