Merge branch 'dev' into dev-warnings

This commit is contained in:
Jan Schuffenhauer
2020-01-17 09:59:25 +01:00
145 changed files with 202 additions and 185 deletions

View File

@@ -26,7 +26,7 @@
<tr style="height: 56px;">
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">IntelliPhoto
&#160;<span id="projectnumber">0.5</span>
&#160;<span id="projectnumber">0.6</span>
</div>
</td>
</tr>
@@ -216,6 +216,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_8cpp_source.html',''); i
<div class="ttc" id="aclass_intelli_image_html_ad66fbe380ffe0e073a8cd760f8285fe3"><div class="ttname"><a href="class_intelli_image.html#ad66fbe380ffe0e073a8cd760f8285fe3">IntelliImage::getImageData</a></div><div class="ttdeci">virtual QImage getImageData()</div><div class="ttdoc">getImageData returns the data of the current image (Note: It will allways return a ARGB32bit QImage!...</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_image_8cpp_source.html#l00134">IntelliImage.cpp:134</a></div></div>
<div class="ttc" id="aclass_intelli_image_html_ab09c64e7559f3db32ca3b20ba6339268"><div class="ttname"><a href="class_intelli_image.html#ab09c64e7559f3db32ca3b20ba6339268">IntelliImage::setImageData</a></div><div class="ttdeci">virtual void setImageData(const QImage &amp;newData)</div><div class="ttdoc">setImageData overwrites the old imageData the new imageData.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_image_8cpp_source.html#l00142">IntelliImage.cpp:142</a></div></div>
<div class="ttc" id="aclass_intelli_photo_gui_html_a343f8ebf5d27b7242208747de6c92497"><div class="ttname"><a href="class_intelli_photo_gui.html#a343f8ebf5d27b7242208747de6c92497">IntelliPhotoGui::setToolWidth</a></div><div class="ttdeci">void setToolWidth(int value)</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_photo_gui_8cpp_source.html#l00827">IntelliPhotoGui.cpp:827</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a0020fad2e26315d5c4d96dbc95d1dceb"><div class="ttname"><a href="class_intelli_tool.html#a0020fad2e26315d5c4d96dbc95d1dceb">IntelliTool::getIsDrawing</a></div><div class="ttdeci">bool getIsDrawing()</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8cpp_source.html#l00103">IntelliTool.cpp:103</a></div></div>
<div class="ttc" id="a_painting_area_8h_html"><div class="ttname"><a href="_painting_area_8h.html">PaintingArea.h</a></div></div>
<div class="ttc" id="astruct_layer_object_html_ae0003fb815e50ed587a9897988befc90"><div class="ttname"><a href="struct_layer_object.html#ae0003fb815e50ed587a9897988befc90">LayerObject::height</a></div><div class="ttdeci">int height</div><div class="ttdoc">height - Stores the height of a layer in pixels.</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8h_source.html#l00035">PaintingArea.h:35</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html_a631388999f36013628e13b9de87a6f7b"><div class="ttname"><a href="class_intelli_tool.html#a631388999f36013628e13b9de87a6f7b">IntelliTool::ActiveType</a></div><div class="ttdeci">Tooltype ActiveType</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00052">IntelliTool.h:52</a></div></div>