From kde-commits  Sat Jun 30 22:54:05 2007
From: =?utf-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <aurelien.gateau () free ! fr>
Date: Sat, 30 Jun 2007 22:54:05 +0000
To: kde-commits
Subject: KDE/kdegraphics/gwenview/lib
Message-Id: <1183244045.051047.1650.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=118324405611774

SVN commit 681945 by gateau:

Started to replace format type from QString to QByteArray.


 M  +1 -1      abstractdocumentimpl.h  
 M  +1 -1      document.cpp  
 M  +4 -4      documentloadedimpl.cpp  
 M  +2 -2      documentloadedimpl.h  
 M  +1 -1      emptydocumentimpl.cpp  
 M  +1 -1      emptydocumentimpl.h  
 M  +1 -1      jpegdocumentloadedimpl.cpp  
 M  +1 -1      jpegdocumentloadedimpl.h  
 M  +1 -1      loadingdocumentimpl.cpp  
 M  +1 -1      loadingdocumentimpl.h  


--- trunk/KDE/kdegraphics/gwenview/lib/abstractdocumentimpl.h #681944:681945
@@ -51,7 +51,7 @@
 
 	virtual bool isLoaded() const = 0;
 
-	virtual Document::SaveResult save(const KUrl&, const QString& format) = 0;
+	virtual Document::SaveResult save(const KUrl&, const QByteArray& format) = 0;
 
 Q_SIGNALS:
 	void loaded();
--- trunk/KDE/kdegraphics/gwenview/lib/document.cpp #681944:681945
@@ -95,7 +95,7 @@
 	while (!isLoaded()) {
 		qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 	}
-	return d->mImpl->save(url, format);
+	return d->mImpl->save(url, format.toAscii());
 }
 
 QByteArray Document::format() const {
--- trunk/KDE/kdegraphics/gwenview/lib/documentloadedimpl.cpp #681944:681945
@@ -57,16 +57,16 @@
 }
 
 
-bool DocumentLoadedImpl::saveInternal(QIODevice* device, const QString& format) {
-	bool ok = document()->image().save(device, format.toAscii());
+bool DocumentLoadedImpl::saveInternal(QIODevice* device, const QByteArray& format) {
+	bool ok = document()->image().save(device, format);
 	if (ok) {
-		setDocumentFormat(format.toAscii());
+		setDocumentFormat(format);
 	}
 	return ok;
 }
 
 
-Document::SaveResult DocumentLoadedImpl::save(const KUrl& url, const QString& format) {
+Document::SaveResult DocumentLoadedImpl::save(const KUrl& url, const QByteArray& format) {
 	// FIXME: Handle remote urls
 	Q_ASSERT(url.isLocalFile());
 	QFile file(url.path());
--- trunk/KDE/kdegraphics/gwenview/lib/documentloadedimpl.h #681944:681945
@@ -41,10 +41,10 @@
 
 	virtual void init();
 	virtual bool isLoaded() const;
-	virtual Document::SaveResult save(const KUrl&, const QString& format);
+	virtual Document::SaveResult save(const KUrl&, const QByteArray& format);
 
 protected:
-	virtual bool saveInternal(QIODevice* device, const QString& format);
+	virtual bool saveInternal(QIODevice* device, const QByteArray& format);
 
 private:
 	DocumentLoadedImplPrivate* const d;
--- trunk/KDE/kdegraphics/gwenview/lib/emptydocumentimpl.cpp #681944:681945
@@ -45,7 +45,7 @@
 	return false;
 }
 
-Document::SaveResult EmptyDocumentImpl::save(const KUrl&, const QString&) {
+Document::SaveResult EmptyDocumentImpl::save(const KUrl&, const QByteArray&) {
 	return Document::SR_OtherError;
 }
 
--- trunk/KDE/kdegraphics/gwenview/lib/emptydocumentimpl.h #681944:681945
@@ -37,7 +37,7 @@
 
 	virtual void init();
 	virtual bool isLoaded() const;
-	virtual Document::SaveResult save(const KUrl&, const QString& format);
+	virtual Document::SaveResult save(const KUrl&, const QByteArray& format);
 };
 
 
--- trunk/KDE/kdegraphics/gwenview/lib/jpegdocumentloadedimpl.cpp #681944:681945
@@ -48,7 +48,7 @@
 }
 
 
-bool JpegDocumentLoadedImpl::saveInternal(QIODevice* device, const QString& format) {
+bool JpegDocumentLoadedImpl::saveInternal(QIODevice* device, const QByteArray& format) {
 	if (format == "jpeg") {
 		int size = device->write(d->mData);
 		return size == d->mData.size();
--- trunk/KDE/kdegraphics/gwenview/lib/jpegdocumentloadedimpl.h #681944:681945
@@ -40,7 +40,7 @@
 	~JpegDocumentLoadedImpl();
 
 protected:
-	virtual bool saveInternal(QIODevice* device, const QString& format);
+	virtual bool saveInternal(QIODevice* device, const QByteArray& format);
 
 private:
 	JpegDocumentLoadedImplPrivate* const d;
--- trunk/KDE/kdegraphics/gwenview/lib/loadingdocumentimpl.cpp #681944:681945
@@ -145,7 +145,7 @@
 }
 
 
-Document::SaveResult LoadingDocumentImpl::save(const KUrl&, const QString&) {
+Document::SaveResult LoadingDocumentImpl::save(const KUrl&, const QByteArray&) {
 	return Document::SR_OtherError;
 }
 
--- trunk/KDE/kdegraphics/gwenview/lib/loadingdocumentimpl.h #681944:681945
@@ -40,7 +40,7 @@
 
 	virtual void init();
 	virtual bool isLoaded() const;
-	virtual Document::SaveResult save(const KUrl&, const QString& format);
+	virtual Document::SaveResult save(const KUrl&, const QByteArray& format);
 
 private Q_SLOTS:
 	void slotImageLoaded();