Commit f3d8783f authored by Laurent Montel's avatar Laurent Montel 😁

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"

svn path=/trunk/KDE/kdegames/ksirk/; revision=1233425
parent 4df48054
......@@ -150,7 +150,7 @@ void NewGameWidget::fillSkinsCombo()
{
skinCombo->addItem(i18n(world->name().toUtf8().data()));
m_newGameSetup->worlds()[i18n(world->name().toUtf8().data())] = world;
if (QString("skins/")+skinDir.dirName() == m_newGameSetup->skin())
if (QString(QLatin1String("skins/")+skinDir.dirName()) == m_newGameSetup->skin())
{
kDebug() << "Setting currentSkinNum to " << skinNum;
currentSkinNum = skinNum;
......
......@@ -1654,7 +1654,7 @@ bool CoreProtocol::normalStep(const QDomElement &e)
r.setAttribute("id", e.attribute("id"));
QDomElement bind = doc.createElementNS(NS_BIND, "bind");
QDomElement jid = doc.createElement("jid");
Jid j = user + '@' + host + '/' + resource;
Jid j = QString(user + QLatin1Char('@') + host + QLatin1Char('/') + resource);
jid.appendChild(doc.createTextNode(j.full()));
bind.appendChild(jid);
r.appendChild(bind);
......
......@@ -3178,7 +3178,7 @@ void KGameWindow::askForJabberGames()
{
if (m_jabberClient && m_jabberClient->isConnected())
{
XMPP::Message message(m_groupchatRoom+'@'+m_groupchatHost);
XMPP::Message message(QString(m_groupchatRoom+'@'+m_groupchatHost));
message.setType("groupchat");
message.setId(QUuid::createUuid().toString().remove('{').remove('}').remove('-'));
QString body("Who propose online KsirK games here?");
......@@ -3196,7 +3196,7 @@ void KGameWindow::sendGameInfoToJabber()
&& m_automaton->startingGame())
{
kDebug() << "Sending 'I'm starting a game with ...'";
XMPP::Message message(m_groupchatRoom+'@'+m_groupchatHost);
XMPP::Message message(QString(m_groupchatRoom+'@'+m_groupchatHost));
message.setType("groupchat");
message.setId(QUuid::createUuid().toString().remove('{').remove('}').remove('-'));
QString body;
......
......@@ -1054,7 +1054,7 @@ void KGameWindow::slotGroupChatJoined (const XMPP::Jid & jid)
/* <message type="chat" to="kleag@localhost" id="aabca" >
<body>hello</body>
</message>*/
XMPP::Message message(m_groupchatRoom+'@'+m_groupchatHost);
XMPP::Message message(QString(m_groupchatRoom+'@'+m_groupchatHost));
message.setType("groupchat");
message.setId(QUuid::createUuid().toString().remove('{').remove('}').remove('-'));
message.setBody("Hello, I'm a KsirK Game");
......
......@@ -83,7 +83,7 @@ ONU::ONU(const QString& configDir):
m_name = onugroup.readEntry("name");
m_skin = onugroup.readEntry("skinpath");
kDebug() << "skin snapshot file: " << m_configDir + "/Images/snapshot.jpg";
m_snapshot = m_configDir + "/Images/snapshot.jpg";
m_snapshot = QString(m_configDir + "/Images/snapshot.jpg");
if (m_snapshot.isNull())
{
kError() << "Was not able to load the snapshot image: "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment