summaryrefslogtreecommitdiffstats
path: root/Source/cmCryptoHash.cxx
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2014-01-04 05:47:13 (GMT)
committerBrad King <brad.king@kitware.com>2014-01-07 14:27:44 (GMT)
commit5730710c86e5b844c48e17e9001647ae0aa841a3 (patch)
tree95f04b085aab74156bbbd39089541c6ec586b89c /Source/cmCryptoHash.cxx
parent7fb2b806626b9af791d7372d2ff82b2cf1503237 (diff)
downloadCMake-5730710c86e5b844c48e17e9001647ae0aa841a3.zip
CMake-5730710c86e5b844c48e17e9001647ae0aa841a3.tar.gz
CMake-5730710c86e5b844c48e17e9001647ae0aa841a3.tar.bz2
Use cmsys::[io]fstream instead of cmsys_ios::[io]fstream.
Also use SystemTools::Fopen() instead of fopen(). This is to eventually support utf-8 filenames.
Diffstat (limited to 'Source/cmCryptoHash.cxx')
-rw-r--r--Source/cmCryptoHash.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmCryptoHash.cxx b/Source/cmCryptoHash.cxx
index a4f6ac4..7f4b10f 100644
--- a/Source/cmCryptoHash.cxx
+++ b/Source/cmCryptoHash.cxx
@@ -12,6 +12,7 @@
#include "cmCryptoHash.h"
#include <cmsys/MD5.h>
+#include <cmsys/FStream.hxx>
#include "cm_sha2.h"
//----------------------------------------------------------------------------
@@ -45,7 +46,7 @@ std::string cmCryptoHash::HashString(const char* input)
//----------------------------------------------------------------------------
std::string cmCryptoHash::HashFile(const char* file)
{
- std::ifstream fin(file, std::ios::in | cmsys_ios_binary);
+ cmsys::ifstream fin(file, std::ios::in | cmsys_ios_binary);
if(!fin)
{
return "";
oss-git/Qt.git/diff/examples/declarative/modelviews/listview/content/PetsModel.qml?h=v4.8.3&id=2b6339d3b8f333a686b5e215de280819a6c178bd'>examples/declarative/modelviews/listview/content/PetsModel.qml (renamed from examples/declarative/modelviews/listview/PetsModel.qml)0
-rw-r--r--examples/declarative/modelviews/listview/content/RecipesModel.qml (renamed from examples/declarative/modelviews/listview/RecipesModel.qml)0
-rw-r--r--examples/declarative/modelviews/listview/content/pics/archive-insert.pngbin896 -> 0 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/arrow-down.png (renamed from examples/declarative/modelviews/listview/content/pics/go-down.png)bin892 -> 892 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/arrow-up.png (renamed from examples/declarative/modelviews/listview/content/pics/go-up.png)bin929 -> 929 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/button-pressed.pngbin571 -> 0 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/button.pngbin564 -> 0 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/list-delete.png (renamed from examples/declarative/modelviews/listview/content/pics/archive-remove.png)bin1074 -> 1074 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/minus-sign.png (renamed from examples/declarative/modelviews/listview/content/pics/list-remove.png)bin498 -> 498 bytes-rw-r--r--examples/declarative/modelviews/listview/content/pics/plus-sign.png (renamed from examples/declarative/modelviews/listview/content/pics/list-add.png)bin907 -> 907 bytes-rw-r--r--examples/declarative/modelviews/listview/dynamiclist.qml14
-rw-r--r--examples/declarative/modelviews/listview/highlight.qml1
-rw-r--r--examples/declarative/modelviews/listview/highlightranges.qml1
-rw-r--r--examples/declarative/modelviews/parallax/parallax.qml6
-rw-r--r--examples/declarative/modelviews/parallax/qml/ParallaxView.qml30
-rw-r--r--examples/declarative/modelviews/parallax/qml/Smiley.qml18
-rw-r--r--examples/declarative/modelviews/webview/alerts.qml15
-rw-r--r--examples/declarative/modelviews/webview/autosize.qml14
-rw-r--r--examples/declarative/modelviews/webview/content/FieldText.qml195
-rw-r--r--examples/declarative/modelviews/webview/content/Mapping/Map.qml11
-rw-r--r--examples/declarative/modelviews/webview/content/SpinSquare.qml65
-rw-r--r--examples/declarative/modelviews/webview/googlemaps.qml (renamed from examples/declarative/modelviews/webview/googleMaps.qml)0
-rw-r--r--examples/declarative/modelviews/webview/inlinehtml.qml (renamed from examples/declarative/modelviews/webview/inline-html.qml)12
-rw-r--r--examples/declarative/text/textselection/pics/endHandle.png (renamed from examples/declarative/text/edit/pics/endHandle.png)bin185 -> 185 bytes-rw-r--r--examples/declarative/text/textselection/pics/endHandle.sci (renamed from examples/declarative/text/edit/pics/endHandle.sci)0
-rw-r--r--examples/declarative/text/textselection/pics/startHandle.png (renamed from examples/declarative/text/edit/pics/startHandle.png)bin178 -> 178 bytes-rw-r--r--examples/declarative/text/textselection/pics/startHandle.sci (renamed from examples/declarative/text/edit/pics/startHandle.sci)0
-rw-r--r--examples/declarative/text/textselection/textselection.qml (renamed from examples/declarative/text/edit/edit.qml)71
-rw-r--r--examples/declarative/text/textselection/textselection.qmlproject16
-rw-r--r--examples/declarative/touchinteraction/mousearea/mousearea-example.qml (renamed from examples/declarative/touchinteraction/mousearea/mouse.qml)49
-rw-r--r--examples/declarative/ui-components/flipable/content/Card.qml4
-rw-r--r--examples/declarative/ui-components/scrollbar/ScrollBar.qml1
-rw-r--r--examples/declarative/ui-components/scrollbar/main.qml1
-rw-r--r--examples/declarative/ui-components/searchbox/SearchBox.qml7
-rw-r--r--examples/declarative/ui-components/searchbox/images/clear.png (renamed from examples/declarative/ui-components/searchbox/images/edit-clear-locationbar-rtl.png)bin429 -> 429 bytes-rw-r--r--examples/declarative/ui-components/slideswitch/content/Switch.qml7
-rw-r--r--examples/declarative/ui-components/spinner/content/Spinner.qml5
-rw-r--r--examples/declarative/ui-components/spinner/main.qml3
-rw-r--r--examples/declarative/ui-components/tabwidget/TabWidget.qml8
-rw-r--r--examples/declarative/xml/xmlhttprequest/data.xml (renamed from examples/declarative/xml/xmlhttprequest/test.xml)0
-rw-r--r--examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml (renamed from examples/declarative/xml/xmlhttprequest/test.qml)67
44 files changed, 244 insertions, 392 deletions
diff --git a/examples/declarative/animation/basics/property-animation.qml b/examples/declarative/animation/basics/property-animation.qml
index 0fb253a..69d166a 100644
--- a/examples/declarative/animation/basics/property-animation.qml
+++ b/examples/declarative/animation/basics/property-animation.qml
@@ -65,7 +65,8 @@ Item {
// The shadow for the smiley face
Image {
anchors.horizontalCenter: parent.horizontalCenter
- source: "images/shadow.png"; y: smiley.minHeight + 58
+ y: smiley.minHeight + 58
+ source: "images/shadow.png"
// The scale property depends on the y position of the smiley face.
scale: smiley.y * 0.5 / (smiley.minHeight - smiley.maxHeight)
@@ -77,7 +78,8 @@ Item {
property int minHeight: 2 * window.height / 3
anchors.horizontalCenter: parent.horizontalCenter
- source: "images/face-smile.png"; y: minHeight
+ y: minHeight
+ source: "images/face-smile.png"
// Animate the y property. Setting loops to Animation.Infinite makes the
// animation repeat indefinitely, otherwise it would only run once.
diff --git a/examples/declarative/animation/behaviors/behavior-example.qml b/examples/declarative/animation/behaviors/behavior-example.qml