Changeset 356169a3d3 in tspsg for src/mainwindow.cpp

Timestamp:

Jul 11, 2012, 6:46:48 PM (12 years ago)

Author:

Oleksii Serdiuk

Branches:

appveyor, imgbot, master, readme

Children:

ff8d0488a0

Parents:

c90b437dd8

Message:

Updated code to become compilable with Qt 5.

Compiling with Qt 4 is still possible and it will be the main platform
for TSPSG releases until first Qt 5 release is made.

File:

• src/mainwindow.cpp (modified) (6 diffs)

src/mainwindow.cpp

@@ -1304 +1304 @@
 QColor hilight;
     if (color.value() < 192)
-        hilight.setHsv(color.hue(), color.saturation(), 127 + qRound(color.value() / 2));
+        hilight.setHsv(color.hue(), color.saturation(), 127 + (color.value() / 2));
     else
         hilight.setHsv(color.hue(), color.saturation(), color.value() / 2);
@@ -1362 +1362 @@
         a->setStatusTip(language.at(3));
 #endif
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
         a->setIcon(QIcon::fromTheme(QString("flag-%1").arg(language.at(1)), QIcon(QString(":/images/icons/l10n/flag-%1.png").arg(language.at(1)))));
 #else
@@ -1682 +1682 @@
 #ifndef HANDHELD
     menuSettingsLanguage->setIcon(GET_ICON("preferences-desktop-locale"));
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     actionSettingsLanguageEnglish->setIcon(QIcon::fromTheme("flag-gb", QIcon(":/images/icons/l10n/flag-gb.png")));
-#else // QT_VERSION >= 0x040600
+#else
     actionSettingsLanguageEnglish->setIcon(QIcon(":/images/icons/l10n/flag-gb.png"));
-#endif // QT_VERSION >= 0x040600
+#endif // QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     menuSettingsStyle->setIcon(GET_ICON("preferences-desktop-theme"));
 #endif // HANDHELD
@@ -1697 +1697 @@
     actionHelpReportBug->setIcon(GET_ICON("tools-report-bug"));
     actionHelpAbout->setIcon(GET_ICON("help-about"));
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
     actionHelpAboutQt->setIcon(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"));
-#endif
+#else
+    actionHelpAboutQt->setIcon(QIcon(":/qt-project.org/qmessagebox/images/qtlogo-64.png"));
+#endif // QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#endif // HANDHELD
     // Buttons
     buttonRandom->setIcon(GET_ICON("roll"));
@@ -1707 +1711 @@
 //      action->setIcon(GET_ICON(""));
 
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     setToolButtonStyle(Qt::ToolButtonFollowStyle);
 #endif
@@ -1756 +1760 @@
     actionFilePageSetup->setObjectName("actionFilePrintSetup");
 //    actionFilePageSetup->setEnabled(false);
-#if QT_VERSION >= 0x040600
+#if QT_VERSION >= QT_VERSION_CHECK(4,6,0)
     actionFilePageSetup->setIcon(QIcon::fromTheme("document-page-setup", QIcon(":/trolltech/dialogs/qprintpreviewdialog/images/page-setup-32.png")));
 #else