From 26c4bd3156495d5c6d18e51b06c19e8c6eea62d0 Mon Sep 17 00:00:00 2001
From: Christoph Egger <christoph@christoph-egger.org>
Date: Mon, 10 Feb 2014 16:52:39 +0100
Subject: [PATCH] Update for Qt 5

---
 src/gui/Mainwindow.cxx                     | 17 +++++++++++++----
 src/gui/{Mainwindow.h++ => Mainwindow.hxx} |  0
 src/main.cxx                               |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
 rename src/gui/{Mainwindow.h++ => Mainwindow.hxx} (100%)

diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx
index 412c424..790c1a3 100644
--- a/src/gui/Mainwindow.cxx
+++ b/src/gui/Mainwindow.cxx
@@ -1,9 +1,20 @@
-#include "Mainwindow.h++"
+#include "Mainwindow.hxx"
 
 #include <iostream>
 #include <sstream>
 
 #include <QtGui>
+#include <QAction>
+#include <QMenuBar>
+#include <QMenu>
+#include <QDockWidget>
+#include <QMessageBox>
+#include <QFileDialog>
+#include <QTableWidget>
+#include <QHeaderView>
+#include <QGraphicsScene>
+#include <QGraphicsItem>
+#include <QGraphicsView>
 
 namespace {
 
@@ -75,7 +86,7 @@ void Mainwindow::populateSymbolInformation(const std::string& sym) {
     // Listing
     QTableWidget * t = new QTableWidget();
     t->setColumnCount(3);
-    t->horizontalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+    t->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
     curBin->for_each_instruction(sym, [&t](long add, std::string bytes, std::string mnemonic) {
             int row = t->rowCount();
             std::stringstream s;
@@ -97,8 +108,6 @@ void Mainwindow::populateSymbolInformation(const std::string& sym) {
     QGraphicsView * view = new QGraphicsView(scene);
     w->addTab(view, "CFG");
 
-
-
     listWidget->addItem(sym.c_str());
     stackedWidget->addWidget(w);
 }
diff --git a/src/gui/Mainwindow.h++ b/src/gui/Mainwindow.hxx
similarity index 100%
rename from src/gui/Mainwindow.h++
rename to src/gui/Mainwindow.hxx
diff --git a/src/main.cxx b/src/main.cxx
index 3a60a99..b23eb88 100644
--- a/src/main.cxx
+++ b/src/main.cxx
@@ -7,7 +7,7 @@
 #include <QTextEdit>
 
 #include "Binary.hxx"
-#include "gui/Mainwindow.h++"
+#include "gui/Mainwindow.hxx"
 
 using std::cout;
 using std::cin;
-- 
2.39.5