← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/kdebase/jaunty-backports

« back to all changes in this revision

Viewing changes to apps/lib/konq/konq_copytomenu.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Steve Stalcup
  • Date: 2009-01-08 09:49:20 UTC
  • mfrom: (1.1.22 upstream)
  • Revision ID: james.westby@ubuntu.com-20090108094920-zbm1d1y0y3t5rpff
Tags: 4:4.1.96-0ubuntu1
* New upstream release
* Updated various .install files:
  + dolphin.install
  + kappfinder.install
  + kfind.install
  + konqueror.install
* Bumped build-dep versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/lib/konq/konq_copytomenu.cpp
193
193
    const QStringList entries = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::LocaleAware);
194
194
    KMimeType::Ptr dirMime = KMimeType::mimeType("inode/directory");
195
195
    Q_FOREACH(const QString& subDir, entries) {
196
 
        const QString subPath = m_path + '/' + subDir;
 
196
        QString subPath = m_path;
 
197
        if (!subPath.endsWith('/'))
 
198
            subPath.append('/');
 
199
        subPath += subDir;
197
200
        KonqCopyToDirectoryMenu* subMenu = new KonqCopyToDirectoryMenu(this, m_mainMenu, subPath);
198
201
        subMenu->setTitle(subDir);
199
202
        const QString iconName = dirMime->iconName(KUrl(subPath));