projects
/
harmattan
/
cameraplus
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e85bb26
)
Renamed imports to declarative and libimports to libdeclarativeqtcamera
author
Mohammed Sameer
<msameer@foolab.org>
Wed, 2 Jan 2013 04:04:25 +0000
(06:04 +0200)
committer
Mohammed Sameer
<msameer@foolab.org>
Wed, 2 Jan 2013 04:04:25 +0000
(06:04 +0200)
62 files changed:
cameraplus.pro
patch
|
blob
|
history
declarative/aperture.cpp
[moved from
imports/aperture.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/aperture.h
[moved from
imports/aperture.h
with 100% similarity]
patch
|
blob
|
history
declarative/autofocus.cpp
[moved from
imports/autofocus.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/autofocus.h
[moved from
imports/autofocus.h
with 100% similarity]
patch
|
blob
|
history
declarative/camera.cpp
[moved from
imports/camera.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/camera.h
[moved from
imports/camera.h
with 100% similarity]
patch
|
blob
|
history
declarative/colortone.cpp
[moved from
imports/colortone.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/colortone.h
[moved from
imports/colortone.h
with 100% similarity]
patch
|
blob
|
history
declarative/declarative.pro
[moved from
imports/imports.pro
with 97% similarity]
patch
|
blob
|
history
declarative/evcomp.cpp
[moved from
imports/evcomp.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/evcomp.h
[moved from
imports/evcomp.h
with 100% similarity]
patch
|
blob
|
history
declarative/exposure.cpp
[moved from
imports/exposure.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/exposure.h
[moved from
imports/exposure.h
with 100% similarity]
patch
|
blob
|
history
declarative/flash.cpp
[moved from
imports/flash.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/flash.h
[moved from
imports/flash.h
with 100% similarity]
patch
|
blob
|
history
declarative/flickerreduction.cpp
[moved from
imports/flickerreduction.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/flickerreduction.h
[moved from
imports/flickerreduction.h
with 100% similarity]
patch
|
blob
|
history
declarative/focus.cpp
[moved from
imports/focus.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/focus.h
[moved from
imports/focus.h
with 100% similarity]
patch
|
blob
|
history
declarative/imagemode.cpp
[moved from
imports/imagemode.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/imagemode.h
[moved from
imports/imagemode.h
with 100% similarity]
patch
|
blob
|
history
declarative/imageresolutionmodel.cpp
[moved from
imports/imageresolutionmodel.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/imageresolutionmodel.h
[moved from
imports/imageresolutionmodel.h
with 100% similarity]
patch
|
blob
|
history
declarative/imagesettings.cpp
[moved from
imports/imagesettings.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/imagesettings.h
[moved from
imports/imagesettings.h
with 100% similarity]
patch
|
blob
|
history
declarative/iso.cpp
[moved from
imports/iso.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/iso.h
[moved from
imports/iso.h
with 100% similarity]
patch
|
blob
|
history
declarative/metadata.cpp
[moved from
imports/metadata.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/metadata.h
[moved from
imports/metadata.h
with 100% similarity]
patch
|
blob
|
history
declarative/mode.cpp
[moved from
imports/mode.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/mode.h
[moved from
imports/mode.h
with 100% similarity]
patch
|
blob
|
history
declarative/noisereduction.cpp
[moved from
imports/noisereduction.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/noisereduction.h
[moved from
imports/noisereduction.h
with 100% similarity]
patch
|
blob
|
history
declarative/notifications.cpp
[moved from
imports/notifications.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/notifications.h
[moved from
imports/notifications.h
with 100% similarity]
patch
|
blob
|
history
declarative/notificationscontainer.cpp
[moved from
imports/notificationscontainer.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/notificationscontainer.h
[moved from
imports/notificationscontainer.h
with 100% similarity]
patch
|
blob
|
history
declarative/plugin.cpp
[moved from
imports/plugin.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/plugin.h
[moved from
imports/plugin.h
with 100% similarity]
patch
|
blob
|
history
declarative/previewprovider.cpp
[moved from
imports/previewprovider.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/previewprovider.h
[moved from
imports/previewprovider.h
with 100% similarity]
patch
|
blob
|
history
declarative/scene.cpp
[moved from
imports/scene.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/scene.h
[moved from
imports/scene.h
with 100% similarity]
patch
|
blob
|
history
declarative/sounds.cpp
[moved from
imports/sounds.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/sounds.h
[moved from
imports/sounds.h
with 100% similarity]
patch
|
blob
|
history
declarative/videomode.cpp
[moved from
imports/videomode.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/videomode.h
[moved from
imports/videomode.h
with 100% similarity]
patch
|
blob
|
history
declarative/videomute.cpp
[moved from
imports/videomute.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/videomute.h
[moved from
imports/videomute.h
with 100% similarity]
patch
|
blob
|
history
declarative/videoresolutionmodel.cpp
[moved from
imports/videoresolutionmodel.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/videoresolutionmodel.h
[moved from
imports/videoresolutionmodel.h
with 100% similarity]
patch
|
blob
|
history
declarative/videosettings.cpp
[moved from
imports/videosettings.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/videosettings.h
[moved from
imports/videosettings.h
with 100% similarity]
patch
|
blob
|
history
declarative/videotorch.cpp
[moved from
imports/videotorch.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/videotorch.h
[moved from
imports/videotorch.h
with 100% similarity]
patch
|
blob
|
history
declarative/whitebalance.cpp
[moved from
imports/whitebalance.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/whitebalance.h
[moved from
imports/whitebalance.h
with 100% similarity]
patch
|
blob
|
history
declarative/zoom.cpp
[moved from
imports/zoom.cpp
with 100% similarity]
patch
|
blob
|
history
declarative/zoom.h
[moved from
imports/zoom.h
with 100% similarity]
patch
|
blob
|
history
src/main.cpp
patch
|
blob
|
history
src/src.pro
patch
|
blob
|
history
diff --git
a/cameraplus.pro
b/cameraplus.pro
index
e3d703b
..
beadc23
100644
(file)
--- a/
cameraplus.pro
+++ b/
cameraplus.pro
@@
-1,4
+1,4
@@
TEMPLATE = subdirs
CONFIG += ordered
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
(file)
--- a/
imports/imports.pro
+++ b/
declarative/declarative.pro
@@
-1,5
+1,5
@@
TEMPLATE = lib
TEMPLATE = lib
-TARGET =
imports
+TARGET =
declarativeqtcamera
DEPENDPATH += . ../lib/
INCLUDEPATH += . ../lib/
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
(file)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-26,7
+26,7
@@
#include <QGLWidget>
#include <QuillFile>
#include <QGLWidget>
#include <QuillFile>
-#include "
imports
/plugin.h"
+#include "
declarative
/plugin.h"
#include "settings.h"
#include "filenaming.h"
#include "settings.h"
#include "filenaming.h"
diff --git
a/src/src.pro
b/src/src.pro
index
3fdcaec
..
2d8124a
100644
(file)
--- 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
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 \
SOURCES += main.cpp settings.cpp filenaming.cpp quillitem.cpp displaystate.cpp fsmonitor.cpp \
cameraresources.cpp compass.cpp orientation.cpp geocode.cpp mountprotector.cpp \