Changeset 226 for Common


Ignore:
Timestamp:
Apr 6, 2011, 3:08:13 PM (13 years ago)
Author:
george
Message:
Location:
Common
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • Common/Common.lpk

    r123 r226  
    1717    <Description Value="Various libraries"/>
    1818    <License Value="GNU/GPL"/>
    19     <Version Minor="1"/>
    20     <Files Count="5">
     19    <Version Minor="2"/>
     20    <Files Count="6">
    2121      <Item1>
    2222        <Filename Value="StopWatch.pas"/>
    … …  
    3939        <UnitName Value="UPrefixMultiplier"/>
    4040      </Item5>
     41      <Item6>
     42        <Filename Value="UURI.pas"/>
     43        <UnitName Value="UURI"/>
     44      </Item6>
    4145    </Files>
    4246    <Type Value="RunAndDesignTime"/>

  • Common/Common.pas

    r118 r226  
    88
    99uses
    10     StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier,
     10    StopWatch, UCommon, UDebugLog, UDelay, UPrefixMultiplier, UURI,
    1111  LazarusPackageIntf;
    1212

  • Common/UURI.pas

    r222 r226  
    238238    Scheme := TURI(Source).Scheme;
    239239    Authority := TURI(Source).Authority;
    240     Path := TURI(Source).Path;
     240    Path.Assign(TURI(Source).Path);
    241241    Fragment := TURI(Source).Fragment;
    242242    Query := TURI(Source).Query;
    … …  
    310310    RightCutString(AValue, Extension, ExtensionSeparator);
    311311    Extension := ExtensionSeparator + Extension;
    312   end;
     312  end else Extension := '';
    313313  if Pos(DirectorySeparator, AValue) > 0 then RightCutString(AValue, Name, DirectorySeparator)
    314314    else begin
    … …  
    319319    LeftCutString(AValue, Drive, DriveSeparator);
    320320    Drive := Drive + DriveSeparator;
    321   end;
     321  end else Drive := '';
    322322  Directory.AsString := AValue;
    323323end;
Note: See TracChangeset for help on using the changeset viewer.