[Debian-astro-commits] [stellarium] 02/04: import stuff from the patch

[Tomasz Buchert]

This is an automated email from the git hooks/post-receive script.

tomasz pushed a commit to branch bug-786715/sandbox
in repository stellarium.

commit 5499dda2246e315480ce2a59b88ffb72c38fb2d6
Author: Tomasz Buchert <tomasz at debian.org>
Date:   Wed Jun 3 13:29:26 2015 +0200

    import stuff from the patch
---
 qzip.cpp     | 18 +++++++++---------
 qzipreader.h | 14 ++++++++------
 qzipwriter.h | 12 +++++++-----
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/qzip.cpp b/qzip.cpp
index 2675875..95a15c5 100644
--- a/qzip.cpp
+++ b/qzip.cpp
@@ -39,17 +39,15 @@
 **
 ****************************************************************************/
 
-#include <qglobal.h>
-
 #ifndef QT_NO_TEXTODFWRITER
 
 #include "qzipreader.h"
 #include "qzipwriter.h"
-#include <qdatetime.h>
-#include <qplatformdefs.h>
-#include <qendian.h>
-#include <qdebug.h>
-#include <qdir.h>
+
+#include <sys/stat.h>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
 
 #include <zlib.h>
 
@@ -101,7 +99,8 @@
 #define ZDEBUG if (0) qDebug
 #endif
 
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
 
 static inline uint readUInt(const uchar *data)
 {
@@ -1390,6 +1389,7 @@ void QZipWriter::close()
     d->device->close();
 }
 
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
 
 #endif // QT_NO_TEXTODFWRITER
diff --git a/qzipreader.h b/qzipreader.h
index d263191..60635db 100644
--- a/qzipreader.h
+++ b/qzipreader.h
@@ -42,13 +42,14 @@
 #ifndef QZIPREADER_H
 #define QZIPREADER_H
 
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
 
-#include <QtCore/qdatetime.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qstring.h>
+#include <QDateTime>
+#include <QFile>
+#include <QString>
 
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
 
 class QZipReaderPrivate;
 
@@ -107,6 +108,7 @@ private:
     Q_DISABLE_COPY(QZipReader)
 };
 
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
 
 #endif // QZIPREADER_H
diff --git a/qzipwriter.h b/qzipwriter.h
index b54a8d3..9e6e78c 100644
--- a/qzipwriter.h
+++ b/qzipwriter.h
@@ -41,11 +41,12 @@
 #ifndef QZIPWRITER_H
 #define QZIPWRITER_H
 
-#include <QtCore/qglobal.h>
-#include <QtCore/qstring.h>
-#include <QtCore/qfile.h>
+#include <QtGlobal>
+#include <QString>
+#include <QFile>
 
-QT_BEGIN_NAMESPACE
+// QT_BEGIN_NAMESPACE
+namespace Stel {
 
 class QZipWriterPrivate;
 
@@ -98,6 +99,7 @@ private:
     Q_DISABLE_COPY(QZipWriter)
 };
 
-QT_END_NAMESPACE
+// QT_END_NAMESPACE
+}
 
 #endif // QZIPWRITER_H

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/stellarium.git