Re: [kdelibs] kio/kfile: completeBaseName gives us "foo.bar" for "foo.bar.png"

[Aaron J. Seigo]

Hi ..

I pushed this set of changes into master by accident, after having done the 
development in a local branch. Wasn't thinking .. it's also in KDE/4.10 branch 
at this point as well.

(Well, I was thinking -> "I will have to pull this into the stable branch and 
then into master .. ah, right, kdelibs is not doing the normal multiple branch 
thing. *brain fart* master it is, then." *sigh*)

I merged KDE/4.10 back into master to ensure it wouldn't problems .. it went 
ok, though now master has a slightly odd stutter in its commit msgs (though 
all the code and changes are at least accurate).

I can't wait until we cut over to the frameworks branch for all devel. :/

On Thursday, February 21, 2013 18:23:54 Aaron Seigo wrote:
> Git commit 6b1c9f53c19d2c9b129ff359f8fb1df676e25028 by Aaron Seigo.
> Committed on 21/02/2013 at 18:11.
> Pushed by aseigo into branch 'master'.
> 
> completeBaseName gives us "foo.bar" for "foo.bar.png"
> 
> icon names with dots in them were getting mangled as a result
> 
> BUG:315578
> 
> M  +2    -2    kio/kfile/kicondialog.cpp
> 
> http://commits.kde.org/kdelibs/6b1c9f53c19d2c9b129ff359f8fb1df676e25028
> 
> diff --git a/kio/kfile/kicondialog.cpp b/kio/kfile/kicondialog.cpp
> index b7d646f..63f4bd9 100644
> --- a/kio/kfile/kicondialog.cpp
> +++ b/kio/kfile/kicondialog.cpp
> @@ -661,8 +661,8 @@ void KIconDialog::slotOk()
>      {
>          name = d->mpCanvas->getCurrent();
>          if (!name.isEmpty() && d->mpSystemIcons->isChecked()) {
> -            QFileInfo fi(name);
> -            name = fi.baseName();
> +            const QFileInfo fi(name);
> +            name = fi.completeBaseName();
>          }
>      }
-- 
Aaron Seigo

signature.asc
Description: This is a digitally signed message part.