feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use plain QrcEditor* instead of QPointer

Browse Source 
Change-Id: Ie8529d0daf1573130212be7c0acfd42f7627a092
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Konstantin Tokarev
2012-07-20 19:42:38 +04:00
committed by Eike Ziller
parent a628fdb6a5
commit 3fc4511fdf
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/resourceeditor/resourceeditorw.cpp
View File

@@ -315,8 +315,7 @@ void ResourceEditorW::openFile(const QString &fileName)
void ResourceEditorW::onRefresh() void ResourceEditorW::onRefresh()
{ {
if (!m_resourceEditor.isNull()) m_resourceEditor->refresh();
m_resourceEditor.data()->refresh();
} }
void ResourceEditorW::renameCurrentFile() void ResourceEditorW::renameCurrentFile()
@@ -326,14 +325,12 @@ void ResourceEditorW::renameCurrentFile()
void ResourceEditorW::onUndo() void ResourceEditorW::onUndo()
{ {
if (!m_resourceEditor.isNull()) m_resourceEditor->onUndo();
m_resourceEditor.data()->onUndo();
} }
void ResourceEditorW::onRedo() void ResourceEditorW::onRedo()
{ {
if (!m_resourceEditor.isNull()) m_resourceEditor->onRedo();
m_resourceEditor.data()->onRedo();
} }
} // namespace Internal } // namespace Internal

4
src/plugins/resourceeditor/resourceeditorw.h
View File

@@ -34,8 +34,6 @@
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <QPointer>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QMenu; class QMenu;
class QToolBar; class QToolBar;
@@ -113,7 +111,7 @@ private:
const QString m_fileFilter; const QString m_fileFilter;
QString m_displayName; QString m_displayName;
QString m_suggestedName; QString m_suggestedName;
QPointer<QrcEditor> m_resourceEditor; QrcEditor *m_resourceEditor;
ResourceEditorDocument *m_resourceDocument; ResourceEditorDocument *m_resourceDocument;
ResourceEditorPlugin *m_plugin; ResourceEditorPlugin *m_plugin;
bool m_shouldAutoSave; bool m_shouldAutoSave;