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>
@@ -157,6 +157,7 @@ $(document).ready(function(){initNavTree('_intelli_tool_line_8cpp_source.html','
<div class="ttc" id="aclass_intelli_tool_html_a144d469cc03584f501194529a1b53c77"><div class="ttname"><a href="class_intelli_tool.html#a144d469cc03584f501194529a1b53c77">IntelliTool::Canvas</a></div><div class="ttdeci">LayerObject * Canvas</div><div class="ttdoc">A pointer to the drawing canvas of the tool, work on this.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00069">IntelliTool.h:69</a></div></div>
<div class="ttc" id="aclass_intelli_tool_html"><div class="ttname"><a href="class_intelli_tool.html">IntelliTool</a></div><div class="ttdoc">An abstract class that manages the basic events, like mouse clicks or scrolls events.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_tool_8h_source.html#l00017">IntelliTool.h:17</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="aclass_intelli_color_picker_html_aae2eb27b928fe9388b9398b0556303b7"><div class="ttname"><a href="class_intelli_color_picker.html#aae2eb27b928fe9388b9398b0556303b7">IntelliColorPicker::getFirstColor</a></div><div class="ttdeci">QColor getFirstColor()</div><div class="ttdoc">A function to read the primary selected color.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8cpp_source.html#l00015">IntelliColorPicker.cpp:15</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>
<div class="ttc" id="aclass_intelli_color_picker_html"><div class="ttname"><a href="class_intelli_color_picker.html">IntelliColorPicker</a></div><div class="ttdoc">The IntelliColorPicker manages the selected colors for one whole project.</div><div class="ttdef"><b>Definition:</b> <a href="_intelli_color_picker_8h_source.html#l00014">IntelliColorPicker.h:14</a></div></div>
<div class="ttc" id="astruct_layer_object_html_af01a139bc8edfdbb338393874e89bd83"><div class="ttname"><a href="struct_layer_object.html#af01a139bc8edfdbb338393874e89bd83">LayerObject::image</a></div><div class="ttdeci">IntelliImage * image</div><div class="ttdoc">image - Stores the imageData of the current LayerObject.</div><div class="ttdef"><b>Definition:</b> <a href="_painting_area_8h_source.html#l00027">PaintingArea.h:27</a></div></div>