summaryrefslogtreecommitdiffstats
path: root/src/io/uristream.cpp
diff options
context:
space:
mode:
authorPeter Moulder <peter.moulder@monash.edu>2007-10-11 14:05:24 +0000
committerpjrm <pjrm@users.sourceforge.net>2007-10-11 14:05:24 +0000
commit4762cac4319b72d6e931473fda7efe71c0e02e3e (patch)
tree34f7a5d0b9790c859943183660971c318c452c09 /src/io/uristream.cpp
parentdom/xpathparser.h: (Lookup::sval): Change from char* to char const *. Addres... (diff)
downloadinkscape-4762cac4319b72d6e931473fda7efe71c0e02e3e.tar.gz
inkscape-4762cac4319b72d6e931473fda7efe71c0e02e3e.zip
(noop): io/uristream.cpp: Remove some unneeded gchar/char casts. Change constness of a couple of local vars to avoid some more casts (that were casting away constness).
(bzr r3880)
Diffstat (limited to 'src/io/uristream.cpp')
-rw-r--r--src/io/uristream.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp
index e06498d52..9787620db 100644
--- a/src/io/uristream.cpp
+++ b/src/io/uristream.cpp
@@ -105,19 +105,19 @@ UriInputStream::UriInputStream(Inkscape::URI &source)
throw (StreamException): uri(source)
{
//get information from uri
- char *schemestr = (char *) uri.getScheme();
+ char const *schemestr = uri.getScheme();
scheme = SCHEME_FILE;
if (!schemestr || strncmp("file", schemestr, 4)==0)
scheme = SCHEME_FILE;
else if (strncmp("data", schemestr, 4)==0)
scheme = SCHEME_DATA;
//printf("in schemestr:'%s' scheme:'%d'\n", schemestr, scheme);
- char *cpath = NULL;
+ gchar *cpath = NULL;
switch (scheme) {
case SCHEME_FILE:
- cpath = (char *) uri.toNativeFilename();
+ cpath = uri.toNativeFilename();
//printf("in cpath:'%s'\n", cpath);
inf = fopen_utf8name(cpath, FILE_READ);
//inf = fopen(cpath, "rb");
@@ -317,18 +317,18 @@ UriOutputStream::UriOutputStream(Inkscape::URI &destination)
scheme(SCHEME_FILE)
{
//get information from uri
- char *schemestr = (char *) uri.getScheme();
+ char const *schemestr = uri.getScheme();
if (!schemestr || strncmp("file", schemestr, 4)==0)
scheme = SCHEME_FILE;
else if (strncmp("data", schemestr, 4)==0)
scheme = SCHEME_DATA;
//printf("out schemestr:'%s' scheme:'%d'\n", schemestr, scheme);
- char *cpath = NULL;
+ gchar *cpath = NULL;
switch (scheme) {
case SCHEME_FILE:
- cpath = (char *) uri.toNativeFilename();
+ cpath = uri.toNativeFilename();
//printf("out path:'%s'\n", cpath);
outf = fopen_utf8name(cpath, FILE_WRITE);
//outf = fopen(cpath, "wb");