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

Merge remote branch 'origin/2.0'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppcodecompletion.cpp
This commit is contained in:
con
2010-05-12 17:25:40 +02:00
parent 64d65fb698 acea722d75
commit 1fd12ab63b
65 changed files with 1014 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/basetexteditor.h
View File

@@ -59,6 +59,7 @@ class BaseTextDocument;
class BaseTextEditorEditable;
class FontSettings;
struct BehaviorSettings;
struct CompletionSettings;
struct DisplaySettings;
struct StorageSettings;
struct TabSettings;
@@ -160,13 +161,15 @@ public:
void setParenthesesMatchingEnabled(bool b);
bool isParenthesesMatchingEnabled() const;
void setAutoParenthesesEnabled(bool b);
bool isAutoParenthesesEnabled() const;
void setHighlightCurrentLine(bool b);
bool highlightCurrentLine() const;
void setLineNumbersVisible(bool b);
bool lineNumbersVisible() const;
void setMarksVisible(bool b);
bool marksVisible() const;
@@ -366,6 +369,7 @@ public slots:
virtual void setDisplaySettings(const TextEditor::DisplaySettings &);
virtual void setBehaviorSettings(const TextEditor::BehaviorSettings &);
virtual void setStorageSettings(const TextEditor::StorageSettings &);
virtual void setCompletionSettings(const TextEditor::CompletionSettings &);
protected:
bool viewportEvent(QEvent *event);