summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Fischer <[email protected]>2014-12-30 10:36:00 +0100
committerAndi Fischer <[email protected]>2014-12-30 10:36:00 +0100
commit2878676a6b07ed23b9673cf7858ca522dfb620bc (patch)
tree9af7fe3a9edad7b54ec152706756a3b5660be550
parent2c9cdf6c0c70abd908dffba92d704a7e439b6f00 (diff)
Conflict resolution after merge with master.
-rw-r--r--umbrello/umllistview.cpp4
-rw-r--r--umbrello/umlrole.cpp2
2 files changed, 2 insertions, 4 deletions
diff --git a/umbrello/umllistview.cpp b/umbrello/umllistview.cpp
index af87ff6..c09ec83 100644
--- a/umbrello/umllistview.cpp
+++ b/umbrello/umllistview.cpp
@@ -61,7 +61,7 @@
// kde includes
#include <KLocalizedString>
-#include <kmessagebox.h>
+#include <KMessageBox>
// qt includes
#include <QApplication>
@@ -319,9 +319,7 @@ void UMLListView::slotMenuSelection(QAction* action, const QPoint &position)
return;
}
UMLListViewItem::ListViewType lvt = currItem->type();
- UMLObject::ObjectType umlType = UMLObject::ot_UMLObject;
ListPopupMenu::MenuType menuType = ListPopupMenu::typeFromAction(action);
- QString name;
switch (menuType) {
case ListPopupMenu::mt_Class:
diff --git a/umbrello/umlrole.cpp b/umbrello/umlrole.cpp
index f79e20b..1d46a3e 100644
--- a/umbrello/umlrole.cpp
+++ b/umbrello/umlrole.cpp
@@ -224,7 +224,7 @@ bool UMLRole::showPropertiesDialog(QWidget *parent)
{
QPointer<UMLRoleDialog> dlg = new UMLRoleDialog(parent, this);
bool modified = false;
- if (dlg->exec() == KDialog::Accepted) {
+ if (dlg->exec() == QDialog::Accepted) {
modified = true;
}
delete dlg;