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
55
66 #include <qglobal.h>
77
8−#include <q3mainwindow.h>
8+#include <QMainWindow>
99 #include <q3vbox.h>
1010 #include <q3valuelist.h>
1111 #include <q3textbrowser.h>
@@ -1303,7 +1303,7 @@ ConfigMainWindow::ConfigMainWindow(void) · 1291 unmodified lines
13031303 configList->setFocus();
13041304
13051305 menu = menuBar();
1306− toolBar = new Q3ToolBar("Tools", this);
1306+ toolBar = new QToolBar("Tools", this);
13071307
13081308 backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
13091309 connect(backAction, SIGNAL(activated()), SLOT(goBack()));
scripts/kconfig/qconf.h+3−2
@@ -4,6 +4,7 @@ · 3 unmodified lines
44 */
55
66 #include <q3listview.h>
7+#include <QMainWindow>
78 #include <qsettings.h>
89
910 class ConfigView;
@@ -281,7 +282,7 @@ protected: · 271 unmodified lines
281282 struct symbol **result;
282283 };
283284
284−class ConfigMainWindow : public Q3MainWindow {
285+class ConfigMainWindow : public QMainWindow {
285286 Q_OBJECT
286287
287288 static Q3Action *saveAction;
@@ -313,7 +314,7 @@ protected: · 25 unmodified lines
313314 ConfigView *configView;
314315 ConfigList *configList;
315316 ConfigInfoView *helpText;
316− Q3ToolBar *toolBar;
317+ QToolBar *toolBar;
317318 Q3Action *backAction;
318319 QSplitter* split1;
319320 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