From 6f4e855b029e59ff91cdae16e692f7a03c497b73 Mon Sep 17 00:00:00 2001
From: Florian Geyer <blueice@fobos.de>
Date: Tue, 15 May 2012 12:31:49 +0200
Subject: [PATCH] Rename EditEntryWidgetIcons to EditWidgetIcons.

---
 src/CMakeLists.txt                                      | 2 +-
 src/gui/EditEntryWidget.cpp                             | 6 +++---
 src/gui/EditEntryWidget.h                               | 4 ++--
 src/gui/{EditEntryWidgetIcons.ui => EditWidgetIcons.ui} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/gui/{EditEntryWidgetIcons.ui => EditWidgetIcons.ui} (96%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index db566483e..5cb6d7b83 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,11 +119,11 @@ set(keepassx_FORMS
     gui/DatabaseOpenDialog.ui
     gui/DatabaseSettingsWidget.ui
     gui/EditEntryWidgetAdvanced.ui
-    gui/EditEntryWidgetIcons.ui
     gui/EditEntryWidgetMain.ui
     gui/EditEntryWidgetNotes.ui
     gui/EditGroupWidgetMain.ui
     gui/EditWidget.ui
+    gui/EditWidgetIcons.ui
     gui/MainWindow.ui
 )
 
diff --git a/src/gui/EditEntryWidget.cpp b/src/gui/EditEntryWidget.cpp
index 9ce203f58..453507993 100644
--- a/src/gui/EditEntryWidget.cpp
+++ b/src/gui/EditEntryWidget.cpp
@@ -16,11 +16,11 @@
  */
 
 #include "EditEntryWidget.h"
-#include "ui_EditWidget.h"
 #include "ui_EditEntryWidgetAdvanced.h"
 #include "ui_EditEntryWidgetMain.h"
 #include "ui_EditEntryWidgetNotes.h"
-#include "ui_EditEntryWidgetIcons.h"
+#include "ui_EditWidget.h"
+#include "ui_EditWidgetIcons.h"
 
 #include <QtGui/QDesktopServices>
 #include <QtGui/QStackedLayout>
@@ -41,7 +41,7 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
     , m_mainUi(new Ui::EditEntryWidgetMain())
     , m_notesUi(new Ui::EditEntryWidgetNotes())
     , m_advancedUi(new Ui::EditEntryWidgetAdvanced())
-    , m_iconsUi(new Ui::EditEntryWidgetIcons())
+    , m_iconsUi(new Ui::EditWidgetIcons())
     , m_mainWidget(new QWidget(this))
     , m_notesWidget(new QWidget(this))
     , m_advancedWidget(new QWidget(this))
diff --git a/src/gui/EditEntryWidget.h b/src/gui/EditEntryWidget.h
index 01dfa069e..148b84e0a 100644
--- a/src/gui/EditEntryWidget.h
+++ b/src/gui/EditEntryWidget.h
@@ -38,8 +38,8 @@ namespace Ui {
     class EditEntryWidgetAdvanced;
     class EditEntryWidgetMain;
     class EditEntryWidgetNotes;
-    class EditEntryWidgetIcons;
     class EditWidget;
+    class EditWidgetIcons;
 }
 
 class EditEntryWidget : public EditWidget
@@ -87,7 +87,7 @@ private:
     const QScopedPointer<Ui::EditEntryWidgetMain> m_mainUi;
     const QScopedPointer<Ui::EditEntryWidgetNotes> m_notesUi;
     const QScopedPointer<Ui::EditEntryWidgetAdvanced> m_advancedUi;
-    const QScopedPointer<Ui::EditEntryWidgetIcons> m_iconsUi;
+    const QScopedPointer<Ui::EditWidgetIcons> m_iconsUi;
     QWidget* const m_mainWidget;
     QWidget* const m_notesWidget;
     QWidget* const m_advancedWidget;
diff --git a/src/gui/EditEntryWidgetIcons.ui b/src/gui/EditWidgetIcons.ui
similarity index 96%
rename from src/gui/EditEntryWidgetIcons.ui
rename to src/gui/EditWidgetIcons.ui
index 751c973d2..4a0d39fc2 100644
--- a/src/gui/EditEntryWidgetIcons.ui
+++ b/src/gui/EditWidgetIcons.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>EditEntryWidgetIcons</class>
- <widget class="QWidget" name="EditEntryWidgetIcons">
+ <class>EditWidgetIcons</class>
+ <widget class="QWidget" name="EditWidgetIcons">
   <property name="geometry">
    <rect>
     <x>0</x>