diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-15 20:34:28 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-12-15 20:34:28 +0100 |
| commit | 7647cdae97b66c5d8c4e77cc3b54acccd42da725 (patch) | |
| tree | 4cc0806919b450886118595dc5b401b1b93a3808 | |
| parent | aa54c8d2286c8732a049af7cffbc1ec6e1f7f6e7 (diff) | |
Prospective fix for namespace builds
| -rw-r--r-- | src/pdf/qpdfdocument.cpp | 4 | ||||
| -rw-r--r-- | src/pdf/qpdfdocument.h | 4 | ||||
| -rw-r--r-- | src/pdf/qpdfdocument_p.h | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/pdf/qpdfdocument.cpp b/src/pdf/qpdfdocument.cpp index 3eeef29..1be6b4a 100644 --- a/src/pdf/qpdfdocument.cpp +++ b/src/pdf/qpdfdocument.cpp @@ -6,6 +6,8 @@ #include <QIODevice> #include <QMutex> +QT_BEGIN_NAMESPACE + // The library is not thread-safe at all, it has a lot of global variables. Q_GLOBAL_STATIC_WITH_ARGS(QMutex, pdfMutex, (QMutex::Recursive)); static int libraryRefCount; @@ -268,4 +270,6 @@ QImage QPdfDocument::render(int page, const QSizeF &pageSize) return result; } +QT_END_NAMESPACE + #include "moc_qpdfdocument.cpp" diff --git a/src/pdf/qpdfdocument.h b/src/pdf/qpdfdocument.h index df6e69f..76f3017 100644 --- a/src/pdf/qpdfdocument.h +++ b/src/pdf/qpdfdocument.h @@ -5,6 +5,8 @@ #include <QImage> #include "qtpdfglobal.h" +QT_BEGIN_NAMESPACE + class QPdfDocumentPrivate; class QNetworkReply; @@ -53,4 +55,6 @@ private: QScopedPointer<QPdfDocumentPrivate> d; }; +QT_END_NAMESPACE + #endif // QPDFDOCUMENT_H diff --git a/src/pdf/qpdfdocument_p.h b/src/pdf/qpdfdocument_p.h index ec9e2e3..03b9723 100644 --- a/src/pdf/qpdfdocument_p.h +++ b/src/pdf/qpdfdocument_p.h @@ -8,6 +8,8 @@ #include <qbuffer.h> #include <qnetworkreply.h> +QT_BEGIN_NAMESPACE + class QPdfDocumentPrivate: public FPDF_FILEACCESS, public FX_FILEAVAIL, public FX_DOWNLOADHINTS { public: @@ -42,5 +44,7 @@ public: void setErrorCode(); }; +QT_END_NAMESPACE + #endif // QPDFDOCUMENT_P_H |