aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/qpdf/Buffer.hh3
-rw-r--r--include/qpdf/Pipeline.hh3
-rw-r--r--include/qpdf/Pl_Buffer.hh3
-rw-r--r--include/qpdf/Pl_Count.hh3
-rw-r--r--include/qpdf/Pl_Discard.hh3
-rw-r--r--include/qpdf/Pl_Flate.hh3
-rw-r--r--include/qpdf/Pl_StdioFile.hh3
-rw-r--r--include/qpdf/QPDF.hh3
-rw-r--r--include/qpdf/QPDFExc.hh3
-rw-r--r--include/qpdf/QPDFObject.hh3
-rw-r--r--include/qpdf/QPDFObjectHandle.hh3
-rw-r--r--include/qpdf/QPDFTokenizer.hh3
-rw-r--r--include/qpdf/QPDFWriter.hh3
-rw-r--r--include/qpdf/QPDFXRefEntry.hh3
-rw-r--r--libqpdf/qpdf/BitStream.hh3
-rw-r--r--libqpdf/qpdf/BitWriter.hh3
-rw-r--r--libqpdf/qpdf/MD5.hh3
-rw-r--r--libqpdf/qpdf/PCRE.hh3
-rw-r--r--libqpdf/qpdf/Pl_ASCII85Decoder.hh3
-rw-r--r--libqpdf/qpdf/Pl_ASCIIHexDecoder.hh3
-rw-r--r--libqpdf/qpdf/Pl_LZWDecoder.hh3
-rw-r--r--libqpdf/qpdf/Pl_MD5.hh3
-rw-r--r--libqpdf/qpdf/Pl_PNGFilter.hh3
-rw-r--r--libqpdf/qpdf/Pl_RC4.hh3
24 files changed, 24 insertions, 48 deletions
diff --git a/include/qpdf/Buffer.hh b/include/qpdf/Buffer.hh
index 084da8e3..8da972ca 100644
--- a/include/qpdf/Buffer.hh
+++ b/include/qpdf/Buffer.hh
@@ -10,8 +10,7 @@
#include <qpdf/DLL.hh>
-DLL_EXPORT
-class Buffer
+class DLL_EXPORT Buffer
{
public:
Buffer();
diff --git a/include/qpdf/Pipeline.hh b/include/qpdf/Pipeline.hh
index a8b8b794..8b589e20 100644
--- a/include/qpdf/Pipeline.hh
+++ b/include/qpdf/Pipeline.hh
@@ -33,8 +33,7 @@
#include <qpdf/DLL.hh>
#include <string>
-DLL_EXPORT
-class Pipeline
+class DLL_EXPORT Pipeline
{
public:
Pipeline(char const* identifier, Pipeline* next);
diff --git a/include/qpdf/Pl_Buffer.hh b/include/qpdf/Pl_Buffer.hh
index 4d5ced70..de376d1e 100644
--- a/include/qpdf/Pl_Buffer.hh
+++ b/include/qpdf/Pl_Buffer.hh
@@ -24,8 +24,7 @@
#include <qpdf/Buffer.hh>
#include <list>
-DLL_EXPORT
-class Pl_Buffer: public Pipeline
+class DLL_EXPORT Pl_Buffer: public Pipeline
{
public:
Pl_Buffer(char const* identifier, Pipeline* next = 0);
diff --git a/include/qpdf/Pl_Count.hh b/include/qpdf/Pl_Count.hh
index 66bc69a4..0539bcbd 100644
--- a/include/qpdf/Pl_Count.hh
+++ b/include/qpdf/Pl_Count.hh
@@ -13,8 +13,7 @@
#include <qpdf/Pipeline.hh>
-DLL_EXPORT
-class Pl_Count: public Pipeline
+class DLL_EXPORT Pl_Count: public Pipeline
{
public:
Pl_Count(char const* identifier, Pipeline* next);
diff --git a/include/qpdf/Pl_Discard.hh b/include/qpdf/Pl_Discard.hh
index 59e8a0d3..7565744e 100644
--- a/include/qpdf/Pl_Discard.hh
+++ b/include/qpdf/Pl_Discard.hh
@@ -16,8 +16,7 @@
#include <qpdf/Pipeline.hh>
-DLL_EXPORT
-class Pl_Discard: public Pipeline
+class DLL_EXPORT Pl_Discard: public Pipeline
{
public:
Pl_Discard();
diff --git a/include/qpdf/Pl_Flate.hh b/include/qpdf/Pl_Flate.hh
index 5fdab63d..6cbd148f 100644
--- a/include/qpdf/Pl_Flate.hh
+++ b/include/qpdf/Pl_Flate.hh
@@ -12,8 +12,7 @@
#include <zlib.h>
-DLL_EXPORT
-class Pl_Flate: public Pipeline
+class DLL_EXPORT Pl_Flate: public Pipeline
{
public:
static int const def_bufsize = 65536;
diff --git a/include/qpdf/Pl_StdioFile.hh b/include/qpdf/Pl_StdioFile.hh
index 026bc41b..2b60e664 100644
--- a/include/qpdf/Pl_StdioFile.hh
+++ b/include/qpdf/Pl_StdioFile.hh
@@ -18,8 +18,7 @@
// This pipeline is reusable.
//
-DLL_EXPORT
-class Pl_StdioFile: public Pipeline
+class DLL_EXPORT Pl_StdioFile: public Pipeline
{
public:
// f is externally maintained; this class just writes to and
diff --git a/include/qpdf/QPDF.hh b/include/qpdf/QPDF.hh
index 0b9cee2f..e2f7a498 100644
--- a/include/qpdf/QPDF.hh
+++ b/include/qpdf/QPDF.hh
@@ -25,8 +25,7 @@ class BitStream;
class BitWriter;
class QPDFExc;
-DLL_EXPORT
-class QPDF
+class DLL_EXPORT QPDF
{
public:
QPDF();
diff --git a/include/qpdf/QPDFExc.hh b/include/qpdf/QPDFExc.hh
index 1c3794a5..341b5f0b 100644
--- a/include/qpdf/QPDFExc.hh
+++ b/include/qpdf/QPDFExc.hh
@@ -11,8 +11,7 @@
#include <qpdf/DLL.hh>
#include <stdexcept>
-DLL_EXPORT
-class QPDFExc: public std::runtime_error
+class DLL_EXPORT QPDFExc: public std::runtime_error
{
public:
QPDFExc(std::string const& message);
diff --git a/include/qpdf/QPDFObject.hh b/include/qpdf/QPDFObject.hh
index eae75682..99d56542 100644
--- a/include/qpdf/QPDFObject.hh
+++ b/include/qpdf/QPDFObject.hh
@@ -12,8 +12,7 @@
#include <string>
-DLL_EXPORT
-class QPDFObject
+class DLL_EXPORT QPDFObject
{
public:
virtual ~QPDFObject() {}
diff --git a/include/qpdf/QPDFObjectHandle.hh b/include/qpdf/QPDFObjectHandle.hh
index fd8a8a81..348aef6b 100644
--- a/include/qpdf/QPDFObjectHandle.hh
+++ b/include/qpdf/QPDFObjectHandle.hh
@@ -23,8 +23,7 @@
class Pipeline;
class QPDF;
-DLL_EXPORT
-class QPDFObjectHandle
+class DLL_EXPORT QPDFObjectHandle
{
public:
QPDFObjectHandle();
diff --git a/include/qpdf/QPDFTokenizer.hh b/include/qpdf/QPDFTokenizer.hh
index cafa9e52..705155a2 100644
--- a/include/qpdf/QPDFTokenizer.hh
+++ b/include/qpdf/QPDFTokenizer.hh
@@ -13,8 +13,7 @@
#include <string>
#include <stdio.h>
-DLL_EXPORT
-class QPDFTokenizer
+class DLL_EXPORT QPDFTokenizer
{
public:
enum token_type_e
diff --git a/include/qpdf/QPDFWriter.hh b/include/qpdf/QPDFWriter.hh
index 91747543..a9392839 100644
--- a/include/qpdf/QPDFWriter.hh
+++ b/include/qpdf/QPDFWriter.hh
@@ -31,8 +31,7 @@ class QPDF;
class QPDFObjectHandle;
class Pl_Count;
-DLL_EXPORT
-class QPDFWriter
+class DLL_EXPORT QPDFWriter
{
public:
// Passing null as filename means write to stdout. QPDFWriter
diff --git a/include/qpdf/QPDFXRefEntry.hh b/include/qpdf/QPDFXRefEntry.hh
index aac2e5cb..e5b79df5 100644
--- a/include/qpdf/QPDFXRefEntry.hh
+++ b/include/qpdf/QPDFXRefEntry.hh
@@ -10,8 +10,7 @@
#include <qpdf/DLL.hh>
-DLL_EXPORT
-class QPDFXRefEntry
+class DLL_EXPORT QPDFXRefEntry
{
public:
// Type constants are from the PDF spec section
diff --git a/libqpdf/qpdf/BitStream.hh b/libqpdf/qpdf/BitStream.hh
index ccebddda..d01be32e 100644
--- a/libqpdf/qpdf/BitStream.hh
+++ b/libqpdf/qpdf/BitStream.hh
@@ -5,8 +5,7 @@
#include <qpdf/DLL.hh>
-DLL_EXPORT
-class BitStream
+class DLL_EXPORT BitStream
{
public:
BitStream(unsigned char const* p, int nbytes);
diff --git a/libqpdf/qpdf/BitWriter.hh b/libqpdf/qpdf/BitWriter.hh
index fb88e908..9e99123b 100644
--- a/libqpdf/qpdf/BitWriter.hh
+++ b/libqpdf/qpdf/BitWriter.hh
@@ -7,8 +7,7 @@
class Pipeline;
-DLL_EXPORT
-class BitWriter
+class DLL_EXPORT BitWriter
{
public:
// Write bits to the pipeline. It is the caller's responsibility
diff --git a/libqpdf/qpdf/MD5.hh b/libqpdf/qpdf/MD5.hh
index 435abbfb..9bc82877 100644
--- a/libqpdf/qpdf/MD5.hh
+++ b/libqpdf/qpdf/MD5.hh
@@ -8,8 +8,7 @@
# include <inttypes.h>
#endif
-DLL_EXPORT
-class MD5
+class DLL_EXPORT MD5
{
public:
typedef unsigned char Digest[16];
diff --git a/libqpdf/qpdf/PCRE.hh b/libqpdf/qpdf/PCRE.hh
index 2cf2bdcd..f8487ee9 100644
--- a/libqpdf/qpdf/PCRE.hh
+++ b/libqpdf/qpdf/PCRE.hh
@@ -17,8 +17,7 @@
// Note: this class does not encapsulate all features of the PCRE
// package -- only those that I actually need right now are here.
-DLL_EXPORT
-class PCRE
+class DLL_EXPORT PCRE
{
public:
// This is thrown when an attempt is made to access a non-existent
diff --git a/libqpdf/qpdf/Pl_ASCII85Decoder.hh b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
index 3997e403..bcb31340 100644
--- a/libqpdf/qpdf/Pl_ASCII85Decoder.hh
+++ b/libqpdf/qpdf/Pl_ASCII85Decoder.hh
@@ -3,8 +3,7 @@
#include <qpdf/Pipeline.hh>
-DLL_EXPORT
-class Pl_ASCII85Decoder: public Pipeline
+class DLL_EXPORT Pl_ASCII85Decoder: public Pipeline
{
public:
Pl_ASCII85Decoder(char const* identifier, Pipeline* next);
diff --git a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
index 63fa7345..8a0c43f6 100644
--- a/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
+++ b/libqpdf/qpdf/Pl_ASCIIHexDecoder.hh
@@ -3,8 +3,7 @@
#include <qpdf/Pipeline.hh>
-DLL_EXPORT
-class Pl_ASCIIHexDecoder: public Pipeline
+class DLL_EXPORT Pl_ASCIIHexDecoder: public Pipeline
{
public:
Pl_ASCIIHexDecoder(char const* identifier, Pipeline* next);
diff --git a/libqpdf/qpdf/Pl_LZWDecoder.hh b/libqpdf/qpdf/Pl_LZWDecoder.hh
index 6ffc6a84..ab7a3d25 100644
--- a/libqpdf/qpdf/Pl_LZWDecoder.hh
+++ b/libqpdf/qpdf/Pl_LZWDecoder.hh
@@ -6,8 +6,7 @@
#include <qpdf/Buffer.hh>
#include <vector>
-DLL_EXPORT
-class Pl_LZWDecoder: public Pipeline
+class DLL_EXPORT Pl_LZWDecoder: public Pipeline
{
public:
Pl_LZWDecoder(char const* identifier, Pipeline* next,
diff --git a/libqpdf/qpdf/Pl_MD5.hh b/libqpdf/qpdf/Pl_MD5.hh
index 6454e535..6184ef15 100644
--- a/libqpdf/qpdf/Pl_MD5.hh
+++ b/libqpdf/qpdf/Pl_MD5.hh
@@ -12,8 +12,7 @@
#include <qpdf/Pipeline.hh>
#include <qpdf/MD5.hh>
-DLL_EXPORT
-class Pl_MD5: public Pipeline
+class DLL_EXPORT Pl_MD5: public Pipeline
{
public:
Pl_MD5(char const* identifier, Pipeline* next);
diff --git a/libqpdf/qpdf/Pl_PNGFilter.hh b/libqpdf/qpdf/Pl_PNGFilter.hh
index 84a16af0..99d8ac14 100644
--- a/libqpdf/qpdf/Pl_PNGFilter.hh
+++ b/libqpdf/qpdf/Pl_PNGFilter.hh
@@ -16,8 +16,7 @@
#include <qpdf/Pipeline.hh>
-DLL_EXPORT
-class Pl_PNGFilter: public Pipeline
+class DLL_EXPORT Pl_PNGFilter: public Pipeline
{
public:
// Encoding is not presently supported
diff --git a/libqpdf/qpdf/Pl_RC4.hh b/libqpdf/qpdf/Pl_RC4.hh
index fab3ac31..ade69053 100644
--- a/libqpdf/qpdf/Pl_RC4.hh
+++ b/libqpdf/qpdf/Pl_RC4.hh
@@ -5,8 +5,7 @@
#include <qpdf/RC4.hh>
-DLL_EXPORT
-class Pl_RC4: public Pipeline
+class DLL_EXPORT Pl_RC4: public Pipeline
{
public:
static int const def_bufsize = 65536;