Commit 008364a9a4b1bd58c964151c7dc1db0a83c9b70c
Committed by
Jay Berkenbilt
1 parent
ff42ea4e
Remove redundant friend class statements
Showing
6 changed files
with
0 additions
and
13 deletions
include/qpdf/QPDF.hh
| @@ -886,7 +886,6 @@ class QPDF | @@ -886,7 +886,6 @@ class QPDF | ||
| 886 | qpdf->resolve(og); | 886 | qpdf->resolve(og); |
| 887 | } | 887 | } |
| 888 | }; | 888 | }; |
| 889 | - friend class Resolver; | ||
| 890 | 889 | ||
| 891 | // StreamCopier class is restricted to QPDFObjectHandle so it can | 890 | // StreamCopier class is restricted to QPDFObjectHandle so it can |
| 892 | // copy stream data. | 891 | // copy stream data. |
| @@ -904,7 +903,6 @@ class QPDF | @@ -904,7 +903,6 @@ class QPDF | ||
| 904 | qpdf->copyStreamData(dest, src); | 903 | qpdf->copyStreamData(dest, src); |
| 905 | } | 904 | } |
| 906 | }; | 905 | }; |
| 907 | - friend class Resolver; | ||
| 908 | 906 | ||
| 909 | // The ParseGuard class allows QPDFObjectHandle to detect | 907 | // The ParseGuard class allows QPDFObjectHandle to detect |
| 910 | // re-entrant parsing. | 908 | // re-entrant parsing. |
| @@ -928,7 +926,6 @@ class QPDF | @@ -928,7 +926,6 @@ class QPDF | ||
| 928 | } | 926 | } |
| 929 | QPDF* qpdf; | 927 | QPDF* qpdf; |
| 930 | }; | 928 | }; |
| 931 | - friend class ParseGuard; | ||
| 932 | 929 | ||
| 933 | // Pipe class is restricted to QPDF_Stream | 930 | // Pipe class is restricted to QPDF_Stream |
| 934 | class Pipe | 931 | class Pipe |
| @@ -957,7 +954,6 @@ class QPDF | @@ -957,7 +954,6 @@ class QPDF | ||
| 957 | will_retry); | 954 | will_retry); |
| 958 | } | 955 | } |
| 959 | }; | 956 | }; |
| 960 | - friend class Pipe; | ||
| 961 | 957 | ||
| 962 | // For testing only -- do not add to DLL | 958 | // For testing only -- do not add to DLL |
| 963 | static bool test_json_validators(); | 959 | static bool test_json_validators(); |
| @@ -1106,7 +1102,6 @@ class QPDF | @@ -1106,7 +1102,6 @@ class QPDF | ||
| 1106 | QPDF* qpdf; | 1102 | QPDF* qpdf; |
| 1107 | std::set<QPDFObjGen>::const_iterator iter; | 1103 | std::set<QPDFObjGen>::const_iterator iter; |
| 1108 | }; | 1104 | }; |
| 1109 | - friend class ResolveRecorder; | ||
| 1110 | 1105 | ||
| 1111 | class JSONReactor: public JSON::Reactor | 1106 | class JSONReactor: public JSON::Reactor |
| 1112 | { | 1107 | { |
| @@ -1173,7 +1168,6 @@ class QPDF | @@ -1173,7 +1168,6 @@ class QPDF | ||
| 1173 | std::vector<QPDFObjectHandle> object_stack; | 1168 | std::vector<QPDFObjectHandle> object_stack; |
| 1174 | std::set<QPDFObjGen> reserved; | 1169 | std::set<QPDFObjGen> reserved; |
| 1175 | }; | 1170 | }; |
| 1176 | - friend class JSONReactor; | ||
| 1177 | 1171 | ||
| 1178 | void parse(char const* password); | 1172 | void parse(char const* password); |
| 1179 | void inParse(bool); | 1173 | void inParse(bool); |
include/qpdf/QPDFJob.hh
| @@ -382,7 +382,6 @@ class QPDFJob | @@ -382,7 +382,6 @@ class QPDFJob | ||
| 382 | } | 382 | } |
| 383 | QPDFJob& o; | 383 | QPDFJob& o; |
| 384 | }; | 384 | }; |
| 385 | - friend class Config; | ||
| 386 | 385 | ||
| 387 | // Return a top-level configuration item. See CONFIGURATION above | 386 | // Return a top-level configuration item. See CONFIGURATION above |
| 388 | // for details. If an invalid configuration is created (such as | 387 | // for details. If an invalid configuration is created (such as |
include/qpdf/QPDFObjectHandle.hh
| @@ -1504,7 +1504,6 @@ class QPDFObjectHandle | @@ -1504,7 +1504,6 @@ class QPDFObjectHandle | ||
| 1504 | return QPDFObjectHandle(obj); | 1504 | return QPDFObjectHandle(obj); |
| 1505 | } | 1505 | } |
| 1506 | }; | 1506 | }; |
| 1507 | - friend class Factory; | ||
| 1508 | 1507 | ||
| 1509 | // Accessor for raw underlying object -- only QPDF is allowed to | 1508 | // Accessor for raw underlying object -- only QPDF is allowed to |
| 1510 | // call this. | 1509 | // call this. |
| @@ -1533,7 +1532,6 @@ class QPDFObjectHandle | @@ -1533,7 +1532,6 @@ class QPDFObjectHandle | ||
| 1533 | return oh.asStream(); | 1532 | return oh.asStream(); |
| 1534 | } | 1533 | } |
| 1535 | }; | 1534 | }; |
| 1536 | - friend class ObjAccessor; | ||
| 1537 | 1535 | ||
| 1538 | // Provide access to specific classes for recursive | 1536 | // Provide access to specific classes for recursive |
| 1539 | // disconnected(). | 1537 | // disconnected(). |
| @@ -1550,7 +1548,6 @@ class QPDFObjectHandle | @@ -1550,7 +1548,6 @@ class QPDFObjectHandle | ||
| 1550 | o.disconnect(); | 1548 | o.disconnect(); |
| 1551 | } | 1549 | } |
| 1552 | }; | 1550 | }; |
| 1553 | - friend class Resetter; | ||
| 1554 | 1551 | ||
| 1555 | // Convenience routine: Throws if the assumption is violated. Your | 1552 | // Convenience routine: Throws if the assumption is violated. Your |
| 1556 | // code will be better if you call one of the isType methods and | 1553 | // code will be better if you call one of the isType methods and |
include/qpdf/QPDFOutlineDocumentHelper.hh
| @@ -76,7 +76,6 @@ class QPDFOutlineDocumentHelper: public QPDFDocumentHelper | @@ -76,7 +76,6 @@ class QPDFOutlineDocumentHelper: public QPDFDocumentHelper | ||
| 76 | return dh.checkSeen(og); | 76 | return dh.checkSeen(og); |
| 77 | } | 77 | } |
| 78 | }; | 78 | }; |
| 79 | - friend class Accessor; | ||
| 80 | 79 | ||
| 81 | private: | 80 | private: |
| 82 | bool checkSeen(QPDFObjGen const& og); | 81 | bool checkSeen(QPDFObjGen const& og); |
include/qpdf/QPDFOutlineObjectHelper.hh
| @@ -93,7 +93,6 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper | @@ -93,7 +93,6 @@ class QPDFOutlineObjectHelper: public QPDFObjectHelper | ||
| 93 | return QPDFOutlineObjectHelper(oh, dh, depth); | 93 | return QPDFOutlineObjectHelper(oh, dh, depth); |
| 94 | } | 94 | } |
| 95 | }; | 95 | }; |
| 96 | - friend class Accessor; | ||
| 97 | 96 | ||
| 98 | private: | 97 | private: |
| 99 | QPDF_DLL | 98 | QPDF_DLL |
include/qpdf/QPDFWriter.hh
| @@ -550,7 +550,6 @@ class QPDFWriter | @@ -550,7 +550,6 @@ class QPDFWriter | ||
| 550 | std::shared_ptr<Buffer>* bp; | 550 | std::shared_ptr<Buffer>* bp; |
| 551 | std::string stack_id; | 551 | std::string stack_id; |
| 552 | }; | 552 | }; |
| 553 | - friend class PipelinePopper; | ||
| 554 | 553 | ||
| 555 | unsigned int bytesNeeded(long long n); | 554 | unsigned int bytesNeeded(long long n); |
| 556 | void writeBinary(unsigned long long val, unsigned int bytes); | 555 | void writeBinary(unsigned long long val, unsigned int bytes); |