Commit b1f8a45b authored by Boris Barbulovski's avatar Boris Barbulovski Committed by Michal Marek

Port xconfig to Qt5 - Use QMainWindow, QToolBar

Signed-off-by: default avatarBoris Barbulovski <bbarbulovski@gmail.com>
Signed-off-by: default avatarThiago Macieira <thiago.macieira@intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent 8328447a
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#include <qglobal.h> #include <qglobal.h>
#include <q3mainwindow.h> #include <QMainWindow>
#include <q3vbox.h> #include <q3vbox.h>
#include <q3valuelist.h> #include <q3valuelist.h>
#include <q3textbrowser.h> #include <q3textbrowser.h>
...@@ -1303,7 +1303,7 @@ ConfigMainWindow::ConfigMainWindow(void) ...@@ -1303,7 +1303,7 @@ ConfigMainWindow::ConfigMainWindow(void)
configList->setFocus(); configList->setFocus();
menu = menuBar(); menu = menuBar();
toolBar = new Q3ToolBar("Tools", this); toolBar = new QToolBar("Tools", this);
backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this); backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
connect(backAction, SIGNAL(activated()), SLOT(goBack())); connect(backAction, SIGNAL(activated()), SLOT(goBack()));
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
*/ */
#include <q3listview.h> #include <q3listview.h>
#include <QMainWindow>
#include <qsettings.h> #include <qsettings.h>
class ConfigView; class ConfigView;
...@@ -281,7 +282,7 @@ public slots: ...@@ -281,7 +282,7 @@ public slots:
struct symbol **result; struct symbol **result;
}; };
class ConfigMainWindow : public Q3MainWindow { class ConfigMainWindow : public QMainWindow {
Q_OBJECT Q_OBJECT
static Q3Action *saveAction; static Q3Action *saveAction;
...@@ -313,7 +314,7 @@ public slots: ...@@ -313,7 +314,7 @@ public slots:
ConfigView *configView; ConfigView *configView;
ConfigList *configList; ConfigList *configList;
ConfigInfoView *helpText; ConfigInfoView *helpText;
Q3ToolBar *toolBar; QToolBar *toolBar;
Q3Action *backAction; Q3Action *backAction;
QSplitter* split1; QSplitter* split1;
QSplitter* split2; QSplitter* split2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment