Skip to content

Instantly share code, notes, and snippets.

@macedd
Created June 11, 2014 23:38
Show Gist options
  • Save macedd/63b68e35796a16bcf477 to your computer and use it in GitHub Desktop.
Save macedd/63b68e35796a16bcf477 to your computer and use it in GitHub Desktop.
Yaffey Patch for QT5 Compilation (ubuntu 12, 13, 14)
diff -rupN yaffey-orig/main.cpp yaffey-qt5/main.cpp
--- yaffey-orig/main.cpp 2014-06-11 20:01:50.155769286 -0300
+++ yaffey-qt5/main.cpp 2014-06-11 20:24:07.659482714 -0300
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>
*/
-#include <QtGui/QApplication>
+#include <QApplication>
#include "MainWindow.h"
diff -rupN yaffey-orig/MainWindow.cpp yaffey-qt5/MainWindow.cpp
--- yaffey-orig/MainWindow.cpp 2014-06-11 20:01:50.111768902 -0300
+++ yaffey-qt5/MainWindow.cpp 2014-06-11 20:24:38.255750664 -0300
@@ -66,19 +66,19 @@ MainWindow::MainWindow(QWidget* parent,
QHeaderView* headerView = mUi->treeView->header();
headerView->setContextMenuPolicy(Qt::CustomContextMenu);
- headerView->setResizeMode(YaffsItem::NAME, QHeaderView::Stretch);
- headerView->setResizeMode(YaffsItem::SIZE, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::PERMISSIONS, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::ALIAS, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::DATE_ACCESSED, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::DATE_CREATED, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::DATE_MODIFIED, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::USER, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::GROUP, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::NAME, QHeaderView::Stretch);
+ headerView->setSectionResizeMode(YaffsItem::SIZE, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::PERMISSIONS, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::ALIAS, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::DATE_ACCESSED, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::DATE_CREATED, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::DATE_MODIFIED, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::USER, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::GROUP, QHeaderView::ResizeToContents);
#ifdef QT_DEBUG
- headerView->setResizeMode(YaffsItem::OBJECTID, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::PARENTID, QHeaderView::ResizeToContents);
- headerView->setResizeMode(YaffsItem::HEADERPOS, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::OBJECTID, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::PARENTID, QHeaderView::ResizeToContents);
+ headerView->setSectionResizeMode(YaffsItem::HEADERPOS, QHeaderView::ResizeToContents);
#endif //QT_DEBUG
mUi->treeView->hideColumn(YaffsItem::DATE_CREATED);
diff -rupN yaffey-orig/yaffey.pro yaffey-qt5/yaffey.pro
--- yaffey-orig/yaffey.pro 2014-06-11 20:01:50.155769286 -0300
+++ yaffey-qt5/yaffey.pro 2014-06-11 20:24:59.235934388 -0300
@@ -5,6 +5,7 @@
#-------------------------------------------------
QT += core gui
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = yaffey
TEMPLATE = app
diff -rupN yaffey-orig/yaffs2/yaffs_guts.h yaffey-qt5/yaffs2/yaffs_guts.h
--- yaffey-orig/yaffs2/yaffs_guts.h 2014-06-11 20:01:50.155769286 -0300
+++ yaffey-qt5/yaffs2/yaffs_guts.h 2014-06-11 20:25:29.428198812 -0300
@@ -21,7 +21,7 @@
typedef unsigned char u8;
typedef unsigned short u16;
typedef unsigned u32;
-typedef unsigned loff_t;
+#include <stdlib.h>
#define YAFFS_MAX_NAME_LENGTH 255
#define YAFFS_MAX_ALIAS_LENGTH 159
diff -rupN yaffey-orig/YaffsTreeView.cpp yaffey-qt5/YaffsTreeView.cpp
--- yaffey-orig/YaffsTreeView.cpp 2014-06-11 20:01:50.123769003 -0300
+++ yaffey-qt5/YaffsTreeView.cpp 2014-06-11 20:25:54.312416753 -0300
@@ -17,6 +17,7 @@
*/
#include <QDebug>
+#include <QMimeData>
#include <QDragEnterEvent>
#include <QUrl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment