Commit 9abb8563 authored by jkobus's avatar jkobus Committed by Friedemann Kleint

Standardize IEditor subclass names, don't capitalize namespaces

Change-Id: I13ac8d4286b292c03019a7a564feee2c36475bf9
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@digia.com>
parent 605b62d6
......@@ -51,7 +51,7 @@ namespace Internal {
///////////////////////////////// DiffEditor //////////////////////////////////
DiffEditor::DiffEditor(DiffEditorWidget *editorWidget)
DiffEditorEditable::DiffEditorEditable(DiffEditorWidget *editorWidget)
:
IEditor(0),
m_file(new DiffFile(QLatin1String(Constants::DIFF_EDITOR_MIMETYPE), this)),
......@@ -61,21 +61,21 @@ DiffEditor::DiffEditor(DiffEditorWidget *editorWidget)
setWidget(editorWidget);
}
DiffEditor::~DiffEditor()
DiffEditorEditable::~DiffEditorEditable()
{
delete m_toolWidget;
if (m_widget)
delete m_widget;
}
bool DiffEditor::createNew(const QString &contents)
bool DiffEditorEditable::createNew(const QString &contents)
{
Q_UNUSED(contents)
// setFileContents(contents);
return true;
}
bool DiffEditor::open(QString *errorString, const QString &fileName, const QString &realFileName)
bool DiffEditorEditable::open(QString *errorString, const QString &fileName, const QString &realFileName)
{
Q_UNUSED(errorString)
Q_UNUSED(fileName)
......@@ -87,35 +87,35 @@ bool DiffEditor::open(QString *errorString, const QString &fileName, const QStri
return true;
}
Core::IDocument *DiffEditor::document()
Core::IDocument *DiffEditorEditable::document()
{
return m_file;
}
QString DiffEditor::displayName() const
QString DiffEditorEditable::displayName() const
{
if (m_displayName.isEmpty())
m_displayName = QCoreApplication::translate("DiffEditor", Constants::DIFF_EDITOR_DISPLAY_NAME);
return m_displayName;
}
void DiffEditor::setDisplayName(const QString &title)
void DiffEditorEditable::setDisplayName(const QString &title)
{
m_displayName = title;
emit changed();
}
bool DiffEditor::duplicateSupported() const
bool DiffEditorEditable::duplicateSupported() const
{
return false;
}
Core::IEditor *DiffEditor::duplicate(QWidget * /*parent*/)
Core::IEditor *DiffEditorEditable::duplicate(QWidget * /*parent*/)
{
return 0;
}
Core::Id DiffEditor::id() const
Core::Id DiffEditorEditable::id() const
{
return Constants::DIFF_EDITOR_ID;
}
......@@ -132,7 +132,7 @@ static QToolBar *createToolBar(const QWidget *someWidget)
return toolBar;
}
QWidget *DiffEditor::toolBar()
QWidget *DiffEditorEditable::toolBar()
{
if (m_toolWidget)
return m_toolWidget;
......@@ -161,12 +161,12 @@ QWidget *DiffEditor::toolBar()
return m_toolWidget;
}
QByteArray DiffEditor::saveState() const
QByteArray DiffEditorEditable::saveState() const
{
return QByteArray();
}
bool DiffEditor::restoreState(const QByteArray &/*state*/)
bool DiffEditorEditable::restoreState(const QByteArray &/*state*/)
{
return true;
}
......@@ -252,7 +252,7 @@ QString DiffEditorFactory::displayName() const
Core::IEditor *DiffEditorFactory::createEditor(QWidget *parent)
{
DiffEditorWidget *editorWidget = new DiffEditorWidget(parent);
DiffEditor *editor = new DiffEditor(editorWidget);
DiffEditorEditable *editor = new DiffEditorEditable(editorWidget);
return editor;
}
......@@ -335,7 +335,7 @@ void DiffEditorPlugin::diff()
DiffEditorWidget *DiffEditorPlugin::getDiffEditorWidget(const Core::IEditor *editor) const
{
if (const DiffEditor *de = qobject_cast<const DiffEditor *>(editor))
if (const DiffEditorEditable *de = qobject_cast<const DiffEditorEditable *>(editor))
return de->editorWidget();
return 0;
}
......
......@@ -48,12 +48,12 @@ class DiffEditorWidget;
namespace Internal {
class DiffFile;
class DiffEditor : public Core::IEditor
class DiffEditorEditable : public Core::IEditor
{
Q_OBJECT
public:
explicit DiffEditor(DiffEditorWidget *editorWidget);
virtual ~DiffEditor();
explicit DiffEditorEditable(DiffEditorWidget *editorWidget);
virtual ~DiffEditorEditable();
public:
// Core::IEditor
......
......@@ -53,11 +53,11 @@ namespace DiffEditor {
//////////////////////
class DiffViewEditor : public BaseTextEditor
class DiffViewEditorEditable : public BaseTextEditor
{
Q_OBJECT
public:
DiffViewEditor(BaseTextEditorWidget *editorWidget) : BaseTextEditor(editorWidget) {}
DiffViewEditorEditable(BaseTextEditorWidget *editorWidget) : BaseTextEditor(editorWidget) {}
virtual Core::Id id() const { return "DiffViewEditor"; }
virtual bool duplicateSupported() const { return false; }
virtual IEditor *duplicate(QWidget *parent) { Q_UNUSED(parent) return 0; }
......@@ -89,7 +89,7 @@ public:
protected:
virtual int extraAreaWidth(int *markWidthPtr = 0) const { return BaseTextEditorWidget::extraAreaWidth(markWidthPtr); }
BaseTextEditor *createEditor() { return new DiffViewEditor(this); }
BaseTextEditor *createEditor() { return new DiffViewEditorEditable(this); }
virtual QString lineNumber(int blockNumber) const;
int lineNumberTopPositionOffset(int blockNumber) const;
virtual int lineNumberDigits() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment