diff options
author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-05-17 19:36:50 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-09 16:37:49 -0400 |
commit | 7298b936017859fce4906e38f485c131520fe857 (patch) | |
tree | 718c57096a4109e43afcafc593e8ec967c017186 /scripts | |
parent | 98403a91389d11edd954e8f89dcffc3db525657f (diff) |
kconfig qconf: fix namespace for Horizontal and Vertical enum values
They were used as QSplitter::Horizontal resp. QSplitter::Vertical, but
are defined in the 'Qt' namespace.
Fixes the following compiler errors after a quick conversion with 'qt3to4',
which occured with g++ 3.4.6 and 4.1.2, but not anymore with 4.3.2.
scripts/kconfig/qconf.cc: In constructor 'ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow*, const char*)':
scripts/kconfig/qconf.cc:1213: error: 'Vertical' is not a member of 'QSplitter'
scripts/kconfig/qconf.cc: In constructor 'ConfigMainWindow::ConfigMainWindow()':
scripts/kconfig/qconf.cc:1304: error: 'Horizontal' is not a member of 'QSplitter'
scripts/kconfig/qconf.cc:1311: error: 'Vertical' is not a member of 'QSplitter'
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/kconfig/qconf.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 2bd6ed021aac..7433dac6b90a 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1199,7 +1199,7 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam | |||
1199 | layout1->addLayout(layout2); | 1199 | layout1->addLayout(layout2); |
1200 | 1200 | ||
1201 | split = new QSplitter(this); | 1201 | split = new QSplitter(this); |
1202 | split->setOrientation(QSplitter::Vertical); | 1202 | split->setOrientation(Qt::Vertical); |
1203 | list = new ConfigView(split, name); | 1203 | list = new ConfigView(split, name); |
1204 | list->list->mode = listMode; | 1204 | list->list->mode = listMode; |
1205 | info = new ConfigInfoView(split, name); | 1205 | info = new ConfigInfoView(split, name); |
@@ -1290,14 +1290,14 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1290 | move(x, y); | 1290 | move(x, y); |
1291 | 1291 | ||
1292 | split1 = new QSplitter(this); | 1292 | split1 = new QSplitter(this); |
1293 | split1->setOrientation(QSplitter::Horizontal); | 1293 | split1->setOrientation(Qt::Horizontal); |
1294 | setCentralWidget(split1); | 1294 | setCentralWidget(split1); |
1295 | 1295 | ||
1296 | menuView = new ConfigView(split1, "menu"); | 1296 | menuView = new ConfigView(split1, "menu"); |
1297 | menuList = menuView->list; | 1297 | menuList = menuView->list; |
1298 | 1298 | ||
1299 | split2 = new QSplitter(split1); | 1299 | split2 = new QSplitter(split1); |
1300 | split2->setOrientation(QSplitter::Vertical); | 1300 | split2->setOrientation(Qt::Vertical); |
1301 | 1301 | ||
1302 | // create config tree | 1302 | // create config tree |
1303 | configView = new ConfigView(split2, "config"); | 1303 | configView = new ConfigView(split2, "config"); |