From 03be60dd84653f51551bd8f4626b5944ce72dd23 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Tue, 23 Aug 2016 12:08:17 -0400 Subject: [PATCH] get nandExtract to work with qt5 --- breft_editor/breft.pro | 21 ++++++++++----------- breft_editor/main.cpp | 2 +- nandExtract/black.png | Bin nandExtract/blue.png | Bin nandExtract/green.png | Bin nandExtract/grey.png | Bin nandExtract/main.cpp | 26 +++++++++++++------------- nandExtract/nandExtract.pro | 2 ++ nandExtract/nandwindow.cpp | 0 nandExtract/nandwindow.h | 0 nandExtract/nandwindow.ui | 0 nandExtract/pink.png | Bin 12 files changed, 26 insertions(+), 25 deletions(-) mode change 100755 => 100644 nandExtract/black.png mode change 100755 => 100644 nandExtract/blue.png mode change 100755 => 100644 nandExtract/green.png mode change 100755 => 100644 nandExtract/grey.png mode change 100755 => 100644 nandExtract/main.cpp mode change 100755 => 100644 nandExtract/nandExtract.pro mode change 100755 => 100644 nandExtract/nandwindow.cpp mode change 100755 => 100644 nandExtract/nandwindow.h mode change 100755 => 100644 nandExtract/nandwindow.ui mode change 100755 => 100644 nandExtract/pink.png diff --git a/breft_editor/breft.pro b/breft_editor/breft.pro index 4293b82..868e3db 100644 --- a/breft_editor/breft.pro +++ b/breft_editor/breft.pro @@ -1,19 +1,18 @@ -QT += core gui\ - network +QT += core gui network widgets TARGET = breft_editor TEMPLATE = app SOURCES += main.cpp\ - mainwindow.cpp \ - breft.cpp \ - ../WiiQt/tools.cpp \ - ../WiiQt/aes.c \ - ../WiiQt/sha1.c \ - texture.cpp + mainwindow.cpp \ + breft.cpp \ + ../WiiQt/tools.cpp \ + ../WiiQt/aes.c \ + ../WiiQt/sha1.c \ + texture.cpp HEADERS += mainwindow.h \ - breft.h \ - ../WiiQt/tools.h \ - texture.h + breft.h \ + ../WiiQt/tools.h \ + texture.h diff --git a/breft_editor/main.cpp b/breft_editor/main.cpp index 9ae175b..8a63d7b 100644 --- a/breft_editor/main.cpp +++ b/breft_editor/main.cpp @@ -1,4 +1,4 @@ -#include +#include #include "mainwindow.h" int main(int argc, char *argv[]) diff --git a/nandExtract/black.png b/nandExtract/black.png old mode 100755 new mode 100644 diff --git a/nandExtract/blue.png b/nandExtract/blue.png old mode 100755 new mode 100644 diff --git a/nandExtract/green.png b/nandExtract/green.png old mode 100755 new mode 100644 diff --git a/nandExtract/grey.png b/nandExtract/grey.png old mode 100755 new mode 100644 diff --git a/nandExtract/main.cpp b/nandExtract/main.cpp old mode 100755 new mode 100644 index b38053e..0b214b4 --- a/nandExtract/main.cpp +++ b/nandExtract/main.cpp @@ -1,13 +1,13 @@ -#include -#include "nandwindow.h" - -int main(int argc, char *argv[]) -{ - Q_INIT_RESOURCE( rc ); - - QApplication a(argc, argv); - QApplication::setWindowIcon( QIcon( ":/icon.png" ) ); - NandWindow w; - w.show(); - return a.exec(); -} +#include +#include "nandwindow.h" + +int main(int argc, char *argv[]) +{ + Q_INIT_RESOURCE( rc ); + + QApplication a(argc, argv); + QApplication::setWindowIcon( QIcon( ":/icon.png" ) ); + NandWindow w; + w.show(); + return a.exec(); +} diff --git a/nandExtract/nandExtract.pro b/nandExtract/nandExtract.pro old mode 100755 new mode 100644 index 6a72b12..46cbc50 --- a/nandExtract/nandExtract.pro +++ b/nandExtract/nandExtract.pro @@ -1,6 +1,8 @@ # ------------------------------------------------- # Project created by QtCreator 2010-12-06T03:40:50 # ------------------------------------------------- +QT = core gui widgets + TARGET = nandExtract TEMPLATE = app SOURCES += main.cpp \ diff --git a/nandExtract/nandwindow.cpp b/nandExtract/nandwindow.cpp old mode 100755 new mode 100644 diff --git a/nandExtract/nandwindow.h b/nandExtract/nandwindow.h old mode 100755 new mode 100644 diff --git a/nandExtract/nandwindow.ui b/nandExtract/nandwindow.ui old mode 100755 new mode 100644 diff --git a/nandExtract/pink.png b/nandExtract/pink.png old mode 100755 new mode 100644