flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 01:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes for linux build

Browse Source 
refs #36
- Fixed compiler error in context.cpp (is not used anymore, but was still annoying)
- GCC was complaining about the template definitons in blackgui. Removing typename fixed it.
- Fixed a bug in qmake. Unfortunately qmake mkspec was just linux-g++ (not linux-g++-64), so added this case.
- Fixed a PRE_TARGETDEPS bug
- QMake has strange behaviour with DBUS_ADAPTORS: include the header somewhere, otherwise it won't be generated.

refs #81
This commit is contained in:
Roland Winklmeier
2013-11-27 23:17:42 +01:00
committed by Mathew Sutcliffe
parent 7410d6aeb2
commit f24d16019f
5 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackgui/listmodelbase.cpp
View File

@@ -15,7 +15,8 @@ namespace BlackGui
/*
* Column count
*/
template <typename ObjectType, typename ListType> int CListModelBase<ObjectType, ListType>::columnCount(const QModelIndex & /** modelIndex **/) const
template <typename ObjectType, typename ListType>
int CListModelBase<ObjectType, ListType>::columnCount(const QModelIndex & /** modelIndex **/) const
{
int c = this->m_columns.size();
return c;
@@ -24,7 +25,8 @@ namespace BlackGui
/*
* Row count
*/
template <typename ObjectType, typename ListType> int CListModelBase<ObjectType, ListType>::rowCount(const QModelIndex & /** parent */) const
template <typename ObjectType, typename ListType>
int CListModelBase<ObjectType, ListType>::rowCount(const QModelIndex & /** parent */) const
{
return this->m_list.size();
}
@@ -32,7 +34,8 @@ namespace BlackGui
/*
* Column to property index
*/
template <typename ObjectType, typename ListType> int CListModelBase<ObjectType, ListType>::columnToPropertyIndex(int column) const
template <typename ObjectType, typename ListType>
int CListModelBase<ObjectType, ListType>::columnToPropertyIndex(int column) const
{
return this->m_columns.columnToPropertyIndex(column);
}
@@ -40,7 +43,8 @@ namespace BlackGui
/*
* Header data
*/
template <typename ObjectType, typename ListType> QVariant CListModelBase<ObjectType, ListType>::headerData(int section, Qt::Orientation orientation, int role) const
template <typename ObjectType, typename ListType> QVariant
CListModelBase<ObjectType, ListType>::headerData(int section, Qt::Orientation orientation, int role) const
{
if (role == Qt::DisplayRole && orientation == Qt::Horizontal)
{
@@ -55,7 +59,8 @@ namespace BlackGui
/*
* Data
*/
template <typename ObjectType, typename ListType> QVariant CListModelBase<ObjectType, ListType>::data(const QModelIndex &index, int role) const
template <typename ObjectType, typename ListType>
QVariant CListModelBase<ObjectType, ListType>::data(const QModelIndex &index, int role) const
{
// checks
if (index.row() < 0 || index.row() >= this->m_list.size() ||
@@ -81,7 +86,8 @@ namespace BlackGui
/*
* Update
*/
template <typename ObjectType, typename ListType> int CListModelBase<ObjectType, ListType>::update(const ListType &list)
template <typename ObjectType, typename ListType>
int CListModelBase<ObjectType, ListType>::update(const ListType &list)
{
ListType copyList = (list.size() > 1 && this->hasValidSortColumn() ?
this->sortListByColumn(list, this->m_sortedColumn, this->m_sortOrder) :