summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOrgad Shaneh <orgads@gmail.com>2012-08-01 11:33:51 +0300
committerhjk <qthjk@ovi.com>2012-08-01 10:43:15 +0200
commit93756975e1960052f0d6f17b4f63ba22007e967b (patch)
treece3b24f7e96740147bc0b59c75974f54ad109fec /src
parente982b5b3d1cf464725f2d672864599909980ae9a (diff)
downloadqt-creator-93756975e1960052f0d6f17b4f63ba22007e967b.tar.gz
Context cleanup
Change-Id: I5e228acda32e8924d6a9bed13ea34182fff1dbb1 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.cpp5
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeeditor.h1
-rw-r--r--src/plugins/coreplugin/icontext.h2
-rw-r--r--src/plugins/texteditor/basetexteditor.h2
-rw-r--r--src/plugins/texteditor/itexteditor.h2
5 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
index be382322fa..d7a5ed3600 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp
@@ -73,11 +73,6 @@ Core::IEditor *CMakeEditor::duplicate(QWidget *parent)
return ret->editor();
}
-Core::Context CMakeEditor::context() const
-{
- return Core::Context(Constants::C_CMAKEEDITOR);
-}
-
Core::Id CMakeEditor::id() const
{
return CMakeProjectManager::Constants::CMAKE_EDITOR_ID;
diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.h b/src/plugins/cmakeprojectmanager/cmakeeditor.h
index 4da6027a63..211c2449d2 100644
--- a/src/plugins/cmakeprojectmanager/cmakeeditor.h
+++ b/src/plugins/cmakeprojectmanager/cmakeeditor.h
@@ -58,7 +58,6 @@ public:
bool duplicateSupported() const { return true; }
Core::IEditor *duplicate(QWidget *parent);
- Core::Context context() const;
Core::Id id() const;
bool isTemporary() const { return false; }
diff --git a/src/plugins/coreplugin/icontext.h b/src/plugins/coreplugin/icontext.h
index 4f43c99c11..3080d4a93a 100644
--- a/src/plugins/coreplugin/icontext.h
+++ b/src/plugins/coreplugin/icontext.h
@@ -75,7 +75,7 @@ class CORE_EXPORT IContext : public QObject
{
Q_OBJECT
public:
- IContext(QObject *parent = 0) : QObject(parent), m_widget(0) {}
+ IContext(QObject *parent = 0) : QObject(parent) {}
virtual Context context() const { return m_context; }
virtual QWidget *widget() const { return m_widget; }
diff --git a/src/plugins/texteditor/basetexteditor.h b/src/plugins/texteditor/basetexteditor.h
index dd260ebc67..3b377d4b9e 100644
--- a/src/plugins/texteditor/basetexteditor.h
+++ b/src/plugins/texteditor/basetexteditor.h
@@ -634,7 +634,6 @@ public:
inline ITextMarkable *markableInterface() { return e->markableInterface(); }
- void setContextHelpId(const QString &id) { m_contextHelpId = id; }
QString contextHelpId() const; // from IContext
inline void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason) { e->setTextCodec(codec); }
@@ -653,7 +652,6 @@ private slots:
private:
BaseTextEditorWidget *e;
- mutable QString m_contextHelpId;
QToolBar *m_toolBar;
QWidget *m_stretchWidget;
QAction *m_cursorPositionLabelAction;
diff --git a/src/plugins/texteditor/itexteditor.h b/src/plugins/texteditor/itexteditor.h
index 25982ddd1f..812fe3f038 100644
--- a/src/plugins/texteditor/itexteditor.h
+++ b/src/plugins/texteditor/itexteditor.h
@@ -92,8 +92,6 @@ public:
virtual ITextMarkable *markableInterface() = 0;
- virtual void setContextHelpId(const QString &) = 0;
-
enum TextCodecReason {
TextCodecOtherReason,
TextCodecFromSystemSetting,