← Back to branch summary

~ci-train-bot/libertine/libertine-ubuntu-zesty-2123

« back to all changes in this revision

Viewing changes to common/ContainerConfigList.cpp

  • Committer: Bileto Bot
  • Date: 2016-11-21 19:45:03 UTC
  • mfrom: (171.1.9 libertine.1.4.3-release)
  • Revision ID: ci-train-bot@canonical.com-20161121194503-9jtvays9v8el78ny
Fix old libertine package breaks/replaces version for proper
upgrading. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/ContainerConfigList.cpp
16
16
 * You should have received a copy of the GNU General Public License
17
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
18
 */
19
 
#include "libertine/ContainerManager.h"
20
 
#include "libertine/ContainerConfigList.h"
21
 
#include "libertine/LibertineConfig.h"
 
19
#include "common/ContainerConfigList.h"
22
20
 
 
21
#include "common/ContainerConfig.h"
 
22
#include "common/LibertineConfig.h"
23
23
#include <algorithm>
24
 
#include "libertine/ContainerConfig.h"
25
24
#include <QtCore/QDebug>
26
25
#include <QtCore/QDir>
27
26
#include <QtCore/QFile>
95
94
reloadContainerList()
96
95
{
97
96
  beginResetModel();
98
 
  endResetModel();  
 
97
  endResetModel();
99
98
}
100
99
 
101
100
 
128
127
deleteContainer()
129
128
{
130
129
  beginResetModel();
131
 
  endResetModel();  
 
130
  endResetModel();
132
131
}
133
132
 
134
133
 
360
359
getHostDistroDescription()
361
360
{
362
361
  QSettings distro_info("/etc/lsb-release", QSettings::NativeFormat);
363
 
 
 
362
 
364
363
  return distro_info.value("DISTRIB_DESCRIPTION").toString().section(' ', 0, 2);
365
364
}
366
365