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

Set correct mime type for C++ files.

Browse Source
This commit is contained in:
dt
2009-10-13 17:17:08 +02:00
parent 1653e287e7
commit ceaa92ecbb
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -67,6 +67,7 @@
#include <coreplugin/actionmanager/actionmanager.h> #include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/mimedatabase.h>
#include <utils/uncommentselection.h> #include <utils/uncommentselection.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/projectexplorerconstants.h>
@@ -1751,6 +1752,13 @@ const char *CPPEditorEditable::kind() const
return CppEditor::Constants::CPPEDITOR_KIND; return CppEditor::Constants::CPPEDITOR_KIND;
} }
bool CPPEditorEditable::open(const QString & fileName)
{
bool b = TextEditor::BaseTextEditorEditable::open(fileName);
editor()->setMimeType(Core::ICore::instance()->mimeDatabase()->findByFile(QFileInfo(fileName)).type());
return b;
}
void CPPEditor::setFontSettings(const TextEditor::FontSettings &fs) void CPPEditor::setFontSettings(const TextEditor::FontSettings &fs)
{ {
TextEditor::BaseTextEditor::setFontSettings(fs); TextEditor::BaseTextEditor::setFontSettings(fs);

1
src/plugins/cppeditor/cppeditor.h
View File

@@ -164,6 +164,7 @@ public:
const char *kind() const; const char *kind() const;
bool isTemporary() const { return false; } bool isTemporary() const { return false; }
virtual bool open(const QString & fileName);
private: private:
QList<int> m_context; QList<int> m_context;

1
src/plugins/cppeditor/cppplugin.cpp
View File

@@ -97,7 +97,6 @@ Core::IEditor *CppEditorFactory::createEditor(QWidget *parent)
{ {
CPPEditor *editor = new CPPEditor(parent); CPPEditor *editor = new CPPEditor(parent);
editor->setRevisionsVisible(true); editor->setRevisionsVisible(true);
editor->setMimeType(CppEditor::Constants::CPP_SOURCE_MIMETYPE);
m_owner->initializeEditor(editor); m_owner->initializeEditor(editor);
return editor->editableInterface(); return editor->editableInterface();
} }