[Kst] branches/work/kst/portto4/kst/src

[Peter Kümmel]

SVN commit 1236960 by kuemmel:

mingw/merged files fixes

 M  +5 -0      libkstapp/mainwindow.cpp  
 M  +3 -3      libkstmath/colorsequence.cpp  


--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #1236959:1236960
@@ -59,6 +59,11 @@
 #include "dialoglauncher.h"
 
 #include <QSvgGenerator>
+#include <QUndoGroup>
+#include <QPrintDialog>
+#include <QMenuBar>
+#include <QStatusBar>
+#include <QProgressBar>
 
 
 namespace Kst {
--- branches/work/kst/portto4/kst/src/libkstmath/colorsequence.cpp #1236959:1236960
@@ -18,7 +18,7 @@
 
 namespace Kst {
 
-static const QLatin1String& KstColorsName = QLatin1String("KstColors");
+static const QLatin1String& KstColorSequenceName = QLatin1String("KstColors");
 
 // Default palette that is used if "Kst Colors" is not found.
 static const char *const colors[] = { "red",
@@ -62,9 +62,9 @@
 
 
 void ColorSequence::createPalette( ) {
-  if (_palette != KstColorsName) {
+  if (_palette != KstColorSequenceName) {
     _pal.clear();
-    _palette = KstColorsName;
+    _palette = KstColorSequenceName;
 
     for (int i = 0; i < colorcnt; i++) {
       _pal.insert(i, QColor(colors[i]));