Context Navigation

Changeset 1110 for s10k/CommonLibs

Timestamp:

Feb 16, 2019, 6:24:18 PM (6 years ago)

Author:

s10k

Message:

slightly modifications to allow subclassing, added Q_OBJECT macro, since usually all classes derived from QObject should use it

Location:

s10k/CommonLibs

Files:

-              r1096
+              r1110
 // This XML highligter is the same from Dmitry Ivanov available here:
 // https://github.com/d1vanov/basic-xml-syntax-highlighter
 // with some slightly modifications by random-guy (https://github.com/random-guy)
+// with some slightly modifications by fabiobento512 (https://github.com/fabiobento512)
 // (like different colors, and remove of unneeded constructors)
 …
 protected:
     virtual void highlightBlock(const QString & text);
 private:
     void highlightByRegex(const QTextCharFormat & format,
 …
     void setFormats();
 private:
+protected:
     QTextCharFormat     m_xmlKeywordFormat;
     QTextCharFormat     m_xmlElementFormat;

r1096	r1110
1	1	MIT License
2	2
3		Copyright (~~c) 2017 random-guy~~
	3	Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
4	4
5	5	Permission is hereby granted, free of charge, to any person obtaining a copy

-              r1096
+              r1110
 /**
  * Copyright (C) 2017 Fábio Bento (random-guy)
+ * Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
+ *
  * This library is distributed under the MIT License. See notice at the end
 …
 /**
  * Copyright (c) 2017
+ * Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
+ *
  * Permission is hereby granted, free of charge, to any person

-              r1096
+              r1110
 /**
  * Copyright (C) 2017 Fábio Bento (random-guy)
+ * Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
+ *
  * This library is distributed under the MIT License. See notice at the end
 …
 /**
  * Copyright (c) 2017
+ * Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
+ *
  * Permission is hereby granted, free of charge, to any person

r1096	r1110
1	1	MIT License
2	2
3		Copyright (~~c) 2017 random-guy~~
	3	Copyright (C) 2017 - 2018 Fábio Bento (fabiobento512)
4	4
5	5	Permission is hereby granted, free of charge, to any person obtaining a copy

r1096	r1110
1	1	# CommonLibs
2		CommonLibs for ~~random-guy~~ C++ Qt Projects
	2	CommonLibs for fabiobento512 C++ Qt Projects

r1096	r1110
32	32	void Highlighter::highlightBlock(const QString &text)
33	33	{
34		for ~~(const HighlightingRule &rule :~~ rules) {
	34	foreach (const HighlightingRule &rule, rules) {
35	35	QRegExp expression(rule.pattern);
36	36	int index = expression.indexIn(text);

-              r1073
+              r1110
 class Highlighter: public QSyntaxHighlighter
+{
+        Q_OBJECT
 public:
      Highlighter(QTextDocument *parent = 0);
 private:
+protected:
      struct HighlightingRule
+     {

Note: See TracChangeset for help on using the changeset viewer.