History

Port xconfig to Qt5 - Use QMainWindow, QToolBar

Boris Barbulovski committed 11 years ago

Commit b1f8a451 parent 83284472 files · +5 −4Browse files

Showing the changes to scripts (2 of 2 files). Show all

Unified · Split

2 files
  1. scripts/kconfig/qconf.cc +2 −2
  2. scripts/kconfig/qconf.h +3 −2
scripts/kconfig/qconf.cc+2−2
@@ -5,7 +5,7 @@ · 4 unmodified lines
5 5
6#include <qglobal.h>6#include <qglobal.h>
7 7
8#include <q3mainwindow.h>8#include <QMainWindow>
9#include <q3vbox.h>9#include <q3vbox.h>
10#include <q3valuelist.h>10#include <q3valuelist.h>
11#include <q3textbrowser.h>11#include <q3textbrowser.h>
@@ -1303,7 +1303,7 @@ ConfigMainWindow::ConfigMainWindow(void) · 1291 unmodified lines
1303 configList->setFocus();1303 configList->setFocus();
1304 1304
1305 menu = menuBar();1305 menu = menuBar();
1306 toolBar = new Q3ToolBar("Tools", this);1306 toolBar = new QToolBar("Tools", this);
1307 1307
1308 backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);1308 backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
1309 connect(backAction, SIGNAL(activated()), SLOT(goBack()));1309 connect(backAction, SIGNAL(activated()), SLOT(goBack()));
scripts/kconfig/qconf.h+3−2
@@ -4,6 +4,7 @@ · 3 unmodified lines
4 */4 */
5 5
6#include <q3listview.h>6#include <q3listview.h>
7#include <QMainWindow>
7#include <qsettings.h>8#include <qsettings.h>
8 9
9class ConfigView;10class ConfigView;
@@ -281,7 +282,7 @@ protected: · 271 unmodified lines
281 struct symbol **result;282 struct symbol **result;
282};283};
283 284
284class ConfigMainWindow : public Q3MainWindow {285class ConfigMainWindow : public QMainWindow {
285 Q_OBJECT286 Q_OBJECT
286 287
287 static Q3Action *saveAction;288 static Q3Action *saveAction;
@@ -313,7 +314,7 @@ protected: · 25 unmodified lines
313 ConfigView *configView;314 ConfigView *configView;
314 ConfigList *configList;315 ConfigList *configList;
315 ConfigInfoView *helpText;316 ConfigInfoView *helpText;
316 Q3ToolBar *toolBar;317 QToolBar *toolBar;
317 Q3Action *backAction;318 Q3Action *backAction;
318 QSplitter* split1;319 QSplitter* split1;
319 QSplitter* split2;320 QSplitter* split2;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t