Mercurial > hg > forks > UniversalIndentGUI
diff src/UiGuiHighlighter.h @ 751:ac165b6ae67e
Done some refactoring:
- Moved includes into the cpp files where possible and using class pre-declarations if possible
- Made class member variable names begin with an underscore
- Made by uic created header files be used as class members instead of inherting them
- Renamed some variables to reflect their purpose better
- Added some NULL initializations and added some comments
- Rearranged some include and declaration code parts to be consistent and better readable
- Updated for QScintilla 2.4.5
- Made UiGuiSettings be accessed via a shared pointer only
git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@1028 59b1889a-e5ac-428c-b0c7-476e01d41282
| author | thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282> |
|---|---|
| date | Thu, 14 Oct 2010 19:52:47 +0000 |
| parents | aae5a8d04f70 |
| children | f3631db17328 |
line wrap: on
line diff
--- a/src/UiGuiHighlighter.h Sat Oct 02 12:48:56 2010 +0000 +++ b/src/UiGuiHighlighter.h Thu Oct 14 19:52:47 2010 +0000 @@ -22,49 +22,14 @@ #include <QObject> #include <QMap> -#include <QMenu> -#include <QCoreApplication> -#include <Qsci/qsciscintilla.h> -#include <Qsci/qscilexer.h> -#include <Qsci/qscilexerbash.h> -#include <Qsci/qscilexerbatch.h> -#include <Qsci/qscilexercmake.h> -#include <Qsci/qscilexercpp.h> -#include <Qsci/qscilexercsharp.h> -#include <Qsci/qscilexercss.h> -#include <Qsci/qscilexerd.h> -#include <Qsci/qscilexerdiff.h> -#if ( QSCINTILLA_VERSION >= 0x020300 ) -#include <Qsci/qscilexerfortran.h> -#include <Qsci/qscilexerfortran77.h> -#endif -#include <Qsci/qscilexerhtml.h> -#include <Qsci/qscilexeridl.h> -#include <Qsci/qscilexerjava.h> -#include <Qsci/qscilexerjavascript.h> -#include <Qsci/qscilexerlua.h> -#include <Qsci/qscilexermakefile.h> -#if ( QSCINTILLA_VERSION >= 0x020300 ) -#include <Qsci/qscilexerpascal.h> -#endif -#include <Qsci/qscilexerperl.h> -#if ( QSCINTILLA_VERSION >= 0x020300 ) -#include <Qsci/qscilexerpostscript.h> -#endif -#include <Qsci/qscilexerpov.h> -#include <Qsci/qscilexerproperties.h> -#include <Qsci/qscilexerpython.h> -#include <Qsci/qscilexerruby.h> -#include <Qsci/qscilexersql.h> -#if ( QSCINTILLA_VERSION >= 0x020300 ) -#include <Qsci/qscilexertcl.h> -#endif -#include <Qsci/qscilexertex.h> -#include <Qsci/qscilexervhdl.h> -#if ( QSCINTILLA_VERSION >= 0x020300 ) -#include <Qsci/qscilexerxml.h> -#include <Qsci/qscilexeryaml.h> -#endif +#include <QFont> +#include <QColor> + +class QAction; +class QSettings; + +class QsciScintilla; +class QsciLexer; class UiGuiHighlighter : public QObject @@ -80,15 +45,6 @@ void writeCurrentSettings(const char *prefix); QStringList getAvailableHighlighters(); -private: - bool highlightningIsOn; - QsciScintilla *qsciEditorParent; - QMap<int, QFont> fontForStyles; - QMap<int, QColor> colorForStyles; - QsciLexer* lexer; - QSettings *settings; - QMap<QString, QStringList> mapHighlighternameToExtension; - public slots: //! The foreground color for style number \a style is set to \a color. If //! \a style is -1 then the color is set for all styles. @@ -104,6 +60,15 @@ void setLexerByName( QString lexerName ); void setHighlighterByAction(QAction* highlighterAction); + +private: + bool _highlightningIsOn; + QsciScintilla *_qsciEditorParent; + QMap<int, QFont> _fontForStyles; + QMap<int, QColor> _colorForStyles; + QsciLexer* _lexer; + QSettings *_settings; + QMap<QString, QStringList> _mapHighlighternameToExtension; }; #endif // UIGUIHIGHLIGHTER_H