From 7e3233fc1946e66ca11564ddd285cb7ddfe4f737 Mon Sep 17 00:00:00 2001
From: Joseph Mirabel <jmirabel@laas.fr>
Date: Tue, 13 Feb 2018 13:12:08 +0100
Subject: [PATCH] Fix compilation warning.
---
.../gepetto/gui/dialog/pluginmanagerdialog.hh | 8 +++----
src/gui/dialog/pluginmanagerdialog.cc | 22 +++++++++----------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/gepetto/gui/dialog/pluginmanagerdialog.hh b/include/gepetto/gui/dialog/pluginmanagerdialog.hh
index 9a2e250..8779082 100644
--- a/include/gepetto/gui/dialog/pluginmanagerdialog.hh
+++ b/include/gepetto/gui/dialog/pluginmanagerdialog.hh
@@ -71,10 +71,10 @@ namespace gepetto {
void unload (const QString& name);
private:
- static const std::size_t NAME;
- static const std::size_t FILE;
- static const std::size_t FULLPATH;
- static const std::size_t VERSION;
+ static const int P_NAME;
+ static const int P_FILE;
+ static const int P_FULLPATH;
+ static const int P_VERSION;
void updateList ();
diff --git a/src/gui/dialog/pluginmanagerdialog.cc b/src/gui/dialog/pluginmanagerdialog.cc
index 914f77c..16a776c 100644
--- a/src/gui/dialog/pluginmanagerdialog.cc
+++ b/src/gui/dialog/pluginmanagerdialog.cc
@@ -106,7 +106,7 @@ namespace gepetto {
updateList ();
- ui_->pluginList->setColumnHidden(FILE, true);
+ ui_->pluginList->setColumnHidden(P_FILE, true);
connect(ui_->pluginList, SIGNAL (currentItemChanged (QTableWidgetItem*,QTableWidgetItem*)),
this, SLOT (onItemChanged(QTableWidgetItem*,QTableWidgetItem*)));
@@ -123,7 +123,7 @@ namespace gepetto {
QTableWidgetItem* /*previous*/)
{
if (!current) return;
- QString key = ui_->pluginList->item(current->row(), FILE)->text();
+ QString key = ui_->pluginList->item(current->row(), P_FILE)->text();
const QPluginLoader* pl = pm_->plugins()[key];
ui_->pluginMessage->setText(pm_->status (pl));
}
@@ -132,7 +132,7 @@ namespace gepetto {
{
int row = ui_->pluginList->rowAt(pos.y());
if (row == -1) return;
- QString key = ui_->pluginList->item(row, FILE)->text();
+ QString key = ui_->pluginList->item(row, P_FILE)->text();
QMenu contextMenu (tr("Plugin"), ui_->pluginList);
if (pm_->plugins()[key]->isLoaded()) {
QAction* unload = contextMenu.addAction("&Unload", &signalMapper_, SLOT(map()));
@@ -159,10 +159,10 @@ namespace gepetto {
updateList ();
}
- const std::size_t PluginManagerDialog::NAME = 0;
- const std::size_t PluginManagerDialog::FILE = 1;
- const std::size_t PluginManagerDialog::VERSION = 2;
- const std::size_t PluginManagerDialog::FULLPATH = 3;
+ const int PluginManagerDialog::P_NAME = 0;
+ const int PluginManagerDialog::P_FILE = 1;
+ const int PluginManagerDialog::P_VERSION = 2;
+ const int PluginManagerDialog::P_FULLPATH = 3;
void PluginManagerDialog::updateList()
{
@@ -182,10 +182,10 @@ namespace gepetto {
QIcon icon = pm_->icon (p.value());
ui_->pluginList->insertRow(ui_->pluginList->rowCount());
- ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, NAME, new QTableWidgetItem (icon, name));
- ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, FILE, new QTableWidgetItem (filename));
- ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, VERSION, new QTableWidgetItem (version));
- ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, FULLPATH, new QTableWidgetItem (fullpath));
+ ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, P_NAME, new QTableWidgetItem (icon, name));
+ ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, P_FILE, new QTableWidgetItem (filename));
+ ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, P_VERSION, new QTableWidgetItem (version));
+ ui_->pluginList->setItem(ui_->pluginList->rowCount() - 1, P_FULLPATH, new QTableWidgetItem (fullpath));
}
ui_->pluginList->resizeColumnsToContents();
}
--
GitLab