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

List:       kde-commits
Subject:    KDE/kdenetwork
From:       Laurent Montel <montel () kde ! org>
Date:       2011-05-29 11:33:47
Message-ID: 20110529113347.90EDBAC73E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1234107 by mlaurent:

Fix compile with "-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS"


 M  +1 -0      CMakeLists.txt  
 M  +1 -1      kget/transfer-plugins/bittorrent/bttransfer.cpp  
 M  +1 -1      kget/transfer-plugins/kio/transferKio.cpp  
 M  +1 -1      kget/transfer-plugins/metalink/metalink.cpp  
 M  +1 -1      kget/ui/newtransferdialog.cpp  
 M  +5 -5      kopete/kopete/chatwindow/chatview.cpp  
 M  +1 -1      kopete/libkopete/kopetetransfermanager.cpp  
 M  +4 -4      kopete/plugins/pipes/pipesconfig.cpp  
 M  +2 -2      kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/protocol.cpp  
 M  +2 -2      kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp  
 M  +1 -1      kppp/logview/export.cpp  
 M  +1 -1      krdc/remotedesktopsmodel.cpp  


--- trunk/KDE/kdenetwork/CMakeLists.txt #1234106:1234107
@@ -73,6 +73,7 @@
 endif (BUILD_EXPERIMENTAL_TUBES_SUPPORT)
 
 add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} \
${KDEPIMLIBS_INCLUDE_DIR})  
 macro_optional_add_subdirectory(kfile-plugins)
--- trunk/KDE/kdenetwork/kget/transfer-plugins/bittorrent/bttransfer.cpp \
#1234106:1234107 @@ -127,7 +127,7 @@
         if (!m_source.isLocalFile())
         {
             kDebug(5001) << m_dest.path();
-            Download *download = new Download(m_source, \
KStandardDirs::locateLocal("appdata", "tmp/") + m_source.fileName()); +            \
Download *download = new Download(m_source, \
QString(KStandardDirs::locateLocal("appdata", "tmp/") + m_source.fileName()));  
             setStatus(Job::Stopped, i18n("Downloading Torrent File...."), \
SmallIcon("document-save"));  setTransferChange(Tc_Status, true);
--- trunk/KDE/kdenetwork/kget/transfer-plugins/kio/transferKio.cpp #1234106:1234107
@@ -120,7 +120,7 @@
 {
     if (status() != Job::Finished)//if the transfer is not finished, we delete the \
*.part-file  {
-        KIO::Job *del = KIO::del(m_dest.path() + ".part", KIO::HideProgressInfo);
+        KIO::Job *del = KIO::del(QString(m_dest.path() + ".part"), \
KIO::HideProgressInfo);  KIO::NetAccess::synchronousRun(del, 0);
     }//TODO: Ask the user if he/she wants to delete the *.part-file? To discuss \
(boom1992)  }
--- trunk/KDE/kdenetwork/kget/transfer-plugins/metalink/metalink.cpp #1234106:1234107
@@ -82,7 +82,7 @@
 
     setStatus(Job::Stopped, i18n("Downloading Metalink File...."), \
SmallIcon("document-save"));  setTransferChange(Tc_Status, true);
-    Download *download = new Download(m_source, \
KStandardDirs::locateLocal("appdata", "metalinks/") + m_source.fileName()); +    \
Download *download = new Download(m_source, \
                QString(KStandardDirs::locateLocal("appdata", "metalinks/") + \
                m_source.fileName()));
     connect(download, SIGNAL(finishedSuccessfully(KUrl, QByteArray)), \
SLOT(metalinkInit(KUrl, QByteArray)));  }
 
--- trunk/KDE/kdenetwork/kget/ui/newtransferdialog.cpp #1234106:1234107
@@ -153,7 +153,7 @@
 
 void NewTransferDialog::setDestinationFileName(const QString &filename)
 {
-    ui.destRequester->setUrl(ui.destRequester->url().path(KUrl::AddTrailingSlash) + \
filename); +    ui.destRequester->setUrl(QString(ui.destRequester->url().path(KUrl::AddTrailingSlash) \
+ filename));  }
 
 //TODO improve this method, so that it does not take sources and has a better name
--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/chatview.cpp #1234106:1234107
@@ -266,7 +266,7 @@
 	if ( !mc )
 		return;
 
-	QString contactListGroup = QLatin1String("chatwindow_") + mc->metaContactId();
+	QString contactListGroup = QString(QLatin1String("chatwindow_") + \
QString(mc->metaContactId()));  KConfigGroup config = \
KGlobal::config()->group(contactListGroup);  editPart()->resetConfig( config );
 	config.sync();
@@ -770,8 +770,8 @@
 	if ( !mc )
 		return;
 
-	QString contactListGroup = QLatin1String("chatwindow_") +
-	                           mc->metaContactId();
+	QString contactListGroup = QString(QLatin1String("chatwindow_") +
+	                           QString(mc->metaContactId()));
     KConfigGroup config = KGlobal::config()->group(contactListGroup);
 
 	// If settings are the same as default delete entry from config. This will \
propagate global setting change. @@ -796,8 +796,8 @@
 		return; //can't load with more than one other person in the chat
 
 	//read settings for metacontact
-	QString contactListGroup = QLatin1String("chatwindow_") +
-	                           contacts.first()->metaContact()->metaContactId();
+	QString contactListGroup = QString(QLatin1String("chatwindow_") +
+	                           \
QString(contacts.first()->metaContact()->metaContactId()));  KConfigGroup \
config(KGlobal::config(), contactListGroup );  bool enableRichText = \
config.readEntry( "EnableRichText", \
Kopete::BehaviorSettings::self()->richTextByDefault() );  \
                editPart()->textEdit()->setRichTextEnabled( enableRichText );
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetetransfermanager.cpp #1234106:1234107
@@ -419,7 +419,7 @@
 
 	KConfigGroup cg( KGlobal::config(), "File Transfer" );
 	const QString defaultPath = cg.readEntry( "defaultPath", QDir::homePath() );
-	KUrl url = defaultPath + QLatin1String( "/" ) + info.file();
+	KUrl url = QString(defaultPath + QLatin1String( "/" ) + info.file());
 
 	if ( info.saveToDirectory() )
 		url = getSaveDir( url );
--- trunk/KDE/kdenetwork/kopete/plugins/pipes/pipesconfig.cpp #1234106:1234107
@@ -50,10 +50,10 @@
 	
 	QStringList uids;
 	foreach (PipesPlugin::PipeOptions pipe, mPipesList){
-		config.writeEntry ( pipe.uid + "enabled", pipe.enabled );
-		config.writeEntry ( pipe.uid + "path", pipe.path );
-		config.writeEntry ( pipe.uid + "direction", (int) pipe.direction );
-		config.writeEntry ( pipe.uid + "pipeContents", (int) pipe.pipeContents);
+		config.writeEntry ( QString(pipe.uid) + "enabled", pipe.enabled );
+		config.writeEntry ( QString(pipe.uid) + "path", pipe.path );
+		config.writeEntry ( QString(pipe.uid) + "direction", (int) pipe.direction );
+		config.writeEntry ( QString(pipe.uid) + "pipeContents", (int) pipe.pipeContents);
 		uids.append (pipe.uid.toString());
 	}
 	config.writeEntry ( "Pipes", uids);
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/libiris/iris/xmpp/xmpp-core/protocol.cpp \
#1234106:1234107 @@ -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 + '@' + host + '/' + resource);
 				jid.appendChild(doc.createTextNode(j.full()));
 				bind.appendChild(jid);
 				r.appendChild(bind);
@@ -1670,7 +1670,7 @@
 		}
 	}
 	else if(step == GetSASLResponse) {
-		if(e.namespaceURI() == NS_SASL && e.localName() == "response") {
+		if(e.namespaceURI() == NS_SASL && e.localName() == QLatin1String("response")) {
 			sasl_step = QCA::Base64().stringToArray(e.text()).toByteArray();
 			need = NSASLNext;
 			step = GetSASLNext;
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp \
#1234106:1234107 @@ -229,14 +229,14 @@
 	
 		send( t );
 		// The server expects a HTTP HEAD command prior to the GET
-		m_mimetypeJob = KIO::mimetype(
+		m_mimetypeJob = KIO::mimetype(QString(
 				QString::fromLatin1("http://%1/relay?token=")
 					.arg( QString(transfer->firstParam( 250 )) ) 
 				+
 				QString(QUrl::toPercentEncoding(QString(transfer->firstParam( 251 )))) +
 				QString::fromLatin1("&sender=%1&recver=%2")
 					.arg(m_userId)
-					.arg(client()->userId())
+					.arg(client()->userId()))
 				, 
 				KIO::HideProgressInfo);
 		m_mimetypeJob->addMetaData("cookies", "manual");
--- trunk/KDE/kdenetwork/kppp/logview/export.cpp #1234106:1234107
@@ -136,7 +136,7 @@
                    i18n(ExportFormats[i].name.toUtf8()) + " (*." + \
ExportFormats[i].ext + " *." +  ExportFormats[i].ext.toUpper() + ')';
 
-  filename = KFileDialog::getSaveFileName(date + '.' + ExportFormats[i].ext, filter, \
0, i18n("Please Choose File")); +  filename = \
KFileDialog::getSaveFileName(QString(date + '.' + ExportFormats[i].ext), filter, 0, \
i18n("Please Choose File"));  if (filename.isEmpty()) // no file selected
     return;
   fnLine->setText(filename);
--- trunk/KDE/kdenetwork/krdc/remotedesktopsmodel.cpp #1234106:1234107
@@ -160,7 +160,7 @@
         return item.url;
 
     case 10002: //filter
-        return QUrl::fromPercentEncoding((item.url + item.title).toUtf8()); // \
return both user visible title and url data, percent encoded +        return \
QUrl::fromPercentEncoding(QString(item.url + item.title).toUtf8()); // return both \
user visible title and url data, percent encoded  
     case 10003: //title for dockwidget
         return item.title;


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