From: Boris Barbulovski <bbarbulovski@gmail.com>
Date: Tue, 22 Sep 2015 18:36:02 +0000 (-0700)
Subject: Port xconfig to Qt5 - Use QMainWindow, QToolBar
X-Git-Tag: KARO-TX6UL-2015-11-03~97^2~2^2~38
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1f8a45bfee563f6aa9969c6b01f6c831a85e39a;p=karo-tx-linux.git

Port xconfig to Qt5 - Use QMainWindow, QToolBar

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>
---

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 0e18a9ccf288..199934c5cdbf 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -5,7 +5,7 @@
 
 #include <qglobal.h>
 
-#include <q3mainwindow.h>
+#include <QMainWindow>
 #include <q3vbox.h>
 #include <q3valuelist.h>
 #include <q3textbrowser.h>
@@ -1303,7 +1303,7 @@ ConfigMainWindow::ConfigMainWindow(void)
 	configList->setFocus();
 
 	menu = menuBar();
-	toolBar = new Q3ToolBar("Tools", this);
+	toolBar = new QToolBar("Tools", this);
 
 	backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
 	  connect(backAction, SIGNAL(activated()), SLOT(goBack()));
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 703285d0faf6..db4b41730053 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -4,6 +4,7 @@
  */
 
 #include <q3listview.h>
+#include <QMainWindow>
 #include <qsettings.h>
 
 class ConfigView;
@@ -281,7 +282,7 @@ protected:
 	struct symbol **result;
 };
 
-class ConfigMainWindow : public Q3MainWindow {
+class ConfigMainWindow : public QMainWindow {
 	Q_OBJECT
 
 	static Q3Action *saveAction;
@@ -313,7 +314,7 @@ protected:
 	ConfigView *configView;
 	ConfigList *configList;
 	ConfigInfoView *helpText;
-	Q3ToolBar *toolBar;
+	QToolBar *toolBar;
 	Q3Action *backAction;
 	QSplitter* split1;
 	QSplitter* split2;