diff options
author | Boris Barbulovski <bbarbulovski@gmail.com> | 2015-09-22 14:36:15 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2015-10-14 08:59:02 -0400 |
commit | 68ccb7ef4974bfce0d99a4425324a1c7ef85a82e (patch) | |
tree | 23c612b886155b99429ff0b260b96efb34a57312 /scripts/kconfig/qconf.h | |
parent | 76538660fb08f2f794d569a594a95fc55eb03932 (diff) |
Port xconfig to Qt5 - Fix the code so it compiles with Qt5
Signed-off-by: Boris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
Diffstat (limited to 'scripts/kconfig/qconf.h')
-rw-r--r-- | scripts/kconfig/qconf.h | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index d025f29694c6..1cd02192f172 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h | |||
@@ -3,9 +3,18 @@ | |||
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 <q3listview.h> | 6 | #include <QTextBrowser> |
7 | #include <QTreeWidget> | ||
7 | #include <QMainWindow> | 8 | #include <QMainWindow> |
9 | #include <QHeaderView> | ||
8 | #include <qsettings.h> | 10 | #include <qsettings.h> |
11 | #include <QPushButton> | ||
12 | #include <QSettings> | ||
13 | #include <QLineEdit> | ||
14 | #include <QSplitter> | ||
15 | #include <QCheckBox> | ||
16 | #include <QDialog> | ||
17 | #include "expr.h" | ||
9 | 18 | ||
10 | class ConfigView; | 19 | class ConfigView; |
11 | class ConfigLineEdit; | 20 | class ConfigLineEdit; |
@@ -37,11 +46,11 @@ public: | |||
37 | { | 46 | { |
38 | return (ConfigView*)Parent::parent(); | 47 | return (ConfigView*)Parent::parent(); |
39 | } | 48 | } |
40 | void show(Q3ListViewItem *i); | 49 | void show(QTreeWidgetItem *i); |
41 | void keyPressEvent(QKeyEvent *e); | 50 | void keyPressEvent(QKeyEvent *e); |
42 | 51 | ||
43 | public: | 52 | public: |
44 | Q3ListViewItem *item; | 53 | QTreeWidgetItem *item; |
45 | }; | 54 | }; |
46 | 55 | ||
47 | class ConfigView : public QWidget { | 56 | class ConfigView : public QWidget { |
@@ -50,7 +59,7 @@ class ConfigView : public QWidget { | |||
50 | public: | 59 | public: |
51 | ConfigView(QWidget* parent, const char *name = 0); | 60 | ConfigView(QWidget* parent, const char *name = 0); |
52 | ~ConfigView(void); | 61 | ~ConfigView(void); |
53 | static void updateList(Q3ListViewItem* item); | 62 | static void updateList(QTreeWidgetItem* item); |
54 | static void updateListAll(void); | 63 | static void updateListAll(void); |
55 | 64 | ||
56 | bool showName(void) const { return false; } // TODO: Implement me. | 65 | bool showName(void) const { return false; } // TODO: Implement me. |
@@ -66,7 +75,7 @@ signals: | |||
66 | void showRangeChanged(bool); | 75 | void showRangeChanged(bool); |
67 | void showDataChanged(bool); | 76 | void showDataChanged(bool); |
68 | public: | 77 | public: |
69 | Q3ListView* list; | 78 | QTreeWidget* list; |
70 | ConfigLineEdit* lineEdit; | 79 | ConfigLineEdit* lineEdit; |
71 | 80 | ||
72 | static ConfigView* viewList; | 81 | static ConfigView* viewList; |
@@ -155,9 +164,9 @@ protected: | |||
155 | 164 | ||
156 | ConfigSearchWindow *searchWindow; | 165 | ConfigSearchWindow *searchWindow; |
157 | ConfigView *menuView; | 166 | ConfigView *menuView; |
158 | Q3ListView *menuList; | 167 | QTreeWidget *menuList; |
159 | ConfigView *configView; | 168 | ConfigView *configView; |
160 | Q3ListView *configList; | 169 | QTreeWidget *configList; |
161 | ConfigInfoView *helpText; | 170 | ConfigInfoView *helpText; |
162 | QToolBar *toolBar; | 171 | QToolBar *toolBar; |
163 | QAction *backAction; | 172 | QAction *backAction; |