[Kst] kdeextragear-2/kst/kst

[Adriaan de Groot]

CVS commit by adridg: 

--enable-final: identifiers need to be unique across object files too; the static QString looks scary and superfluous anyway -- what about making it non-static, like the one in for fit?


  M +5 -5      kstfitdialog_i.cpp   1.53
  M +5 -5      kstplugindialog_i.cpp   1.99


--- kdeextragear-2/kst/kst/kstfitdialog_i.cpp  #1.52:1.53
@@ -53,5 +53,5 @@ KstFitDialogI *KstFitDialogI::globalInst
 
 //const QString newFitPluginString = "<Auto Name>";
-const QString defaultTag = "<Auto Name>";
+const QString fit_defaultTag = "<Auto Name>";
 
 KstFitDialogI::KstFitDialogI(QWidget* parent, const char* name,
@@ -107,5 +107,5 @@ void KstFitDialogI::show_setCurve(const 
   if ( _yvector=="<None>" ) return;
 
-   _tagName->setText(defaultTag);
+   _tagName->setText(fit_defaultTag);
 
   updatePluginList();
@@ -317,5 +317,5 @@ bool KstFitDialogI::saveOutputs(KstPlugi
     if (li->text().isEmpty()) {
       QString tagName = _tagName->text();
-      if (tagName == defaultTag) {
+      if (tagName == fit_defaultTag) {
         tagName = plugin->tagName();
       }
@@ -454,5 +454,5 @@ bool KstFitDialogI::new_I() {
   QString tagName = _tagName->text();
 
-  if (tagName != defaultTag) {
+  if (tagName != fit_defaultTag) {
     if (KST::dataTagNameNotUnique(tagName, true, this)) {
       _tagName->setFocus();
@@ -472,5 +472,5 @@ bool KstFitDialogI::new_I() {
         plugin->setPlugin(pPtr);
 
-        if (tagName == defaultTag) {
+        if (tagName == fit_defaultTag) {
           tagName = KST::suggestPluginName(_pluginList[pitem], _strCurve);
         }

--- kdeextragear-2/kst/kst/kstplugindialog_i.cpp  #1.98:1.99
@@ -58,5 +58,5 @@ KstPluginDialogI *KstPluginDialogI::glob
 
 
-static const QString& defaultTag = KGlobal::staticQString("<Auto Name>");
+static const QString& plugin_defaultTag = KGlobal::staticQString("<Auto Name>");
 
 KstPluginDialogI::KstPluginDialogI(QWidget* parent, const char* name,
@@ -176,5 +176,5 @@ void KstPluginDialogI::_fillFieldsForNew
 
   /* set tag name */
-  _tagName->setText(defaultTag);
+  _tagName->setText(plugin_defaultTag);
 
   updatePluginList();
@@ -392,5 +392,5 @@ bool KstPluginDialogI::saveOutputs(KstPl
     if (li->text().isEmpty()) {
       QString tagName = _tagName->text();
-      if (tagName==defaultTag) {
+      if (tagName==plugin_defaultTag) {
         tagName = plugin->tagName();
       }
@@ -490,5 +490,5 @@ bool KstPluginDialogI::new_I() {
   QString tagName = _tagName->text();
 
-  if ((tagName!=defaultTag) && 
+  if ((tagName!=plugin_defaultTag) && 
       KST::dataTagNameNotUnique(tagName, true, this)) {
     _tagName->setFocus();
@@ -510,5 +510,5 @@ bool KstPluginDialogI::new_I() {
       plugin->setPlugin(pPtr);
 
-      if (tagName==defaultTag) {
+      if (tagName==plugin_defaultTag) {
         tagName = KST::suggestPluginName(_pluginList[pitem]);
       }