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

List:       kde-commits
Subject:    KDE/kdesdk/kioslave/svn
From:       Laurent Montel <montel () kde ! org>
Date:       2009-06-11 7:24:49
Message-ID: 1244705089.511570.16918.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 980111 by mlaurent:

qt3support--


 M  +0 -2      CMakeLists.txt  
 M  +1 -1      ksvnd/ksvnd.h  
 M  +3 -4      svn.cpp  


--- trunk/KDE/kdesdk/kioslave/svn/CMakeLists.txt #980110:980111
@@ -1,5 +1,3 @@
-# TODO port away from QT3_SUPPORT
-add_definitions(-DQT3_SUPPORT)
 
 if(SUBVERSION14)
 include_directories(${SVN_INCLUDES})
--- trunk/KDE/kdesdk/kioslave/svn/ksvnd/ksvnd.h #980110:980111
@@ -41,7 +41,7 @@
   }
   QString logMessage() const
   {
-    return textMessage->text();
+    return textMessage->toPlainText();
   }
 };
 
--- trunk/KDE/kdesdk/kioslave/svn/svn.cpp #980110:980111
@@ -276,16 +276,15 @@
 	}
 
 	// Send the mimeType as soon as it is known
-	QByteArray *cp = new QByteArray();
-	cp->setRawData( bt->target_string->data, bt->target_string->len );
-	KMimeType::Ptr mt = KMimeType::findByNameAndContent(url.fileName(), *cp);
+	QByteArray cp = QByteArray::fromRawData(bt->target_string->data, bt->target_string->len);
+	KMimeType::Ptr mt = KMimeType::findByNameAndContent(url.fileName(), cp);
 	kDebug(7128) << "KMimeType returned : " << mt->name();
 	mimeType( mt->name() );
 
 	totalSize(bt->target_string->len);
 
 	//send data
-	data(*cp);
+	data(cp);
 
 	data(QByteArray()); // empty array means we're done sending the data
 	finished();
[prev in list] [next in list] [prev in thread] [next in thread]