[Kst] Re: branches/work/kst/portto4/kst/src/d2asc

[Peter Kümmel]

But d2asc doesn't work because of my patch, I couldn't image
how it broke it.


On 14.01.2011 21:29, Barth Netterfield wrote:
> d2asc currently doesn't work.  It shouldn't be built by default, and
> certainly shouldn't be installed (I haven't verified whether it is or
> not...).
>
> I might try to resurrect it, so we don't need to remove it from svn quite
> yet though.
>
> On Fri, Jan 14, 2011 at 9:56 AM, Peter Kümmel<syntheticpp at gmx.net>  wrote:
>
>> SVN commit 1214402 by kuemmel:
>>
>> remove msvc warnings by not using plain C functions
>>
>>   M  +7 -6      d2asc.cpp
>>
>>
>> --- branches/work/kst/portto4/kst/src/d2asc/d2asc.cpp #1214401:1214402
>> @@ -45,7 +45,8 @@
>>
>>    Kst::DataSourcePluginManager::init();
>>
>> -  char field_list[40][120], filename[180];
>> +  QString filename;
>> +  QString field_list[40];
>>    bool do_hex[40];
>>    int n_field=0;
>>    int start_frame=0, n_frames=2000000;
>> @@ -61,7 +62,7 @@
>>    for (i = 0; i<  40; i++)
>>      do_hex[i] = false;
>>
>> -  strcpy(filename, argv[1]);
>> +  filename = QString::fromLocal8Bit(argv[1]);
>>    for (i = 2; i<  argc; i++) {
>>      if (argv[i][0] == '-') {
>>        if (argv[i][1] == 'f') {
>> @@ -78,14 +79,14 @@
>>          do_ave = true;
>>        } else if (argv[i][1] == 'x') {
>>          i++;
>> -        strcpy(field_list[n_field], argv[i]);
>> +        field_list[n_field] = QString::fromLocal8Bit(argv[i]);
>>          do_hex[n_field] = true;
>>          n_field++;
>>        } else {
>>          Usage();
>>        }
>>      } else {
>> -      strcpy(field_list[n_field], argv[i]);
>> +      field_list[n_field] = QString::fromLocal8Bit(argv[i]);
>>        n_field++;
>>      }
>>    }
>> @@ -94,7 +95,7 @@
>>
>>    file = Kst::DataSourcePluginManager::loadSource(_document.objectStore(),
>> filename);
>>    if (!file || !file->isValid() || file->isEmpty()) {
>> -    fprintf(stderr, "d2asc error: file %s has no data\n", filename);
>> +    fprintf(stderr, "d2asc error: file %s has no data\n",
>> qPrintable(filename));
>>      return -2;
>>    }
>>    /** make vectors and fill the list **/
>> @@ -103,7 +104,7 @@
>>    for (i=0; i<n_field; i++) {
>>      if (!file->vector().isValid(field_list[i])) {
>>        fprintf(stderr, "d2asc error: field %s in file %s is not valid\n",
>> -              field_list[i], filename);
>> +              qPrintable(field_list[i]), qPrintable(filename));
>>        return -3;
>>      }
>>      Kst::DataVectorPtr v =
>> _document.objectStore()->createObject<Kst::DataVector>();
>> _______________________________________________
>> Kst mailing list
>> Kst at kde.org
>> https://mail.kde.org/mailman/listinfo/kst
>>
>
>
>
>
>
> _______________________________________________
> Kst mailing list
> Kst at kde.org
> https://mail.kde.org/mailman/listinfo/kst