feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,755 Commits 108 Branches 368 Tags
a588af8049e2154c8d001a81dfc3a471f00537db
Commit Graph

790 Commits

Author SHA1 Message Date
Lukas Holecek
a588af8049 FakeVim: Fix target column for visual movement commands 
Change-Id: I90fb87c06d623736d506c570b77c92666fab4170
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-12 15:25:35 +01:00
Lukas Holecek
dfae736505 FakeVim: Handle more commands as aliases 
Change-Id: Id7eb81ccb87b89c4c164119147b2d854d2fca9d4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-10 15:47:21 +01:00
Lukas Holecek
ffe956ad3a FakeVim: Test some sub-modes in functions 
Change-Id: Ia5434b0e3dc56ad1657b5113279f8656c27ccfa7
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-10 15:47:17 +01:00
Lukas Holecek
cb29cd6c6c FakeVim: Added helper functions 
Change-Id: I01ac58625370b7f01b9b87a15afbf6c32549e6f8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-10 15:47:09 +01:00
Eike Ziller
3f1deee5e1 Merge remote-tracking branch 'origin/3.3' 2014-11-06 12:38:37 +01:00
Lukas Holecek
ab1159096d FakeVim: Refactor cutting text 
Change-Id: Iea371c67c67c9a810ee47aec98e18297993098b2
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-05 21:25:03 +01:00
Lukas Holecek
5458fdee72 FakeVim: Move common movement operations to functions 
Change-Id: I06dce44098a535e0d8f49d885b77a4f07731288b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-05 21:19:26 +01:00
Lukas Holecek
743e1ca67e FakeVim: Don't change cursor column after 'yy' command 
Change-Id: I44b61dfc6a03fba242c8d9d42d483806ca9d85ce
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-05 21:03:32 +01:00
hjk
d6a7287fb4 FakeVim: Fix line selection for wrapped lines 
Task-number: QTCREATORBUG-13102
Change-Id: I0845d98cdbca9a172a3ccda7b5730a7a2d5392b3
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 20:36:16 +01:00
Lukas Holecek
de33b3affa FakeVim: Properly replay macro with command line 
Change-Id: I40617a1f6d28052e3593c186afb6db1d14222076
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 11:19:39 +01:00
Lukas Holecek
36f94d3661 FakeVim: Properly replay macro with insert mode 
Task-number: QTCREATORBUG-13266
Change-Id: Id73e6e561bfa93f43c6839974d6d767164b4dbd8
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 10:05:07 +01:00
Lukas Holecek
3ebdcdc7bf FakeVim: Simpler handling for command synonyms 
Change-Id: Ia0ad19ddd3fcc0aa0c2012b5e7086d40c59c01c3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 09:54:15 +01:00
Lukas Holecek
7043706212 FakeVim: Yank wrapped lines with 'Y' an 'yy' 
Task-number: QTCREATORBUG-13102
Change-Id: I632dd5113ca8021f67364b92f8f0840e0f15772c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 09:53:24 +01:00
hjk
22c15b3ea8 FakeVim: Use a bool to indicate recording, not QString::isNull 
Change-Id: I30f996aa61b357dc6b83f3f313abb0448e7f0fc3
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-21 13:22:14 +02:00
Takao Fujiwara
2b7dae1b84 Delete QEvent::InputMethod handling in FakeVimHandler::eventFilter() 
The head keys handling is not needed because IBusEngineSimple handles
compose keys.
Also the length of QInputMethodEvent.commitString() is not one and
prevent users from auto-complettions.

Change-Id: Ieb0022add243829340797954e7d48ca71af2c249
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-15 11:49:47 +02:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
hjk
513ee02f10 FakeVim: Use a single "FakeVim" translation context 
Change-Id: I624dedddf88a017af107670794034282f0aafdcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-26 11:59:39 +02:00
Lukas Holecek
5a0a61bfac FakeVim: Update file path and global marks 
Update file path and global marks if file in project is renamed.

Update file path on "Save as...".

Task-number: QTCREATORBUG-12810
Change-Id: Ia2361e8f65a7a494e339d96c8b4610af4ab38edb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-18 15:25:43 +02:00
David Schulz
6e9b724006 Editor: Blockselection rewrite. 
Also adding the possibility to insert text into the blockselection.

Task-number: QTCREATORBUG-7773
Change-Id: I7a47a1d630f769a8253ee1a2f21057820ea170d5
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-20 13:16:54 +02:00
Nikita Baryshnikov
84e176edab CleanUp usage of QtAlgorithms 
Change-Id: I61be20554014f90c2e1313167a3e3c869e26c35e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-06-17 08:19:29 +02:00
Orgad Shaneh
c3e1f04476 FakeVim: Fix conditions 
Change-Id: I1787bd80124ebe224932e10be9e1e307c4925949
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-19 17:49:17 +02:00
hluk
c783fba706 FakeVim: Share some data among editors with same document 
Task-number: QTCREATORBUG-12140
Change-Id: Ieabb331745395c7bb012c9c26ef18c14bcba7cc4
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-05 16:27:51 +02:00
hluk
91d0739b97 FakeVim: Allow to jump to the first quoted block on line 
Task-number: QTCREATORBUG-12128
Change-Id: I3376a2f75307eaad1671d5b8b70ac7ba3035fdb8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-05-05 12:12:42 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
 2014-05-02 10:00:20 +02:00
hjk
e8c23dd85a FakeVim: Allow unicode input using Ctrl-V in insert mode 
Change-Id: Id43e1c5ce8cfd0dff346f9914b585daa80bfc03d
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-28 16:52:52 +02:00
hluk
3728da8825 FakeVim: Commands 'v', 'V' and 'C-v' work in visual mode 
Task-number: QTCREATORBUG-12113
Change-Id: Ib98930347a23f672833d50e5b903fd90445d7462
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-28 15:25:09 +02:00
hluk
69258bc5bc FakeVim: Don't handle command mapping further if editor was closed 
Task-number: QTCREATORBUG-12073
Change-Id: I99b49b15a588e5fbcec4218df250a981644914ec
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-28 14:01:28 +02:00
hluk
0d19eb8db0 FakeVim: Command 'gv' restores visual selection after yanking 
Task-number: QTCREATORBUG-12112
Change-Id: I303a2c1e25972f14f50235223b13c0bc28edf480
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-28 13:36:37 +02:00
hluk
1ce6387940 FakeVim: Move cursor when repeating 't' command once with ';' 
Change-Id: I33f0ff27aaab78e8c738f35f59dea3a2da076040
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-04-28 13:30:28 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines. 
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-04-22 10:06:40 +02:00
hjk
703a93d7e1 FakeVim: Fix cw on white space 
Task-number: QTCREATORBUG-11757
Change-Id: I99ac0f78c02e0bb6684fc714d2cba2c35a3b7db3
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-03-25 19:10:27 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
hluk
bc45321949 FakeVim: Allow to insert space on <S-SPACE> 
Change-Id: I20f3e8e6602c35b812e2a1f29fdc2b1b458468e5
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-27 12:56:01 +01:00
hluk
d8a56f9dc1 FakeVim: Save and restore cursor if handling custom Ex command 
Change-Id: I38ee04fd76f92b0e0e5755e6a9f8828bd347c245
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-21 13:31:12 +01:00
hluk
2ec277bc46 FakeVim: Keep visual selection when focusing editor 
Change-Id: I4dddcf8f8a214810e140af356078cefe82e9381c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-19 13:44:43 +01:00
hluk
6defaacedd FakeVim: Update text cursor when leaving search sub-mode 
Change-Id: Ie02f47390a95572db780f0aaf6e509cea8caa1a8
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-19 13:41:02 +01:00
hluk
d90d6f40b3 FakeVim: Fixes for insert/change in visual mode 
Always limit position of marks to current document (mainly position of
'<' and '>' marks for last selection).

Command '$' selects end of selected lines in visual block mode. This
will require editor support since visual representation of such
selection isn't always rectangle.

Command 'c' works the same as 's' in visual block mode.

Corrected positions for 'I', 'A', 's' and 'c' commands in visual block
mode after '<ESC>'.

Task-number: QTCREATORBUG-11378
Change-Id: I86582b634eb782829db48fd1b914713f87ac409f
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-11 11:27:44 +01:00
hluk
33345045bc FakeVim: Differentiate between <S-SPACE> and <SPACE> and others 
Since some keys with shift modifier pressed generate same string (e.g.
<S-SPACE> and <SPACE>), the modifier must not be ignored.

Recognize Qt::Key_Backtab as <S-TAB>.

Change-Id: I6b25dec4b3bc9564249609449f9df7cd7fab263e
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-11 11:27:33 +01:00
hjk
5ea71557be FakeVim: Don't touch cursor on focus in. 
Change-Id: Ic8199fc14089717a6b121b384ddc0bbc606a5fb7
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-02-02 21:14:59 +01:00
hluk
ff30e7f577 FakeVim: Toggle boolean option and print option 
Allow to use character '!' to toggle a boolean option and '?' to print
an option at the end of ":set {option}" command.

Change-Id: I7475c6a748c834c40de03cca57a59c428b1c4188
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-21 17:39:20 +01:00
hluk
348c823ab9 FakeVim: Remove redundant variable 
Change-Id: Ia10bd60de7e1a55903024f20bd041df23c85b151
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-21 17:39:03 +01:00
hluk
fc5799367c FakeVim: Select matched text when searching backwards 
Task-number: QTCREATORBUG-7251
Change-Id: I3ef998683080b92e9e4a301434e45dc56c5a2f0a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-01-21 17:38:53 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
hluk
2976345ff5 FakeVim: Fix mappings in insert mode 
Mapped user input shouldn't break edit block in insert mode.

Change-Id: I47ad449d9f0a2623cfcbdfa6c66626aa876ed76b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-30 16:59:54 +01:00
hluk
99d8567103 FakeVim: Use registers 0, 1 and - 
Command "y" additionally yanks text to register 0 if the default
register " is used.

Delete and change command set register 1, if removed text contains
multiple lines, or to small delete register (-).

Register " is always set.

Change-Id: I9d357911cedaac97fb1a91698523c9b0f3de8621
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-30 16:56:58 +01:00
hluk
227ef8240a FakeVim: Command % jumps to first known parenthesis character 
Change-Id: I28988925f397af8c4927c416774d7fe21e982dcb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-30 13:25:27 +01:00
hluk
8ea6a21a78 FakeVim: Added Vim commands "g0", "g^" and "g$" 
Change-Id: I05958e56282f0b290feb7e8e01d30b77f566d11b
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-30 13:24:04 +01:00
hluk
bf587d179e FakeVim: Added Vim commands "gj" and "gk" 
Change-Id: I1d38f86a1993f4aa82eb5dbf4595af69e062c0e1
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-12-30 13:22:04 +01:00