Changeset 7a39458d16 in tspsg

Timestamp:

Sep 21, 2012, 11:22:42 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

07e43cf61a

Parents:

19d4eac43b

git-author:

Oleksii Serdiuk <contacts@…> (09/21/12 23:22:42)

git-committer:

Oleksii Serdiuk <contacts@…> (09/21/12 23:27:33)

Message:

A few more fixes for compatibility with Qt 5.

Location:

src

Files:

• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp (modified) (1 diff)
• 3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h (modified) (1 diff)
• mainwindow.cpp (modified) (2 diffs)

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.cpp

@@ -1807 +1807 @@
     window \a flags.
 */
-QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WFlags flags)
+QtToolBarDialog::QtToolBarDialog(QWidget *parent, Qt::WindowFlags flags)
     : QDialog(parent, flags)
 {

src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.h

@@ -115 +115 @@
 public:
 
-    QtToolBarDialog(QWidget *parent = 0, Qt::WFlags flags = 0);
+    QtToolBarDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
     ~QtToolBarDialog();
 

src/mainwindow.cpp

@@ -307 +307 @@
         QString format = settings->value("Output/GraphImageFormat", DEF_GRAPH_IMAGE_FORMAT).toString();
 #if !defined(NOSVG)
-        if (!QImageWriter::supportedImageFormats().contains(format.toAscii()) && (format != "svg")) {
+        if (!QImageWriter::supportedImageFormats().contains(format.toLatin1()) && (format != "svg")) {
 #else // NOSVG
-        if (!QImageWriter::supportedImageFormats().contains(format.toAscii())) {
+        if (!QImageWriter::supportedImageFormats().contains(format.toLatin1())) {
 #endif // NOSVG
             format = DEF_GRAPH_IMAGE_FORMAT;
@@ -1317 +1317 @@
         QImageWriter pic;
         pic.setDevice(&buf);
-        pic.setFormat(format.toAscii());
+        pic.setFormat(format.toLatin1());
         if (pic.supportsOption(QImageIOHandler::Description)) {
             pic.setText("Title", "Solution Graph");