From 8d5e06a4391ba5851fc208e84f12d11446ace099 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 1 Apr 2014 03:25:03 +0200 Subject: [PATCH] refs #199 and refs #198, formatting / Doxygen as preparation for some refactoring. Also added new icon as application and table view icon. --- samples/blackcore/blackcore.ico | Bin 0 -> 165662 bytes samples/blackcore/blackcore.qrc | 5 + samples/blackcore/blackcore.rc | 1 + samples/blackcore/icons/blackcore.ico | Bin 0 -> 165662 bytes samples/blackcore/icons/tower.png | Bin 0 -> 3114 bytes samples/blackcore/sample_blackcore.pro | 4 +- samples/blackcore/tool.cpp | 2 +- samples/blackcore/tool.h | 26 +--- src/blackcore/context_application.h | 22 +-- src/blackcore/context_application_impl.h | 11 +- src/blackcore/context_application_proxy.h | 11 +- src/blackcore/context_audio.h | 90 +++--------- src/blackcore/context_audio_impl.h | 7 +- src/blackcore/context_audio_proxy.h | 11 +- src/blackcore/context_network.h | 42 +++--- src/blackcore/context_settings.h | 7 +- src/blackcore/context_settings_proxy.h | 12 +- src/blackcore/context_simulator.h | 21 +-- src/blackcore/context_simulator_impl.h | 11 +- src/blackcore/context_simulator_proxy.h | 6 +- src/blackcore/coreruntime.h | 161 ++++++++-------------- src/blackcore/dbus_server.h | 61 ++------ src/blackgui/blackgui.qrc | 1 + src/blackgui/icons/tower.png | Bin 0 -> 3114 bytes src/blackmisc/avcallsign.cpp | 8 +- src/blackmisc/blackmisc.qrc | 1 + src/blackmisc/hwkeyboardkey.h | 10 +- src/blackmisc/hwkeyboardkeylist.h | 2 +- src/blackmisc/icons/tower.png | Bin 0 -> 1548 bytes src/blackmisc/setnetwork.h | 3 +- 30 files changed, 171 insertions(+), 365 deletions(-) create mode 100644 samples/blackcore/blackcore.ico create mode 100644 samples/blackcore/blackcore.qrc create mode 100644 samples/blackcore/blackcore.rc create mode 100644 samples/blackcore/icons/blackcore.ico create mode 100644 samples/blackcore/icons/tower.png create mode 100644 src/blackgui/icons/tower.png create mode 100644 src/blackmisc/icons/tower.png diff --git a/samples/blackcore/blackcore.ico b/samples/blackcore/blackcore.ico new file mode 100644 index 0000000000000000000000000000000000000000..449cd37028705cd7804edaee3f68ef9995978c05 GIT binary patch literal 165662 zcmeI5d9W149mg9r5ETT8SVD0KBvl@X;+20y@zzvQqKHv*Xgo0DRY^=GQKR4yO+`zQ zAhD7d6?ht$w=Iy@O?d{p`Sk3fI zPapIBeLvf?volYnddYv!KC9&4{naOL-$m`KlsZ6?>{8QuMf)Y|YuQISo*?Omk~$qSZM z+89Z#y!4a7eMizNNsZ8gZBo}f54_ar!M?I?m1Teo)0FS^c@C>{I55Y@WUQ=p=l;au<-t@J|Hyd?i%D7_0Hzvw4kr3WtIovHF)m81H1Y$^5_%dRd}`;%h}S&CP~#}Ic$tpk1W(` z$9BdtE0!#4oIl{bh4Zz77t{WXJbOk10l^$~XP1754vnrIcYfHo^QNb$Z7m*v7ayLh z)sP`+PIiiaajy$rE^_HDjp4p?b$|H2#Oo+}w-)a<^VqGMw3>8DwPzy_&k`?xq98!P z#?mS__S!3&Gn#p>?28=M>jBIq{raUjSt6c>w|lZ+9-1R5X?yTstyaERTddyOs?{GJ z*Xp`!wHkkV^gU{iJ(4!f_L-+HX%E0F`0fqwz(arhy;ks4Exf$&yjJ_|m(~{E?#Z>* z9aU`LyT%)@b#GkT-q-5U#af*)K0PLGr{mA<`aCh=%*bQgKj@w(;azyRTJPIsyPoCC zQYmR`&>*c|eK~&|_-=&XJcbWX>YD8^PhE=k0K7J5R=zhe-@LR!tG)L&V}S4Mcs{U} zWwac;SyI$a@7`KHvpm25*Vbq??pU*L=3@=HZoC(cKdyV%H%~pG6+E591ix2|l+>LC z*JH~iCH3!{na>8k1DSQ0ryjmMfai7czMD*+mX6Pp;@|Fk7rC&?=lK0Tt1nznU4LD= zFK+wt2K$Y?cjFD&zJ;gHo|yJ2o<+%821;S_Jk^L1THzkDix042zrURBm)rDh^F8p* zOSOVWUH;v?G5vl0KjQ!X8GuZcvgAB)|H;)h_D{YnIo7PlJauUm4}AMu*&bfBARVh4 z9DLyYjkha&oOWtQ*#FE7iE=(yv?x!c0^9PXpV$8t?ALhu0ItIGPWaLiaU zj(7*wT#l5Dq&(}l7Cb*}9?LxS2*m@77r7b1Z`#%8F~$Jou1Xo6<8nRQg1O_+L(=VV zyINQ3(W-hJewh1y*1KD@!aJ|Y*zp{Eyx_g|sO+o>ZpN1U#;nhLtQptgcwy-hx4-fH zV-m|1op9jKW#Ji=s0{a|T-RxM9xOhNYibdq2k@Jq%iq<%spD@4eM-{AD$lQ4X|KO= zJ^c`(A2{Z&zTLFJ?s0g(S}#1ecw=SXz=7`Tvw0oqy4v!{{j#;1iv@X8bK)>m+ zaNDhkix2$0-$b{B4eaZf?dB?}W7cOrtqb`G!xJt(z(6{t@izHzYZGgfw+4?l4t zAAWS_{1Jxk+4?l4tAAWS_{1Jxk< zaUvgnbm#mLhVJAej5u-r@DnHU;YWAQA7SWDKEj9-=MO(|A|HNq=ll_d?&KqkIC1{) z6DRWFM|aL2Vdzdi!iW>+4?l4tAAWS_{1Jxk+ z4?l4tAAWS_{1Jxk;cYT9=Rbv)|_N^geTbh|AW05X~L&cD%0DBkg=V`Dk4}Vm}wXZfC#O zdhX<-b@-@dzUT=vwR)tTk0&4g`DhjwF;ngA_gc@LeE8=h_HCortJg-~M{4y*J0DLz z+J}#rzjpR}t>;cY{P0n0oOrySIFS!Oy3_Ar=uSS0jZ=ILQGu+IhLgM5G+@-GcrU5vc?>ur;8jj`5+(U!|eg`;nt>}&!H@@g;-XP24$*4KFCKFw`KBr zJ?BC`$Orjwdw_hnwW;UxCd+Ffmer#{nd*=a@{z@DnY>=lxsVU?K|b6bARlgR>iN9M z@>+;x^=MG0I^=_VWN}+2uh(-fzaHtmXD&mSX4XkaglA6m5cbi$OriVFR>rE zuGWHlRO?Z+KZ^RSE~*`zpRFx2V)p_0uhB0X4STNrcE?Pci@avAv` zA0{gyd$|!~Cm-#}2fSo*5$7A>v5?y&ALJuu1M85z+=#K0kH&ez^j(~S2b6sy+ zaXquGI3JgB9r=QMG=`7ZZ|1ruo-^Bt^F3(~b>nu-bx+$YTYd7;zI>38{MeI^e2wb) zOf)}}<9t2s#C75}%ynGWleO7iobO3{Wvfd*isd8rSQ*x3^Ljn!Lq5odi{*O!RJJwv8pB7HuS_5M%4dy_ zWr-)qN1{cueBp};v)^W&Yv}!ukLL1Wdemn=bl)~>{N$rO`2d^E@>t0IkdNm1#OHir z>pNuMHf!wUgM2j0Ya#YSKH8TLUSs9Qo_yqMRK(|=?fRxw_7!n{Wo?6ekdLx@yNL55 zALOG5ACA97;zRTycA2L5z!N$f4A2VmT z`RLQftjB!p9h)y(WnVl-uB-jpub7#5IAi22Je+3RjxZ`Na;e1z+PO&jbUU$ruQP7{QUeI@OzFfwDhy)N#DO*k`M zpWEalEDuaP%kA&!)68?(Ax!Ke3Ck);QCU{~-#%v6XFk@9>u|iVbcvgfGsc_evEpMg zqJQqL@PT{7?`^fWf$t`Ve9mlxd9o3X2gV%g{(k-L7OndBHP7V^gO8&sd?4O)=h*qc zH5R_x&=b@kL=QZ&(CzE$-^~%YdH*_CMOD)rH?kx6kcX@kYCkW6~w=`&GCG z+VZwm!-t!GT`%76-^qe&b#a9c==-&=y7@pK_`d%A@0oot-|oI_h4a7ux@+*6B&{FTCHK<8-M|B4b$cDBAJ+mz>R4Ql;T@4A zhC_yEh3A0t#$uM^9vGeryY>fKed&u@9dLkFyX}^=X|~TibxC^wUV&%e9eC*R-)V*C zrA&|Ier9dHom;^vz&T1$^#4Mr{8;m zm*Hu6yNCttbVy1V>D5asyr)90sVZ)No^W?MrPVsP0uc=}tZ0oaSXL9d1?)URYY4zyh?%hN1sT=z) zFSmGq9M}Cv9B$(Ro`rXtv3y24ss0Ty=H#;nYxUr-vY$(#N6YI`AF;)C6n;}U_#hh> z*tc8~e$#8_f;s9ENy+nCF(X*xU99uJ9=&VzufNj|K73Q=KH(|+PLAiFs^9xF8G$!1 zl+?)UDQP})!846FOL|+9IkxKj{`+f%=ZLSoLM!~8#`|VQ&!jAPSSu!K;PL?8>w{O| z8F&XCf|s(q7X8iKo8*`Ql3HcK`y+VAYK^44@w1#7HNpdU2NoXeC#jW}BV}-RNm?x_ z`P)JCL?b-W&TYb5_}e@1+7XgMT=4g`CQ6zjX`ZAPB)usK*JIlywR3!V?)mYDN8lBB z2Hu$~30}f8Q}9+p7p?WWE*DE!*|udQ+`s^24X}XDy2M<3r1~Op%>gWi~a@&NxZ- z(^G0hPMIwVXcI5_tV71KWR>-iC}kA!Au~m3_-B`>_jUQ<1SO_~Ja(vLCw| zRp#i9yQu&bpaN8Y3Qz$mKn17(6`%rCfC^B75-2d$aSn~T&ydyMGRIi*?xU=8)XTeX zyL0R{Z>b)7{&RQ1TJG7sCbkEU#g3-N7 g`#?2zYwJLJb(Yy85#Lj_br|1^)m_h`^B(U10b^wvX#fBK literal 0 HcmV?d00001 diff --git a/samples/blackcore/blackcore.qrc b/samples/blackcore/blackcore.qrc new file mode 100644 index 000000000..e14908df9 --- /dev/null +++ b/samples/blackcore/blackcore.qrc @@ -0,0 +1,5 @@ + + + icons/tower.png + + diff --git a/samples/blackcore/blackcore.rc b/samples/blackcore/blackcore.rc new file mode 100644 index 000000000..18a4166b3 --- /dev/null +++ b/samples/blackcore/blackcore.rc @@ -0,0 +1 @@ +IDI_ICON1 ICON DISCARDABLE "blackcore.ico" diff --git a/samples/blackcore/icons/blackcore.ico b/samples/blackcore/icons/blackcore.ico new file mode 100644 index 0000000000000000000000000000000000000000..449cd37028705cd7804edaee3f68ef9995978c05 GIT binary patch literal 165662 zcmeI5d9W149mg9r5ETT8SVD0KBvl@X;+20y@zzvQqKHv*Xgo0DRY^=GQKR4yO+`zQ zAhD7d6?ht$w=Iy@O?d{p`Sk3fI zPapIBeLvf?volYnddYv!KC9&4{naOL-$m`KlsZ6?>{8QuMf)Y|YuQISo*?Omk~$qSZM z+89Z#y!4a7eMizNNsZ8gZBo}f54_ar!M?I?m1Teo)0FS^c@C>{I55Y@WUQ=p=l;au<-t@J|Hyd?i%D7_0Hzvw4kr3WtIovHF)m81H1Y$^5_%dRd}`;%h}S&CP~#}Ic$tpk1W(` z$9BdtE0!#4oIl{bh4Zz77t{WXJbOk10l^$~XP1754vnrIcYfHo^QNb$Z7m*v7ayLh z)sP`+PIiiaajy$rE^_HDjp4p?b$|H2#Oo+}w-)a<^VqGMw3>8DwPzy_&k`?xq98!P z#?mS__S!3&Gn#p>?28=M>jBIq{raUjSt6c>w|lZ+9-1R5X?yTstyaERTddyOs?{GJ z*Xp`!wHkkV^gU{iJ(4!f_L-+HX%E0F`0fqwz(arhy;ks4Exf$&yjJ_|m(~{E?#Z>* z9aU`LyT%)@b#GkT-q-5U#af*)K0PLGr{mA<`aCh=%*bQgKj@w(;azyRTJPIsyPoCC zQYmR`&>*c|eK~&|_-=&XJcbWX>YD8^PhE=k0K7J5R=zhe-@LR!tG)L&V}S4Mcs{U} zWwac;SyI$a@7`KHvpm25*Vbq??pU*L=3@=HZoC(cKdyV%H%~pG6+E591ix2|l+>LC z*JH~iCH3!{na>8k1DSQ0ryjmMfai7czMD*+mX6Pp;@|Fk7rC&?=lK0Tt1nznU4LD= zFK+wt2K$Y?cjFD&zJ;gHo|yJ2o<+%821;S_Jk^L1THzkDix042zrURBm)rDh^F8p* zOSOVWUH;v?G5vl0KjQ!X8GuZcvgAB)|H;)h_D{YnIo7PlJauUm4}AMu*&bfBARVh4 z9DLyYjkha&oOWtQ*#FE7iE=(yv?x!c0^9PXpV$8t?ALhu0ItIGPWaLiaU zj(7*wT#l5Dq&(}l7Cb*}9?LxS2*m@77r7b1Z`#%8F~$Jou1Xo6<8nRQg1O_+L(=VV zyINQ3(W-hJewh1y*1KD@!aJ|Y*zp{Eyx_g|sO+o>ZpN1U#;nhLtQptgcwy-hx4-fH zV-m|1op9jKW#Ji=s0{a|T-RxM9xOhNYibdq2k@Jq%iq<%spD@4eM-{AD$lQ4X|KO= zJ^c`(A2{Z&zTLFJ?s0g(S}#1ecw=SXz=7`Tvw0oqy4v!{{j#;1iv@X8bK)>m+ zaNDhkix2$0-$b{B4eaZf?dB?}W7cOrtqb`G!xJt(z(6{t@izHzYZGgfw+4?l4t zAAWS_{1Jxk+4?l4tAAWS_{1Jxk< zaUvgnbm#mLhVJAej5u-r@DnHU;YWAQA7SWDKEj9-=MO(|A|HNq=ll_d?&KqkIC1{) z6DRWFM|aL2Vdzdi!iW>+4?l4tAAWS_{1Jxk+ z4?l4tAAWS_{1Jxk;cYT9=Rbv)|_N^geTbh|AW05X~L&cD%0DBkg=V`Dk4}Vm}wXZfC#O zdhX<-b@-@dzUT=vwR)tTk0&4g`DhjwF;ngA_gc@LeE8=h_HCortJg-~M{4y*J0DLz z+J}#rzjpR}t>;cY{P0n0oOrySIFS!Oy3_Ar=uSS0jZ=ILQGu+IhLgM5G+@-GcrU5vc?>ur;8jj`5+(U!|eg`;nt>}&!H@@g;-XP24$*4KFCKFw`KBr zJ?BC`$Orjwdw_hnwW;UxCd+Ffmer#{nd*=a@{z@DnY>=lxsVU?K|b6bARlgR>iN9M z@>+;x^=MG0I^=_VWN}+2uh(-fzaHtmXD&mSX4XkaglA6m5cbi$OriVFR>rE zuGWHlRO?Z+KZ^RSE~*`zpRFx2V)p_0uhB0X4STNrcE?Pci@avAv` zA0{gyd$|!~Cm-#}2fSo*5$7A>v5?y&ALJuu1M85z+=#K0kH&ez^j(~S2b6sy+ zaXquGI3JgB9r=QMG=`7ZZ|1ruo-^Bt^F3(~b>nu-bx+$YTYd7;zI>38{MeI^e2wb) zOf)}}<9t2s#C75}%ynGWleO7iobO3{Wvfd*isd8rSQ*x3^Ljn!Lq5odi{*O!RJJwv8pB7HuS_5M%4dy_ zWr-)qN1{cueBp};v)^W&Yv}!ukLL1Wdemn=bl)~>{N$rO`2d^E@>t0IkdNm1#OHir z>pNuMHf!wUgM2j0Ya#YSKH8TLUSs9Qo_yqMRK(|=?fRxw_7!n{Wo?6ekdLx@yNL55 zALOG5ACA97;zRTycA2L5z!N$f4A2VmT z`RLQftjB!p9h)y(WnVl-uB-jpub7#5IAi22Je+3RjxZ`Na;e1z+PO&jbUU$ruQP7{QUeI@OzFfwDhy)N#DO*k`M zpWEalEDuaP%kA&!)68?(Ax!Ke3Ck);QCU{~-#%v6XFk@9>u|iVbcvgfGsc_evEpMg zqJQqL@PT{7?`^fWf$t`Ve9mlxd9o3X2gV%g{(k-L7OndBHP7V^gO8&sd?4O)=h*qc zH5R_x&=b@kL=QZ&(CzE$-^~%YdH*_CMOD)rH?kx6kcX@kYCkW6~w=`&GCG z+VZwm!-t!GT`%76-^qe&b#a9c==-&=y7@pK_`d%A@0oot-|oI_h4a7ux@+*6B&{FTCHK<8-M|B4b$cDBAJ+mz>R4Ql;T@4A zhC_yEh3A0t#$uM^9vGeryY>fKed&u@9dLkFyX}^=X|~TibxC^wUV&%e9eC*R-)V*C zrA&|Ier9dHom;^vz&T1$^#4Mr{8;m zm*Hu6yNCttbVy1V>D5asyr)90sVZ)No^W?MrPVsP0uc=}tZ0oaSXL9d1?)URYY4zyh?%hN1sT=z) zFSmGq9M}Cv9B$(Ro`rXtv3y24ss0Ty=H#;nYxUr-vY$(#N6YI`AF;)C6n;}U_#hh> z*tc8~e$#8_f;s9ENy+nCF(X*xU99uJ9=&VzufNj|K73Q=KH(|+PLAiFs^9xF8G$!1 zl+?)UDQP})!846FOL|+9IkxKj{`+f%=ZLSoLM!~8#`|VQ&!jAPSSu!K;PL?8>w{O| z8F&XCf|s(q7X8iKo8*`Ql3HcK`y+VAYK^44@w1#7HNpdU2NoXeC#jW}BV}-RNm?x_ z`P)JCL?b-W&TYb5_}e@1+7XgMT=4g`CQ6zjX`ZAPB)usK*JIlywR3!V?)mYDN8lBB z2Hu$~30}f8Q}9+p7p?WWE*DE!*|udQ+`s^24X}XDy2M<3r1~Op%>gWi~a@&NxZ- z(^G0hPMIwVXcI5_tV71KWR>-iC}kA!Au~m3_-B`>_jUQ<1SO_~Ja(vLCw| zRp#i9yQu&bpaN8Y3Qz$mKn17(6`%rCfC^B75-2d$aSn~T&ydyMGRIi*?xU=8)XTeX zyL0R{Z>b)7{&RQ1TJG7sCbkEU#g3-N7 g`#?2zYwJLJb(Yy85#Lj_br|1^)m_h`^B(U10b^wvX#fBK literal 0 HcmV?d00001 diff --git a/samples/blackcore/icons/tower.png b/samples/blackcore/icons/tower.png new file mode 100644 index 0000000000000000000000000000000000000000..8a86ac6ac0586e094432281c3100ea52c3643de9 GIT binary patch literal 3114 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 V #include #include @@ -15,35 +15,21 @@ namespace BlackMiscTest class Tool { private: - /*! - * \brief Constructor - */ + //! \brief Constructor Tool() {} public: - /*! - * \brief Get process id - * \return - */ + //! \brief Get process id static qint64 getPid() { return QCoreApplication::applicationPid(); } - /*! - * \brief Start a new process - * \param executable - * \param arguments - * \param parent - * \return - */ + //! Start a new process static QProcess *startNewProcess(const QString &executable, const QStringList &arguments = QStringList(), QObject *parent = 0); - /*! - * \brief Server loop - * \param core - */ - static void serverLoop(const BlackCore::CCoreRuntime *core); + //! \brief Server loop + static void serverLoop(const BlackCore::CRuntime *runtime); }; } // namespace diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index da1e72351..4d7662b9b 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -25,20 +25,14 @@ namespace BlackCore public: - /*! - * \brief Service name - * \return - */ + //! Service name static const QString &InterfaceName() { static QString s(BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME); return s; } - /*! - * \brief Service path - * \return - */ + //! Service path static const QString &ObjectPath() { static QString s(BLACKCORE_CONTEXTAPPLICATION_OBJECTPATH); @@ -50,10 +44,7 @@ namespace BlackCore * \param parent */ IContextApplication(QObject *parent = nullptr) : QObject(parent) {} - - /*! - * Destructor - */ + //! Destructor virtual ~IContextApplication() {} signals: @@ -68,13 +59,8 @@ namespace BlackCore public slots: - /*! - * \brief Ping - * \param token - * \return - */ + //! \brief Ping a token, used to check if application is alive virtual qint64 ping(qint64 token) const = 0; - }; } diff --git a/src/blackcore/context_application_impl.h b/src/blackcore/context_application_impl.h index edc2a54d2..b187d8480 100644 --- a/src/blackcore/context_application_impl.h +++ b/src/blackcore/context_application_impl.h @@ -30,16 +30,11 @@ namespace BlackCore */ CContextApplication(QObject *parent = nullptr); - /*! - * Destructor - */ + //! Destructor virtual ~CContextApplication() {} - /*! - * \brief Register myself in DBus - * \param server - */ - void registerWithDBus(CDBusServer *server) + //! Register myself in DBus + CContextApplication *registerWithDBus(CDBusServer *server) { server->addObject(IContextApplication::ObjectPath(), this); } diff --git a/src/blackcore/context_application_proxy.h b/src/blackcore/context_application_proxy.h index a65dce60c..7fe9ae45f 100644 --- a/src/blackcore/context_application_proxy.h +++ b/src/blackcore/context_application_proxy.h @@ -29,19 +29,14 @@ namespace BlackCore */ CContextApplicationProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent = nullptr); - /*! - * Destructor - */ + //! Destructor virtual ~CContextApplicationProxy() {} private: BlackMisc::CGenericDBusInterface *m_dBusInterface; - /*! - * Relay connection signals to local signals - * No idea why this has to be wired and is not done automatically - * \param connection - */ + //! Relay connection signals to local signals + //! No idea why this has to be wired and is not done automatically void relaySignals(const QString &serviceName, QDBusConnection &connection); protected: diff --git a/src/blackcore/context_audio.h b/src/blackcore/context_audio.h index 8e40394fe..59429aa95 100644 --- a/src/blackcore/context_audio.h +++ b/src/blackcore/context_audio.h @@ -28,47 +28,31 @@ namespace BlackCore Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME) public: - /*! - * \brief Interface name - * \return - */ + //! \brief Interface name static const QString &InterfaceName() { static QString s(BLACKCORE_CONTEXTAUDIO_INTERFACENAME); return s; } - /*! - * \brief Object path - * \return - */ + //! \brief Object path static const QString &ObjectPath() { static QString s(BLACKCORE_CONTEXTAUDIO_OBJECTPATH); return s; } - /*! - * \brief Constructor - * \param parent - */ + //! \brief Constructor IContextAudio(QObject *parent = nullptr) : QObject(parent) {} - /*! - * Destructor - */ + //! \brief Destructor virtual ~IContextAudio() {} - /*! - * \brief Using local objects? - * \return - */ + //! \brief Using local objects? virtual bool usingLocalObjects() const = 0; signals: - /*! - * \brief Audio test has been completed - */ + //! \brief Audio test has been completed void audioTestCompleted(); public slots: @@ -80,16 +64,10 @@ namespace BlackCore */ virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAiricraft) = 0; - /*! - * Get voice rooms for COM1, COM2: - * From this connection audio status can be obtained - */ + //! Get voice rooms for COM1, COM2: virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRoomsWithAudioStatus() const = 0; - /*! - * Get voice rooms for COM1, COM2, but without latest audio status - * \return all voice rooms - */ + //! Get voice rooms for COM1, COM2, but without latest audio status virtual BlackMisc::Audio::CVoiceRoomList getComVoiceRooms() const = 0; /*! @@ -106,39 +84,25 @@ namespace BlackCore */ virtual BlackMisc::Audio::CVoiceRoom getCom2VoiceRoom(bool withAudioStatus) const = 0; - /*! - * \brief Set voice rooms - */ + //! Set voice rooms virtual void setComVoiceRooms(const BlackMisc::Audio::CVoiceRoom &voiceRoomCom1, const BlackMisc::Audio::CVoiceRoom &voiceRoomCom2) = 0; - /*! - * Leave all voice rooms - */ + //! Leave all voice rooms virtual void leaveAllVoiceRooms() = 0; - /*! - * \brief COM1 room users callsigns - */ + //! COM1 room users callsigns virtual BlackMisc::Aviation::CCallsignList getCom1RoomCallsigns() const = 0; - /*! - * \brief COM2 room users callsigns - */ + //! COM2 room users callsigns virtual BlackMisc::Aviation::CCallsignList getCom2RoomCallsigns() const = 0; - /*! - * \brief COM1 room users - */ + //! COM1 room users virtual BlackMisc::Network::CUserList getCom1RoomUsers() const = 0; - /*! - * \brief COM2 room users - */ + //! COM2 room users virtual BlackMisc::Network::CUserList getCom2RoomUsers() const = 0; - /*! - * \brief Audio devices - */ + //! Audio devices virtual BlackMisc::Audio::CAudioDeviceList getAudioDevices() const = 0; /*! @@ -160,14 +124,10 @@ namespace BlackCore */ virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) = 0; - /*! - * \brief Is muted? - */ + //! Is muted? virtual bool isMuted() const = 0; - /*! - * \brief Play SELCAL tone - */ + //! Play SELCAL tone virtual void playSelcalTone(const BlackMisc::Aviation::CSelcal &selcal) const = 0; /*! @@ -176,24 +136,16 @@ namespace BlackCore */ virtual void playNotification(uint notification) const = 0; - /*! - * \brief Microphone test - */ + //! Microphone test virtual void runMicrophoneTest() = 0; - /*! - * \brief Microphone test - */ + //! Microphone test virtual void runSquelchTest() = 0; - /*! - * \brief Get the microphone test result - */ + //! Get the microphone test result virtual QString getMicrophoneTestResult() const = 0; - /*! - * \brief Get the squelch value - */ + //! Get the squelch value virtual double getSquelchValue() const = 0; }; } diff --git a/src/blackcore/context_audio_impl.h b/src/blackcore/context_audio_impl.h index e3bd210bd..899e6c189 100644 --- a/src/blackcore/context_audio_impl.h +++ b/src/blackcore/context_audio_impl.h @@ -29,11 +29,8 @@ namespace BlackCore //! \brief Destructor virtual ~CContextAudio(); - /*! - * \brief Register myself in DBus - * \param server DBus server - */ - void registerWithDBus(CDBusServer *server) + //! \brief Register myself in DBus + CContextAudio *registerWithDBus(CDBusServer *server) { Q_ASSERT(server); server->addObject(IContextAudio::ObjectPath(), this); diff --git a/src/blackcore/context_audio_proxy.h b/src/blackcore/context_audio_proxy.h index 3316a073f..231739a39 100644 --- a/src/blackcore/context_audio_proxy.h +++ b/src/blackcore/context_audio_proxy.h @@ -33,9 +33,7 @@ namespace BlackCore */ CContextAudioProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent = nullptr); - /*! - * Destructor - */ + //! Destructor virtual ~CContextAudioProxy() {} //! \copydoc IContextVoice::usingLocalObjects() @@ -44,11 +42,8 @@ namespace BlackCore private: BlackMisc::CGenericDBusInterface *m_dBusInterface; - /*! - * Relay connection signals to local signals - * No idea why this has to be wired and is not done automatically - * \param connection - */ + //! Relay connection signals to local signals + //! No idea why this has to be wired and is not done automatically void relaySignals(const QString &serviceName, QDBusConnection &connection); protected: diff --git a/src/blackcore/context_network.h b/src/blackcore/context_network.h index 121afd4a9..55f236a4b 100644 --- a/src/blackcore/context_network.h +++ b/src/blackcore/context_network.h @@ -68,15 +68,16 @@ namespace BlackCore */ void statusMessages(const BlackMisc::CStatusMessageList &messages); - //! \brief ATC station (online) list has been changed + //! ATC station (online) list has been changed void changedAtcStationsOnline(); - //! \brief ATC station (booked) list has been changed + //! ATC station (booked) list has been changed void changedAtcStationsBooked(); - //! \brief Aircraft list has been changed + //! Aircraft list has been changed void changedAircraftsInRange(); +<<<<<<< HEAD /*! * \brief Aircraft situation update * \param callsign @@ -85,7 +86,7 @@ namespace BlackCore */ void aircraftSituationUpdate(const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::Aviation::CAircraftSituation &situation); - //! \brief Terminated connection + //! Terminated connection void connectionTerminated(); /*! @@ -97,15 +98,12 @@ namespace BlackCore */ void connectionStatusChanged(uint from, uint to); - /*! - * \brief Text messages (also private chat messages) - * \param textMessages message list - */ + //! Text messages received (also private chat messages, rfaio channel messages) void textMessagesReceived(const BlackMisc::Network::CTextMessageList &textMessages); public slots: - //! \brief Reload bookings from booking service + //! Reload bookings from booking service virtual void readAtcBookingsFromSource() const = 0; /*! @@ -114,19 +112,19 @@ namespace BlackCore */ virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsOnline() const = 0; - //! \brief ATC list, with booked controllers + //! ATC list, with booked controllers virtual const BlackMisc::Aviation::CAtcStationList getAtcStationsBooked() const = 0 ; - //! \brief Aircraft list + //! Aircraft list virtual const BlackMisc::Aviation::CAircraftList getAircraftsInRange() const = 0; - //! \brief Get all users + //! Get all users virtual BlackMisc::Network::CUserList getUsers() const = 0; - //! \brief Users for given callsigns, e.g. for voice room resolution + //! Users for given callsigns, e.g. for voice room resolution virtual BlackMisc::Network::CUserList getUsersForCallsigns(const BlackMisc::Aviation::CCallsignList &callsigns) const = 0; - //! \brief Get own aircraft + //! Get own aircraft virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0; /*! @@ -152,16 +150,16 @@ namespace BlackCore */ virtual BlackMisc::CStatusMessageList setOwnAircraft(const BlackMisc::Aviation::CAircraft &aircraft) = 0; - //! \brief Own position, be aware height is terrain height + //! Own position, be aware height is terrain height virtual void updateOwnPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0; - //! \brief Complete situation update + //! Complete situation update virtual void updateOwnSituation(const BlackMisc::Aviation::CAircraftSituation &situation) = 0; - //! \brief Update own cockpit + //! Update own cockpit virtual void updateOwnCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder) = 0; - //! \brief Text messages (radio and private chat messages) + //! Text messages (radio and private chat messages) virtual void sendTextMessages(const BlackMisc::Network::CTextMessageList &textMessages) = 0; /*! @@ -171,16 +169,16 @@ namespace BlackCore */ virtual BlackMisc::Aviation::CInformationMessage getMetar(const QString &airportIcaoCode) = 0; - //! \brief Use the selected COM1/2 frequencies, and get the corresponding voice room for it + //! Use the selected COM1/2 frequencies, and get the corresponding voice room for it virtual BlackMisc::Audio::CVoiceRoomList getSelectedVoiceRooms() const = 0; - //! \brief Use the selected COM1/2 frequencies, and get the corresponding ATC stations for it + //! Use the selected COM1/2 frequencies, and get the corresponding ATC stations for it virtual BlackMisc::Aviation::CAtcStationList getSelectedAtcStations() const = 0; - //! \brief Request data updates (pilot's frequencies, ATIS, ..) + //! Request data updates (pilot's frequencies, ATIS, ..) virtual void requestDataUpdates() = 0; - //! \brief Request ATIS updates (for all stations) + //! Request ATIS updates (for all stations) virtual void requestAtisUpdates() = 0; }; } diff --git a/src/blackcore/context_settings.h b/src/blackcore/context_settings.h index 2fbb557bc..460cf9787 100644 --- a/src/blackcore/context_settings.h +++ b/src/blackcore/context_settings.h @@ -33,8 +33,7 @@ namespace BlackCore Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSETTINGS_INTERFACENAME) public: - - //! \brief Settings type + //! Settings type enum SettingsType { SettingsHotKeys, @@ -121,10 +120,10 @@ namespace BlackCore public slots: - //! \brief Network settings + //! Network settings virtual BlackMisc::Settings::CSettingsNetwork getNetworkSettings() const = 0; - //! \brief Hotkeys + //! Hotkeys virtual BlackMisc::Hardware::CKeyboardKeyList getHotkeys() const = 0; }; } diff --git a/src/blackcore/context_settings_proxy.h b/src/blackcore/context_settings_proxy.h index 7e84a015f..0f925faba 100644 --- a/src/blackcore/context_settings_proxy.h +++ b/src/blackcore/context_settings_proxy.h @@ -32,10 +32,7 @@ namespace BlackCore * \brief DBus version constructor */ CContextSettingsProxy(const QString &serviceName, QDBusConnection &connection, QObject *parent = nullptr); - - /*! - * Destructor - */ + //! \brief Destructor virtual ~CContextSettingsProxy() {} @@ -54,11 +51,8 @@ namespace BlackCore private: BlackMisc::CGenericDBusInterface *m_dBusInterface; - /*! - * Relay connection signals to local signals - * No idea why this has to be wired and is not done automatically - * \param connection - */ + //! Relay connection signals to local signals + //! No idea why this has to be wired and is not done automatically void relaySignals(const QString &serviceName, QDBusConnection &connection); protected: diff --git a/src/blackcore/context_simulator.h b/src/blackcore/context_simulator.h index 0d55b0300..6207626c6 100644 --- a/src/blackcore/context_simulator.h +++ b/src/blackcore/context_simulator.h @@ -24,20 +24,14 @@ namespace BlackCore public: - /*! - * \brief Service name - * \return - */ + //! \brief Service name static const QString &InterfaceName() { static QString s(BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME); return s; } - /*! - * \brief Service path - * \return - */ + //! \brief Service path static const QString &ObjectPath() { static QString s(BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH); @@ -57,10 +51,7 @@ namespace BlackCore virtual bool usingLocalObjects() const = 0; signals: - /*! - * \brief Emitted when the simulator connection changes - * \param value - */ + //! Emitted when the simulator connection changes void connectionChanged(bool value); public slots: @@ -69,12 +60,10 @@ namespace BlackCore virtual bool isConnected() const = 0; /*! - * \brief Get user aircraft value object - * \return - */ + //! Get user aircraft value object virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0; }; } // namespace BlackCore -#endif // BLACKCORE_CONTEXTSIMULATOR_H +#endif // guard diff --git a/src/blackcore/context_simulator_impl.h b/src/blackcore/context_simulator_impl.h index 38778e452..5ca64482a 100644 --- a/src/blackcore/context_simulator_impl.h +++ b/src/blackcore/context_simulator_impl.h @@ -31,10 +31,8 @@ namespace BlackCore virtual ~CContextSimulator(); /*! - * \brief Register myself in DBus - * \param server - */ - void registerWithDBus(CDBusServer *server) + //! Register myself in DBus + CContextSimulator *registerWithDBus(CDBusServer *server) { Q_ASSERT(server); server->addObject(CContextSimulator::ObjectPath(), this); @@ -77,10 +75,7 @@ namespace BlackCore //! \copydoc IContextSimulator::updateOwnAircraft() virtual void updateOwnAircraft(); - /*! - * \brief Set new connection status - * \param value - */ + //! Set new connection status void setConnectionStatus(bool value); private: diff --git a/src/blackcore/context_simulator_proxy.h b/src/blackcore/context_simulator_proxy.h index 907e94b39..f5998ce70 100644 --- a/src/blackcore/context_simulator_proxy.h +++ b/src/blackcore/context_simulator_proxy.h @@ -36,11 +36,7 @@ namespace BlackCore private: BlackMisc::CGenericDBusInterface *m_dBusInterface; - /*! - * Relay connection signals to local signals - * No idea why this has to be wired and is not done automatically - * \param connection - */ + //! Relay connection signals to local signals void relaySignals(const QString &serviceName, QDBusConnection &connection); protected: diff --git a/src/blackcore/coreruntime.h b/src/blackcore/coreruntime.h index 463d116f2..8961f9979 100644 --- a/src/blackcore/coreruntime.h +++ b/src/blackcore/coreruntime.h @@ -5,125 +5,80 @@ namespace BlackCore { -// forward declaration, see review -// https://dev.vatsim-germany.org/boards/22/topics/1350?r=1359#message-1359 -class CDBusServer; -class CContextNetwork; -class CContextAudio; -class CContextSettings; -class CContextApplication; -class CContextSimulator; -class IContextNetwork; -class IContextAudio; -class IContextSettings; -class IContextApplication; -class IContextSimulator; + // forward declaration, see review + // https://dev.vatsim-germany.org/boards/22/topics/1350?r=1359#message-1359 + class CDBusServer; + class CContextNetwork; + class CContextAudio; + class CContextSettings; + class CContextApplication; + class CContextSimulator; + class IContextNetwork; + class IContextAudio; + class IContextSettings; + class IContextApplication; + class IContextSimulator; -/*! - * \brief The CCoreRuntime class - */ -class CCoreRuntime : public QObject -{ - Q_OBJECT + //! \brief The CCoreRuntime class + class CCoreRuntime : public QObject + { + Q_OBJECT -private: - bool m_init; /*!< flag */ - CDBusServer *m_dbusServer; - CContextNetwork *m_contextNetwork; - CContextAudio *m_contextAudio; - CContextSettings *m_contextSettings; - CContextApplication *m_contextApplication; - CContextSimulator *m_contextSimulator; + private: + bool m_init; /*!< flag */ + CDBusServer *m_dbusServer; + CContextNetwork *m_contextNetwork; + CContextAudio *m_contextAudio; + CContextSettings *m_contextSettings; + CContextApplication *m_contextApplication; + CContextSimulator *m_contextSimulator; + //! \brief Init + void init(bool withDbus); - /*! - * \brief Init - * \param withDbus - */ - void init(bool withDbus); + public: + //! \brief Constructor + CCoreRuntime(bool withDbus = true, QObject *parent = nullptr); -public: - /*! - * \brief Constructor - * \param withDbus - * \param parent - */ - CCoreRuntime(bool withDbus = true, QObject *parent = nullptr); + //! \brief Destructor + virtual ~CCoreRuntime() {} - /*! - * \brief Destructor - */ - virtual ~CCoreRuntime() {} + //! \brief DBus server + const CDBusServer *getDBusServer() const + { + return this->m_dbusServer; + } - /*! - * \brief DBus server - * \return - */ - const CDBusServer *getDBusServer() const { - return this->m_dbusServer; - } + //! \brief Context for network + IContextNetwork *getIContextNetwork(); - /*! - * \brief Context for network - * \return - */ - IContextNetwork *getIContextNetwork(); + //! \brief Context for network + const IContextNetwork *getIContextNetwork() const; - /*! - * \brief Context for network - * \return - */ - const IContextNetwork *getIContextNetwork() const; + //! \brief Context for network + IContextAudio *getIContextAudio(); - /*! - * \brief Context for network - * \return - */ - IContextAudio *getIContextAudio(); + //! \brief Context for network + const IContextAudio *getIContextAudio() const; - /*! - * \brief Context for network - * \return - */ - const IContextAudio *getIContextAudio() const; + //! \brief Settings + IContextSettings *getIContextSettings(); + //! \brief Settings + const IContextSettings *getIContextSettings() const; - /*! - * \brief Settings - * \return - */ - IContextSettings *getIContextSettings(); + //! \brief Context for application + const IContextApplication *getIContextApplication() const; - /*! - * \brief Settings - * \return - */ - const IContextSettings *getIContextSettings() const; + //! \brief Application + IContextApplication *getIContextApplication(); - /*! - * \brief Context for application - * \return - */ - const IContextApplication *getIContextApplication() const; + //! \brief Context for simulator + const IContextSimulator *getIContextSimulator() const; - /*! - * \brief Application - * \return - */ - IContextApplication *getIContextApplication(); + //! \brief Simulator + IContextSimulator *getIContextSimulator(); - /*! - * \brief Context for simulator - * \return - */ - const IContextSimulator *getIContextSimulator() const; - - /*! - * \brief Simulator - * \return - */ - IContextSimulator *getIContextSimulator(); - -}; + }; } #endif // guard diff --git a/src/blackcore/dbus_server.h b/src/blackcore/dbus_server.h index eeebdcd02..5a08ff3b0 100644 --- a/src/blackcore/dbus_server.h +++ b/src/blackcore/dbus_server.h @@ -22,7 +22,7 @@ namespace BlackCore /*! * \brief Custom DBusServer - * \details This class implements a custom DBusServer for DBus peer connections + * \details This class implements a custom DBusServer for DBus peer connections, but can also be used as session or system bus */ class CDBusServer : public QObject { @@ -33,9 +33,7 @@ namespace BlackCore //! \brief Service name of DBus serve static const QString ServiceName; - /*! - * \brief Server mode, normally P2P, but can be changed for debugging / testing - */ + //! \brief Server mode, normally P2P, but can be changed for debugging / testing enum ServerMode { SERVERMODE_P2P, @@ -49,24 +47,13 @@ namespace BlackCore QMap m_objects; //!< Mapping of all exposed objects QMap m_DBusConnections; //!< Mapping of all DBusConnection objects - /*! - * \brief Check if address means a real server with P2P connection - * \param address - * \return - */ + //! \brief Check if address means a real server with P2P connection static bool isP2P(const QString &address); - /*! - * \brief Get the class info - * \param object - * \return - */ + //! \brief Get the class info static const QString getClassInfo(QObject *object); - /*! - * \brief Register options with connection - * \return - */ + //! \brief Register options with connection static const QDBusConnection::RegisterOptions &RegisterOptions() { static QDBusConnection::RegisterOptions opt = QDBusConnection::ExportAdaptors | QDBusConnection::ExportAllSignals | QDBusConnection::ExportAllSlots; @@ -80,55 +67,35 @@ namespace BlackCore //!! \brief Adds a QObject to be exposed to DBus void addObject(const QString &name, QObject *object); - /*! - * \brief Last error - * \return - */ + //! \brief Last error QDBusError lastError() const; - /*! - * \brief Connected? - * \return - */ + //! \brief Connected? bool isConnected() const { return this->m_busServer.isConnected(); } - /*! - * \brief address - * \return - */ + //! \brief address QString address() const { - return this->m_busServer.address(); } - /*! - * \brief Connection by name - * \param connectionName - * \return - */ + //! \brief Connection by name const QDBusConnection getDbusConnection(const QString &connectionName) const { return this->m_DBusConnections.value(connectionName, CDBusServer::defaultConnection()); } - /*! - * \brief Get DBbus connections - * \return - */ + //! \brief Get DBbus connections const QList getDbusConnections() const { // http://stackoverflow.com/questions/1124340/any-ideas-why-qhash-and-qmap-return-const-t-instead-of-const-t return this->m_DBusConnections.values(); } - /*! - * \brief Default connection - * \return - */ + //! \brief Default connection static const QDBusConnection &defaultConnection() { static QDBusConnection defaultConnection("default"); @@ -137,11 +104,7 @@ namespace BlackCore private slots: - /*! - * \brief Called when a new DBus client has connected - * \param connection - * \return - */ + //! \brief Called when a new DBus client has connected bool newConnection(const QDBusConnection &connection); }; } diff --git a/src/blackgui/blackgui.qrc b/src/blackgui/blackgui.qrc index 7ae227520..b6cfb7c8f 100644 --- a/src/blackgui/blackgui.qrc +++ b/src/blackgui/blackgui.qrc @@ -10,5 +10,6 @@ icons/close.png icons/aircraftdeparture.png icons/apronsmall.jpg + icons/tower.png diff --git a/src/blackgui/icons/tower.png b/src/blackgui/icons/tower.png new file mode 100644 index 0000000000000000000000000000000000000000..8a86ac6ac0586e094432281c3100ea52c3643de9 GIT binary patch literal 3114 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 Vicons/S3.png icons/SUP.png icons/aeropuerto.png + icons/tower.png diff --git a/src/blackmisc/hwkeyboardkey.h b/src/blackmisc/hwkeyboardkey.h index 856978d48..17336dc86 100644 --- a/src/blackmisc/hwkeyboardkey.h +++ b/src/blackmisc/hwkeyboardkey.h @@ -38,7 +38,7 @@ namespace BlackMisc IndexKeyObject, // just for updates }; - //! \brief Function + //! Function enum HotkeyFunction { HotkeyNone, @@ -49,7 +49,7 @@ namespace BlackMisc HotkeyOpacity100 }; - //! \brief Modifier + //! Modifier enum Modifier { ModifierNone, @@ -66,13 +66,13 @@ namespace BlackMisc ModifierNum }; - //! \brief Default constructor + //! Default constructor CKeyboardKey(); - //! \brief Constructor by function + //! Constructor by function CKeyboardKey(HotkeyFunction function); - //! \brief Constructor + //! Constructor CKeyboardKey(Qt::Key keyCode, quint32 nativeVirtualKey, Modifier modifier1 = ModifierNone, Modifier modifier2 = ModifierNone, const HotkeyFunction &function = HotkeyNone); //! \brief Destructor diff --git a/src/blackmisc/hwkeyboardkeylist.h b/src/blackmisc/hwkeyboardkeylist.h index 9b9547518..94e21c789 100644 --- a/src/blackmisc/hwkeyboardkeylist.h +++ b/src/blackmisc/hwkeyboardkeylist.h @@ -28,7 +28,7 @@ namespace BlackMisc //! Default constructor CKeyboardKeyList(); - //! \brief Construct from a base class object. + //! Construct from a base class object. CKeyboardKeyList(const CSequence &baseClass); //! \copydoc CValueObject::toQVariant diff --git a/src/blackmisc/icons/tower.png b/src/blackmisc/icons/tower.png new file mode 100644 index 0000000000000000000000000000000000000000..a71000c7f127d41a27093b158d5d55927af4a191 GIT binary patch literal 1548 zcmaJ>2~3k`7%osOlu5}Hq*?_fMu-QJaacLVEocOBZ7Gzyu%QA{e#<2VYH>ORN)`c? zB1T5!s7N^k3Ua9xMq7?i4z&dVDgJT@r7#M%`_bvPnCwg5?@gXO-}652cl~n8>)2-G zb|ef2+wAG#dK$`|8=~;OH&$@v|~N|02oa7=|-sK?$_M` zfrty9C*2Sd4a_#=Zi5glGZ;+smZz%|F7d_etCOW~B6hYd%mat}QarbiBFCKjT$4G~ z{aKBX`V9llC(il|5AM;~6RS^eGJRQVs&m7DK0wH*x@!q{sm(Z`Ube8;onN2g|H?M* zrzt+aurXnYZ(oG^Mgy2kbWN%5nmQR~n(2s?kV zr8GrB9BmkO$Jh{O44T``EHR(^9tzR^Rz=<82KCxTxquYhE zJh7Q~p2g4mI+5z?YV>qRN8@*7JSt=7T^%?@3l1OOxr1&@peKgz(bLoF4zQ5Uc(fAQ z`;=)FDU#vibI3UE8s+i(D8vKfjiqCT;riKb@zwW7XP?`SFwbeK!NYQ0jQ5d)xs#Wt zWSWpZjLsG>Ak<$UVHW6JO^AUCpdqwMutn<;L*0*zLbvZq2D(O?n_5b+l7tzt-TB|K zL;_TtfcoeTL#|*r4)&MNEV!BJdG#e~ZrC2X38Q1`n{=C}nbMfI&$-=-KBY2VHRrX9 z5si8NCV*WRsE>I{a&j~_hLoVTKJ^OwsJH>K58ZEK=)=AEXWXmSBwacc0q_V-KdNu@ z7S;5qa-Cq9kc7lA*wt62SVJTy_@#q+2Mx3`#7k(Cs%ISr-5Y!Nx8^@3zLfbN=wD_& zv%Z4)8OYI!eOOM@&CMDVhk{06q| zw6``qd&c}a7z$mWRNL|ue9t3Fv{uz?0od`3B?}fA@ilZ8*RWCYm0&f+ zg5EOwPMOeh+w>doSFE(fO~jIoikN)Oaz#4}7$xoZ5E)L4gI(YOS!mYm!$U=Y1Bv8C zU;)Y+MdfPMR1097%^>6m@RLi{srTf&fw0XV$`q34;dnYn%?nxi`sBliFB zTXH_O8u6GwOA@ZiOsr#T9j#3oIa%KNJyzb!IVxN|ADc!S7*cW6M=~d?K_z$=h(IOQ za?c1?mpCmHl1=nYKv}0qq>|*U)wpZPF*2(ZLHzjeGBU37Y@84Em^>GZ`cAs_{b{N< zb!8Bx=6&3l?JTB5TL)47`ya7uhC&^Hht=vU}l vIFU3SUDcXZz_jzRZ$a}IfKZyCXj37;lRA@rulj5^K6OtwFV{-vkV}67D22S? literal 0 HcmV?d00001 diff --git a/src/blackmisc/setnetwork.h b/src/blackmisc/setnetwork.h index 5be7b8114..264149639 100644 --- a/src/blackmisc/setnetwork.h +++ b/src/blackmisc/setnetwork.h @@ -20,7 +20,8 @@ namespace BlackMisc { namespace Settings { - //! Value object encapsulating information of a server + //! \brief Value object encapsulating information of network related settings. + //! \remarks Not only traffic network settings, but also URLs, DBus address, ... class CSettingsNetwork : public BlackMisc::CValueObject { public: