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

[Mike Fenton]

SVN commit 856387 by fenton:

Initial fixes for Qt 4.4.X segfaults.
Fix crash on load.
Fix crash on appending of empty strings in description fields.


 M  +1 -6      libkst/datamatrix.cpp  
 M  +1 -8      libkst/matrix.cpp  
 M  +4 -6      libkstapp/mainwindow.cpp  
 M  +1 -5      libkstmath/equation.cpp  
 M  +3 -1      libkstmath/image.cpp  


--- branches/work/kst/portto4/kst/src/libkst/datamatrix.cpp #856386:856387
@@ -569,17 +569,12 @@
 }
 
 QString DataMatrix::descriptionTip() const {
-  QString IDstring;
-  //QString range_string;
-
-  IDstring = i18n(
+  return i18n(
       "Data Matrix: %1\n"
       "  %2\n"
       "  Field: %3\n"
       "  %4 x %5"
       ).arg(Name()).arg(dataSource()->fileName()).arg(field().arg(_nX).arg(_nY));
-
-  return IDstring;
 }
 
 }
--- branches/work/kst/portto4/kst/src/libkst/matrix.cpp #856386:856387
@@ -616,14 +616,7 @@
 }
 
 QString Matrix::descriptionTip() const {
-    QString tip;
-  //QString range_string;
-
-  tip = i18n(
-      "Matrix: %1\n"
-      "  %2 x %3"
-            ).arg(Name()).arg(_nX).arg(_nY);
-
+  return i18n("Matrix: %1\n %2 x %3").arg(Name()).arg(_nX).arg(_nY);
 }
 }
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/libkstapp/mainwindow.cpp #856386:856387
@@ -71,17 +71,15 @@
   _debugDialog = new DebugDialog(this); // need this early for hookups
   Debug::self()->setHandler(_debugDialog);
 
-  connect(_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentViewChanged()));
-
-  _tabWidget->createView();
-
-  setCentralWidget(_tabWidget);
-
   createActions();
   createMenus();
   createToolBars();
   createStatusBar();
 
+  _tabWidget->createView();
+  setCentralWidget(_tabWidget);
+  connect(_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(currentViewChanged()));
+
   readSettings();
   QTimer::singleShot(0, this, SLOT(performHeavyStartupActions()));
 }
--- branches/work/kst/portto4/kst/src/libkstmath/equation.cpp #856386:856387
@@ -587,11 +587,7 @@
 }
 
 QString Equation::descriptionTip() const {
-  QString tip;
-
-  tip = i18n("Equation: %1\n  %2\nX: %3").arg(Name()).arg(equation()).arg(vXIn()->descriptionTip());
-  
-  return tip;
+  return i18n("Equation: %1\n  %2\nX: %3").arg(Name()).arg(equation()).arg(vXIn()->descriptionTip());
 }
 
 }
--- branches/work/kst/portto4/kst/src/libkstmath/image.cpp #856386:856387
@@ -807,7 +807,9 @@
   if (_hasColorMap) {
     tip += i18n("  Color Map");
   }
-  tip+= matrix()->descriptionTip();
+
+  tip += matrix()->descriptionTip();
+  return tip;
 }
 
 }