package/graphic/scribus/stl.diff

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
   3 #
   4 # T2 SDE: package/.../scribus/stl.diff
   5 # Copyright (C) 2006 The T2 SDE Project
   6 #
   7 # More information can be found in the files COPYING and README.
   8 #
   9 # This patch file is dual-licensed. It is available under the license the
  10 # patched project is licensed under, as long as it is an OpenSource license
  11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12 # of the GNU General Public License as published by the Free Software
  13 # Foundation; either version 2 of the License, or (at your option) any later
  14 # version.
  15 # --- T2-COPYRIGHT-NOTE-END ---
  16
  17 --- ./scribus/mspinbox.cpp.vanilla      2006-05-02 18:57:15.000000000 +0200
  18 +++ ./scribus/mspinbox.cpp      2006-05-02 18:58:24.000000000 +0200
  19 @@ -222,12 +222,12 @@
  20         //Get the index of our suffix
  21         int toConvertToIndex=unitIndexFromString(su);
  22         //Add in the fparser constants using our unit strings, and the conversion factors.
  23 -       fp.AddConstant(strPT, value2value(1.0, SC_PT, toConvertToIndex));
  24 -       fp.AddConstant(strMM, value2value(1.0, SC_MM, toConvertToIndex));
  25 -       fp.AddConstant(strIN, value2value(1.0, SC_IN, toConvertToIndex));
  26 -       fp.AddConstant(strP, value2value(1.0, SC_P, toConvertToIndex));
  27 -       fp.AddConstant(strCM, value2value(1.0, SC_CM, toConvertToIndex));
  28 -       fp.AddConstant(strC, value2value(1.0, SC_C, toConvertToIndex));
  29 +       fp.AddConstant(strPT.ascii(), value2value(1.0, SC_PT, toConvertToIndex));
  30 +       fp.AddConstant(strMM.ascii(), value2value(1.0, SC_MM, toConvertToIndex));
  31 +       fp.AddConstant(strIN.ascii(), value2value(1.0, SC_IN, toConvertToIndex));
  32 +       fp.AddConstant(strP.ascii(), value2value(1.0, SC_P, toConvertToIndex));
  33 +       fp.AddConstant(strCM.ascii(), value2value(1.0, SC_CM, toConvertToIndex));
  34 +       fp.AddConstant(strC.ascii(), value2value(1.0, SC_C, toConvertToIndex));
  35         int ret = fp.Parse(ts.latin1(), "", true);
  36         if (ret >= 0)
  37                 return 0;
  38 @@ -351,7 +351,7 @@
  39         QMap<QString, double>::Iterator it=functionParserConstants.begin();
  40         while(it!=itend)
  41         {
  42 -               fp.AddConstant(it.key(), it.data());
  43 +               fp.AddConstant(it.key().ascii(), it.data());
  44                 ++it;
  45         }
  46  }