From c17506caec0c761c91a181b6e84ba56df6c9978e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 8 Sep 2017 21:10:26 +0200 Subject: [PATCH 1/2] icons: remove leftovers from our old iconsets Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/6c558fd4fb36599153301415e50b6fbadf0d420c Author: vanhofen Date: 2017-09-08 (Fri, 08 Sep 2017) Origin message was: ------------------ - icons: remove leftovers from our old iconsets --- data/icons/hints/Makefile.am | 4 ---- data/icons/hints/hint_iconsPKG0.png | Bin 355 -> 0 bytes data/icons/hints/hint_iconsPKG1.png | Bin 336 -> 0 bytes data/icons/hints/hint_iconsPKG2.png | Bin 991 -> 0 bytes data/icons/hints/hint_iconsPKG3.png | Bin 744 -> 0 bytes 5 files changed, 4 deletions(-) delete mode 100644 data/icons/hints/hint_iconsPKG0.png delete mode 100644 data/icons/hints/hint_iconsPKG1.png delete mode 100644 data/icons/hints/hint_iconsPKG2.png delete mode 100644 data/icons/hints/hint_iconsPKG3.png diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index b64106667..2124a6d87 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -16,10 +16,6 @@ install_DATA = \ hint_games.png \ hint_hdd.png \ hint_hdd_info.png \ - hint_iconsPKG0.png \ - hint_iconsPKG1.png \ - hint_iconsPKG2.png \ - hint_iconsPKG3.png \ hint_imageinfo.png \ hint_imagelogo.png \ hint_inetradio.png \ diff --git a/data/icons/hints/hint_iconsPKG0.png b/data/icons/hints/hint_iconsPKG0.png deleted file mode 100644 index 002ea7e5da6c238e99fa295dcdde40604935c011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 355 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm4!3HFsR?RmBQfx`y?k)`fL2$v|<&%LToCO|{ z#S9GG!XV7ZFl&wkP>{XE)7O>#0S_m)k?aHSBM*Q=A3R+gLp+YZoo3H<$Ux%g{p&3b zEzbn@I-P&;Y(cVM)QfkScerJ{7PEg4*xT6tB0=#+onO-reb;uDkG((lJ)A!MyTXG&^SdZ*o%K4_rEAY&h64pQ%_1*38Z|8xe&$7l zUcLNzlaBh?%OY>%z)_C?LLs!nDBntt>lOkL! zO@0e6D)HS>O8Cx@8y+N-6O?r4&=T#J%q7MlOB^#FiK_8trn51#im^@L=x!Ej=AO*d fZ7jAwxkZ8@+RlNe)ZMWO=uHMsS3j3^P6+s0006jP)t-s0000E z9t@`apO@{Ap!b<`%xX%lI$gU`hu(iYXE#D+KQCV?3l|BO?vQiKYBNtUq4=6JPBDnz zfHP1qLYgx)d?;SKQ#*_;Bse37+KWVS6Np*XgE7zI7+KJVVPYnNh~TtC|r?Pa>{BWM<15!k5*PzU0+>7Xg^ef zQ7%g>bhB@5sAy%JVOxz?SB6uX?UQJrV=+uGHC!^8?2>=Oc@G;7p!JztTwG&iV?3cI zK0ZE{_=hY_es5fPg$aJZqz7D?uq}XlQP5Za-r@QG87{Q!`yC1Aa&~xj zK5IEST{R^=BS>~c8Y>xq(s)mTN=IcAVC~5Wh@pg6Cy<(8z~tpSSB4j z8D6?me0+R-etb);JAHk9et><6)Pq8zE`NW2nCp^8@MLBH0004WQchC90ifB-MOP#8^NJ}eNb@_0Cjtpy185rz)akx>?m5R=Jt zGAAObEk6~VF_+?aSq31%F3$D=O7>s{sP)jKBSVc$+y}Bn`R7ueja9?brYSv<^i{a}x`mT5F$4~k-;o6_SMC-di{{eXDi&t)_Ly!Of N002ovPDHLkV1htRkc0pL diff --git a/data/icons/hints/hint_iconsPKG3.png b/data/icons/hints/hint_iconsPKG3.png deleted file mode 100644 index 84b14f2a901d5ee0ac5221eb2f03029bb491d792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 744 zcmVP)US0+6?hM-68?CJxu&@-v!ycxl6~DhU zWMnOQc`tKwAEBW>L_{rkcsE*F6UWCnQ&TC0g%iZY0s8t6(9k82kR+3n4%XHyeSJ1v zT_ll_A)1;gf`T2XsSDoTH(OgCqoWMl+b?i%I#5s(#>OvkaWQRe2<7Do_laBbJsvMn)c_q!hx!1@Q0~ zxVQuN_cLc_I#NI>c74%O8ewY4aR zhlAlQNdN!=GD$>1RCr#U(?gR3VGzgR{tsi@#?rQJ+qUuPcQUC;)w^@ZCci`X>A7`N zZB-SSbIj-vb!BT1#JpT$ZqJlGL;tDH)zM^aDKcFTRZ?0O3rq~LAjB2w?dP~& z7LK+lEJp>%1VNZ2vlSMilo2z2AkMP6tcJ~F zLEVc8E)gw5ZG~mIH4R&btnLkL5^Z7IBJBWnmhJBSW&1pzQ_ta$Kce(8Zy^fse1v7G z6NMS#RAEwHVYR1c=arz$g|2wYmsi)m+dHqmZ1=8*$EW9)(&I?4Z=&O-Y{rkT@1N4+ aRM9U~Pfr1kX_k}#0000 Date: Fri, 8 Sep 2017 21:21:32 +0200 Subject: [PATCH 2/2] remove double includes Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/6576729fd16a728affa70e3203e8152fc52734f6 Author: Jacek Jendrzej Date: 2017-09-08 (Fri, 08 Sep 2017) --- lib/libiw/iwlib.h | 2 -- src/driver/pictureviewer/jpeg.cpp | 1 - src/gui/movieplayer.cpp | 1 - src/gui/network_service.cpp | 2 -- src/gui/osd_setup.cpp | 1 - src/gui/plugins.cpp | 1 - src/gui/screensaver.cpp | 1 - src/gui/test_menu.cpp | 1 - src/gui/widget/shellwindow.cpp | 1 - src/neutrino.cpp | 2 -- src/nhttpd/tuxboxapi/controlapi.cpp | 2 -- src/nhttpd/yhttpd.cpp | 1 - src/nhttpd/yhttpd_core/helper.cpp | 1 - src/nhttpd/yhttpd_core/yconnection.cpp | 2 -- src/nhttpd/yhttpd_core/yhook.cpp | 1 - src/nhttpd/yhttpd_core/ylanguage.cpp | 1 - src/nhttpd/yhttpd_core/ywebserver.cpp | 2 -- src/system/helpers.h | 4 ---- src/zapit/include/zapit/client/msgtypes.h | 1 - src/zapit/src/zapit.cpp | 1 - 20 files changed, 29 deletions(-) diff --git a/lib/libiw/iwlib.h b/lib/libiw/iwlib.h index 31cf39b73..c0fbe9461 100644 --- a/lib/libiw/iwlib.h +++ b/lib/libiw/iwlib.h @@ -30,7 +30,6 @@ #include /* gethostbyname, getnetbyname */ #include /* struct ether_addr */ #include /* struct timeval */ -#include /* This is our header selection. Try to hide the mess and the misery :-( * Don't look, you would go blind ;-) @@ -41,7 +40,6 @@ /* Set of headers proposed by Dr. Michael Rietz , 27.3.2 */ #include /* For ARPHRD_ETHER */ -#include /* For AF_INET & struct sockaddr */ #include /* For struct sockaddr_in */ #include diff --git a/src/driver/pictureviewer/jpeg.cpp b/src/driver/pictureviewer/jpeg.cpp index 95413f180..accb8a512 100644 --- a/src/driver/pictureviewer/jpeg.cpp +++ b/src/driver/pictureviewer/jpeg.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #if __cplusplus >= 201103 diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index a18773a4b..e00c8c430 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -56,7 +56,6 @@ #include #include #include -#include #include #include #include diff --git a/src/gui/network_service.cpp b/src/gui/network_service.cpp index fd14d9318..627c65163 100644 --- a/src/gui/network_service.cpp +++ b/src/gui/network_service.cpp @@ -36,8 +36,6 @@ #include #include -#include - #define TOUCH_BASE "/var/etc/." struct network_service diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 88b0c8e5e..be8002c52 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -56,7 +56,6 @@ #include #include -#include #include #include #include diff --git a/src/gui/plugins.cpp b/src/gui/plugins.cpp index 0f7bdc7e6..55062700f 100644 --- a/src/gui/plugins.cpp +++ b/src/gui/plugins.cpp @@ -60,7 +60,6 @@ #include "widget/shellwindow.h" #include -#include #include #include diff --git a/src/gui/screensaver.cpp b/src/gui/screensaver.cpp index d3d61e7bb..aecc3c6d9 100644 --- a/src/gui/screensaver.cpp +++ b/src/gui/screensaver.cpp @@ -36,7 +36,6 @@ #include #include #include // sort -#include #include "audiomute.h" #include "screensaver.h" #include diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index f5edf226d..a2dfa2f32 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -59,7 +59,6 @@ #include #include #include -#include #include extern int cs_test_card(int unit, char * str); diff --git a/src/gui/widget/shellwindow.cpp b/src/gui/widget/shellwindow.cpp index 480b6df4a..bd5daa3ca 100644 --- a/src/gui/widget/shellwindow.cpp +++ b/src/gui/widget/shellwindow.cpp @@ -46,7 +46,6 @@ #include #include #include -#include #include CShellWindow::CShellWindow(const std::string &Command, const int Mode, int *Res, bool auto_exec) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 080a31d07..15a73d540 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -72,7 +71,6 @@ #include "gui/bouquetlist.h" #include "gui/cam_menu.h" #include "gui/cec_setup.h" -#include "gui/channellist.h" #include "gui/epgview.h" #include "gui/eventlist.h" #include "gui/favorites.h" diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp index 296c83ae7..215ca5d17 100644 --- a/src/nhttpd/tuxboxapi/controlapi.cpp +++ b/src/nhttpd/tuxboxapi/controlapi.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include // tuxbox #include @@ -34,7 +33,6 @@ #include #include #include -#include #include //for relodplugins #include #include diff --git a/src/nhttpd/yhttpd.cpp b/src/nhttpd/yhttpd.cpp index 93e6a66e6..72698d9ed 100644 --- a/src/nhttpd/yhttpd.cpp +++ b/src/nhttpd/yhttpd.cpp @@ -15,7 +15,6 @@ #include #include // yhttpd -#include "yconfig.h" #include #include #include diff --git a/src/nhttpd/yhttpd_core/helper.cpp b/src/nhttpd/yhttpd_core/helper.cpp index 6361bd0c7..8bd342654 100644 --- a/src/nhttpd/yhttpd_core/helper.cpp +++ b/src/nhttpd/yhttpd_core/helper.cpp @@ -16,7 +16,6 @@ // yhttpd #include #include -#include "ytypes_globals.h" #include "helper.h" #include "ylogging.h" diff --git a/src/nhttpd/yhttpd_core/yconnection.cpp b/src/nhttpd/yhttpd_core/yconnection.cpp index 074c78584..62cafb6dc 100644 --- a/src/nhttpd/yhttpd_core/yconnection.cpp +++ b/src/nhttpd/yhttpd_core/yconnection.cpp @@ -9,8 +9,6 @@ #include // yhttpd #include -#include "ytypes_globals.h" -#include "ywebserver.h" #include "yconnection.h" #include "helper.h" //============================================================================= diff --git a/src/nhttpd/yhttpd_core/yhook.cpp b/src/nhttpd/yhttpd_core/yhook.cpp index 7838cefa9..2d4a88d4d 100644 --- a/src/nhttpd/yhttpd_core/yhook.cpp +++ b/src/nhttpd/yhttpd_core/yhook.cpp @@ -10,7 +10,6 @@ // yhttpd #include "yhook.h" -#include "ylogging.h" #include "helper.h" //============================================================================= diff --git a/src/nhttpd/yhttpd_core/ylanguage.cpp b/src/nhttpd/yhttpd_core/ylanguage.cpp index 47391ddc6..f733d16e2 100644 --- a/src/nhttpd/yhttpd_core/ylanguage.cpp +++ b/src/nhttpd/yhttpd_core/ylanguage.cpp @@ -14,7 +14,6 @@ // yhttpd #include #include -#include "ytypes_globals.h" #include "ylanguage.h" #include "yconnection.h" diff --git a/src/nhttpd/yhttpd_core/ywebserver.cpp b/src/nhttpd/yhttpd_core/ywebserver.cpp index e1a5f149d..e3debef47 100644 --- a/src/nhttpd/yhttpd_core/ywebserver.cpp +++ b/src/nhttpd/yhttpd_core/ywebserver.cpp @@ -20,11 +20,9 @@ // yhttpd #include -#include "ytypes_globals.h" #include "ywebserver.h" #include "ylogging.h" #include "helper.h" -#include "ysocket.h" #include "yconnection.h" #include "yrequest.h" #include diff --git a/src/system/helpers.h b/src/system/helpers.h index c7f3ae06a..48ac50a06 100644 --- a/src/system/helpers.h +++ b/src/system/helpers.h @@ -23,7 +23,6 @@ */ #include -#include #include #include #include @@ -33,9 +32,6 @@ #include #include #include - -#include -#include int my_system(const char * cmd); int my_system(int argc, const char *arg, ...); /* argc is number of arguments including command */ diff --git a/src/zapit/include/zapit/client/msgtypes.h b/src/zapit/include/zapit/client/msgtypes.h index c38b754d5..52a0f8144 100644 --- a/src/zapit/include/zapit/client/msgtypes.h +++ b/src/zapit/include/zapit/client/msgtypes.h @@ -25,7 +25,6 @@ #define __msgtypes_h__ -#include "zapittypes.h" #include #include "zapitclient.h" diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index c88eabe0b..f6641dbb8 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -74,7 +74,6 @@ #include #include #include -#include #include #include