forked from qt-creator/qt-creator
Corrected name of .config editor
This commit is contained in:
@@ -46,13 +46,10 @@ QKeySequence INavigationWidgetFactory::activationSequence()
|
|||||||
return QKeySequence();
|
return QKeySequence();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void INavigationWidgetFactory::saveSettings(int /* position */, QWidget * /* widget */)
|
void INavigationWidgetFactory::saveSettings(int /* position */, QWidget * /* widget */)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void INavigationWidgetFactory::restoreSettings(int /* position */, QWidget * /* widget */)
|
void INavigationWidgetFactory::restoreSettings(int /* position */, QWidget * /* widget */)
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -269,7 +269,7 @@ void CppHoverHandler::updateHelpIdAndTooltip(TextEditor::ITextEditor *editor, in
|
|||||||
const Snapshot documents = m_modelManager->snapshot();
|
const Snapshot documents = m_modelManager->snapshot();
|
||||||
const QString fileName = editor->file()->fileName();
|
const QString fileName = editor->file()->fileName();
|
||||||
Document::Ptr doc = documents.value(fileName);
|
Document::Ptr doc = documents.value(fileName);
|
||||||
if (! doc)
|
if (!doc)
|
||||||
return; // nothing to do
|
return; // nothing to do
|
||||||
|
|
||||||
QTextCursor tc(edit->document());
|
QTextCursor tc(edit->document());
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ const char *const FILES_MIMETYPE = "application/vnd.nokia.qt.generic.files";
|
|||||||
const char *const INCLUDES_EDITOR = ".includes Editor";
|
const char *const INCLUDES_EDITOR = ".includes Editor";
|
||||||
const char *const INCLUDES_MIMETYPE = "application/vnd.nokia.qt.generic.includes";
|
const char *const INCLUDES_MIMETYPE = "application/vnd.nokia.qt.generic.includes";
|
||||||
|
|
||||||
const char *const CONFIG_EDITOR = ".includes Editor";
|
const char *const CONFIG_EDITOR = ".config Editor";
|
||||||
const char *const CONFIG_MIMETYPE = "application/vnd.nokia.qt.generic.config";
|
const char *const CONFIG_MIMETYPE = "application/vnd.nokia.qt.generic.config";
|
||||||
|
|
||||||
} // namespace Constants
|
} // namespace Constants
|
||||||
|
|||||||
@@ -36,14 +36,15 @@
|
|||||||
|
|
||||||
namespace ProjectExplorer {
|
namespace ProjectExplorer {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|
||||||
class BuildConfiguration
|
class BuildConfiguration
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BuildConfiguration(const QString &name);
|
BuildConfiguration(const QString &name);
|
||||||
BuildConfiguration(const QString &name, BuildConfiguration *source);
|
BuildConfiguration(const QString &name, BuildConfiguration *source);
|
||||||
QString name() const;
|
QString name() const;
|
||||||
QVariant getValue(const QString & key) const;
|
QVariant getValue(const QString &key) const;
|
||||||
void setValue(const QString & key, QVariant value);
|
void setValue(const QString &key, QVariant value);
|
||||||
|
|
||||||
QString displayName();
|
QString displayName();
|
||||||
void setDisplayName(const QString &name);
|
void setDisplayName(const QString &name);
|
||||||
@@ -55,6 +56,7 @@ private:
|
|||||||
QHash<QString, QVariant> m_values;
|
QHash<QString, QVariant> m_values;
|
||||||
QString m_name;
|
QString m_name;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
} // namespace ProjectExplorer
|
} // namespace ProjectExplorer
|
||||||
|
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ QList<CompletionItem> CompletionSupport::getCompletions() const
|
|||||||
QString lastKey;
|
QString lastKey;
|
||||||
QList<CompletionItem> uniquelist;
|
QList<CompletionItem> uniquelist;
|
||||||
|
|
||||||
foreach (const CompletionItem item, completionItems) {
|
foreach (const CompletionItem &item, completionItems) {
|
||||||
if (item.m_text != lastKey) {
|
if (item.m_text != lastKey) {
|
||||||
uniquelist.append(item);
|
uniquelist.append(item);
|
||||||
lastKey = item.m_text;
|
lastKey = item.m_text;
|
||||||
|
|||||||
Reference in New Issue
Block a user