diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index b5941722971b2961dbe671f22fce59e1917a6e81..cb4bd0c867c381517b3bf29058c75c647abf3e0a 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -315,8 +315,7 @@ void ResourceEditorW::openFile(const QString &fileName) void ResourceEditorW::onRefresh() { - if (!m_resourceEditor.isNull()) - m_resourceEditor.data()->refresh(); + m_resourceEditor->refresh(); } void ResourceEditorW::renameCurrentFile() @@ -326,14 +325,12 @@ void ResourceEditorW::renameCurrentFile() void ResourceEditorW::onUndo() { - if (!m_resourceEditor.isNull()) - m_resourceEditor.data()->onUndo(); + m_resourceEditor->onUndo(); } void ResourceEditorW::onRedo() { - if (!m_resourceEditor.isNull()) - m_resourceEditor.data()->onRedo(); + m_resourceEditor->onRedo(); } } // namespace Internal diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 38b47b76dd8d73cbd6992012e18c3dee8643d488..1342d09fc305ed4eb4ff0b2ce55786f9cda4f940 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -34,8 +34,6 @@ #include <coreplugin/idocument.h> #include <coreplugin/editormanager/ieditor.h> -#include <QPointer> - QT_BEGIN_NAMESPACE class QMenu; class QToolBar; @@ -113,7 +111,7 @@ private: const QString m_fileFilter; QString m_displayName; QString m_suggestedName; - QPointer<QrcEditor> m_resourceEditor; + QrcEditor *m_resourceEditor; ResourceEditorDocument *m_resourceDocument; ResourceEditorPlugin *m_plugin; bool m_shouldAutoSave;