Merge branch 'devel-stable' into devel

[sfrench/cifs-2.6.git] / scripts / kconfig / qconf.h

diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 6fc1c5f14425162aab07eb5e35f8d24f0c8ccadc..636a74b23bf93bba0eeb2a3e263d21891a60889b 100644 (file)
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -44,6 +44,9 @@ enum colIdx {
 enum listMode {
        singleMode, menuMode, symbolMode, fullMode, listMode
 };
+enum optionMode {
+       normalOpt = 0, allOpt, promptOpt
+};
 
 class ConfigList : public QListView {
        Q_OBJECT
@@ -115,6 +118,8 @@ public:
        void setAllOpen(bool open);
        void setParentMenu(void);
 
+       bool menuSkip(struct menu *);
+
        template <class P>
        void updateMenuList(P*, struct menu*);
 
@@ -124,8 +129,9 @@ public:
        QPixmap choiceYesPix, choiceNoPix;
        QPixmap menuPix, menuInvPix, menuBackPix, voidPix;
 
-       bool showAll, showName, showRange, showData;
+       bool showName, showRange, showData;
        enum listMode mode;
+       enum optionMode optMode;
        struct menu *rootEntry;
        QColorGroup disabledColorGroup;
        QColorGroup inactivedColorGroup;
@@ -222,17 +228,15 @@ public:
        static void updateList(ConfigItem* item);
        static void updateListAll(void);
 
-       bool showAll(void) const { return list->showAll; }
        bool showName(void) const { return list->showName; }
        bool showRange(void) const { return list->showRange; }
        bool showData(void) const { return list->showData; }
 public slots:
-       void setShowAll(bool);
        void setShowName(bool);
        void setShowRange(bool);
        void setShowData(bool);
+       void setOptionMode(QAction *);
 signals:
-       void showAllChanged(bool);
        void showNameChanged(bool);
        void showRangeChanged(bool);
        void showDataChanged(bool);
@@ -242,6 +246,10 @@ public:
 
        static ConfigView* viewList;
        ConfigView* nextView;
+
+       static QAction *showNormalAction;
+       static QAction *showAllAction;
+       static QAction *showPromptAction;
 };
 
 class ConfigInfoView : public QTextBrowser {
@@ -254,7 +262,6 @@ public:
 public slots:
        void setInfo(struct menu *menu);
        void saveSettings(void);
-       void setSource(const QString& name);
        void setShowDebug(bool);
 
 signals:
@@ -279,7 +286,7 @@ class ConfigSearchWindow : public QDialog {
        Q_OBJECT
        typedef class QDialog Parent;
 public:
-       ConfigSearchWindow(QWidget* parent, const char *name = 0);
+       ConfigSearchWindow(ConfigMainWindow* parent, const char *name = 0);
 
 public slots:
        void saveSettings(void);