- make opie compilable against qte 2.3.10 snapshot

check QT_VERSION against 0x030000 instead of 300
author: ar <ar> 2005-01-21 19:56:15 (UTC)
committer: ar <ar> 2005-01-21 19:56:15 (UTC)
commit: cd51d382be50bc021739395309e23760f1619759 (patch) (unidiff)
tree: e76155f772df7faea5fcf38667c6da8c916208db /scripts
parent: fdc37fbd908472e28735a8f0b01e3e66a43535e0 (diff)
download: opie-cd51d382be50bc021739395309e23760f1619759.zip
opie-cd51d382be50bc021739395309e23760f1619759.tar.gz
opie-cd51d382be50bc021739395309e23760f1619759.tar.bz2
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 52419ad..0459caf 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -1,57 +1,57 @@
 /*
 * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
 * Released under the terms of the GNU GPL v2.0.
 */
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qtoolbar.h>
 #include <qvbox.h>
 #include <qsplitter.h>
 #include <qlistview.h>
 #include <qtextview.h>
 #include <qlineedit.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qfiledialog.h>
 #include <qregexp.h>
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 #include <qsettings.h>
 #endif
 #include <stdlib.h>
 #include "lkc.h"
 #include "qconf.h"
 #include "qconf.moc"
 #include "images.c"
 static QApplication *configApp;
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 static QSettings *configSettings;
 #endif
 /*
 * update all the children of a menu entry
 *   removes/adds the entries from the parent widget as necessary
 *
 * parent: either the menu list widget or a menu entry widget
 * menu: entry to be updated
 */
 template <class P>
 void ConfigList::updateMenuList(P* parent, struct menu* menu)
 {
        struct menu* child;
        ConfigItem* item;
        ConfigItem* last;
        bool visible;
        enum prop_type type;
        if (!menu) {
                while ((item = parent->firstChild()))
                        delete item;
                return;
        }
@@ -81,49 +81,49 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
                        if (!item || item->menu != child)
                                item = new ConfigItem(parent, last, child, visible);
                        else
                                item->testUpdateMenu(visible);
                        if (mode == fullMode || mode == menuMode || type != P_MENU)
                                updateMenuList(item, child);
                        else
                                updateMenuList(item, 0);
                        last = item;
                        continue;
                }
        hide:
                if (item && item->menu == child) {
                        last = parent->firstChild();
                        if (last == item)
                                last = 0;
                        else while (last->nextSibling() != item)
                                last = last->nextSibling();
                        delete item;
                }
        }
 }
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
 /*
 * set the new data
 * TODO check the value
 */
 void ConfigItem::okRename(int col)
 {
        Parent::okRename(col);
        sym_set_string_value(menu->sym, text(dataColIdx).latin1());
 }
 #endif
 /*
 * update the displayed of a menu entry
 */
 void ConfigItem::updateMenu(void)
 {
        ConfigList* list;
        struct symbol* sym;
        struct property *prop;
        QString prompt;
        int type;
        tristate expr;
        list = listView();
@@ -194,49 +194,49 @@ void ConfigItem::updateMenu(void)
                default:
                        if (sym_is_choice_value(sym) && type == S_BOOLEAN)
                                setPixmap(promptColIdx, list->choiceNoPix);
                        else
                                setPixmap(promptColIdx, list->symbolNoPix);
                        setText(noColIdx, "N");
                        ch = 'N';
                        break;
                }
                if (expr != no)
                        setText(noColIdx, sym_tristate_within_range(sym, no) ? "_" : 0);
                if (expr != mod)
                        setText(modColIdx, sym_tristate_within_range(sym, mod) ? "_" : 0);
                if (expr != yes)
                        setText(yesColIdx, sym_tristate_within_range(sym, yes) ? "_" : 0);
                setText(dataColIdx, QChar(ch));
                break;
        case S_INT:
        case S_HEX:
        case S_STRING:
                const char* data;
                data = sym_get_string_value(sym);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                int i = list->mapIdx(dataColIdx);
                if (i >= 0)
                        setRenameEnabled(i, TRUE);
 #endif
                setText(dataColIdx, data);
                if (type == S_STRING)
                        prompt.sprintf("%s: %s", prompt.latin1(), data);
                else
                        prompt.sprintf("(%s) %s", data, prompt.latin1());
                break;
        }
        if (!sym_has_value(sym) && visible)
                prompt += " (NEW)";
 set_prompt:
        setText(promptColIdx, prompt);
 }
 void ConfigItem::testUpdateMenu(bool v)
 {
        ConfigItem* i;
        visible = v;
        if (!menu)
                return;
@@ -469,49 +469,49 @@ void ConfigList::changeValue(ConfigItem* item)
        if (!sym) {
                if (item->menu->list)
                        item->setOpen(!item->isOpen());
                return;
        }
        type = sym_get_type(sym);
        switch (type) {
        case S_BOOLEAN:
        case S_TRISTATE:
                oldexpr = sym_get_tristate_value(sym);
                newexpr = sym_toggle_tristate_value(sym);
                if (item->menu->list) {
                        if (oldexpr == newexpr)
                                item->setOpen(!item->isOpen());
                        else if (oldexpr == no)
                                item->setOpen(TRUE);
                }
                if (oldexpr != newexpr)
                        parent()->updateList(item);
                break;
        case S_INT:
        case S_HEX:
        case S_STRING:
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
                if (colMap[dataColIdx] >= 0)
                        item->startRename(colMap[dataColIdx]);
                else
 #endif
                        parent()->lineEdit->show(item);
                break;
        }
 }
 void ConfigList::setRootMenu(struct menu *menu)
 {
        enum prop_type type;
        if (rootEntry == menu)
                return;
        type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;
        if (type != P_MENU)
                return;
        updateMenuList(this, 0);
        rootEntry = menu;
        updateListAll();
        setSelected(currentItem(), hasFocus());
 }
@@ -730,49 +730,49 @@ void ConfigView::updateList(ConfigItem* item)
                v->list->updateList(item);
 }
 void ConfigView::updateListAll(void)
 {
        ConfigView* v;
        for (v = viewList; v; v = v->nextView)
                v->list->updateListAll();
 }
 /*
 * Construct the complete config widget
 */
 ConfigMainWindow::ConfigMainWindow(void)
 {
        QMenuBar* menu;
        QSplitter* split1;
        QSplitter* split2;
        bool ok;
        int x, y, width, height;
        QWidget *d = configApp->desktop();
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
        width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64);
        height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64);
        resize(width, height);
        x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok);
        if (ok)
                y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok);
        if (ok)
                move(x, y);
 #else
        width = d->width() - 64;
        height = d->height() - 64;
        resize(width, height);
 #endif
        showDebug = false;
        split1 = new QSplitter(this);
        split1->setOrientation(QSplitter::Horizontal);
        setCentralWidget(split1);
        menuView = new ConfigView(split1, this);
        menuList = menuView->list;
        split2 = new QSplitter(split1);
@@ -1245,60 +1245,60 @@ void fixup_rootmenu(struct menu *menu)
                } else if (!menu_cnt)
                        fixup_rootmenu(child);
        }
 }
 static const char *progname;
 static void usage(void)
 {
        printf("%s <config>\n", progname);
        exit(0);
 }
 int main(int ac, char** av)
 {
        ConfigMainWindow* v;
        const char *name;
 #ifndef LKC_DIRECT_LINK
        kconfig_load();
 #endif
        progname = av[0];
        configApp = new QApplication(ac, av);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
        configSettings = new QSettings;
 #endif
        if (ac > 1 && av[1][0] == '-') {
                switch (av[1][1]) {
                case 'h':
                case '?':
                        usage();
                }
                name = av[2];
        } else
                name = av[1];
        if (!name)
                usage();
        conf_parse(name);
        fixup_rootmenu(&rootmenu);
        conf_read(NULL);
        //zconfdump(stdout);
        v = new ConfigMainWindow();
        //zconfdump(stdout);
        v->show();
        configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
        configApp->exec();
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
        configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x());
        configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y());
        configSettings->writeEntry("/kconfig/qconf/window width", v->size().width());
        configSettings->writeEntry("/kconfig/qconf/window height", v->size().height());
        delete configSettings;
 #endif
        return 0;
 }
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index c548884..dee5254 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -120,49 +120,49 @@ private:
        int colMap[colNr];
        int colRevMap[colNr];
 };
 class ConfigItem : public QListViewItem {
        typedef class QListViewItem Parent;
 public:
        ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v)
        : Parent(parent, after), menu(m), visible(v), goParent(false)
        {
                init();
        }
        ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v)
        : Parent(parent, after), menu(m), visible(v), goParent(false)
        {
                init();
        }
        ConfigItem(QListView *parent, ConfigItem *after, bool v)
        : Parent(parent, after), menu(0), visible(v), goParent(true)
        {
                init();
        }
        ~ConfigItem(void);
        void init(void);
-#if QT_VERSION >= 300
+#if QT_VERSION >= 0x030000
        void okRename(int col);
 #endif
        void updateMenu(void);
        void testUpdateMenu(bool v);
        ConfigList* listView() const
        {
                return (ConfigList*)Parent::listView();
        }
        ConfigItem* firstChild() const
        {
                return (ConfigItem *)Parent::firstChild();
        }
        ConfigItem* nextSibling() const
        {
                return (ConfigItem *)Parent::nextSibling();
        }
        void setText(colIdx idx, const QString& text)
        {
                Parent::setText(listView()->mapIdx(idx), text);
        }
        QString text(colIdx idx) const
        {
                return Parent::text(listView()->mapIdx(idx));
        }
author	ar <ar>	2005-01-21 19:56:15 (UTC)
committer	ar <ar>	2005-01-21 19:56:15 (UTC)
commit	cd51d382be50bc021739395309e23760f1619759 (patch) (unidiff)
tree	e76155f772df7faea5fcf38667c6da8c916208db /scripts
parent	fdc37fbd908472e28735a8f0b01e3e66a43535e0 (diff)
download	opie-cd51d382be50bc021739395309e23760f1619759.zip opie-cd51d382be50bc021739395309e23760f1619759.tar.gz opie-cd51d382be50bc021739395309e23760f1619759.tar.bz2

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 52419ad..0459caf 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc
@@ -1,57 +1,57 @@
1	/*	1	/*
2	* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>	2	* Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
3	* Released under the terms of the GNU GPL v2.0.	3	* Released under the terms of the GNU GPL v2.0.
4	*/	4	*/
5		5
6	#include <qapplication.h>	6	#include <qapplication.h>
7	#include <qmainwindow.h>	7	#include <qmainwindow.h>
8	#include <qtoolbar.h>	8	#include <qtoolbar.h>
9	#include <qvbox.h>	9	#include <qvbox.h>
10	#include <qsplitter.h>	10	#include <qsplitter.h>
11	#include <qlistview.h>	11	#include <qlistview.h>
12	#include <qtextview.h>	12	#include <qtextview.h>
13	#include <qlineedit.h>	13	#include <qlineedit.h>
14	#include <qmenubar.h>	14	#include <qmenubar.h>
15	#include <qmessagebox.h>	15	#include <qmessagebox.h>
16	#include <qaction.h>	16	#include <qaction.h>
17	#include <qheader.h>	17	#include <qheader.h>
18	#include <qfiledialog.h>	18	#include <qfiledialog.h>
19	#include <qregexp.h>	19	#include <qregexp.h>
20	#if QT_VERSION >= 300	20	#if QT_VERSION >= 0x030000
21	#include <qsettings.h>	21	#include <qsettings.h>
22	#endif	22	#endif
23		23
24	#include <stdlib.h>	24	#include <stdlib.h>
25		25
26	#include "lkc.h"	26	#include "lkc.h"
27	#include "qconf.h"	27	#include "qconf.h"
28		28
29	#include "qconf.moc"	29	#include "qconf.moc"
30	#include "images.c"	30	#include "images.c"
31		31
32	static QApplication *configApp;	32	static QApplication *configApp;
33	#if QT_VERSION >= 300	33	#if QT_VERSION >= 0x030000
34	static QSettings *configSettings;	34	static QSettings *configSettings;
35	#endif	35	#endif
36		36
37	/*	37	/*
38	* update all the children of a menu entry	38	* update all the children of a menu entry
39	* removes/adds the entries from the parent widget as necessary	39	* removes/adds the entries from the parent widget as necessary
40	*	40	*
41	* parent: either the menu list widget or a menu entry widget	41	* parent: either the menu list widget or a menu entry widget
42	* menu: entry to be updated	42	* menu: entry to be updated
43	*/	43	*/
44	template <class P>	44	template <class P>
45	void ConfigList::updateMenuList(P* parent, struct menu* menu)	45	void ConfigList::updateMenuList(P* parent, struct menu* menu)
46	{	46	{
47	struct menu* child;	47	struct menu* child;
48	ConfigItem* item;	48	ConfigItem* item;
49	ConfigItem* last;	49	ConfigItem* last;
50	bool visible;	50	bool visible;
51	enum prop_type type;	51	enum prop_type type;
52		52
53	if (!menu) {	53	if (!menu) {
54	while ((item = parent->firstChild()))	54	while ((item = parent->firstChild()))
55	delete item;	55	delete item;
56	return;	56	return;
57	}	57	}
@@ -81,49 +81,49 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
81	if (!item \|\| item->menu != child)	81	if (!item \|\| item->menu != child)
82	item = new ConfigItem(parent, last, child, visible);	82	item = new ConfigItem(parent, last, child, visible);
83	else	83	else
84	item->testUpdateMenu(visible);	84	item->testUpdateMenu(visible);
85		85
86	if (mode == fullMode \|\| mode == menuMode \|\| type != P_MENU)	86	if (mode == fullMode \|\| mode == menuMode \|\| type != P_MENU)
87	updateMenuList(item, child);	87	updateMenuList(item, child);
88	else	88	else
89	updateMenuList(item, 0);	89	updateMenuList(item, 0);
90	last = item;	90	last = item;
91	continue;	91	continue;
92	}	92	}
93	hide:	93	hide:
94	if (item && item->menu == child) {	94	if (item && item->menu == child) {
95	last = parent->firstChild();	95	last = parent->firstChild();
96	if (last == item)	96	if (last == item)
97	last = 0;	97	last = 0;
98	else while (last->nextSibling() != item)	98	else while (last->nextSibling() != item)
99	last = last->nextSibling();	99	last = last->nextSibling();
100	delete item;	100	delete item;
101	}	101	}
102	}	102	}
103	}	103	}
104		104
105	#if QT_VERSION >= 300	105	#if QT_VERSION >= 0x030000
106	/*	106	/*
107	* set the new data	107	* set the new data
108	* TODO check the value	108	* TODO check the value
109	*/	109	*/
110	void ConfigItem::okRename(int col)	110	void ConfigItem::okRename(int col)
111	{	111	{
112	Parent::okRename(col);	112	Parent::okRename(col);
113	sym_set_string_value(menu->sym, text(dataColIdx).latin1());	113	sym_set_string_value(menu->sym, text(dataColIdx).latin1());
114	}	114	}
115	#endif	115	#endif
116		116
117	/*	117	/*
118	* update the displayed of a menu entry	118	* update the displayed of a menu entry
119	*/	119	*/
120	void ConfigItem::updateMenu(void)	120	void ConfigItem::updateMenu(void)
121	{	121	{
122	ConfigList* list;	122	ConfigList* list;
123	struct symbol* sym;	123	struct symbol* sym;
124	struct property *prop;	124	struct property *prop;
125	QString prompt;	125	QString prompt;
126	int type;	126	int type;
127	tristate expr;	127	tristate expr;
128		128
129	list = listView();	129	list = listView();
@@ -194,49 +194,49 @@ void ConfigItem::updateMenu(void)
194	default:	194	default:
195	if (sym_is_choice_value(sym) && type == S_BOOLEAN)	195	if (sym_is_choice_value(sym) && type == S_BOOLEAN)
196	setPixmap(promptColIdx, list->choiceNoPix);	196	setPixmap(promptColIdx, list->choiceNoPix);
197	else	197	else
198	setPixmap(promptColIdx, list->symbolNoPix);	198	setPixmap(promptColIdx, list->symbolNoPix);
199	setText(noColIdx, "N");	199	setText(noColIdx, "N");
200	ch = 'N';	200	ch = 'N';
201	break;	201	break;
202	}	202	}
203	if (expr != no)	203	if (expr != no)
204	setText(noColIdx, sym_tristate_within_range(sym, no) ? "_" : 0);	204	setText(noColIdx, sym_tristate_within_range(sym, no) ? "_" : 0);
205	if (expr != mod)	205	if (expr != mod)
206	setText(modColIdx, sym_tristate_within_range(sym, mod) ? "_" : 0);	206	setText(modColIdx, sym_tristate_within_range(sym, mod) ? "_" : 0);
207	if (expr != yes)	207	if (expr != yes)
208	setText(yesColIdx, sym_tristate_within_range(sym, yes) ? "_" : 0);	208	setText(yesColIdx, sym_tristate_within_range(sym, yes) ? "_" : 0);
209		209
210	setText(dataColIdx, QChar(ch));	210	setText(dataColIdx, QChar(ch));
211	break;	211	break;
212	case S_INT:	212	case S_INT:
213	case S_HEX:	213	case S_HEX:
214	case S_STRING:	214	case S_STRING:
215	const char* data;	215	const char* data;
216		216
217	data = sym_get_string_value(sym);	217	data = sym_get_string_value(sym);
218	#if QT_VERSION >= 300	218	#if QT_VERSION >= 0x030000
219	int i = list->mapIdx(dataColIdx);	219	int i = list->mapIdx(dataColIdx);
220	if (i >= 0)	220	if (i >= 0)
221	setRenameEnabled(i, TRUE);	221	setRenameEnabled(i, TRUE);
222	#endif	222	#endif
223	setText(dataColIdx, data);	223	setText(dataColIdx, data);
224	if (type == S_STRING)	224	if (type == S_STRING)
225	prompt.sprintf("%s: %s", prompt.latin1(), data);	225	prompt.sprintf("%s: %s", prompt.latin1(), data);
226	else	226	else
227	prompt.sprintf("(%s) %s", data, prompt.latin1());	227	prompt.sprintf("(%s) %s", data, prompt.latin1());
228	break;	228	break;
229	}	229	}
230	if (!sym_has_value(sym) && visible)	230	if (!sym_has_value(sym) && visible)
231	prompt += " (NEW)";	231	prompt += " (NEW)";
232	set_prompt:	232	set_prompt:
233	setText(promptColIdx, prompt);	233	setText(promptColIdx, prompt);
234	}	234	}
235		235
236	void ConfigItem::testUpdateMenu(bool v)	236	void ConfigItem::testUpdateMenu(bool v)
237	{	237	{
238	ConfigItem* i;	238	ConfigItem* i;
239		239
240	visible = v;	240	visible = v;
241	if (!menu)	241	if (!menu)
242	return;	242	return;
@@ -469,49 +469,49 @@ void ConfigList::changeValue(ConfigItem* item)
469	if (!sym) {	469	if (!sym) {
470	if (item->menu->list)	470	if (item->menu->list)
471	item->setOpen(!item->isOpen());	471	item->setOpen(!item->isOpen());
472	return;	472	return;
473	}	473	}
474		474
475	type = sym_get_type(sym);	475	type = sym_get_type(sym);
476	switch (type) {	476	switch (type) {
477	case S_BOOLEAN:	477	case S_BOOLEAN:
478	case S_TRISTATE:	478	case S_TRISTATE:
479	oldexpr = sym_get_tristate_value(sym);	479	oldexpr = sym_get_tristate_value(sym);
480	newexpr = sym_toggle_tristate_value(sym);	480	newexpr = sym_toggle_tristate_value(sym);
481	if (item->menu->list) {	481	if (item->menu->list) {
482	if (oldexpr == newexpr)	482	if (oldexpr == newexpr)
483	item->setOpen(!item->isOpen());	483	item->setOpen(!item->isOpen());
484	else if (oldexpr == no)	484	else if (oldexpr == no)
485	item->setOpen(TRUE);	485	item->setOpen(TRUE);
486	}	486	}
487	if (oldexpr != newexpr)	487	if (oldexpr != newexpr)
488	parent()->updateList(item);	488	parent()->updateList(item);
489	break;	489	break;
490	case S_INT:	490	case S_INT:
491	case S_HEX:	491	case S_HEX:
492	case S_STRING:	492	case S_STRING:
493	#if QT_VERSION >= 300	493	#if QT_VERSION >= 0x030000
494	if (colMap[dataColIdx] >= 0)	494	if (colMap[dataColIdx] >= 0)
495	item->startRename(colMap[dataColIdx]);	495	item->startRename(colMap[dataColIdx]);
496	else	496	else
497	#endif	497	#endif
498	parent()->lineEdit->show(item);	498	parent()->lineEdit->show(item);
499	break;	499	break;
500	}	500	}
501	}	501	}
502		502
503	void ConfigList::setRootMenu(struct menu *menu)	503	void ConfigList::setRootMenu(struct menu *menu)
504	{	504	{
505	enum prop_type type;	505	enum prop_type type;
506		506
507	if (rootEntry == menu)	507	if (rootEntry == menu)
508	return;	508	return;
509	type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;	509	type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN;
510	if (type != P_MENU)	510	if (type != P_MENU)
511	return;	511	return;
512	updateMenuList(this, 0);	512	updateMenuList(this, 0);
513	rootEntry = menu;	513	rootEntry = menu;
514	updateListAll();	514	updateListAll();
515	setSelected(currentItem(), hasFocus());	515	setSelected(currentItem(), hasFocus());
516	}	516	}
517		517
@@ -730,49 +730,49 @@ void ConfigView::updateList(ConfigItem* item)
730	v->list->updateList(item);	730	v->list->updateList(item);
731	}	731	}
732		732
733	void ConfigView::updateListAll(void)	733	void ConfigView::updateListAll(void)
734	{	734	{
735	ConfigView* v;	735	ConfigView* v;
736		736
737	for (v = viewList; v; v = v->nextView)	737	for (v = viewList; v; v = v->nextView)
738	v->list->updateListAll();	738	v->list->updateListAll();
739	}	739	}
740		740
741	/*	741	/*
742	* Construct the complete config widget	742	* Construct the complete config widget
743	*/	743	*/
744	ConfigMainWindow::ConfigMainWindow(void)	744	ConfigMainWindow::ConfigMainWindow(void)
745	{	745	{
746	QMenuBar* menu;	746	QMenuBar* menu;
747	QSplitter* split1;	747	QSplitter* split1;
748	QSplitter* split2;	748	QSplitter* split2;
749	bool ok;	749	bool ok;
750	int x, y, width, height;	750	int x, y, width, height;
751		751
752	QWidget *d = configApp->desktop();	752	QWidget *d = configApp->desktop();
753		753
754	#if QT_VERSION >= 300	754	#if QT_VERSION >= 0x030000
755	width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64);	755	width = configSettings->readNumEntry("/kconfig/qconf/window width", d->width() - 64);
756	height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64);	756	height = configSettings->readNumEntry("/kconfig/qconf/window height", d->height() - 64);
757	resize(width, height);	757	resize(width, height);
758	x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok);	758	x = configSettings->readNumEntry("/kconfig/qconf/window x", 0, &ok);
759	if (ok)	759	if (ok)
760	y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok);	760	y = configSettings->readNumEntry("/kconfig/qconf/window y", 0, &ok);
761	if (ok)	761	if (ok)
762	move(x, y);	762	move(x, y);
763	#else	763	#else
764	width = d->width() - 64;	764	width = d->width() - 64;
765	height = d->height() - 64;	765	height = d->height() - 64;
766	resize(width, height);	766	resize(width, height);
767	#endif	767	#endif
768		768
769	showDebug = false;	769	showDebug = false;
770		770
771	split1 = new QSplitter(this);	771	split1 = new QSplitter(this);
772	split1->setOrientation(QSplitter::Horizontal);	772	split1->setOrientation(QSplitter::Horizontal);
773	setCentralWidget(split1);	773	setCentralWidget(split1);
774		774
775	menuView = new ConfigView(split1, this);	775	menuView = new ConfigView(split1, this);
776	menuList = menuView->list;	776	menuList = menuView->list;
777		777
778	split2 = new QSplitter(split1);	778	split2 = new QSplitter(split1);
@@ -1245,60 +1245,60 @@ void fixup_rootmenu(struct menu *menu)
1245	} else if (!menu_cnt)	1245	} else if (!menu_cnt)
1246	fixup_rootmenu(child);	1246	fixup_rootmenu(child);
1247	}	1247	}
1248	}	1248	}
1249		1249
1250	static const char *progname;	1250	static const char *progname;
1251		1251
1252	static void usage(void)	1252	static void usage(void)
1253	{	1253	{
1254	printf("%s <config>\n", progname);	1254	printf("%s <config>\n", progname);
1255	exit(0);	1255	exit(0);
1256	}	1256	}
1257		1257
1258	int main(int ac, char** av)	1258	int main(int ac, char** av)
1259	{	1259	{
1260	ConfigMainWindow* v;	1260	ConfigMainWindow* v;
1261	const char *name;	1261	const char *name;
1262		1262
1263	#ifndef LKC_DIRECT_LINK	1263	#ifndef LKC_DIRECT_LINK
1264	kconfig_load();	1264	kconfig_load();
1265	#endif	1265	#endif
1266		1266
1267	progname = av[0];	1267	progname = av[0];
1268	configApp = new QApplication(ac, av);	1268	configApp = new QApplication(ac, av);
1269	#if QT_VERSION >= 300	1269	#if QT_VERSION >= 0x030000
1270	configSettings = new QSettings;	1270	configSettings = new QSettings;
1271	#endif	1271	#endif
1272	if (ac > 1 && av[1][0] == '-') {	1272	if (ac > 1 && av[1][0] == '-') {
1273	switch (av[1][1]) {	1273	switch (av[1][1]) {
1274	case 'h':	1274	case 'h':
1275	case '?':	1275	case '?':
1276	usage();	1276	usage();
1277	}	1277	}
1278	name = av[2];	1278	name = av[2];
1279	} else	1279	} else
1280	name = av[1];	1280	name = av[1];
1281	if (!name)	1281	if (!name)
1282	usage();	1282	usage();
1283		1283
1284	conf_parse(name);	1284	conf_parse(name);
1285	fixup_rootmenu(&rootmenu);	1285	fixup_rootmenu(&rootmenu);
1286	conf_read(NULL);	1286	conf_read(NULL);
1287	//zconfdump(stdout);	1287	//zconfdump(stdout);
1288		1288
1289	v = new ConfigMainWindow();	1289	v = new ConfigMainWindow();
1290		1290
1291	//zconfdump(stdout);	1291	//zconfdump(stdout);
1292	v->show();	1292	v->show();
1293	configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));	1293	configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit()));
1294	configApp->exec();	1294	configApp->exec();
1295		1295
1296	#if QT_VERSION >= 300	1296	#if QT_VERSION >= 0x030000
1297	configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x());	1297	configSettings->writeEntry("/kconfig/qconf/window x", v->pos().x());
1298	configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y());	1298	configSettings->writeEntry("/kconfig/qconf/window y", v->pos().y());
1299	configSettings->writeEntry("/kconfig/qconf/window width", v->size().width());	1299	configSettings->writeEntry("/kconfig/qconf/window width", v->size().width());
1300	configSettings->writeEntry("/kconfig/qconf/window height", v->size().height());	1300	configSettings->writeEntry("/kconfig/qconf/window height", v->size().height());
1301	delete configSettings;	1301	delete configSettings;
1302	#endif	1302	#endif
1303	return 0;	1303	return 0;
1304	}	1304	}


diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index c548884..dee5254 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h
@@ -120,49 +120,49 @@ private:
120	int colMap[colNr];	120	int colMap[colNr];
121	int colRevMap[colNr];	121	int colRevMap[colNr];
122	};	122	};
123		123
124	class ConfigItem : public QListViewItem {	124	class ConfigItem : public QListViewItem {
125	typedef class QListViewItem Parent;	125	typedef class QListViewItem Parent;
126	public:	126	public:
127	ConfigItem(QListView parent, ConfigItem after, struct menu *m, bool v)	127	ConfigItem(QListView parent, ConfigItem after, struct menu *m, bool v)
128	: Parent(parent, after), menu(m), visible(v), goParent(false)	128	: Parent(parent, after), menu(m), visible(v), goParent(false)
129	{	129	{
130	init();	130	init();
131	}	131	}
132	ConfigItem(ConfigItem parent, ConfigItem after, struct menu *m, bool v)	132	ConfigItem(ConfigItem parent, ConfigItem after, struct menu *m, bool v)
133	: Parent(parent, after), menu(m), visible(v), goParent(false)	133	: Parent(parent, after), menu(m), visible(v), goParent(false)
134	{	134	{
135	init();	135	init();
136	}	136	}
137	ConfigItem(QListView parent, ConfigItem after, bool v)	137	ConfigItem(QListView parent, ConfigItem after, bool v)
138	: Parent(parent, after), menu(0), visible(v), goParent(true)	138	: Parent(parent, after), menu(0), visible(v), goParent(true)
139	{	139	{
140	init();	140	init();
141	}	141	}
142	~ConfigItem(void);	142	~ConfigItem(void);
143	void init(void);	143	void init(void);
144	#if QT_VERSION >= 300	144	#if QT_VERSION >= 0x030000
145	void okRename(int col);	145	void okRename(int col);
146	#endif	146	#endif
147	void updateMenu(void);	147	void updateMenu(void);
148	void testUpdateMenu(bool v);	148	void testUpdateMenu(bool v);
149	ConfigList* listView() const	149	ConfigList* listView() const
150	{	150	{
151	return (ConfigList*)Parent::listView();	151	return (ConfigList*)Parent::listView();
152	}	152	}
153	ConfigItem* firstChild() const	153	ConfigItem* firstChild() const
154	{	154	{
155	return (ConfigItem *)Parent::firstChild();	155	return (ConfigItem *)Parent::firstChild();
156	}	156	}
157	ConfigItem* nextSibling() const	157	ConfigItem* nextSibling() const
158	{	158	{
159	return (ConfigItem *)Parent::nextSibling();	159	return (ConfigItem *)Parent::nextSibling();
160	}	160	}
161	void setText(colIdx idx, const QString& text)	161	void setText(colIdx idx, const QString& text)
162	{	162	{
163	Parent::setText(listView()->mapIdx(idx), text);	163	Parent::setText(listView()->mapIdx(idx), text);
164	}	164	}
165	QString text(colIdx idx) const	165	QString text(colIdx idx) const
166	{	166	{
167	return Parent::text(listView()->mapIdx(idx));	167	return Parent::text(listView()->mapIdx(idx));
168	}	168	}