diff options
| author | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2015-02-19 02:51:00 +1100 |
|---|---|---|
| committer | Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au> | 2015-02-19 04:13:26 +1100 |
| commit | 39b48f2357b0b783815be88031b738376fa228e0 (patch) | |
| tree | f2fca0b77a29e5df49425a5c132416d14fa3b938 /heimdall-frontend/Source | |
| parent | 09ba1839225ea6adcba65ebec2f3a783edd6647d (diff) | |
| download | external_heimdall-39b48f2357b0b783815be88031b738376fa228e0.tar.gz external_heimdall-39b48f2357b0b783815be88031b738376fa228e0.tar.bz2 external_heimdall-39b48f2357b0b783815be88031b738376fa228e0.zip | |
Upgrade Heimdall Frontend to Qt5 and build with cmake
Diffstat (limited to 'heimdall-frontend/Source')
| -rw-r--r-- | heimdall-frontend/Source/aboutform.cpp | 2 | ||||
| -rw-r--r-- | heimdall-frontend/Source/aboutform.h | 6 | ||||
| -rw-r--r-- | heimdall-frontend/Source/main.cpp | 7 | ||||
| -rw-r--r-- | heimdall-frontend/Source/mainwindow.cpp | 2 |
4 files changed, 14 insertions, 3 deletions
diff --git a/heimdall-frontend/Source/aboutform.cpp b/heimdall-frontend/Source/aboutform.cpp index 9f04c6b..fbb3fb1 100644 --- a/heimdall-frontend/Source/aboutform.cpp +++ b/heimdall-frontend/Source/aboutform.cpp @@ -25,6 +25,8 @@ // Heimdall Frontend
#include "aboutform.h"
+#include <QStringList>
+
#define UNUSED(x) (void)(x)
using namespace HeimdallFrontend;
diff --git a/heimdall-frontend/Source/aboutform.h b/heimdall-frontend/Source/aboutform.h index 0c02f08..4b6a8e3 100644 --- a/heimdall-frontend/Source/aboutform.h +++ b/heimdall-frontend/Source/aboutform.h @@ -18,6 +18,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.*/
+#ifndef ABOUTFORM_H
+#define ABOUTFORM_H
+
// Qt
#include <QProcess>
#include <QWidget>
@@ -50,3 +53,6 @@ namespace HeimdallFrontend void HandleHeimdallError(QProcess::ProcessError error);
};
}
+
+#endif
+
diff --git a/heimdall-frontend/Source/main.cpp b/heimdall-frontend/Source/main.cpp index 41e018d..c327b63 100644 --- a/heimdall-frontend/Source/main.cpp +++ b/heimdall-frontend/Source/main.cpp @@ -19,17 +19,20 @@ THE SOFTWARE.*/
// Qt
-#include <QtGui/QApplication>
+#include <QApplication>
+#include <QtPlugin>
// Heimdall Frontend
#include "mainwindow.h"
+Q_IMPORT_PLUGIN (QWindowsIntegrationPlugin);
+
using namespace HeimdallFrontend;
int main(int argc, char *argv[])
{
QApplication application(argc, argv);
-
+
MainWindow window;
window.show();
diff --git a/heimdall-frontend/Source/mainwindow.cpp b/heimdall-frontend/Source/mainwindow.cpp index f122034..74d9500 100644 --- a/heimdall-frontend/Source/mainwindow.cpp +++ b/heimdall-frontend/Source/mainwindow.cpp @@ -836,7 +836,7 @@ void MainWindow::SelectPit(void) for (int i = 0; i < partitionNamesCount; i++)
{
- const PitEntry *pitEntry = currentPitData.FindEntry(partitionNames[i].toAscii().constData());
+ const PitEntry *pitEntry = currentPitData.FindEntry(partitionNames[i].toLatin1().constData());
if (pitEntry)
{
|