← Back to branch summary

~ubuntu-branches/ubuntu/vivid/digikam/vivid

« back to all changes in this revision

Viewing changes to extra/kipi-plugins/panorama/manager/cpfindbinary.cpp

  • Committer: Package Import Robot
  • Author(s): Philip Muškovac
  • Date: 2012-02-14 19:29:29 UTC
  • mfrom: (1.2.38) (3.1.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120214192929-cx2zia3b2nt67lvz
Tags: 4:2.5.0-1ubuntu1
* Merge from debian unstable, remaining changes:
  - keep seperate binary packages:
    + libkface1, libkface-data, libkface-dev
    + libkgeomap1, libkgeomap-data, libkgeomap-dev
    + libvkontakte1, libkvkontakte-dev
    + libmediawiki1, libmediawiki-dev
  - keep patches:
    + kubuntu_mysqld_executable_name.diff
  - don't fail on missing files in dh_install
  - install oxygen icons for kipi-plugins
  - build-depend on mysql 5.5 instead of 5.1
  - update install files
* digikam breaks/replaces kipi-plugins-common << 4:2.5.0~
* digikam-doc breaks/replaces digikam-data << 4:2.5.0~
* digikam-data breaks/replaces kipi-plugins << 4:2.5.0~
* kipi-plugins-common breaks/replaces kipi-plugins << 4:2.5.0~

Show diffs side-by-side

added added

removed removed

Lines of Context:
extra/kipi-plugins/panorama/manager/cpfindbinary.cpp
58
58
    QStringList lines = stdOut.split('\n');
59
59
 
60
60
    dev = false;
61
 
    foreach (QString line, lines)
 
61
    foreach(QString line, lines)
62
62
    {
63
63
        kDebug() << path() << " help header line: \n" << line;
64
 
        m_version = "";
 
64
        m_version.clear();
 
65
 
65
66
        if (line.startsWith(headerStarts))
66
67
        {
67
68
            m_version = line.remove(0, headerStarts.length()).section('.', 0, 1);
68
69
        }
69
 
        else if (line.startsWith(headerStartsNew))
70
 
        {
 
70
        else if (line.startsWith(headerStartsNew))
 
71
        {
71
72
            m_version = line.remove(0, headerStartsNew.length()).section('.', 0, 1);
72
 
        }
 
73
        }
73
74
 
74
 
        if (m_version != "")
 
75
        if (!m_version.isEmpty())
75
76
        {
76
77
            m_version.remove("Pre-Release ");            // Special case with Hugin beta.
77
78