diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-03-19 20:01:38 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2017-03-20 08:38:20 +0000 |
commit | 981cf84903ebd78d3eb96165ebbd59b58c7ffe04 (patch) | |
tree | 5b378c9eddd6223e695f38c83c397bcdcf21af59 /src/plugins/resourceeditor | |
parent | f2d8be7c67a40f667b3eb3c478a923e8f8de0113 (diff) |
ResourceEditor: Complete transition to Qt5-style connect
Change-Id: I39380ed83f3d554d326b956cf729bc5f69f612c1
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
-rw-r--r-- | src/plugins/resourceeditor/resourceeditorw.cpp | 8 | ||||
-rw-r--r-- | src/plugins/resourceeditor/resourceeditorw.h | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/resourceeditor/resourceeditorw.cpp b/src/plugins/resourceeditor/resourceeditorw.cpp index 3b856ba724..09a4001ff6 100644 --- a/src/plugins/resourceeditor/resourceeditorw.cpp +++ b/src/plugins/resourceeditor/resourceeditorw.cpp @@ -89,10 +89,12 @@ ResourceEditorW::ResourceEditorW(const Core::Context &context, m_toolBar->addWidget(refreshButton); m_resourceEditor->setResourceDragEnabled(true); - m_contextMenu->addAction(tr("Open File"), this, SLOT(openCurrentFile())); + m_contextMenu->addAction(tr("Open File"), this, &ResourceEditorW::openCurrentFile); m_openWithMenu = m_contextMenu->addMenu(tr("Open With")); - m_renameAction = m_contextMenu->addAction(tr("Rename File..."), this, SLOT(renameCurrentFile())); - m_copyFileNameAction = m_contextMenu->addAction(tr("Copy Resource Path to Clipboard"), this, SLOT(copyCurrentResourcePath())); + m_renameAction = m_contextMenu->addAction(tr("Rename File..."), this, + &ResourceEditorW::renameCurrentFile); + m_copyFileNameAction = m_contextMenu->addAction(tr("Copy Resource Path to Clipboard"), + this, &ResourceEditorW::copyCurrentResourcePath); connect(m_resourceDocument, &ResourceEditorDocument::loaded, m_resourceEditor, &QrcEditor::loaded); diff --git a/src/plugins/resourceeditor/resourceeditorw.h b/src/plugins/resourceeditor/resourceeditorw.h index 3d8d139e3c..cbc4715dac 100644 --- a/src/plugins/resourceeditor/resourceeditorw.h +++ b/src/plugins/resourceeditor/resourceeditorw.h @@ -92,7 +92,7 @@ public: Core::IDocument *document() override { return m_resourceDocument; } QWidget *toolBar() override; -private slots: +private: void onUndoStackChanged(bool canUndo, bool canRedo); void showContextMenu(const QPoint &globalPoint, const QString &fileName); void openCurrentFile(); @@ -100,7 +100,6 @@ private slots: void renameCurrentFile(); void copyCurrentResourcePath(); -private: const QString m_extension; const QString m_fileFilter; QString m_displayName; @@ -114,10 +113,8 @@ private: QAction *m_renameAction; QAction *m_copyFileNameAction; -public slots: - void onRefresh(); - public: + void onRefresh(); void onUndo(); void onRedo(); |