# HG changeset patch
# User Jeandet Alexis
# Date 2014-06-18 18:59:31
# Node ID 589c372f2986b8623d49c3873d285370b3175f32
# Parent  4b45cc285cfb78184206a662c4fbba8d2fcd33e2

added Qt4 compatibility and pre ARM_NONE_EABI libelf.

diff --git a/BinFile/binaryfilewidget.cpp b/BinFile/binaryfilewidget.cpp
--- a/BinFile/binaryfilewidget.cpp
+++ b/BinFile/binaryfilewidget.cpp
@@ -1,8 +1,13 @@
 #include "binaryfilewidget.h"
 #include "ui_binaryfilewidget.h"
 #include "qtablewidgetintitem.h"
-#include <QtWidgets/QTableWidget>
-#include <QtWidgets/QFileDialog>
+#if QT_VERSION >= 0x050000
+    #include <QtWidgets/QTableWidget>
+    #include <QtWidgets/QFileDialog>
+#else
+    #include <QTableWidget>
+    #include <QFileDialog>
+#endif
 #include "srecfile.h"
 
 binaryFileWidget::binaryFileWidget(QWidget *parent) :
diff --git a/abstractbinfile.h b/abstractbinfile.h
--- a/abstractbinfile.h
+++ b/abstractbinfile.h
@@ -21,10 +21,13 @@
 ----------------------------------------------------------------------------*/
 #ifndef ABSTRACTBINFILE_H
 #define ABSTRACTBINFILE_H
-
-#include <QtCore/QObject>
-#include <QtWidgets/QWidget>
-
+#if QT_VERSION >= 0x050000
+    #include <QtCore/QObject>
+    #include <QtWidgets/QWidget>
+#else
+    #include <QObject>
+    #include <QWidget>
+#endif
 class codeFragment
 {
 public:
diff --git a/elf/elffile.cpp b/elf/elffile.cpp
--- a/elf/elffile.cpp
+++ b/elf/elffile.cpp
@@ -489,7 +489,9 @@ QString ElfFile::getABI()
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_TRU64)return "Compaq TRU64 UNIX";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_MODESTO)return " Novell Modesto";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_OPENBSD)return "OpenBSD";
+#ifdef ELFOSABI_ARM_AEABI
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM_AEABI)return "ARM EABI";
+#endif
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM)return "ARM";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_STANDALONE)return "Standalone (embedded) application";
     }
diff --git a/elf/elffilewidget.cpp b/elf/elffilewidget.cpp
--- a/elf/elffilewidget.cpp
+++ b/elf/elffilewidget.cpp
@@ -21,8 +21,13 @@
 ----------------------------------------------------------------------------*/
 #include "elffilewidget.h"
 #include "ui_elffilewidget.h"
-#include <QtWidgets/QTableWidgetItem>
-#include <QtWidgets/QFileDialog>
+#if QT_VERSION >= 0x050000
+    #include <QtWidgets/QTableWidgetItem>
+    #include <QtWidgets/QFileDialog>
+#else
+    #include <QTableWidgetItem>
+    #include <QFileDialog>
+#endif
 #include "qhexedit.h"
 #include "qtablewidgetintitem.h"
 #include "../srec/srecfile.h"
diff --git a/elf/elffilewidget.h b/elf/elffilewidget.h
--- a/elf/elffilewidget.h
+++ b/elf/elffilewidget.h
@@ -22,9 +22,14 @@
 #ifndef ELFFILEWIDGET_H
 #define ELFFILEWIDGET_H
 
-#include <QtWidgets/QWidget>
+#if QT_VERSION >= 0x050000
+    #include <QtWidgets/QWidget>
+    #include <QtWidgets/QAction>
+#else
+    #include <QWidget>
+    #include <QAction>
+#endif
 #include "elffile.h"
-#include <QtWidgets/QAction>
 #include <qhexedit.h>
 
 namespace Ui {
diff --git a/elf/elfinfowdgt.h b/elf/elfinfowdgt.h
--- a/elf/elfinfowdgt.h
+++ b/elf/elfinfowdgt.h
@@ -22,15 +22,26 @@
 #ifndef ELFINFOWDGT_H
 #define ELFINFOWDGT_H
 
-#include <QtWidgets/QWidget>
+#if QT_VERSION >= 0x050000
+    #include <QtWidgets/QWidget>
+    #include <QtWidgets/QVBoxLayout>
+    #include <QtWidgets/QHBoxLayout>
+    #include <QtWidgets/QLabel>
+    #include <QtWidgets/QTextEdit>
+    #include <QtWidgets/QTableWidget>
+    #include <QtWidgets/QSplitter>
+#else
+    #include <QWidget>
+    #include <QVBoxLayout>
+    #include <QHBoxLayout>
+    #include <QLabel>
+    #include <QTextEdit>
+    #include <QTableWidget>
+    #include <QSplitter>
+#endif
+
 #include "elfparser.h"
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QTextEdit>
-#include <QtWidgets/QTableWidget>
 #include <qhexedit.h>
-#include <QtWidgets/QSplitter>
 
 class elfInfoWdgt : public QWidget
 {
diff --git a/elf/elfparser.cpp b/elf/elfparser.cpp
--- a/elf/elfparser.cpp
+++ b/elf/elfparser.cpp
@@ -163,7 +163,9 @@ QString elfparser::getABI()
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_TRU64)return "Compaq TRU64 UNIX";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_MODESTO)return " Novell Modesto";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_OPENBSD)return "OpenBSD";
+#ifdef ELFOSABI_ARM_AEABI
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM_AEABI)return "ARM EABI";
+#endif
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_ARM)return "ARM";
         if(this->ehdr.e_ident[EI_OSABI]==ELFOSABI_STANDALONE)return "Standalone (embedded) application";
     }
diff --git a/filelist.cpp b/filelist.cpp
--- a/filelist.cpp
+++ b/filelist.cpp
@@ -1,5 +1,6 @@
 #include "filelist.h"
 #include <QMimeData>
+#include <QUrl>
 
 FileList::FileList(QWidget *parent) :
     QTableWidget(parent)
diff --git a/srec/srecfilewidget.cpp b/srec/srecfilewidget.cpp
--- a/srec/srecfilewidget.cpp
+++ b/srec/srecfilewidget.cpp
@@ -23,7 +23,11 @@
 #include "ui_srecfilewidget.h"
 #include <QTableWidgetItem>
 #include <qtablewidgetintitem.h>
-#include <QtWidgets/QFileDialog>
+#if QT_VERSION >= 0x050000
+    #include <QtWidgets/QFileDialog>
+#else
+    #include <QFileDialog>
+#endif
 #include "binaryfile.h"
 
 srecFileWidget::srecFileWidget(QWidget *parent) :
@@ -102,8 +106,8 @@ void srecFileWidget::exportToSREC()
     if(SelectedFragmentsList.count()>0)
     {
         QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
-                                   NULL,
-                                   tr("SREC Files (*.srec)"));
+                                                        NULL,
+                                                        tr("SREC Files (*.srec)"));
         if(!fileName.isEmpty())
         {
             srecFile::toSrec(SelectedFragmentsList,fileName);
@@ -117,8 +121,8 @@ void srecFileWidget::exportToBIN()
     if(SelectedFragmentsList.count()>0)
     {
         QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
-                                   NULL,
-                                   tr("Binary Files (*.bin)"));
+                                                        NULL,
+                                                        tr("Binary Files (*.bin)"));
         if(!fileName.isEmpty())
         {
             binaryFile::toBinary(SelectedFragmentsList,fileName);