← Back to branch summary

~ubuntu-branches/ubuntu/wily/marble/wily-proposed

« back to all changes in this revision

Viewing changes to src/plugins/runner/monav/MonavConfigWidget.cpp

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark, Jonathan Riddell, Scarlett Clark
  • Date: 2014-07-24 23:38:32 UTC
  • mfrom: (1.5.2)
  • Revision ID: package-import@ubuntu.com-20140724233832-7v4421t4khrhw487
Tags: 4:4.13.90-0ubuntu1
[ Jonathan Riddell ]
* Switch to libmarblewidget19 for new soversion

[ Scarlett Clark ]
* New upstream beta release
* Update: do_not_install_private_headers. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/plugins/runner/monav/MonavConfigWidget.cpp
121
121
 
122
122
    void updateTransportPreference();
123
123
 
124
 
    bool canExecute( const QString &executable ) const;
 
124
    static bool canExecute( const QString &executable );
125
125
 
126
126
    void setBusy( bool busy, const QString &message = QString() ) const;
127
127
 
128
128
private:
129
 
    bool fillComboBox( QStringList items, QComboBox* comboBox ) const;
 
129
    static bool fillComboBox( QStringList items, QComboBox* comboBox );
130
130
};
131
131
 
132
132
void MonavStuffEntry::setPayload( const QString &payload )
254
254
    updateInstalledMapsViewButtons();
255
255
}
256
256
 
257
 
bool MonavConfigWidgetPrivate::fillComboBox( QStringList items, QComboBox* comboBox ) const
 
257
bool MonavConfigWidgetPrivate::fillComboBox( QStringList items, QComboBox* comboBox )
258
258
{
259
259
    comboBox->clear();
260
260
    qSort( items );
552
552
    m_progressBar->setFormat( progress.arg( bytesReceived / 1024 / 1024 ).arg( bytesTotal / 1024 / 1024 ) );
553
553
}
554
554
 
555
 
bool MonavConfigWidgetPrivate::canExecute( const QString &executable ) const
 
555
bool MonavConfigWidgetPrivate::canExecute( const QString &executable )
556
556
{
557
557
    QString path = QProcessEnvironment::systemEnvironment().value( "PATH", "/usr/local/bin:/usr/bin:/bin" );
558
558
    foreach( const QString &dir, path.split( QLatin1Char( ':' ) ) ) {