AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add data() to all QString::toASCII Qt calls to help out Linux compiler

Browse Source 
https://codereview.appspot.com/7232052/



git-svn-id: http://skia.googlecode.com/svn/trunk@7419 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
robertphillips@google.com 2013-01-28 19:25:43 +00:00
parent ff6e6bade3
commit e219baf747
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debugger/QT/SkDebuggerGUI.cpp
View File

@ -514,9 +514,9 @@ void SkDebuggerGUI::actionRewind() {
} }
void SkDebuggerGUI::actionSave() { void SkDebuggerGUI::actionSave() {
fFileName = fPath.toAscii(); fFileName = fPath.toAscii().data();
fFileName.append("/"); fFileName.append("/");
fFileName.append(fDirectoryWidget.currentItem()->text().toAscii()); fFileName.append(fDirectoryWidget.currentItem()->text().toAscii().data());
saveToFile(fFileName); saveToFile(fFileName);
} }
@ -571,9 +571,9 @@ void SkDebuggerGUI::saveToFile(const SkString& filename) {
void SkDebuggerGUI::loadFile(QListWidgetItem *item) { void SkDebuggerGUI::loadFile(QListWidgetItem *item) {
if (fDirectoryWidgetActive) { if (fDirectoryWidgetActive) {
fFileName = fPath.toAscii(); fFileName = fPath.toAscii().data();
fFileName.append("/"); fFileName.append("/");
fFileName.append(item->text().toAscii()); fFileName.append(item->text().toAscii().data());
loadPicture(fFileName); loadPicture(fFileName);
} }
} }

4
debugger/debuggermain.cpp
View File

@ -29,7 +29,7 @@ int main(int argc, char *argv[]) {
QStringList::const_iterator iter = argList.begin(); QStringList::const_iterator iter = argList.begin();
SkString commandName(iter->toAscii()); SkString commandName(iter->toAscii().data());
++iter; // skip the command name ++iter; // skip the command name
for ( ; iter != argList.end(); ++iter) { for ( ; iter != argList.end(); ++iter) {
@ -37,7 +37,7 @@ int main(int argc, char *argv[]) {
usage(commandName.c_str()); usage(commandName.c_str());
return -1; return -1;
} else if (input.isEmpty()) { } else if (input.isEmpty()) {
input = SkString(iter->toAscii()); input = SkString(iter->toAscii().data());
} else { } else {
usage(commandName.c_str()); usage(commandName.c_str());
return -1; return -1;