[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames
From:       Laurent Montel <montel () kde ! org>
Date:       2011-05-24 11:43:00
Message-ID: 20110524114300.1BC38AC852 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1233425 by mlaurent:

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"


 M  +1 -0      CMakeLists.txt  
 M  +1 -1      kbounce/sound.cpp  
 M  +4 -4      konquest/mapitems.cc  
 M  +1 -1      ksirk/ksirk/Dialogs/newGameDialogImpl.cpp  
 M  +1 -1      ksirk/ksirk/iris/src/xmpp/xmpp-core/protocol.cpp  
 M  +2 -2      ksirk/ksirk/kgamewin.cpp  
 M  +1 -1      ksirk/ksirk/kgamewinslots.cpp  
 M  +1 -1      ksirk/ksirkskineditor/onu.cpp  


--- trunk/KDE/kdegames/CMakeLists.txt #1233424:1233425
@@ -32,6 +32,7 @@
 endif(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 include_directories ( ${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 # add the includes for libkdegames and the fwd headers, available for all the applications
 include_directories(${CMAKE_SOURCE_DIR}/libkdegames ${CMAKE_SOURCE_DIR}/libkdegames/includes)
--- trunk/KDE/kdegames/kbounce/sound.cpp #1233424:1233425
@@ -53,7 +53,7 @@
 	{
 		usedMedia = Phonon::createPlayer(Phonon::GameCategory);
 		usedMedia->setParent( m_parent );
-		usedMedia->setCurrentSource( "sounds:" + sound );
+		usedMedia->setCurrentSource( QString(QLatin1String("sounds:") + sound) );
 		m_hMedia.insert( sound, usedMedia );
 	}
 	else
--- trunk/KDE/kdegames/konquest/mapitems.cc #1233424:1233425
@@ -228,15 +228,15 @@
        && ((!m_gamelogic->options().BlindMap || m_gamelogic->currentPlayer() == planet->player())
            || (m_gamelogic->options().NeutralsShowStats && planet->player()->isNeutral())))
     {
-        text += "<br />" + i18n("Owner: %1", planet->player()->coloredName())
+        text += QString("<br />" + i18n("Owner: %1", planet->player()->coloredName())
           + (m_gamelogic->options().NeutralsShowShips || !planet->player()->isNeutral() ?
-             "<br />"
-             + i18n("Ships: %1", planet->ships() ) :
+             QString("<br />"
+             + i18n("Ships: %1", planet->ships() )) :
              "")
           + "<br />"
           + i18n("Production: %1", planet->production() )
           + "<br />"
-          + i18n("Kill percent: %1", planet->killPercentage() );
+          + i18n("Kill percent: %1", planet->killPercentage() ));
     }
     m_textDoc.setHtml(text);
 }
--- trunk/KDE/kdegames/ksirk/ksirk/Dialogs/newGameDialogImpl.cpp #1233424:1233425
@@ -150,7 +150,7 @@
         {
           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;
--- trunk/KDE/kdegames/ksirk/ksirk/iris/src/xmpp/xmpp-core/protocol.cpp #1233424:1233425
@@ -1654,7 +1654,7 @@
 				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);
--- trunk/KDE/kdegames/ksirk/ksirk/kgamewin.cpp #1233424:1233425
@@ -3178,7 +3178,7 @@
 {
   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 @@
     && 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;
--- trunk/KDE/kdegames/ksirk/ksirk/kgamewinslots.cpp #1233424:1233425
@@ -1054,7 +1054,7 @@
   /*    <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");
--- trunk/KDE/kdegames/ksirk/ksirkskineditor/onu.cpp #1233424:1233425
@@ -83,7 +83,7 @@
   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: " 
[prev in list] [next in list] [prev in thread] [next in thread]