Skip to content

Commit 18f69ef

Browse files
threedeyesthreedeyes
committed
QPA: use constData() for utf8 strings
1 parent 67b3960 commit 18f69ef

7 files changed

+33
-36
lines changed

‎platforms/qhaikuplatform/haiku/qhaikuclipboard.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void QHaikuClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
101101
QStringList formats = mimeData->formats();
102102
for (int format = 0; format < formats.size(); ++format) {
103103
QString mimeType = formats.at(format);
104-
clip->AddData(mimeType.toUtf8(), B_MIME_TYPE, mimeData->data(mimeType).data(), mimeData->data(mimeType).count());
104+
clip->AddData(mimeType.toUtf8().constData(), B_MIME_TYPE, mimeData->data(mimeType).data(), mimeData->data(mimeType).count());
105105
if (mimeType == "text/plain")
106106
textPlain = true;
107107
}
@@ -112,7 +112,7 @@ void QHaikuClipboard::setMimeData(QMimeData *mimeData, QClipboard::Mode mode)
112112
body = body.left(body.indexOf("</body>"));
113113
body = body.remove("\n");
114114
QString plainText = QTextDocumentFragment::fromHtml(body).toPlainText();
115-
clip->AddData("text/plain", B_MIME_TYPE, plainText.toUtf8(), plainText.toUtf8().count() + 1);
115+
clip->AddData("text/plain", B_MIME_TYPE, plainText.toUtf8().constData(), plainText.toUtf8().count() + 1);
116116
}
117117
}
118118
}

‎platforms/qhaikuplatform/haiku/qhaikuintegration_haiku.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
152152

153153
QString appPath = QCoreApplication::applicationFilePath();
154154

155-
BFile appFile(appPath.toUtf8(), B_READ_ONLY);
155+
BFile appFile(appPath.toUtf8().constData(), B_READ_ONLY);
156156
if (appFile.InitCheck() == B_OK) {
157157
BAppFileInfo info(&appFile);
158158
if (info.InitCheck() == B_OK) {
@@ -170,7 +170,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
170170
thread_id my_thread;
171171

172172
if (be_app == NULL) {
173-
haikuApplication = new HQApplication(appSignature.toUtf8());
173+
haikuApplication = new HQApplication(appSignature.toUtf8().constData());
174174
be_app = haikuApplication;
175175

176176
my_thread = spawn_thread(haikuAppThread, "BApplication_thread", B_NORMAL_PRIORITY, (void*)haikuApplication);
@@ -215,7 +215,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
215215
env += resultUserEnv.split("\n");
216216

217217
foreach (const QString &line, env) {
218-
putenv(line.toUtf8());
218+
putenv(line.toUtf8().constData());
219219
}
220220
}
221221
// Enable software rendering for QML
@@ -237,7 +237,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
237237
http_proxy += username + ":" + password + "@";
238238
http_proxy += settings.value("http_proxy_address", QString("")).toString() + ":";
239239
http_proxy += QString::number(settings.value("http_proxy_port", 8080).toInt()) + "/";
240-
putenv(http_proxy.toUtf8());
240+
putenv(http_proxy.toUtf8().constData());
241241
}
242242
if (settings.value("https_proxy_enable", false).toBool()) {
243243
QString username = settings.value("https_proxy_username", QString("")).toString();
@@ -249,7 +249,7 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
249249
https_proxy += username + ":" + password + "@";
250250
https_proxy += settings.value("https_proxy_address", QString("")).toString() + ":";
251251
https_proxy += QString::number(settings.value("https_proxy_port", 8080).toInt()) + "/";
252-
putenv(https_proxy.toUtf8());
252+
putenv(https_proxy.toUtf8().constData());
253253
}
254254
if (settings.value("ftp_proxy_enable", false).toBool()) {
255255
QString username = settings.value("ftp_proxy_username", QString("")).toString();
@@ -261,12 +261,12 @@ QHaikuIntegration *QHaikuIntegration::createHaikuIntegration(const QStringList&
261261
ftp_proxy += username + ":" + password + "@";
262262
ftp_proxy += settings.value("ftp_proxy_address", QString("")).toString() + ":";
263263
ftp_proxy += QString::number(settings.value("ftp_proxy_port", 8080).toInt()) + "/";
264-
putenv(ftp_proxy.toUtf8());
264+
putenv(ftp_proxy.toUtf8().constData());
265265
}
266266
QString no_proxy = settings.value("no_proxy_list", QString("")).toString();
267267
if (!no_proxy.isEmpty()) {
268268
no_proxy = "no_proxy=\"" + no_proxy + "\"";
269-
putenv(no_proxy.toUtf8());
269+
putenv(no_proxy.toUtf8().constData());
270270
}
271271
}
272272
settings.endGroup();

‎platforms/qhaikuplatform/haiku/qhaikuplatformdialoghelpers.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ bool QHaikuPlatformMessageDialogHelper::show(Qt::WindowFlags, Qt::WindowModality
9696
doc.setHtml(text);
9797

9898
BAlert* alert = new BAlert();
99-
alert->SetText(doc.toPlainText().toUtf8());
99+
alert->SetText(doc.toPlainText().toUtf8().constData());
100100
alert->SetType(type);
101101
alert->SetButtonSpacing(B_EVEN_SPACING);
102102
alert->SetButtonWidth(B_WIDTH_AS_USUAL);
@@ -133,7 +133,7 @@ bool QHaikuPlatformMessageDialogHelper::show(Qt::WindowFlags, Qt::WindowModality
133133
if ((buttons & i) && i != defButtonId) {
134134
QString label = QGuiApplicationPrivate::platformTheme()->standardButtonText(i);
135135
label = QPlatformTheme::removeMnemonics(label).trimmed();
136-
alert->AddButton(label.toUtf8(), buttonsCount);
136+
alert->AddButton(label.toUtf8().constData(), buttonsCount);
137137
buttonsHash[buttonsCount] = i;
138138
buttonsCount++;
139139
}
@@ -142,7 +142,7 @@ bool QHaikuPlatformMessageDialogHelper::show(Qt::WindowFlags, Qt::WindowModality
142142
if (defButtonId != QPlatformDialogHelper::NoButton) {
143143
QString label = QGuiApplicationPrivate::platformTheme()->standardButtonText(defButtonId);
144144
label = QPlatformTheme::removeMnemonics(label).trimmed();
145-
alert->AddButton(label.toUtf8(), buttonsCount);
145+
alert->AddButton(label.toUtf8().constData(), buttonsCount);
146146
buttonsHash[buttonsCount] = defButtonId;
147147
buttonsCount++;
148148
}

‎platforms/qhaikuplatform/haiku/qhaikuplatformmenu.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ BPopUpMenu* QHaikuPlatformMenu::makeBPopUpMenu(QHaikuPlatformMenu *menu)
215215
BMessage *msg = new BMessage('STMI');
216216
int64 val = (*it)->tag();
217217
msg->AddInt64("tag", val);
218-
BMenuItem *item = (icon != NULL)||iconPressent ? new IconMenuItem(text.toUtf8(), icon, msg) :
219-
new BMenuItem(text.toUtf8(), msg);
218+
BMenuItem *item = (icon != NULL)||iconPressent ? new IconMenuItem(text.toUtf8().constData(), icon, msg) :
219+
new BMenuItem(text.toUtf8().constData(), msg);
220220
item->SetEnabled((*it)->isEnabled());
221221
item->SetTarget(menuLooper);
222222
haikuMenu->AddItem(item);

‎platforms/qhaikuplatform/haiku/qhaikusystemtrayicon.cpp

+12-15
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,6 @@ QT_BEGIN_NAMESPACE
7070
#define TRAY_MOUSEDOWN 1
7171
#define TRAY_MOUSEUP 2
7272

73-
#define maxTipLength 128
74-
7573
#define DBAR_SIGNATURE "application/x-vnd.Be-TSKB"
7674

7775

@@ -185,13 +183,12 @@ QHaikuSystemTrayIcon::updateToolTip(const QString &tip)
185183
{
186184
currentToolTip = tip;
187185

188-
BString tipStr("");
186+
BString tipStr("");
189187

190-
if (!currentToolTip.isNull()) {
191-
currentToolTip.remove(QRegExp("<[^>]*>"));
192-
currentToolTip.replace("&nbsp;", " ");
193-
const char *str = (const char *)(currentToolTip.toUtf8());
194-
tipStr.SetTo(str);
188+
if (!currentToolTip.isNull()) {
189+
currentToolTip.remove(QRegExp("<[^>]*>"));
190+
currentToolTip.replace("&nbsp;", " ");
191+
tipStr.SetTo(currentToolTip.toUtf8().constData(), currentToolTip.toUtf8().count());
195192
}
196193

197194
BMessage *message = new BMessage('TTIP');
@@ -225,12 +222,12 @@ QHaikuSystemTrayIcon::showMessage(const QString &title, const QString &msg,
225222
const QIcon& icon, MessageIcon iconType, int secs)
226223
{
227224
QFileInfo appFileInfo(QCoreApplication::applicationFilePath());
228-
BString stitle((const char *)(title.toUtf8()));
229-
BString smessage((const char *)(msg.toUtf8()));
230-
BString smessageId((const char *)(appFileInfo.fileName().toUtf8()));
231-
BString group((const char*)(appFileInfo.baseName().toUtf8()));
225+
BString stitle(title.toUtf8().constData());
226+
BString smessage(msg.toUtf8().constData());
227+
BString smessageId(appFileInfo.fileName().toUtf8().constData());
228+
BString group(appFileInfo.baseName().toUtf8().constData());
232229

233-
BFile file(appFileInfo.filePath().toUtf8(), O_RDONLY);
230+
BFile file(appFileInfo.filePath().toUtf8().constData(), O_RDONLY);
234231
BNodeInfo nodeInfo(&file);
235232
BRect rect(0, 0, B_LARGE_ICON - 1, B_LARGE_ICON -1);
236233
BBitmap bitmap(rect, B_RGBA32);
@@ -376,7 +373,7 @@ QHaikuSystemTrayIcon::installIcon(void)
376373
replicantId = deskBarLoadIcon();
377374

378375
QString appName = QFileInfo(QCoreApplication::applicationFilePath()).fileName();
379-
BString app_name((const char *)(appName.toUtf8()));
376+
BString app_name(appName.toUtf8().constData());
380377

381378
BMessage message('MSGR');
382379
QHaikuSystemTrayIcon *sysTray = this;
@@ -430,7 +427,7 @@ QHaikuSystemTrayIcon::executeCommand(const char *command)
430427
int32
431428
QHaikuSystemTrayIcon::deskBarLoadIcon(team_id tid)
432429
{
433-
BString cmd((const char *)(sysTrayExecutable.absoluteFilePath().toUtf8()));
430+
BString cmd(sysTrayExecutable.absoluteFilePath().toUtf8().constData());
434431
cmd << " " << (int)tid;
435432
int32 id = executeCommand(cmd.String());
436433
return id;

‎platforms/qhaikuplatform/haiku/qhaikutheme.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ QIcon QHaikuTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptio
168168
if (filename == "/")
169169
filename = "/boot/system/servers/mount_server";
170170

171-
BFile file(filename.toUtf8(), O_RDONLY);
171+
BFile file(filename.toUtf8().constData(), O_RDONLY);
172172
BNodeInfo nodeInfo(&file);
173173
icon_size iconSize = B_LARGE_ICON;
174174
BRect rect(0, 0, iconSize - 1, iconSize -1);

‎platforms/qhaikuplatform/haiku/qhaikuwindow.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -273,11 +273,11 @@ QHaikuWindow::QHaikuWindow(QWindow *wnd)
273273
, m_visible(false)
274274
, m_pendingGeometryChangeOnShow(true)
275275
, m_window(new QtHaikuWindow(this, BRect(wnd->geometry().left(),
276-
wnd->geometry().top(),
277-
wnd->geometry().right(),
278-
wnd->geometry().bottom()),
279-
wnd->title().toUtf8(),
280-
B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 0))
276+
wnd->geometry().top(),
277+
wnd->geometry().right(),
278+
wnd->geometry().bottom()),
279+
wnd->title().toUtf8().constData(),
280+
B_NO_BORDER_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL, 0))
281281
, m_parent(0)
282282
{
283283
connect(m_window, SIGNAL(quitRequested()), SLOT(platformWindowQuitRequested()), Qt::BlockingQueuedConnection);
@@ -422,7 +422,7 @@ void QHaikuWindow::setWindowTitle(const QString &title)
422422
{
423423
QString newTitle = QPlatformWindow::formatWindowTitle(title, QStringLiteral(" - "));
424424
newTitle = QPlatformTheme::removeMnemonics(newTitle).trimmed();
425-
m_window->SetTitle(newTitle.toUtf8());
425+
m_window->SetTitle(newTitle.toUtf8().constData());
426426
}
427427

428428

0 commit comments

Comments
 (0)