From 9dbc3a1540d607380de6d9faafc80c82348e12ee Mon Sep 17 00:00:00 2001 From: Christophe Dumez Date: Fri, 30 Oct 2009 15:19:52 +0000 Subject: [PATCH] - BUGFIX: Suppress compilation warning regarding sortNewsList() not being used - bump to v1.5.5 --- Changelog | 1 + src/Icons/qBittorrent.desktop | 2 +- src/Icons/skin/splash.png | Bin 77575 -> 77376 bytes src/rss.cpp | 2 +- src/rss.h | 30 ++++++++++++++++-------------- src/rss_imp.cpp | 4 ++-- src/src.pro | 4 ++-- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/Changelog b/Changelog index dc63521ab..6aca7351d 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ - BUGFIX: Fixed man page - BUGFIX: Fix crash on torrent addition (if libtorrent-rasterbar has debug enabled) - BUGFIX: Fix trackers addition to torrents (bug introduced in v1.5.4) + - BUGFIX: Suppress compilation warning regarding sortNewsList() not being used * Sun Oct 25 2009 - Christophe Dumez - v1.5.4 - BUGFIX: Updated man page diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop index 37da5fe1f..02610abf7 100644 --- a/src/Icons/qBittorrent.desktop +++ b/src/Icons/qBittorrent.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;Network;P2P; -Comment=V1.5.4 +Comment=V1.5.5 Exec=qbittorrent %f GenericName=Bittorrent client GenericName[bg]=Торент клиент diff --git a/src/Icons/skin/splash.png b/src/Icons/skin/splash.png index 9b600f7f9e3b69ff5676ac9ab1013e21d14c21cc..6064e0b43d022ae27bf5482874273e6520a6f37c 100644 GIT binary patch delta 10298 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 LB2yz}8ub4GE!BCq delta 10522 zcma*MWmFtp(*>G@KyY_=8{D1X?he6%gh2uX*ADLPE&+nOYtUdpgIfk0++FXy&v)0l ze{cWkUaPCmsZ+aTSM{&e_hIYrklhWdPKAL(H-}6 zTj-6N6IfUJFsGT3nE^SieFfe1Rf%vO_%uiSMhv>XvQ{5@a%+hFMaQ`5;o9dmN4V-T z=hSG!a9;0wAJsWfMQ%|U$A&`Dy)2ZRI!?fmi*JwSqpk7|j)NJIyf4+DjZ!00Ug>jH z?%mIIAKrTI(F|yc2MM87~M5=)mYM3%c00oLv8kvq(Evyf(sY5&zkfnvPGchj8kknN2gd6 z_eg)aPs|$tb-ZTqu%is=$UnEkq|Z&MR2wXx9E8T&a+vb`|GgoSla4UKsqV;k&e`q8 z4o|sCIG*4fJ1jQ88x7-9pst+BUdz!+DOuZ=#KgyWdM}JzC#17aVbMT~^%Ls{_|M5Y zDN@1fq2xiGjZ0^8B5pDNcwOvAGvu6s>?Pyc4*pwYAevI%QMo7Q{PT557d8A58H+#{ zx71Hg=9#K#mDyc3P=6<)Nrz&7aSu<r$Vv zZ3Ie@z(lXBAxAE*Lw)1l$kMcL2dl|09kaDfP*Wc|FxgagLvKyLT;*6Tm@^YsdDjiZ zX@3C)b|FpC$*8AtG8*@Egj=id`~9f~CJm)eZz{c5yv);~^eog+rW7AV+4vq!mo)-c zT9aCGBD2P(i=n1hxUtE4zxmt(~xM5mC93DQCA`h9)#Z7(qBf7wx{s* zLu@^*Xi^NQ%$ygq>?QeZ9m{3i2TGYBin7Ki6I{}4bQxp%*dD5`$bjkX!GE3QQ|I~190-{VqJu} z6XS!AvZcT>Gisjyj{}&tmlKpZmN#Hqm-n3`VZds_^u4)C zPckCvH{aw%9OX}{a@MCI1XvZ(OXwKaZr)Q&qBc122j_X&@I!MgHh%qSFm>GU(EUg} zNP751`698iG6Fk<)ixTJkO{Nt>VSxfLoz=a@%-pr!6$vj3rNa63v_&6YrDaiFV1-K z{L7~;wP3FeIOi+i&_E3>oZr0 zY2Y<*{Po%jM;~RC)hpz6=YY^Qqo*%85rsBbbM{U~gLvX}Jfd1_pl)GKHi70);Y6@w z&`(&(JHm>a_3elaxkkZoJr%#bUTZ6QB6HiSY}=WNHLG(a6KD)do{4FvKssiP?>b_e zpJ0>0(W^R>{^xjn3~0uu5;jDuIHN?XQB)QfaMQ^lPq%-K<60D0!bgiM9cdr$?B8hyWaEGp*zbPp zrWBO2T+Uz)iYd>u6`L%*)nxMSC+|pt_t^^M(Y?}K+x5@^n#}7;``vTQS`z{_kL#rq z9uYHGqI^l!u{kSPZ}W(;?1<_|QG--~zIt=2LR9mpVA~p&m^ep*z{)g^tX<#D7qUd! z3zCo-jD*ahO>4?lzDicxiR`Rz{Y_F75nss^?Lt>XcV`1f_L&k4OOmCR#be7aRE^zQ zi8;`{Nkl1t>?K-#;nz=t;DM8(f2%Kn0*Twjbdj|EF_kKvshYt`pZ72{hmx{=PFCnt zX=Ti(>Pi;W`jD_k`;;2$2YTeRi>CN?|F#jGuNR7%KuKjFZo@JT`)Iy*;2(R8V-HAr zT_0uxHO_pTB&mb@2*dg~lyPJ)v%PX>CwaIMTMa)0!4kv7RCF_U*NPz9QeK;$P+<^C zc{>8Gm!L&+kCM0+s#bm`*Q!YG_7l{}K-_6^raK{C;AjpJa$qJSw%bRvim)=mhh2)) zHE{n&s87L;H>)b=_g{S@EnLA4oZ~7kJ>)v6D)*glcMEq;;dme^k42{bEpUJUL+i_S zKHUZ&fKMu3k^v0_qy0!gS3--V#bPw(G{x1<=x5SBT4$^FG#;)vxVA7YGdP7j*f4Mh z(99y^Axbxvp$Fb~ZjRqGu?=epB&zZ%Z(|EAVm5Yyxu)e^r%42w&KB@HDIfyx!$P?>(YKRP2 zUna_!7++xP8}4BWV~JSH#m|{LL^IMEy9fc2|sHvg0_IR ze@k8YHb>f?QK7q3pYXT6=DmB|6^S{}#X_Y-f){q1Oeh{HyhKx@>a`Km;Nx;M|AzGo z?)x-2yJ_r)GHaf(k;HTpe0izA@>R7~G9mrQ5#QDs{l&_d`gE<5Z8jO{6L?p$IO{aE ztpci03I%#2GTWIcv8fn1wcGokWxRF?D$4Ojq5r%_^ra>WCP6C$5V` zu22A?_G-wHsr%Rbw4eM!y{hfNwqwc$yU2z2xJkTv<6Tr2?~w(jcZ30%N6FwRTYeWj`B^5;RlT|QIlwbZTcXfd-$ zuWf_Oa#Xs}8XSp6^?N&69Gt3ziv;K&E()e|XW-g9T0x*))jX;+i9E<`>R;R1@MERk z%dy&#KF(&ZJquojFx^7GgE?hJfmat!$oY(v^uR zb4@YQYO%Nij3|aR7vTnu)y>3hBb`u-6(S=NCZR+ssM6Ho*!(AJ9V%*)AJ|Kn4(eSj z%rN(fk(e3MR$vNGvRO(>Doi0(rHAi$bZO?}ZsyZMoKMrJOv|g7>hOU00UV=Dp#J>^ zt!i;W$}#HXH$U+V009$=qtUv1B@Ln%6B2+cPefLHea>CV=mqKbQcz$=oF7?B`D--J z`aNq6a^>}C=Hh&|czQjUi!X!{j}jCyOR31=r2=-SeXnB)mh8!!rnr(%{>(>yuN%1h2`G`EC| zNB1<{m8f9yIR~+&KP7>eB%InNN^drFMVkhSp6A)y!G!A((W zp$ZD~qNXex=BD>T1 z12b#;FgK9TjI7bl$xY_nrHgB( zjlmqI+V&1b1Lp@WP05zwlrTq|)lKd2L9w+MiGpqL*@cEG0?!a6{{0&PJFigZ3?;iQ z`jFt3!n7)o z-LKrft0OlkOp}^w?mbH3YLFS6SkEpj9qHGUV{a`nzSBpxNdE(Jzp-kANH8ln;qB(FTc^o-!bZv}_?*S=DLNT*g>~3vdJBn#&j*&+}gm$e{tg(T) z6n~Ege(Q2gT0a-j;!pD_ICXiD4~jtmjJpLI)9NSbksFVc8UpTIe9zwp6F|k z92%vD*?4z156qx8gtWH4bxj`VIJ%z@AcWG^QAh9^D)cOqfM%q9yfhZcahhevsFf)! zqA%IhB|~@M-~LdT=(Uj`t#CrROXt7mm~SSr8d_9(vFE1E{-abVUq#!`SG1`Bd@(NB z1ip$erL%WBSY&!$%#LQArc-vd%xB%>hIrU>Lx@YuSz+-+KO0CpOFZcq!Ta97hp5WWPoaRuOfzona-a(b#-8tO2n#qEi0SN;rV`OGwDORD)W5ojL;WSFpMfpW; z0ZNkkPos4`UDWh(-*{6sP@~bPb9ubDyS|OCUet`pNnVxRA#X5>;iOKU=6Z!FN z^WgwlRA2IYWi-@w01h z-HP041?wr4v%7kzMwy-b^xQBEX|i{Q5PU7rb7to)I6Rga6tNMntwhO3)(*UudO>)B3m*wR?V**Q6uPX z20yqRAxtu7fUQ%3Cfb(`E7O)GW|uMA&vw2ct2YF`G*VNZ*^4_LRd}M9UPd9SFD%*} z-3-3Cb8L48bB0-Db@S^!o$h%L9EepT@?3WNsIfA1ce7fPP;R418RQX`77-DJggP1I zu4HS{UL3DMa=SzHQ?{+P_EqS^e$>xp3ttw7&M`JufUVTq<0mhL==oZw)A=Q0nUkbC zu@uYu;xa6&ovrCAGmgCk73-_|_lGPE1_7zq8Qv-!O&;V8P5G&QyO(}q=U;mImoC3x zMv;~H{H(Q=SL3zIG8vlpJQYe!oRkeZ+$o@!A9*^+=N%Hx7u<*k7Zycx+Ub17oO}o= zV%a6@0dP1CSR|W3aYf75K{wa#tL4+WKL*;%2Rb5U1OKv!U4@BG94o2DkO^V`P1#x0 zl_V}wq1JA{0jtuJ34NL_Zz;_fS2`^y#BGZ!`G_1*Y3J&|Arq2_U53{$uz4pNI+a;p zEkG!xJ16ZdLuywvZxUE$QP|t0&u{U{?GZQ=4!8yhkWmH=t$fx)*#5f1JkV4^$Y-B_ z4=Ej-@7-!d0YVEKtTc2qKQ0k3mrLGhU_0%(5u zor9zk$t+GPC=isrq2DBNhFM7}Wf|3!s*6KE4;rQ2Kaah=&e(x(5^T36_-Hpryw%z? zpD!*eF6D)d<%mbWp{O9vIz&}$i)N?~EJ-(*&vXN|`5;eWS5MTmUllT{U`9~HUnIkn z#bq;Qsfb_5Qz?3%`6{POkyb{UKBibB^J~JjRo&+ z5D&PSp1)}~yrIK9jE$7|cHcVkREy!8upr{g093Ur@ae+BvDGvTH*%CleGFsJnWlUC6oIjH}|nCG~QG8QiXJ?fWk z?6QG2DHd3!lDDy&Xp~(<;56#Uvf|W=I~i(5j;*x*y)MFCpq{J>#b-R;zb62C;tI*({2&f};CbqK#z zz1x&m%iGYGNyt2>KLn1`Cn#*eTdNsSSHpzJ9Qu#L6SP2YM$JC=6ksJ(t zEDII7yJjTOMxcM+V;jbWP5{n!wXv#G^*Tk~st})MCdy>?B}%t7#xXt)6pX#Bz}5`X zmKae-_~I0Si4a`W(l!$J3i&?!2(N?2+t)%ID}RP72h01$mY!^xpf^;dwwJ*Oc4X)7 zduKc}rjpBbXXp>UzQFmXue!HflXjs7%Ir5^y>yOO-n=_)rAK7y(bzM!4MVp);wfDY zNY+*@NS5-H3$tQfT;ym((5E`%8L*xn9V6Afd;jf?(M~!&0uv!OnXo%+&$pkuN9);M zR2-^a_lsEN%1N}gf6`L@a@_Q?%l$W3GXGD7fc`@x_jgzSO}VS!s%hi=_xlra#5v;1^b+nc|l& zn$~8uU(g>7ySq48JPPzYr=_ZiXg7$v5hki1ldnnIVar*9zj5wY6XxmZsOY#2tQ1Iv z&BISQ20>^6^pUo!V*8GcHifuOKk%Vx*rYuUI&*mTg`X}Y1#LpmzH+)x0)iuHyMw9w zu;|{#6A9*;?Og5+`NRtl&bOO|pGZcABcuD%O)dUZL|FOlwej;`teWr*l&*MM|1EFt z?Gd73hvdghdOPn;YmGjL;nrn+yNF|A?Eey*;YY&vf&>DVQ>}{GN&2`H6yjmpK&BD@ z?(ke%0r^`>U`_QeRqDjYKFE)?)PfK1ApHu5$TW69v?Ryk>h8oN^ZKJ+q=61cjYVZN zCl#T2+n{^vQC2Zh7Y|a!lBHE1Y=m3DGx% zdEQ@#sD0{{y9{0;81gbms|_tjDvSw~l<>JoR;5Y+^!N3`pTz?7byqyyq%8>7b^Gq< zYt>`h+5Co#^ko-?+yh@GR`tQRhyOD z(vZr3us5=Nw<`6;Lyt+}RF(EUTID2P+<+Q6{^{rXh{*b;cK#8akpjgMPC`F>!`9By z3Q!Gl)rZ84S80o_ViUbwNiz|1p@RlA?V`&%+r0I&7sZ@u#4oabdO2lNeMU>@m#tYmf6Y3{^$V%9>Nro=X>ek`zOr=*%+H%i5V1g!&e*>6pj!_!rFfu<(#u2h4ZWraGppCIX%H{A1V;U9R^e16(SLRoZ7!ovqY-Kym#e zqlahtzmg8k<6!l%tms;5gbeCJ)B>M;O@9cq z@-FYq8*~x{X$fs9KQX~ndAvl5HftX4a480Gba)rax(n&!$e zWh!=YHp*loME0{*XYW}_`>W7S05KY`*-8IMVii_uTP!U>AX~DWBiJsLWuPFjdOlKu zU5aV$>qM2D`F#)j#YLochw&iH#6kK>FUKA|h*fMox&p|X&+9ck8SFrBU4>+O#ay*I zae+mV3TH`QIXUB&PmAQ)x|;lp^mga9l^EE7M+vh}7@>Wc63>R=*}D?pr7~sjLkjEl z-U97kcTE^n8aQ7hcCYIoCePCbZTY^kul;WPo3B+Q?@SG!P-q#bjwN4niKj^(k!&uo zmq34h;boUZCoN!pw^%P@@~LiP3Cl5zL9|}_oZGQ2huv#p7q6`+trGLJ=V7O38$;~d zO(gj#=&R^NR?mr`UW5x*T19L3w`kw$3`Hl6oh^^-$s0V$fGOOjT`~_H5f_(U{*7Iv z8H_bj%|L8*5;z24Q!DKs^;>-4W!~BUU=8D-nGazVY1<79S;}*no_EUD`c%^rf2Yt_B9>pS&gsn*pE)diewN;8_E6 z?KpPKy<)43)hX|!*9BAwSI8Y-o3sQ3-xfI4f8gpZ zdrxFl$|!Zfv+6qt(guR#+tE%%D*2??m6iyvmL&*f%rx9Uy$JAe3W9CUZp zwcf+vx66tPpN52wZRM8f%QN({cygsM&sOzxr}NYTdZ*R{+!_pB{$`I~&^$|W?2f6D zPeb9S}G<^<8Blnv-%q-Unh>VZnR)J%}(xhRI!9xb&mg4FWnAthu^|URQD?aN!40_Xe$_boA`%oWVEJQ zrv?U5F(O_IP~@{X_cd|A{_EAWw?Y7QBi?c`W`4Dub;ICR>LIjfWEfJ#jSfd;pIB3wWEi{ zuVY9suCS?i2A*rOVR`@3WYE{5)(&jIo6y!bdVJ#kazEG+2&YGKau8^zw?`9IqTGn6 z@%95Hf|#=bI5=AJ`Zz+Td{M7eqqR!66XNsyU5Q+=i3I#-w^l82V2l-8_o4l(!mrt- z%}4<4FRbD?6?snPV4QcE0^H8D_n~Q~lfti1Kjlj+8NqR$jWay{H)3oDq8?(6^T>B` zJ&%Ixw{cYk(=u}>|_B}l=bU^AW!&Ws6+9l8S; zUIklby65XX0{w?3{%~E|moYV+0k02o7>%zlu*U?J^SLDozbn$mq#ewy6##hZ*Spfc zm^r&|;8y)w{Pbd)4Oye`j8_vEpo^e2eY9FQhuiQ)0av!dKy-X5|8j8%-0i)87{?(J zzc4mM{RIn(mp?UYE-87=SfQ7NRo+=OW9nEaWzJlZr877+Ohz+<#P)Zyj|Z8QC=CSM zz7}bVSD*FD!8OY21%9=pz!g%?ow&{_wxiO7W>q6$HOr-K@!~Qu7wL`RZ?c}H&Tn3L z{2-!LxKQCp#un3BDL@J{KNR7%Q9yIeLn* zdzR=aJpFa_i}a!JUZgh`=4im?=WoaqAw#m+GQ5wiAKyaUQ2FE*n<4 z`(cqX8<%xivX+9RImB=2_r{Q09P~)B_e&JUZ+7GT#f<>RluE(4`whdn&}mO^M!z)} z+xt{pev2#ql=G7KWb`t@eZSQ)c^Rs=_V?w{(eGbxg@5#qrTRb9jpE&y-TR=t>6cfG zuJe$mDH7AW@Queh(3&=_8xn*Ub09LC<_=Z^gC+oTYEKB%IEXIUakIvIkQoVbd5ECyqeO!jVZwPPN}NZU$i|>xW7{6|b^F9+)$Md$>$^02-1jVV{SN9C?5{ssY>)oj2fByb;l~m@_1I*bo{11F zGkaKkkN+I-c~+?clqVE?l-b}A+8;fFw}b=UoS+y+5reOs|jCvz?D{7@9`6{C9W&HUaM7W+A&c5eLkaq&Gz9 zj}C6#w(r^d7BYWN*?(Za2<&?1gjK2ovHq5xov!L1LFlk)0UpQR7kku4d%j?jBBVm& zS2SW{yR@Kzv$=iy-u0KeNbf^;JV)4!C$||!+w4)jQN#Q!5ul>?hpYgyLFJw1Pebyc15-`SW7a*J~5Vd82UaDg0mmmmrBKznRVx zp)i}yqcS|R_*0*!er2lmI;gI=Tv7mQbKaoLevnu^Zb%DV7H2nVQ{j=+^}l8rw92f` z$fT}V(9|Pih$E9JFf-sRjlKLKhPRYK<2Q1DGwh#BTQ!cu>~CY@Lse@RK=#LeLiLLY z{`vaL;Nsize(); if(nb_articles > max_articles) { - QList listItem = sortNewsList(this->values()); + QList listItem = RssManager::sortNewsList(this->values()); int excess = nb_articles - max_articles; for(int i=0; i &list, RssItem *item) { + int i = 0; + while(i < list.size() && item->getDate() < list.at(i)->getDate()) { + ++i; + } + list.insert(i, item); + } + + static QList sortNewsList(QList news_list) { + QList new_list; + foreach(RssItem *item, news_list) { + insertSortElem(new_list, item); + } + return new_list; + } }; -static void insertSortElem(QList &list, RssItem *item) { - int i = 0; - while(i < list.size() && item->getDate() < list.at(i)->getDate()) { - ++i; - } - list.insert(i, item); -} -static QList sortNewsList(QList news_list) { - QList new_list; - foreach(RssItem *item, news_list) { - insertSortElem(new_list, item); - } - return new_list; -} + #endif diff --git a/src/rss_imp.cpp b/src/rss_imp.cpp index 7e484af39..814325085 100644 --- a/src/rss_imp.cpp +++ b/src/rss_imp.cpp @@ -431,9 +431,9 @@ void RSSImp::refreshNewsList(QTreeWidgetItem* item) { qDebug("Getting the list of news"); QList news; if(rss_item == rssmanager) - news = sortNewsList(rss_item->getUnreadNewsList()); + news = RssManager::sortNewsList(rss_item->getUnreadNewsList()); else - news = sortNewsList(rss_item->getNewsList()); + news = RssManager::sortNewsList(rss_item->getNewsList()); // Clear the list first textBrowser->clear(); previous_news = 0; diff --git a/src/src.pro b/src/src.pro index 62b2c2463..f9ed8f4c7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -14,10 +14,10 @@ CONFIG += qt \ network # Update this VERSION for each release -DEFINES += VERSION=\\\"v1.5.4\\\" +DEFINES += VERSION=\\\"v1.5.5\\\" DEFINES += VERSION_MAJOR=1 DEFINES += VERSION_MINOR=5 -DEFINES += VERSION_BUGFIX=4 +DEFINES += VERSION_BUGFIX=5 !mac:QMAKE_LFLAGS += -Wl,--as-needed contains(DEBUG_MODE, 1) { CONFIG += debug