Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/qt4/patches/qt-4.8.7-systemtrayicon.patch

    Diff of /trunk/qt4/patches/qt-4.8.7-systemtrayicon.patch

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2916 by niro, Thu Apr 27 14:32:52 2017 UTC revision 2917 by niro, Wed May 17 09:04:25 2017 UTC
    # Line 1  Line 1 
    1  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  Description: Introduce a plugin system for QSystemTrayIcon.
       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">  
     <html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>  
     <head>  
     <title>svntogit/packages.git - Git clone of the 'packages' repository  
     </title>  
     <meta name='generator' content='cgit v0.12'/>  
     <meta name='robots' content='index, nofollow'/>  
     <link rel='stylesheet' type='text/css' href='/cgit.css'/>  
     <link rel='shortcut icon' href='/favicon.ico'/>  
     <link rel='alternate' title='Atom feed' href='https://git.archlinux.org/svntogit/packages.git/atom/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4' type='application/atom+xml'/>  
     <link rel='vcs-git' href='https://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='git://git.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     <link rel='vcs-git' href='ssh://git.archlinux.org/srv/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>  
     </head>  
     <body>  
      <div id="archnavbar"><!-- Arch Linux global navigation bar -->  
      <div id="archnavbarlogo">  
      <p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>  
      </div>  
      <div id="archnavbarmenu">  
      <ul id="archnavbarlist">  
      <li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>  
      <li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>  
      <li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>  
      <li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>  
      <li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>  
      <li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>  
      <li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>  
      </ul>  
      </div>  
      </div><!-- #archnavbar -->  
     <div id='cgit'><table id='header'>  
     <tr>  
     <td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>  
     <tr><td class='sub'>Git clone of the 'packages' repository  
     </td><td class='sub right'></td></tr></table>  
     <table class='tabs'><tr><td>  
     <a href='/svntogit/packages.git/?h=packages/qt4'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/qt4'>refs</a><a href='/svntogit/packages.git/log/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>tree</a><a href='/svntogit/packages.git/commit/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>commit</a><a href='/svntogit/packages.git/diff/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>diff</a><a href='/svntogit/packages.git/stats/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/kubuntu_14_systemtrayicon.diff'>  
     <input type='hidden' name='h' value='packages/qt4'/><select name='qt'>  
     <option value='grep'>log msg</option>  
     <option value='author'>author</option>  
     <option value='committer'>committer</option>  
     <option value='range'>range</option>  
     </select>  
     <input class='txt' type='text' size='10' name='q' value=''/>  
     <input type='submit' value='search'/>  
     </form>  
     </td></tr></table>  
     <div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/qt4'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/qt4'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>kubuntu_14_systemtrayicon.diff</a></div><div class='content'>blob: 2466a16b47ea681ed1258e16f1596d27b234d0a8 (<a href='/svntogit/packages.git/plain/trunk/kubuntu_14_systemtrayicon.diff?h=packages/qt4'>plain</a>)  
     <table summary='blob content' class='blob'>  
     <tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>  
     <a id='n2' href='#n2'>2</a>  
     <a id='n3' href='#n3'>3</a>  
     <a id='n4' href='#n4'>4</a>  
     <a id='n5' href='#n5'>5</a>  
     <a id='n6' href='#n6'>6</a>  
     <a id='n7' href='#n7'>7</a>  
     <a id='n8' href='#n8'>8</a>  
     <a id='n9' href='#n9'>9</a>  
     <a id='n10' href='#n10'>10</a>  
     <a id='n11' href='#n11'>11</a>  
     <a id='n12' href='#n12'>12</a>  
     <a id='n13' href='#n13'>13</a>  
     <a id='n14' href='#n14'>14</a>  
     <a id='n15' href='#n15'>15</a>  
     <a id='n16' href='#n16'>16</a>  
     <a id='n17' href='#n17'>17</a>  
     <a id='n18' href='#n18'>18</a>  
     <a id='n19' href='#n19'>19</a>  
     <a id='n20' href='#n20'>20</a>  
     <a id='n21' href='#n21'>21</a>  
     <a id='n22' href='#n22'>22</a>  
     <a id='n23' href='#n23'>23</a>  
     <a id='n24' href='#n24'>24</a>  
     <a id='n25' href='#n25'>25</a>  
     <a id='n26' href='#n26'>26</a>  
     <a id='n27' href='#n27'>27</a>  
     <a id='n28' href='#n28'>28</a>  
     <a id='n29' href='#n29'>29</a>  
     <a id='n30' href='#n30'>30</a>  
     <a id='n31' href='#n31'>31</a>  
     <a id='n32' href='#n32'>32</a>  
     <a id='n33' href='#n33'>33</a>  
     <a id='n34' href='#n34'>34</a>  
     <a id='n35' href='#n35'>35</a>  
     <a id='n36' href='#n36'>36</a>  
     <a id='n37' href='#n37'>37</a>  
     <a id='n38' href='#n38'>38</a>  
     <a id='n39' href='#n39'>39</a>  
     <a id='n40' href='#n40'>40</a>  
     <a id='n41' href='#n41'>41</a>  
     <a id='n42' href='#n42'>42</a>  
     <a id='n43' href='#n43'>43</a>  
     <a id='n44' href='#n44'>44</a>  
     <a id='n45' href='#n45'>45</a>  
     <a id='n46' href='#n46'>46</a>  
     <a id='n47' href='#n47'>47</a>  
     <a id='n48' href='#n48'>48</a>  
     <a id='n49' href='#n49'>49</a>  
     <a id='n50' href='#n50'>50</a>  
     <a id='n51' href='#n51'>51</a>  
     <a id='n52' href='#n52'>52</a>  
     <a id='n53' href='#n53'>53</a>  
     <a id='n54' href='#n54'>54</a>  
     <a id='n55' href='#n55'>55</a>  
     <a id='n56' href='#n56'>56</a>  
     <a id='n57' href='#n57'>57</a>  
     <a id='n58' href='#n58'>58</a>  
     <a id='n59' href='#n59'>59</a>  
     <a id='n60' href='#n60'>60</a>  
     <a id='n61' href='#n61'>61</a>  
     <a id='n62' href='#n62'>62</a>  
     <a id='n63' href='#n63'>63</a>  
     <a id='n64' href='#n64'>64</a>  
     <a id='n65' href='#n65'>65</a>  
     <a id='n66' href='#n66'>66</a>  
     <a id='n67' href='#n67'>67</a>  
     <a id='n68' href='#n68'>68</a>  
     <a id='n69' href='#n69'>69</a>  
     <a id='n70' href='#n70'>70</a>  
     <a id='n71' href='#n71'>71</a>  
     <a id='n72' href='#n72'>72</a>  
     <a id='n73' href='#n73'>73</a>  
     <a id='n74' href='#n74'>74</a>  
     <a id='n75' href='#n75'>75</a>  
     <a id='n76' href='#n76'>76</a>  
     <a id='n77' href='#n77'>77</a>  
     <a id='n78' href='#n78'>78</a>  
     <a id='n79' href='#n79'>79</a>  
     <a id='n80' href='#n80'>80</a>  
     <a id='n81' href='#n81'>81</a>  
     <a id='n82' href='#n82'>82</a>  
     <a id='n83' href='#n83'>83</a>  
     <a id='n84' href='#n84'>84</a>  
     <a id='n85' href='#n85'>85</a>  
     <a id='n86' href='#n86'>86</a>  
     <a id='n87' href='#n87'>87</a>  
     <a id='n88' href='#n88'>88</a>  
     <a id='n89' href='#n89'>89</a>  
     <a id='n90' href='#n90'>90</a>  
     <a id='n91' href='#n91'>91</a>  
     <a id='n92' href='#n92'>92</a>  
     <a id='n93' href='#n93'>93</a>  
     <a id='n94' href='#n94'>94</a>  
     <a id='n95' href='#n95'>95</a>  
     <a id='n96' href='#n96'>96</a>  
     <a id='n97' href='#n97'>97</a>  
     <a id='n98' href='#n98'>98</a>  
     <a id='n99' href='#n99'>99</a>  
     <a id='n100' href='#n100'>100</a>  
     <a id='n101' href='#n101'>101</a>  
     <a id='n102' href='#n102'>102</a>  
     <a id='n103' href='#n103'>103</a>  
     <a id='n104' href='#n104'>104</a>  
     <a id='n105' href='#n105'>105</a>  
     <a id='n106' href='#n106'>106</a>  
     <a id='n107' href='#n107'>107</a>  
     <a id='n108' href='#n108'>108</a>  
     <a id='n109' href='#n109'>109</a>  
     <a id='n110' href='#n110'>110</a>  
     <a id='n111' href='#n111'>111</a>  
     <a id='n112' href='#n112'>112</a>  
     <a id='n113' href='#n113'>113</a>  
     <a id='n114' href='#n114'>114</a>  
     <a id='n115' href='#n115'>115</a>  
     <a id='n116' href='#n116'>116</a>  
     <a id='n117' href='#n117'>117</a>  
     <a id='n118' href='#n118'>118</a>  
     <a id='n119' href='#n119'>119</a>  
     <a id='n120' href='#n120'>120</a>  
     <a id='n121' href='#n121'>121</a>  
     <a id='n122' href='#n122'>122</a>  
     <a id='n123' href='#n123'>123</a>  
     <a id='n124' href='#n124'>124</a>  
     <a id='n125' href='#n125'>125</a>  
     <a id='n126' href='#n126'>126</a>  
     <a id='n127' href='#n127'>127</a>  
     <a id='n128' href='#n128'>128</a>  
     <a id='n129' href='#n129'>129</a>  
     <a id='n130' href='#n130'>130</a>  
     <a id='n131' href='#n131'>131</a>  
     <a id='n132' href='#n132'>132</a>  
     <a id='n133' href='#n133'>133</a>  
     <a id='n134' href='#n134'>134</a>  
     <a id='n135' href='#n135'>135</a>  
     <a id='n136' href='#n136'>136</a>  
     <a id='n137' href='#n137'>137</a>  
     <a id='n138' href='#n138'>138</a>  
     <a id='n139' href='#n139'>139</a>  
     <a id='n140' href='#n140'>140</a>  
     <a id='n141' href='#n141'>141</a>  
     <a id='n142' href='#n142'>142</a>  
     <a id='n143' href='#n143'>143</a>  
     <a id='n144' href='#n144'>144</a>  
     <a id='n145' href='#n145'>145</a>  
     <a id='n146' href='#n146'>146</a>  
     <a id='n147' href='#n147'>147</a>  
     <a id='n148' href='#n148'>148</a>  
     <a id='n149' href='#n149'>149</a>  
     <a id='n150' href='#n150'>150</a>  
     <a id='n151' href='#n151'>151</a>  
     <a id='n152' href='#n152'>152</a>  
     <a id='n153' href='#n153'>153</a>  
     <a id='n154' href='#n154'>154</a>  
     <a id='n155' href='#n155'>155</a>  
     <a id='n156' href='#n156'>156</a>  
     <a id='n157' href='#n157'>157</a>  
     <a id='n158' href='#n158'>158</a>  
     <a id='n159' href='#n159'>159</a>  
     <a id='n160' href='#n160'>160</a>  
     <a id='n161' href='#n161'>161</a>  
     <a id='n162' href='#n162'>162</a>  
     <a id='n163' href='#n163'>163</a>  
     <a id='n164' href='#n164'>164</a>  
     <a id='n165' href='#n165'>165</a>  
     <a id='n166' href='#n166'>166</a>  
     <a id='n167' href='#n167'>167</a>  
     <a id='n168' href='#n168'>168</a>  
     <a id='n169' href='#n169'>169</a>  
     <a id='n170' href='#n170'>170</a>  
     <a id='n171' href='#n171'>171</a>  
     <a id='n172' href='#n172'>172</a>  
     <a id='n173' href='#n173'>173</a>  
     <a id='n174' href='#n174'>174</a>  
     <a id='n175' href='#n175'>175</a>  
     <a id='n176' href='#n176'>176</a>  
     <a id='n177' href='#n177'>177</a>  
     <a id='n178' href='#n178'>178</a>  
     <a id='n179' href='#n179'>179</a>  
     <a id='n180' href='#n180'>180</a>  
     <a id='n181' href='#n181'>181</a>  
     <a id='n182' href='#n182'>182</a>  
     <a id='n183' href='#n183'>183</a>  
     <a id='n184' href='#n184'>184</a>  
     <a id='n185' href='#n185'>185</a>  
     <a id='n186' href='#n186'>186</a>  
     <a id='n187' href='#n187'>187</a>  
     <a id='n188' href='#n188'>188</a>  
     <a id='n189' href='#n189'>189</a>  
     <a id='n190' href='#n190'>190</a>  
     <a id='n191' href='#n191'>191</a>  
     <a id='n192' href='#n192'>192</a>  
     <a id='n193' href='#n193'>193</a>  
     <a id='n194' href='#n194'>194</a>  
     <a id='n195' href='#n195'>195</a>  
     <a id='n196' href='#n196'>196</a>  
     <a id='n197' href='#n197'>197</a>  
     <a id='n198' href='#n198'>198</a>  
     <a id='n199' href='#n199'>199</a>  
     <a id='n200' href='#n200'>200</a>  
     <a id='n201' href='#n201'>201</a>  
     <a id='n202' href='#n202'>202</a>  
     <a id='n203' href='#n203'>203</a>  
     <a id='n204' href='#n204'>204</a>  
     <a id='n205' href='#n205'>205</a>  
     <a id='n206' href='#n206'>206</a>  
     <a id='n207' href='#n207'>207</a>  
     <a id='n208' href='#n208'>208</a>  
     <a id='n209' href='#n209'>209</a>  
     <a id='n210' href='#n210'>210</a>  
     <a id='n211' href='#n211'>211</a>  
     <a id='n212' href='#n212'>212</a>  
     <a id='n213' href='#n213'>213</a>  
     <a id='n214' href='#n214'>214</a>  
     <a id='n215' href='#n215'>215</a>  
     <a id='n216' href='#n216'>216</a>  
     <a id='n217' href='#n217'>217</a>  
     <a id='n218' href='#n218'>218</a>  
     <a id='n219' href='#n219'>219</a>  
     <a id='n220' href='#n220'>220</a>  
     <a id='n221' href='#n221'>221</a>  
     <a id='n222' href='#n222'>222</a>  
     <a id='n223' href='#n223'>223</a>  
     <a id='n224' href='#n224'>224</a>  
     <a id='n225' href='#n225'>225</a>  
     <a id='n226' href='#n226'>226</a>  
     <a id='n227' href='#n227'>227</a>  
     <a id='n228' href='#n228'>228</a>  
     <a id='n229' href='#n229'>229</a>  
     <a id='n230' href='#n230'>230</a>  
     <a id='n231' href='#n231'>231</a>  
     <a id='n232' href='#n232'>232</a>  
     <a id='n233' href='#n233'>233</a>  
     <a id='n234' href='#n234'>234</a>  
     <a id='n235' href='#n235'>235</a>  
     <a id='n236' href='#n236'>236</a>  
     <a id='n237' href='#n237'>237</a>  
     <a id='n238' href='#n238'>238</a>  
     <a id='n239' href='#n239'>239</a>  
     <a id='n240' href='#n240'>240</a>  
     <a id='n241' href='#n241'>241</a>  
     <a id='n242' href='#n242'>242</a>  
     <a id='n243' href='#n243'>243</a>  
     <a id='n244' href='#n244'>244</a>  
     <a id='n245' href='#n245'>245</a>  
     <a id='n246' href='#n246'>246</a>  
     <a id='n247' href='#n247'>247</a>  
     <a id='n248' href='#n248'>248</a>  
     <a id='n249' href='#n249'>249</a>  
     <a id='n250' href='#n250'>250</a>  
     <a id='n251' href='#n251'>251</a>  
     <a id='n252' href='#n252'>252</a>  
     <a id='n253' href='#n253'>253</a>  
     <a id='n254' href='#n254'>254</a>  
     <a id='n255' href='#n255'>255</a>  
     <a id='n256' href='#n256'>256</a>  
     <a id='n257' href='#n257'>257</a>  
     <a id='n258' href='#n258'>258</a>  
     <a id='n259' href='#n259'>259</a>  
     <a id='n260' href='#n260'>260</a>  
     <a id='n261' href='#n261'>261</a>  
     <a id='n262' href='#n262'>262</a>  
     <a id='n263' href='#n263'>263</a>  
     <a id='n264' href='#n264'>264</a>  
     <a id='n265' href='#n265'>265</a>  
     <a id='n266' href='#n266'>266</a>  
     <a id='n267' href='#n267'>267</a>  
     <a id='n268' href='#n268'>268</a>  
     <a id='n269' href='#n269'>269</a>  
     <a id='n270' href='#n270'>270</a>  
     <a id='n271' href='#n271'>271</a>  
     <a id='n272' href='#n272'>272</a>  
     <a id='n273' href='#n273'>273</a>  
     <a id='n274' href='#n274'>274</a>  
     <a id='n275' href='#n275'>275</a>  
     <a id='n276' href='#n276'>276</a>  
     <a id='n277' href='#n277'>277</a>  
     <a id='n278' href='#n278'>278</a>  
     <a id='n279' href='#n279'>279</a>  
     <a id='n280' href='#n280'>280</a>  
     <a id='n281' href='#n281'>281</a>  
     <a id='n282' href='#n282'>282</a>  
     <a id='n283' href='#n283'>283</a>  
     <a id='n284' href='#n284'>284</a>  
     <a id='n285' href='#n285'>285</a>  
     <a id='n286' href='#n286'>286</a>  
     <a id='n287' href='#n287'>287</a>  
     <a id='n288' href='#n288'>288</a>  
     <a id='n289' href='#n289'>289</a>  
     <a id='n290' href='#n290'>290</a>  
     <a id='n291' href='#n291'>291</a>  
     <a id='n292' href='#n292'>292</a>  
     <a id='n293' href='#n293'>293</a>  
     <a id='n294' href='#n294'>294</a>  
     <a id='n295' href='#n295'>295</a>  
     <a id='n296' href='#n296'>296</a>  
     <a id='n297' href='#n297'>297</a>  
     <a id='n298' href='#n298'>298</a>  
     <a id='n299' href='#n299'>299</a>  
     <a id='n300' href='#n300'>300</a>  
     <a id='n301' href='#n301'>301</a>  
     <a id='n302' href='#n302'>302</a>  
     <a id='n303' href='#n303'>303</a>  
     <a id='n304' href='#n304'>304</a>  
     <a id='n305' href='#n305'>305</a>  
     <a id='n306' href='#n306'>306</a>  
     <a id='n307' href='#n307'>307</a>  
     <a id='n308' href='#n308'>308</a>  
     <a id='n309' href='#n309'>309</a>  
     <a id='n310' href='#n310'>310</a>  
     <a id='n311' href='#n311'>311</a>  
     <a id='n312' href='#n312'>312</a>  
     <a id='n313' href='#n313'>313</a>  
     <a id='n314' href='#n314'>314</a>  
     <a id='n315' href='#n315'>315</a>  
     <a id='n316' href='#n316'>316</a>  
     <a id='n317' href='#n317'>317</a>  
     <a id='n318' href='#n318'>318</a>  
     <a id='n319' href='#n319'>319</a>  
     <a id='n320' href='#n320'>320</a>  
     <a id='n321' href='#n321'>321</a>  
     <a id='n322' href='#n322'>322</a>  
     <a id='n323' href='#n323'>323</a>  
     <a id='n324' href='#n324'>324</a>  
     <a id='n325' href='#n325'>325</a>  
     <a id='n326' href='#n326'>326</a>  
     <a id='n327' href='#n327'>327</a>  
     <a id='n328' href='#n328'>328</a>  
     <a id='n329' href='#n329'>329</a>  
     <a id='n330' href='#n330'>330</a>  
     <a id='n331' href='#n331'>331</a>  
     <a id='n332' href='#n332'>332</a>  
     <a id='n333' href='#n333'>333</a>  
     <a id='n334' href='#n334'>334</a>  
     <a id='n335' href='#n335'>335</a>  
     <a id='n336' href='#n336'>336</a>  
     <a id='n337' href='#n337'>337</a>  
     <a id='n338' href='#n338'>338</a>  
     <a id='n339' href='#n339'>339</a>  
     <a id='n340' href='#n340'>340</a>  
     <a id='n341' href='#n341'>341</a>  
     <a id='n342' href='#n342'>342</a>  
     <a id='n343' href='#n343'>343</a>  
     <a id='n344' href='#n344'>344</a>  
     <a id='n345' href='#n345'>345</a>  
     <a id='n346' href='#n346'>346</a>  
     <a id='n347' href='#n347'>347</a>  
     <a id='n348' href='#n348'>348</a>  
     <a id='n349' href='#n349'>349</a>  
     <a id='n350' href='#n350'>350</a>  
     <a id='n351' href='#n351'>351</a>  
     <a id='n352' href='#n352'>352</a>  
     <a id='n353' href='#n353'>353</a>  
     <a id='n354' href='#n354'>354</a>  
     <a id='n355' href='#n355'>355</a>  
     <a id='n356' href='#n356'>356</a>  
     <a id='n357' href='#n357'>357</a>  
     <a id='n358' href='#n358'>358</a>  
     <a id='n359' href='#n359'>359</a>  
     <a id='n360' href='#n360'>360</a>  
     <a id='n361' href='#n361'>361</a>  
     <a id='n362' href='#n362'>362</a>  
     <a id='n363' href='#n363'>363</a>  
     <a id='n364' href='#n364'>364</a>  
     <a id='n365' href='#n365'>365</a>  
     <a id='n366' href='#n366'>366</a>  
     <a id='n367' href='#n367'>367</a>  
     <a id='n368' href='#n368'>368</a>  
     <a id='n369' href='#n369'>369</a>  
     <a id='n370' href='#n370'>370</a>  
     <a id='n371' href='#n371'>371</a>  
     <a id='n372' href='#n372'>372</a>  
     <a id='n373' href='#n373'>373</a>  
     <a id='n374' href='#n374'>374</a>  
     <a id='n375' href='#n375'>375</a>  
     <a id='n376' href='#n376'>376</a>  
     <a id='n377' href='#n377'>377</a>  
     <a id='n378' href='#n378'>378</a>  
     <a id='n379' href='#n379'>379</a>  
     <a id='n380' href='#n380'>380</a>  
     <a id='n381' href='#n381'>381</a>  
     <a id='n382' href='#n382'>382</a>  
     <a id='n383' href='#n383'>383</a>  
     <a id='n384' href='#n384'>384</a>  
     <a id='n385' href='#n385'>385</a>  
     <a id='n386' href='#n386'>386</a>  
     <a id='n387' href='#n387'>387</a>  
     <a id='n388' href='#n388'>388</a>  
     <a id='n389' href='#n389'>389</a>  
     <a id='n390' href='#n390'>390</a>  
     <a id='n391' href='#n391'>391</a>  
     <a id='n392' href='#n392'>392</a>  
     <a id='n393' href='#n393'>393</a>  
     <a id='n394' href='#n394'>394</a>  
     <a id='n395' href='#n395'>395</a>  
     <a id='n396' href='#n396'>396</a>  
     <a id='n397' href='#n397'>397</a>  
     <a id='n398' href='#n398'>398</a>  
     <a id='n399' href='#n399'>399</a>  
     <a id='n400' href='#n400'>400</a>  
     <a id='n401' href='#n401'>401</a>  
     <a id='n402' href='#n402'>402</a>  
     <a id='n403' href='#n403'>403</a>  
     <a id='n404' href='#n404'>404</a>  
     <a id='n405' href='#n405'>405</a>  
     <a id='n406' href='#n406'>406</a>  
     <a id='n407' href='#n407'>407</a>  
     <a id='n408' href='#n408'>408</a>  
     <a id='n409' href='#n409'>409</a>  
     <a id='n410' href='#n410'>410</a>  
     <a id='n411' href='#n411'>411</a>  
     <a id='n412' href='#n412'>412</a>  
     <a id='n413' href='#n413'>413</a>  
     <a id='n414' href='#n414'>414</a>  
     <a id='n415' href='#n415'>415</a>  
     <a id='n416' href='#n416'>416</a>  
     <a id='n417' href='#n417'>417</a>  
     <a id='n418' href='#n418'>418</a>  
     <a id='n419' href='#n419'>419</a>  
     <a id='n420' href='#n420'>420</a>  
     <a id='n421' href='#n421'>421</a>  
     <a id='n422' href='#n422'>422</a>  
     <a id='n423' href='#n423'>423</a>  
     <a id='n424' href='#n424'>424</a>  
     <a id='n425' href='#n425'>425</a>  
     <a id='n426' href='#n426'>426</a>  
     <a id='n427' href='#n427'>427</a>  
     <a id='n428' href='#n428'>428</a>  
     <a id='n429' href='#n429'>429</a>  
     <a id='n430' href='#n430'>430</a>  
     <a id='n431' href='#n431'>431</a>  
     <a id='n432' href='#n432'>432</a>  
     <a id='n433' href='#n433'>433</a>  
     <a id='n434' href='#n434'>434</a>  
     <a id='n435' href='#n435'>435</a>  
     <a id='n436' href='#n436'>436</a>  
     <a id='n437' href='#n437'>437</a>  
     <a id='n438' href='#n438'>438</a>  
     <a id='n439' href='#n439'>439</a>  
     <a id='n440' href='#n440'>440</a>  
     <a id='n441' href='#n441'>441</a>  
     <a id='n442' href='#n442'>442</a>  
     <a id='n443' href='#n443'>443</a>  
     <a id='n444' href='#n444'>444</a>  
     <a id='n445' href='#n445'>445</a>  
     <a id='n446' href='#n446'>446</a>  
     <a id='n447' href='#n447'>447</a>  
     <a id='n448' href='#n448'>448</a>  
     <a id='n449' href='#n449'>449</a>  
     <a id='n450' href='#n450'>450</a>  
     <a id='n451' href='#n451'>451</a>  
     <a id='n452' href='#n452'>452</a>  
     <a id='n453' href='#n453'>453</a>  
     <a id='n454' href='#n454'>454</a>  
     <a id='n455' href='#n455'>455</a>  
     <a id='n456' href='#n456'>456</a>  
     <a id='n457' href='#n457'>457</a>  
     <a id='n458' href='#n458'>458</a>  
     <a id='n459' href='#n459'>459</a>  
     <a id='n460' href='#n460'>460</a>  
     <a id='n461' href='#n461'>461</a>  
     <a id='n462' href='#n462'>462</a>  
     <a id='n463' href='#n463'>463</a>  
     <a id='n464' href='#n464'>464</a>  
     <a id='n465' href='#n465'>465</a>  
     <a id='n466' href='#n466'>466</a>  
     <a id='n467' href='#n467'>467</a>  
     <a id='n468' href='#n468'>468</a>  
     <a id='n469' href='#n469'>469</a>  
     <a id='n470' href='#n470'>470</a>  
     <a id='n471' href='#n471'>471</a>  
     <a id='n472' href='#n472'>472</a>  
     <a id='n473' href='#n473'>473</a>  
     <a id='n474' href='#n474'>474</a>  
     <a id='n475' href='#n475'>475</a>  
     <a id='n476' href='#n476'>476</a>  
     <a id='n477' href='#n477'>477</a>  
     <a id='n478' href='#n478'>478</a>  
     <a id='n479' href='#n479'>479</a>  
     <a id='n480' href='#n480'>480</a>  
     <a id='n481' href='#n481'>481</a>  
     <a id='n482' href='#n482'>482</a>  
     <a id='n483' href='#n483'>483</a>  
     <a id='n484' href='#n484'>484</a>  
     <a id='n485' href='#n485'>485</a>  
     <a id='n486' href='#n486'>486</a>  
     <a id='n487' href='#n487'>487</a>  
     <a id='n488' href='#n488'>488</a>  
     <a id='n489' href='#n489'>489</a>  
     <a id='n490' href='#n490'>490</a>  
     <a id='n491' href='#n491'>491</a>  
     <a id='n492' href='#n492'>492</a>  
     <a id='n493' href='#n493'>493</a>  
     <a id='n494' href='#n494'>494</a>  
     <a id='n495' href='#n495'>495</a>  
     <a id='n496' href='#n496'>496</a>  
     <a id='n497' href='#n497'>497</a>  
     <a id='n498' href='#n498'>498</a>  
     <a id='n499' href='#n499'>499</a>  
     <a id='n500' href='#n500'>500</a>  
     <a id='n501' href='#n501'>501</a>  
     <a id='n502' href='#n502'>502</a>  
     <a id='n503' href='#n503'>503</a>  
     <a id='n504' href='#n504'>504</a>  
     <a id='n505' href='#n505'>505</a>  
     <a id='n506' href='#n506'>506</a>  
     <a id='n507' href='#n507'>507</a>  
     <a id='n508' href='#n508'>508</a>  
     <a id='n509' href='#n509'>509</a>  
     <a id='n510' href='#n510'>510</a>  
     <a id='n511' href='#n511'>511</a>  
     <a id='n512' href='#n512'>512</a>  
     <a id='n513' href='#n513'>513</a>  
     <a id='n514' href='#n514'>514</a>  
     <a id='n515' href='#n515'>515</a>  
     <a id='n516' href='#n516'>516</a>  
     <a id='n517' href='#n517'>517</a>  
     <a id='n518' href='#n518'>518</a>  
     <a id='n519' href='#n519'>519</a>  
     <a id='n520' href='#n520'>520</a>  
     <a id='n521' href='#n521'>521</a>  
     <a id='n522' href='#n522'>522</a>  
     <a id='n523' href='#n523'>523</a>  
     <a id='n524' href='#n524'>524</a>  
     <a id='n525' href='#n525'>525</a>  
     <a id='n526' href='#n526'>526</a>  
     <a id='n527' href='#n527'>527</a>  
     <a id='n528' href='#n528'>528</a>  
     <a id='n529' href='#n529'>529</a>  
     <a id='n530' href='#n530'>530</a>  
     <a id='n531' href='#n531'>531</a>  
     <a id='n532' href='#n532'>532</a>  
     <a id='n533' href='#n533'>533</a>  
     <a id='n534' href='#n534'>534</a>  
     <a id='n535' href='#n535'>535</a>  
     <a id='n536' href='#n536'>536</a>  
     <a id='n537' href='#n537'>537</a>  
     <a id='n538' href='#n538'>538</a>  
     <a id='n539' href='#n539'>539</a>  
     <a id='n540' href='#n540'>540</a>  
     <a id='n541' href='#n541'>541</a>  
     <a id='n542' href='#n542'>542</a>  
     <a id='n543' href='#n543'>543</a>  
     <a id='n544' href='#n544'>544</a>  
     <a id='n545' href='#n545'>545</a>  
     <a id='n546' href='#n546'>546</a>  
     <a id='n547' href='#n547'>547</a>  
     <a id='n548' href='#n548'>548</a>  
     <a id='n549' href='#n549'>549</a>  
     <a id='n550' href='#n550'>550</a>  
     <a id='n551' href='#n551'>551</a>  
     <a id='n552' href='#n552'>552</a>  
     <a id='n553' href='#n553'>553</a>  
     <a id='n554' href='#n554'>554</a>  
     <a id='n555' href='#n555'>555</a>  
     <a id='n556' href='#n556'>556</a>  
     <a id='n557' href='#n557'>557</a>  
     <a id='n558' href='#n558'>558</a>  
     <a id='n559' href='#n559'>559</a>  
     <a id='n560' href='#n560'>560</a>  
     <a id='n561' href='#n561'>561</a>  
     <a id='n562' href='#n562'>562</a>  
     <a id='n563' href='#n563'>563</a>  
     <a id='n564' href='#n564'>564</a>  
     <a id='n565' href='#n565'>565</a>  
     <a id='n566' href='#n566'>566</a>  
     <a id='n567' href='#n567'>567</a>  
     <a id='n568' href='#n568'>568</a>  
     <a id='n569' href='#n569'>569</a>  
     <a id='n570' href='#n570'>570</a>  
     <a id='n571' href='#n571'>571</a>  
     <a id='n572' href='#n572'>572</a>  
     <a id='n573' href='#n573'>573</a>  
     <a id='n574' href='#n574'>574</a>  
     <a id='n575' href='#n575'>575</a>  
     <a id='n576' href='#n576'>576</a>  
     <a id='n577' href='#n577'>577</a>  
     <a id='n578' href='#n578'>578</a>  
     <a id='n579' href='#n579'>579</a>  
     <a id='n580' href='#n580'>580</a>  
     <a id='n581' href='#n581'>581</a>  
     <a id='n582' href='#n582'>582</a>  
     <a id='n583' href='#n583'>583</a>  
     <a id='n584' href='#n584'>584</a>  
     <a id='n585' href='#n585'>585</a>  
     <a id='n586' href='#n586'>586</a>  
     <a id='n587' href='#n587'>587</a>  
     <a id='n588' href='#n588'>588</a>  
     <a id='n589' href='#n589'>589</a>  
     <a id='n590' href='#n590'>590</a>  
     <a id='n591' href='#n591'>591</a>  
     <a id='n592' href='#n592'>592</a>  
     <a id='n593' href='#n593'>593</a>  
     <a id='n594' href='#n594'>594</a>  
     <a id='n595' href='#n595'>595</a>  
     <a id='n596' href='#n596'>596</a>  
     <a id='n597' href='#n597'>597</a>  
     <a id='n598' href='#n598'>598</a>  
     <a id='n599' href='#n599'>599</a>  
     <a id='n600' href='#n600'>600</a>  
     <a id='n601' href='#n601'>601</a>  
     <a id='n602' href='#n602'>602</a>  
     <a id='n603' href='#n603'>603</a>  
     <a id='n604' href='#n604'>604</a>  
     <a id='n605' href='#n605'>605</a>  
     <a id='n606' href='#n606'>606</a>  
     <a id='n607' href='#n607'>607</a>  
     <a id='n608' href='#n608'>608</a>  
     <a id='n609' href='#n609'>609</a>  
     <a id='n610' href='#n610'>610</a>  
     <a id='n611' href='#n611'>611</a>  
     <a id='n612' href='#n612'>612</a>  
     <a id='n613' href='#n613'>613</a>  
     <a id='n614' href='#n614'>614</a>  
     <a id='n615' href='#n615'>615</a>  
     <a id='n616' href='#n616'>616</a>  
     <a id='n617' href='#n617'>617</a>  
     <a id='n618' href='#n618'>618</a>  
     <a id='n619' href='#n619'>619</a>  
     <a id='n620' href='#n620'>620</a>  
     <a id='n621' href='#n621'>621</a>  
     <a id='n622' href='#n622'>622</a>  
     <a id='n623' href='#n623'>623</a>  
     <a id='n624' href='#n624'>624</a>  
     <a id='n625' href='#n625'>625</a>  
     <a id='n626' href='#n626'>626</a>  
     <a id='n627' href='#n627'>627</a>  
     <a id='n628' href='#n628'>628</a>  
     <a id='n629' href='#n629'>629</a>  
     <a id='n630' href='#n630'>630</a>  
     <a id='n631' href='#n631'>631</a>  
     <a id='n632' href='#n632'>632</a>  
     <a id='n633' href='#n633'>633</a>  
     <a id='n634' href='#n634'>634</a>  
     <a id='n635' href='#n635'>635</a>  
     <a id='n636' href='#n636'>636</a>  
     <a id='n637' href='#n637'>637</a>  
     <a id='n638' href='#n638'>638</a>  
     <a id='n639' href='#n639'>639</a>  
     <a id='n640' href='#n640'>640</a>  
     <a id='n641' href='#n641'>641</a>  
     <a id='n642' href='#n642'>642</a>  
     <a id='n643' href='#n643'>643</a>  
     <a id='n644' href='#n644'>644</a>  
     <a id='n645' href='#n645'>645</a>  
     <a id='n646' href='#n646'>646</a>  
     <a id='n647' href='#n647'>647</a>  
     <a id='n648' href='#n648'>648</a>  
     <a id='n649' href='#n649'>649</a>  
     <a id='n650' href='#n650'>650</a>  
     <a id='n651' href='#n651'>651</a>  
     <a id='n652' href='#n652'>652</a>  
     <a id='n653' href='#n653'>653</a>  
     <a id='n654' href='#n654'>654</a>  
     <a id='n655' href='#n655'>655</a>  
     <a id='n656' href='#n656'>656</a>  
     <a id='n657' href='#n657'>657</a>  
     <a id='n658' href='#n658'>658</a>  
     <a id='n659' href='#n659'>659</a>  
     <a id='n660' href='#n660'>660</a>  
     <a id='n661' href='#n661'>661</a>  
     <a id='n662' href='#n662'>662</a>  
     <a id='n663' href='#n663'>663</a>  
     <a id='n664' href='#n664'>664</a>  
     <a id='n665' href='#n665'>665</a>  
     <a id='n666' href='#n666'>666</a>  
     <a id='n667' href='#n667'>667</a>  
     <a id='n668' href='#n668'>668</a>  
     <a id='n669' href='#n669'>669</a>  
     <a id='n670' href='#n670'>670</a>  
     <a id='n671' href='#n671'>671</a>  
     <a id='n672' href='#n672'>672</a>  
     <a id='n673' href='#n673'>673</a>  
     <a id='n674' href='#n674'>674</a>  
     <a id='n675' href='#n675'>675</a>  
     <a id='n676' href='#n676'>676</a>  
     <a id='n677' href='#n677'>677</a>  
     <a id='n678' href='#n678'>678</a>  
     <a id='n679' href='#n679'>679</a>  
     <a id='n680' href='#n680'>680</a>  
     <a id='n681' href='#n681'>681</a>  
     <a id='n682' href='#n682'>682</a>  
     <a id='n683' href='#n683'>683</a>  
     <a id='n684' href='#n684'>684</a>  
     <a id='n685' href='#n685'>685</a>  
     <a id='n686' href='#n686'>686</a>  
     <a id='n687' href='#n687'>687</a>  
     <a id='n688' href='#n688'>688</a>  
     <a id='n689' href='#n689'>689</a>  
     <a id='n690' href='#n690'>690</a>  
     <a id='n691' href='#n691'>691</a>  
     <a id='n692' href='#n692'>692</a>  
     <a id='n693' href='#n693'>693</a>  
     <a id='n694' href='#n694'>694</a>  
     <a id='n695' href='#n695'>695</a>  
     <a id='n696' href='#n696'>696</a>  
     <a id='n697' href='#n697'>697</a>  
     <a id='n698' href='#n698'>698</a>  
     <a id='n699' href='#n699'>699</a>  
     <a id='n700' href='#n700'>700</a>  
     <a id='n701' href='#n701'>701</a>  
     <a id='n702' href='#n702'>702</a>  
     <a id='n703' href='#n703'>703</a>  
     <a id='n704' href='#n704'>704</a>  
     <a id='n705' href='#n705'>705</a>  
     <a id='n706' href='#n706'>706</a>  
     <a id='n707' href='#n707'>707</a>  
     <a id='n708' href='#n708'>708</a>  
     <a id='n709' href='#n709'>709</a>  
     <a id='n710' href='#n710'>710</a>  
     <a id='n711' href='#n711'>711</a>  
     <a id='n712' href='#n712'>712</a>  
     <a id='n713' href='#n713'>713</a>  
     <a id='n714' href='#n714'>714</a>  
     <a id='n715' href='#n715'>715</a>  
     <a id='n716' href='#n716'>716</a>  
     <a id='n717' href='#n717'>717</a>  
     <a id='n718' href='#n718'>718</a>  
     <a id='n719' href='#n719'>719</a>  
     <a id='n720' href='#n720'>720</a>  
     <a id='n721' href='#n721'>721</a>  
     <a id='n722' href='#n722'>722</a>  
     <a id='n723' href='#n723'>723</a>  
     <a id='n724' href='#n724'>724</a>  
     <a id='n725' href='#n725'>725</a>  
     <a id='n726' href='#n726'>726</a>  
     <a id='n727' href='#n727'>727</a>  
     <a id='n728' href='#n728'>728</a>  
     <a id='n729' href='#n729'>729</a>  
     <a id='n730' href='#n730'>730</a>  
     <a id='n731' href='#n731'>731</a>  
     <a id='n732' href='#n732'>732</a>  
     <a id='n733' href='#n733'>733</a>  
     <a id='n734' href='#n734'>734</a>  
     <a id='n735' href='#n735'>735</a>  
     <a id='n736' href='#n736'>736</a>  
     <a id='n737' href='#n737'>737</a>  
     <a id='n738' href='#n738'>738</a>  
     <a id='n739' href='#n739'>739</a>  
     <a id='n740' href='#n740'>740</a>  
     <a id='n741' href='#n741'>741</a>  
     <a id='n742' href='#n742'>742</a>  
     <a id='n743' href='#n743'>743</a>  
     <a id='n744' href='#n744'>744</a>  
     <a id='n745' href='#n745'>745</a>  
     <a id='n746' href='#n746'>746</a>  
     <a id='n747' href='#n747'>747</a>  
     <a id='n748' href='#n748'>748</a>  
     <a id='n749' href='#n749'>749</a>  
     <a id='n750' href='#n750'>750</a>  
     <a id='n751' href='#n751'>751</a>  
     <a id='n752' href='#n752'>752</a>  
     <a id='n753' href='#n753'>753</a>  
     <a id='n754' href='#n754'>754</a>  
     <a id='n755' href='#n755'>755</a>  
     <a id='n756' href='#n756'>756</a>  
     <a id='n757' href='#n757'>757</a>  
     <a id='n758' href='#n758'>758</a>  
     <a id='n759' href='#n759'>759</a>  
     <a id='n760' href='#n760'>760</a>  
     <a id='n761' href='#n761'>761</a>  
     <a id='n762' href='#n762'>762</a>  
     <a id='n763' href='#n763'>763</a>  
     <a id='n764' href='#n764'>764</a>  
     <a id='n765' href='#n765'>765</a>  
     <a id='n766' href='#n766'>766</a>  
     <a id='n767' href='#n767'>767</a>  
     <a id='n768' href='#n768'>768</a>  
     <a id='n769' href='#n769'>769</a>  
     <a id='n770' href='#n770'>770</a>  
     <a id='n771' href='#n771'>771</a>  
     <a id='n772' href='#n772'>772</a>  
     <a id='n773' href='#n773'>773</a>  
     <a id='n774' href='#n774'>774</a>  
     <a id='n775' href='#n775'>775</a>  
     <a id='n776' href='#n776'>776</a>  
     <a id='n777' href='#n777'>777</a>  
     <a id='n778' href='#n778'>778</a>  
     <a id='n779' href='#n779'>779</a>  
     <a id='n780' href='#n780'>780</a>  
     <a id='n781' href='#n781'>781</a>  
     <a id='n782' href='#n782'>782</a>  
     <a id='n783' href='#n783'>783</a>  
     <a id='n784' href='#n784'>784</a>  
     <a id='n785' href='#n785'>785</a>  
     <a id='n786' href='#n786'>786</a>  
     <a id='n787' href='#n787'>787</a>  
     <a id='n788' href='#n788'>788</a>  
     <a id='n789' href='#n789'>789</a>  
     <a id='n790' href='#n790'>790</a>  
     <a id='n791' href='#n791'>791</a>  
     <a id='n792' href='#n792'>792</a>  
     <a id='n793' href='#n793'>793</a>  
     <a id='n794' href='#n794'>794</a>  
     <a id='n795' href='#n795'>795</a>  
     <a id='n796' href='#n796'>796</a>  
     <a id='n797' href='#n797'>797</a>  
     <a id='n798' href='#n798'>798</a>  
     <a id='n799' href='#n799'>799</a>  
     <a id='n800' href='#n800'>800</a>  
     <a id='n801' href='#n801'>801</a>  
     <a id='n802' href='#n802'>802</a>  
     <a id='n803' href='#n803'>803</a>  
     <a id='n804' href='#n804'>804</a>  
     <a id='n805' href='#n805'>805</a>  
     <a id='n806' href='#n806'>806</a>  
     <a id='n807' href='#n807'>807</a>  
     <a id='n808' href='#n808'>808</a>  
     <a id='n809' href='#n809'>809</a>  
     <a id='n810' href='#n810'>810</a>  
     <a id='n811' href='#n811'>811</a>  
     <a id='n812' href='#n812'>812</a>  
     <a id='n813' href='#n813'>813</a>  
     <a id='n814' href='#n814'>814</a>  
     <a id='n815' href='#n815'>815</a>  
     <a id='n816' href='#n816'>816</a>  
     <a id='n817' href='#n817'>817</a>  
     <a id='n818' href='#n818'>818</a>  
     <a id='n819' href='#n819'>819</a>  
     <a id='n820' href='#n820'>820</a>  
     <a id='n821' href='#n821'>821</a>  
     <a id='n822' href='#n822'>822</a>  
     <a id='n823' href='#n823'>823</a>  
     <a id='n824' href='#n824'>824</a>  
     <a id='n825' href='#n825'>825</a>  
     <a id='n826' href='#n826'>826</a>  
     <a id='n827' href='#n827'>827</a>  
     <a id='n828' href='#n828'>828</a>  
     <a id='n829' href='#n829'>829</a>  
     <a id='n830' href='#n830'>830</a>  
     <a id='n831' href='#n831'>831</a>  
     <a id='n832' href='#n832'>832</a>  
     <a id='n833' href='#n833'>833</a>  
     <a id='n834' href='#n834'>834</a>  
     <a id='n835' href='#n835'>835</a>  
     <a id='n836' href='#n836'>836</a>  
     <a id='n837' href='#n837'>837</a>  
     <a id='n838' href='#n838'>838</a>  
     <a id='n839' href='#n839'>839</a>  
     <a id='n840' href='#n840'>840</a>  
     <a id='n841' href='#n841'>841</a>  
     <a id='n842' href='#n842'>842</a>  
     <a id='n843' href='#n843'>843</a>  
     <a id='n844' href='#n844'>844</a>  
     <a id='n845' href='#n845'>845</a>  
     <a id='n846' href='#n846'>846</a>  
     <a id='n847' href='#n847'>847</a>  
     <a id='n848' href='#n848'>848</a>  
     <a id='n849' href='#n849'>849</a>  
     <a id='n850' href='#n850'>850</a>  
     <a id='n851' href='#n851'>851</a>  
     <a id='n852' href='#n852'>852</a>  
     <a id='n853' href='#n853'>853</a>  
     <a id='n854' href='#n854'>854</a>  
     <a id='n855' href='#n855'>855</a>  
     <a id='n856' href='#n856'>856</a>  
     <a id='n857' href='#n857'>857</a>  
     <a id='n858' href='#n858'>858</a>  
     <a id='n859' href='#n859'>859</a>  
     <a id='n860' href='#n860'>860</a>  
     <a id='n861' href='#n861'>861</a>  
     <a id='n862' href='#n862'>862</a>  
     <a id='n863' href='#n863'>863</a>  
     <a id='n864' href='#n864'>864</a>  
     <a id='n865' href='#n865'>865</a>  
     <a id='n866' href='#n866'>866</a>  
     <a id='n867' href='#n867'>867</a>  
     <a id='n868' href='#n868'>868</a>  
     <a id='n869' href='#n869'>869</a>  
     <a id='n870' href='#n870'>870</a>  
     <a id='n871' href='#n871'>871</a>  
     <a id='n872' href='#n872'>872</a>  
     <a id='n873' href='#n873'>873</a>  
     <a id='n874' href='#n874'>874</a>  
     <a id='n875' href='#n875'>875</a>  
     <a id='n876' href='#n876'>876</a>  
     <a id='n877' href='#n877'>877</a>  
     <a id='n878' href='#n878'>878</a>  
     <a id='n879' href='#n879'>879</a>  
     <a id='n880' href='#n880'>880</a>  
     <a id='n881' href='#n881'>881</a>  
     <a id='n882' href='#n882'>882</a>  
     <a id='n883' href='#n883'>883</a>  
     <a id='n884' href='#n884'>884</a>  
     <a id='n885' href='#n885'>885</a>  
     <a id='n886' href='#n886'>886</a>  
     <a id='n887' href='#n887'>887</a>  
     <a id='n888' href='#n888'>888</a>  
     <a id='n889' href='#n889'>889</a>  
     <a id='n890' href='#n890'>890</a>  
     <a id='n891' href='#n891'>891</a>  
     <a id='n892' href='#n892'>892</a>  
     <a id='n893' href='#n893'>893</a>  
     <a id='n894' href='#n894'>894</a>  
     <a id='n895' href='#n895'>895</a>  
     <a id='n896' href='#n896'>896</a>  
     <a id='n897' href='#n897'>897</a>  
     <a id='n898' href='#n898'>898</a>  
     <a id='n899' href='#n899'>899</a>  
     <a id='n900' href='#n900'>900</a>  
     <a id='n901' href='#n901'>901</a>  
     <a id='n902' href='#n902'>902</a>  
     <a id='n903' href='#n903'>903</a>  
     <a id='n904' href='#n904'>904</a>  
     <a id='n905' href='#n905'>905</a>  
     <a id='n906' href='#n906'>906</a>  
     <a id='n907' href='#n907'>907</a>  
     <a id='n908' href='#n908'>908</a>  
     <a id='n909' href='#n909'>909</a>  
     <a id='n910' href='#n910'>910</a>  
     <a id='n911' href='#n911'>911</a>  
     <a id='n912' href='#n912'>912</a>  
     <a id='n913' href='#n913'>913</a>  
     <a id='n914' href='#n914'>914</a>  
     <a id='n915' href='#n915'>915</a>  
     <a id='n916' href='#n916'>916</a>  
     <a id='n917' href='#n917'>917</a>  
     <a id='n918' href='#n918'>918</a>  
     <a id='n919' href='#n919'>919</a>  
     <a id='n920' href='#n920'>920</a>  
     <a id='n921' href='#n921'>921</a>  
     <a id='n922' href='#n922'>922</a>  
     <a id='n923' href='#n923'>923</a>  
     <a id='n924' href='#n924'>924</a>  
     <a id='n925' href='#n925'>925</a>  
     <a id='n926' href='#n926'>926</a>  
     <a id='n927' href='#n927'>927</a>  
     <a id='n928' href='#n928'>928</a>  
     <a id='n929' href='#n929'>929</a>  
     <a id='n930' href='#n930'>930</a>  
     <a id='n931' href='#n931'>931</a>  
     <a id='n932' href='#n932'>932</a>  
     <a id='n933' href='#n933'>933</a>  
     <a id='n934' href='#n934'>934</a>  
     <a id='n935' href='#n935'>935</a>  
     <a id='n936' href='#n936'>936</a>  
     <a id='n937' href='#n937'>937</a>  
     <a id='n938' href='#n938'>938</a>  
     <a id='n939' href='#n939'>939</a>  
     <a id='n940' href='#n940'>940</a>  
     <a id='n941' href='#n941'>941</a>  
     <a id='n942' href='#n942'>942</a>  
     <a id='n943' href='#n943'>943</a>  
     <a id='n944' href='#n944'>944</a>  
     <a id='n945' href='#n945'>945</a>  
     <a id='n946' href='#n946'>946</a>  
     <a id='n947' href='#n947'>947</a>  
     <a id='n948' href='#n948'>948</a>  
     <a id='n949' href='#n949'>949</a>  
     <a id='n950' href='#n950'>950</a>  
     <a id='n951' href='#n951'>951</a>  
     <a id='n952' href='#n952'>952</a>  
     <a id='n953' href='#n953'>953</a>  
     <a id='n954' href='#n954'>954</a>  
     <a id='n955' href='#n955'>955</a>  
     <a id='n956' href='#n956'>956</a>  
     <a id='n957' href='#n957'>957</a>  
     <a id='n958' href='#n958'>958</a>  
     <a id='n959' href='#n959'>959</a>  
     <a id='n960' href='#n960'>960</a>  
     <a id='n961' href='#n961'>961</a>  
     <a id='n962' href='#n962'>962</a>  
     <a id='n963' href='#n963'>963</a>  
     <a id='n964' href='#n964'>964</a>  
     <a id='n965' href='#n965'>965</a>  
     <a id='n966' href='#n966'>966</a>  
     <a id='n967' href='#n967'>967</a>  
     <a id='n968' href='#n968'>968</a>  
     <a id='n969' href='#n969'>969</a>  
     <a id='n970' href='#n970'>970</a>  
     <a id='n971' href='#n971'>971</a>  
     <a id='n972' href='#n972'>972</a>  
     <a id='n973' href='#n973'>973</a>  
     <a id='n974' href='#n974'>974</a>  
     <a id='n975' href='#n975'>975</a>  
     <a id='n976' href='#n976'>976</a>  
     <a id='n977' href='#n977'>977</a>  
     <a id='n978' href='#n978'>978</a>  
     <a id='n979' href='#n979'>979</a>  
     <a id='n980' href='#n980'>980</a>  
     <a id='n981' href='#n981'>981</a>  
     <a id='n982' href='#n982'>982</a>  
     <a id='n983' href='#n983'>983</a>  
     <a id='n984' href='#n984'>984</a>  
     <a id='n985' href='#n985'>985</a>  
     <a id='n986' href='#n986'>986</a>  
     <a id='n987' href='#n987'>987</a>  
     <a id='n988' href='#n988'>988</a>  
     <a id='n989' href='#n989'>989</a>  
     <a id='n990' href='#n990'>990</a>  
     <a id='n991' href='#n991'>991</a>  
     <a id='n992' href='#n992'>992</a>  
     <a id='n993' href='#n993'>993</a>  
     <a id='n994' href='#n994'>994</a>  
     <a id='n995' href='#n995'>995</a>  
     <a id='n996' href='#n996'>996</a>  
     <a id='n997' href='#n997'>997</a>  
     <a id='n998' href='#n998'>998</a>  
     <a id='n999' href='#n999'>999</a>  
     <a id='n1000' href='#n1000'>1000</a>  
     <a id='n1001' href='#n1001'>1001</a>  
     <a id='n1002' href='#n1002'>1002</a>  
     <a id='n1003' href='#n1003'>1003</a>  
     <a id='n1004' href='#n1004'>1004</a>  
     <a id='n1005' href='#n1005'>1005</a>  
     <a id='n1006' href='#n1006'>1006</a>  
     <a id='n1007' href='#n1007'>1007</a>  
     <a id='n1008' href='#n1008'>1008</a>  
     <a id='n1009' href='#n1009'>1009</a>  
     <a id='n1010' href='#n1010'>1010</a>  
     <a id='n1011' href='#n1011'>1011</a>  
     <a id='n1012' href='#n1012'>1012</a>  
     <a id='n1013' href='#n1013'>1013</a>  
     <a id='n1014' href='#n1014'>1014</a>  
     <a id='n1015' href='#n1015'>1015</a>  
     <a id='n1016' href='#n1016'>1016</a>  
     <a id='n1017' href='#n1017'>1017</a>  
     <a id='n1018' href='#n1018'>1018</a>  
     <a id='n1019' href='#n1019'>1019</a>  
     <a id='n1020' href='#n1020'>1020</a>  
     <a id='n1021' href='#n1021'>1021</a>  
     <a id='n1022' href='#n1022'>1022</a>  
     <a id='n1023' href='#n1023'>1023</a>  
     <a id='n1024' href='#n1024'>1024</a>  
     <a id='n1025' href='#n1025'>1025</a>  
     <a id='n1026' href='#n1026'>1026</a>  
     <a id='n1027' href='#n1027'>1027</a>  
     <a id='n1028' href='#n1028'>1028</a>  
     <a id='n1029' href='#n1029'>1029</a>  
     <a id='n1030' href='#n1030'>1030</a>  
     <a id='n1031' href='#n1031'>1031</a>  
     <a id='n1032' href='#n1032'>1032</a>  
     <a id='n1033' href='#n1033'>1033</a>  
     <a id='n1034' href='#n1034'>1034</a>  
     <a id='n1035' href='#n1035'>1035</a>  
     <a id='n1036' href='#n1036'>1036</a>  
     <a id='n1037' href='#n1037'>1037</a>  
     <a id='n1038' href='#n1038'>1038</a>  
     <a id='n1039' href='#n1039'>1039</a>  
     <a id='n1040' href='#n1040'>1040</a>  
     <a id='n1041' href='#n1041'>1041</a>  
     <a id='n1042' href='#n1042'>1042</a>  
     <a id='n1043' href='#n1043'>1043</a>  
     <a id='n1044' href='#n1044'>1044</a>  
     <a id='n1045' href='#n1045'>1045</a>  
     <a id='n1046' href='#n1046'>1046</a>  
     <a id='n1047' href='#n1047'>1047</a>  
     <a id='n1048' href='#n1048'>1048</a>  
     <a id='n1049' href='#n1049'>1049</a>  
     <a id='n1050' href='#n1050'>1050</a>  
     <a id='n1051' href='#n1051'>1051</a>  
     <a id='n1052' href='#n1052'>1052</a>  
     <a id='n1053' href='#n1053'>1053</a>  
     <a id='n1054' href='#n1054'>1054</a>  
     <a id='n1055' href='#n1055'>1055</a>  
     <a id='n1056' href='#n1056'>1056</a>  
     <a id='n1057' href='#n1057'>1057</a>  
     <a id='n1058' href='#n1058'>1058</a>  
     <a id='n1059' href='#n1059'>1059</a>  
     <a id='n1060' href='#n1060'>1060</a>  
     <a id='n1061' href='#n1061'>1061</a>  
     <a id='n1062' href='#n1062'>1062</a>  
     <a id='n1063' href='#n1063'>1063</a>  
     <a id='n1064' href='#n1064'>1064</a>  
     <a id='n1065' href='#n1065'>1065</a>  
     <a id='n1066' href='#n1066'>1066</a>  
     <a id='n1067' href='#n1067'>1067</a>  
     <a id='n1068' href='#n1068'>1068</a>  
     <a id='n1069' href='#n1069'>1069</a>  
     <a id='n1070' href='#n1070'>1070</a>  
     <a id='n1071' href='#n1071'>1071</a>  
     <a id='n1072' href='#n1072'>1072</a>  
     <a id='n1073' href='#n1073'>1073</a>  
     <a id='n1074' href='#n1074'>1074</a>  
     <a id='n1075' href='#n1075'>1075</a>  
     <a id='n1076' href='#n1076'>1076</a>  
     <a id='n1077' href='#n1077'>1077</a>  
     <a id='n1078' href='#n1078'>1078</a>  
     <a id='n1079' href='#n1079'>1079</a>  
     <a id='n1080' href='#n1080'>1080</a>  
     <a id='n1081' href='#n1081'>1081</a>  
     <a id='n1082' href='#n1082'>1082</a>  
     <a id='n1083' href='#n1083'>1083</a>  
     <a id='n1084' href='#n1084'>1084</a>  
     <a id='n1085' href='#n1085'>1085</a>  
     <a id='n1086' href='#n1086'>1086</a>  
     <a id='n1087' href='#n1087'>1087</a>  
     <a id='n1088' href='#n1088'>1088</a>  
     <a id='n1089' href='#n1089'>1089</a>  
     <a id='n1090' href='#n1090'>1090</a>  
     <a id='n1091' href='#n1091'>1091</a>  
     <a id='n1092' href='#n1092'>1092</a>  
     <a id='n1093' href='#n1093'>1093</a>  
     <a id='n1094' href='#n1094'>1094</a>  
     <a id='n1095' href='#n1095'>1095</a>  
     <a id='n1096' href='#n1096'>1096</a>  
     <a id='n1097' href='#n1097'>1097</a>  
     <a id='n1098' href='#n1098'>1098</a>  
     <a id='n1099' href='#n1099'>1099</a>  
     <a id='n1100' href='#n1100'>1100</a>  
     <a id='n1101' href='#n1101'>1101</a>  
     <a id='n1102' href='#n1102'>1102</a>  
     <a id='n1103' href='#n1103'>1103</a>  
     <a id='n1104' href='#n1104'>1104</a>  
     <a id='n1105' href='#n1105'>1105</a>  
     <a id='n1106' href='#n1106'>1106</a>  
     <a id='n1107' href='#n1107'>1107</a>  
     <a id='n1108' href='#n1108'>1108</a>  
     <a id='n1109' href='#n1109'>1109</a>  
     <a id='n1110' href='#n1110'>1110</a>  
     <a id='n1111' href='#n1111'>1111</a>  
     <a id='n1112' href='#n1112'>1112</a>  
     <a id='n1113' href='#n1113'>1113</a>  
     <a id='n1114' href='#n1114'>1114</a>  
     <a id='n1115' href='#n1115'>1115</a>  
     <a id='n1116' href='#n1116'>1116</a>  
     <a id='n1117' href='#n1117'>1117</a>  
     <a id='n1118' href='#n1118'>1118</a>  
     <a id='n1119' href='#n1119'>1119</a>  
     <a id='n1120' href='#n1120'>1120</a>  
     <a id='n1121' href='#n1121'>1121</a>  
     <a id='n1122' href='#n1122'>1122</a>  
     <a id='n1123' href='#n1123'>1123</a>  
     <a id='n1124' href='#n1124'>1124</a>  
     <a id='n1125' href='#n1125'>1125</a>  
     <a id='n1126' href='#n1126'>1126</a>  
     <a id='n1127' href='#n1127'>1127</a>  
     <a id='n1128' href='#n1128'>1128</a>  
     <a id='n1129' href='#n1129'>1129</a>  
     <a id='n1130' href='#n1130'>1130</a>  
     <a id='n1131' href='#n1131'>1131</a>  
     <a id='n1132' href='#n1132'>1132</a>  
     <a id='n1133' href='#n1133'>1133</a>  
     <a id='n1134' href='#n1134'>1134</a>  
     <a id='n1135' href='#n1135'>1135</a>  
     <a id='n1136' href='#n1136'>1136</a>  
     <a id='n1137' href='#n1137'>1137</a>  
     <a id='n1138' href='#n1138'>1138</a>  
     <a id='n1139' href='#n1139'>1139</a>  
     <a id='n1140' href='#n1140'>1140</a>  
     <a id='n1141' href='#n1141'>1141</a>  
     <a id='n1142' href='#n1142'>1142</a>  
     <a id='n1143' href='#n1143'>1143</a>  
     <a id='n1144' href='#n1144'>1144</a>  
     <a id='n1145' href='#n1145'>1145</a>  
     <a id='n1146' href='#n1146'>1146</a>  
     <a id='n1147' href='#n1147'>1147</a>  
     <a id='n1148' href='#n1148'>1148</a>  
     <a id='n1149' href='#n1149'>1149</a>  
     <a id='n1150' href='#n1150'>1150</a>  
     <a id='n1151' href='#n1151'>1151</a>  
     <a id='n1152' href='#n1152'>1152</a>  
     <a id='n1153' href='#n1153'>1153</a>  
     <a id='n1154' href='#n1154'>1154</a>  
     <a id='n1155' href='#n1155'>1155</a>  
     <a id='n1156' href='#n1156'>1156</a>  
     <a id='n1157' href='#n1157'>1157</a>  
     <a id='n1158' href='#n1158'>1158</a>  
     <a id='n1159' href='#n1159'>1159</a>  
     <a id='n1160' href='#n1160'>1160</a>  
     <a id='n1161' href='#n1161'>1161</a>  
     <a id='n1162' href='#n1162'>1162</a>  
     <a id='n1163' href='#n1163'>1163</a>  
     <a id='n1164' href='#n1164'>1164</a>  
     <a id='n1165' href='#n1165'>1165</a>  
     <a id='n1166' href='#n1166'>1166</a>  
     <a id='n1167' href='#n1167'>1167</a>  
     <a id='n1168' href='#n1168'>1168</a>  
     <a id='n1169' href='#n1169'>1169</a>  
     <a id='n1170' href='#n1170'>1170</a>  
     <a id='n1171' href='#n1171'>1171</a>  
     <a id='n1172' href='#n1172'>1172</a>  
     <a id='n1173' href='#n1173'>1173</a>  
     <a id='n1174' href='#n1174'>1174</a>  
     <a id='n1175' href='#n1175'>1175</a>  
     <a id='n1176' href='#n1176'>1176</a>  
     <a id='n1177' href='#n1177'>1177</a>  
     <a id='n1178' href='#n1178'>1178</a>  
     <a id='n1179' href='#n1179'>1179</a>  
     <a id='n1180' href='#n1180'>1180</a>  
     <a id='n1181' href='#n1181'>1181</a>  
     <a id='n1182' href='#n1182'>1182</a>  
     <a id='n1183' href='#n1183'>1183</a>  
     <a id='n1184' href='#n1184'>1184</a>  
     <a id='n1185' href='#n1185'>1185</a>  
     <a id='n1186' href='#n1186'>1186</a>  
     <a id='n1187' href='#n1187'>1187</a>  
     <a id='n1188' href='#n1188'>1188</a>  
     <a id='n1189' href='#n1189'>1189</a>  
     <a id='n1190' href='#n1190'>1190</a>  
     <a id='n1191' href='#n1191'>1191</a>  
     <a id='n1192' href='#n1192'>1192</a>  
     <a id='n1193' href='#n1193'>1193</a>  
     <a id='n1194' href='#n1194'>1194</a>  
     <a id='n1195' href='#n1195'>1195</a>  
     <a id='n1196' href='#n1196'>1196</a>  
     <a id='n1197' href='#n1197'>1197</a>  
     <a id='n1198' href='#n1198'>1198</a>  
     <a id='n1199' href='#n1199'>1199</a>  
     <a id='n1200' href='#n1200'>1200</a>  
     <a id='n1201' href='#n1201'>1201</a>  
     <a id='n1202' href='#n1202'>1202</a>  
     <a id='n1203' href='#n1203'>1203</a>  
     <a id='n1204' href='#n1204'>1204</a>  
     <a id='n1205' href='#n1205'>1205</a>  
     <a id='n1206' href='#n1206'>1206</a>  
     <a id='n1207' href='#n1207'>1207</a>  
     <a id='n1208' href='#n1208'>1208</a>  
     <a id='n1209' href='#n1209'>1209</a>  
     <a id='n1210' href='#n1210'>1210</a>  
     <a id='n1211' href='#n1211'>1211</a>  
     <a id='n1212' href='#n1212'>1212</a>  
     <a id='n1213' href='#n1213'>1213</a>  
     <a id='n1214' href='#n1214'>1214</a>  
     <a id='n1215' href='#n1215'>1215</a>  
     <a id='n1216' href='#n1216'>1216</a>  
     <a id='n1217' href='#n1217'>1217</a>  
     <a id='n1218' href='#n1218'>1218</a>  
     <a id='n1219' href='#n1219'>1219</a>  
     <a id='n1220' href='#n1220'>1220</a>  
     <a id='n1221' href='#n1221'>1221</a>  
     <a id='n1222' href='#n1222'>1222</a>  
     <a id='n1223' href='#n1223'>1223</a>  
     <a id='n1224' href='#n1224'>1224</a>  
     <a id='n1225' href='#n1225'>1225</a>  
     <a id='n1226' href='#n1226'>1226</a>  
     <a id='n1227' href='#n1227'>1227</a>  
     <a id='n1228' href='#n1228'>1228</a>  
     <a id='n1229' href='#n1229'>1229</a>  
     <a id='n1230' href='#n1230'>1230</a>  
     <a id='n1231' href='#n1231'>1231</a>  
     <a id='n1232' href='#n1232'>1232</a>  
     <a id='n1233' href='#n1233'>1233</a>  
     <a id='n1234' href='#n1234'>1234</a>  
     <a id='n1235' href='#n1235'>1235</a>  
     <a id='n1236' href='#n1236'>1236</a>  
     <a id='n1237' href='#n1237'>1237</a>  
     <a id='n1238' href='#n1238'>1238</a>  
     <a id='n1239' href='#n1239'>1239</a>  
     <a id='n1240' href='#n1240'>1240</a>  
     <a id='n1241' href='#n1241'>1241</a>  
     <a id='n1242' href='#n1242'>1242</a>  
     <a id='n1243' href='#n1243'>1243</a>  
     <a id='n1244' href='#n1244'>1244</a>  
     <a id='n1245' href='#n1245'>1245</a>  
     <a id='n1246' href='#n1246'>1246</a>  
     <a id='n1247' href='#n1247'>1247</a>  
     <a id='n1248' href='#n1248'>1248</a>  
     <a id='n1249' href='#n1249'>1249</a>  
     <a id='n1250' href='#n1250'>1250</a>  
     <a id='n1251' href='#n1251'>1251</a>  
     <a id='n1252' href='#n1252'>1252</a>  
     <a id='n1253' href='#n1253'>1253</a>  
     <a id='n1254' href='#n1254'>1254</a>  
     <a id='n1255' href='#n1255'>1255</a>  
     <a id='n1256' href='#n1256'>1256</a>  
     <a id='n1257' href='#n1257'>1257</a>  
     <a id='n1258' href='#n1258'>1258</a>  
     <a id='n1259' href='#n1259'>1259</a>  
     <a id='n1260' href='#n1260'>1260</a>  
     <a id='n1261' href='#n1261'>1261</a>  
     <a id='n1262' href='#n1262'>1262</a>  
     <a id='n1263' href='#n1263'>1263</a>  
     <a id='n1264' href='#n1264'>1264</a>  
     <a id='n1265' href='#n1265'>1265</a>  
     <a id='n1266' href='#n1266'>1266</a>  
     <a id='n1267' href='#n1267'>1267</a>  
     <a id='n1268' href='#n1268'>1268</a>  
     <a id='n1269' href='#n1269'>1269</a>  
     <a id='n1270' href='#n1270'>1270</a>  
     <a id='n1271' href='#n1271'>1271</a>  
     <a id='n1272' href='#n1272'>1272</a>  
     <a id='n1273' href='#n1273'>1273</a>  
     <a id='n1274' href='#n1274'>1274</a>  
     <a id='n1275' href='#n1275'>1275</a>  
     <a id='n1276' href='#n1276'>1276</a>  
     <a id='n1277' href='#n1277'>1277</a>  
     <a id='n1278' href='#n1278'>1278</a>  
     <a id='n1279' href='#n1279'>1279</a>  
     <a id='n1280' href='#n1280'>1280</a>  
     <a id='n1281' href='#n1281'>1281</a>  
     <a id='n1282' href='#n1282'>1282</a>  
     <a id='n1283' href='#n1283'>1283</a>  
     <a id='n1284' href='#n1284'>1284</a>  
     <a id='n1285' href='#n1285'>1285</a>  
     <a id='n1286' href='#n1286'>1286</a>  
     <a id='n1287' href='#n1287'>1287</a>  
     <a id='n1288' href='#n1288'>1288</a>  
     <a id='n1289' href='#n1289'>1289</a>  
     <a id='n1290' href='#n1290'>1290</a>  
     <a id='n1291' href='#n1291'>1291</a>  
     <a id='n1292' href='#n1292'>1292</a>  
     <a id='n1293' href='#n1293'>1293</a>  
     <a id='n1294' href='#n1294'>1294</a>  
     <a id='n1295' href='#n1295'>1295</a>  
     <a id='n1296' href='#n1296'>1296</a>  
     <a id='n1297' href='#n1297'>1297</a>  
     <a id='n1298' href='#n1298'>1298</a>  
     <a id='n1299' href='#n1299'>1299</a>  
     <a id='n1300' href='#n1300'>1300</a>  
     <a id='n1301' href='#n1301'>1301</a>  
     <a id='n1302' href='#n1302'>1302</a>  
     <a id='n1303' href='#n1303'>1303</a>  
     <a id='n1304' href='#n1304'>1304</a>  
     <a id='n1305' href='#n1305'>1305</a>  
     <a id='n1306' href='#n1306'>1306</a>  
     <a id='n1307' href='#n1307'>1307</a>  
     <a id='n1308' href='#n1308'>1308</a>  
     <a id='n1309' href='#n1309'>1309</a>  
     <a id='n1310' href='#n1310'>1310</a>  
     <a id='n1311' href='#n1311'>1311</a>  
     <a id='n1312' href='#n1312'>1312</a>  
     <a id='n1313' href='#n1313'>1313</a>  
     <a id='n1314' href='#n1314'>1314</a>  
     <a id='n1315' href='#n1315'>1315</a>  
     <a id='n1316' href='#n1316'>1316</a>  
     <a id='n1317' href='#n1317'>1317</a>  
     <a id='n1318' href='#n1318'>1318</a>  
     <a id='n1319' href='#n1319'>1319</a>  
     <a id='n1320' href='#n1320'>1320</a>  
     <a id='n1321' href='#n1321'>1321</a>  
     <a id='n1322' href='#n1322'>1322</a>  
     <a id='n1323' href='#n1323'>1323</a>  
     <a id='n1324' href='#n1324'>1324</a>  
     <a id='n1325' href='#n1325'>1325</a>  
     <a id='n1326' href='#n1326'>1326</a>  
     <a id='n1327' href='#n1327'>1327</a>  
     <a id='n1328' href='#n1328'>1328</a>  
     <a id='n1329' href='#n1329'>1329</a>  
     <a id='n1330' href='#n1330'>1330</a>  
     <a id='n1331' href='#n1331'>1331</a>  
     <a id='n1332' href='#n1332'>1332</a>  
     <a id='n1333' href='#n1333'>1333</a>  
     <a id='n1334' href='#n1334'>1334</a>  
     <a id='n1335' href='#n1335'>1335</a>  
     <a id='n1336' href='#n1336'>1336</a>  
     <a id='n1337' href='#n1337'>1337</a>  
     <a id='n1338' href='#n1338'>1338</a>  
     <a id='n1339' href='#n1339'>1339</a>  
     <a id='n1340' href='#n1340'>1340</a>  
     <a id='n1341' href='#n1341'>1341</a>  
     <a id='n1342' href='#n1342'>1342</a>  
     <a id='n1343' href='#n1343'>1343</a>  
     <a id='n1344' href='#n1344'>1344</a>  
     <a id='n1345' href='#n1345'>1345</a>  
     <a id='n1346' href='#n1346'>1346</a>  
     <a id='n1347' href='#n1347'>1347</a>  
     <a id='n1348' href='#n1348'>1348</a>  
     <a id='n1349' href='#n1349'>1349</a>  
     <a id='n1350' href='#n1350'>1350</a>  
     <a id='n1351' href='#n1351'>1351</a>  
     <a id='n1352' href='#n1352'>1352</a>  
     <a id='n1353' href='#n1353'>1353</a>  
     <a id='n1354' href='#n1354'>1354</a>  
     <a id='n1355' href='#n1355'>1355</a>  
     <a id='n1356' href='#n1356'>1356</a>  
     <a id='n1357' href='#n1357'>1357</a>  
     <a id='n1358' href='#n1358'>1358</a>  
     <a id='n1359' href='#n1359'>1359</a>  
     <a id='n1360' href='#n1360'>1360</a>  
     <a id='n1361' href='#n1361'>1361</a>  
     <a id='n1362' href='#n1362'>1362</a>  
     <a id='n1363' href='#n1363'>1363</a>  
     <a id='n1364' href='#n1364'>1364</a>  
     <a id='n1365' href='#n1365'>1365</a>  
     <a id='n1366' href='#n1366'>1366</a>  
     <a id='n1367' href='#n1367'>1367</a>  
     <a id='n1368' href='#n1368'>1368</a>  
     <a id='n1369' href='#n1369'>1369</a>  
     <a id='n1370' href='#n1370'>1370</a>  
     <a id='n1371' href='#n1371'>1371</a>  
     <a id='n1372' href='#n1372'>1372</a>  
     <a id='n1373' href='#n1373'>1373</a>  
     <a id='n1374' href='#n1374'>1374</a>  
     <a id='n1375' href='#n1375'>1375</a>  
     <a id='n1376' href='#n1376'>1376</a>  
     <a id='n1377' href='#n1377'>1377</a>  
     <a id='n1378' href='#n1378'>1378</a>  
     <a id='n1379' href='#n1379'>1379</a>  
     <a id='n1380' href='#n1380'>1380</a>  
     <a id='n1381' href='#n1381'>1381</a>  
     <a id='n1382' href='#n1382'>1382</a>  
     <a id='n1383' href='#n1383'>1383</a>  
     <a id='n1384' href='#n1384'>1384</a>  
     <a id='n1385' href='#n1385'>1385</a>  
     <a id='n1386' href='#n1386'>1386</a>  
     <a id='n1387' href='#n1387'>1387</a>  
     <a id='n1388' href='#n1388'>1388</a>  
     <a id='n1389' href='#n1389'>1389</a>  
     <a id='n1390' href='#n1390'>1390</a>  
     <a id='n1391' href='#n1391'>1391</a>  
     <a id='n1392' href='#n1392'>1392</a>  
     <a id='n1393' href='#n1393'>1393</a>  
     <a id='n1394' href='#n1394'>1394</a>  
     <a id='n1395' href='#n1395'>1395</a>  
     <a id='n1396' href='#n1396'>1396</a>  
     <a id='n1397' href='#n1397'>1397</a>  
     <a id='n1398' href='#n1398'>1398</a>  
     <a id='n1399' href='#n1399'>1399</a>  
     <a id='n1400' href='#n1400'>1400</a>  
     <a id='n1401' href='#n1401'>1401</a>  
     <a id='n1402' href='#n1402'>1402</a>  
     <a id='n1403' href='#n1403'>1403</a>  
     <a id='n1404' href='#n1404'>1404</a>  
     <a id='n1405' href='#n1405'>1405</a>  
     <a id='n1406' href='#n1406'>1406</a>  
     <a id='n1407' href='#n1407'>1407</a>  
     <a id='n1408' href='#n1408'>1408</a>  
     <a id='n1409' href='#n1409'>1409</a>  
     <a id='n1410' href='#n1410'>1410</a>  
     <a id='n1411' href='#n1411'>1411</a>  
     <a id='n1412' href='#n1412'>1412</a>  
     <a id='n1413' href='#n1413'>1413</a>  
     <a id='n1414' href='#n1414'>1414</a>  
     <a id='n1415' href='#n1415'>1415</a>  
     <a id='n1416' href='#n1416'>1416</a>  
     <a id='n1417' href='#n1417'>1417</a>  
     <a id='n1418' href='#n1418'>1418</a>  
     <a id='n1419' href='#n1419'>1419</a>  
     <a id='n1420' href='#n1420'>1420</a>  
     <a id='n1421' href='#n1421'>1421</a>  
     <a id='n1422' href='#n1422'>1422</a>  
     <a id='n1423' href='#n1423'>1423</a>  
     <a id='n1424' href='#n1424'>1424</a>  
     <a id='n1425' href='#n1425'>1425</a>  
     <a id='n1426' href='#n1426'>1426</a>  
     <a id='n1427' href='#n1427'>1427</a>  
     <a id='n1428' href='#n1428'>1428</a>  
     <a id='n1429' href='#n1429'>1429</a>  
     <a id='n1430' href='#n1430'>1430</a>  
     <a id='n1431' href='#n1431'>1431</a>  
     <a id='n1432' href='#n1432'>1432</a>  
     <a id='n1433' href='#n1433'>1433</a>  
     <a id='n1434' href='#n1434'>1434</a>  
     <a id='n1435' href='#n1435'>1435</a>  
     <a id='n1436' href='#n1436'>1436</a>  
     <a id='n1437' href='#n1437'>1437</a>  
     <a id='n1438' href='#n1438'>1438</a>  
     <a id='n1439' href='#n1439'>1439</a>  
     <a id='n1440' href='#n1440'>1440</a>  
     <a id='n1441' href='#n1441'>1441</a>  
     <a id='n1442' href='#n1442'>1442</a>  
     <a id='n1443' href='#n1443'>1443</a>  
     <a id='n1444' href='#n1444'>1444</a>  
     <a id='n1445' href='#n1445'>1445</a>  
     <a id='n1446' href='#n1446'>1446</a>  
     <a id='n1447' href='#n1447'>1447</a>  
     <a id='n1448' href='#n1448'>1448</a>  
     <a id='n1449' href='#n1449'>1449</a>  
     <a id='n1450' href='#n1450'>1450</a>  
     <a id='n1451' href='#n1451'>1451</a>  
     <a id='n1452' href='#n1452'>1452</a>  
     <a id='n1453' href='#n1453'>1453</a>  
     <a id='n1454' href='#n1454'>1454</a>  
     <a id='n1455' href='#n1455'>1455</a>  
     <a id='n1456' href='#n1456'>1456</a>  
     <a id='n1457' href='#n1457'>1457</a>  
     <a id='n1458' href='#n1458'>1458</a>  
     <a id='n1459' href='#n1459'>1459</a>  
     <a id='n1460' href='#n1460'>1460</a>  
     <a id='n1461' href='#n1461'>1461</a>  
     <a id='n1462' href='#n1462'>1462</a>  
     <a id='n1463' href='#n1463'>1463</a>  
     <a id='n1464' href='#n1464'>1464</a>  
     <a id='n1465' href='#n1465'>1465</a>  
     <a id='n1466' href='#n1466'>1466</a>  
     </pre></td>  
     <td class='lines'><pre><code>Description: Introduce a plugin system for QSystemTrayIcon.  
    2   Designed to be used with sni-qt (https://launchpad.net/sni-qt)   Designed to be used with sni-qt (https://launchpad.net/sni-qt)
    3  Author: agateau&#64;kde.org  Author: agateau@kde.org
    4  Forwarded: no  Forwarded: no
    5    
    6  Introduce a plugin system for QSystemTrayIcon. Designed to be used with sni-qt  Introduce a plugin system for QSystemTrayIcon. Designed to be used with sni-qt
    7  (https://launchpad.net/sni-qt)  (https://launchpad.net/sni-qt)
    8  <span class="hl kwb">---</span>  ---
    9   examples/desktop/systray/window.cpp         |   40 ++   examples/desktop/systray/window.cpp         |   40 ++
    10   examples/desktop/systray/window.h           |    6   examples/desktop/systray/window.h           |    6
    11   src/gui/util/qabstractsystemtrayiconsys.cpp |   65 +++   src/gui/util/qabstractsystemtrayiconsys.cpp |   65 +++
    # Line 1536  Introduce a plugin system for QSystemTra Line 18  Introduce a plugin system for QSystemTra
    18   src/gui/util/util.pri                       |    7   src/gui/util/util.pri                       |    7
    19   10 files changed, 916 insertions(+), 328 deletions(-)   10 files changed, 916 insertions(+), 328 deletions(-)
    20    
    21  <span class="hl kwb">--- a/examples/desktop/systray/window.cpp</span>  --- a/examples/desktop/systray/window.cpp
    22  <span class="hl kwa">+++ b/examples/desktop/systray/window.cpp</span>  +++ b/examples/desktop/systray/window.cpp
    23  <span class="hl kwd">&#64;&#64; -158,15 +158,23 &#64;&#64;</span>  @@ -158,15 +158,23 @@
    24       iconComboBox-&gt;addItem(QIcon(&quot;:/images/bad.svg&quot;), tr(&quot;Bad&quot;));       iconComboBox->addItem(QIcon(":/images/bad.svg"), tr("Bad"));
    25       iconComboBox-&gt;addItem(QIcon(&quot;:/images/heart.svg&quot;), tr(&quot;Heart&quot;));       iconComboBox->addItem(QIcon(":/images/heart.svg"), tr("Heart"));
    26       iconComboBox-&gt;addItem(QIcon(&quot;:/images/trash.svg&quot;), tr(&quot;Trash&quot;));       iconComboBox->addItem(QIcon(":/images/trash.svg"), tr("Trash"));
    27  <span class="hl kwa">+    iconComboBox-&gt;addItem(QIcon::fromTheme(&quot;system-file-manager&quot;), tr(&quot;File Manager&quot;));</span>  +    iconComboBox->addItem(QIcon::fromTheme("system-file-manager"), tr("File Manager"));
    28    
    29       showIconCheckBox = new QCheckBox(tr(&quot;Show icon&quot;));       showIconCheckBox = new QCheckBox(tr("Show icon"));
    30       showIconCheckBox-&gt;setChecked(true);       showIconCheckBox->setChecked(true);
    31    
    32  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    33  <span class="hl kwa">+    jitToolTipCheckBox = new QCheckBox(tr(&quot;Just In Time Tooltip&quot;));</span>  +    jitToolTipCheckBox = new QCheckBox(tr("Just In Time Tooltip"));
    34  <span class="hl kwa">+#endif</span>  +#endif
    35  <span class="hl kwa">+</span>  +
    36       QHBoxLayout *iconLayout = new QHBoxLayout;       QHBoxLayout *iconLayout = new QHBoxLayout;
    37       iconLayout-&gt;addWidget(iconLabel);       iconLayout->addWidget(iconLabel);
    38       iconLayout-&gt;addWidget(iconComboBox);       iconLayout->addWidget(iconComboBox);
    39       iconLayout-&gt;addStretch();       iconLayout->addStretch();
    40       iconLayout-&gt;addWidget(showIconCheckBox);       iconLayout->addWidget(showIconCheckBox);
    41  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    42  <span class="hl kwa">+    iconLayout-&gt;addWidget(jitToolTipCheckBox);</span>  +    iconLayout->addWidget(jitToolTipCheckBox);
    43  <span class="hl kwa">+#endif</span>  +#endif
    44       iconGroupBox-&gt;setLayout(iconLayout);       iconGroupBox->setLayout(iconLayout);
    45   }   }
    46    
    47  <span class="hl kwd">&#64;&#64; -254,5 +262,37 &#64;&#64;</span>  @@ -254,5 +262,37 @@
    48       trayIconMenu-&gt;addAction(quitAction);       trayIconMenu->addAction(quitAction);
    49    
    50       trayIcon = new QSystemTrayIcon(this);       trayIcon = new QSystemTrayIcon(this);
    51  <span class="hl kwa">+    QByteArray category = qgetenv(&quot;SNI_CATEGORY&quot;);</span>  +    QByteArray category = qgetenv("SNI_CATEGORY");
    52  <span class="hl kwa">+    if (!category.isEmpty()) {</span>  +    if (!category.isEmpty()) {
    53  <span class="hl kwa">+        trayIcon-&gt;setProperty(&quot;_qt_sni_category&quot;, QString::fromLocal8Bit(category));</span>  +        trayIcon->setProperty("_qt_sni_category", QString::fromLocal8Bit(category));
    54  <span class="hl kwa">+    }</span>  +    }
    55       trayIcon-&gt;setContextMenu(trayIconMenu);       trayIcon->setContextMenu(trayIconMenu);
    56  <span class="hl kwa">+</span>  +
    57  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    58  <span class="hl kwa">+    trayIcon-&gt;installEventFilter(this);</span>  +    trayIcon->installEventFilter(this);
    59  <span class="hl kwa">+#endif</span>  +#endif
    60  <span class="hl kwa">+}</span>  +}
    61  <span class="hl kwa">+</span>  +
    62  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    63  <span class="hl kwa">+bool Window::eventFilter(QObject *, QEvent *event)</span>  +bool Window::eventFilter(QObject *, QEvent *event)
    64  <span class="hl kwa">+{</span>  +{
    65  <span class="hl kwa">+    switch(event-&gt;type()) {</span>  +    switch(event->type()) {
    66  <span class="hl kwa">+    case QEvent::ToolTip:</span>  +    case QEvent::ToolTip:
    67  <span class="hl kwa">+        if (jitToolTipCheckBox-&gt;isChecked()) {</span>  +        if (jitToolTipCheckBox->isChecked()) {
    68  <span class="hl kwa">+            QString timeString = QTime::currentTime().toString();</span>  +            QString timeString = QTime::currentTime().toString();
    69  <span class="hl kwa">+            trayIcon-&gt;setToolTip(tr(&quot;Current Time: %1&quot;).arg(timeString));</span>  +            trayIcon->setToolTip(tr("Current Time: %1").arg(timeString));
    70  <span class="hl kwa">+        }</span>  +        }
    71  <span class="hl kwa">+        break;</span>  +        break;
    72  <span class="hl kwa">+    case QEvent::Wheel: {</span>  +    case QEvent::Wheel: {
    73  <span class="hl kwa">+        QWheelEvent *wheelEvent = static_cast&lt;QWheelEvent*&gt;(event);</span>  +        QWheelEvent *wheelEvent = static_cast<QWheelEvent*>(event);
    74  <span class="hl kwa">+        int delta = wheelEvent-&gt;delta() &gt; 0 ? 1 : -1;</span>  +        int delta = wheelEvent->delta() > 0 ? 1 : -1;
    75  <span class="hl kwa">+        int index = (iconComboBox-&gt;currentIndex() + delta) % iconComboBox-&gt;count();</span>  +        int index = (iconComboBox->currentIndex() + delta) % iconComboBox->count();
    76  <span class="hl kwa">+        iconComboBox-&gt;setCurrentIndex(index);</span>  +        iconComboBox->setCurrentIndex(index);
    77  <span class="hl kwa">+        break;</span>  +        break;
    78  <span class="hl kwa">+    }</span>  +    }
    79  <span class="hl kwa">+    default:</span>  +    default:
    80  <span class="hl kwa">+        break;</span>  +        break;
    81  <span class="hl kwa">+    }</span>  +    }
    82  <span class="hl kwa">+    return false;</span>  +    return false;
    83   }   }
    84  <span class="hl kwa">+#endif</span>  +#endif
    85  <span class="hl kwb">--- a/examples/desktop/systray/window.h</span>  --- a/examples/desktop/systray/window.h
    86  <span class="hl kwa">+++ b/examples/desktop/systray/window.h</span>  +++ b/examples/desktop/systray/window.h
    87  <span class="hl kwd">&#64;&#64; -69,6 +69,9 &#64;&#64;</span>  @@ -69,6 +69,9 @@
    88    
    89   protected:   protected:
    90       void closeEvent(QCloseEvent *event);       void closeEvent(QCloseEvent *event);
    91  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    92  <span class="hl kwa">+    bool eventFilter(QObject *object, QEvent *event);</span>  +    bool eventFilter(QObject *object, QEvent *event);
    93  <span class="hl kwa">+#endif</span>  +#endif
    94    
    95   private slots:   private slots:
    96       void setIcon(int index);       void setIcon(int index);
    97  <span class="hl kwd">&#64;&#64; -86,6 +89,9 &#64;&#64;</span>  @@ -86,6 +89,9 @@
    98       QLabel *iconLabel;       QLabel *iconLabel;
    99       QComboBox *iconComboBox;       QComboBox *iconComboBox;
    100       QCheckBox *showIconCheckBox;       QCheckBox *showIconCheckBox;
    101  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    102  <span class="hl kwa">+    QCheckBox *jitToolTipCheckBox;</span>  +    QCheckBox *jitToolTipCheckBox;
    103  <span class="hl kwa">+#endif</span>  +#endif
    104    
    105       QGroupBox *messageGroupBox;       QGroupBox *messageGroupBox;
    106       QLabel *typeLabel;       QLabel *typeLabel;
    107  <span class="hl kwb">--- /dev/null</span>  --- /dev/null
    108  <span class="hl kwa">+++ b/src/gui/util/qabstractsystemtrayiconsys.cpp</span>  +++ b/src/gui/util/qabstractsystemtrayiconsys.cpp
    109  <span class="hl kwd">&#64;&#64; -0,0 +1,65 &#64;&#64;</span>  @@ -0,0 +1,65 @@
    110  <span class="hl kwa">+/****************************************************************************</span>  +/****************************************************************************
    111  <span class="hl kwa">+**</span>  +**
    112  <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span>  +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    113  <span class="hl kwa">+** All rights reserved.</span>  +** All rights reserved.
    114  <span class="hl kwa">+** Contact: Nokia Corporation (qt-info&#64;nokia.com)</span>  +** Contact: Nokia Corporation (qt-info@nokia.com)
    115  <span class="hl kwa">+**</span>  +**
    116  <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span>  +** This file is part of the QtGui module of the Qt Toolkit.
    117  <span class="hl kwa">+**</span>  +**
    118  <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span>  +** $QT_BEGIN_LICENSE:LGPL$
    119  <span class="hl kwa">+** GNU Lesser General Public License Usage</span>  +** GNU Lesser General Public License Usage
    120  <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span>  +** This file may be used under the terms of the GNU Lesser General Public
    121  <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span>  +** License version 2.1 as published by the Free Software Foundation and
    122  <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span>  +** appearing in the file LICENSE.LGPL included in the packaging of this
    123  <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span>  +** file. Please review the following information to ensure the GNU Lesser
    124  <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span>  +** General Public License version 2.1 requirements will be met:
    125  <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span>  +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    126  <span class="hl kwa">+**</span>  +**
    127  <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span>  +** In addition, as a special exception, Nokia gives you certain additional
    128  <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span>  +** rights. These rights are described in the Nokia Qt LGPL Exception
    129  <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span>  +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    130  <span class="hl kwa">+**</span>  +**
    131  <span class="hl kwa">+** GNU General Public License Usage</span>  +** GNU General Public License Usage
    132  <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span>  +** Alternatively, this file may be used under the terms of the GNU General
    133  <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span>  +** Public License version 3.0 as published by the Free Software Foundation
    134  <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span>  +** and appearing in the file LICENSE.GPL included in the packaging of this
    135  <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span>  +** file. Please review the following information to ensure the GNU General
    136  <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span>  +** Public License version 3.0 requirements will be met:
    137  <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span>  +** http://www.gnu.org/copyleft/gpl.html.
    138  <span class="hl kwa">+**</span>  +**
    139  <span class="hl kwa">+** Other Usage</span>  +** Other Usage
    140  <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span>  +** Alternatively, this file may be used in accordance with the terms and
    141  <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span>  +** conditions contained in a signed written agreement between you and Nokia.
    142  <span class="hl kwa">+**</span>  +**
    143  <span class="hl kwa">+**</span>  +**
    144  <span class="hl kwa">+**</span>  +**
    145  <span class="hl kwa">+**</span>  +**
    146  <span class="hl kwa">+**</span>  +**
    147  <span class="hl kwa">+** $QT_END_LICENSE$</span>  +** $QT_END_LICENSE$
    148  <span class="hl kwa">+**</span>  +**
    149  <span class="hl kwa">+****************************************************************************/</span>  +****************************************************************************/
    150  <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span>  +#ifndef QT_NO_SYSTEMTRAYICON
    151  <span class="hl kwa">+</span>  +
    152  <span class="hl kwa">+#include &quot;qabstractsystemtrayiconsys_p.h&quot;</span>  +#include "qabstractsystemtrayiconsys_p.h"
    153  <span class="hl kwa">+</span>  +
    154  <span class="hl kwa">+</span>  +
    155  <span class="hl kwa">+QSystemTrayIconSysFactoryInterface::QSystemTrayIconSysFactoryInterface()</span>  +QSystemTrayIconSysFactoryInterface::QSystemTrayIconSysFactoryInterface()
    156  <span class="hl kwa">+{</span>  +{
    157  <span class="hl kwa">+}</span>  +}
    158  <span class="hl kwa">+</span>  +
    159  <span class="hl kwa">+/////////////////////////////////////////////////</span>  +/////////////////////////////////////////////////
    160  <span class="hl kwa">+QAbstractSystemTrayIconSys::QAbstractSystemTrayIconSys(QSystemTrayIcon *icon)</span>  +QAbstractSystemTrayIconSys::QAbstractSystemTrayIconSys(QSystemTrayIcon *icon)
    161  <span class="hl kwa">+: trayIcon(icon)</span>  +: trayIcon(icon)
    162  <span class="hl kwa">+{</span>  +{
    163  <span class="hl kwa">+}</span>  +}
    164  <span class="hl kwa">+</span>  +
    165  <span class="hl kwa">+QAbstractSystemTrayIconSys::~QAbstractSystemTrayIconSys()</span>  +QAbstractSystemTrayIconSys::~QAbstractSystemTrayIconSys()
    166  <span class="hl kwa">+{</span>  +{
    167  <span class="hl kwa">+}</span>  +}
    168  <span class="hl kwa">+</span>  +
    169  <span class="hl kwa">+void QAbstractSystemTrayIconSys::sendActivated(QSystemTrayIcon::ActivationReason reason)</span>  +void QAbstractSystemTrayIconSys::sendActivated(QSystemTrayIcon::ActivationReason reason)
    170  <span class="hl kwa">+{</span>  +{
    171  <span class="hl kwa">+    qtsystray_sendActivated(trayIcon, reason);</span>  +    qtsystray_sendActivated(trayIcon, reason);
    172  <span class="hl kwa">+}</span>  +}
    173  <span class="hl kwa">+</span>  +
    174  <span class="hl kwa">+#endif</span>  +#endif
    175  <span class="hl kwb">--- /dev/null</span>  --- /dev/null
    176  <span class="hl kwa">+++ b/src/gui/util/qabstractsystemtrayiconsys_p.h</span>  +++ b/src/gui/util/qabstractsystemtrayiconsys_p.h
    177  <span class="hl kwd">&#64;&#64; -0,0 +1,106 &#64;&#64;</span>  @@ -0,0 +1,106 @@
    178  <span class="hl kwa">+/****************************************************************************</span>  +/****************************************************************************
    179  <span class="hl kwa">+**</span>  +**
    180  <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span>  +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    181  <span class="hl kwa">+** All rights reserved.</span>  +** All rights reserved.
    182  <span class="hl kwa">+** Contact: Nokia Corporation (qt-info&#64;nokia.com)</span>  +** Contact: Nokia Corporation (qt-info@nokia.com)
    183  <span class="hl kwa">+**</span>  +**
    184  <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span>  +** This file is part of the QtGui module of the Qt Toolkit.
    185  <span class="hl kwa">+**</span>  +**
    186  <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span>  +** $QT_BEGIN_LICENSE:LGPL$
    187  <span class="hl kwa">+** GNU Lesser General Public License Usage</span>  +** GNU Lesser General Public License Usage
    188  <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span>  +** This file may be used under the terms of the GNU Lesser General Public
    189  <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span>  +** License version 2.1 as published by the Free Software Foundation and
    190  <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span>  +** appearing in the file LICENSE.LGPL included in the packaging of this
    191  <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span>  +** file. Please review the following information to ensure the GNU Lesser
    192  <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span>  +** General Public License version 2.1 requirements will be met:
    193  <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span>  +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    194  <span class="hl kwa">+**</span>  +**
    195  <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span>  +** In addition, as a special exception, Nokia gives you certain additional
    196  <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span>  +** rights. These rights are described in the Nokia Qt LGPL Exception
    197  <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span>  +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    198  <span class="hl kwa">+**</span>  +**
    199  <span class="hl kwa">+** GNU General Public License Usage</span>  +** GNU General Public License Usage
    200  <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span>  +** Alternatively, this file may be used under the terms of the GNU General
    201  <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span>  +** Public License version 3.0 as published by the Free Software Foundation
    202  <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span>  +** and appearing in the file LICENSE.GPL included in the packaging of this
    203  <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span>  +** file. Please review the following information to ensure the GNU General
    204  <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span>  +** Public License version 3.0 requirements will be met:
    205  <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span>  +** http://www.gnu.org/copyleft/gpl.html.
    206  <span class="hl kwa">+**</span>  +**
    207  <span class="hl kwa">+** Other Usage</span>  +** Other Usage
    208  <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span>  +** Alternatively, this file may be used in accordance with the terms and
    209  <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span>  +** conditions contained in a signed written agreement between you and Nokia.
    210  <span class="hl kwa">+**</span>  +**
    211  <span class="hl kwa">+**</span>  +**
    212  <span class="hl kwa">+**</span>  +**
    213  <span class="hl kwa">+**</span>  +**
    214  <span class="hl kwa">+**</span>  +**
    215  <span class="hl kwa">+** $QT_END_LICENSE$</span>  +** $QT_END_LICENSE$
    216  <span class="hl kwa">+**</span>  +**
    217  <span class="hl kwa">+****************************************************************************/</span>  +****************************************************************************/
    218  <span class="hl kwa">+</span>  +
    219  <span class="hl kwa">+#ifndef QABSTRACTSYSTEMTRAYICONSYS_P_H</span>  +#ifndef QABSTRACTSYSTEMTRAYICONSYS_P_H
    220  <span class="hl kwa">+#define QABSTRACTSYSTEMTRAYICONSYS_P_H</span>  +#define QABSTRACTSYSTEMTRAYICONSYS_P_H
    221  <span class="hl kwa">+</span>  +
    222  <span class="hl kwa">+//</span>  +//
    223  <span class="hl kwa">+//  W A R N I N G</span>  +//  W A R N I N G
    224  <span class="hl kwa">+//  -------------</span>  +//  -------------
    225  <span class="hl kwa">+//</span>  +//
    226  <span class="hl kwa">+// This file is not part of the Qt API.  It exists for the convenience</span>  +// This file is not part of the Qt API.  It exists for the convenience
    227  <span class="hl kwa">+// of a number of Qt sources files.  This header file may change from</span>  +// of a number of Qt sources files.  This header file may change from
    228  <span class="hl kwa">+// version to version without notice, or even be removed.</span>  +// version to version without notice, or even be removed.
    229  <span class="hl kwa">+//</span>  +//
    230  <span class="hl kwa">+// We mean it.</span>  +// We mean it.
    231  <span class="hl kwa">+//</span>  +//
    232  <span class="hl kwa">+</span>  +
    233  <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span>  +#ifndef QT_NO_SYSTEMTRAYICON
    234  <span class="hl kwa">+</span>  +
    235  <span class="hl kwa">+#include &lt;qfactoryinterface.h&gt;</span>  +#include <qfactoryinterface.h>
    236  <span class="hl kwa">+#include &lt;qsystemtrayicon.h&gt;</span>  +#include <qsystemtrayicon.h>
    237  <span class="hl kwa">+</span>  +
    238  <span class="hl kwa">+class QAbstractSystemTrayIconSys;</span>  +class QAbstractSystemTrayIconSys;
    239  <span class="hl kwa">+</span>  +
    240  <span class="hl kwa">+class Q_GUI_EXPORT QSystemTrayIconSysFactoryInterface : public QObject, public QFactoryInterface</span>  +class Q_GUI_EXPORT QSystemTrayIconSysFactoryInterface : public QObject, public QFactoryInterface
    241  <span class="hl kwa">+{</span>  +{
    242  <span class="hl kwa">+    Q_OBJECT</span>  +    Q_OBJECT
    243  <span class="hl kwa">+public:</span>  +public:
    244  <span class="hl kwa">+    QSystemTrayIconSysFactoryInterface();</span>  +    QSystemTrayIconSysFactoryInterface();
    245  <span class="hl kwa">+    virtual QAbstractSystemTrayIconSys * create(QSystemTrayIcon *) = 0;</span>  +    virtual QAbstractSystemTrayIconSys * create(QSystemTrayIcon *) = 0;
    246  <span class="hl kwa">+    virtual bool isAvailable() const = 0;</span>  +    virtual bool isAvailable() const = 0;
    247  <span class="hl kwa">+</span>  +
    248  <span class="hl kwa">+    // \reimp</span>  +    // \reimp
    249  <span class="hl kwa">+    virtual QStringList keys() const { return QStringList() &lt;&lt; QLatin1String(&quot;default&quot;); }</span>  +    virtual QStringList keys() const { return QStringList() << QLatin1String("default"); }
    250  <span class="hl kwa">+</span>  +
    251  <span class="hl kwa">+Q_SIGNALS:</span>  +Q_SIGNALS:
    252  <span class="hl kwa">+    void availableChanged(bool);</span>  +    void availableChanged(bool);
    253  <span class="hl kwa">+};</span>  +};
    254  <span class="hl kwa">+</span>  +
    255  <span class="hl kwa">+#define QSystemTrayIconSysFactoryInterface_iid &quot;com.nokia.qt.QSystemTrayIconSysFactoryInterface&quot;</span>  +#define QSystemTrayIconSysFactoryInterface_iid "com.nokia.qt.QSystemTrayIconSysFactoryInterface"
    256  <span class="hl kwa">+Q_DECLARE_INTERFACE(QSystemTrayIconSysFactoryInterface, QSystemTrayIconSysFactoryInterface_iid)</span>  +Q_DECLARE_INTERFACE(QSystemTrayIconSysFactoryInterface, QSystemTrayIconSysFactoryInterface_iid)
    257  <span class="hl kwa">+</span>  +
    258  <span class="hl kwa">+class QRect;</span>  +class QRect;
    259  <span class="hl kwa">+</span>  +
    260  <span class="hl kwa">+class Q_GUI_EXPORT QAbstractSystemTrayIconSys</span>  +class Q_GUI_EXPORT QAbstractSystemTrayIconSys
    261  <span class="hl kwa">+{</span>  +{
    262  <span class="hl kwa">+public:</span>  +public:
    263  <span class="hl kwa">+    QAbstractSystemTrayIconSys(QSystemTrayIcon *icon);</span>  +    QAbstractSystemTrayIconSys(QSystemTrayIcon *icon);
    264  <span class="hl kwa">+    virtual ~QAbstractSystemTrayIconSys();</span>  +    virtual ~QAbstractSystemTrayIconSys();
    265  <span class="hl kwa">+</span>  +
    266  <span class="hl kwa">+    virtual QRect geometry() const = 0;</span>  +    virtual QRect geometry() const = 0;
    267  <span class="hl kwa">+    virtual void updateVisibility() = 0;</span>  +    virtual void updateVisibility() = 0;
    268  <span class="hl kwa">+    virtual void updateIcon() = 0;</span>  +    virtual void updateIcon() = 0;
    269  <span class="hl kwa">+    virtual void updateToolTip() = 0;</span>  +    virtual void updateToolTip() = 0;
    270  <span class="hl kwa">+    virtual void updateMenu() = 0;</span>  +    virtual void updateMenu() = 0;
    271  <span class="hl kwa">+    virtual void showMessage(const QString &amp;title, const QString &amp;message,</span>  +    virtual void showMessage(const QString &title, const QString &message,
    272  <span class="hl kwa">+                     QSystemTrayIcon::MessageIcon icon, int msecs) = 0;</span>  +                     QSystemTrayIcon::MessageIcon icon, int msecs) = 0;
    273  <span class="hl kwa">+</span>  +
    274  <span class="hl kwa">+    void sendActivated(QSystemTrayIcon::ActivationReason);</span>  +    void sendActivated(QSystemTrayIcon::ActivationReason);
    275  <span class="hl kwa">+</span>  +
    276  <span class="hl kwa">+protected:</span>  +protected:
    277  <span class="hl kwa">+    QSystemTrayIcon *trayIcon;</span>  +    QSystemTrayIcon *trayIcon;
    278  <span class="hl kwa">+};</span>  +};
    279  <span class="hl kwa">+</span>  +
    280  <span class="hl kwa">+#endif // QT_NO_SYSTEMTRAYICON</span>  +#endif // QT_NO_SYSTEMTRAYICON
    281  <span class="hl kwa">+</span>  +
    282  <span class="hl kwa">+#endif // QABSTRACTSYSTEMTRAYICONSYS_P_H</span>  +#endif // QABSTRACTSYSTEMTRAYICONSYS_P_H
    283  <span class="hl kwa">+</span>  +
    284  <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon.cpp</span>  --- a/src/gui/util/qsystemtrayicon.cpp
    285  <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon.cpp</span>  +++ b/src/gui/util/qsystemtrayicon.cpp
    286  <span class="hl kwd">&#64;&#64; -287,12 +287,6 &#64;&#64;</span>  @@ -287,12 +287,6 @@
    287   */   */
    288   bool QSystemTrayIcon::event(QEvent *e)   bool QSystemTrayIcon::event(QEvent *e)
    289   {   {
    290  <span class="hl kwb">-#if defined(Q_WS_X11)</span>  -#if defined(Q_WS_X11)
    291  <span class="hl kwb">-    if (e-&gt;type() == QEvent::ToolTip) {</span>  -    if (e->type() == QEvent::ToolTip) {
    292  <span class="hl kwb">-        Q_D(QSystemTrayIcon);</span>  -        Q_D(QSystemTrayIcon);
    293  <span class="hl kwb">-        return d-&gt;sys-&gt;deliverToolTipEvent(e);</span>  -        return d->sys->deliverToolTipEvent(e);
    294  <span class="hl kwb">-    }</span>  -    }
    295  <span class="hl kwb">-#endif</span>  -#endif
    296       return QObject::event(e);       return QObject::event(e);
    297   }   }
    298    
    299  <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon_p.h</span>  --- a/src/gui/util/qsystemtrayicon_p.h
    300  <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon_p.h</span>  +++ b/src/gui/util/qsystemtrayicon_p.h
    301  <span class="hl kwd">&#64;&#64; -62,10 +62,17 &#64;&#64;</span>  @@ -62,10 +62,17 @@
    302   #include &quot;QtGui/qpixmap.h&quot;   #include "QtGui/qpixmap.h"
    303   #include &quot;QtCore/qstring.h&quot;   #include "QtCore/qstring.h"
    304   #include &quot;QtCore/qpointer.h&quot;   #include "QtCore/qpointer.h"
    305  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    306  <span class="hl kwa">+#include &quot;QtCore/qset.h&quot;</span>  +#include "QtCore/qset.h"
    307  <span class="hl kwa">+#endif</span>  +#endif
    308    
    309   QT_BEGIN_NAMESPACE   QT_BEGIN_NAMESPACE
    310    
    311  <span class="hl kwa">+#if defined(Q_WS_X11)</span>  +#if defined(Q_WS_X11)
    312  <span class="hl kwa">+class QAbstractSystemTrayIconSys;</span>  +class QAbstractSystemTrayIconSys;
    313  <span class="hl kwa">+#else</span>  +#else
    314   class QSystemTrayIconSys;   class QSystemTrayIconSys;
    315  <span class="hl kwa">+#endif</span>  +#endif
    316   class QToolButton;   class QToolButton;
    317   class QLabel;   class QLabel;
    318    
    319  <span class="hl kwd">&#64;&#64; -75,6 +82,9 &#64;&#64;</span>  @@ -75,6 +82,9 @@
    320    
    321   public:   public:
    322       QSystemTrayIconPrivate() : sys(0), visible(false) { }       QSystemTrayIconPrivate() : sys(0), visible(false) { }
    323  <span class="hl kwa">+    #if defined(Q_WS_X11)</span>  +    #if defined(Q_WS_X11)
    324  <span class="hl kwa">+    ~QSystemTrayIconPrivate();</span>  +    ~QSystemTrayIconPrivate();
    325  <span class="hl kwa">+    #endif</span>  +    #endif
    326    
    327       void install_sys();       void install_sys();
    328       void remove_sys();       void remove_sys();
    329  <span class="hl kwd">&#64;&#64; -90,7 +100,11 &#64;&#64;</span>  @@ -90,7 +100,11 @@
    330       QPointer&lt;QMenu&gt; menu;       QPointer<QMenu> menu;
    331       QIcon icon;       QIcon icon;
    332       QString toolTip;       QString toolTip;
    333  <span class="hl kwa">+    #if defined(Q_WS_X11)</span>  +    #if defined(Q_WS_X11)
    334  <span class="hl kwa">+    QAbstractSystemTrayIconSys *sys;</span>  +    QAbstractSystemTrayIconSys *sys;
    335  <span class="hl kwa">+    #else</span>  +    #else
    336       QSystemTrayIconSys *sys;       QSystemTrayIconSys *sys;
    337  <span class="hl kwa">+    #endif</span>  +    #endif
    338       bool visible;       bool visible;
    339   };   };
    340    
    341  <span class="hl kwd">&#64;&#64; -123,60 +137,37 &#64;&#64;</span>  @@ -123,60 +137,37 @@
    342   };   };
    343    
    344   #if defined(Q_WS_X11)   #if defined(Q_WS_X11)
    345  <span class="hl kwb">-QT_BEGIN_INCLUDE_NAMESPACE</span>  -QT_BEGIN_INCLUDE_NAMESPACE
    346  <span class="hl kwb">-#include &lt;QtCore/qcoreapplication.h&gt;</span>  -#include <QtCore/qcoreapplication.h>
    347  <span class="hl kwb">-#include &lt;X11/Xlib.h&gt;</span>  -#include <X11/Xlib.h>
    348  <span class="hl kwb">-#include &lt;X11/Xatom.h&gt;</span>  -#include <X11/Xatom.h>
    349  <span class="hl kwb">-#include &lt;X11/Xutil.h&gt;</span>  -#include <X11/Xutil.h>
    350  <span class="hl kwb">-QT_END_INCLUDE_NAMESPACE</span>  -QT_END_INCLUDE_NAMESPACE
    351  <span class="hl kwa">+class QSystemTrayIconSysFactoryInterface;</span>  +class QSystemTrayIconSysFactoryInterface;
    352    
    353  <span class="hl kwb">-class QSystemTrayIconSys : public QWidget</span>  -class QSystemTrayIconSys : public QWidget
    354  <span class="hl kwa">+/**</span>  +/**
    355  <span class="hl kwa">+ * This class acts as a composite QSystemTrayIconSysFactory: It can create</span>  + * This class acts as a composite QSystemTrayIconSysFactory: It can create
    356  <span class="hl kwa">+ * instances of QAbstractSystemTrayIconSys* using either a plugin or the</span>  + * instances of QAbstractSystemTrayIconSys* using either a plugin or the
    357  <span class="hl kwa">+ * builtin factory and will cause QSystemTrayIconPrivate to recreate their</span>  + * builtin factory and will cause QSystemTrayIconPrivate to recreate their
    358  <span class="hl kwa">+ * &apos;sys&apos; instances if the plugin availability changes.</span>  + * 'sys' instances if the plugin availability changes.
    359  <span class="hl kwa">+ */</span>  + */
    360  <span class="hl kwa">+class QSystemTrayIconSysFactory : public QObject</span>  +class QSystemTrayIconSysFactory : public QObject
    361   {   {
    362  <span class="hl kwb">-    friend class QSystemTrayIconPrivate;</span>  -    friend class QSystemTrayIconPrivate;
    363  <span class="hl kwb">-</span>  -
    364  <span class="hl kwa">+    Q_OBJECT</span>  +    Q_OBJECT
    365   public:   public:
    366  <span class="hl kwb">-    QSystemTrayIconSys(QSystemTrayIcon *q);</span>  -    QSystemTrayIconSys(QSystemTrayIcon *q);
    367  <span class="hl kwb">-    ~QSystemTrayIconSys();</span>  -    ~QSystemTrayIconSys();
    368  <span class="hl kwb">-    enum {</span>  -    enum {
    369  <span class="hl kwb">-        SYSTEM_TRAY_REQUEST_DOCK = 0,</span>  -        SYSTEM_TRAY_REQUEST_DOCK = 0,
    370  <span class="hl kwb">-        SYSTEM_TRAY_BEGIN_MESSAGE = 1,</span>  -        SYSTEM_TRAY_BEGIN_MESSAGE = 1,
    371  <span class="hl kwb">-        SYSTEM_TRAY_CANCEL_MESSAGE =2</span>  -        SYSTEM_TRAY_CANCEL_MESSAGE =2
    372  <span class="hl kwb">-    };</span>  -    };
    373  <span class="hl kwb">-</span>  -
    374  <span class="hl kwb">-    void addToTray();</span>  -    void addToTray();
    375  <span class="hl kwb">-    void updateIcon();</span>  -    void updateIcon();
    376  <span class="hl kwb">-    XVisualInfo* getSysTrayVisualInfo();</span>  -    XVisualInfo* getSysTrayVisualInfo();
    377  <span class="hl kwb">-</span>  -
    378  <span class="hl kwb">-    // QObject::event is public but QWidget&apos;s ::event() re-implementation</span>  -    // QObject::event is public but QWidget's ::event() re-implementation
    379  <span class="hl kwb">-    // is protected ;(</span>  -    // is protected ;(
    380  <span class="hl kwb">-    inline bool deliverToolTipEvent(QEvent *e)</span>  -    inline bool deliverToolTipEvent(QEvent *e)
    381  <span class="hl kwb">-    { return QWidget::event(e); }</span>  -    { return QWidget::event(e); }
    382  <span class="hl kwb">-</span>  -
    383  <span class="hl kwb">-    static Window sysTrayWindow;</span>  -    static Window sysTrayWindow;
    384  <span class="hl kwb">-    static QList&lt;QSystemTrayIconSys *&gt; trayIcons;</span>  -    static QList<QSystemTrayIconSys *> trayIcons;
    385  <span class="hl kwb">-    static QCoreApplication::EventFilter oldEventFilter;</span>  -    static QCoreApplication::EventFilter oldEventFilter;
    386  <span class="hl kwb">-    static bool sysTrayTracker(void *message, long *result);</span>  -    static bool sysTrayTracker(void *message, long *result);
    387  <span class="hl kwb">-    static Window locateSystemTray();</span>  -    static Window locateSystemTray();
    388  <span class="hl kwb">-    static Atom sysTraySelection;</span>  -    static Atom sysTraySelection;
    389  <span class="hl kwb">-    static XVisualInfo sysTrayVisual;</span>  -    static XVisualInfo sysTrayVisual;
    390  <span class="hl kwa">+    QSystemTrayIconSysFactory();</span>  +    QSystemTrayIconSysFactory();
    391  <span class="hl kwa">+    void registerSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);</span>  +    void registerSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);
    392  <span class="hl kwa">+    void unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);</span>  +    void unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate *iconPrivate);
    393    
    394  <span class="hl kwb">-protected:</span>  -protected:
    395  <span class="hl kwb">-    void paintEvent(QPaintEvent *pe);</span>  -    void paintEvent(QPaintEvent *pe);
    396  <span class="hl kwb">-    void resizeEvent(QResizeEvent *re);</span>  -    void resizeEvent(QResizeEvent *re);
    397  <span class="hl kwb">-    bool x11Event(XEvent *event);</span>  -    bool x11Event(XEvent *event);
    398  <span class="hl kwb">-    void mousePressEvent(QMouseEvent *event);</span>  -    void mousePressEvent(QMouseEvent *event);
    399  <span class="hl kwb">-    void mouseDoubleClickEvent(QMouseEvent *event);</span>  -    void mouseDoubleClickEvent(QMouseEvent *event);
    400  <span class="hl kwb">-#ifndef QT_NO_WHEELEVENT</span>  -#ifndef QT_NO_WHEELEVENT
    401  <span class="hl kwb">-    void wheelEvent(QWheelEvent *event);</span>  -    void wheelEvent(QWheelEvent *event);
    402  <span class="hl kwb">-#endif</span>  -#endif
    403  <span class="hl kwb">-    bool event(QEvent *e);</span>  -    bool event(QEvent *e);
    404  <span class="hl kwa">+    QAbstractSystemTrayIconSys *create(QSystemTrayIcon *) const;</span>  +    QAbstractSystemTrayIconSys *create(QSystemTrayIcon *) const;
    405  <span class="hl kwa">+</span>  +
    406  <span class="hl kwa">+    bool isAvailable() const;</span>  +    bool isAvailable() const;
    407  <span class="hl kwa">+</span>  +
    408  <span class="hl kwa">+private Q_SLOTS:</span>  +private Q_SLOTS:
    409  <span class="hl kwa">+    void refreshTrayIconPrivates();</span>  +    void refreshTrayIconPrivates();
    410    
    411   private:   private:
    412  <span class="hl kwb">-    QPixmap background;</span>  -    QPixmap background;
    413  <span class="hl kwb">-    QSystemTrayIcon *q;</span>  -    QSystemTrayIcon *q;
    414  <span class="hl kwb">-    Colormap colormap;</span>  -    Colormap colormap;
    415  <span class="hl kwa">+    QSystemTrayIconSysFactoryInterface *factory() const;</span>  +    QSystemTrayIconSysFactoryInterface *factory() const;
    416  <span class="hl kwa">+    void loadPluginFactory();</span>  +    void loadPluginFactory();
    417  <span class="hl kwa">+</span>  +
    418  <span class="hl kwa">+    QSystemTrayIconSysFactoryInterface *pluginFactory;</span>  +    QSystemTrayIconSysFactoryInterface *pluginFactory;
    419  <span class="hl kwa">+    QSet&lt;QSystemTrayIconPrivate *&gt; trayIconPrivates;</span>  +    QSet<QSystemTrayIconPrivate *> trayIconPrivates;
    420   };   };
    421  <span class="hl kwb">-#endif // Q_WS_X11</span>  -#endif // Q_WS_X11
    422  <span class="hl kwa">+#endif</span>  +#endif
    423    
    424   QT_END_NAMESPACE   QT_END_NAMESPACE
    425    
    426  <span class="hl kwb">--- a/src/gui/util/qsystemtrayicon_x11.cpp</span>  --- a/src/gui/util/qsystemtrayicon_x11.cpp
    427  <span class="hl kwa">+++ b/src/gui/util/qsystemtrayicon_x11.cpp</span>  +++ b/src/gui/util/qsystemtrayicon_x11.cpp
    428  <span class="hl kwd">&#64;&#64; -38,311 +38,122 &#64;&#64;</span>  @@ -38,311 +38,122 @@
    429   ** $QT_END_LICENSE$   ** $QT_END_LICENSE$
    430   **   **
    431   ****************************************************************************/   ****************************************************************************/
    432  <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span>  +#ifndef QT_NO_SYSTEMTRAYICON
    433  <span class="hl kwa">+</span>  +
    434  <span class="hl kwa">+#include &lt;private/qfactoryloader_p.h&gt;</span>  +#include <private/qfactoryloader_p.h>
    435    
    436  <span class="hl kwb">-#include &quot;private/qt_x11_p.h&quot;</span>  -#include "private/qt_x11_p.h"
    437  <span class="hl kwb">-#include &quot;qlabel.h&quot;</span>  -#include "qlabel.h"
    438  <span class="hl kwb">-#include &quot;qx11info_x11.h&quot;</span>  -#include "qx11info_x11.h"
    439  <span class="hl kwb">-#include &quot;qpainter.h&quot;</span>  -#include "qpainter.h"
    440  <span class="hl kwb">-#include &quot;qpixmap.h&quot;</span>  -#include "qpixmap.h"
    441  <span class="hl kwb">-#include &quot;qbitmap.h&quot;</span>  -#include "qbitmap.h"
    442  <span class="hl kwb">-#include &quot;qevent.h&quot;</span>  -#include "qevent.h"
    443  <span class="hl kwb">-#include &quot;qapplication.h&quot;</span>  -#include "qapplication.h"
    444  <span class="hl kwb">-#include &quot;qlist.h&quot;</span>  -#include "qlist.h"
    445  <span class="hl kwb">-#include &quot;qmenu.h&quot;</span>  -#include "qmenu.h"
    446  <span class="hl kwb">-#include &quot;qtimer.h&quot;</span>  -#include "qtimer.h"
    447   #include &quot;qsystemtrayicon_p.h&quot;   #include "qsystemtrayicon_p.h"
    448  <span class="hl kwb">-#include &quot;qpaintengine.h&quot;</span>  -#include "qpaintengine.h"
    449  <span class="hl kwa">+#include &quot;qabstractsystemtrayiconsys_p.h&quot;</span>  +#include "qabstractsystemtrayiconsys_p.h"
    450  <span class="hl kwa">+#include &quot;qcoreapplication.h&quot;</span>  +#include "qcoreapplication.h"
    451  <span class="hl kwa">+#include &quot;qxembedsystemtrayicon_x11_p.h&quot;</span>  +#include "qxembedsystemtrayicon_x11_p.h"
    452    
    453  <span class="hl kwb">-#ifndef QT_NO_SYSTEMTRAYICON</span>  -#ifndef QT_NO_SYSTEMTRAYICON
    454   QT_BEGIN_NAMESPACE   QT_BEGIN_NAMESPACE
    455    
    456  <span class="hl kwb">-Window QSystemTrayIconSys::sysTrayWindow = XNone;</span>  -Window QSystemTrayIconSys::sysTrayWindow = XNone;
    457  <span class="hl kwb">-QList&lt;QSystemTrayIconSys *&gt; QSystemTrayIconSys::trayIcons;</span>  -QList<QSystemTrayIconSys *> QSystemTrayIconSys::trayIcons;
    458  <span class="hl kwb">-QCoreApplication::EventFilter QSystemTrayIconSys::oldEventFilter = 0;</span>  -QCoreApplication::EventFilter QSystemTrayIconSys::oldEventFilter = 0;
    459  <span class="hl kwb">-Atom QSystemTrayIconSys::sysTraySelection = XNone;</span>  -Atom QSystemTrayIconSys::sysTraySelection = XNone;
    460  <span class="hl kwb">-XVisualInfo QSystemTrayIconSys::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};</span>  -XVisualInfo QSystemTrayIconSys::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
    461  <span class="hl kwb">-</span>  -
    462  <span class="hl kwb">-// Locate the system tray</span>  -// Locate the system tray
    463  <span class="hl kwb">-Window QSystemTrayIconSys::locateSystemTray()</span>  -Window QSystemTrayIconSys::locateSystemTray()
    464  <span class="hl kwb">-{</span>  -{
    465  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    466  <span class="hl kwb">-    if (sysTraySelection == XNone) {</span>  -    if (sysTraySelection == XNone) {
    467  <span class="hl kwb">-        int screen = QX11Info::appScreen();</span>  -        int screen = QX11Info::appScreen();
    468  <span class="hl kwb">-        QString net_sys_tray = QString::fromLatin1(&quot;_NET_SYSTEM_TRAY_S%1&quot;).arg(screen);</span>  -        QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);
    469  <span class="hl kwb">-        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);</span>  -        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);
    470  <span class="hl kwb">-    }</span>  -    }
    471  <span class="hl kwb">-</span>  -
    472  <span class="hl kwb">-    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);</span>  -    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);
    473  <span class="hl kwb">-}</span>  -}
    474  <span class="hl kwa">+Q_GLOBAL_STATIC(QSystemTrayIconSysFactory, qt_guiSystemTrayIconSysFactory)</span>  +Q_GLOBAL_STATIC(QSystemTrayIconSysFactory, qt_guiSystemTrayIconSysFactory)
    475    
    476  <span class="hl kwb">-XVisualInfo* QSystemTrayIconSys::getSysTrayVisualInfo()</span>  -XVisualInfo* QSystemTrayIconSys::getSysTrayVisualInfo()
    477  <span class="hl kwa">+QSystemTrayIconSysFactory::QSystemTrayIconSysFactory()</span>  +QSystemTrayIconSysFactory::QSystemTrayIconSysFactory()
    478  <span class="hl kwa">+: pluginFactory(0)</span>  +: pluginFactory(0)
    479   {   {
    480  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    481  <span class="hl kwb">-</span>  -
    482  <span class="hl kwb">-    if (!sysTrayVisual.visual) {</span>  -    if (!sysTrayVisual.visual) {
    483  <span class="hl kwb">-        Window win = locateSystemTray();</span>  -        Window win = locateSystemTray();
    484  <span class="hl kwb">-        if (win != XNone) {</span>  -        if (win != XNone) {
    485  <span class="hl kwb">-            Atom actual_type;</span>  -            Atom actual_type;
    486  <span class="hl kwb">-            int actual_format;</span>  -            int actual_format;
    487  <span class="hl kwb">-            ulong nitems, bytes_remaining;</span>  -            ulong nitems, bytes_remaining;
    488  <span class="hl kwb">-            uchar *data = 0;</span>  -            uchar *data = 0;
    489  <span class="hl kwb">-            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,</span>  -            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,
    490  <span class="hl kwb">-                                            False, XA_VISUALID, &amp;actual_type,</span>  -                                            False, XA_VISUALID, &actual_type,
    491  <span class="hl kwb">-                                            &amp;actual_format, &amp;nitems, &amp;bytes_remaining, &amp;data);</span>  -                                            &actual_format, &nitems, &bytes_remaining, &data);
    492  <span class="hl kwb">-            VisualID vid = 0;</span>  -            VisualID vid = 0;
    493  <span class="hl kwb">-            if (result == Success &amp;&amp; data &amp;&amp; actual_type == XA_VISUALID &amp;&amp; actual_format == 32 &amp;&amp;</span>  -            if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&
    494  <span class="hl kwb">-                nitems == 1 &amp;&amp; bytes_remaining == 0)</span>  -                nitems == 1 && bytes_remaining == 0)
    495  <span class="hl kwb">-                vid = *(VisualID*)data;</span>  -                vid = *(VisualID*)data;
    496  <span class="hl kwb">-            if (data)</span>  -            if (data)
    497  <span class="hl kwb">-                XFree(data);</span>  -                XFree(data);
    498  <span class="hl kwb">-            if (vid == 0)</span>  -            if (vid == 0)
    499  <span class="hl kwb">-                return 0;</span>  -                return 0;
    500  <span class="hl kwb">-</span>  -
    501  <span class="hl kwb">-            uint mask = VisualIDMask;</span>  -            uint mask = VisualIDMask;
    502  <span class="hl kwb">-            XVisualInfo *vi, rvi;</span>  -            XVisualInfo *vi, rvi;
    503  <span class="hl kwb">-            int count;</span>  -            int count;
    504  <span class="hl kwb">-            rvi.visualid = vid;</span>  -            rvi.visualid = vid;
    505  <span class="hl kwb">-            vi = XGetVisualInfo(display, mask, &amp;rvi, &amp;count);</span>  -            vi = XGetVisualInfo(display, mask, &rvi, &count);
    506  <span class="hl kwb">-            if (vi) {</span>  -            if (vi) {
    507  <span class="hl kwb">-                sysTrayVisual = vi[0];</span>  -                sysTrayVisual = vi[0];
    508  <span class="hl kwb">-                XFree((char*)vi);</span>  -                XFree((char*)vi);
    509  <span class="hl kwb">-            }</span>  -            }
    510  <span class="hl kwb">-            if (sysTrayVisual.depth != 32)</span>  -            if (sysTrayVisual.depth != 32)
    511  <span class="hl kwb">-                memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  -                memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    512  <span class="hl kwb">-        }</span>  -        }
    513  <span class="hl kwb">-    }</span>  -    }
    514  <span class="hl kwb">-</span>  -
    515  <span class="hl kwb">-    return sysTrayVisual.visual ? &amp;sysTrayVisual : 0;</span>  -    return sysTrayVisual.visual ? &sysTrayVisual : 0;
    516   }   }
    517    
    518  <span class="hl kwb">-bool QSystemTrayIconSys::sysTrayTracker(void *message, long *result)</span>  -bool QSystemTrayIconSys::sysTrayTracker(void *message, long *result)
    519  <span class="hl kwa">+void QSystemTrayIconSysFactory::loadPluginFactory()</span>  +void QSystemTrayIconSysFactory::loadPluginFactory()
    520   {   {
    521  <span class="hl kwb">-    bool retval = false;</span>  -    bool retval = false;
    522  <span class="hl kwb">-    if (QSystemTrayIconSys::oldEventFilter)</span>  -    if (QSystemTrayIconSys::oldEventFilter)
    523  <span class="hl kwb">-        retval = QSystemTrayIconSys::oldEventFilter(message, result);</span>  -        retval = QSystemTrayIconSys::oldEventFilter(message, result);
    524  <span class="hl kwb">-</span>  -
    525  <span class="hl kwb">-    if (trayIcons.isEmpty())</span>  -    if (trayIcons.isEmpty())
    526  <span class="hl kwb">-        return retval;</span>  -        return retval;
    527  <span class="hl kwb">-</span>  -
    528  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    529  <span class="hl kwb">-    XEvent *ev = (XEvent *)message;</span>  -    XEvent *ev = (XEvent *)message;
    530  <span class="hl kwb">-    if  (ev-&gt;type == DestroyNotify &amp;&amp; ev-&gt;xany.window == sysTrayWindow) {</span>  -    if  (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {
    531  <span class="hl kwb">- sysTrayWindow = locateSystemTray();</span>  - sysTrayWindow = locateSystemTray();
    532  <span class="hl kwb">-        memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  -        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    533  <span class="hl kwb">-        for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  -        for (int i = 0; i < trayIcons.count(); i++) {
    534  <span class="hl kwb">-            if (sysTrayWindow == XNone) {</span>  -            if (sysTrayWindow == XNone) {
    535  <span class="hl kwb">-        QBalloonTip::hideBalloon();</span>  -        QBalloonTip::hideBalloon();
    536  <span class="hl kwb">-                trayIcons[i]-&gt;hide(); // still no luck</span>  -                trayIcons[i]->hide(); // still no luck
    537  <span class="hl kwb">-                trayIcons[i]-&gt;destroy();</span>  -                trayIcons[i]->destroy();
    538  <span class="hl kwb">-                trayIcons[i]-&gt;create();</span>  -                trayIcons[i]->create();
    539  <span class="hl kwb">-    } else</span>  -    } else
    540  <span class="hl kwb">-                trayIcons[i]-&gt;addToTray(); // add it to the new tray</span>  -                trayIcons[i]->addToTray(); // add it to the new tray
    541  <span class="hl kwb">-        }</span>  -        }
    542  <span class="hl kwb">-        retval = true;</span>  -        retval = true;
    543  <span class="hl kwb">-    } else if (ev-&gt;type == ClientMessage &amp;&amp; sysTrayWindow == XNone) {</span>  -    } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {
    544  <span class="hl kwb">-        static Atom manager_atom = XInternAtom(display, &quot;MANAGER&quot;, False);</span>  -        static Atom manager_atom = XInternAtom(display, "MANAGER", False);
    545  <span class="hl kwb">-        XClientMessageEvent *cm = (XClientMessageEvent *)message;</span>  -        XClientMessageEvent *cm = (XClientMessageEvent *)message;
    546  <span class="hl kwb">-        if ((cm-&gt;message_type == manager_atom) &amp;&amp; ((Atom)cm-&gt;data.l[1] == sysTraySelection)) {</span>  -        if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {
    547  <span class="hl kwb">-    sysTrayWindow = cm-&gt;data.l[2];</span>  -    sysTrayWindow = cm->data.l[2];
    548  <span class="hl kwb">-            memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  -            memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    549  <span class="hl kwb">-    XSelectInput(display, sysTrayWindow, StructureNotifyMask);</span>  -    XSelectInput(display, sysTrayWindow, StructureNotifyMask);
    550  <span class="hl kwb">-            for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  -            for (int i = 0; i < trayIcons.count(); i++) {
    551  <span class="hl kwb">-                trayIcons[i]-&gt;addToTray();</span>  -                trayIcons[i]->addToTray();
    552  <span class="hl kwb">-            }</span>  -            }
    553  <span class="hl kwb">-            retval = true;</span>  -            retval = true;
    554  <span class="hl kwb">-        }</span>  -        }
    555  <span class="hl kwb">-    } else if (ev-&gt;type == PropertyNotify &amp;&amp; ev-&gt;xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &amp;&amp;</span>  -    } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&
    556  <span class="hl kwb">-               ev-&gt;xproperty.window == sysTrayWindow) {</span>  -               ev->xproperty.window == sysTrayWindow) {
    557  <span class="hl kwb">-        memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  -        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    558  <span class="hl kwb">-        for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  -        for (int i = 0; i < trayIcons.count(); i++) {
    559  <span class="hl kwb">-            trayIcons[i]-&gt;addToTray();</span>  -            trayIcons[i]->addToTray();
    560  <span class="hl kwb">-        }</span>  -        }
    561  <span class="hl kwb">-    }</span>  -    }
    562  <span class="hl kwb">-</span>  -
    563  <span class="hl kwb">-    return retval;</span>  -    return retval;
    564  <span class="hl kwb">-}</span>  -}
    565  <span class="hl kwb">-</span>  -
    566  <span class="hl kwb">-QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *q)</span>  -QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *q)
    567  <span class="hl kwb">-    : QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint),</span>  -    : QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint),
    568  <span class="hl kwb">-      q(q), colormap(0)</span>  -      q(q), colormap(0)
    569  <span class="hl kwb">-{</span>  -{
    570  <span class="hl kwb">-    setAttribute(Qt::WA_AlwaysShowToolTips);</span>  -    setAttribute(Qt::WA_AlwaysShowToolTips);
    571  <span class="hl kwb">-    setAttribute(Qt::WA_QuitOnClose, false);</span>  -    setAttribute(Qt::WA_QuitOnClose, false);
    572  <span class="hl kwb">-    setAttribute(Qt::WA_NoSystemBackground, true);</span>  -    setAttribute(Qt::WA_NoSystemBackground, true);
    573  <span class="hl kwb">-    setAttribute(Qt::WA_PaintOnScreen);</span>  -    setAttribute(Qt::WA_PaintOnScreen);
    574  <span class="hl kwb">-</span>  -
    575  <span class="hl kwb">-    static bool eventFilterAdded = false;</span>  -    static bool eventFilterAdded = false;
    576  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    577  <span class="hl kwb">-    if (!eventFilterAdded) {</span>  -    if (!eventFilterAdded) {
    578  <span class="hl kwb">-        oldEventFilter = qApp-&gt;setEventFilter(sysTrayTracker);</span>  -        oldEventFilter = qApp->setEventFilter(sysTrayTracker);
    579  <span class="hl kwb">- eventFilterAdded = true;</span>  - eventFilterAdded = true;
    580  <span class="hl kwb">- Window root = QX11Info::appRootWindow();</span>  - Window root = QX11Info::appRootWindow();
    581  <span class="hl kwb">-        XWindowAttributes attr;</span>  -        XWindowAttributes attr;
    582  <span class="hl kwb">-        XGetWindowAttributes(display, root, &amp;attr);</span>  -        XGetWindowAttributes(display, root, &attr);
    583  <span class="hl kwb">-        if ((attr.your_event_mask &amp; StructureNotifyMask) != StructureNotifyMask) {</span>  -        if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
    584  <span class="hl kwb">-            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden</span>  -            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden
    585  <span class="hl kwb">-            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection</span>  -            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
    586  <span class="hl kwb">-        }</span>  -        }
    587  <span class="hl kwa">+    if (pluginFactory) {</span>  +    if (pluginFactory) {
    588  <span class="hl kwa">+        return;</span>  +        return;
    589       }       }
    590  <span class="hl kwb">-    if (trayIcons.isEmpty()) {</span>  -    if (trayIcons.isEmpty()) {
    591  <span class="hl kwb">-        sysTrayWindow = locateSystemTray();</span>  -        sysTrayWindow = locateSystemTray();
    592  <span class="hl kwb">- if (sysTrayWindow != XNone)</span>  - if (sysTrayWindow != XNone)
    593  <span class="hl kwb">-    XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events</span>  -    XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events
    594  <span class="hl kwa">+#ifndef QT_NO_LIBRARY</span>  +#ifndef QT_NO_LIBRARY
    595  <span class="hl kwa">+    QFactoryLoader loader(QSystemTrayIconSysFactoryInterface_iid, QLatin1String(&quot;/systemtrayicon&quot;));</span>  +    QFactoryLoader loader(QSystemTrayIconSysFactoryInterface_iid, QLatin1String("/systemtrayicon"));
    596  <span class="hl kwa">+    pluginFactory = qobject_cast&lt;QSystemTrayIconSysFactoryInterface *&gt;(loader.instance(QLatin1String(&quot;default&quot;)));</span>  +    pluginFactory = qobject_cast<QSystemTrayIconSysFactoryInterface *>(loader.instance(QLatin1String("default")));
    597  <span class="hl kwa">+    if (pluginFactory) {</span>  +    if (pluginFactory) {
    598  <span class="hl kwa">+        // Set parent to ensure factory destructor is called when application</span>  +        // Set parent to ensure factory destructor is called when application
    599  <span class="hl kwa">+        // is closed</span>  +        // is closed
    600  <span class="hl kwa">+        pluginFactory-&gt;setParent(QCoreApplication::instance());</span>  +        pluginFactory->setParent(QCoreApplication::instance());
    601  <span class="hl kwa">+        connect(pluginFactory, SIGNAL(availableChanged(bool)), SLOT(refreshTrayIconPrivates()));</span>  +        connect(pluginFactory, SIGNAL(availableChanged(bool)), SLOT(refreshTrayIconPrivates()));
    602       }       }
    603  <span class="hl kwb">-    trayIcons.append(this);</span>  -    trayIcons.append(this);
    604  <span class="hl kwb">-    setMouseTracking(true);</span>  -    setMouseTracking(true);
    605  <span class="hl kwb">-#ifndef QT_NO_TOOLTIP</span>  -#ifndef QT_NO_TOOLTIP
    606  <span class="hl kwb">-    setToolTip(q-&gt;toolTip());</span>  -    setToolTip(q->toolTip());
    607  <span class="hl kwb">-#endif</span>  -#endif
    608  <span class="hl kwb">-    if (sysTrayWindow != XNone)</span>  -    if (sysTrayWindow != XNone)
    609  <span class="hl kwb">-        addToTray();</span>  -        addToTray();
    610  <span class="hl kwa">+#endif // QT_NO_LIBRARY</span>  +#endif // QT_NO_LIBRARY
    611   }   }
    612    
    613  <span class="hl kwb">-QSystemTrayIconSys::~QSystemTrayIconSys()</span>  -QSystemTrayIconSys::~QSystemTrayIconSys()
    614  <span class="hl kwa">+QSystemTrayIconSysFactoryInterface *QSystemTrayIconSysFactory::factory() const</span>  +QSystemTrayIconSysFactoryInterface *QSystemTrayIconSysFactory::factory() const
    615   {   {
    616  <span class="hl kwb">-    trayIcons.removeAt(trayIcons.indexOf(this));</span>  -    trayIcons.removeAt(trayIcons.indexOf(this));
    617  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    618  <span class="hl kwb">-    if (trayIcons.isEmpty()) {</span>  -    if (trayIcons.isEmpty()) {
    619  <span class="hl kwb">-        if (sysTrayWindow == XNone)</span>  -        if (sysTrayWindow == XNone)
    620  <span class="hl kwb">-            return;</span>  -            return;
    621  <span class="hl kwb">-        if (display)</span>  -        if (display)
    622  <span class="hl kwb">-            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray</span>  -            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray
    623  <span class="hl kwb">-        sysTrayWindow = XNone;</span>  -        sysTrayWindow = XNone;
    624  <span class="hl kwa">+    if (!pluginFactory) {</span>  +    if (!pluginFactory) {
    625  <span class="hl kwa">+        const_cast&lt;QSystemTrayIconSysFactory*&gt;(this)-&gt;loadPluginFactory();</span>  +        const_cast<QSystemTrayIconSysFactory*>(this)->loadPluginFactory();
    626       }       }
    627  <span class="hl kwb">-    if (colormap)</span>  -    if (colormap)
    628  <span class="hl kwb">-        XFreeColormap(display, colormap);</span>  -        XFreeColormap(display, colormap);
    629  <span class="hl kwa">+    if (pluginFactory &amp;&amp; pluginFactory-&gt;isAvailable()) {</span>  +    if (pluginFactory && pluginFactory->isAvailable()) {
    630  <span class="hl kwa">+        return pluginFactory;</span>  +        return pluginFactory;
    631  <span class="hl kwa">+    }</span>  +    }
    632  <span class="hl kwa">+    static QXEmbedSystemTrayIconSysFactory def;</span>  +    static QXEmbedSystemTrayIconSysFactory def;
    633  <span class="hl kwa">+    return def.isAvailable() ? &amp;def : 0;</span>  +    return def.isAvailable() ? &def : 0;
    634   }   }
    635    
    636  <span class="hl kwb">-void QSystemTrayIconSys::addToTray()</span>  -void QSystemTrayIconSys::addToTray()
    637  <span class="hl kwa">+void QSystemTrayIconSysFactory::refreshTrayIconPrivates()</span>  +void QSystemTrayIconSysFactory::refreshTrayIconPrivates()
    638   {   {
    639  <span class="hl kwb">-    Q_ASSERT(sysTrayWindow != XNone);</span>  -    Q_ASSERT(sysTrayWindow != XNone);
    640  <span class="hl kwb">-    Display *display = QX11Info::display();</span>  -    Display *display = QX11Info::display();
    641  <span class="hl kwb">-</span>  -
    642  <span class="hl kwb">-    XVisualInfo *vi = getSysTrayVisualInfo();</span>  -    XVisualInfo *vi = getSysTrayVisualInfo();
    643  <span class="hl kwb">-    if (vi &amp;&amp; vi-&gt;visual) {</span>  -    if (vi && vi->visual) {
    644  <span class="hl kwb">-        Window root = RootWindow(display, vi-&gt;screen);</span>  -        Window root = RootWindow(display, vi->screen);
    645  <span class="hl kwb">-        Window p = root;</span>  -        Window p = root;
    646  <span class="hl kwb">-        if (QWidget *pw = parentWidget())</span>  -        if (QWidget *pw = parentWidget())
    647  <span class="hl kwb">-            p = pw-&gt;effectiveWinId();</span>  -            p = pw->effectiveWinId();
    648  <span class="hl kwb">-        colormap = XCreateColormap(display, root, vi-&gt;visual, AllocNone);</span>  -        colormap = XCreateColormap(display, root, vi->visual, AllocNone);
    649  <span class="hl kwb">-        XSetWindowAttributes wsa;</span>  -        XSetWindowAttributes wsa;
    650  <span class="hl kwb">-        wsa.background_pixmap = 0;</span>  -        wsa.background_pixmap = 0;
    651  <span class="hl kwb">-        wsa.colormap = colormap;</span>  -        wsa.colormap = colormap;
    652  <span class="hl kwb">-        wsa.background_pixel = 0;</span>  -        wsa.background_pixel = 0;
    653  <span class="hl kwb">-        wsa.border_pixel = 0;</span>  -        wsa.border_pixel = 0;
    654  <span class="hl kwb">-        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,</span>  -        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,
    655  <span class="hl kwb">-                                   0, vi-&gt;depth, InputOutput, vi-&gt;visual,</span>  -                                   0, vi->depth, InputOutput, vi->visual,
    656  <span class="hl kwb">-                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &amp;wsa);</span>  -                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);
    657  <span class="hl kwb">-        create(wid);</span>  -        create(wid);
    658  <span class="hl kwb">-    } else {</span>  -    } else {
    659  <span class="hl kwb">-        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);</span>  -        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);
    660  <span class="hl kwb">-    }</span>  -    }
    661  <span class="hl kwb">-</span>  -
    662  <span class="hl kwb">-    // GNOME, NET WM Specification</span>  -    // GNOME, NET WM Specification
    663  <span class="hl kwb">-    static Atom netwm_tray_atom = XInternAtom(display, &quot;_NET_SYSTEM_TRAY_OPCODE&quot;, False);</span>  -    static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);
    664  <span class="hl kwb">-    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast&lt;long&gt;(winId()), 0, 0 };</span>  -    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };
    665  <span class="hl kwb">-    XEvent ev;</span>  -    XEvent ev;
    666  <span class="hl kwb">-    memset(&amp;ev, 0, sizeof(ev));</span>  -    memset(&ev, 0, sizeof(ev));
    667  <span class="hl kwb">-    ev.xclient.type = ClientMessage;</span>  -    ev.xclient.type = ClientMessage;
    668  <span class="hl kwb">-    ev.xclient.window = sysTrayWindow;</span>  -    ev.xclient.window = sysTrayWindow;
    669  <span class="hl kwb">-    ev.xclient.message_type = netwm_tray_atom;</span>  -    ev.xclient.message_type = netwm_tray_atom;
    670  <span class="hl kwb">-    ev.xclient.format = 32;</span>  -    ev.xclient.format = 32;
    671  <span class="hl kwb">-    memcpy((char *)&amp;ev.xclient.data, (const char *) l, sizeof(l));</span>  -    memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));
    672  <span class="hl kwb">-    XSendEvent(display, sysTrayWindow, False, 0, &amp;ev);</span>  -    XSendEvent(display, sysTrayWindow, False, 0, &ev);
    673  <span class="hl kwb">-    setMinimumSize(22, 22); // required at least on GNOME</span>  -    setMinimumSize(22, 22); // required at least on GNOME
    674  <span class="hl kwb">-}</span>  -}
    675  <span class="hl kwb">-</span>  -
    676  <span class="hl kwb">-void QSystemTrayIconSys::updateIcon()</span>  -void QSystemTrayIconSys::updateIcon()
    677  <span class="hl kwb">-{</span>  -{
    678  <span class="hl kwb">-    update();</span>  -    update();
    679  <span class="hl kwb">-}</span>  -}
    680  <span class="hl kwb">-</span>  -
    681  <span class="hl kwb">-void QSystemTrayIconSys::resizeEvent(QResizeEvent *re)</span>  -void QSystemTrayIconSys::resizeEvent(QResizeEvent *re)
    682  <span class="hl kwb">-{</span>  -{
    683  <span class="hl kwb">-     QWidget::resizeEvent(re);</span>  -     QWidget::resizeEvent(re);
    684  <span class="hl kwb">-     updateIcon();</span>  -     updateIcon();
    685  <span class="hl kwb">-}</span>  -}
    686  <span class="hl kwb">-</span>  -
    687  <span class="hl kwb">-void QSystemTrayIconSys::paintEvent(QPaintEvent*)</span>  -void QSystemTrayIconSys::paintEvent(QPaintEvent*)
    688  <span class="hl kwb">-{</span>  -{
    689  <span class="hl kwb">-    QPainter p(this);</span>  -    QPainter p(this);
    690  <span class="hl kwb">-    if (!getSysTrayVisualInfo()) {</span>  -    if (!getSysTrayVisualInfo()) {
    691  <span class="hl kwb">-        const QRegion oldSystemClip = p.paintEngine()-&gt;systemClip();</span>  -        const QRegion oldSystemClip = p.paintEngine()->systemClip();
    692  <span class="hl kwb">-        const QRect clearedRect = oldSystemClip.boundingRect();</span>  -        const QRect clearedRect = oldSystemClip.boundingRect();
    693  <span class="hl kwb">-        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),</span>  -        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),
    694  <span class="hl kwb">-                   clearedRect.width(), clearedRect.height(), False);</span>  -                   clearedRect.width(), clearedRect.height(), False);
    695  <span class="hl kwb">-        QPaintEngine *pe = p.paintEngine();</span>  -        QPaintEngine *pe = p.paintEngine();
    696  <span class="hl kwb">-        pe-&gt;setSystemClip(clearedRect);</span>  -        pe->setSystemClip(clearedRect);
    697  <span class="hl kwb">-        q-&gt;icon().paint(&amp;p, rect());</span>  -        q->icon().paint(&p, rect());
    698  <span class="hl kwb">-        pe-&gt;setSystemClip(oldSystemClip);</span>  -        pe->setSystemClip(oldSystemClip);
    699  <span class="hl kwb">-    } else {</span>  -    } else {
    700  <span class="hl kwb">-        p.setCompositionMode(QPainter::CompositionMode_Source);</span>  -        p.setCompositionMode(QPainter::CompositionMode_Source);
    701  <span class="hl kwb">-        p.fillRect(rect(), Qt::transparent);</span>  -        p.fillRect(rect(), Qt::transparent);
    702  <span class="hl kwb">-        p.setCompositionMode(QPainter::CompositionMode_SourceOver);</span>  -        p.setCompositionMode(QPainter::CompositionMode_SourceOver);
    703  <span class="hl kwb">-        q-&gt;icon().paint(&amp;p, rect());</span>  -        q->icon().paint(&p, rect());
    704  <span class="hl kwa">+    Q_FOREACH(QSystemTrayIconPrivate *trayIconPrivate, trayIconPrivates) {</span>  +    Q_FOREACH(QSystemTrayIconPrivate *trayIconPrivate, trayIconPrivates) {
    705  <span class="hl kwa">+        if (trayIconPrivate-&gt;sys) {</span>  +        if (trayIconPrivate->sys) {
    706  <span class="hl kwa">+            delete trayIconPrivate-&gt;sys;</span>  +            delete trayIconPrivate->sys;
    707  <span class="hl kwa">+            trayIconPrivate-&gt;sys = 0;</span>  +            trayIconPrivate->sys = 0;
    708  <span class="hl kwa">+        }</span>  +        }
    709  <span class="hl kwa">+        // When visible is true, sys is usually not 0 but it can be 0 if the</span>  +        // When visible is true, sys is usually not 0 but it can be 0 if the
    710  <span class="hl kwa">+        // call to install_sys() failed.</span>  +        // call to install_sys() failed.
    711  <span class="hl kwa">+        if (trayIconPrivate-&gt;visible) {</span>  +        if (trayIconPrivate->visible) {
    712  <span class="hl kwa">+            trayIconPrivate-&gt;install_sys();</span>  +            trayIconPrivate->install_sys();
    713  <span class="hl kwa">+        }</span>  +        }
    714       }       }
    715   }   }
    716    
    717  <span class="hl kwb">-void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)</span>  -void QSystemTrayIconSys::mousePressEvent(QMouseEvent *ev)
    718  <span class="hl kwa">+void QSystemTrayIconSysFactory::registerSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)</span>  +void QSystemTrayIconSysFactory::registerSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)
    719   {   {
    720  <span class="hl kwb">-    QPoint globalPos = ev-&gt;globalPos();</span>  -    QPoint globalPos = ev->globalPos();
    721  <span class="hl kwb">-    if (ev-&gt;button() == Qt::RightButton &amp;&amp; q-&gt;contextMenu())</span>  -    if (ev->button() == Qt::RightButton && q->contextMenu())
    722  <span class="hl kwb">-        q-&gt;contextMenu()-&gt;popup(globalPos);</span>  -        q->contextMenu()->popup(globalPos);
    723  <span class="hl kwb">-</span>  -
    724  <span class="hl kwb">-    if (QBalloonTip::isBalloonVisible()) {</span>  -    if (QBalloonTip::isBalloonVisible()) {
    725  <span class="hl kwb">-        emit q-&gt;messageClicked();</span>  -        emit q->messageClicked();
    726  <span class="hl kwb">-        QBalloonTip::hideBalloon();</span>  -        QBalloonTip::hideBalloon();
    727  <span class="hl kwb">-    }</span>  -    }
    728  <span class="hl kwb">-</span>  -
    729  <span class="hl kwb">-    if (ev-&gt;button() == Qt::LeftButton)</span>  -    if (ev->button() == Qt::LeftButton)
    730  <span class="hl kwb">-        emit q-&gt;activated(QSystemTrayIcon::Trigger);</span>  -        emit q->activated(QSystemTrayIcon::Trigger);
    731  <span class="hl kwb">-    else if (ev-&gt;button() == Qt::RightButton)</span>  -    else if (ev->button() == Qt::RightButton)
    732  <span class="hl kwb">-        emit q-&gt;activated(QSystemTrayIcon::Context);</span>  -        emit q->activated(QSystemTrayIcon::Context);
    733  <span class="hl kwb">-    else if (ev-&gt;button() == Qt::MidButton)</span>  -    else if (ev->button() == Qt::MidButton)
    734  <span class="hl kwb">-        emit q-&gt;activated(QSystemTrayIcon::MiddleClick);</span>  -        emit q->activated(QSystemTrayIcon::MiddleClick);
    735  <span class="hl kwa">+    trayIconPrivates.insert(trayIconPrivate);</span>  +    trayIconPrivates.insert(trayIconPrivate);
    736   }   }
    737    
    738  <span class="hl kwb">-void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev)</span>  -void QSystemTrayIconSys::mouseDoubleClickEvent(QMouseEvent *ev)
    739  <span class="hl kwa">+void QSystemTrayIconSysFactory::unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)</span>  +void QSystemTrayIconSysFactory::unregisterSystemTrayIconPrivate(QSystemTrayIconPrivate* trayIconPrivate)
    740   {   {
    741  <span class="hl kwb">-    if (ev-&gt;button() == Qt::LeftButton)</span>  -    if (ev->button() == Qt::LeftButton)
    742  <span class="hl kwb">-        emit q-&gt;activated(QSystemTrayIcon::DoubleClick);</span>  -        emit q->activated(QSystemTrayIcon::DoubleClick);
    743  <span class="hl kwa">+    trayIconPrivates.remove(trayIconPrivate);</span>  +    trayIconPrivates.remove(trayIconPrivate);
    744   }   }
    745    
    746  <span class="hl kwb">-#ifndef QT_NO_WHEELEVENT</span>  -#ifndef QT_NO_WHEELEVENT
    747  <span class="hl kwb">-void QSystemTrayIconSys::wheelEvent(QWheelEvent *e)</span>  -void QSystemTrayIconSys::wheelEvent(QWheelEvent *e)
    748  <span class="hl kwa">+QAbstractSystemTrayIconSys *QSystemTrayIconSysFactory::create(QSystemTrayIcon *trayIcon) const</span>  +QAbstractSystemTrayIconSys *QSystemTrayIconSysFactory::create(QSystemTrayIcon *trayIcon) const
    749   {   {
    750  <span class="hl kwb">-    QApplication::sendEvent(q, e);</span>  -    QApplication::sendEvent(q, e);
    751  <span class="hl kwa">+    QSystemTrayIconSysFactoryInterface *f = factory();</span>  +    QSystemTrayIconSysFactoryInterface *f = factory();
    752  <span class="hl kwa">+    if (!f) {</span>  +    if (!f) {
    753  <span class="hl kwa">+        qWarning(&quot;No systemtrayicon available&quot;);</span>  +        qWarning("No systemtrayicon available");
    754  <span class="hl kwa">+        return 0;</span>  +        return 0;
    755  <span class="hl kwa">+    }</span>  +    }
    756  <span class="hl kwa">+    return f-&gt;create(trayIcon);</span>  +    return f->create(trayIcon);
    757   }   }
    758  <span class="hl kwb">-#endif</span>  -#endif
    759    
    760  <span class="hl kwb">-bool QSystemTrayIconSys::event(QEvent *e)</span>  -bool QSystemTrayIconSys::event(QEvent *e)
    761  <span class="hl kwa">+bool QSystemTrayIconSysFactory::isAvailable() const</span>  +bool QSystemTrayIconSysFactory::isAvailable() const
    762   {   {
    763  <span class="hl kwb">-    if (e-&gt;type() == QEvent::ToolTip) {</span>  -    if (e->type() == QEvent::ToolTip) {
    764  <span class="hl kwb">-        return QApplication::sendEvent(q, e);</span>  -        return QApplication::sendEvent(q, e);
    765  <span class="hl kwb">-    }</span>  -    }
    766  <span class="hl kwb">-    return QWidget::event(e);</span>  -    return QWidget::event(e);
    767  <span class="hl kwa">+    return factory();</span>  +    return factory();
    768   }   }
    769    
    770  <span class="hl kwb">-bool QSystemTrayIconSys::x11Event(XEvent *event)</span>  -bool QSystemTrayIconSys::x11Event(XEvent *event)
    771  <span class="hl kwa">+////////////////////////////////////////////////</span>  +////////////////////////////////////////////////
    772  <span class="hl kwa">+QSystemTrayIconPrivate::~QSystemTrayIconPrivate()</span>  +QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
    773   {   {
    774  <span class="hl kwb">-    if (event-&gt;type == ReparentNotify)</span>  -    if (event->type == ReparentNotify)
    775  <span class="hl kwb">-        show();</span>  -        show();
    776  <span class="hl kwb">-    return QWidget::x11Event(event);</span>  -    return QWidget::x11Event(event);
    777  <span class="hl kwa">+    qt_guiSystemTrayIconSysFactory()-&gt;unregisterSystemTrayIconPrivate(this);</span>  +    qt_guiSystemTrayIconSysFactory()->unregisterSystemTrayIconPrivate(this);
    778  <span class="hl kwa">+    delete sys;</span>  +    delete sys;
    779   }   }
    780    
    781  <span class="hl kwb">-////////////////////////////////////////////////////////////////////////////</span>  -////////////////////////////////////////////////////////////////////////////
    782   void QSystemTrayIconPrivate::install_sys()   void QSystemTrayIconPrivate::install_sys()
    783   {   {
    784       Q_Q(QSystemTrayIcon);       Q_Q(QSystemTrayIcon);
    785  <span class="hl kwb">-    if (!sys)</span>  -    if (!sys)
    786  <span class="hl kwb">-        sys = new QSystemTrayIconSys(q);</span>  -        sys = new QSystemTrayIconSys(q);
    787  <span class="hl kwa">+    if (!sys) {</span>  +    if (!sys) {
    788  <span class="hl kwa">+        // Register ourself even if create() fails: our &quot;sys&quot; will get created</span>  +        // Register ourself even if create() fails: our "sys" will get created
    789  <span class="hl kwa">+        // later by refreshTrayIconPrivates() if a systemtray becomes</span>  +        // later by refreshTrayIconPrivates() if a systemtray becomes
    790  <span class="hl kwa">+        // available. This situation can happen for applications which are</span>  +        // available. This situation can happen for applications which are
    791  <span class="hl kwa">+        // started at login time, while the desktop itself is starting up.</span>  +        // started at login time, while the desktop itself is starting up.
    792  <span class="hl kwa">+        qt_guiSystemTrayIconSysFactory()-&gt;registerSystemTrayIconPrivate(this);</span>  +        qt_guiSystemTrayIconSysFactory()->registerSystemTrayIconPrivate(this);
    793  <span class="hl kwa">+        sys = qt_guiSystemTrayIconSysFactory()-&gt;create(q);</span>  +        sys = qt_guiSystemTrayIconSysFactory()->create(q);
    794  <span class="hl kwa">+        if (!sys) {</span>  +        if (!sys) {
    795  <span class="hl kwa">+            return;</span>  +            return;
    796  <span class="hl kwa">+        }</span>  +        }
    797  <span class="hl kwa">+    }</span>  +    }
    798  <span class="hl kwa">+    sys-&gt;updateVisibility();</span>  +    sys->updateVisibility();
    799   }   }
    800    
    801   QRect QSystemTrayIconPrivate::geometry_sys() const   QRect QSystemTrayIconPrivate::geometry_sys() const
    802   {   {
    803  <span class="hl kwb">-    if (!sys)</span>  -    if (!sys)
    804  <span class="hl kwb">- return QRect();</span>  - return QRect();
    805  <span class="hl kwb">-    return QRect(sys-&gt;mapToGlobal(QPoint(0, 0)), sys-&gt;size());</span>  -    return QRect(sys->mapToGlobal(QPoint(0, 0)), sys->size());
    806  <span class="hl kwa">+    if (!sys || !visible)</span>  +    if (!sys || !visible)
    807  <span class="hl kwa">+        return QRect();</span>  +        return QRect();
    808  <span class="hl kwa">+    return sys-&gt;geometry();</span>  +    return sys->geometry();
    809   }   }
    810    
    811   void QSystemTrayIconPrivate::remove_sys()   void QSystemTrayIconPrivate::remove_sys()
    812  <span class="hl kwd">&#64;&#64; -350,35 +161,35 &#64;&#64;</span>  @@ -350,35 +161,35 @@
    813       if (!sys)       if (!sys)
    814           return;           return;
    815       QBalloonTip::hideBalloon();       QBalloonTip::hideBalloon();
    816  <span class="hl kwb">-    sys-&gt;hide(); // this should do the trick, but...</span>  -    sys->hide(); // this should do the trick, but...
    817  <span class="hl kwb">-    delete sys; // wm may resize system tray only for DestroyEvents</span>  -    delete sys; // wm may resize system tray only for DestroyEvents
    818  <span class="hl kwb">-    sys = 0;</span>  -    sys = 0;
    819  <span class="hl kwa">+    sys-&gt;updateVisibility();</span>  +    sys->updateVisibility();
    820   }   }
    821    
    822   void QSystemTrayIconPrivate::updateIcon_sys()   void QSystemTrayIconPrivate::updateIcon_sys()
    823   {   {
    824  <span class="hl kwb">-    if (!sys)</span>  -    if (!sys)
    825  <span class="hl kwa">+    if (!sys || !visible)</span>  +    if (!sys || !visible)
    826           return;           return;
    827       sys-&gt;updateIcon();       sys->updateIcon();
    828   }   }
    829    
    830   void QSystemTrayIconPrivate::updateMenu_sys()   void QSystemTrayIconPrivate::updateMenu_sys()
    831   {   {
    832  <span class="hl kwb">-</span>  -
    833  <span class="hl kwa">+    if (!sys || !visible)</span>  +    if (!sys || !visible)
    834  <span class="hl kwa">+        return;</span>  +        return;
    835  <span class="hl kwa">+    sys-&gt;updateMenu();</span>  +    sys->updateMenu();
    836   }   }
    837    
    838   void QSystemTrayIconPrivate::updateToolTip_sys()   void QSystemTrayIconPrivate::updateToolTip_sys()
    839   {   {
    840  <span class="hl kwb">-    if (!sys)</span>  -    if (!sys)
    841  <span class="hl kwa">+    if (!sys || !visible)</span>  +    if (!sys || !visible)
    842           return;           return;
    843   #ifndef QT_NO_TOOLTIP   #ifndef QT_NO_TOOLTIP
    844  <span class="hl kwb">-    sys-&gt;setToolTip(toolTip);</span>  -    sys->setToolTip(toolTip);
    845  <span class="hl kwa">+    sys-&gt;updateToolTip();</span>  +    sys->updateToolTip();
    846   #endif   #endif
    847   }   }
    848    
    849   bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()   bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
    850   {   {
    851  <span class="hl kwb">-    return QSystemTrayIconSys::locateSystemTray() != XNone;</span>  -    return QSystemTrayIconSys::locateSystemTray() != XNone;
    852  <span class="hl kwa">+    return qt_guiSystemTrayIconSysFactory()-&gt;isAvailable();</span>  +    return qt_guiSystemTrayIconSysFactory()->isAvailable();
    853   }   }
    854    
    855   bool QSystemTrayIconPrivate::supportsMessages_sys()   bool QSystemTrayIconPrivate::supportsMessages_sys()
    856  <span class="hl kwd">&#64;&#64; -389,12 +200,9 &#64;&#64;</span>  @@ -389,12 +200,9 @@
    857   void QSystemTrayIconPrivate::showMessage_sys(const QString &amp;message, const QString &amp;title,   void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
    858                                      QSystemTrayIcon::MessageIcon icon, int msecs)                                      QSystemTrayIcon::MessageIcon icon, int msecs)
    859   {   {
    860  <span class="hl kwb">-    if (!sys)</span>  -    if (!sys)
    861  <span class="hl kwa">+    if (!sys || !visible)</span>  +    if (!sys || !visible)
    862           return;           return;
    863  <span class="hl kwb">-    QPoint g = sys-&gt;mapToGlobal(QPoint(0, 0));</span>  -    QPoint g = sys->mapToGlobal(QPoint(0, 0));
    864  <span class="hl kwb">-    QBalloonTip::showBalloon(icon, message, title, sys-&gt;q,</span>  -    QBalloonTip::showBalloon(icon, message, title, sys->q,
    865  <span class="hl kwb">-                             QPoint(g.x() + sys-&gt;width()/2, g.y() + sys-&gt;height()/2),</span>  -                             QPoint(g.x() + sys->width()/2, g.y() + sys->height()/2),
    866  <span class="hl kwb">-                             msecs);</span>  -                             msecs);
    867  <span class="hl kwa">+    sys-&gt;showMessage(message, title, icon, msecs);</span>  +    sys->showMessage(message, title, icon, msecs);
    868   }   }
    869    
    870   QT_END_NAMESPACE   QT_END_NAMESPACE
    871  <span class="hl kwb">--- /dev/null</span>  --- /dev/null
    872  <span class="hl kwa">+++ b/src/gui/util/qxembedsystemtrayicon_x11.cpp</span>  +++ b/src/gui/util/qxembedsystemtrayicon_x11.cpp
    873  <span class="hl kwd">&#64;&#64; -0,0 +1,469 &#64;&#64;</span>  @@ -0,0 +1,469 @@
    874  <span class="hl kwa">+/****************************************************************************</span>  +/****************************************************************************
    875  <span class="hl kwa">+**</span>  +**
    876  <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span>  +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    877  <span class="hl kwa">+** All rights reserved.</span>  +** All rights reserved.
    878  <span class="hl kwa">+** Contact: Nokia Corporation (qt-info&#64;nokia.com)</span>  +** Contact: Nokia Corporation (qt-info@nokia.com)
    879  <span class="hl kwa">+**</span>  +**
    880  <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span>  +** This file is part of the QtGui module of the Qt Toolkit.
    881  <span class="hl kwa">+**</span>  +**
    882  <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span>  +** $QT_BEGIN_LICENSE:LGPL$
    883  <span class="hl kwa">+** GNU Lesser General Public License Usage</span>  +** GNU Lesser General Public License Usage
    884  <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span>  +** This file may be used under the terms of the GNU Lesser General Public
    885  <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span>  +** License version 2.1 as published by the Free Software Foundation and
    886  <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span>  +** appearing in the file LICENSE.LGPL included in the packaging of this
    887  <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span>  +** file. Please review the following information to ensure the GNU Lesser
    888  <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span>  +** General Public License version 2.1 requirements will be met:
    889  <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span>  +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    890  <span class="hl kwa">+**</span>  +**
    891  <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span>  +** In addition, as a special exception, Nokia gives you certain additional
    892  <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span>  +** rights. These rights are described in the Nokia Qt LGPL Exception
    893  <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span>  +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    894  <span class="hl kwa">+**</span>  +**
    895  <span class="hl kwa">+** GNU General Public License Usage</span>  +** GNU General Public License Usage
    896  <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span>  +** Alternatively, this file may be used under the terms of the GNU General
    897  <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span>  +** Public License version 3.0 as published by the Free Software Foundation
    898  <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span>  +** and appearing in the file LICENSE.GPL included in the packaging of this
    899  <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span>  +** file. Please review the following information to ensure the GNU General
    900  <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span>  +** Public License version 3.0 requirements will be met:
    901  <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span>  +** http://www.gnu.org/copyleft/gpl.html.
    902  <span class="hl kwa">+**</span>  +**
    903  <span class="hl kwa">+** Other Usage</span>  +** Other Usage
    904  <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span>  +** Alternatively, this file may be used in accordance with the terms and
    905  <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span>  +** conditions contained in a signed written agreement between you and Nokia.
    906  <span class="hl kwa">+**</span>  +**
    907  <span class="hl kwa">+**</span>  +**
    908  <span class="hl kwa">+**</span>  +**
    909  <span class="hl kwa">+**</span>  +**
    910  <span class="hl kwa">+**</span>  +**
    911  <span class="hl kwa">+** $QT_END_LICENSE$</span>  +** $QT_END_LICENSE$
    912  <span class="hl kwa">+**</span>  +**
    913  <span class="hl kwa">+****************************************************************************/</span>  +****************************************************************************/
    914  <span class="hl kwa">+#include &quot;qxembedsystemtrayicon_x11_p.h&quot;</span>  +#include "qxembedsystemtrayicon_x11_p.h"
    915  <span class="hl kwa">+</span>  +
    916  <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span>  +#ifndef QT_NO_SYSTEMTRAYICON
    917  <span class="hl kwa">+</span>  +
    918  <span class="hl kwa">+#include &quot;private/qt_x11_p.h&quot;</span>  +#include "private/qt_x11_p.h"
    919  <span class="hl kwa">+#include &quot;qapplication.h&quot;</span>  +#include "qapplication.h"
    920  <span class="hl kwa">+#include &quot;qevent.h&quot;</span>  +#include "qevent.h"
    921  <span class="hl kwa">+#include &quot;qlist.h&quot;</span>  +#include "qlist.h"
    922  <span class="hl kwa">+#include &quot;qmenu.h&quot;</span>  +#include "qmenu.h"
    923  <span class="hl kwa">+#include &quot;qpainter.h&quot;</span>  +#include "qpainter.h"
    924  <span class="hl kwa">+#include &quot;qpaintengine.h&quot;</span>  +#include "qpaintengine.h"
    925  <span class="hl kwa">+#include &quot;qsystemtrayicon_p.h&quot;</span>  +#include "qsystemtrayicon_p.h"
    926  <span class="hl kwa">+#include &quot;qx11info_x11.h&quot;</span>  +#include "qx11info_x11.h"
    927  <span class="hl kwa">+</span>  +
    928  <span class="hl kwa">+QT_BEGIN_INCLUDE_NAMESPACE</span>  +QT_BEGIN_INCLUDE_NAMESPACE
    929  <span class="hl kwa">+#include &lt;QtCore/qcoreapplication.h&gt;</span>  +#include <QtCore/qcoreapplication.h>
    930  <span class="hl kwa">+#include &lt;X11/Xlib.h&gt;</span>  +#include <X11/Xlib.h>
    931  <span class="hl kwa">+#include &lt;X11/Xatom.h&gt;</span>  +#include <X11/Xatom.h>
    932  <span class="hl kwa">+#include &lt;X11/Xutil.h&gt;</span>  +#include <X11/Xutil.h>
    933  <span class="hl kwa">+QT_END_INCLUDE_NAMESPACE</span>  +QT_END_INCLUDE_NAMESPACE
    934  <span class="hl kwa">+</span>  +
    935  <span class="hl kwa">+QT_BEGIN_NAMESPACE</span>  +QT_BEGIN_NAMESPACE
    936  <span class="hl kwa">+</span>  +
    937  <span class="hl kwa">+class QSystemTrayIconWidget : public QWidget</span>  +class QSystemTrayIconWidget : public QWidget
    938  <span class="hl kwa">+{</span>  +{
    939  <span class="hl kwa">+public:</span>  +public:
    940  <span class="hl kwa">+    QSystemTrayIconWidget(QSystemTrayIcon *q, QXEmbedSystemTrayIconSys *s);</span>  +    QSystemTrayIconWidget(QSystemTrayIcon *q, QXEmbedSystemTrayIconSys *s);
    941  <span class="hl kwa">+    ~QSystemTrayIconWidget();</span>  +    ~QSystemTrayIconWidget();
    942  <span class="hl kwa">+</span>  +
    943  <span class="hl kwa">+    static Window locateSystemTray();</span>  +    static Window locateSystemTray();
    944  <span class="hl kwa">+</span>  +
    945  <span class="hl kwa">+protected:</span>  +protected:
    946  <span class="hl kwa">+    void paintEvent(QPaintEvent *pe);</span>  +    void paintEvent(QPaintEvent *pe);
    947  <span class="hl kwa">+    void resizeEvent(QResizeEvent *re);</span>  +    void resizeEvent(QResizeEvent *re);
    948  <span class="hl kwa">+    bool x11Event(XEvent *event);</span>  +    bool x11Event(XEvent *event);
    949  <span class="hl kwa">+    void mousePressEvent(QMouseEvent *event);</span>  +    void mousePressEvent(QMouseEvent *event);
    950  <span class="hl kwa">+    void mouseDoubleClickEvent(QMouseEvent *event);</span>  +    void mouseDoubleClickEvent(QMouseEvent *event);
    951  <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span>  +#ifndef QT_NO_WHEELEVENT
    952  <span class="hl kwa">+    void wheelEvent(QWheelEvent *event);</span>  +    void wheelEvent(QWheelEvent *event);
    953  <span class="hl kwa">+#endif</span>  +#endif
    954  <span class="hl kwa">+    bool event(QEvent *e);</span>  +    bool event(QEvent *e);
    955  <span class="hl kwa">+</span>  +
    956  <span class="hl kwa">+private:</span>  +private:
    957  <span class="hl kwa">+    enum {</span>  +    enum {
    958  <span class="hl kwa">+        SYSTEM_TRAY_REQUEST_DOCK = 0,</span>  +        SYSTEM_TRAY_REQUEST_DOCK = 0,
    959  <span class="hl kwa">+        SYSTEM_TRAY_BEGIN_MESSAGE = 1,</span>  +        SYSTEM_TRAY_BEGIN_MESSAGE = 1,
    960  <span class="hl kwa">+        SYSTEM_TRAY_CANCEL_MESSAGE =2</span>  +        SYSTEM_TRAY_CANCEL_MESSAGE =2
    961  <span class="hl kwa">+    };</span>  +    };
    962  <span class="hl kwa">+</span>  +
    963  <span class="hl kwa">+    void addToTray();</span>  +    void addToTray();
    964  <span class="hl kwa">+    static XVisualInfo* getSysTrayVisualInfo();</span>  +    static XVisualInfo* getSysTrayVisualInfo();
    965  <span class="hl kwa">+</span>  +
    966  <span class="hl kwa">+    static Window sysTrayWindow;</span>  +    static Window sysTrayWindow;
    967  <span class="hl kwa">+    static QList&lt;QSystemTrayIconWidget *&gt; trayIcons;</span>  +    static QList<QSystemTrayIconWidget *> trayIcons;
    968  <span class="hl kwa">+    static QCoreApplication::EventFilter oldEventFilter;</span>  +    static QCoreApplication::EventFilter oldEventFilter;
    969  <span class="hl kwa">+    static bool sysTrayTracker(void *message, long *result);</span>  +    static bool sysTrayTracker(void *message, long *result);
    970  <span class="hl kwa">+    static Atom sysTraySelection;</span>  +    static Atom sysTraySelection;
    971  <span class="hl kwa">+    static XVisualInfo sysTrayVisual;</span>  +    static XVisualInfo sysTrayVisual;
    972  <span class="hl kwa">+</span>  +
    973  <span class="hl kwa">+    QSystemTrayIcon *q;</span>  +    QSystemTrayIcon *q;
    974  <span class="hl kwa">+    QXEmbedSystemTrayIconSys *sys;</span>  +    QXEmbedSystemTrayIconSys *sys;
    975  <span class="hl kwa">+    Colormap colormap;</span>  +    Colormap colormap;
    976  <span class="hl kwa">+};</span>  +};
    977  <span class="hl kwa">+</span>  +
    978  <span class="hl kwa">+Window QSystemTrayIconWidget::sysTrayWindow = XNone;</span>  +Window QSystemTrayIconWidget::sysTrayWindow = XNone;
    979  <span class="hl kwa">+QList&lt;QSystemTrayIconWidget *&gt; QSystemTrayIconWidget::trayIcons;</span>  +QList<QSystemTrayIconWidget *> QSystemTrayIconWidget::trayIcons;
    980  <span class="hl kwa">+QCoreApplication::EventFilter QSystemTrayIconWidget::oldEventFilter = 0;</span>  +QCoreApplication::EventFilter QSystemTrayIconWidget::oldEventFilter = 0;
    981  <span class="hl kwa">+Atom QSystemTrayIconWidget::sysTraySelection = XNone;</span>  +Atom QSystemTrayIconWidget::sysTraySelection = XNone;
    982  <span class="hl kwa">+XVisualInfo QSystemTrayIconWidget::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};</span>  +XVisualInfo QSystemTrayIconWidget::sysTrayVisual = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
    983  <span class="hl kwa">+</span>  +
    984  <span class="hl kwa">+QSystemTrayIconWidget::QSystemTrayIconWidget(QSystemTrayIcon* q, QXEmbedSystemTrayIconSys* sys)</span>  +QSystemTrayIconWidget::QSystemTrayIconWidget(QSystemTrayIcon* q, QXEmbedSystemTrayIconSys* sys)
    985  <span class="hl kwa">+: QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)</span>  +: QWidget(0, Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
    986  <span class="hl kwa">+, q(q)</span>  +, q(q)
    987  <span class="hl kwa">+, sys(sys)</span>  +, sys(sys)
    988  <span class="hl kwa">+, colormap(0)</span>  +, colormap(0)
    989  <span class="hl kwa">+{</span>  +{
    990  <span class="hl kwa">+    setAttribute(Qt::WA_AlwaysShowToolTips);</span>  +    setAttribute(Qt::WA_AlwaysShowToolTips);
    991  <span class="hl kwa">+    setAttribute(Qt::WA_QuitOnClose, false);</span>  +    setAttribute(Qt::WA_QuitOnClose, false);
    992  <span class="hl kwa">+    setAttribute(Qt::WA_NoSystemBackground, true);</span>  +    setAttribute(Qt::WA_NoSystemBackground, true);
    993  <span class="hl kwa">+    setAttribute(Qt::WA_PaintOnScreen);</span>  +    setAttribute(Qt::WA_PaintOnScreen);
    994  <span class="hl kwa">+    setMouseTracking(true);</span>  +    setMouseTracking(true);
    995  <span class="hl kwa">+#ifndef QT_NO_TOOLTIP</span>  +#ifndef QT_NO_TOOLTIP
    996  <span class="hl kwa">+    setToolTip(q-&gt;toolTip());</span>  +    setToolTip(q->toolTip());
    997  <span class="hl kwa">+#endif</span>  +#endif
    998  <span class="hl kwa">+</span>  +
    999  <span class="hl kwa">+    static bool eventFilterAdded = false;</span>  +    static bool eventFilterAdded = false;
    1000  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1001  <span class="hl kwa">+    if (!eventFilterAdded) {</span>  +    if (!eventFilterAdded) {
    1002  <span class="hl kwa">+        oldEventFilter = qApp-&gt;setEventFilter(sysTrayTracker);</span>  +        oldEventFilter = qApp->setEventFilter(sysTrayTracker);
    1003  <span class="hl kwa">+        eventFilterAdded = true;</span>  +        eventFilterAdded = true;
    1004  <span class="hl kwa">+        Window root = QX11Info::appRootWindow();</span>  +        Window root = QX11Info::appRootWindow();
    1005  <span class="hl kwa">+        XWindowAttributes attr;</span>  +        XWindowAttributes attr;
    1006  <span class="hl kwa">+        XGetWindowAttributes(display, root, &amp;attr);</span>  +        XGetWindowAttributes(display, root, &attr);
    1007  <span class="hl kwa">+        if ((attr.your_event_mask &amp; StructureNotifyMask) != StructureNotifyMask) {</span>  +        if ((attr.your_event_mask & StructureNotifyMask) != StructureNotifyMask) {
    1008  <span class="hl kwa">+            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden</span>  +            (void) QApplication::desktop(); // lame trick to ensure our event mask is not overridden
    1009  <span class="hl kwa">+            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection</span>  +            XSelectInput(display, root, attr.your_event_mask | StructureNotifyMask); // for MANAGER selection
    1010  <span class="hl kwa">+        }</span>  +        }
    1011  <span class="hl kwa">+    }</span>  +    }
    1012  <span class="hl kwa">+    if (trayIcons.isEmpty()) {</span>  +    if (trayIcons.isEmpty()) {
    1013  <span class="hl kwa">+        sysTrayWindow = locateSystemTray();</span>  +        sysTrayWindow = locateSystemTray();
    1014  <span class="hl kwa">+        if (sysTrayWindow != XNone)</span>  +        if (sysTrayWindow != XNone)
    1015  <span class="hl kwa">+            XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events</span>  +            XSelectInput(display, sysTrayWindow, StructureNotifyMask); // track tray events
    1016  <span class="hl kwa">+    }</span>  +    }
    1017  <span class="hl kwa">+    trayIcons.append(this);</span>  +    trayIcons.append(this);
    1018  <span class="hl kwa">+    if (sysTrayWindow != XNone)</span>  +    if (sysTrayWindow != XNone)
    1019  <span class="hl kwa">+        addToTray();</span>  +        addToTray();
    1020  <span class="hl kwa">+}</span>  +}
    1021  <span class="hl kwa">+</span>  +
    1022  <span class="hl kwa">+QSystemTrayIconWidget::~QSystemTrayIconWidget()</span>  +QSystemTrayIconWidget::~QSystemTrayIconWidget()
    1023  <span class="hl kwa">+{</span>  +{
    1024  <span class="hl kwa">+    trayIcons.removeAt(trayIcons.indexOf(this));</span>  +    trayIcons.removeAt(trayIcons.indexOf(this));
    1025  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1026  <span class="hl kwa">+    if (trayIcons.isEmpty()) {</span>  +    if (trayIcons.isEmpty()) {
    1027  <span class="hl kwa">+        if (sysTrayWindow == XNone)</span>  +        if (sysTrayWindow == XNone)
    1028  <span class="hl kwa">+            return;</span>  +            return;
    1029  <span class="hl kwa">+        if (display)</span>  +        if (display)
    1030  <span class="hl kwa">+            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray</span>  +            XSelectInput(display, sysTrayWindow, 0); // stop tracking the tray
    1031  <span class="hl kwa">+        sysTrayWindow = XNone;</span>  +        sysTrayWindow = XNone;
    1032  <span class="hl kwa">+    }</span>  +    }
    1033  <span class="hl kwa">+    if (colormap)</span>  +    if (colormap)
    1034  <span class="hl kwa">+        XFreeColormap(display, colormap);</span>  +        XFreeColormap(display, colormap);
    1035  <span class="hl kwa">+}</span>  +}
    1036  <span class="hl kwa">+</span>  +
    1037  <span class="hl kwa">+void QSystemTrayIconWidget::resizeEvent(QResizeEvent *re)</span>  +void QSystemTrayIconWidget::resizeEvent(QResizeEvent *re)
    1038  <span class="hl kwa">+{</span>  +{
    1039  <span class="hl kwa">+    QWidget::resizeEvent(re);</span>  +    QWidget::resizeEvent(re);
    1040  <span class="hl kwa">+    update();</span>  +    update();
    1041  <span class="hl kwa">+}</span>  +}
    1042  <span class="hl kwa">+</span>  +
    1043  <span class="hl kwa">+void QSystemTrayIconWidget::paintEvent(QPaintEvent*)</span>  +void QSystemTrayIconWidget::paintEvent(QPaintEvent*)
    1044  <span class="hl kwa">+{</span>  +{
    1045  <span class="hl kwa">+    QPainter p(this);</span>  +    QPainter p(this);
    1046  <span class="hl kwa">+    if (!getSysTrayVisualInfo()) {</span>  +    if (!getSysTrayVisualInfo()) {
    1047  <span class="hl kwa">+        const QRegion oldSystemClip = p.paintEngine()-&gt;systemClip();</span>  +        const QRegion oldSystemClip = p.paintEngine()->systemClip();
    1048  <span class="hl kwa">+        const QRect clearedRect = oldSystemClip.boundingRect();</span>  +        const QRect clearedRect = oldSystemClip.boundingRect();
    1049  <span class="hl kwa">+        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),</span>  +        XClearArea(QX11Info::display(), winId(), clearedRect.x(), clearedRect.y(),
    1050  <span class="hl kwa">+                   clearedRect.width(), clearedRect.height(), False);</span>  +                   clearedRect.width(), clearedRect.height(), False);
    1051  <span class="hl kwa">+        QPaintEngine *pe = p.paintEngine();</span>  +        QPaintEngine *pe = p.paintEngine();
    1052  <span class="hl kwa">+        pe-&gt;setSystemClip(clearedRect);</span>  +        pe->setSystemClip(clearedRect);
    1053  <span class="hl kwa">+        q-&gt;icon().paint(&amp;p, rect());</span>  +        q->icon().paint(&p, rect());
    1054  <span class="hl kwa">+        pe-&gt;setSystemClip(oldSystemClip);</span>  +        pe->setSystemClip(oldSystemClip);
    1055  <span class="hl kwa">+    } else {</span>  +    } else {
    1056  <span class="hl kwa">+        p.setCompositionMode(QPainter::CompositionMode_Source);</span>  +        p.setCompositionMode(QPainter::CompositionMode_Source);
    1057  <span class="hl kwa">+        p.fillRect(rect(), Qt::transparent);</span>  +        p.fillRect(rect(), Qt::transparent);
    1058  <span class="hl kwa">+        p.setCompositionMode(QPainter::CompositionMode_SourceOver);</span>  +        p.setCompositionMode(QPainter::CompositionMode_SourceOver);
    1059  <span class="hl kwa">+        q-&gt;icon().paint(&amp;p, rect());</span>  +        q->icon().paint(&p, rect());
    1060  <span class="hl kwa">+    }</span>  +    }
    1061  <span class="hl kwa">+}</span>  +}
    1062  <span class="hl kwa">+</span>  +
    1063  <span class="hl kwa">+void QSystemTrayIconWidget::mousePressEvent(QMouseEvent *ev)</span>  +void QSystemTrayIconWidget::mousePressEvent(QMouseEvent *ev)
    1064  <span class="hl kwa">+{</span>  +{
    1065  <span class="hl kwa">+    QPoint globalPos = ev-&gt;globalPos();</span>  +    QPoint globalPos = ev->globalPos();
    1066  <span class="hl kwa">+    if (ev-&gt;button() == Qt::RightButton &amp;&amp; q-&gt;contextMenu())</span>  +    if (ev->button() == Qt::RightButton && q->contextMenu())
    1067  <span class="hl kwa">+        q-&gt;contextMenu()-&gt;popup(globalPos);</span>  +        q->contextMenu()->popup(globalPos);
    1068  <span class="hl kwa">+</span>  +
    1069  <span class="hl kwa">+    if (QBalloonTip::isBalloonVisible()) {</span>  +    if (QBalloonTip::isBalloonVisible()) {
    1070  <span class="hl kwa">+        QMetaObject::invokeMethod(q, &quot;messageClicked&quot;);</span>  +        QMetaObject::invokeMethod(q, "messageClicked");
    1071  <span class="hl kwa">+        QBalloonTip::hideBalloon();</span>  +        QBalloonTip::hideBalloon();
    1072  <span class="hl kwa">+    }</span>  +    }
    1073  <span class="hl kwa">+</span>  +
    1074  <span class="hl kwa">+    if (ev-&gt;button() == Qt::LeftButton)</span>  +    if (ev->button() == Qt::LeftButton)
    1075  <span class="hl kwa">+        qtsystray_sendActivated(q, QSystemTrayIcon::Trigger);</span>  +        qtsystray_sendActivated(q, QSystemTrayIcon::Trigger);
    1076  <span class="hl kwa">+    else if (ev-&gt;button() == Qt::RightButton)</span>  +    else if (ev->button() == Qt::RightButton)
    1077  <span class="hl kwa">+        qtsystray_sendActivated(q, QSystemTrayIcon::Context);</span>  +        qtsystray_sendActivated(q, QSystemTrayIcon::Context);
    1078  <span class="hl kwa">+    else if (ev-&gt;button() == Qt::MidButton)</span>  +    else if (ev->button() == Qt::MidButton)
    1079  <span class="hl kwa">+        qtsystray_sendActivated(q, QSystemTrayIcon::MiddleClick);</span>  +        qtsystray_sendActivated(q, QSystemTrayIcon::MiddleClick);
    1080  <span class="hl kwa">+}</span>  +}
    1081  <span class="hl kwa">+</span>  +
    1082  <span class="hl kwa">+void QSystemTrayIconWidget::mouseDoubleClickEvent(QMouseEvent *ev)</span>  +void QSystemTrayIconWidget::mouseDoubleClickEvent(QMouseEvent *ev)
    1083  <span class="hl kwa">+{</span>  +{
    1084  <span class="hl kwa">+    if (ev-&gt;button() == Qt::LeftButton)</span>  +    if (ev->button() == Qt::LeftButton)
    1085  <span class="hl kwa">+        qtsystray_sendActivated(q, QSystemTrayIcon::DoubleClick);</span>  +        qtsystray_sendActivated(q, QSystemTrayIcon::DoubleClick);
    1086  <span class="hl kwa">+}</span>  +}
    1087  <span class="hl kwa">+</span>  +
    1088  <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span>  +#ifndef QT_NO_WHEELEVENT
    1089  <span class="hl kwa">+void QSystemTrayIconWidget::wheelEvent(QWheelEvent *e)</span>  +void QSystemTrayIconWidget::wheelEvent(QWheelEvent *e)
    1090  <span class="hl kwa">+{</span>  +{
    1091  <span class="hl kwa">+    sys-&gt;sendWheelEventToTrayIcon(e-&gt;delta(), e-&gt;orientation());</span>  +    sys->sendWheelEventToTrayIcon(e->delta(), e->orientation());
    1092  <span class="hl kwa">+}</span>  +}
    1093  <span class="hl kwa">+#endif</span>  +#endif
    1094  <span class="hl kwa">+</span>  +
    1095  <span class="hl kwa">+bool QSystemTrayIconWidget::event(QEvent *e)</span>  +bool QSystemTrayIconWidget::event(QEvent *e)
    1096  <span class="hl kwa">+{</span>  +{
    1097  <span class="hl kwa">+    if (e-&gt;type() == QEvent::ToolTip) {</span>  +    if (e->type() == QEvent::ToolTip) {
    1098  <span class="hl kwa">+        sys-&gt;sendToolTipEventToTrayIcon();</span>  +        sys->sendToolTipEventToTrayIcon();
    1099  <span class="hl kwa">+    }</span>  +    }
    1100  <span class="hl kwa">+    return QWidget::event(e);</span>  +    return QWidget::event(e);
    1101  <span class="hl kwa">+}</span>  +}
    1102  <span class="hl kwa">+</span>  +
    1103  <span class="hl kwa">+bool QSystemTrayIconWidget::x11Event(XEvent *event)</span>  +bool QSystemTrayIconWidget::x11Event(XEvent *event)
    1104  <span class="hl kwa">+{</span>  +{
    1105  <span class="hl kwa">+    if (event-&gt;type == ReparentNotify)</span>  +    if (event->type == ReparentNotify)
    1106  <span class="hl kwa">+        show();</span>  +        show();
    1107  <span class="hl kwa">+    return QWidget::x11Event(event);</span>  +    return QWidget::x11Event(event);
    1108  <span class="hl kwa">+}</span>  +}
    1109  <span class="hl kwa">+</span>  +
    1110  <span class="hl kwa">+// Locate the system tray</span>  +// Locate the system tray
    1111  <span class="hl kwa">+Window QSystemTrayIconWidget::locateSystemTray()</span>  +Window QSystemTrayIconWidget::locateSystemTray()
    1112  <span class="hl kwa">+{</span>  +{
    1113  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1114  <span class="hl kwa">+    if (sysTraySelection == XNone) {</span>  +    if (sysTraySelection == XNone) {
    1115  <span class="hl kwa">+        int screen = QX11Info::appScreen();</span>  +        int screen = QX11Info::appScreen();
    1116  <span class="hl kwa">+        QString net_sys_tray = QString::fromLatin1(&quot;_NET_SYSTEM_TRAY_S%1&quot;).arg(screen);</span>  +        QString net_sys_tray = QString::fromLatin1("_NET_SYSTEM_TRAY_S%1").arg(screen);
    1117  <span class="hl kwa">+        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);</span>  +        sysTraySelection = XInternAtom(display, net_sys_tray.toLatin1(), False);
    1118  <span class="hl kwa">+    }</span>  +    }
    1119  <span class="hl kwa">+</span>  +
    1120  <span class="hl kwa">+    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);</span>  +    return XGetSelectionOwner(QX11Info::display(), sysTraySelection);
    1121  <span class="hl kwa">+}</span>  +}
    1122  <span class="hl kwa">+</span>  +
    1123  <span class="hl kwa">+XVisualInfo* QSystemTrayIconWidget::getSysTrayVisualInfo()</span>  +XVisualInfo* QSystemTrayIconWidget::getSysTrayVisualInfo()
    1124  <span class="hl kwa">+{</span>  +{
    1125  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1126  <span class="hl kwa">+</span>  +
    1127  <span class="hl kwa">+    if (!sysTrayVisual.visual) {</span>  +    if (!sysTrayVisual.visual) {
    1128  <span class="hl kwa">+        Window win = locateSystemTray();</span>  +        Window win = locateSystemTray();
    1129  <span class="hl kwa">+        if (win != XNone) {</span>  +        if (win != XNone) {
    1130  <span class="hl kwa">+            Atom actual_type;</span>  +            Atom actual_type;
    1131  <span class="hl kwa">+            int actual_format;</span>  +            int actual_format;
    1132  <span class="hl kwa">+            ulong nitems, bytes_remaining;</span>  +            ulong nitems, bytes_remaining;
    1133  <span class="hl kwa">+            uchar *data = 0;</span>  +            uchar *data = 0;
    1134  <span class="hl kwa">+            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,</span>  +            int result = XGetWindowProperty(display, win, ATOM(_NET_SYSTEM_TRAY_VISUAL), 0, 1,
    1135  <span class="hl kwa">+                                            False, XA_VISUALID, &amp;actual_type,</span>  +                                            False, XA_VISUALID, &actual_type,
    1136  <span class="hl kwa">+                                            &amp;actual_format, &amp;nitems, &amp;bytes_remaining, &amp;data);</span>  +                                            &actual_format, &nitems, &bytes_remaining, &data);
    1137  <span class="hl kwa">+            VisualID vid = 0;</span>  +            VisualID vid = 0;
    1138  <span class="hl kwa">+            if (result == Success &amp;&amp; data &amp;&amp; actual_type == XA_VISUALID &amp;&amp; actual_format == 32 &amp;&amp;</span>  +            if (result == Success && data && actual_type == XA_VISUALID && actual_format == 32 &&
    1139  <span class="hl kwa">+                nitems == 1 &amp;&amp; bytes_remaining == 0)</span>  +                nitems == 1 && bytes_remaining == 0)
    1140  <span class="hl kwa">+                vid = *(VisualID*)data;</span>  +                vid = *(VisualID*)data;
    1141  <span class="hl kwa">+            if (data)</span>  +            if (data)
    1142  <span class="hl kwa">+                XFree(data);</span>  +                XFree(data);
    1143  <span class="hl kwa">+            if (vid == 0)</span>  +            if (vid == 0)
    1144  <span class="hl kwa">+                return 0;</span>  +                return 0;
    1145  <span class="hl kwa">+</span>  +
    1146  <span class="hl kwa">+            uint mask = VisualIDMask;</span>  +            uint mask = VisualIDMask;
    1147  <span class="hl kwa">+            XVisualInfo *vi, rvi;</span>  +            XVisualInfo *vi, rvi;
    1148  <span class="hl kwa">+            int count;</span>  +            int count;
    1149  <span class="hl kwa">+            rvi.visualid = vid;</span>  +            rvi.visualid = vid;
    1150  <span class="hl kwa">+            vi = XGetVisualInfo(display, mask, &amp;rvi, &amp;count);</span>  +            vi = XGetVisualInfo(display, mask, &rvi, &count);
    1151  <span class="hl kwa">+            if (vi) {</span>  +            if (vi) {
    1152  <span class="hl kwa">+                sysTrayVisual = vi[0];</span>  +                sysTrayVisual = vi[0];
    1153  <span class="hl kwa">+                XFree((char*)vi);</span>  +                XFree((char*)vi);
    1154  <span class="hl kwa">+            }</span>  +            }
    1155  <span class="hl kwa">+            if (sysTrayVisual.depth != 32)</span>  +            if (sysTrayVisual.depth != 32)
    1156  <span class="hl kwa">+                memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  +                memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    1157  <span class="hl kwa">+        }</span>  +        }
    1158  <span class="hl kwa">+    }</span>  +    }
    1159  <span class="hl kwa">+</span>  +
    1160  <span class="hl kwa">+    return sysTrayVisual.visual ? &amp;sysTrayVisual : 0;</span>  +    return sysTrayVisual.visual ? &sysTrayVisual : 0;
    1161  <span class="hl kwa">+}</span>  +}
    1162  <span class="hl kwa">+</span>  +
    1163  <span class="hl kwa">+bool QSystemTrayIconWidget::sysTrayTracker(void *message, long *result)</span>  +bool QSystemTrayIconWidget::sysTrayTracker(void *message, long *result)
    1164  <span class="hl kwa">+{</span>  +{
    1165  <span class="hl kwa">+    bool retval = false;</span>  +    bool retval = false;
    1166  <span class="hl kwa">+    if (QSystemTrayIconWidget::oldEventFilter)</span>  +    if (QSystemTrayIconWidget::oldEventFilter)
    1167  <span class="hl kwa">+        retval = QSystemTrayIconWidget::oldEventFilter(message, result);</span>  +        retval = QSystemTrayIconWidget::oldEventFilter(message, result);
    1168  <span class="hl kwa">+</span>  +
    1169  <span class="hl kwa">+    if (trayIcons.isEmpty())</span>  +    if (trayIcons.isEmpty())
    1170  <span class="hl kwa">+        return retval;</span>  +        return retval;
    1171  <span class="hl kwa">+</span>  +
    1172  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1173  <span class="hl kwa">+    XEvent *ev = (XEvent *)message;</span>  +    XEvent *ev = (XEvent *)message;
    1174  <span class="hl kwa">+    if  (ev-&gt;type == DestroyNotify &amp;&amp; ev-&gt;xany.window == sysTrayWindow) {</span>  +    if  (ev->type == DestroyNotify && ev->xany.window == sysTrayWindow) {
    1175  <span class="hl kwa">+        sysTrayWindow = locateSystemTray();</span>  +        sysTrayWindow = locateSystemTray();
    1176  <span class="hl kwa">+        memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  +        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    1177  <span class="hl kwa">+        for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  +        for (int i = 0; i < trayIcons.count(); i++) {
    1178  <span class="hl kwa">+            if (sysTrayWindow == XNone) {</span>  +            if (sysTrayWindow == XNone) {
    1179  <span class="hl kwa">+                QBalloonTip::hideBalloon();</span>  +                QBalloonTip::hideBalloon();
    1180  <span class="hl kwa">+                trayIcons[i]-&gt;hide(); // still no luck</span>  +                trayIcons[i]->hide(); // still no luck
    1181  <span class="hl kwa">+                trayIcons[i]-&gt;destroy();</span>  +                trayIcons[i]->destroy();
    1182  <span class="hl kwa">+                trayIcons[i]-&gt;create();</span>  +                trayIcons[i]->create();
    1183  <span class="hl kwa">+            } else</span>  +            } else
    1184  <span class="hl kwa">+                trayIcons[i]-&gt;addToTray(); // add it to the new tray</span>  +                trayIcons[i]->addToTray(); // add it to the new tray
    1185  <span class="hl kwa">+        }</span>  +        }
    1186  <span class="hl kwa">+        retval = true;</span>  +        retval = true;
    1187  <span class="hl kwa">+    } else if (ev-&gt;type == ClientMessage &amp;&amp; sysTrayWindow == XNone) {</span>  +    } else if (ev->type == ClientMessage && sysTrayWindow == XNone) {
    1188  <span class="hl kwa">+        static Atom manager_atom = XInternAtom(display, &quot;MANAGER&quot;, False);</span>  +        static Atom manager_atom = XInternAtom(display, "MANAGER", False);
    1189  <span class="hl kwa">+        XClientMessageEvent *cm = (XClientMessageEvent *)message;</span>  +        XClientMessageEvent *cm = (XClientMessageEvent *)message;
    1190  <span class="hl kwa">+        if ((cm-&gt;message_type == manager_atom) &amp;&amp; ((Atom)cm-&gt;data.l[1] == sysTraySelection)) {</span>  +        if ((cm->message_type == manager_atom) && ((Atom)cm->data.l[1] == sysTraySelection)) {
    1191  <span class="hl kwa">+            sysTrayWindow = cm-&gt;data.l[2];</span>  +            sysTrayWindow = cm->data.l[2];
    1192  <span class="hl kwa">+            memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  +            memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    1193  <span class="hl kwa">+            XSelectInput(display, sysTrayWindow, StructureNotifyMask);</span>  +            XSelectInput(display, sysTrayWindow, StructureNotifyMask);
    1194  <span class="hl kwa">+            for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  +            for (int i = 0; i < trayIcons.count(); i++) {
    1195  <span class="hl kwa">+                trayIcons[i]-&gt;addToTray();</span>  +                trayIcons[i]->addToTray();
    1196  <span class="hl kwa">+            }</span>  +            }
    1197  <span class="hl kwa">+            retval = true;</span>  +            retval = true;
    1198  <span class="hl kwa">+        }</span>  +        }
    1199  <span class="hl kwa">+    } else if (ev-&gt;type == PropertyNotify &amp;&amp; ev-&gt;xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &amp;&amp;</span>  +    } else if (ev->type == PropertyNotify && ev->xproperty.atom == ATOM(_NET_SYSTEM_TRAY_VISUAL) &&
    1200  <span class="hl kwa">+               ev-&gt;xproperty.window == sysTrayWindow) {</span>  +               ev->xproperty.window == sysTrayWindow) {
    1201  <span class="hl kwa">+        memset(&amp;sysTrayVisual, 0, sizeof(sysTrayVisual));</span>  +        memset(&sysTrayVisual, 0, sizeof(sysTrayVisual));
    1202  <span class="hl kwa">+        for (int i = 0; i &lt; trayIcons.count(); i++) {</span>  +        for (int i = 0; i < trayIcons.count(); i++) {
    1203  <span class="hl kwa">+            trayIcons[i]-&gt;addToTray();</span>  +            trayIcons[i]->addToTray();
    1204  <span class="hl kwa">+        }</span>  +        }
    1205  <span class="hl kwa">+    }</span>  +    }
    1206  <span class="hl kwa">+</span>  +
    1207  <span class="hl kwa">+    return retval;</span>  +    return retval;
    1208  <span class="hl kwa">+}</span>  +}
    1209  <span class="hl kwa">+</span>  +
    1210  <span class="hl kwa">+void QSystemTrayIconWidget::addToTray()</span>  +void QSystemTrayIconWidget::addToTray()
    1211  <span class="hl kwa">+{</span>  +{
    1212  <span class="hl kwa">+    Q_ASSERT(sysTrayWindow != XNone);</span>  +    Q_ASSERT(sysTrayWindow != XNone);
    1213  <span class="hl kwa">+    Display *display = QX11Info::display();</span>  +    Display *display = QX11Info::display();
    1214  <span class="hl kwa">+</span>  +
    1215  <span class="hl kwa">+    XVisualInfo *vi = getSysTrayVisualInfo();</span>  +    XVisualInfo *vi = getSysTrayVisualInfo();
    1216  <span class="hl kwa">+    if (vi &amp;&amp; vi-&gt;visual) {</span>  +    if (vi && vi->visual) {
    1217  <span class="hl kwa">+        Window root = RootWindow(display, vi-&gt;screen);</span>  +        Window root = RootWindow(display, vi->screen);
    1218  <span class="hl kwa">+        Window p = root;</span>  +        Window p = root;
    1219  <span class="hl kwa">+        if (QWidget *pw = parentWidget())</span>  +        if (QWidget *pw = parentWidget())
    1220  <span class="hl kwa">+            p = pw-&gt;effectiveWinId();</span>  +            p = pw->effectiveWinId();
    1221  <span class="hl kwa">+        colormap = XCreateColormap(display, root, vi-&gt;visual, AllocNone);</span>  +        colormap = XCreateColormap(display, root, vi->visual, AllocNone);
    1222  <span class="hl kwa">+        XSetWindowAttributes wsa;</span>  +        XSetWindowAttributes wsa;
    1223  <span class="hl kwa">+        wsa.background_pixmap = 0;</span>  +        wsa.background_pixmap = 0;
    1224  <span class="hl kwa">+        wsa.colormap = colormap;</span>  +        wsa.colormap = colormap;
    1225  <span class="hl kwa">+        wsa.background_pixel = 0;</span>  +        wsa.background_pixel = 0;
    1226  <span class="hl kwa">+        wsa.border_pixel = 0;</span>  +        wsa.border_pixel = 0;
    1227  <span class="hl kwa">+        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,</span>  +        Window wid = XCreateWindow(display, p, -1, -1, 1, 1,
    1228  <span class="hl kwa">+                                   0, vi-&gt;depth, InputOutput, vi-&gt;visual,</span>  +                                   0, vi->depth, InputOutput, vi->visual,
    1229  <span class="hl kwa">+                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &amp;wsa);</span>  +                                   CWBackPixmap|CWBackPixel|CWBorderPixel|CWColormap, &wsa);
    1230  <span class="hl kwa">+        create(wid);</span>  +        create(wid);
    1231  <span class="hl kwa">+    } else {</span>  +    } else {
    1232  <span class="hl kwa">+        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);</span>  +        XSetWindowBackgroundPixmap(display, winId(), ParentRelative);
    1233  <span class="hl kwa">+    }</span>  +    }
    1234  <span class="hl kwa">+</span>  +
    1235  <span class="hl kwa">+    // GNOME, NET WM Specification</span>  +    // GNOME, NET WM Specification
    1236  <span class="hl kwa">+    static Atom netwm_tray_atom = XInternAtom(display, &quot;_NET_SYSTEM_TRAY_OPCODE&quot;, False);</span>  +    static Atom netwm_tray_atom = XInternAtom(display, "_NET_SYSTEM_TRAY_OPCODE", False);
    1237  <span class="hl kwa">+    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast&lt;long&gt;(winId()), 0, 0 };</span>  +    long l[5] = { CurrentTime, SYSTEM_TRAY_REQUEST_DOCK, static_cast<long>(winId()), 0, 0 };
    1238  <span class="hl kwa">+    XEvent ev;</span>  +    XEvent ev;
    1239  <span class="hl kwa">+    memset(&amp;ev, 0, sizeof(ev));</span>  +    memset(&ev, 0, sizeof(ev));
    1240  <span class="hl kwa">+    ev.xclient.type = ClientMessage;</span>  +    ev.xclient.type = ClientMessage;
    1241  <span class="hl kwa">+    ev.xclient.window = sysTrayWindow;</span>  +    ev.xclient.window = sysTrayWindow;
    1242  <span class="hl kwa">+    ev.xclient.message_type = netwm_tray_atom;</span>  +    ev.xclient.message_type = netwm_tray_atom;
    1243  <span class="hl kwa">+    ev.xclient.format = 32;</span>  +    ev.xclient.format = 32;
    1244  <span class="hl kwa">+    memcpy((char *)&amp;ev.xclient.data, (const char *) l, sizeof(l));</span>  +    memcpy((char *)&ev.xclient.data, (const char *) l, sizeof(l));
    1245  <span class="hl kwa">+    XSendEvent(display, sysTrayWindow, False, 0, &amp;ev);</span>  +    XSendEvent(display, sysTrayWindow, False, 0, &ev);
    1246  <span class="hl kwa">+    setMinimumSize(22, 22); // required at least on GNOME</span>  +    setMinimumSize(22, 22); // required at least on GNOME
    1247  <span class="hl kwa">+}</span>  +}
    1248  <span class="hl kwa">+</span>  +
    1249  <span class="hl kwa">+////////////////////////////////////////////////////////////////////////////</span>  +////////////////////////////////////////////////////////////////////////////
    1250  <span class="hl kwa">+QXEmbedSystemTrayIconSys::QXEmbedSystemTrayIconSys(QSystemTrayIcon *q)</span>  +QXEmbedSystemTrayIconSys::QXEmbedSystemTrayIconSys(QSystemTrayIcon *q)
    1251  <span class="hl kwa">+: QAbstractSystemTrayIconSys(q)</span>  +: QAbstractSystemTrayIconSys(q)
    1252  <span class="hl kwa">+, widget(0)</span>  +, widget(0)
    1253  <span class="hl kwa">+{</span>  +{
    1254  <span class="hl kwa">+}</span>  +}
    1255  <span class="hl kwa">+</span>  +
    1256  <span class="hl kwa">+QXEmbedSystemTrayIconSys::~QXEmbedSystemTrayIconSys()</span>  +QXEmbedSystemTrayIconSys::~QXEmbedSystemTrayIconSys()
    1257  <span class="hl kwa">+{</span>  +{
    1258  <span class="hl kwa">+    delete widget;</span>  +    delete widget;
    1259  <span class="hl kwa">+}</span>  +}
    1260  <span class="hl kwa">+</span>  +
    1261  <span class="hl kwa">+QRect QXEmbedSystemTrayIconSys::geometry() const</span>  +QRect QXEmbedSystemTrayIconSys::geometry() const
    1262  <span class="hl kwa">+{</span>  +{
    1263  <span class="hl kwa">+    if (!widget)</span>  +    if (!widget)
    1264  <span class="hl kwa">+        return QRect();</span>  +        return QRect();
    1265  <span class="hl kwa">+    return QRect(widget-&gt;mapToGlobal(QPoint(0, 0)), widget-&gt;size());</span>  +    return QRect(widget->mapToGlobal(QPoint(0, 0)), widget->size());
    1266  <span class="hl kwa">+}</span>  +}
    1267  <span class="hl kwa">+</span>  +
    1268  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateIcon()</span>  +void QXEmbedSystemTrayIconSys::updateIcon()
    1269  <span class="hl kwa">+{</span>  +{
    1270  <span class="hl kwa">+    if (!widget)</span>  +    if (!widget)
    1271  <span class="hl kwa">+        return;</span>  +        return;
    1272  <span class="hl kwa">+    widget-&gt;update();</span>  +    widget->update();
    1273  <span class="hl kwa">+}</span>  +}
    1274  <span class="hl kwa">+</span>  +
    1275  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateToolTip()</span>  +void QXEmbedSystemTrayIconSys::updateToolTip()
    1276  <span class="hl kwa">+{</span>  +{
    1277  <span class="hl kwa">+    if (!widget)</span>  +    if (!widget)
    1278  <span class="hl kwa">+        return;</span>  +        return;
    1279  <span class="hl kwa">+    widget-&gt;setToolTip(trayIcon-&gt;toolTip());</span>  +    widget->setToolTip(trayIcon->toolTip());
    1280  <span class="hl kwa">+}</span>  +}
    1281  <span class="hl kwa">+</span>  +
    1282  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::showMessage(const QString &amp;message, const QString &amp;title,</span>  +void QXEmbedSystemTrayIconSys::showMessage(const QString &message, const QString &title,
    1283  <span class="hl kwa">+                                   QSystemTrayIcon::MessageIcon icon, int msecs)</span>  +                                   QSystemTrayIcon::MessageIcon icon, int msecs)
    1284  <span class="hl kwa">+{</span>  +{
    1285  <span class="hl kwa">+    if (!widget)</span>  +    if (!widget)
    1286  <span class="hl kwa">+        return;</span>  +        return;
    1287  <span class="hl kwa">+    QPoint point = geometry().center();</span>  +    QPoint point = geometry().center();
    1288  <span class="hl kwa">+    QBalloonTip::showBalloon(icon, message, title, trayIcon, point, msecs);</span>  +    QBalloonTip::showBalloon(icon, message, title, trayIcon, point, msecs);
    1289  <span class="hl kwa">+}</span>  +}
    1290  <span class="hl kwa">+</span>  +
    1291  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateVisibility()</span>  +void QXEmbedSystemTrayIconSys::updateVisibility()
    1292  <span class="hl kwa">+{</span>  +{
    1293  <span class="hl kwa">+    bool visible = trayIcon-&gt;isVisible();</span>  +    bool visible = trayIcon->isVisible();
    1294  <span class="hl kwa">+    if (visible &amp;&amp; !widget)</span>  +    if (visible && !widget)
    1295  <span class="hl kwa">+        widget = new QSystemTrayIconWidget(trayIcon, this);</span>  +        widget = new QSystemTrayIconWidget(trayIcon, this);
    1296  <span class="hl kwa">+    else if (!visible &amp;&amp; widget) {</span>  +    else if (!visible && widget) {
    1297  <span class="hl kwa">+        delete widget;</span>  +        delete widget;
    1298  <span class="hl kwa">+        widget = 0;</span>  +        widget = 0;
    1299  <span class="hl kwa">+    }</span>  +    }
    1300  <span class="hl kwa">+}</span>  +}
    1301  <span class="hl kwa">+</span>  +
    1302  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::sendToolTipEventToTrayIcon()</span>  +void QXEmbedSystemTrayIconSys::sendToolTipEventToTrayIcon()
    1303  <span class="hl kwa">+{</span>  +{
    1304  <span class="hl kwa">+#ifndef QT_NO_TOOLTIP</span>  +#ifndef QT_NO_TOOLTIP
    1305  <span class="hl kwa">+    // Pass the event through QSystemTrayIcon so that it gets a chance to</span>  +    // Pass the event through QSystemTrayIcon so that it gets a chance to
    1306  <span class="hl kwa">+    // update the tooltip, then asks widget to show the tooltip</span>  +    // update the tooltip, then asks widget to show the tooltip
    1307  <span class="hl kwa">+    Q_ASSERT(widget);</span>  +    Q_ASSERT(widget);
    1308  <span class="hl kwa">+    QPoint globalPos = QCursor::pos();</span>  +    QPoint globalPos = QCursor::pos();
    1309  <span class="hl kwa">+    QPoint pos = widget-&gt;mapFromGlobal(globalPos);</span>  +    QPoint pos = widget->mapFromGlobal(globalPos);
    1310  <span class="hl kwa">+    QHelpEvent event(QEvent::ToolTip, pos, globalPos);</span>  +    QHelpEvent event(QEvent::ToolTip, pos, globalPos);
    1311  <span class="hl kwa">+    QApplication::sendEvent(trayIcon, &amp;event);</span>  +    QApplication::sendEvent(trayIcon, &event);
    1312  <span class="hl kwa">+#endif</span>  +#endif
    1313  <span class="hl kwa">+}</span>  +}
    1314  <span class="hl kwa">+</span>  +
    1315  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation)</span>  +void QXEmbedSystemTrayIconSys::sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation)
    1316  <span class="hl kwa">+{</span>  +{
    1317  <span class="hl kwa">+#ifndef QT_NO_WHEELEVENT</span>  +#ifndef QT_NO_WHEELEVENT
    1318  <span class="hl kwa">+    Q_ASSERT(widget);</span>  +    Q_ASSERT(widget);
    1319  <span class="hl kwa">+    QPoint globalPos = QCursor::pos();</span>  +    QPoint globalPos = QCursor::pos();
    1320  <span class="hl kwa">+    QPoint pos = widget-&gt;mapFromGlobal(globalPos);</span>  +    QPoint pos = widget->mapFromGlobal(globalPos);
    1321  <span class="hl kwa">+    QWheelEvent event(pos, globalPos, delta, Qt::NoButton, Qt::NoModifier, orientation);</span>  +    QWheelEvent event(pos, globalPos, delta, Qt::NoButton, Qt::NoModifier, orientation);
    1322  <span class="hl kwa">+    QApplication::sendEvent(trayIcon, &amp;event);</span>  +    QApplication::sendEvent(trayIcon, &event);
    1323  <span class="hl kwa">+#endif</span>  +#endif
    1324  <span class="hl kwa">+}</span>  +}
    1325  <span class="hl kwa">+</span>  +
    1326  <span class="hl kwa">+void QXEmbedSystemTrayIconSys::updateMenu()</span>  +void QXEmbedSystemTrayIconSys::updateMenu()
    1327  <span class="hl kwa">+{</span>  +{
    1328  <span class="hl kwa">+}</span>  +}
    1329  <span class="hl kwa">+</span>  +
    1330  <span class="hl kwa">+/////////////////////////////////////////////////////////////</span>  +/////////////////////////////////////////////////////////////
    1331  <span class="hl kwa">+QAbstractSystemTrayIconSys * QXEmbedSystemTrayIconSysFactory::create(QSystemTrayIcon *icon)</span>  +QAbstractSystemTrayIconSys * QXEmbedSystemTrayIconSysFactory::create(QSystemTrayIcon *icon)
    1332  <span class="hl kwa">+{</span>  +{
    1333  <span class="hl kwa">+    return new QXEmbedSystemTrayIconSys(icon);</span>  +    return new QXEmbedSystemTrayIconSys(icon);
    1334  <span class="hl kwa">+}</span>  +}
    1335  <span class="hl kwa">+</span>  +
    1336  <span class="hl kwa">+bool QXEmbedSystemTrayIconSysFactory::isAvailable() const</span>  +bool QXEmbedSystemTrayIconSysFactory::isAvailable() const
    1337  <span class="hl kwa">+{</span>  +{
    1338  <span class="hl kwa">+    return QSystemTrayIconWidget::locateSystemTray() != XNone;</span>  +    return QSystemTrayIconWidget::locateSystemTray() != XNone;
    1339  <span class="hl kwa">+}</span>  +}
    1340  <span class="hl kwa">+</span>  +
    1341  <span class="hl kwa">+QT_END_NAMESPACE</span>  +QT_END_NAMESPACE
    1342  <span class="hl kwa">+#endif //QT_NO_SYSTEMTRAYICON</span>  +#endif //QT_NO_SYSTEMTRAYICON
    1343  <span class="hl kwb">--- /dev/null</span>  --- /dev/null
    1344  <span class="hl kwa">+++ b/src/gui/util/qxembedsystemtrayicon_x11_p.h</span>  +++ b/src/gui/util/qxembedsystemtrayicon_x11_p.h
    1345  <span class="hl kwd">&#64;&#64; -0,0 +1,104 &#64;&#64;</span>  @@ -0,0 +1,104 @@
    1346  <span class="hl kwa">+/****************************************************************************</span>  +/****************************************************************************
    1347  <span class="hl kwa">+**</span>  +**
    1348  <span class="hl kwa">+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).</span>  +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
    1349  <span class="hl kwa">+** All rights reserved.</span>  +** All rights reserved.
    1350  <span class="hl kwa">+** Contact: Nokia Corporation (qt-info&#64;nokia.com)</span>  +** Contact: Nokia Corporation (qt-info@nokia.com)
    1351  <span class="hl kwa">+**</span>  +**
    1352  <span class="hl kwa">+** This file is part of the QtGui module of the Qt Toolkit.</span>  +** This file is part of the QtGui module of the Qt Toolkit.
    1353  <span class="hl kwa">+**</span>  +**
    1354  <span class="hl kwa">+** $QT_BEGIN_LICENSE:LGPL$</span>  +** $QT_BEGIN_LICENSE:LGPL$
    1355  <span class="hl kwa">+** GNU Lesser General Public License Usage</span>  +** GNU Lesser General Public License Usage
    1356  <span class="hl kwa">+** This file may be used under the terms of the GNU Lesser General Public</span>  +** This file may be used under the terms of the GNU Lesser General Public
    1357  <span class="hl kwa">+** License version 2.1 as published by the Free Software Foundation and</span>  +** License version 2.1 as published by the Free Software Foundation and
    1358  <span class="hl kwa">+** appearing in the file LICENSE.LGPL included in the packaging of this</span>  +** appearing in the file LICENSE.LGPL included in the packaging of this
    1359  <span class="hl kwa">+** file. Please review the following information to ensure the GNU Lesser</span>  +** file. Please review the following information to ensure the GNU Lesser
    1360  <span class="hl kwa">+** General Public License version 2.1 requirements will be met:</span>  +** General Public License version 2.1 requirements will be met:
    1361  <span class="hl kwa">+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.</span>  +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    1362  <span class="hl kwa">+**</span>  +**
    1363  <span class="hl kwa">+** In addition, as a special exception, Nokia gives you certain additional</span>  +** In addition, as a special exception, Nokia gives you certain additional
    1364  <span class="hl kwa">+** rights. These rights are described in the Nokia Qt LGPL Exception</span>  +** rights. These rights are described in the Nokia Qt LGPL Exception
    1365  <span class="hl kwa">+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.</span>  +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
    1366  <span class="hl kwa">+**</span>  +**
    1367  <span class="hl kwa">+** GNU General Public License Usage</span>  +** GNU General Public License Usage
    1368  <span class="hl kwa">+** Alternatively, this file may be used under the terms of the GNU General</span>  +** Alternatively, this file may be used under the terms of the GNU General
    1369  <span class="hl kwa">+** Public License version 3.0 as published by the Free Software Foundation</span>  +** Public License version 3.0 as published by the Free Software Foundation
    1370  <span class="hl kwa">+** and appearing in the file LICENSE.GPL included in the packaging of this</span>  +** and appearing in the file LICENSE.GPL included in the packaging of this
    1371  <span class="hl kwa">+** file. Please review the following information to ensure the GNU General</span>  +** file. Please review the following information to ensure the GNU General
    1372  <span class="hl kwa">+** Public License version 3.0 requirements will be met:</span>  +** Public License version 3.0 requirements will be met:
    1373  <span class="hl kwa">+** http://www.gnu.org/copyleft/gpl.html.</span>  +** http://www.gnu.org/copyleft/gpl.html.
    1374  <span class="hl kwa">+**</span>  +**
    1375  <span class="hl kwa">+** Other Usage</span>  +** Other Usage
    1376  <span class="hl kwa">+** Alternatively, this file may be used in accordance with the terms and</span>  +** Alternatively, this file may be used in accordance with the terms and
    1377  <span class="hl kwa">+** conditions contained in a signed written agreement between you and Nokia.</span>  +** conditions contained in a signed written agreement between you and Nokia.
    1378  <span class="hl kwa">+**</span>  +**
    1379  <span class="hl kwa">+**</span>  +**
    1380  <span class="hl kwa">+**</span>  +**
    1381  <span class="hl kwa">+**</span>  +**
    1382  <span class="hl kwa">+**</span>  +**
    1383  <span class="hl kwa">+** $QT_END_LICENSE$</span>  +** $QT_END_LICENSE$
    1384  <span class="hl kwa">+**</span>  +**
    1385  <span class="hl kwa">+****************************************************************************/</span>  +****************************************************************************/
    1386  <span class="hl kwa">+</span>  +
    1387  <span class="hl kwa">+#ifndef QXEMBEDSYSTEMTRAYICON_X11_P_H</span>  +#ifndef QXEMBEDSYSTEMTRAYICON_X11_P_H
    1388  <span class="hl kwa">+#define QXEMBEDSYSTEMTRAYICON_X11_P_H</span>  +#define QXEMBEDSYSTEMTRAYICON_X11_P_H
    1389  <span class="hl kwa">+</span>  +
    1390  <span class="hl kwa">+//</span>  +//
    1391  <span class="hl kwa">+//  W A R N I N G</span>  +//  W A R N I N G
    1392  <span class="hl kwa">+//  -------------</span>  +//  -------------
    1393  <span class="hl kwa">+//</span>  +//
    1394  <span class="hl kwa">+// This file is not part of the Qt API.  It exists for the convenience</span>  +// This file is not part of the Qt API.  It exists for the convenience
    1395  <span class="hl kwa">+// of a number of Qt sources files.  This header file may change from</span>  +// of a number of Qt sources files.  This header file may change from
    1396  <span class="hl kwa">+// version to version without notice, or even be removed.</span>  +// version to version without notice, or even be removed.
    1397  <span class="hl kwa">+//</span>  +//
    1398  <span class="hl kwa">+// We mean it.</span>  +// We mean it.
    1399  <span class="hl kwa">+//</span>  +//
    1400  <span class="hl kwa">+</span>  +
    1401  <span class="hl kwa">+#ifndef QT_NO_SYSTEMTRAYICON</span>  +#ifndef QT_NO_SYSTEMTRAYICON
    1402  <span class="hl kwa">+</span>  +
    1403  <span class="hl kwa">+#include &quot;qabstractsystemtrayiconsys_p.h&quot;</span>  +#include "qabstractsystemtrayiconsys_p.h"
    1404  <span class="hl kwa">+</span>  +
    1405  <span class="hl kwa">+QT_BEGIN_NAMESPACE</span>  +QT_BEGIN_NAMESPACE
    1406  <span class="hl kwa">+</span>  +
    1407  <span class="hl kwa">+class QSystemTrayIconWidget;</span>  +class QSystemTrayIconWidget;
    1408  <span class="hl kwa">+</span>  +
    1409  <span class="hl kwa">+class QXEmbedSystemTrayIconSys : public QAbstractSystemTrayIconSys</span>  +class QXEmbedSystemTrayIconSys : public QAbstractSystemTrayIconSys
    1410  <span class="hl kwa">+{</span>  +{
    1411  <span class="hl kwa">+public:</span>  +public:
    1412  <span class="hl kwa">+    QXEmbedSystemTrayIconSys(QSystemTrayIcon *);</span>  +    QXEmbedSystemTrayIconSys(QSystemTrayIcon *);
    1413  <span class="hl kwa">+    ~QXEmbedSystemTrayIconSys();</span>  +    ~QXEmbedSystemTrayIconSys();
    1414  <span class="hl kwa">+</span>  +
    1415  <span class="hl kwa">+    QRect geometry() const;</span>  +    QRect geometry() const;
    1416  <span class="hl kwa">+</span>  +
    1417  <span class="hl kwa">+    void updateVisibility();</span>  +    void updateVisibility();
    1418  <span class="hl kwa">+</span>  +
    1419  <span class="hl kwa">+    void updateIcon();</span>  +    void updateIcon();
    1420  <span class="hl kwa">+</span>  +
    1421  <span class="hl kwa">+    void updateToolTip();</span>  +    void updateToolTip();
    1422  <span class="hl kwa">+</span>  +
    1423  <span class="hl kwa">+    void updateMenu();</span>  +    void updateMenu();
    1424  <span class="hl kwa">+</span>  +
    1425  <span class="hl kwa">+    void showMessage(const QString &amp;message, const QString &amp;title,</span>  +    void showMessage(const QString &message, const QString &title,
    1426  <span class="hl kwa">+                     QSystemTrayIcon::MessageIcon icon, int msecs);</span>  +                     QSystemTrayIcon::MessageIcon icon, int msecs);
    1427  <span class="hl kwa">+</span>  +
    1428  <span class="hl kwa">+private:</span>  +private:
    1429  <span class="hl kwa">+    friend class QSystemTrayIconWidget;</span>  +    friend class QSystemTrayIconWidget;
    1430  <span class="hl kwa">+    QSystemTrayIconWidget *widget;</span>  +    QSystemTrayIconWidget *widget;
    1431  <span class="hl kwa">+</span>  +
    1432  <span class="hl kwa">+    void sendToolTipEventToTrayIcon();</span>  +    void sendToolTipEventToTrayIcon();
    1433  <span class="hl kwa">+</span>  +
    1434  <span class="hl kwa">+    void sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation);</span>  +    void sendWheelEventToTrayIcon(int delta, Qt::Orientation orientation);
    1435  <span class="hl kwa">+};</span>  +};
    1436  <span class="hl kwa">+</span>  +
    1437  <span class="hl kwa">+struct QXEmbedSystemTrayIconSysFactory : public QSystemTrayIconSysFactoryInterface</span>  +struct QXEmbedSystemTrayIconSysFactory : public QSystemTrayIconSysFactoryInterface
    1438  <span class="hl kwa">+{</span>  +{
    1439  <span class="hl kwa">+    QAbstractSystemTrayIconSys * create(QSystemTrayIcon *trayIcon);</span>  +    QAbstractSystemTrayIconSys * create(QSystemTrayIcon *trayIcon);
    1440  <span class="hl kwa">+    bool isAvailable() const;</span>  +    bool isAvailable() const;
    1441  <span class="hl kwa">+};</span>  +};
    1442  <span class="hl kwa">+</span>  +
    1443  <span class="hl kwa">+</span>  +
    1444  <span class="hl kwa">+QT_END_NAMESPACE</span>  +QT_END_NAMESPACE
    1445  <span class="hl kwa">+</span>  +
    1446  <span class="hl kwa">+#endif // QT_NO_SYSTEMTRAYICON</span>  +#endif // QT_NO_SYSTEMTRAYICON
    1447  <span class="hl kwa">+</span>  +
    1448  <span class="hl kwa">+#endif // QXEMBEDSYSTEMTRAYICON_X11_P_H</span>  +#endif // QXEMBEDSYSTEMTRAYICON_X11_P_H
    1449  <span class="hl kwa">+</span>  +
    1450  <span class="hl kwb">--- a/src/gui/util/util.pri</span>  --- a/src/gui/util/util.pri
    1451  <span class="hl kwa">+++ b/src/gui/util/util.pri</span>  +++ b/src/gui/util/util.pri
    1452  <span class="hl kwd">&#64;&#64; -29,8 +29,13 &#64;&#64;</span>  @@ -29,8 +29,13 @@
    1453   }   }
    1454    
    1455   unix:x11 {   unix:x11 {
    1456  <span class="hl kwa">+ HEADERS += \</span>  + HEADERS += \
    1457  <span class="hl kwa">+ util/qabstractsystemtrayiconsys_p.h \</span>  + util/qabstractsystemtrayiconsys_p.h \
    1458  <span class="hl kwa">+ util/qxembedsystemtrayicon_x11_p.h</span>  + util/qxembedsystemtrayicon_x11_p.h
    1459   SOURCES += \   SOURCES += \
    1460  <span class="hl kwb">- util/qsystemtrayicon_x11.cpp</span>  - util/qsystemtrayicon_x11.cpp
    1461  <span class="hl kwa">+ util/qabstractsystemtrayiconsys.cpp \</span>  + util/qabstractsystemtrayiconsys.cpp \
    1462  <span class="hl kwa">+ util/qsystemtrayicon_x11.cpp \</span>  + util/qsystemtrayicon_x11.cpp \
    1463  <span class="hl kwa">+ util/qxembedsystemtrayicon_x11.cpp</span>  + util/qxembedsystemtrayicon_x11.cpp
    1464   }   }
    1465    
    1466   embedded|qpa {   embedded|qpa {
     </code></pre></td></tr></table>  
     </div> <!-- class=content -->  
     <div class="foot" style="padding-left:1em;padding-right:1em;">  
     <p>Copyright &copy; 2002-2016 <a href="mailto:jvinet@zeroflux.org"  
     title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"  
     title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo  
     are recognized trademarks. Some rights reserved. The registered trademark  
     Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee  
     of Linus Torvalds, owner of the mark on a world-wide basis.</p>  
     </div>  
     </div> <!-- id=cgit -->  
     </body>  
     </html>  
    Legend:
    Removed from v.2916  
    changed lines
      Added in v.2917