From dbfedbdeaebfa11732b529a6ff3ceec3f18bdcc8 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 20 May 2015 11:18:46 +0200 Subject: [PATCH] + fix a few minor issues in DlgWorkbenchesImp and QListWidgetCustom --- src/Gui/DlgWorkbenchesImp.cpp | 16 +++++++--------- src/Gui/DlgWorkbenchesImp.h | 2 +- src/Gui/QListWidgetCustom.cpp | 2 ++ src/Gui/QListWidgetCustom.h | 6 ++++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/Gui/DlgWorkbenchesImp.cpp b/src/Gui/DlgWorkbenchesImp.cpp index c3cf2649098e..d6dca30d242d 100644 --- a/src/Gui/DlgWorkbenchesImp.cpp +++ b/src/Gui/DlgWorkbenchesImp.cpp @@ -42,7 +42,7 @@ using namespace Gui::Dialog; const QString DlgWorkbenchesImp::all_workbenches = QString::fromAscii("ALL"); -/* TRANSLATOR Gui::Dialog::DlgWorkbenches */ +/* TRANSLATOR Gui::Dialog::DlgWorkbenchesImp */ DlgWorkbenchesImp::DlgWorkbenchesImp(QWidget* parent) : CustomizeActionPage(parent) @@ -59,16 +59,14 @@ DlgWorkbenchesImp::DlgWorkbenchesImp(QWidget* parent) for (QStringList::Iterator it = enabled_wbs_list.begin(); it != enabled_wbs_list.end(); ++it) { if (workbenches.contains(*it)) { - QString wb = *it; - add_workbench(lw_enabled_workbenches, wb); + add_workbench(lw_enabled_workbenches, *it); } else { - qDebug() << "Ignoring unknown " << it->toLatin1() << " workbench found in user preferences."; + qDebug() << "Ignoring unknown" << *it << "workbench found in user preferences."; } } for (QStringList::Iterator it = workbenches.begin(); it != workbenches.end(); ++it) { if (!enabled_wbs_list.contains(*it)){ - QString wb = *it; - add_workbench(lw_disabled_workbenches, wb); + add_workbench(lw_disabled_workbenches, *it); } } lw_enabled_workbenches->setCurrentRow(0); @@ -90,7 +88,7 @@ void DlgWorkbenchesImp::set_lw_properties(QListWidgetCustom *lw) lw->setDefaultDropAction(Qt::MoveAction); } -void DlgWorkbenchesImp::add_workbench(QListWidgetCustom *lw, QString it) +void DlgWorkbenchesImp::add_workbench(QListWidgetCustom *lw, const QString& it) { QPixmap px = Application::Instance->workbenchIcon(it); QString mt = Application::Instance->workbenchMenuText(it); @@ -139,7 +137,7 @@ void DlgWorkbenchesImp::on_add_to_enabled_workbenches_btn_clicked() { QListWidgetItem* ci = lw_disabled_workbenches->currentItem(); if (ci) { - move_workbench(lw_enabled_workbenches, ci); + move_workbench(lw_enabled_workbenches, ci); } } @@ -147,7 +145,7 @@ void DlgWorkbenchesImp::on_remove_from_enabled_workbenches_btn_clicked() { QListWidgetItem* ci = lw_enabled_workbenches->currentItem(); if (ci) { - move_workbench(lw_disabled_workbenches, ci); + move_workbench(lw_disabled_workbenches, ci); } } diff --git a/src/Gui/DlgWorkbenchesImp.h b/src/Gui/DlgWorkbenchesImp.h index 3f262af3dd33..7cbf1277c67a 100644 --- a/src/Gui/DlgWorkbenchesImp.h +++ b/src/Gui/DlgWorkbenchesImp.h @@ -57,7 +57,7 @@ protected Q_SLOTS: private: void set_lw_properties(QListWidgetCustom *lw); - void add_workbench(QListWidgetCustom *lw, QString it); + void add_workbench(QListWidgetCustom *lw, const QString& it); void move_workbench(QListWidgetCustom *lwc_dest, QListWidgetItem *wi); void save_enabled_workbenches(); diff --git a/src/Gui/QListWidgetCustom.cpp b/src/Gui/QListWidgetCustom.cpp index 0c2754e5a676..316fdf6290b8 100644 --- a/src/Gui/QListWidgetCustom.cpp +++ b/src/Gui/QListWidgetCustom.cpp @@ -60,3 +60,5 @@ void QListWidgetCustom::dragMoveEvent(QDragMoveEvent *e) e->ignore(); } } + +#include "moc_QListWidgetCustom.cpp" diff --git a/src/Gui/QListWidgetCustom.h b/src/Gui/QListWidgetCustom.h index 6e8a4029d16a..8444f86f6c87 100644 --- a/src/Gui/QListWidgetCustom.h +++ b/src/Gui/QListWidgetCustom.h @@ -28,11 +28,13 @@ #include #include -class QListWidgetCustom : public QListWidget { +class QListWidgetCustom : public QListWidget +{ + Q_OBJECT public: QListWidgetCustom (QWidget *parent); - ~QListWidgetCustom (); + virtual ~QListWidgetCustom (); protected: void dragMoveEvent(QDragMoveEvent *e);