Converted from Qt4 to Qt5.

[ttedit] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8c7524f500a1d37f9e409920cb9fd8d6df901c6f..25b63d11af9d534907a81fc3a3787cd660aeeb08 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -191,6 +191,7 @@ void MainWindow::NewGlyph(void)
        editWnd->pts.Clear();
        ((TTEdit *)qApp)->charWnd->MakePathFromPoints(&(editWnd->pts));
        ((TTEdit *)qApp)->charWnd->update();
+//     editWnd->polyFirstPoint = true;
        editWnd->update();
 }
 
@@ -199,7 +200,7 @@ void MainWindow::OpenFile(void)
 {
        QString filename = QFileDialog::getOpenFileName(this, tr("Open Glyph File"),
                "./", tr("Glyph files (*.glyph)"));
-       FILE * file = fopen(filename.toAscii().data(), "r");
+       FILE * file = fopen(filename.toUtf8().data(), "r");
 
        //need to pop an error box here...
        if (file == 0)
@@ -218,7 +219,7 @@ void MainWindow::SaveFile(void)
 {
        QString filename = QFileDialog::getSaveFileName(this, tr("Save Glyph File"),
                "./", tr("Glyph files (*.glyph)"));
-       FILE * file = fopen(filename.toAscii().data(), "w");
+       FILE * file = fopen(filename.toUtf8().data(), "w");
 
        //need to pop an error box here...
        if (file == 0)
@@ -254,29 +255,6 @@ void MainWindow::WriteSettings(void)
 
 
 #if 0
-#include "ttedit.h"
-#include "charwindow.h"
-#include "toolwindow.h"
-#include "editwindow.h"
-#include "tte_res.h"                                                   // Resource IDs
-#ifdef DEBUG
-#include "debug.h"
-#endif
-
-// Pixmap resouces
-
-#include "res/cur1.xpm"
-#include "res/cur2.xpm"
-#include "res/cur3.xpm"
-#include "res/cur4.xpm"
-#include "res/cur5.xpm"
-#include "res/cur6.xpm"
-#include "res/cur7.xpm"
-#include "res/cur8.xpm"
-#include "res/ttedit.xpm"                                              // *nix only, but small enough to not matter
-#include "res/tool1.xpm"
-#include "res/tool2.xpm"
-#include "res/tool3.xpm"
 
 
 IMPLEMENT_APP(TTEditApp)                                               // Run the main application loop