From b45437d5026cae101dc9f4b88da36749f3362e0d Mon Sep 17 00:00:00 2001
From: Amir Pakdel <pakdel@gmail.com>
Date: Tue, 12 May 2015 15:54:39 -0400
Subject: [PATCH] Refactored DatabaseWidget::currentEntryHas*()

---
 src/gui/DatabaseWidget.cpp | 10 +++++-----
 src/gui/DatabaseWidget.h   | 10 +++++-----
 src/gui/MainWindow.cpp     | 12 ++++++------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index c0fe81f32..6729a06e5 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -907,7 +907,7 @@ bool DatabaseWidget::isGroupSelected() const
     return m_groupView->currentGroup() != Q_NULLPTR;
 }
 
-bool DatabaseWidget::hasTitle()
+bool DatabaseWidget::currentEntryHasTitle()
 {
     Entry* currentEntry = m_entryView->currentEntry();
     if (!currentEntry) {
@@ -917,7 +917,7 @@ bool DatabaseWidget::hasTitle()
     return !currentEntry->title().isEmpty();
 }
 
-bool DatabaseWidget::hasUsername()
+bool DatabaseWidget::currentEntryHasUsername()
 {
     Entry* currentEntry = m_entryView->currentEntry();
     if (!currentEntry) {
@@ -927,7 +927,7 @@ bool DatabaseWidget::hasUsername()
     return !currentEntry->username().isEmpty();
 }
 
-bool DatabaseWidget::hasPassword()
+bool DatabaseWidget::currentEntryHasPassword()
 {
     Entry* currentEntry = m_entryView->currentEntry();
     if (!currentEntry) {
@@ -937,7 +937,7 @@ bool DatabaseWidget::hasPassword()
     return !currentEntry->password().isEmpty();
 }
 
-bool DatabaseWidget::hasUrl()
+bool DatabaseWidget::currentEntryHasUrl()
 {
     Entry* currentEntry = m_entryView->currentEntry();
     if (!currentEntry) {
@@ -947,7 +947,7 @@ bool DatabaseWidget::hasUrl()
     return !currentEntry->url().isEmpty();
 }
 
-bool DatabaseWidget::hasNotes()
+bool DatabaseWidget::currentEntryHasNotes()
 {
     Entry* currentEntry = m_entryView->currentEntry();
     if (!currentEntry) {
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 7e565de03..1ba3dd1f5 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -80,11 +80,11 @@ public:
     QList<int> entryHeaderViewSizes() const;
     void setEntryViewHeaderSizes(const QList<int>& sizes);
     void clearAllWidgets();
-    bool hasTitle();
-    bool hasUsername();
-    bool hasPassword();
-    bool hasUrl();
-    bool hasNotes();
+    bool currentEntryHasTitle();
+    bool currentEntryHasUsername();
+    bool currentEntryHasPassword();
+    bool currentEntryHasUrl();
+    bool currentEntryHasNotes();
 
 Q_SIGNALS:
     void closeRequest();
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index 5f3d1b365..ce814ae98 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -286,14 +286,14 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
             m_ui->actionEntryClone->setEnabled(singleEntrySelected && !inSearch);
             m_ui->actionEntryEdit->setEnabled(singleEntrySelected);
             m_ui->actionEntryDelete->setEnabled(entriesSelected);
-            m_ui->actionEntryCopyTitle->setEnabled(singleEntrySelected && dbWidget->hasTitle());
-            m_ui->actionEntryCopyUsername->setEnabled(singleEntrySelected && dbWidget->hasUsername());
-            m_ui->actionEntryCopyPassword->setEnabled(singleEntrySelected && dbWidget->hasPassword());
-            m_ui->actionEntryCopyURL->setEnabled(singleEntrySelected && dbWidget->hasUrl());
-            m_ui->actionEntryCopyNotes->setEnabled(singleEntrySelected && dbWidget->hasUrl());
+            m_ui->actionEntryCopyTitle->setEnabled(singleEntrySelected && dbWidget->currentEntryHasTitle());
+            m_ui->actionEntryCopyUsername->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUsername());
+            m_ui->actionEntryCopyPassword->setEnabled(singleEntrySelected && dbWidget->currentEntryHasPassword());
+            m_ui->actionEntryCopyURL->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl());
+            m_ui->actionEntryCopyNotes->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl());
             m_ui->menuEntryCopyAttribute->setEnabled(singleEntrySelected);
             m_ui->actionEntryAutoType->setEnabled(singleEntrySelected);
-            m_ui->actionEntryOpenUrl->setEnabled(singleEntrySelected && dbWidget->hasUrl());
+            m_ui->actionEntryOpenUrl->setEnabled(singleEntrySelected && dbWidget->currentEntryHasUrl());
             m_ui->actionGroupNew->setEnabled(groupSelected);
             m_ui->actionGroupEdit->setEnabled(groupSelected);
             m_ui->actionGroupDelete->setEnabled(groupSelected && dbWidget->canDeleteCurrentGroup());