[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kphotoalbum] Settings: Removed passing variables with the currentCategoryNameChanged signal,
From:       Tobias Leupold <tobias.leupold () web ! de>
Date:       2015-12-17 20:41:43
Message-ID: E1a9fMt-0007wN-FE () scm ! kde ! org
[Download RAW message or body]

Git commit ec4650ff7bf716cf6262ebf7b3473991bf829582 by Tobias Leupold.
Committed on 17/12/2015 at 20:40.
Pushed by tleupold into branch 'master'.

Removed passing variables with the currentCategoryNameChanged signal, as it's only \
connected to the tag groups page and the variables are not used there. Probably some \
legacy from the category and tag groups page rewrite.

M  +2    -2    Settings/CategoryPage.cpp
M  +1    -1    Settings/CategoryPage.h
M  +2    -2    Settings/SettingsDialog.cpp
M  +1    -1    Settings/TagGroupsPage.cpp
M  +1    -1    Settings/TagGroupsPage.h

http://commits.kde.org/kphotoalbum/ec4650ff7bf716cf6262ebf7b3473991bf829582

diff --git a/Settings/CategoryPage.cpp b/Settings/CategoryPage.cpp
index e960a40..5b3293c 100644
--- a/Settings/CategoryPage.cpp
+++ b/Settings/CategoryPage.cpp
@@ -290,7 +290,7 @@ void Settings::CategoryPage::categoryNameChanged(QListWidgetItem* \
item)  item->setText(newCategoryName);
     m_categoriesListWidget->blockSignals(false);
 
-    emit currentCategoryNameChanged(m_currentCategory->originalName(), \
newCategoryName); +    emit currentCategoryNameChanged();
     m_untaggedBox->categoryRenamed(m_categoryNameBeforeEdit, newCategoryName);
     m_currentCategory->setLabel(newCategoryName);
     editCategory(m_currentCategory);
@@ -374,7 +374,7 @@ void Settings::CategoryPage::newCategory()
                                                    DB::Category::TreeView,
                                                    64,
                                                    m_categoriesListWidget);
-    emit currentCategoryNameChanged(QString(), checkedCategory);
+    emit currentCategoryNameChanged();
     m_currentCategory->setLabel(checkedCategory);
     m_categoriesListWidget->blockSignals(false);
 
diff --git a/Settings/CategoryPage.h b/Settings/CategoryPage.h
index f4bd924..1c34d4f 100644
--- a/Settings/CategoryPage.h
+++ b/Settings/CategoryPage.h
@@ -70,7 +70,7 @@ public:
     void resetInterface();
 
 signals:
-    void currentCategoryNameChanged(const QString& oldName, const QString& newName);
+    void currentCategoryNameChanged();
 
 protected slots:
     void resetCategoryLabel();
diff --git a/Settings/SettingsDialog.cpp b/Settings/SettingsDialog.cpp
index 1cab7ec..8ec9ce9 100644
--- a/Settings/SettingsDialog.cpp
+++ b/Settings/SettingsDialog.cpp
@@ -111,8 +111,8 @@ Settings::SettingsDialog::SettingsDialog( QWidget* parent)
     setButtons( KDialog::Ok | KDialog::Cancel | KDialog::Apply );
     setCaption( i18n( "Settings" ) );
 
-    connect(m_categoryPage, SIGNAL(currentCategoryNameChanged(QString,QString)),
-            m_tagGroupsPage, SLOT(categoryRenamed(QString,QString)));
+    connect(m_categoryPage, SIGNAL(currentCategoryNameChanged()),
+            m_tagGroupsPage, SLOT(categoryRenamed()));
     connect(this, SIGNAL(currentPageChanged(KPageWidgetItem*,KPageWidgetItem*)),
             m_tagGroupsPage, SLOT(slotPageChange()));
 #ifdef HAVE_KFACE
diff --git a/Settings/TagGroupsPage.cpp b/Settings/TagGroupsPage.cpp
index d90878a..fd465e2 100644
--- a/Settings/TagGroupsPage.cpp
+++ b/Settings/TagGroupsPage.cpp
@@ -674,7 +674,7 @@ void Settings::TagGroupsPage::loadSettings()
     updateCategoryTree();
 }
 
-void Settings::TagGroupsPage::categoryRenamed(const QString&, const QString&)
+void Settings::TagGroupsPage::categoryRenamed()
 {
     m_categoryTreeWidget->setEnabled(false);
     m_membersListWidget->setEnabled(false);
diff --git a/Settings/TagGroupsPage.h b/Settings/TagGroupsPage.h
index 132922c..0be8544 100644
--- a/Settings/TagGroupsPage.h
+++ b/Settings/TagGroupsPage.h
@@ -60,7 +60,7 @@ public:
     void processDrop(QTreeWidgetItem* draggedItem, QTreeWidgetItem* targetItem);
 
 public slots:
-    void categoryRenamed(const QString& oldName, const QString& newName);
+    void categoryRenamed();
     void slotPageChange();
     void discardChanges();
 


[prev in list] [next in list] [prev in thread] [next in thread]