diff options
| author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
| commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
| tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/kernel/qprinter_unix.cpp | |
| parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
| parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
| download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qprinter_unix.cpp')
| -rw-r--r-- | src/kernel/qprinter_unix.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp index 5dcfa93..643f2d0 100644 --- a/src/kernel/qprinter_unix.cpp +++ b/src/kernel/qprinter_unix.cpp @@ -412,15 +412,15 @@ bool QPrinter::cmd( int c, QPainter *paint, QPDevCmdParam *p ) lphack.append(pr); } char ** lpargs = new char *[lphack.size()+6]; - lpargs[0] = "lp"; + lpargs[0] = (char *)"lp"; uint i; for (i = 0; i < lphack.size(); ++i) lpargs[i+1] = (char *)lphack[i].ascii(); #ifndef Q_OS_OSF if (psToStr[page_size]) { - lpargs[++i] = "-o"; + lpargs[++i] = (char *)"-o"; lpargs[++i] = (char *)psToStr[page_size]; - lpargs[++i] = "-o"; + lpargs[++i] = (char *)"-o"; media = "media="; media += psToStr[page_size]; lpargs[++i] = (char *)media.ascii(); @@ -428,7 +428,7 @@ bool QPrinter::cmd( int c, QPainter *paint, QPDevCmdParam *p ) #endif lpargs[++i] = 0; char **lprargs = new char *[lprhack.size()+1]; - lprargs[0] = "lpr"; + lprargs[0] = (char *)"lpr"; for (uint x = 0; x < lprhack.size(); ++x) lprargs[x+1] = (char *)lprhack[x].ascii(); lprargs[lprhack.size() + 1] = 0; |