From a84b551ab029d69a7c9ca015584c2e94a26ce9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20G=C3=A2teau?= <agateau@kde.org>
Date: Tue, 8 Jul 2014 15:26:55 +0200
Subject: [PATCH] Rename CategoryItem to TextTreeItem

---
 src/calamares/CMakeLists.txt                           |  2 +-
 src/calamares/progresstree/ProgressTreeModel.cpp       |  6 +++---
 .../{CategoryItem.cpp => TextTreeItem.cpp}             |  6 +++---
 .../progresstree/{CategoryItem.h => TextTreeItem.h}    | 10 +++++-----
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename src/calamares/progresstree/{CategoryItem.cpp => TextTreeItem.cpp} (90%)
 rename src/calamares/progresstree/{CategoryItem.h => TextTreeItem.h} (83%)

diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index 4d11469de..b618c6418 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -11,11 +11,11 @@ set( calamaresSources
     CalamaresApplication.cpp
     CalamaresWindow.cpp
 
-    progresstree/CategoryItem.cpp
     progresstree/ProgressTreeDelegate.cpp
     progresstree/ProgressTreeItem.cpp
     progresstree/ProgressTreeModel.cpp
     progresstree/ProgressTreeView.cpp
+    progresstree/TextTreeItem.cpp
     progresstree/ViewStepItem.cpp
 )
 
diff --git a/src/calamares/progresstree/ProgressTreeModel.cpp b/src/calamares/progresstree/ProgressTreeModel.cpp
index bc62d1339..bece777bb 100644
--- a/src/calamares/progresstree/ProgressTreeModel.cpp
+++ b/src/calamares/progresstree/ProgressTreeModel.cpp
@@ -18,7 +18,7 @@
 
 #include "ProgressTreeModel.h"
 
-#include "progresstree/CategoryItem.h"
+#include "progresstree/TextTreeItem.h"
 #include "progresstree/ViewStepItem.h"
 #include "ViewManager.h"
 
@@ -133,7 +133,7 @@ ProgressTreeModel::setupModelData()
     m_rootItem = new ProgressTreeRoot();
     const Calamares::ViewManager* vm = Calamares::ViewManager::instance();
 
-    CategoryItem* prepare = new CategoryItem( tr( "Prepare" ), m_rootItem );
+    TextTreeItem* prepare = new TextTreeItem( tr( "Prepare" ), m_rootItem );
     m_rootItem->appendChild( prepare );
 
     foreach ( const Calamares::ViewStep* step, vm->prepareSteps() )
@@ -142,7 +142,7 @@ ProgressTreeModel::setupModelData()
     }
 
     m_rootItem->appendChild( new ViewStepItem( vm->installationStep(), m_rootItem ) );
-    m_rootItem->appendChild( new CategoryItem( tr( "Finish" ), m_rootItem ) );
+    m_rootItem->appendChild( new TextTreeItem( tr( "Finish" ), m_rootItem ) );
 }
 
 
diff --git a/src/calamares/progresstree/CategoryItem.cpp b/src/calamares/progresstree/TextTreeItem.cpp
similarity index 90%
rename from src/calamares/progresstree/CategoryItem.cpp
rename to src/calamares/progresstree/TextTreeItem.cpp
index 396849815..8c6f8d692 100644
--- a/src/calamares/progresstree/CategoryItem.cpp
+++ b/src/calamares/progresstree/TextTreeItem.cpp
@@ -16,18 +16,18 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "CategoryItem.h"
+#include "TextTreeItem.h"
 
 #include "ProgressTreeModel.h"
 
-CategoryItem::CategoryItem( const QString& text, ProgressTreeItem* parent )
+TextTreeItem::TextTreeItem( const QString& text, ProgressTreeItem* parent )
     : ProgressTreeItem( parent )
     , m_text( text )
 {}
 
 
 QVariant
-CategoryItem::data( int role ) const
+TextTreeItem::data( int role ) const
 {
     if ( role == ProgressTreeModel::ProgressTreeItemTypeRole )
         return ProgressTreeModel::Category;
diff --git a/src/calamares/progresstree/CategoryItem.h b/src/calamares/progresstree/TextTreeItem.h
similarity index 83%
rename from src/calamares/progresstree/CategoryItem.h
rename to src/calamares/progresstree/TextTreeItem.h
index d15e55d02..ba69b34b2 100644
--- a/src/calamares/progresstree/CategoryItem.h
+++ b/src/calamares/progresstree/TextTreeItem.h
@@ -16,16 +16,16 @@
  *   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CATEGORYITEM_H
-#define CATEGORYITEM_H
+#ifndef TEXTTREEITEM_H
+#define TEXTTREEITEM_H
 
 #include "ProgressTreeItem.h"
 
 
-class CategoryItem : public ProgressTreeItem
+class TextTreeItem : public ProgressTreeItem
 {
 public:
-    explicit CategoryItem( const QString& text, ProgressTreeItem* parent = nullptr );
+    explicit TextTreeItem( const QString& text, ProgressTreeItem* parent = nullptr );
 
     virtual QVariant data( int role ) const override;
 
@@ -33,4 +33,4 @@ private:
     QString m_text;
 };
 
-#endif // CATEGORYITEM_H
+#endif // TEXTTREEITEM_H