Commit 2b7e9ba2f5a247ea45ac19cdf73506f351d5afb1

Authored by m-holger
1 parent 1bb40238

Remove methods and parameters obsoleted by the last two commits

include/qpdf/QPDFObjectHandle.hh
@@ -326,7 +326,7 @@ class QPDFObjectHandle @@ -326,7 +326,7 @@ class QPDFObjectHandle
326 }; 326 };
327 327
328 QPDF_DLL 328 QPDF_DLL
329 - QPDFObjectHandle(); 329 + QPDFObjectHandle() = default;
330 QPDF_DLL 330 QPDF_DLL
331 QPDFObjectHandle(QPDFObjectHandle const&) = default; 331 QPDFObjectHandle(QPDFObjectHandle const&) = default;
332 QPDF_DLL 332 QPDF_DLL
@@ -1453,12 +1453,9 @@ class QPDFObjectHandle @@ -1453,12 +1453,9 @@ class QPDFObjectHandle
1453 1453
1454 private: 1454 private:
1455 static QPDFObjectHandle 1455 static QPDFObjectHandle
1456 - newIndirect(  
1457 - QPDF* qpdf,  
1458 - QPDFObjGen const& og,  
1459 - std::shared_ptr<QPDFObject> const& obj) 1456 + newIndirect(std::shared_ptr<QPDFObject> const& obj)
1460 { 1457 {
1461 - return QPDFObjectHandle(qpdf, og, obj); 1458 + return QPDFObjectHandle(obj);
1462 } 1459 }
1463 static QPDFObjectHandle 1460 static QPDFObjectHandle
1464 newStream( 1461 newStream(
@@ -1580,14 +1577,10 @@ class QPDFObjectHandle @@ -1580,14 +1577,10 @@ class QPDFObjectHandle
1580 bool isImage(bool exclude_imagemask = true); 1577 bool isImage(bool exclude_imagemask = true);
1581 1578
1582 private: 1579 private:
1583 - QPDFObjectHandle(  
1584 - QPDF* qpdf,  
1585 - QPDFObjGen const& og,  
1586 - std::shared_ptr<QPDFObject> const& obj) : 1580 + QPDFObjectHandle(std::shared_ptr<QPDFObject> const& obj) :
1587 obj(obj) 1581 obj(obj)
1588 { 1582 {
1589 } 1583 }
1590 - QPDFObjectHandle(std::shared_ptr<QPDFObject> const&);  
1591 1584
1592 // Private object factory methods 1585 // Private object factory methods
1593 static QPDFObjectHandle newStream( 1586 static QPDFObjectHandle newStream(
libqpdf/QPDF.cc
@@ -2113,7 +2113,7 @@ QPDF::newIndirect(QPDFObjGen const&amp; og, std::shared_ptr&lt;QPDFObject&gt; const&amp; obj) @@ -2113,7 +2113,7 @@ QPDF::newIndirect(QPDFObjGen const&amp; og, std::shared_ptr&lt;QPDFObject&gt; const&amp; obj)
2113 if (!obj->hasDescription()) { 2113 if (!obj->hasDescription()) {
2114 obj->setDescription(this, "object " + og.unparse(' ')); 2114 obj->setDescription(this, "object " + og.unparse(' '));
2115 } 2115 }
2116 - return QPDFObjectHandle::Factory::newIndirect(this, og, obj); 2116 + return QPDFObjectHandle::Factory::newIndirect(obj);
2117 } 2117 }
2118 2118
2119 void 2119 void
libqpdf/QPDFObjectHandle.cc
@@ -235,15 +235,6 @@ LastChar::getLastChar() @@ -235,15 +235,6 @@ LastChar::getLastChar()
235 return this->last_char; 235 return this->last_char;
236 } 236 }
237 237
238 -QPDFObjectHandle::QPDFObjectHandle()  
239 -{  
240 -}  
241 -  
242 -QPDFObjectHandle::QPDFObjectHandle(std::shared_ptr<QPDFObject> const& data) :  
243 - obj(data)  
244 -{  
245 -}  
246 -  
247 void 238 void
248 QPDFObjectHandle::releaseResolved() 239 QPDFObjectHandle::releaseResolved()
249 { 240 {