From: Michael Wallner Date: Thu, 5 Dec 2013 08:37:03 +0000 (+0100) Subject: Merge remote-tracking branch 'refs/remotes/origin/master' X-Git-Tag: release-1.0.2RC1~20 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=9155673850189951e27e188f2003ba68d8ea2c67;hp=36da2074d28309d1704b47e121f432fcdaf8a245;p=m6w6%2Fext-propro Merge remote-tracking branch 'refs/remotes/origin/master' especially if it merges an updated upstream into a topic branch. --- diff --git a/Doxyfile b/Doxyfile index 26fd71e..4b56bef 100644 --- a/Doxyfile +++ b/Doxyfile @@ -7,8 +7,8 @@ DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = "Property proxy API" PROJECT_NUMBER = PROJECT_BRIEF = "A facility to manage extension object properties tied to C-struct members" -PROJECT_LOGO = -OUTPUT_DIRECTORY = +PROJECT_LOGO = +OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES diff --git a/html/annotated.html b/html/annotated.html index ae1a090..0fdbff0 100644 --- a/html/annotated.html +++ b/html/annotated.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -79,7 +79,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -96,7 +96,7 @@ $(document).ready(function(){initNavTree('annotated.html','');});
-
diff --git a/html/classes.html b/html/classes.html index 61b8272..468fe2f 100644 --- a/html/classes.html +++ b/html/classes.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -79,7 +79,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -96,7 +96,7 @@ $(document).ready(function(){initNavTree('classes.html','');});
-
diff --git a/html/doxygen.css b/html/doxygen.css index cdafb5f..4699e69 100644 --- a/html/doxygen.css +++ b/html/doxygen.css @@ -142,11 +142,11 @@ a.elRef { } a.code, a.code:visited, a.line, a.line:visited { - color: #4665A2; + color: #4665A2; } a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited { - color: #4665A2; + color: #4665A2; } /* @end */ @@ -290,7 +290,7 @@ p.formulaDsp { } img.formulaDsp { - + } img.formulaInl { @@ -348,20 +348,20 @@ span.charliteral { color: #008080 } -span.vhdldigit { - color: #ff00ff +span.vhdldigit { + color: #ff00ff } -span.vhdlchar { - color: #000000 +span.vhdlchar { + color: #000000 } -span.vhdlkeyword { - color: #700070 +span.vhdlkeyword { + color: #700070 } -span.vhdllogic { - color: #ff0000 +span.vhdllogic { + color: #ff0000 } blockquote { @@ -556,9 +556,9 @@ table.memberdecls { } .memdoc, dl.reflist dd { - border-bottom: 1px solid #A8B8D9; - border-left: 1px solid #A8B8D9; - border-right: 1px solid #A8B8D9; + border-bottom: 1px solid #A8B8D9; + border-left: 1px solid #A8B8D9; + border-right: 1px solid #A8B8D9; padding: 6px 10px 2px 10px; background-color: #FBFCFD; border-top-width: 0; @@ -610,18 +610,18 @@ dl.reflist dd { .params, .retval, .exception, .tparams { margin-left: 0px; padding-left: 0px; -} +} .params .paramname, .retval .paramname { font-weight: bold; vertical-align: top; } - + .params .paramtype { font-style: italic; vertical-align: top; -} - +} + .params .paramdir { font-family: "courier new",courier,monospace; vertical-align: top; @@ -799,8 +799,8 @@ table.fieldtable { .fieldtable td.fielddoc p:first-child { margin-top: 0px; -} - +} + .fieldtable td.fielddoc p:last-child { margin-bottom: 2px; } @@ -874,7 +874,7 @@ table.fieldtable { color: #283A5D; font-family: 'Lucida Grande',Geneva,Helvetica,Arial,sans-serif; text-shadow: 0px 1px 1px rgba(255, 255, 255, 0.9); - text-decoration: none; + text-decoration: none; } .navpath li.navelem a:hover @@ -903,7 +903,7 @@ div.summary padding-right: 5px; width: 50%; text-align: right; -} +} div.summary a { @@ -1015,19 +1015,19 @@ dl.section dd { vertical-align: bottom; border-collapse: separate; } - + #projectlogo img -{ +{ border: 0px none; } - + #projectname { font: 300% Tahoma, Arial,sans-serif; margin: 0px; padding: 2px 0px; } - + #projectbrief { font: 120% Tahoma, Arial,sans-serif; @@ -1122,7 +1122,7 @@ div.toc ul { list-style: none outside none; border: medium none; padding: 0px; -} +} div.toc li.level1 { margin-left: 0px; @@ -1354,3 +1354,4 @@ tr.heading h2 { display:inline; } } + diff --git a/html/dynsections.js b/html/dynsections.js index 10420e7..ed092c7 100644 --- a/html/dynsections.js +++ b/html/dynsections.js @@ -15,7 +15,7 @@ function toggleVisibility(linkObj) summary.hide(); $(linkObj).removeClass('closed').addClass('opened'); $(trigger).attr('src',src.substring(0,src.length-10)+'open.png'); - } + } return false; } @@ -26,7 +26,7 @@ function updateStripes() } function toggleLevel(level) { - $('table.directory tr').each(function(){ + $('table.directory tr').each(function(){ var l = this.id.split('_').length-1; var i = $('#img'+this.id.substring(3)); var a = $('#arr'+this.id.substring(3)); @@ -94,3 +94,4 @@ function toggleInherit(id) $(img).attr('src',src.substring(0,src.length-10)+'open.png'); } } + diff --git a/html/files.html b/html/files.html index e7fa21a..4a1ed59 100644 --- a/html/files.html +++ b/html/files.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -95,7 +95,7 @@ $(document).ready(function(){initNavTree('files.html','');});
-
diff --git a/html/functions.html b/html/functions.html index 54aa64f..840ab0c 100644 --- a/html/functions.html +++ b/html/functions.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -102,7 +102,7 @@ $(document).ready(function(){initNavTree('functions.html','');});
-
diff --git a/html/functions_vars.html b/html/functions_vars.html index b023c66..047cee6 100644 --- a/html/functions_vars.html +++ b/html/functions_vars.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -102,7 +102,7 @@ $(document).ready(function(){initNavTree('functions_vars.html','');});
-
diff --git a/html/globals.html b/html/globals.html index 5d9b43b..c64aa76 100644 --- a/html/globals.html +++ b/html/globals.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -102,7 +102,7 @@ $(document).ready(function(){initNavTree('globals.html','');});
-
diff --git a/html/globals_func.html b/html/globals_func.html index 91f9595..06f71f6 100644 --- a/html/globals_func.html +++ b/html/globals_func.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -102,7 +102,7 @@ $(document).ready(function(){initNavTree('globals_func.html','');});
-
diff --git a/html/globals_type.html b/html/globals_type.html index 7802c55..9249fee 100644 --- a/html/globals_type.html +++ b/html/globals_type.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -85,7 +85,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -102,7 +102,7 @@ $(document).ready(function(){initNavTree('globals_type.html','');});
-
diff --git a/html/graph_legend.html b/html/graph_legend.html index 6f9a514..94ec6a8 100644 --- a/html/graph_legend.html +++ b/html/graph_legend.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -89,7 +89,7 @@ $(document).ready(function(){initNavTree('graph_legend.html','');});
-
diff --git a/html/index.html b/html/index.html index 74c4341..fcc4194 100644 --- a/html/index.html +++ b/html/index.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -72,7 +72,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -89,7 +89,7 @@ $(document).ready(function(){initNavTree('index.html','');});
-
diff --git a/html/jquery.js b/html/jquery.js index daead15..3db33e6 100644 --- a/html/jquery.js +++ b/html/jquery.js @@ -63,7 +63,7 @@ if(bA>0){if(bv!=="border"){for(;bx=t.parentData.width){t.size.width=t.parentData.width-l;if(r){t.size.height=t.size.width/t.aspectRatio}}if(s+t.size.height>=t.parentData.height){t.size.height=t.parentData.height-s;if(r){t.size.width=t.size.height*t.aspectRatio}}},stop:function(f,n){var q=c(this).data("resizable"),g=q.options,l=q.position,m=q.containerOffset,e=q.containerPosition,i=q.containerElement;var j=c(q.helper),r=j.offset(),p=j.outerWidth()-q.sizeDiff.width,k=j.outerHeight()-q.sizeDiff.height;if(q._helper&&!g.animate&&(/relative/).test(i.css("position"))){c(this).css({left:r.left-e.left-m.left,width:p,height:k})}if(q._helper&&!g.animate&&(/static/).test(i.css("position"))){c(this).css({left:r.left-e.left-m.left,width:p,height:k})}}});c.ui.plugin.add("resizable","ghost",{start:function(g,h){var e=c(this).data("resizable"),i=e.options,f=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,display:"block",position:"relative",height:f.height,width:f.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof i.ghost=="string"?i.ghost:"");e.ghost.appendTo(e.helper)},resize:function(f,g){var e=c(this).data("resizable"),h=e.options;if(e.ghost){e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})}},stop:function(f,g){var e=c(this).data("resizable"),h=e.options;if(e.ghost&&e.helper){e.helper.get(0).removeChild(e.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(e,m){var p=c(this).data("resizable"),h=p.options,k=p.size,i=p.originalSize,j=p.originalPosition,n=p.axis,l=h._aspectRatio||e.shiftKey;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var g=Math.round((k.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1),f=Math.round((k.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f}else{if(/^(ne)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f;p.position.top=j.top-f}else{if(/^(sw)$/.test(n)){p.size.width=i.width+g;p.size.height=i.height+f;p.position.left=j.left-g}else{p.size.width=i.width+g;p.size.height=i.height+f;p.position.top=j.top-f;p.position.left=j.left-g}}}}});var b=function(e){return parseInt(e,10)||0};var a=function(e){return !isNaN(parseInt(e,10))}})(jQuery);/*! * jQuery hashchange event - v1.3 - 7/21/2010 * http://benalman.com/projects/jquery-hashchange-plugin/ - * + * * Copyright (c) 2010 "Cowboy" Ben Alman * Dual licensed under the MIT and GPL licenses. * http://benalman.com/about/license/ diff --git a/html/navtree.css b/html/navtree.css index 3b16de1..41a9cb9 100644 --- a/html/navtree.css +++ b/html/navtree.css @@ -67,7 +67,7 @@ #nav-tree { padding: 0px 0px; - background-color: #FAFAFF; + background-color: #FAFAFF; font-size:14px; overflow:auto; } @@ -140,3 +140,4 @@ #nav-tree { display: none; } div.ui-resizable-handle { display: none; position: relative; } } + diff --git a/html/navtree.js b/html/navtree.js index 955668b..550f10f 100644 --- a/html/navtree.js +++ b/html/navtree.js @@ -73,7 +73,7 @@ function deleteLink() { if (localStorageSupported()) { window.localStorage.setItem('navpath',''); - } + } } function cachedLink() @@ -87,21 +87,21 @@ function cachedLink() function getScript(scriptName,func,show) { - var head = document.getElementsByTagName("head")[0]; + var head = document.getElementsByTagName("head")[0]; var script = document.createElement('script'); script.id = scriptName; script.type = 'text/javascript'; - script.onload = func; - script.src = scriptName+'.js'; - if ($.browser.msie && $.browser.version<=8) { + script.onload = func; + script.src = scriptName+'.js'; + if ($.browser.msie && $.browser.version<=8) { // script.onload does not work with older versions of IE script.onreadystatechange = function() { - if (script.readyState=='complete' || script.readyState=='loaded') { - func(); if (show) showRoot(); + if (script.readyState=='complete' || script.readyState=='loaded') { + func(); if (show) showRoot(); } } } - head.appendChild(script); + head.appendChild(script); } function createIndent(o,domNode,node,level) @@ -137,7 +137,7 @@ function createIndent(o,domNode,node,level) span.style.height = '22px'; span.innerHTML = ' '; domNode.appendChild(span); - } + } } var animationInProgress = false; @@ -147,7 +147,7 @@ function gotoAnchor(anchor,aname,updateLocation) var pos, docContent = $('#doc-content'); if (anchor.parent().attr('class')=='memItemLeft' || anchor.parent().attr('class')=='fieldtype' || - anchor.parent().is(':header')) + anchor.parent().is(':header')) { pos = anchor.parent().position().top; } else if (anchor.position()) { @@ -209,7 +209,7 @@ function newNode(o, po, text, link, childrenData, lastNode) var aname = '#'+link.split('#')[1]; var srcPage = stripPath($(location).attr('pathname')); var targetPage = stripPath(link.split('#')[0]); - a.href = srcPage!=targetPage ? url : "javascript:void(0)"; + a.href = srcPage!=targetPage ? url : "javascript:void(0)"; a.onclick = function(){ storeLink(link); if (!$(a).parent().parent().hasClass('selected')) @@ -227,7 +227,7 @@ function newNode(o, po, text, link, childrenData, lastNode) a.onclick = function() { storeLink(link); } } } else { - if (childrenData != null) + if (childrenData != null) { a.className = "nolink"; a.href = "javascript:void(0)"; @@ -276,7 +276,7 @@ function expandNode(o, node, imm, showRoot) } else { if (!node.childrenVisited) { getNode(o, node); - } if (imm || ($.browser.msie && $.browser.version>8)) { + } if (imm || ($.browser.msie && $.browser.version>8)) { // somehow slideDown jumps to the start of tree for IE9 :-( $(node.getChildrenUL()).show(); } else { @@ -541,3 +541,4 @@ function initNavTree(toroot,relpath) } }) } + diff --git a/html/php__propro_8h.html b/html/php__propro_8h.html index 12ec79e..d89ae2a 100644 --- a/html/php__propro_8h.html +++ b/html/php__propro_8h.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -95,7 +95,7 @@ $(document).ready(function(){initNavTree('php__propro_8h.html','');});
-
diff --git a/html/php__propro_8h_source.html b/html/php__propro_8h_source.html index 42ee849..af87d4c 100644 --- a/html/php__propro_8h_source.html +++ b/html/php__propro_8h_source.html @@ -55,8 +55,8 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); onmouseout="return searchBox.OnSearchSelectHide()" alt=""/> @@ -78,7 +78,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); -
@@ -95,7 +95,7 @@ $(document).ready(function(){initNavTree('php__propro_8h_source.html','');});
-
diff --git a/html/resize.js b/html/resize.js index 2bb9169..a80dece 100644 --- a/html/resize.js +++ b/html/resize.js @@ -1,17 +1,17 @@ -var cookie_namespace = 'doxygen'; +var cookie_namespace = 'doxygen'; var sidenav,navtree,content,header; -function readCookie(cookie) +function readCookie(cookie) { var myCookie = cookie_namespace+"_"+cookie+"="; - if (document.cookie) + if (document.cookie) { var index = document.cookie.indexOf(myCookie); - if (index != -1) + if (index != -1) { var valStart = index + myCookie.length; var valEnd = document.cookie.indexOf(";", valStart); - if (valEnd == -1) + if (valEnd == -1) { valEnd = document.cookie.length; } @@ -22,10 +22,10 @@ function readCookie(cookie) return 0; } -function writeCookie(cookie, val, expiration) +function writeCookie(cookie, val, expiration) { if (val==undefined) return; - if (expiration == null) + if (expiration == null) { var date = new Date(); date.setTime(date.getTime()+(10*365*24*60*60*1000)); // default expiration is one week @@ -33,12 +33,12 @@ function writeCookie(cookie, val, expiration) } document.cookie = cookie_namespace + "_" + cookie + "=" + val + "; expires=" + expiration+"; path=/"; } - -function resizeWidth() + +function resizeWidth() { var windowWidth = $(window).width() + "px"; var sidenavWidth = $(sidenav).outerWidth(); - content.css({marginLeft:parseInt(sidenavWidth)+"px"}); + content.css({marginLeft:parseInt(sidenavWidth)+"px"}); writeCookie('width',sidenavWidth, null); } @@ -49,7 +49,7 @@ function restoreWidth(navWidth) sidenav.css({width:navWidth + "px"}); } -function resizeHeight() +function resizeHeight() { var headerHeight = header.outerHeight(); var footerHeight = footer.outerHeight(); @@ -89,3 +89,5 @@ function initResizable() } }); } + + diff --git a/html/search/search.css b/html/search/search.css index 9e3d349..4d7612f 100644 --- a/html/search/search.css +++ b/html/search/search.css @@ -130,7 +130,7 @@ span.SelectionMark { a.SelectItem { display: block; outline-style: none; - color: #000000; + color: #000000; text-decoration: none; padding-left: 6px; padding-right: 12px; @@ -138,7 +138,7 @@ a.SelectItem { a.SelectItem:focus, a.SelectItem:active { - color: #000000; + color: #000000; outline-style: none; text-decoration: none; } @@ -171,7 +171,7 @@ iframe#MSearchResults { #SRIndex { - clear:both; + clear:both; padding-bottom: 15px; } @@ -190,7 +190,7 @@ body.SRPage { } .SRChildren { - padding-left: 3ex; padding-bottom: .5em + padding-left: 3ex; padding-bottom: .5em } .SRPage .SRChildren { @@ -198,7 +198,7 @@ body.SRPage { } .SRSymbol { - font-weight: bold; + font-weight: bold; color: #425E97; font-family: Arial, Verdana, sans-serif; text-decoration: none; @@ -207,7 +207,7 @@ body.SRPage { a.SRScope { display: block; - color: #425E97; + color: #425E97; font-family: Arial, Verdana, sans-serif; text-decoration: none; outline: none; @@ -268,3 +268,4 @@ DIV.searchresults { .searchpages { margin-top: 10px; } + diff --git a/html/search/search.js b/html/search/search.js index b4dede7..6806816 100644 --- a/html/search/search.js +++ b/html/search/search.js @@ -36,11 +36,11 @@ function convertToId(search) { result+=c; } - else if (cn<16) + else if (cn<16) { result+="_0"+cn.toString(16); } - else + else { result+="_"+cn.toString(16); } @@ -79,14 +79,14 @@ function getYPos(item) /* A class handling everything associated with the search panel. Parameters: - name - The name of the global variable that will be + name - The name of the global variable that will be storing this instance. Is needed to be able to set timeouts. resultPath - path to use for external files */ function SearchBox(name, resultsPath, inFrame, label) { if (!name || !resultsPath) { alert("Missing parameters to SearchBox."); } - + // ---------- Instance variables this.name = name; this.resultsPath = resultsPath; @@ -163,7 +163,7 @@ function SearchBox(name, resultsPath, inFrame, label) } // stop selection hide timer - if (this.hideTimeout) + if (this.hideTimeout) { clearTimeout(this.hideTimeout); this.hideTimeout=0; @@ -192,7 +192,7 @@ function SearchBox(name, resultsPath, inFrame, label) if (e.shiftKey==1) { this.OnSearchSelectShow(); - var win=this.DOMSearchSelectWindow(); + var win=this.DOMSearchSelectWindow(); for (i=0;i