Merge lp:~kalikiana/u1db-qt/move-to-src into lp:u1db-qt

[Cris Dywan]

Moves sources to src folder

Move sources to src folder

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:70
http://91.189.93.125:8080/job/u1db-qt-ci/45/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/45
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/45

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/45/rebuild

review: Approve (continuous-integration)

[Kevin Wright (kevin-wright-1)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-10 14:56:02 +0000
+++ CMakeLists.txt	2013-04-12 12:45:31 +0000
@@ -23,18 +23,18 @@
 
 # Sources
 set(U1DB_QT_SRCS
-    database.cpp
-    document.cpp
-    index.cpp
-    query.cpp
+    src/database.cpp
+    src/document.cpp
+    src/index.cpp
+    src/query.cpp
     )
 
 # Generated files
 set(U1DB_QT_GENERATED
-    moc_database.cpp
-    moc_document.cpp
-    moc_index.cpp
-    moc_query.cpp
+    src/moc_database.cpp
+    src/moc_document.cpp
+    src/moc_index.cpp
+    src/moc_query.cpp
     )
 
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${U1DB_QT_GENERATED}")
@@ -46,11 +46,6 @@
 
 QT5_ADD_RESOURCES(U1DB_QT_RCC ${U1DB_QT_RESOURCES})
 
-## QtU1DBQml
-set(QtU1DBQml_SRCS
-    plugin.cpp
-    )
-
 # Build
 add_definitions(-DQT_NO_KEYWORDS)
 
@@ -92,7 +87,7 @@
     LIBRARY DESTINATION lib${LIB_SUFFIX}
     )
 
-install(FILES global.h database.h document.h index.h query.h
+install(FILES src/global.h src/database.h src/document.h src/index.h src/query.h
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 

=== modified file 'documentation/u1db.qdocconf'
--- documentation/u1db.qdocconf	2013-04-08 10:32:14 +0000
+++ documentation/u1db.qdocconf	2013-04-12 12:45:31 +0000
@@ -1,12 +1,12 @@
 project = U1Db-Qt
 description = U1Db-Qt plugin documentation
 
-sourcedirs = ..
-headers = ../database.h \
-          ../document.h \
-          ../index.h \
-          ../query.h \
-          ../global.h
+sourcedirs = ../src
+headers = ../src/database.h \
+          ../src/document.h \
+          ../src/index.h \
+          ../src/query.h \
+          ../src/global.h
 Cpp.ignoretokens = Q_DECL_EXPORT \
                    Q_PROPERTY \
                    QT_BEGIN_NAMESPACE_U1DB \

=== modified file 'modules/U1db/CMakeLists.txt'
--- modules/U1db/CMakeLists.txt	2013-04-10 11:07:06 +0000
+++ modules/U1db/CMakeLists.txt	2013-04-12 12:45:31 +0000
@@ -22,6 +22,8 @@
   )
 
 include_directories(
+    ${CMAKE_SOURCE_DIR}/src
+    ${U1DB_INCLUDE_DIRS}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OUR_QT_QUICK_INCLUDE}
     )

=== added directory 'src'
=== renamed file 'database.cpp' => 'src/database.cpp'
=== renamed file 'database.h' => 'src/database.h'
=== renamed file 'document.cpp' => 'src/document.cpp'
=== renamed file 'document.h' => 'src/document.h'
=== renamed file 'global.h' => 'src/global.h'
=== renamed file 'index.cpp' => 'src/index.cpp'
=== renamed file 'index.h' => 'src/index.h'
=== renamed file 'private.h' => 'src/private.h'
=== renamed file 'query.cpp' => 'src/query.cpp'
=== renamed file 'query.h' => 'src/query.h'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-09 11:32:11 +0000
+++ tests/CMakeLists.txt	2013-04-12 12:45:31 +0000
@@ -7,6 +7,7 @@
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     ${OUR_QT_TEST_INCLUDES}
+    ${CMAKE_SOURCE_DIR}/src
     ${OUR_QT_QUICK_INCLUDE}
     )