summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/sidebar.h
diff options
context:
space:
mode:
authordt <qtc-committer@nokia.com>2009-08-20 17:27:33 +0200
committerdt <qtc-committer@nokia.com>2009-08-20 17:40:12 +0200
commitbeb2916ea6d431a9d6922d42ac4ef280bf1bec8d (patch)
tree7ed7e0c0fadfa61a59c4f25c67e7a544bab2b289 /src/plugins/coreplugin/sidebar.h
parentfdf6120d17ec49e1aa06477cd10fbf31bd33a3d6 (diff)
downloadqt-creator-beb2916ea6d431a9d6922d42ac4ef280bf1bec8d.tar.gz
Fix warnings that a signal conflicts with a slot of base classes.
In NavigationSubWidget and SideBarWidget
Diffstat (limited to 'src/plugins/coreplugin/sidebar.h')
-rw-r--r--src/plugins/coreplugin/sidebar.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/sidebar.h b/src/plugins/coreplugin/sidebar.h
index f2f8496649..2526f40118 100644
--- a/src/plugins/coreplugin/sidebar.h
+++ b/src/plugins/coreplugin/sidebar.h
@@ -111,8 +111,8 @@ public:
QMap<QString, Core::Command*> shortcutMap() const;
private slots:
- void split();
- void close();
+ void splitSubWidget();
+ void closeSubWidget();
void updateWidgets();
private:
@@ -146,8 +146,8 @@ public:
Core::Command *command(const QString &title) const;
signals:
- void split();
- void close();
+ void splitMe();
+ void closeMe();
void currentWidgetChanged();
private slots: