refs #432 Doxygen, formatting, added new file types in *.pro

Minor tweaks:
* GUI infobar minimum size
* toogle lock protected
* removed unused function
* ASSERT_X
* object name
This commit is contained in:
Klaus Basan
2015-05-27 03:55:26 +02:00
parent 73164b2ffc
commit e695987fa2
24 changed files with 67 additions and 97 deletions

View File

@@ -20,9 +20,6 @@ namespace BlackGui
{
namespace Models
{
/*
* Constructor
*/
CAirportListModel::CAirportListModel(QObject *parent) :
CListModelBase<BlackMisc::Aviation::CAirport, BlackMisc::Aviation::CAirportList>("ViewAirportList", parent)
{
@@ -45,5 +42,5 @@ namespace BlackGui
(void)QT_TRANSLATE_NOOP("ViewAirportList", "elevation");
(void)QT_TRANSLATE_NOOP("ViewAirportList", "bearing");
}
}
}
} // ns
} // ns

View File

@@ -22,9 +22,7 @@ namespace BlackGui
namespace Models
{
/*!
* Airport list model
*/
//! Airport list model
class BLACKGUI_EXPORT CAirportListModel : public CListModelBase<BlackMisc::Aviation::CAirport, BlackMisc::Aviation::CAirportList>
{

View File

@@ -62,10 +62,8 @@ namespace BlackGui
//! Set sort column
virtual void setSortColumn(int column) { this->m_sortedColumn = column; }
/*!
* Set column for sorting
* \param propertyIndex index of column to be sorted
*/
//! Set column for sorting
//! \param propertyIndex index of column to be sorted
virtual void setSortColumnByPropertyIndex(const BlackMisc::CPropertyIndex &propertyIndex);
//! Get sort column property index
@@ -100,11 +98,9 @@ namespace BlackGui
int ps_updateContainer(const BlackMisc::CVariant &variant, bool sort);
protected:
/*!
* Constructor
* \param translationContext I18N context
* \param parent
*/
//! Constructor
//! \param translationContext I18N context
//! \param parent
CListModelBaseNonTemplate(const QString &translationContext, QObject *parent = nullptr)
: QAbstractItemModel(parent), m_columns(translationContext), m_sortedColumn(-1), m_sortOrder(Qt::AscendingOrder)
{
@@ -217,11 +213,9 @@ namespace BlackGui
protected:
std::unique_ptr<IModelFilter<ContainerType> > m_filter; //!< Used filter
/*!
* Constructor
* \param translationContext I18N context
* \param parent
*/
//! Constructor
//! \param translationContext I18N context
//! \param parent
CListModelBase(const QString &translationContext, QObject *parent = nullptr)
: CListModelBaseNonTemplate(translationContext, parent)
{ }

View File

@@ -14,12 +14,8 @@ namespace BlackGui
{
namespace Models
{
/*
* Constructor
*/
CServerListModel::CServerListModel(QObject *parent) :
CListModelBase("ViewServerList", parent)
CListModelBase("ModelServerList", parent)
{
this->m_columns.addColumn(CColumn::standardString("name", CServer::IndexName));
this->m_columns.addColumn(CColumn::standardString("description", CServer::IndexDescription));
@@ -29,12 +25,12 @@ namespace BlackGui
this->m_columns.addColumn(CColumn::standardString("userid", { CServer::IndexUser, CUser::IndexId}));
// force strings for translation in resource files
(void)QT_TRANSLATE_NOOP("ViewServerList", "name");
(void)QT_TRANSLATE_NOOP("ViewServerList", "description");
(void)QT_TRANSLATE_NOOP("ViewServerList", "address");
(void)QT_TRANSLATE_NOOP("ViewServerList", "port");
(void)QT_TRANSLATE_NOOP("ViewServerList", "realname");
(void)QT_TRANSLATE_NOOP("ViewServerList", "userid");
(void)QT_TRANSLATE_NOOP("ModelServerList", "name");
(void)QT_TRANSLATE_NOOP("ModelServerList", "description");
(void)QT_TRANSLATE_NOOP("ModelServerList", "address");
(void)QT_TRANSLATE_NOOP("ModelServerList", "port");
(void)QT_TRANSLATE_NOOP("ModelServerList", "realname");
(void)QT_TRANSLATE_NOOP("ModelServerList", "userid");
}
} // class

View File

@@ -24,7 +24,6 @@ namespace BlackGui
//! Server list model
class BLACKGUI_EXPORT CServerListModel : public CListModelBase<BlackMisc::Network::CServer, BlackMisc::Network::CServerList>
{
public:
//! Constructor
@@ -33,6 +32,6 @@ namespace BlackGui
//! Destructor
virtual ~CServerListModel() {}
};
}
}
} // ns
} // ns
#endif // guard

View File

@@ -21,9 +21,6 @@ namespace BlackGui
{
namespace Models
{
/*
* Constructor
*/
CSimulatedAircraftListModel::CSimulatedAircraftListModel(QObject *parent) : CListModelBase("ModelSimulatedAircraftList", parent)
{
this->setAircraftMode(InfoMode);

View File

@@ -18,9 +18,6 @@ namespace BlackGui
{
namespace Models
{
/*
* Constructor
*/
CTextMessageListModel::CTextMessageListModel(TextMessageMode mode, QObject *parent) :
CListModelBase("ModelTextMessageList", parent), m_textMessageMode(NotSet)
{

View File

@@ -23,7 +23,7 @@ namespace BlackGui
{
namespace Models
{
//! ATC list model
//! Text message list model
class BLACKGUI_EXPORT CTextMessageListModel : public CListModelBase<BlackMisc::Network::CTextMessage, BlackMisc::Network::CTextMessageList>
{
@@ -51,6 +51,6 @@ namespace BlackGui
private:
TextMessageMode m_textMessageMode = NotSet;
};
}
}
} // ns
} // ns
#endif // guard