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

[Peter Kümmel]

SVN commit 1049186 by kuemmel:

remove qt3support, fixes for msvc, all patches are not critical

 M  +1 -1      dataobjectplugin.pri  
 M  +1 -1      datasourceplugin.pri  
 M  +1 -1      src/libkst/debug.cpp  
 M  +1 -1      src/libkst/stdinsource.h  
 M  +1 -1      src/libkstapp/datamanager.cpp  
 M  +4 -0      src/libkstapp/lineitem.cpp  
 M  +1 -1      src/libkstapp/viewitem.h  
 M  +2 -2      src/plugins/dataobject/genericfilter/genericfilter.cpp  
 M  +1 -1      src/widgets/curveselector.cpp  
 M  +1 -1      src/widgets/matrixselector.cpp  
 M  +1 -1      src/widgets/scalarselector.cpp  
 M  +1 -1      src/widgets/stringselector.cpp  
 M  +1 -1      src/widgets/vectorselector.cpp  


--- branches/work/kst/portto4/kst/dataobjectplugin.pri #1049185:1049186
@@ -1,4 +1,4 @@
-QT += xml qt3support
+QT += xml 
 
 TEMPLATE = lib
 CONFIG += plugin
--- branches/work/kst/portto4/kst/datasourceplugin.pri #1049185:1049186
@@ -1,4 +1,4 @@
-QT += xml qt3support
+QT += xml 
 
 TEMPLATE = lib
 CONFIG += plugin
--- branches/work/kst/portto4/kst/src/libkst/debug.cpp #1049185:1049186
@@ -19,7 +19,7 @@
 #include <qdebug.h>
 #include "kst_i18n.h"
 
-#include <ksttimers.h>
+#include "ksttimers.h"
 
 namespace Kst {
 
--- branches/work/kst/portto4/kst/src/libkst/stdinsource.h #1049185:1049186
@@ -18,7 +18,7 @@
 #ifndef STDINSRC_H
 #define STDINSRC_H
 
-#include <datasource.h>
+#include "datasource.h"
 
 #include "kst_export.h"
 
--- branches/work/kst/portto4/kst/src/libkstapp/datamanager.cpp #1049185:1049186
@@ -315,7 +315,7 @@
 
 
 bool DataManager::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     _doc->session()->triggerReset();
   }
   return QDialog::event(event);
--- branches/work/kst/portto4/kst/src/libkstapp/lineitem.cpp #1049185:1049186
@@ -9,6 +9,10 @@
  *                                                                         *
  ***************************************************************************/
 
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
+
 #include "lineitem.h"
 
 #include "view.h"
--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.h #1049185:1049186
@@ -318,7 +318,7 @@
 Q_DECLARE_OPERATORS_FOR_FLAGS(ViewItem::ActiveGrips)
 
 #ifndef QT_NO_DEBUG_STREAM
-Q_CORE_EXPORT QDebug operator<<(QDebug, ViewItem*);
+KST_EXPORT QDebug operator<<(QDebug, ViewItem*);
 #endif
 
 class KST_EXPORT ViewItemCommand : public QUndoCommand
--- branches/work/kst/portto4/kst/src/plugins/dataobject/genericfilter/genericfilter.cpp #1049185:1049186
@@ -190,8 +190,8 @@
   int length = inputVector->length();
 
   // Extract polynom coefficients and instantiate polynoms
-  QStringList numCoeffs = QStringList::split(QRegExp("\\s*(,|;|:)\\s*"), inputStringNumerator->value());
-  QStringList denCoeffs = QStringList::split(QRegExp("\\s*(,|;|:)\\s*"), inputStringDenominator->value());
+  QStringList numCoeffs = inputStringNumerator->value().split(QRegExp("\\s*(,|;|:)\\s*"));
+  QStringList denCoeffs = inputStringDenominator->value().split(QRegExp("\\s*(,|;|:)\\s*"));
   int numDegree = numCoeffs.count() - 1, denDegree = denCoeffs.count() - 1;
   polynom<double> Num(numDegree), Den(denDegree);
   double tmpDouble = 0.0;
--- branches/work/kst/portto4/kst/src/widgets/curveselector.cpp #1049185:1049186
@@ -132,7 +132,7 @@
 
 
 bool CurveSelector::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     fillCurves();
   }
   return QWidget::event(event);
--- branches/work/kst/portto4/kst/src/widgets/matrixselector.cpp #1049185:1049186
@@ -141,7 +141,7 @@
 
 
 bool MatrixSelector::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     fillMatrices();
   }
   return QWidget::event(event);
--- branches/work/kst/portto4/kst/src/widgets/scalarselector.cpp #1049185:1049186
@@ -226,7 +226,7 @@
 
 
 bool ScalarSelector::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     fillScalars();
   }
   return QWidget::event(event);
--- branches/work/kst/portto4/kst/src/widgets/stringselector.cpp #1049185:1049186
@@ -162,7 +162,7 @@
 
 
 bool StringSelector::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     fillStrings();
   }
   return QWidget::event(event);
--- branches/work/kst/portto4/kst/src/widgets/vectorselector.cpp #1049185:1049186
@@ -202,7 +202,7 @@
 
 
 bool VectorSelector::event(QEvent * event) {
-  if (event->type() == QEvent::QEvent::WindowActivate) {
+  if (event->type() == QEvent::WindowActivate) {
     fillVectors();
   }
   return QWidget::event(event);