From patchwork Mon Aug 19 14:29:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: davidgraeff X-Patchwork-Id: 2846515 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E833D9F2F4 for ; Mon, 19 Aug 2013 14:31:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D91C2010B for ; Mon, 19 Aug 2013 14:31:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46A6220119 for ; Mon, 19 Aug 2013 14:31:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750886Ab3HSObE (ORCPT ); Mon, 19 Aug 2013 10:31:04 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:51836 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751101Ab3HSObB (ORCPT ); Mon, 19 Aug 2013 10:31:01 -0400 Received: by mail-ea0-f169.google.com with SMTP id k11so891459eaj.0 for ; Mon, 19 Aug 2013 07:31:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=cZwALMkiI00VcaSyipXz587tXF0N2H3lejwKhXpqHC4=; b=UatQLcfODiMH8AjYtEbHnpMSHGGbqhgwN5sxTEDQEb+SxYUzDvCSlfkczJMXUydwDX rFq8VJQCeZu3znM39isCJEroVRFwB9hOkVZ8xRfaBTOPKctbXv6bMPfVw08cQYJid+34 ui3Nbm9hmkv0cuOlefbfbE9h6ywZUqRXvf9vlw/c8e/BR1wR6hFVoGOjhiN1TmlEz5Fg nequ55n27XkjwvIIa/x9tMxmypIFnTENc2TZXwbdmBdoTKT3pZXjytTEsYLdETtJVPfi /5Jvsgzz1+OoSZzDcOHW6rBermOBQzf9GMppl/IMYNQ1RFUGui+zBRNpHgfJOtgrNcxM lxJw== X-Received: by 10.14.29.67 with SMTP id h43mr23237196eea.7.1376922659823; Mon, 19 Aug 2013 07:30:59 -0700 (PDT) Received: from localhost.localdomain (ip-5-146-97-192.unitymediagroup.de. [5.146.97.192]) by mx.google.com with ESMTPSA id d8sm17843487eeh.8.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Aug 2013 07:30:59 -0700 (PDT) From: David Graeff To: linux-kbuild@vger.kernel.org Cc: David Graeff , yann.morin.1998@free.fr, sam@ravnborg.org, mmarek@suse.cz Subject: [PATCH v3 5/5] kconfig: images.c for gtk/qt gui flavour reoganized Date: Mon, 19 Aug 2013 16:29:51 +0200 Message-Id: <1376922591-37504-6-git-send-email-david.graeff@web.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1376922591-37504-1-git-send-email-david.graeff@web.de> References: <1376922591-37504-1-git-send-email-david.graeff@web.de> In-Reply-To: References: Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Change order of xpm image constants to build up groups. Make those groups optional via ifdefs. Remove not used constants. Signed-off-by: David Graeff diff --git a/scripts/kconfig/images.c b/scripts/kconfig/images.c index d4f84bd..196e6c0 100644 --- a/scripts/kconfig/images.c +++ b/scripts/kconfig/images.c @@ -3,94 +3,7 @@ * Released under the terms of the GNU GPL v2.0. */ -static const char *xpm_load[] = { -"22 22 5 1", -". c None", -"# c #000000", -"c c #838100", -"a c #ffff00", -"b c #ffffff", -"......................", -"......................", -"......................", -"............####....#.", -"...........#....##.##.", -"..................###.", -".................####.", -".####...........#####.", -"#abab##########.......", -"#babababababab#.......", -"#ababababababa#.......", -"#babababababab#.......", -"#ababab###############", -"#babab##cccccccccccc##", -"#abab##cccccccccccc##.", -"#bab##cccccccccccc##..", -"#ab##cccccccccccc##...", -"#b##cccccccccccc##....", -"###cccccccccccc##.....", -"##cccccccccccc##......", -"###############.......", -"......................"}; - -static const char *xpm_save[] = { -"22 22 5 1", -". c None", -"# c #000000", -"a c #838100", -"b c #c5c2c5", -"c c #cdb6d5", -"......................", -".####################.", -".#aa#bbbbbbbbbbbb#bb#.", -".#aa#bbbbbbbbbbbb#bb#.", -".#aa#bbbbbbbbbcbb####.", -".#aa#bbbccbbbbbbb#aa#.", -".#aa#bbbccbbbbbbb#aa#.", -".#aa#bbbbbbbbbbbb#aa#.", -".#aa#bbbbbbbbbbbb#aa#.", -".#aa#bbbbbbbbbbbb#aa#.", -".#aa#bbbbbbbbbbbb#aa#.", -".#aaa############aaa#.", -".#aaaaaaaaaaaaaaaaaa#.", -".#aaaaaaaaaaaaaaaaaa#.", -".#aaa#############aa#.", -".#aaa#########bbb#aa#.", -".#aaa#########bbb#aa#.", -".#aaa#########bbb#aa#.", -".#aaa#########bbb#aa#.", -".#aaa#########bbb#aa#.", -"..##################..", -"......................"}; - -static const char *xpm_back[] = { -"22 22 3 1", -". c None", -"# c #000083", -"a c #838183", -"......................", -"......................", -"......................", -"......................", -"......................", -"...........######a....", -"..#......##########...", -"..##...####......##a..", -"..###.###.........##..", -"..######..........##..", -"..#####...........##..", -"..######..........##..", -"..#######.........##..", -"..########.......##a..", -"...............a###...", -"...............###....", -"......................", -"......................", -"......................", -"......................", -"......................", -"......................"}; - +#ifdef IMAGES_TOOLBAR static const char *xpm_tree_view[] = { "22 22 2 1", ". c None", @@ -171,90 +84,24 @@ static const char *xpm_split_view[] = { "......#......#........", "......................", "......................"}; +#endif -static const char *xpm_symbol_no[] = { +#ifdef IMAGES_TREEVIEW +static const char *xpm_void[] = { "12 12 2 1", " c white", ". c black", " ", -" .......... ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_symbol_mod[] = { -"12 12 2 1", -" c white", -". c black", " ", -" .......... ", -" . . ", -" . . ", -" . .. . ", -" . .... . ", -" . .... . ", -" . .. . ", -" . . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_symbol_yes[] = { -"12 12 2 1", -" c white", -". c black", " ", -" .......... ", -" . . ", -" . . ", -" . . . ", -" . .. . ", -" . . .. . ", -" . .... . ", -" . .. . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_choice_no[] = { -"12 12 2 1", -" c white", -". c black", " ", -" .... ", -" .. .. ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" .... ", -" "}; - -static const char *xpm_choice_yes[] = { -"12 12 2 1", -" c white", -". c black", " ", -" .... ", -" .. .. ", -" . . ", -" . .. . ", -" . .... . ", -" . .... . ", -" . .. . ", -" . . ", -" .. .. ", -" .... ", +" ", +" ", +" ", +" ", +" ", +" ", " "}; static const char *xpm_menu[] = { @@ -273,54 +120,4 @@ static const char *xpm_menu[] = { " . . ", " .......... ", " "}; - -static const char *xpm_menu_inv[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" .......... ", -" .......... ", -" .. ...... ", -" .. .... ", -" .. .. ", -" .. .. ", -" .. .... ", -" .. ...... ", -" .......... ", -" .......... ", -" "}; - -static const char *xpm_menuback[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" .......... ", -" . . ", -" . .. . ", -" . .... . ", -" . ...... . ", -" . ...... . ", -" . .... . ", -" . .. . ", -" . . ", -" .......... ", -" "}; - -static const char *xpm_void[] = { -"12 12 2 1", -" c white", -". c black", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" ", -" "}; +#endif