From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1OGZiK-0002eq-2c for garchives@archives.gentoo.org; Mon, 24 May 2010 15:37:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B541E082D; Mon, 24 May 2010 15:37:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9DA77E082D for ; Mon, 24 May 2010 15:37:10 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 05AC31B408D for ; Mon, 24 May 2010 15:37:10 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 2195) id 3AF242CDB0; Mon, 24 May 2010 15:37:09 +0000 (UTC) To: gentoo-commits@lists.gentoo.org From: "Mike Pagano (mpagano)" Subject: [gentoo-commits] linux-patches r1708 - genpatches-2.6/trunk/2.6.34 X-VCS-Repository: linux-patches X-VCS-Revision: 1708 X-VCS-Files: genpatches-2.6/trunk/2.6.34/2900_xconfig-with-qt4.patch genpatches-2.6/trunk/2.6.34/0000_README X-VCS-Directories: genpatches-2.6/trunk/2.6.34 X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano Content-Type: text/plain; charset=UTF-8 Message-Id: <20100524153709.3AF242CDB0@corvid.gentoo.org> Date: Mon, 24 May 2010 15:37:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 24990dd0-5cd5-43bf-b64f-79153586bffb X-Archives-Hash: 62fd9ec12bcbd9f2a7cc203e2a423d01 Author: mpagano Date: 2010-05-24 15:37:07 +0000 (Mon, 24 May 2010) New Revision: 1708 Added: genpatches-2.6/trunk/2.6.34/2900_xconfig-with-qt4.patch Modified: genpatches-2.6/trunk/2.6.34/0000_README Log: xconfig patch for qt4. Bug #320761. Thanks to Sam Iam Modified: genpatches-2.6/trunk/2.6.34/0000_README =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- genpatches-2.6/trunk/2.6.34/0000_README 2010-05-20 18:06:03 UTC (rev = 1707) +++ genpatches-2.6/trunk/2.6.34/0000_README 2010-05-24 15:37:07 UTC (rev = 1708) @@ -39,6 +39,10 @@ Individual Patch Descriptions: ------------------------------------------------------------------------= -- =20 +Patch: 2900_xconfig-with-qt4.patch +From: http://bugs.gentoo.org/show_bug.cgi?id=3D320761 +Desc: xconfig patch for qt4 - thanks to Sam Iam + Patch: 4200_fbcondecor-0.9.6.patch From: http://dev.gentoo.org/~spock Desc: Bootsplash successor by Michal Januszewski Added: genpatches-2.6/trunk/2.6.34/2900_xconfig-with-qt4.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- genpatches-2.6/trunk/2.6.34/2900_xconfig-with-qt4.patch = (rev 0) +++ genpatches-2.6/trunk/2.6.34/2900_xconfig-with-qt4.patch 2010-05-24 15= :37:07 UTC (rev 1708) @@ -0,0 +1,736 @@ +--- a/scripts/kconfig/Makefile 2010-05-20 16:09:21.000000000 -0400 ++++ b/scripts/kconfig/Makefile 2010-05-20 16:01:19.000000000 -0400 +@@ -223,6 +223,7 @@ $(obj)/.tmp_qtcheck: + @set -e; echo " CHECK qt"; dir=3D""; pkg=3D""; \ + pkg-config --exists qt 2> /dev/null && pkg=3Dqt; \ + pkg-config --exists qt-mt 2> /dev/null && pkg=3Dqt-mt; \ ++ pkg-config --exists Qt3Support 2> /dev/null && pkg=3DQt3Support; \ + if [ -n "$$pkg" ]; then \ + cflags=3D"\$$(shell pkg-config $$pkg --cflags)"; \ + libs=3D"\$$(shell pkg-config $$pkg --libs)"; \ +--- a/scripts/kconfig/expr.h 2010-05-20 16:09:26.000000000 -0400 ++++ b/scripts/kconfig/expr.h 2010-05-20 16:01:24.000000000 -0400 +@@ -171,6 +171,8 @@ struct menu { + void *data; + }; +=20 ++typedef struct menu KCMenu; /* HACK: to avoid qt4 moc getting confused = by structs - JS */ ++ + #define MENU_CHANGED 0x0001 + #define MENU_ROOT 0x0002 +=20 +--- a/scripts/kconfig/qconf.h 2010-05-20 16:09:30.000000000 -0400 ++++ b/scripts/kconfig/qconf.h 2010-05-20 16:01:50.000000000 -0400 +@@ -3,9 +3,18 @@ + * Released under the terms of the GNU GPL v2.0. + */ +=20 +-#include ++#include + #if QT_VERSION >=3D 300 + #include ++//Added by qt3to4: ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #else + class QSettings { + public: +@@ -34,8 +43,8 @@ class ConfigMainWindow; +=20 + class ConfigSettings : public QSettings { + public: +- QValueList readSizes(const QString& key, bool *ok); +- bool writeSizes(const QString& key, const QValueList& value); ++ Q3ValueList readSizes(const QString& key, bool *ok); ++ bool writeSizes(const QString& key, const Q3ValueList& value); + }; +=20 + enum colIdx { +@@ -45,9 +54,9 @@ enum listMode { + singleMode, menuMode, symbolMode, fullMode, listMode + }; +=20 +-class ConfigList : public QListView { ++class ConfigList : public Q3ListView { + Q_OBJECT +- typedef class QListView Parent; ++ typedef class Q3ListView Parent; + public: + ConfigList(ConfigView* p, const char *name =3D 0); + void reinit(void); +@@ -55,7 +64,7 @@ public: + { + return (ConfigView*)Parent::parent(); + } +- ConfigItem* findConfigItem(struct menu *); ++ ConfigItem* findConfigItem(KCMenu *); +=20 + protected: + void keyPressEvent(QKeyEvent *e); +@@ -67,7 +76,7 @@ protected: + void contextMenuEvent(QContextMenuEvent *e); +=20 + public slots: +- void setRootMenu(struct menu *menu); ++ void setRootMenu(KCMenu *menu); +=20 + void updateList(ConfigItem *item); + void setValue(ConfigItem* item, tristate val); +@@ -75,10 +84,10 @@ public slots: + void updateSelection(void); + void saveSettings(void); + signals: +- void menuChanged(struct menu *menu); +- void menuSelected(struct menu *menu); ++ void menuChanged(KCMenu *menu); ++ void menuSelected(KCMenu *menu); + void parentSelected(void); +- void gotFocus(struct menu *); ++ void gotFocus(KCMenu *); +=20 + public: + void updateListAll(void) +@@ -116,7 +125,7 @@ public: + void setParentMenu(void); +=20 + template +- void updateMenuList(P*, struct menu*); ++ void updateMenuList(P*, KCMenu*); +=20 + bool updateAll; +=20 +@@ -126,30 +135,30 @@ public: +=20 + bool showAll, showName, showRange, showData; + enum listMode mode; +- struct menu *rootEntry; ++ KCMenu *rootEntry; + QColorGroup disabledColorGroup; + QColorGroup inactivedColorGroup; +- QPopupMenu* headerPopup; ++ Q3PopupMenu* headerPopup; +=20 + private: + int colMap[colNr]; + int colRevMap[colNr]; + }; +=20 +-class ConfigItem : public QListViewItem { +- typedef class QListViewItem Parent; ++class ConfigItem : public Q3ListViewItem { ++ typedef class Q3ListViewItem Parent; + public: +- ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool = v) ++ ConfigItem(Q3ListView *parent, ConfigItem *after, KCMenu *m, bool v) + : Parent(parent, after), menu(m), visible(v), goParent(false) + { + init(); + } +- ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool= v) ++ ConfigItem(ConfigItem *parent, ConfigItem *after, KCMenu *m, bool v) + : Parent(parent, after), menu(m), visible(v), goParent(false) + { + init(); + } +- ConfigItem(QListView *parent, ConfigItem *after, bool v) ++ ConfigItem(Q3ListView *parent, ConfigItem *after, bool v) + : Parent(parent, after), menu(0), visible(v), goParent(true) + { + init(); +@@ -192,7 +201,7 @@ public: + void paintCell(QPainter* p, const QColorGroup& cg, int column, int wid= th, int align); +=20 + ConfigItem* nextItem; +- struct menu *menu; ++ KCMenu *menu; + bool visible; + bool goParent; + }; +@@ -213,9 +222,9 @@ public: + ConfigItem *item; + }; +=20 +-class ConfigView : public QVBox { ++class ConfigView : public Q3VBox { + Q_OBJECT +- typedef class QVBox Parent; ++ typedef class Q3VBox Parent; + public: + ConfigView(QWidget* parent, const char *name =3D 0); + ~ConfigView(void); +@@ -244,22 +253,22 @@ public: + ConfigView* nextView; + }; +=20 +-class ConfigInfoView : public QTextBrowser { ++class ConfigInfoView : public Q3TextBrowser { + Q_OBJECT +- typedef class QTextBrowser Parent; ++ typedef class Q3TextBrowser Parent; + public: + ConfigInfoView(QWidget* parent, const char *name =3D 0); + bool showDebug(void) const { return _showDebug; } +=20 + public slots: +- void setInfo(struct menu *menu); ++ void setInfo(KCMenu *menu); + void saveSettings(void); + void setSource(const QString& name); + void setShowDebug(bool); +=20 + signals: + void showDebugChanged(bool); +- void menuSelected(struct menu *); ++ void menuSelected(KCMenu *); +=20 + protected: + void symbolInfo(void); +@@ -267,11 +276,11 @@ protected: + QString debug_info(struct symbol *sym); + static QString print_filter(const QString &str); + static void expr_print_help(void *data, struct symbol *sym, const char= *str); +- QPopupMenu* createPopupMenu(const QPoint& pos); ++ Q3PopupMenu* createPopupMenu(const QPoint& pos); + void contentsContextMenuEvent(QContextMenuEvent *e); +=20 + struct symbol *sym; +- struct menu *menu; ++ KCMenu *menu; + bool _showDebug; + }; +=20 +@@ -295,7 +304,7 @@ protected: + struct symbol **result; + }; +=20 +-class ConfigMainWindow : public QMainWindow { ++class ConfigMainWindow : public Q3MainWindow { + Q_OBJECT +=20 + static QAction *saveAction; +@@ -303,8 +312,8 @@ class ConfigMainWindow : public QMainWin + public: + ConfigMainWindow(void); + public slots: +- void changeMenu(struct menu *); +- void setMenuLink(struct menu *); ++ void changeMenu(KCMenu *); ++ void setMenuLink(KCMenu *); + void listFocusChanged(void); + void goBack(void); + void loadConfig(void); +@@ -327,7 +336,7 @@ protected: + ConfigView *configView; + ConfigList *configList; + ConfigInfoView *helpText; +- QToolBar *toolBar; ++ Q3ToolBar *toolBar; + QAction *backAction; + QSplitter* split1; + QSplitter* split2; +--- a/scripts/kconfig/qconf.cc 2010-05-20 16:09:34.000000000 -0400 ++++ b/scripts/kconfig/qconf.cc 2010-05-20 16:01:46.000000000 -0400 +@@ -4,24 +4,35 @@ + */ +=20 + #include +-#include ++#include + #include +-#include ++#include + #include +-#include ++#include + #include +-#include +-#include ++#include ++#include + #include + #include + #include + #include + #include + #include +-#include +-#include +-#include ++#include ++#include ++#include + #include ++//Added by qt3to4: ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include +=20 + #include +=20 +@@ -54,9 +65,9 @@ static inline QString qgettext(const QSt + /** + * Reads a list of integer values from the application settings. + */ +-QValueList ConfigSettings::readSizes(const QString& key, bool *ok) ++Q3ValueList ConfigSettings::readSizes(const QString& key, bool *ok= ) + { +- QValueList result; ++ Q3ValueList result; + QStringList entryList =3D readListEntry(key, ok); + if (ok) { + QStringList::Iterator it; +@@ -70,10 +81,10 @@ QValueList ConfigSettings::readSize + /** + * Writes a list of integer values to the application settings. + */ +-bool ConfigSettings::writeSizes(const QString& key, const QValueList& value) ++bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList& value) + { + QStringList stringList; +- QValueList::ConstIterator it; ++ Q3ValueList::ConstIterator it; +=20 + for (it =3D value.begin(); it !=3D value.end(); ++it) + stringList.push_back(QString::number(*it)); +@@ -385,7 +396,7 @@ void ConfigList::saveSettings(void) + } + } +=20 +-ConfigItem* ConfigList::findConfigItem(struct menu *menu) ++ConfigItem* ConfigList::findConfigItem(KCMenu *menu) + { + ConfigItem* item =3D (ConfigItem*)menu->data; +=20 +@@ -399,7 +410,7 @@ ConfigItem* ConfigList::findConfigItem(s +=20 + void ConfigList::updateSelection(void) + { +- struct menu *menu; ++ KCMenu *menu; + enum prop_type type; +=20 + ConfigItem* item =3D (ConfigItem*)selectedItem(); +@@ -422,7 +433,7 @@ void ConfigList::updateList(ConfigItem*=20 + if (!rootEntry) { + if (mode !=3D listMode) + goto update; +- QListViewItemIterator it(this); ++ Q3ListViewItemIterator it(this); + ConfigItem* item; +=20 + for (; it.current(); ++it) { +@@ -486,7 +497,7 @@ void ConfigList::setValue(ConfigItem* it + void ConfigList::changeValue(ConfigItem* item) + { + struct symbol* sym; +- struct menu* menu; ++ KCMenu* menu; + int type, oldexpr, newexpr; +=20 + menu =3D item->menu; +@@ -527,7 +538,7 @@ void ConfigList::changeValue(ConfigItem* + } + } +=20 +-void ConfigList::setRootMenu(struct menu *menu) ++void ConfigList::setRootMenu(KCMenu *menu) + { + enum prop_type type; +=20 +@@ -546,14 +557,14 @@ void ConfigList::setRootMenu(struct menu + void ConfigList::setParentMenu(void) + { + ConfigItem* item; +- struct menu *oldroot; ++ KCMenu *oldroot; +=20 + oldroot =3D rootEntry; + if (rootEntry =3D=3D &rootmenu) + return; + setRootMenu(menu_get_parent_menu(rootEntry->parent)); +=20 +- QListViewItemIterator it(this); ++ Q3ListViewItemIterator it(this); + for (; (item =3D (ConfigItem*)it.current()); it++) { + if (item->menu =3D=3D oldroot) { + setCurrentItem(item); +@@ -571,9 +582,9 @@ void ConfigList::setParentMenu(void) + * menu: entry to be updated + */ + template +-void ConfigList::updateMenuList(P* parent, struct menu* menu) ++void ConfigList::updateMenuList(P* parent, KCMenu* menu) + { +- struct menu* child; ++ KCMenu* child; + ConfigItem* item; + ConfigItem* last; + bool visible; +@@ -635,9 +646,9 @@ void ConfigList::updateMenuList(P* paren +=20 + void ConfigList::keyPressEvent(QKeyEvent* ev) + { +- QListViewItem* i =3D currentItem(); ++ Q3ListViewItem* i =3D currentItem(); + ConfigItem* item; +- struct menu *menu; ++ KCMenu *menu; + enum prop_type type; +=20 + if (ev->key() =3D=3D Qt::Key_Escape && mode !=3D fullMode && mode !=3D= listMode) { +@@ -698,7 +709,7 @@ void ConfigList::contentsMouseReleaseEve + { + QPoint p(contentsToViewport(e->pos())); + ConfigItem* item =3D (ConfigItem*)itemAt(p); +- struct menu *menu; ++ KCMenu *menu; + enum prop_type ptype; + const QPixmap* pm; + int idx, x; +@@ -760,7 +771,7 @@ void ConfigList::contentsMouseDoubleClic + { + QPoint p(contentsToViewport(e->pos())); + ConfigItem* item =3D (ConfigItem*)itemAt(p); +- struct menu *menu; ++ KCMenu *menu; + enum prop_type ptype; +=20 + if (!item) +@@ -785,7 +796,7 @@ skip: +=20 + void ConfigList::focusInEvent(QFocusEvent *e) + { +- struct menu *menu =3D NULL; ++ KCMenu *menu =3D NULL; +=20 + Parent::focusInEvent(e); +=20 +@@ -803,8 +814,8 @@ void ConfigList::contextMenuEvent(QConte + if (!headerPopup) { + QAction *action; +=20 +- headerPopup =3D new QPopupMenu(this); +- action =3D new QAction(NULL, _("Show Name"), 0, this); ++ headerPopup =3D new Q3PopupMenu(this); ++ action =3D new QAction(_("Show Name"), this); + action->setToggleAction(TRUE); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowName(bool))); +@@ -812,7 +823,7 @@ void ConfigList::contextMenuEvent(QConte + action, SLOT(setOn(bool))); + action->setOn(showName); + action->addTo(headerPopup); +- action =3D new QAction(NULL, _("Show Range"), 0, this); ++ action =3D new QAction(_("Show Range"), this); + action->setToggleAction(TRUE); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowRange(bool))); +@@ -820,7 +831,7 @@ void ConfigList::contextMenuEvent(QConte + action, SLOT(setOn(bool))); + action->setOn(showRange); + action->addTo(headerPopup); +- action =3D new QAction(NULL, _("Show Data"), 0, this); ++ action =3D new QAction(_("Show Data"), this); + action->setToggleAction(TRUE); + connect(action, SIGNAL(toggled(bool)), + parent(), SLOT(setShowData(bool))); +@@ -898,7 +909,7 @@ void ConfigView::setShowData(bool b) +=20 + void ConfigList::setAllOpen(bool open) + { +- QListViewItemIterator it(this); ++ Q3ListViewItemIterator it(this); +=20 + for (; it.current(); it++) + it.current()->setOpen(open); +@@ -952,7 +963,7 @@ void ConfigInfoView::setShowDebug(bool b + } + } +=20 +-void ConfigInfoView::setInfo(struct menu *m) ++void ConfigInfoView::setInfo(KCMenu *m) + { + if (menu =3D=3D m) + return; +@@ -973,7 +984,7 @@ void ConfigInfoView::setSource(const QSt +=20 + switch (p[0]) { + case 'm': +- struct menu *m; ++ KCMenu *m; +=20 + if (sscanf(p, "m%p", &m) =3D=3D 1 && menu !=3D m) { + menu =3D m; +@@ -1162,10 +1173,10 @@ void ConfigInfoView::expr_print_help(voi + *text +=3D str2; + } +=20 +-QPopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos) ++Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos) + { +- QPopupMenu* popup =3D Parent::createPopupMenu(pos); +- QAction* action =3D new QAction(NULL, _("Show Debug Info"), 0, popup); ++ Q3PopupMenu* popup =3D Parent::createPopupMenu(pos); ++ QAction* action =3D new QAction(_("Show Debug Info"), popup); + action->setToggleAction(TRUE); + connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); + connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(boo= l))); +@@ -1185,8 +1196,8 @@ ConfigSearchWindow::ConfigSearchWindow(C + { + setCaption("Search Config"); +=20 +- QVBoxLayout* layout1 =3D new QVBoxLayout(this, 11, 6); +- QHBoxLayout* layout2 =3D new QHBoxLayout(0, 0, 6); ++ Q3VBoxLayout* layout1 =3D new Q3VBoxLayout(this, 11, 6); ++ Q3HBoxLayout* layout2 =3D new Q3HBoxLayout(0, 0, 6); + layout2->addWidget(new QLabel(_("Find:"), this)); + editField =3D new QLineEdit(this); + connect(editField, SIGNAL(returnPressed()), SLOT(search())); +@@ -1202,10 +1213,10 @@ ConfigSearchWindow::ConfigSearchWindow(C + list =3D new ConfigView(split, name); + list->list->mode =3D listMode; + info =3D new ConfigInfoView(split, name); +- connect(list->list, SIGNAL(menuChanged(struct menu *)), +- info, SLOT(setInfo(struct menu *))); +- connect(list->list, SIGNAL(menuChanged(struct menu *)), +- parent, SLOT(setMenuLink(struct menu *))); ++ connect(list->list, SIGNAL(menuChanged(KCMenu *)), ++ info, SLOT(setInfo(KCMenu *))); ++ connect(list->list, SIGNAL(menuChanged(KCMenu *)), ++ parent, SLOT(setMenuLink(KCMenu *))); +=20 + layout1->addWidget(split); +=20 +@@ -1222,7 +1233,7 @@ ConfigSearchWindow::ConfigSearchWindow(C + y =3D configSettings->readNumEntry("/window y", 0, &ok); + if (ok) + move(x, y); +- QValueList sizes =3D configSettings->readSizes("/split", &ok); ++ Q3ValueList sizes =3D configSettings->readSizes("/split", &ok); + if (ok) + split->setSizes(sizes); + configSettings->endGroup(); +@@ -1309,60 +1320,60 @@ ConfigMainWindow::ConfigMainWindow(void) + configList->setFocus(); +=20 + menu =3D menuBar(); +- toolBar =3D new QToolBar("Tools", this); ++ toolBar =3D new Q3ToolBar("Tools", this); +=20 +- backAction =3D new QAction("Back", QPixmap(xpm_back), _("Back"), 0, th= is); ++ backAction =3D new QAction(QPixmap(xpm_back), _("Back"), this); + connect(backAction, SIGNAL(activated()), SLOT(goBack())); + backAction->setEnabled(FALSE); +- QAction *quitAction =3D new QAction("Quit", _("&Quit"), Qt::CTRL + Qt:= :Key_Q, this); ++ QAction *quitAction =3D new QAction(_("&Quit"), Qt::CTRL + Qt::Key_Q, = this, 0); + connect(quitAction, SIGNAL(activated()), SLOT(close())); +- QAction *loadAction =3D new QAction("Load", QPixmap(xpm_load), _("&Loa= d"), Qt::CTRL + Qt::Key_L, this); ++ QAction *loadAction =3D new QAction(QPixmap(xpm_load), _("&Load"), Qt:= :CTRL + Qt::Key_L, this, 0); + connect(loadAction, SIGNAL(activated()), SLOT(loadConfig())); +- saveAction =3D new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::= CTRL + Qt::Key_S, this); ++ saveAction =3D new QAction(QPixmap(xpm_save), _("&Save"), Qt::CTRL + Q= t::Key_S, this, 0); + connect(saveAction, SIGNAL(activated()), SLOT(saveConfig())); + conf_set_changed_callback(conf_changed); + // Set saveAction's initial state + conf_changed(); +- QAction *saveAsAction =3D new QAction("Save As...", _("Save &As..."), = 0, this); ++ QAction *saveAsAction =3D new QAction(_("Save &As..."), 0, this, "Save= As..."); + connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs())); +- QAction *searchAction =3D new QAction("Find", _("&Find"), Qt::CTRL + Q= t::Key_F, this); ++ QAction *searchAction =3D new QAction(_("&Find"), Qt::CTRL + Qt::Key_F= , this, "Find"); + connect(searchAction, SIGNAL(activated()), SLOT(searchConfig())); +- QAction *singleViewAction =3D new QAction("Single View", QPixmap(xpm_s= ingle_view), _("Single View"), 0, this); ++ QAction *singleViewAction =3D new QAction(QPixmap(xpm_single_view), _(= "Single View"), 0, this, "Single View"); + connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()= )); +- QAction *splitViewAction =3D new QAction("Split View", QPixmap(xpm_spl= it_view), _("Split View"), 0, this); ++ QAction *splitViewAction =3D new QAction(QPixmap(xpm_split_view), _("S= plit View"), 0, this, "Split View"); + connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()))= ; +- QAction *fullViewAction =3D new QAction("Full View", QPixmap(xpm_tree_= view), _("Full View"), 0, this); ++ QAction *fullViewAction =3D new QAction(QPixmap(xpm_tree_view), _("Ful= l View"), 0, this, "Full View"); + connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView())); +=20 +- QAction *showNameAction =3D new QAction(NULL, _("Show Name"), 0, this)= ; ++ QAction *showNameAction =3D new QAction(_("Show Name"), 0, this, 0); + showNameAction->setToggleAction(TRUE); + connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setS= howName(bool))); + connect(configView, SIGNAL(showNameChanged(bool)), showNameAction, S= LOT(setOn(bool))); + showNameAction->setOn(configView->showName()); +- QAction *showRangeAction =3D new QAction(NULL, _("Show Range"), 0, thi= s); ++ QAction *showRangeAction =3D new QAction(_("Show Range"), 0, this, 0); + showRangeAction->setToggleAction(TRUE); + connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(set= ShowRange(bool))); + connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction,= SLOT(setOn(bool))); + showRangeAction->setOn(configList->showRange); +- QAction *showDataAction =3D new QAction(NULL, _("Show Data"), 0, this)= ; ++ QAction *showDataAction =3D new QAction(_("Show Data"), 0, this, 0); + showDataAction->setToggleAction(TRUE); + connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setS= howData(bool))); + connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, S= LOT(setOn(bool))); + showDataAction->setOn(configList->showData); +- QAction *showAllAction =3D new QAction(NULL, _("Show All Options"), 0,= this); ++ QAction *showAllAction =3D new QAction(_("Show All Options"), 0, this,= 0); + showAllAction->setToggleAction(TRUE); + connect(showAllAction, SIGNAL(toggled(bool)), configView, SLOT(setSh= owAll(bool))); + connect(showAllAction, SIGNAL(toggled(bool)), menuView, SLOT(setShow= All(bool))); + showAllAction->setOn(configList->showAll); +- QAction *showDebugAction =3D new QAction(NULL, _("Show Debug Info"), 0= , this); ++ QAction *showDebugAction =3D new QAction(_("Show Debug Info"), 0, this= , 0); + showDebugAction->setToggleAction(TRUE); + connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setSh= owDebug(bool))); + connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction, S= LOT(setOn(bool))); + showDebugAction->setOn(helpText->showDebug()); +=20 +- QAction *showIntroAction =3D new QAction(NULL, _("Introduction"), 0, t= his); ++ QAction *showIntroAction =3D new QAction(_("Introduction"), 0, this, 0= ); + connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro())); +- QAction *showAboutAction =3D new QAction(NULL, _("About"), 0, this); ++ QAction *showAboutAction =3D new QAction(_("About"), 0, this, 0); + connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout())); +=20 + // init tool bar +@@ -1376,7 +1387,7 @@ ConfigMainWindow::ConfigMainWindow(void) + fullViewAction->addTo(toolBar); +=20 + // create config menu +- QPopupMenu* config =3D new QPopupMenu(this); ++ Q3PopupMenu* config =3D new Q3PopupMenu(this); + menu->insertItem(_("&File"), config); + loadAction->addTo(config); + saveAction->addTo(config); +@@ -1385,12 +1396,12 @@ ConfigMainWindow::ConfigMainWindow(void) + quitAction->addTo(config); +=20 + // create edit menu +- QPopupMenu* editMenu =3D new QPopupMenu(this); ++ Q3PopupMenu* editMenu =3D new Q3PopupMenu(this); + menu->insertItem(_("&Edit"), editMenu); + searchAction->addTo(editMenu); +=20 + // create options menu +- QPopupMenu* optionMenu =3D new QPopupMenu(this); ++ Q3PopupMenu* optionMenu =3D new Q3PopupMenu(this); + menu->insertItem(_("&Option"), optionMenu); + showNameAction->addTo(optionMenu); + showRangeAction->addTo(optionMenu); +@@ -1400,31 +1411,31 @@ ConfigMainWindow::ConfigMainWindow(void) + showDebugAction->addTo(optionMenu); +=20 + // create help menu +- QPopupMenu* helpMenu =3D new QPopupMenu(this); ++ Q3PopupMenu* helpMenu =3D new Q3PopupMenu(this); + menu->insertSeparator(); + menu->insertItem(_("&Help"), helpMenu); + showIntroAction->addTo(helpMenu); + showAboutAction->addTo(helpMenu); +=20 +- connect(configList, SIGNAL(menuChanged(struct menu *)), +- helpText, SLOT(setInfo(struct menu *))); +- connect(configList, SIGNAL(menuSelected(struct menu *)), +- SLOT(changeMenu(struct menu *))); ++ connect(configList, SIGNAL(menuChanged(KCMenu *)), ++ helpText, SLOT(setInfo(KCMenu *))); ++ connect(configList, SIGNAL(menuSelected(KCMenu *)), ++ SLOT(changeMenu(KCMenu *))); + connect(configList, SIGNAL(parentSelected()), + SLOT(goBack())); +- connect(menuList, SIGNAL(menuChanged(struct menu *)), +- helpText, SLOT(setInfo(struct menu *))); +- connect(menuList, SIGNAL(menuSelected(struct menu *)), +- SLOT(changeMenu(struct menu *))); +- +- connect(configList, SIGNAL(gotFocus(struct menu *)), +- helpText, SLOT(setInfo(struct menu *))); +- connect(menuList, SIGNAL(gotFocus(struct menu *)), +- helpText, SLOT(setInfo(struct menu *))); +- connect(menuList, SIGNAL(gotFocus(struct menu *)), ++ connect(menuList, SIGNAL(menuChanged(KCMenu *)), ++ helpText, SLOT(setInfo(KCMenu *))); ++ connect(menuList, SIGNAL(menuSelected(KCMenu *)), ++ SLOT(changeMenu(KCMenu *))); ++ ++ connect(configList, SIGNAL(gotFocus(KCMenu *)), ++ helpText, SLOT(setInfo(KCMenu *))); ++ connect(menuList, SIGNAL(gotFocus(KCMenu *)), ++ helpText, SLOT(setInfo(KCMenu *))); ++ connect(menuList, SIGNAL(gotFocus(KCMenu *)), + SLOT(listFocusChanged(void))); +- connect(helpText, SIGNAL(menuSelected(struct menu *)), +- SLOT(setMenuLink(struct menu *))); ++ connect(helpText, SIGNAL(menuSelected(KCMenu *)), ++ SLOT(setMenuLink(KCMenu *))); +=20 + QString listMode =3D configSettings->readEntry("/listMode", "symbol"); + if (listMode =3D=3D "single") +@@ -1435,7 +1446,7 @@ ConfigMainWindow::ConfigMainWindow(void) + showSplitView(); +=20 + // UI setup done, restore splitter positions +- QValueList sizes =3D configSettings->readSizes("/split1", &ok); ++ Q3ValueList sizes =3D configSettings->readSizes("/split1", &ok); + if (ok) + split1->setSizes(sizes); +=20 +@@ -1446,7 +1457,7 @@ ConfigMainWindow::ConfigMainWindow(void) +=20 + void ConfigMainWindow::loadConfig(void) + { +- QString s =3D QFileDialog::getOpenFileName(conf_get_configname(), NULL= , this); ++ QString s =3D Q3FileDialog::getOpenFileName(conf_get_configname(), NUL= L, this); + if (s.isNull()) + return; + if (conf_read(QFile::encodeName(s))) +@@ -1462,7 +1473,7 @@ void ConfigMainWindow::saveConfig(void) +=20 + void ConfigMainWindow::saveConfigAs(void) + { +- QString s =3D QFileDialog::getSaveFileName(conf_get_configname(), NULL= , this); ++ QString s =3D Q3FileDialog::getSaveFileName(conf_get_configname(), NUL= L, this); + if (s.isNull()) + return; + if (conf_write(QFile::encodeName(s))) +@@ -1476,7 +1487,7 @@ void ConfigMainWindow::searchConfig(void + searchWindow->show(); + } +=20 +-void ConfigMainWindow::changeMenu(struct menu *menu) ++void ConfigMainWindow::changeMenu(KCMenu *menu) + { + configList->setRootMenu(menu); + if (configList->rootEntry->parent =3D=3D &rootmenu) +@@ -1485,9 +1496,9 @@ void ConfigMainWindow::changeMenu(struct + backAction->setEnabled(TRUE); + } +=20 +-void ConfigMainWindow::setMenuLink(struct menu *menu) ++void ConfigMainWindow::setMenuLink(KCMenu *menu) + { +- struct menu *parent; ++ KCMenu *parent; + ConfigList* list =3D NULL; + ConfigItem* item; +=20 +@@ -1690,9 +1701,9 @@ void ConfigMainWindow::conf_changed(void + saveAction->setEnabled(conf_get_changed()); + } +=20 +-void fixup_rootmenu(struct menu *menu) ++void fixup_rootmenu(KCMenu *menu) + { +- struct menu *child; ++ KCMenu *child; + static int menu_cnt =3D 0; +=20 + menu->flags |=3D MENU_ROOT;