1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

examples: compile w/QT_NO_CAST_FROM_BYTEARRAY, at least on Unix

Browse Source 
This is all pretty straight-forward, adding .constData() or
using QString::fromLatin1() instead of QLatin1String().

Change-Id: I984706452db7d0841620a0f64e179906123f3849
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Marc Mutz 2012-02-23 07:39:45 +01:00 committed by Qt by Nokia
parent 7de046db73
commit a27d5be4dc
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/desktop/screenshot/screenshot.cpp
View File

@ -102,7 +102,7 @@ void Screenshot::saveScreenshot()
.arg(format.toUpper()) .arg(format.toUpper())
.arg(format)); .arg(format));
if (!fileName.isEmpty()) if (!fileName.isEmpty())
originalPixmap.save(fileName, format.toAscii()); originalPixmap.save(fileName, format.toAscii().constData());
} }
//! [3] //! [3]

2
examples/tools/codecs/mainwindow.cpp
View File

@ -99,7 +99,7 @@ void MainWindow::save()
QByteArray codecName = action->data().toByteArray(); QByteArray codecName = action->data().toByteArray();
QTextStream out(&file); QTextStream out(&file);
out.setCodec(codecName); out.setCodec(codecName.constData());
out << textEdit->toPlainText(); out << textEdit->toPlainText();
} }
} }

6
examples/touch/fingerpaint/mainwindow.cpp
View File

@ -206,12 +206,12 @@ bool MainWindow::saveFile(const QByteArray &fileFormat)
QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
initialPath, initialPath,
tr("%1 Files (*.%2);;All Files (*)") tr("%1 Files (*.%2);;All Files (*)")
.arg(QString(fileFormat.toUpper())) .arg(QString::fromLatin1(fileFormat.toUpper()))
.arg(QString(fileFormat))); .arg(QString::fromLatin1(fileFormat)));
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return false; return false;
} else { } else {
return scribbleArea->saveImage(fileName, fileFormat); return scribbleArea->saveImage(fileName, fileFormat.constData());
} }
} }
//! [20] //! [20]

6
examples/widgets/scribble/mainwindow.cpp
View File

@ -239,12 +239,12 @@ bool MainWindow::saveFile(const QByteArray &fileFormat)
QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
initialPath, initialPath,
tr("%1 Files (*.%2);;All Files (*)") tr("%1 Files (*.%2);;All Files (*)")
.arg(QString(fileFormat.toUpper())) .arg(QString::fromLatin1(fileFormat.toUpper()))
.arg(QString(fileFormat))); .arg(QString::fromLatin1(fileFormat)));
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return false; return false;
} else { } else {
return scribbleArea->saveImage(fileName, fileFormat); return scribbleArea->saveImage(fileName, fileFormat.constData());
} }
} }
//! [20] //! [20]

2
examples/widgets/stylesheet/stylesheeteditor.cpp
View File

@ -85,7 +85,7 @@ void StyleSheetEditor::loadStyleSheet(const QString &sheetName)
{ {
QFile file(":/qss/" + sheetName.toLower() + ".qss"); QFile file(":/qss/" + sheetName.toLower() + ".qss");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QString styleSheet = QLatin1String(file.readAll()); QString styleSheet = QString::fromLatin1(file.readAll());
ui.styleTextEdit->setPlainText(styleSheet); ui.styleTextEdit->setPlainText(styleSheet);
qApp->setStyleSheet(styleSheet); qApp->setStyleSheet(styleSheet);