Commit 711b875b authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kconfig: qconf: remove ConfigItem::pixmap/setPixmap 



Use QTreeWidgetItem::icon/setIcon directly.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 3c73ff04

scripts/kconfig/qconf.cc

+11 −11
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void ConfigItem::updateMenu(void) 


	list = listView();

	if (goParent) {

		setPixmap(promptColIdx, list->menuBackPix);

		setIcon(promptColIdx, list->menuBackPix);

		prompt = "..";

		goto set_prompt;

	}
@@ -114,15 +114,15 @@ void ConfigItem::updateMenu(void) 
			 */

			if (sym && list->rootEntry == menu)

				break;

			setPixmap(promptColIdx, list->menuPix);

			setIcon(promptColIdx, list->menuPix);

		} else {

			if (sym)

				break;

			setPixmap(promptColIdx, QIcon());

			setIcon(promptColIdx, QIcon());

		}

		goto set_prompt;

	case P_COMMENT:

		setPixmap(promptColIdx, QIcon());

		setIcon(promptColIdx, QIcon());

		goto set_prompt;

	default:

		;
@@ -139,7 +139,7 @@ void ConfigItem::updateMenu(void) 
		char ch;



		if (!sym_is_changeable(sym) && list->optMode == normalOpt) {

			setPixmap(promptColIdx, QIcon());

			setIcon(promptColIdx, QIcon());

			setText(noColIdx, QString());

			setText(modColIdx, QString());

			setText(yesColIdx, QString());
@@ -149,22 +149,22 @@ void ConfigItem::updateMenu(void) 
		switch (expr) {

		case yes:

			if (sym_is_choice_value(sym) && type == S_BOOLEAN)

				setPixmap(promptColIdx, list->choiceYesPix);

				setIcon(promptColIdx, list->choiceYesPix);

			else

				setPixmap(promptColIdx, list->symbolYesPix);

				setIcon(promptColIdx, list->symbolYesPix);

			setText(yesColIdx, "Y");

			ch = 'Y';

			break;

		case mod:

			setPixmap(promptColIdx, list->symbolModPix);

			setIcon(promptColIdx, list->symbolModPix);

			setText(modColIdx, "M");

			ch = 'M';

			break;

		default:

			if (sym_is_choice_value(sym) && type == S_BOOLEAN)

				setPixmap(promptColIdx, list->choiceNoPix);

				setIcon(promptColIdx, list->choiceNoPix);

			else

				setPixmap(promptColIdx, list->symbolNoPix);

				setIcon(promptColIdx, list->symbolNoPix);

			setText(noColIdx, "N");

			ch = 'N';

			break;
@@ -769,7 +769,7 @@ void ConfigList::mouseReleaseEvent(QMouseEvent* e) 
	idx = header()->logicalIndexAt(x);

	switch (idx) {

	case promptColIdx:

		icon = item->pixmap(promptColIdx);

		icon = item->icon(promptColIdx);

		if (!icon.isNull()) {

			int off = header()->sectionPosition(0) + visualRect(indexAt(p)).x() + 4; // 4 is Hardcoded image offset. There might be a way to do it properly.

			if (x >= off && x < off + icon.availableSizes().first().width()) {

scripts/kconfig/qconf.h

+0 −8
Original line number Diff line number Diff line
@@ -172,14 +172,6 @@ class ConfigItem : public QTreeWidgetItem { 
	{

		return Parent::text(idx);

	}

	void setPixmap(colIdx idx, const QIcon &icon)

	{

		Parent::setIcon(idx, icon);

	}

	const QIcon pixmap(colIdx idx) const

	{

		return icon(idx);

	}

	// TODO: Implement paintCell



	ConfigItem* nextItem;