Rename EditEntryWidgetIcons to EditWidgetIcons.

This commit is contained in:
Florian Geyer 2012-05-15 12:31:49 +02:00
parent 7e1f7a8729
commit 6f4e855b02
4 changed files with 8 additions and 8 deletions

View File

@ -119,11 +119,11 @@ set(keepassx_FORMS
gui/DatabaseOpenDialog.ui gui/DatabaseOpenDialog.ui
gui/DatabaseSettingsWidget.ui gui/DatabaseSettingsWidget.ui
gui/EditEntryWidgetAdvanced.ui gui/EditEntryWidgetAdvanced.ui
gui/EditEntryWidgetIcons.ui
gui/EditEntryWidgetMain.ui gui/EditEntryWidgetMain.ui
gui/EditEntryWidgetNotes.ui gui/EditEntryWidgetNotes.ui
gui/EditGroupWidgetMain.ui gui/EditGroupWidgetMain.ui
gui/EditWidget.ui gui/EditWidget.ui
gui/EditWidgetIcons.ui
gui/MainWindow.ui gui/MainWindow.ui
) )

View File

@ -16,11 +16,11 @@
*/ */
#include "EditEntryWidget.h" #include "EditEntryWidget.h"
#include "ui_EditWidget.h"
#include "ui_EditEntryWidgetAdvanced.h" #include "ui_EditEntryWidgetAdvanced.h"
#include "ui_EditEntryWidgetMain.h" #include "ui_EditEntryWidgetMain.h"
#include "ui_EditEntryWidgetNotes.h" #include "ui_EditEntryWidgetNotes.h"
#include "ui_EditEntryWidgetIcons.h" #include "ui_EditWidget.h"
#include "ui_EditWidgetIcons.h"
#include <QtGui/QDesktopServices> #include <QtGui/QDesktopServices>
#include <QtGui/QStackedLayout> #include <QtGui/QStackedLayout>
@ -41,7 +41,7 @@ EditEntryWidget::EditEntryWidget(QWidget* parent)
, m_mainUi(new Ui::EditEntryWidgetMain()) , m_mainUi(new Ui::EditEntryWidgetMain())
, m_notesUi(new Ui::EditEntryWidgetNotes()) , m_notesUi(new Ui::EditEntryWidgetNotes())
, m_advancedUi(new Ui::EditEntryWidgetAdvanced()) , m_advancedUi(new Ui::EditEntryWidgetAdvanced())
, m_iconsUi(new Ui::EditEntryWidgetIcons()) , m_iconsUi(new Ui::EditWidgetIcons())
, m_mainWidget(new QWidget(this)) , m_mainWidget(new QWidget(this))
, m_notesWidget(new QWidget(this)) , m_notesWidget(new QWidget(this))
, m_advancedWidget(new QWidget(this)) , m_advancedWidget(new QWidget(this))

View File

@ -38,8 +38,8 @@ namespace Ui {
class EditEntryWidgetAdvanced; class EditEntryWidgetAdvanced;
class EditEntryWidgetMain; class EditEntryWidgetMain;
class EditEntryWidgetNotes; class EditEntryWidgetNotes;
class EditEntryWidgetIcons;
class EditWidget; class EditWidget;
class EditWidgetIcons;
} }
class EditEntryWidget : public EditWidget class EditEntryWidget : public EditWidget
@ -87,7 +87,7 @@ private:
const QScopedPointer<Ui::EditEntryWidgetMain> m_mainUi; const QScopedPointer<Ui::EditEntryWidgetMain> m_mainUi;
const QScopedPointer<Ui::EditEntryWidgetNotes> m_notesUi; const QScopedPointer<Ui::EditEntryWidgetNotes> m_notesUi;
const QScopedPointer<Ui::EditEntryWidgetAdvanced> m_advancedUi; 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_mainWidget;
QWidget* const m_notesWidget; QWidget* const m_notesWidget;
QWidget* const m_advancedWidget; QWidget* const m_advancedWidget;

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>EditEntryWidgetIcons</class> <class>EditWidgetIcons</class>
<widget class="QWidget" name="EditEntryWidgetIcons"> <widget class="QWidget" name="EditWidgetIcons">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>