r22361 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Tue Jan 30 16:45:25 UTC 2018


Author: jghali
Date: Tue Jan 30 16:45:25 2018
New Revision: 22361

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22361
Log:
#15118: fix misleading indentation warning

Modified:
    trunk/Scribus/scribus/third_party/zip/zip.cpp

Modified: trunk/Scribus/scribus/third_party/zip/zip.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22361&path=/trunk/Scribus/scribus/third_party/zip/zip.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/zip.cpp	(original)
+++ trunk/Scribus/scribus/third_party/zip/zip.cpp	Tue Jan 30 16:45:25 2018
@@ -301,8 +301,8 @@
 		closeArchive();
 
 	device = dev;
-    if (device != file)
-        connect(device, SIGNAL(destroyed(QObject*)), this, SLOT(deviceDestroyed(QObject*)));
+	if (device != file)
+		connect(device, SIGNAL(destroyed(QObject*)), this, SLOT(deviceDestroyed(QObject*)));
 
 	if (!device->isOpen()) {
 		if (!device->open(QIODevice::ReadOnly)) {
@@ -1381,23 +1381,23 @@
  */
 Zip::ErrorCode Zip::createArchive(const QString& filename, bool overwrite)
 {
-    closeArchive();
-    Q_ASSERT(!d->device && !d->file);
-
-    if (filename.isEmpty())
-        return Zip::FileNotFound;
+	closeArchive();
+	Q_ASSERT(!d->device && !d->file);
+
+	if (filename.isEmpty())
+		return Zip::FileNotFound;
 
 	d->file = new QFile(filename);
 
 	if (d->file->exists() && !overwrite) {
-        delete d->file;
-        d->file = 0;
+		delete d->file;
+		d->file = 0;
 		return Zip::FileExists;
 	}
 
 	if (!d->file->open(QIODevice::WriteOnly)) {
-        delete d->file;
-        d->file = 0;
+		delete d->file;
+		d->file = 0;
 		return Zip::OpenFailed;
 	}
 




More information about the scribus-commit mailing list