Kill scope api and clean up (#12)

This kills the scope api part, and also does some cleanups.
ubports · Apr 26, 2019 · 98cb672 · 98cb672
1 parent ec799d7
commit 98cb672
Show file tree

Hide file tree

Showing 60 changed files with 6 additions and 4,023 deletions.
diff --git a/.bzr-builddeb/default.conf b/.bzr-builddeb/default.conf
diff --git a/.bzrignore → .gitignore b/.bzrignore → .gitignore
@@ -9,3 +9,4 @@
 /.cproject
 /.settings
 /.pydevproject
+*.qmlc
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,7 +125,7 @@ endif()
 # API version
 set(UNITY_API_MAJOR 0)
 set(UNITY_API_MINOR 1)
-set(UNITY_API_MICRO 6)
+set(UNITY_API_MICRO 7)
 set(UNITY_API_VERSION "${UNITY_API_MAJOR}.${UNITY_API_MINOR}.${UNITY_API_MICRO}")
 
 # API library

diff --git a/CTestCustom.cmake.in b/CTestCustom.cmake.in
@@ -8,16 +8,12 @@ SET(CTEST_CUSTOM_MEMCHECK_IGNORE
     stand-alone-unity-internal-headers
     stand-alone-unity-api-headers
     stand-alone-unity-api-internal-headers
-    stand-alone-unity-scopes-headers
-    stand-alone-unity-scopes-internal-headers
     stand-alone-unity-util-headers
     stand-alone-unity-util-internal-headers
     clean-public-unity-headers
     clean-public-unity-internal-headers
     clean-public-unity-api-headers
     clean-public-unity-api-internal-headers
-    clean-public-unity-scopes-headers
-    clean-public-unity-scopes-internal-headers
     clean-public-unity-util-headers
     clean-public-unity-util-internal-headers
     copyright

diff --git a/debian/control b/debian/control
@@ -31,7 +31,7 @@ Homepage: https://launchpad.net/unity-api
 Vcs-Bzr: lp:unity-api
 Vcs-Browser: https://code.launchpad.net/unity-api
 
-Package: libunity-api0
+Package: libunity-api1
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
@@ -44,7 +44,7 @@ Package: libunity-api-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libunity-api0 (= ${binary:Version}),
+Depends: libunity-api1 (= ${binary:Version}),
          ${misc:Depends},
 Description: Header files for Unity API
  Library to integrate with the Unity shell (dev files)

diff --git a/debian/libunity-api0.install → debian/libunity-api1.install b/debian/libunity-api0.install → debian/libunity-api1.install
diff --git a/include/unity/shell/CMakeLists.txt b/include/unity/shell/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(notifications)
 add_subdirectory(launcher)
 add_subdirectory(application)
-add_subdirectory(scopes)
 
 file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
 file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")

diff --git a/include/unity/shell/scopes/CMakeLists.txt b/include/unity/shell/scopes/CMakeLists.txt
diff --git a/include/unity/shell/scopes/CategoriesInterface.h b/include/unity/shell/scopes/CategoriesInterface.h
diff --git a/include/unity/shell/scopes/ExpandableFilterWidgetInterface.h b/include/unity/shell/scopes/ExpandableFilterWidgetInterface.h
diff --git a/include/unity/shell/scopes/FilterBaseInterface.h b/include/unity/shell/scopes/FilterBaseInterface.h
diff --git a/include/unity/shell/scopes/FiltersInterface.h b/include/unity/shell/scopes/FiltersInterface.h