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

Make expanders work with subexpanders

Browse Source 
Change-Id: I30bad85ce2fbaf1f02043b3d97f657461f5a1995
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
hjk
2014-10-20 23:13:13 +02:00
parent 58be8e6476
commit c6ef3addcc
19 changed files with 247 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/coreplugin/variablechooser.h
View File

@@ -35,6 +35,7 @@
#include <QWidget>
#include <utils/macroexpander.h>
#include <functional>
namespace Utils { class MacroExpander; }
@@ -43,8 +44,6 @@ namespace Core {
namespace Internal { class VariableChooserPrivate; }
typedef std::function<Utils::MacroExpander *()> MacroExpanderProvider;
class CORE_EXPORT VariableChooser : public QWidget
{
Q_OBJECT
@@ -53,11 +52,11 @@ public:
explicit VariableChooser(QWidget *parent = 0);
~VariableChooser();
void addMacroExpanderProvider(const MacroExpanderProvider &provider);
void addMacroExpanderProvider(const Utils::MacroExpanderProvider &provider);
void addSupportedWidget(QWidget *textcontrol, const QByteArray &ownName = QByteArray());
protected:
void keyPressEvent(QKeyEvent *ke);
void keyPressEvent(QKeyEvent *ev);
bool eventFilter(QObject *, QEvent *event);
private: