From f8861ec5a342457760b9e767ac90e6524917ad87 Mon Sep 17 00:00:00 2001 From: Mohammed Sameer Date: Wed, 2 Jan 2013 06:04:25 +0200 Subject: [PATCH] Renamed imports to declarative and libimports to libdeclarativeqtcamera --- cameraplus.pro | 2 +- {imports => declarative}/aperture.cpp | 0 {imports => declarative}/aperture.h | 0 {imports => declarative}/autofocus.cpp | 0 {imports => declarative}/autofocus.h | 0 {imports => declarative}/camera.cpp | 0 {imports => declarative}/camera.h | 0 {imports => declarative}/colortone.cpp | 0 {imports => declarative}/colortone.h | 0 imports/imports.pro => declarative/declarative.pro | 2 +- {imports => declarative}/evcomp.cpp | 0 {imports => declarative}/evcomp.h | 0 {imports => declarative}/exposure.cpp | 0 {imports => declarative}/exposure.h | 0 {imports => declarative}/flash.cpp | 0 {imports => declarative}/flash.h | 0 {imports => declarative}/flickerreduction.cpp | 0 {imports => declarative}/flickerreduction.h | 0 {imports => declarative}/focus.cpp | 0 {imports => declarative}/focus.h | 0 {imports => declarative}/imagemode.cpp | 0 {imports => declarative}/imagemode.h | 0 {imports => declarative}/imageresolutionmodel.cpp | 0 {imports => declarative}/imageresolutionmodel.h | 0 {imports => declarative}/imagesettings.cpp | 0 {imports => declarative}/imagesettings.h | 0 {imports => declarative}/iso.cpp | 0 {imports => declarative}/iso.h | 0 {imports => declarative}/metadata.cpp | 0 {imports => declarative}/metadata.h | 0 {imports => declarative}/mode.cpp | 0 {imports => declarative}/mode.h | 0 {imports => declarative}/noisereduction.cpp | 0 {imports => declarative}/noisereduction.h | 0 {imports => declarative}/notifications.cpp | 0 {imports => declarative}/notifications.h | 0 {imports => declarative}/notificationscontainer.cpp | 0 {imports => declarative}/notificationscontainer.h | 0 {imports => declarative}/plugin.cpp | 0 {imports => declarative}/plugin.h | 0 {imports => declarative}/previewprovider.cpp | 0 {imports => declarative}/previewprovider.h | 0 {imports => declarative}/scene.cpp | 0 {imports => declarative}/scene.h | 0 {imports => declarative}/sounds.cpp | 0 {imports => declarative}/sounds.h | 0 {imports => declarative}/videomode.cpp | 0 {imports => declarative}/videomode.h | 0 {imports => declarative}/videomute.cpp | 0 {imports => declarative}/videomute.h | 0 {imports => declarative}/videoresolutionmodel.cpp | 0 {imports => declarative}/videoresolutionmodel.h | 0 {imports => declarative}/videosettings.cpp | 0 {imports => declarative}/videosettings.h | 0 {imports => declarative}/videotorch.cpp | 0 {imports => declarative}/videotorch.h | 0 {imports => declarative}/whitebalance.cpp | 0 {imports => declarative}/whitebalance.h | 0 {imports => declarative}/zoom.cpp | 0 {imports => declarative}/zoom.h | 0 src/main.cpp | 2 +- src/src.pro | 2 +- 62 files changed, 4 insertions(+), 4 deletions(-) rename {imports => declarative}/aperture.cpp (100%) rename {imports => declarative}/aperture.h (100%) rename {imports => declarative}/autofocus.cpp (100%) rename {imports => declarative}/autofocus.h (100%) rename {imports => declarative}/camera.cpp (100%) rename {imports => declarative}/camera.h (100%) rename {imports => declarative}/colortone.cpp (100%) rename {imports => declarative}/colortone.h (100%) rename imports/imports.pro => declarative/declarative.pro (97%) rename {imports => declarative}/evcomp.cpp (100%) rename {imports => declarative}/evcomp.h (100%) rename {imports => declarative}/exposure.cpp (100%) rename {imports => declarative}/exposure.h (100%) rename {imports => declarative}/flash.cpp (100%) rename {imports => declarative}/flash.h (100%) rename {imports => declarative}/flickerreduction.cpp (100%) rename {imports => declarative}/flickerreduction.h (100%) rename {imports => declarative}/focus.cpp (100%) rename {imports => declarative}/focus.h (100%) rename {imports => declarative}/imagemode.cpp (100%) rename {imports => declarative}/imagemode.h (100%) rename {imports => declarative}/imageresolutionmodel.cpp (100%) rename {imports => declarative}/imageresolutionmodel.h (100%) rename {imports => declarative}/imagesettings.cpp (100%) rename {imports => declarative}/imagesettings.h (100%) rename {imports => declarative}/iso.cpp (100%) rename {imports => declarative}/iso.h (100%) rename {imports => declarative}/metadata.cpp (100%) rename {imports => declarative}/metadata.h (100%) rename {imports => declarative}/mode.cpp (100%) rename {imports => declarative}/mode.h (100%) rename {imports => declarative}/noisereduction.cpp (100%) rename {imports => declarative}/noisereduction.h (100%) rename {imports => declarative}/notifications.cpp (100%) rename {imports => declarative}/notifications.h (100%) rename {imports => declarative}/notificationscontainer.cpp (100%) rename {imports => declarative}/notificationscontainer.h (100%) rename {imports => declarative}/plugin.cpp (100%) rename {imports => declarative}/plugin.h (100%) rename {imports => declarative}/previewprovider.cpp (100%) rename {imports => declarative}/previewprovider.h (100%) rename {imports => declarative}/scene.cpp (100%) rename {imports => declarative}/scene.h (100%) rename {imports => declarative}/sounds.cpp (100%) rename {imports => declarative}/sounds.h (100%) rename {imports => declarative}/videomode.cpp (100%) rename {imports => declarative}/videomode.h (100%) rename {imports => declarative}/videomute.cpp (100%) rename {imports => declarative}/videomute.h (100%) rename {imports => declarative}/videoresolutionmodel.cpp (100%) rename {imports => declarative}/videoresolutionmodel.h (100%) rename {imports => declarative}/videosettings.cpp (100%) rename {imports => declarative}/videosettings.h (100%) rename {imports => declarative}/videotorch.cpp (100%) rename {imports => declarative}/videotorch.h (100%) rename {imports => declarative}/whitebalance.cpp (100%) rename {imports => declarative}/whitebalance.h (100%) rename {imports => declarative}/zoom.cpp (100%) rename {imports => declarative}/zoom.h (100%) diff --git a/cameraplus.pro b/cameraplus.pro index e3d703b..beadc23 100644 --- a/cameraplus.pro +++ b/cameraplus.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = lib imports src +SUBDIRS = lib declarative src diff --git a/imports/aperture.cpp b/declarative/aperture.cpp similarity index 100% rename from imports/aperture.cpp rename to declarative/aperture.cpp diff --git a/imports/aperture.h b/declarative/aperture.h similarity index 100% rename from imports/aperture.h rename to declarative/aperture.h diff --git a/imports/autofocus.cpp b/declarative/autofocus.cpp similarity index 100% rename from imports/autofocus.cpp rename to declarative/autofocus.cpp diff --git a/imports/autofocus.h b/declarative/autofocus.h similarity index 100% rename from imports/autofocus.h rename to declarative/autofocus.h diff --git a/imports/camera.cpp b/declarative/camera.cpp similarity index 100% rename from imports/camera.cpp rename to declarative/camera.cpp diff --git a/imports/camera.h b/declarative/camera.h similarity index 100% rename from imports/camera.h rename to declarative/camera.h diff --git a/imports/colortone.cpp b/declarative/colortone.cpp similarity index 100% rename from imports/colortone.cpp rename to declarative/colortone.cpp diff --git a/imports/colortone.h b/declarative/colortone.h similarity index 100% rename from imports/colortone.h rename to declarative/colortone.h diff --git a/imports/imports.pro b/declarative/declarative.pro similarity index 97% rename from imports/imports.pro rename to declarative/declarative.pro index be4a105..91b21ba 100644 --- a/imports/imports.pro +++ b/declarative/declarative.pro @@ -1,5 +1,5 @@ TEMPLATE = lib -TARGET = imports +TARGET = declarativeqtcamera DEPENDPATH += . ../lib/ INCLUDEPATH += . ../lib/ diff --git a/imports/evcomp.cpp b/declarative/evcomp.cpp similarity index 100% rename from imports/evcomp.cpp rename to declarative/evcomp.cpp diff --git a/imports/evcomp.h b/declarative/evcomp.h similarity index 100% rename from imports/evcomp.h rename to declarative/evcomp.h diff --git a/imports/exposure.cpp b/declarative/exposure.cpp similarity index 100% rename from imports/exposure.cpp rename to declarative/exposure.cpp diff --git a/imports/exposure.h b/declarative/exposure.h similarity index 100% rename from imports/exposure.h rename to declarative/exposure.h diff --git a/imports/flash.cpp b/declarative/flash.cpp similarity index 100% rename from imports/flash.cpp rename to declarative/flash.cpp diff --git a/imports/flash.h b/declarative/flash.h similarity index 100% rename from imports/flash.h rename to declarative/flash.h diff --git a/imports/flickerreduction.cpp b/declarative/flickerreduction.cpp similarity index 100% rename from imports/flickerreduction.cpp rename to declarative/flickerreduction.cpp diff --git a/imports/flickerreduction.h b/declarative/flickerreduction.h similarity index 100% rename from imports/flickerreduction.h rename to declarative/flickerreduction.h diff --git a/imports/focus.cpp b/declarative/focus.cpp similarity index 100% rename from imports/focus.cpp rename to declarative/focus.cpp diff --git a/imports/focus.h b/declarative/focus.h similarity index 100% rename from imports/focus.h rename to declarative/focus.h diff --git a/imports/imagemode.cpp b/declarative/imagemode.cpp similarity index 100% rename from imports/imagemode.cpp rename to declarative/imagemode.cpp diff --git a/imports/imagemode.h b/declarative/imagemode.h similarity index 100% rename from imports/imagemode.h rename to declarative/imagemode.h diff --git a/imports/imageresolutionmodel.cpp b/declarative/imageresolutionmodel.cpp similarity index 100% rename from imports/imageresolutionmodel.cpp rename to declarative/imageresolutionmodel.cpp diff --git a/imports/imageresolutionmodel.h b/declarative/imageresolutionmodel.h similarity index 100% rename from imports/imageresolutionmodel.h rename to declarative/imageresolutionmodel.h diff --git a/imports/imagesettings.cpp b/declarative/imagesettings.cpp similarity index 100% rename from imports/imagesettings.cpp rename to declarative/imagesettings.cpp diff --git a/imports/imagesettings.h b/declarative/imagesettings.h similarity index 100% rename from imports/imagesettings.h rename to declarative/imagesettings.h diff --git a/imports/iso.cpp b/declarative/iso.cpp similarity index 100% rename from imports/iso.cpp rename to declarative/iso.cpp diff --git a/imports/iso.h b/declarative/iso.h similarity index 100% rename from imports/iso.h rename to declarative/iso.h diff --git a/imports/metadata.cpp b/declarative/metadata.cpp similarity index 100% rename from imports/metadata.cpp rename to declarative/metadata.cpp diff --git a/imports/metadata.h b/declarative/metadata.h similarity index 100% rename from imports/metadata.h rename to declarative/metadata.h diff --git a/imports/mode.cpp b/declarative/mode.cpp similarity index 100% rename from imports/mode.cpp rename to declarative/mode.cpp diff --git a/imports/mode.h b/declarative/mode.h similarity index 100% rename from imports/mode.h rename to declarative/mode.h diff --git a/imports/noisereduction.cpp b/declarative/noisereduction.cpp similarity index 100% rename from imports/noisereduction.cpp rename to declarative/noisereduction.cpp diff --git a/imports/noisereduction.h b/declarative/noisereduction.h similarity index 100% rename from imports/noisereduction.h rename to declarative/noisereduction.h diff --git a/imports/notifications.cpp b/declarative/notifications.cpp similarity index 100% rename from imports/notifications.cpp rename to declarative/notifications.cpp diff --git a/imports/notifications.h b/declarative/notifications.h similarity index 100% rename from imports/notifications.h rename to declarative/notifications.h diff --git a/imports/notificationscontainer.cpp b/declarative/notificationscontainer.cpp similarity index 100% rename from imports/notificationscontainer.cpp rename to declarative/notificationscontainer.cpp diff --git a/imports/notificationscontainer.h b/declarative/notificationscontainer.h similarity index 100% rename from imports/notificationscontainer.h rename to declarative/notificationscontainer.h diff --git a/imports/plugin.cpp b/declarative/plugin.cpp similarity index 100% rename from imports/plugin.cpp rename to declarative/plugin.cpp diff --git a/imports/plugin.h b/declarative/plugin.h similarity index 100% rename from imports/plugin.h rename to declarative/plugin.h diff --git a/imports/previewprovider.cpp b/declarative/previewprovider.cpp similarity index 100% rename from imports/previewprovider.cpp rename to declarative/previewprovider.cpp diff --git a/imports/previewprovider.h b/declarative/previewprovider.h similarity index 100% rename from imports/previewprovider.h rename to declarative/previewprovider.h diff --git a/imports/scene.cpp b/declarative/scene.cpp similarity index 100% rename from imports/scene.cpp rename to declarative/scene.cpp diff --git a/imports/scene.h b/declarative/scene.h similarity index 100% rename from imports/scene.h rename to declarative/scene.h diff --git a/imports/sounds.cpp b/declarative/sounds.cpp similarity index 100% rename from imports/sounds.cpp rename to declarative/sounds.cpp diff --git a/imports/sounds.h b/declarative/sounds.h similarity index 100% rename from imports/sounds.h rename to declarative/sounds.h diff --git a/imports/videomode.cpp b/declarative/videomode.cpp similarity index 100% rename from imports/videomode.cpp rename to declarative/videomode.cpp diff --git a/imports/videomode.h b/declarative/videomode.h similarity index 100% rename from imports/videomode.h rename to declarative/videomode.h diff --git a/imports/videomute.cpp b/declarative/videomute.cpp similarity index 100% rename from imports/videomute.cpp rename to declarative/videomute.cpp diff --git a/imports/videomute.h b/declarative/videomute.h similarity index 100% rename from imports/videomute.h rename to declarative/videomute.h diff --git a/imports/videoresolutionmodel.cpp b/declarative/videoresolutionmodel.cpp similarity index 100% rename from imports/videoresolutionmodel.cpp rename to declarative/videoresolutionmodel.cpp diff --git a/imports/videoresolutionmodel.h b/declarative/videoresolutionmodel.h similarity index 100% rename from imports/videoresolutionmodel.h rename to declarative/videoresolutionmodel.h diff --git a/imports/videosettings.cpp b/declarative/videosettings.cpp similarity index 100% rename from imports/videosettings.cpp rename to declarative/videosettings.cpp diff --git a/imports/videosettings.h b/declarative/videosettings.h similarity index 100% rename from imports/videosettings.h rename to declarative/videosettings.h diff --git a/imports/videotorch.cpp b/declarative/videotorch.cpp similarity index 100% rename from imports/videotorch.cpp rename to declarative/videotorch.cpp diff --git a/imports/videotorch.h b/declarative/videotorch.h similarity index 100% rename from imports/videotorch.h rename to declarative/videotorch.h diff --git a/imports/whitebalance.cpp b/declarative/whitebalance.cpp similarity index 100% rename from imports/whitebalance.cpp rename to declarative/whitebalance.cpp diff --git a/imports/whitebalance.h b/declarative/whitebalance.h similarity index 100% rename from imports/whitebalance.h rename to declarative/whitebalance.h diff --git a/imports/zoom.cpp b/declarative/zoom.cpp similarity index 100% rename from imports/zoom.cpp rename to declarative/zoom.cpp diff --git a/imports/zoom.h b/declarative/zoom.h similarity index 100% rename from imports/zoom.h rename to declarative/zoom.h diff --git a/src/main.cpp b/src/main.cpp index 64f6a38..0918c8e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,7 @@ #include #include -#include "imports/plugin.h" +#include "declarative/plugin.h" #include "settings.h" #include "filenaming.h" diff --git a/src/src.pro b/src/src.pro index 3fdcaec..2d8124a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -13,7 +13,7 @@ MOBILITY += location systeminfo PKGCONFIG = gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-tag-0.10 \ gstreamer-pbutils-0.10 meego-gstreamer-interfaces-0.10 quill qmsystem2 libresourceqt1 -LIBS += -L../imports/ -limports -L../lib/ -lqtcamera +LIBS += -L../declarative/ -ldeclarativeqtcamera -L../lib/ -lqtcamera SOURCES += main.cpp settings.cpp filenaming.cpp quillitem.cpp displaystate.cpp fsmonitor.cpp \ cameraresources.cpp compass.cpp orientation.cpp geocode.cpp mountprotector.cpp \ -- 2.25.1