From a1dbab091d565c583c2b3f50121cda1874aabf81 Mon Sep 17 00:00:00 2001 From: Damimani <41192030+Damimani@users.noreply.github.com> Date: Sun, 1 Nov 2026 18:48:06 +0100 Subject: [PATCH] v3 --- feladat4/UnitTest1/UnitTest1.cpp | 9 ++++++--- feladat4/feladat4/IFPQYY_feladat4V2.zip | Bin 4582 -> 0 bytes feladat4/feladat4/IFPQYY_feladat4V3.zip | Bin 0 -> 4460 bytes feladat4/feladat4/UnitTest1.cpp | 9 ++++++--- feladat4/feladat4/cmydate.cpp | 18 +++++++++-------- feladat4/feladat4/cmydate.h | 2 +- feladat4/feladat4/cmydateexception.cpp | 25 +++--------------------- feladat4/feladat4/cmydateexception.h | 5 +++-- feladat4/feladat4/feladat4.cpp | 2 -- feladat4/feladat4/feladat4.h | 2 -- feladat4/feladat4/main.cpp | 2 +- 11 files changed, 30 insertions(+), 44 deletions(-) delete mode 100644 feladat4/feladat4/IFPQYY_feladat4V2.zip create mode 100644 feladat4/feladat4/IFPQYY_feladat4V3.zip delete mode 100644 feladat4/feladat4/feladat4.cpp delete mode 100644 feladat4/feladat4/feladat4.h diff --git a/feladat4/UnitTest1/UnitTest1.cpp b/feladat4/UnitTest1/UnitTest1.cpp index afec52c..1e98f8f 100644 --- a/feladat4/UnitTest1/UnitTest1.cpp +++ b/feladat4/UnitTest1/UnitTest1.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #include "pch.h" #include "CppUnitTest.h" #include @@ -97,6 +97,7 @@ namespace UnitTest1 { 1972, 1, 1 }, { 1970, 1, 2 }, { 1970, 1, 1 }, + { 1970, 1, 1 }, }; int dates2[][3] = { //expected { 1970, 1, 2 }, @@ -107,6 +108,7 @@ namespace UnitTest1 { 1972, 12, 31 }, { 1970, 1, 1 }, { 1970, 1, 1 }, + { 1970, 1, 1 }, }; int counts[] = { 1, @@ -116,7 +118,8 @@ namespace UnitTest1 365, 365, -1, //technically allowed - - 1 //since SubDays calls AddDays, this counts as its test + - 1, //since SubDays calls AddDays, this counts as its test + -100, }; int testcount = sizeof(dates1) / 12; for (size_t i = 0; i < testcount; i++) @@ -132,7 +135,7 @@ namespace UnitTest1 } catch (const CMyDateException& e) { - Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last case + Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last two cases } catch (...) { Assert::IsTrue(false); diff --git a/feladat4/feladat4/IFPQYY_feladat4V2.zip b/feladat4/feladat4/IFPQYY_feladat4V2.zip deleted file mode 100644 index 6596df5b04e461ad8f055e579f9c6bbc0bc66ce7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4582 zcmai2cQjmU-yK~D8H{c)dKn_hRii{A7@de76TSD|Ye@8Nj2a42ojyB zBN#3CDS~&Sx!ac17EnHoz45po_ZUKXwUz|tq7O5hlIhOOxwC<6X-|c>ZQ+9{g$tSmm zvz2kn-;S2&V$5YOnTYvB;U}($MRi-#Xv4j>F6P7$B>l)yirm{^AE}6E`R-k)o5OgW zy^cEzCMC41w@!z>^WO%0xB}u2D@ga6?#(4oCDwaU^aw8`yv?Q(YzbbMOxe@T)GQ{B zXno#|fO8%kY2hQuybryxM8*Nta^OwJHmf%7#1_&$6=*m+jf89>cfx=nw5>7fIO^Cy zN~d`cEJ?A4mQPS#R&+U7d}6l4K5hPuW@VKoF_+b?sGHjH#xdMd>b%=;=_!Z)Z5zti z+EMT~$>F756;{Up$Ai@89Or!X&OfOGm(C%RbMrRz2n}FxKbham3+CpajKf8t>%ETR z!Tq`YI6g(u#2m1~4<;gfJpP@_%u=me#Ut-Hl3te1Jc4_x(jT;m&@gwJ6)AqE@pwu@ zCoXS}>g(_rqg-_|SXGb!%6`jCkjwU3&(!iA9At#4Um2=`}m-<3B zHpcMOFbs#BmY!!;h7_s4u#5JML`mgRXin8)&OD>QZmeC|Xqgy~v}WPB&#{0d)-?8) zO1MSKw``}`^5Swq?-rvKps{Zmxl*dCErxZr#cJz`TIlpsrWtL7js`jJaA3{@A6m8_0m067f&q3!F4uX&TTQ)28 z47rivOj#eRkLd{~lDA{T`izv^xTh^L5no(aE=K8lO*DrrYl>LQ1?MxKWIWLJ9o16d ziLMO0jjHWz;XJzDtd-{Y+yqmPpDQG!-8$EJg2CWDc^?oeHo;cJ@5mb^$8s*yp@UT4 z1u&b7iL4*LQ<%LomDKSm?ngC4+1XMJmyT30pV2_&hwVa}i8N|7B++;7$1LFB8SHge zL6>iuCO4AIiWVl9Ax?4=qIs|IL#rf|vkzER9L~5aK@STZtaV(is>)s(Z_yn~yxxsH zD(v|3u}}Y1H^WrXd;-pyS}WSW0zqx1ZGl(-YdPM@N7);DOBoB{l}|hRB~}?4gAwaW z#gL6s;6j>;sJ@)jm%LKm$!_0AyY;1NwFa(gBW93A>(g7yx)RzYpPpd*Us-miF-%&( zV3i3t@#_;c*ZEdw$QRq7Lnh3HFr6HoT_< z(t<9Ag*kzR2uRYm{>FnJ(IMUk#_aAn-lE;yxQSrSe%oe^LBs0&#_jA+c;o(-Mv3(_ zzP33PXGrP8mkg`q^Srx$0=lnV(pV6ms7Oco0iF(kzDOhQR@Nn<6NLo2&=@d6+u=@llM>ErxUwio2B*}h-n2;y?g)ttpNq9b-PHq4apraNGS&UTd|uty%qSNj#TN*w;R=u2Jmm zs6JWCptx#{SiU1JlUL`G4K!PcHwawL=b!?y9*tHz*rJSjZgY&5!=WFy z_4v*=Ps878{Uzr!mvWx1#%aca0|4ma0sz;p$hmD$GRz(=1dN^(J0i!6T9Ai~TGjK3 z37BP}MDgG7)d@`E-V@HC1P0A?+pN_+6AUacgQWaS!iA8cW%fh%Mvg8HU0$0U%GE_T z@6dIE#@bWMckl!6{J{K7v6A{c6WM7sUUVpcJ50hvNO12?M^O1=j$46|3iSiLyw2#k z$55qb>6t(-1^7p^h*%V|-=7#(yougnpUO+6e9Xr1RIed4Tm+&%%k#K6uiPtMBz`YI zauq~btB{svvl@@^8#XnxFNx_vxssdt9J|?I<;zK$4D#9F*eFho!)9DThnc*rR0ej0 zxSxC1eW*oK#lyxFDzA_r8{Y!8XDugvZmDfwI}n=IQtB|QKgFJO)k3`O=6frem1V+$ z@tbF0z~3xxT(ZbdJevB)C5s}LEdH{}|CpkcuZ5MXr=5%QFLw;m9#Tci17*dNeCQSn z%c@W``&!@29$>VzK!wG(Be(2P#W_i8F@@jJOY}1Sm?WYf)X1S5T+}kq&A`30>muLs zAED>{-TWvB5ixLQg~(;Uqowmiy+_4&Yr9F5YX% z@HmsnUci{13Zt^h7CzH+`FF?5WDkh^?THn<*$KK5TqU!L8@d=YN=8lNTW;HfjMCw; z!6EAVDPy8j%-LxXM$;ET_B0RD4JS&h3)vdP_7wzNQOYX~lhgjysr|PeqcW5~@cGfU zCs!=Fg&8kaY_K)7<1`X=RVgCKL+~tmmFgenT3<+WWPc=-`cfwtbOOtAQ2*-Lqj^W?{CnqtLOVz01#Kgs;evRG`yK+p7wtoUUVm@M3Nq6Dko# z2Lj)QDi-U!fEANxYz734w4zUsPnZ)~HZ)buwIAwWK;bP#b+4dr(6d8lX#Xw2in5(t z+X%Pl0*=M@UY!P-R}t=EU6}-nh{zPoO27%H8bQwSSM5o#FsA?xY!n#|9-7TGT^3Vd zSW&&pew51ijWWf2D~I+=hqJkz8tW1+tU0{1ir9^iQcQ+)0FAjW47tYD8)3!-ZDI0R z&~Z{|#)$(_aFmNR&YDNx-n~Pps#6D^;~~RSOu4H1QC<5X$p0GBraUD&AHp zbyt$Hx8)aA=2cZ@LiIbayEl;yJ#I)I?9n*Sy1@OL%`ca1LNBl?pD$Syzhsp7^6CV) z`}0k8(olH%P97-3*vCRbn}JW`by&k1-BwA$j88xzL!R1modewOIa(mg<$}3(oJFO* z%jzj^`oQ$w;c3MR+qE9`p=h1K9Ha6Qlmz?_Q>Zv&Q)Nit4!TBTAPe|GVO&FPIHbC= zzY0`b_pq*_o=^Xd=KY)B+ml@!?Z{j@`Pf@^5$2rC$9X&SG?wpOfeUK^xfgz7-ZTyE z$!HxtXO!wHjaa=yIzr-z`JDW%kSjIH#%9teRs*<(teVRc@e9OWBVkdHx=EmozrIDq z*(p-M%1heQF~3LsclVz!yWis;`dEk$0JKvB0A!clKXA75)U)#Ny!Gp29Wpp`9v1>$ z1f*igOCg1z7Ez7+Z~<0z#|{oYd46SEgjPm#7cd1V?MQ$X3Ls>L-|UebzMoU9IL=?_O*>`k20wYo+}d*MVZQAA-1FCseu>8@T4@kU zae88Q%Wml&T`(q_PFv90Ca*5^S&Y%Qe9Z{#VXVcq@>VaNwi-JggE{VThQizp1Dqg{ZkhDM1dWHE^^Y7GhR+JrM_V1yWa>W4ooEQc$?(w9#}f;9e!Hr zS;P45A9v@REm{cV+d%|Z-yIEFc(dGRJgPQ$^5prX%Z-M_j9w(3XeewYGQeW7+m#KH z6ir4MdCXRL)c;-O5R|9zF6O5^HjmEfvs1)W)PQ%GtWsJ-A&hU0xk!mXYQn87nN>!}OV-Gcu95nQ?-^mu_X0vT+_7&t#% z-DzeOskGK~7Q=ilKVrxB)J|HG{49o>=p{-LUdr9WJ8X%c%{4f#?@%Dx^XOO?+ns#j z;pMWAP4TE^Zq+7AaTa(w(>N^ZkZVYx<;9r2`iC^;HDJ22h)Di9Pt1{uwHEvYo?&u! z4hNBCU&I<|2izJE!bG(u^|lxcqkrN#)ZKj#_Lwnz!?K&1(OZV{FBplIH2UE!<6h=j z1l4UyJP?ICELI!Ek7+&8=)Lh1oM;45(~6o3*A-g6zO1X6;KZe-(xU4l4&IM*l;7^N z)4>-mS)CkJkB}q~Y)pEwdD76^VD-T9n_E&yvPFLZZZ@Y)YL0J!8FA9O*O=pL$q;sr z`5yx*^w!RVgrGL!GJ%)l^48@xV!@eaNiivYT>Tj5$H6#XS@-M1j*Dg1u*?sXr0CZx8@$0NtJAwZJ@;4w+*u1g>2 z3=AO0m+dKWh=Lr19n*P%WMJMAIaYIcEbIop+5@_+F zFZ0~E5Lv`QKNeHj*oAOdt^^I|@I2I|qyAhV=)KV~%LtNZudq$T)@k4Dt(l`no0*+@ z2Ne6|uFtfqR#os+RdAIVsOi38S}3O!T~~3nidU{Tw<4xwsIBR!w;A=_&c2>L- zBf=3(q{qTO4`ohF*CJp&1Kfea*XSYKA5Pt0-Y3^V-2JGIB-GX?mv84D#WS zzf!Yg%hk{iV6yZloYoNvZ2bB8Y3SN?UnMz2g+K5dPYZ^FEB9yC_+P)}9G80bYq0)# z{wt6CQZ|zROyU6O07gH9!o%%mFXjKA<0|;?A@M5s$mLGJe|G?EuR`zhYWw^f^zX^( zDl|3GU(o-^QCF)>ZmUH9Tb18)!__K5m&W&7TKh*QYOc>B|E=mswl2GM)(L`!tS=tT4q z@yT89d$0TDu63WY&N=Hmf9&7+?emnXzP zSt~~$YfBHCyH+kPB}T?hw-w1Qwen`O@mb54X=k?Y;o~I+vXZ0d^6*$hQ=r{nKKLKmZ45U1|Je4xU0Xm$>>x5#gX5=uo~0l% zGLhSSGq3i)qFXUU=jTn0n|N6R5I6|O$a_inCvCSRmx_Q|SlVv>n+K7Ut{#4s5RvzJ z7{I8Aiq`p`yIZZfmoz{UFJR--#tZLyzJ6og95!kn7HzJKVPoEq!6bAN8vIi4bO7js zPq_Rr?jhRjTi1nmw|9889aMDC7#F>qXD7GHmd^He zSm`!qH+{8zSdq(r$*(DKNhG(wmtenlnj7QD6(x@j!`#&;oy|aB-iuiV&8TO(I=i(r z=CQE$=8xDqL8vHY(Qd%>x$pV$%lxpyg4qQNCpEgG5(#RIR`V?7FC^}9)U?$K7F9jW zd-)tg(g|ydGGr_P0*x-^>*Lxeym#qh5#(X3Y6(d0T;nYgd)Zr6=IYkxzV~QdV>)tI zxEm9C`}UVFd8T(xJaa$g)e*?!VO!3C^U~CmT9p%bLnPpljy+i8m(dp z@m6ymvm_b=SH+3YJx?#A+e&wgsJc8SZBItfb^_5$30yM!XXdZZI~hwsMz3UgKhq6` z9lh%lO1h%-R?3K0%Khwaq-H^uo)?_9C(586IDm3kD{-7I8n1KTgb^WkX>(iZQbCgT zsIXodCyo(`={uA4*~Yp)VyisnSe=}QuRe0*ls7A+zi}^C)}PB3wZ5cOLWo3mZ59m9 z5Q(9u+c^C5o#y(6RTYNknU|fO2%9LK6&j~br16+Np{)DlS&e z_TZ7Po@5z=jbd|i8oM*AztmFGisIOJ@rlY7{VXF56AvVE*7R*pQv?Z_%MkI?Y?^Qm zWi#u8YB1iEn`;7Tmg!HDF=>tg^)v4!lSsy@eZWb_rj)+>VgI06#ZL~IRqIsrB9jqC zK=@`l=4R+p?O|GipJjSnd{9d%X4oS}z1XUH*;CJ3(in>vj&V*T3t2vcUTNZ~vx6_Cy)~d5$7HOp!jC{rb?ilpq>FAx z-6^|eZt!VBBN4EPfFnaX$qu1x^Qzb8=h-?EMBCK+=g#DtwspFL5p}7fqi6?v((#`O zgbnBZOTebpEH~OVcw=JJ@Q)DdU`%Y_`4sV>VSimXHbg8YbUIxvdcikwk3r{86|cHh zaYSsCxhbxNk%}#HiH#`LOzV*=11^mf2=cz+wGci*?lHYa zC0b)r*@)E!=nw2YM!X@r{YfV;2Zs`Y58b>^&UOSYu}44=3;mJ>2@%9Oc{0+@;{)!y zeR?9QqE(^pdv*Qs(iOM#3~D;hDe)@=`CaR}sa%Ygk2?_Kw4WM!;cRkG>FUiIi;@t9 z7hBTpST>OHi3f3M+ef&QzQSWrNcrdJcMDJ|XBDf*cPoShB>?IE8{Ytbu~>S|V%r>@ z_=juu*00ZB4*6d%w0U7=^rl(T86FJS9C*Fz!A{t~rFmv(xa9OlL$X9zF=;=d9@8trRx^ z<_|A^3JI4`P&9+Lz$Y#oypl&7m!zxO>M$b;^@A0y8}%t!9(0zZLwjUF~*5Xb>G&D1|QV zwqw0Ob}uM`afiIdYq;8hw^Y*2KF44>4B4=Ehm8+agdR8g!boexz_)3I^Vr3ufFdSv zq$S!-_)%OoxMO5a-nOH4L%h5B{ir?J5I}#BsMb8CYp|>%?1d_dbLcan3>v8GZB*}C zUqB3vx=*nK)X=KZGecyGD$BwjBP~+y+A3G};83hE)xVQ4)chf)qOM1;TC5*DYBT?1 z{SxypdaJML1^E%|f4Qbr;+kT->${^R^p7RusHGUyra&gc&;ul(d5cZ$X>3H+Zf=M} z8XSzr6#mEx7ZztNWvc^(OPs#;9f&M^K~|Ucq3A=-#ifCJBKC6rGi9DtO#uUa6NFIO z-M4A6CX@0_CzeJ9HX0G@Sx_#{wdTi@D~1GmQ+!hs##DUS1-Z!{3q2B5m0{HuNr`hj znq?I6zQZR(gu*uW@LUfYhprmvr3oPmJ(fJY5++FZ=+vo?YMP9`qygbiXln>&Dk|(t zRJiawh74VXQ)J{WutVdS)02a_F^`TTVT*J+32$($7Wd8w{_4K&mjpGLWE5Zn0B2MH z0P%JA22M~9u#LM1=+|E}Xmsf`CPa4i3Vuvdz>-Z_C#v-v;)qu&?{UfOTjM5p$BPs_Em;dqm!rpa+%+JflYa1bY@pncNtBeoW;BpYG|T> zZ}E`?EUu&LPcr3}7OlMP510-d1--Z(!mEnwXU2M>g?=oGfO1R+hGc9oXvjY{$!Fs3 ze7oIE0ruX~d1*POQ`VxLUoCDm^h0pbWPyiNAgwK7O1C8hwSFQm%w#f;inv34c%iS> z5R-5z6VXImv{mbZtLGGCUEDLd`mJOz_S4e$^@C`Mi|%fS+?bN-Q0VuR?rpg^@x3P~ z64D2y3rw~^fq2PVwt(aT{FAP(=p_{;W?}|*yaQFG@9;7BE{{yeYx1+8ZCTKC*$i$4 zVe$^9Uko=?IT<`6s}f6K_jLhoJPux;r?jIF(^V2AB*vk4yakHOzRAd5M2j= zs21);D8S*FI6^BTxTh~5{Hps)?S^fs(>24Au_MkGnq4$oY8m(^C;MLl3J&m3Vh!S)x#FfU;8|w86t^u_hSNb`@FKdQq{m=!8PHE zvm2&}Bdk8eS^fREfsA=#D{sop{pbB>A!v@ha_h8|nK0e^f=YITo1$O14Vvi337s`n zdS#?-1|%fmoE8=Ay|}CJ{j8Z+V7eW$l$hY@55o@q2b_WOtv+5)r4t6Ms$UCya`g?% z?pEA))d}jEVK(j34{iC{vd1FA19zs4b$`R3oX48F$ei16tgH0|hIUp=M5GQay4_8} zNlD2HW|cIccw?JW@F1Bc*tZG72fK6h7+m-@s{@8B%=NN2FFt^;E1Gp3dd$$Jevqu55;m46LAd*G-7!Lq7{STxOi%w!u!H zz}8-#(lPDNM}{!|isU`KdQC@u=dZKx8MeM*FvLSuK)^WPjSdc8kQ&T2wnweFqE>H6 z&8IQeO$@CcL|pW|nq;<7RaLZ{;>1>v;mD1M&jPfK?sTbskV;cLG^ajM#5-0*0FUYv z9qwoO(5IN|h5L9iLUcgyASc4~a*B|8yh)sk*1xqwJ7QCs6VbVhq9_970Tm)R zh-BGT*k3*&IqFeVgGbQw+7t=CQ;pId+=_G>4L0UzX-$gM$Q$dmix1HlwlE;3ru_TjcSp;6>QpZ*Q{_aJi)5E-Fp75%I|UF zW|i%Ks`9r^4wKG%|El?sXHsuOM{d WpW$(Ee|>M<>qGiFUonvWdip;xbev28 literal 0 HcmV?d00001 diff --git a/feladat4/feladat4/UnitTest1.cpp b/feladat4/feladat4/UnitTest1.cpp index afec52c..1e98f8f 100644 --- a/feladat4/feladat4/UnitTest1.cpp +++ b/feladat4/feladat4/UnitTest1.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #include "pch.h" #include "CppUnitTest.h" #include @@ -97,6 +97,7 @@ namespace UnitTest1 { 1972, 1, 1 }, { 1970, 1, 2 }, { 1970, 1, 1 }, + { 1970, 1, 1 }, }; int dates2[][3] = { //expected { 1970, 1, 2 }, @@ -107,6 +108,7 @@ namespace UnitTest1 { 1972, 12, 31 }, { 1970, 1, 1 }, { 1970, 1, 1 }, + { 1970, 1, 1 }, }; int counts[] = { 1, @@ -116,7 +118,8 @@ namespace UnitTest1 365, 365, -1, //technically allowed - - 1 //since SubDays calls AddDays, this counts as its test + - 1, //since SubDays calls AddDays, this counts as its test + -100, }; int testcount = sizeof(dates1) / 12; for (size_t i = 0; i < testcount; i++) @@ -132,7 +135,7 @@ namespace UnitTest1 } catch (const CMyDateException& e) { - Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last case + Assert::AreEqual(CMyDateException::ErrMinYear, e.what()); //should only happen in the last two cases } catch (...) { Assert::IsTrue(false); diff --git a/feladat4/feladat4/cmydate.cpp b/feladat4/feladat4/cmydate.cpp index 11af7b3..478e41a 100644 --- a/feladat4/feladat4/cmydate.cpp +++ b/feladat4/feladat4/cmydate.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #include #include "cmydateexception.h" #include "cmydate.h" @@ -35,7 +35,9 @@ CMyDate::CMyDate() { m_iDay = 1; } CMyDate::CMyDate(int year, int month, int day) { - IsValid(year, month, day); + IsValidYear(year); + IsValidMonth(month); + IsValidDay(year, month, day); m_iYear = year; m_iMonth = month; m_iDay = day; @@ -70,12 +72,12 @@ void CMyDate::AddDays(int days) { int timestamp = DateToTimeStamp(GetYear(), GetMonth(), GetDay()); int y = 0, m = 0, d = 0; TimeStampToDate(timestamp + days, &y, &m, &d); - if (IsValid(y, m, d)) - { - m_iYear = y; - m_iMonth = m; - m_iDay = d; - } + IsValidYear(y); + IsValidMonth(m); + IsValidDay(y, m, d); + m_iYear = y; + m_iMonth = m; + m_iDay = d; } void CMyDate::SubDays(int days) { AddDays(days * (-1)); diff --git a/feladat4/feladat4/cmydate.h b/feladat4/feladat4/cmydate.h index 5f82d40..e465906 100644 --- a/feladat4/feladat4/cmydate.h +++ b/feladat4/feladat4/cmydate.h @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #pragma once class CMyDate { public: diff --git a/feladat4/feladat4/cmydateexception.cpp b/feladat4/feladat4/cmydateexception.cpp index 1c3e0cd..103ea93 100644 --- a/feladat4/feladat4/cmydateexception.cpp +++ b/feladat4/feladat4/cmydateexception.cpp @@ -1,31 +1,12 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #include "cmydateexception.h" -static int CopyStr(char* dest, const char* src, const char* concat = "\0") { - if (dest == nullptr || src == nullptr) { - return -1; - } - int i = 0; - while (src[i] != '\0') - { - dest[i++] = src[i]; - } - int j = 0; - while (concat[j] != '\0') - { - dest[i++] = concat[j++]; - } - dest[i] = '\0'; - return -1; -} - CMyDateException::CMyDateException(const char* s) { - msg = new char[256]; - CopyStr(msg, s); + msg = std::string(s); } const char* CMyDateException::what() const { - return msg; + return msg.c_str(); } diff --git a/feladat4/feladat4/cmydateexception.h b/feladat4/feladat4/cmydateexception.h index 728d3e4..7214b5b 100644 --- a/feladat4/feladat4/cmydateexception.h +++ b/feladat4/feladat4/cmydateexception.h @@ -1,5 +1,6 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #pragma once +#include class CMyDateException { public: CMyDateException(const char* s); @@ -11,5 +12,5 @@ public: static constexpr const char* ErrMinYear = "Hiba: ev kisebb, mint 1970!"; static constexpr const char* ErrUnexpected = "Varatlan hiba"; private: - char* msg; + std::string msg; }; \ No newline at end of file diff --git a/feladat4/feladat4/feladat4.cpp b/feladat4/feladat4/feladat4.cpp deleted file mode 100644 index e159638..0000000 --- a/feladat4/feladat4/feladat4.cpp +++ /dev/null @@ -1,2 +0,0 @@ -//Tóth Dániel Mátyás | IFPQYY | V1 -#include "feladat4.h" \ No newline at end of file diff --git a/feladat4/feladat4/feladat4.h b/feladat4/feladat4/feladat4.h deleted file mode 100644 index 0b3d20a..0000000 --- a/feladat4/feladat4/feladat4.h +++ /dev/null @@ -1,2 +0,0 @@ -//Tóth Dániel Mátyás | IFPQYY | V1 -#pragma once diff --git a/feladat4/feladat4/main.cpp b/feladat4/feladat4/main.cpp index efd24c0..d0b21c2 100644 --- a/feladat4/feladat4/main.cpp +++ b/feladat4/feladat4/main.cpp @@ -1,4 +1,4 @@ -//Tóth Dániel Mátyás | IFPQYY | V2 +//Tóth Dániel Mátyás | IFPQYY | V3 #include #include #include "cmydateexception.h"