[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [lokalize] src: Fix minor EBN issues
From:       Yuri Chornoivan <null () kde ! org>
Date:       2018-09-07 17:40:48
Message-ID: E1fyKkS-00058n-U6 () code ! kde ! org
[Download RAW message or body]

Git commit 0bb10e4f56be5af08e4e5334376806bec6ecd622 by Yuri Chornoivan.
Committed on 07/09/2018 at 17:40.
Pushed by yurchor into branch 'master'.

Fix minor EBN issues

M  +3    -6    src/binunitsview.h
M  +2    -2    src/catalog/gettext/catalogfileplugin.h
M  +3    -3    src/filesearch/filesearchtab.cpp
M  +6    -1    src/nokde-stubs/kaboutdata.h
M  +0    -1    src/syntaxhighlighter.h

https://commits.kde.org/lokalize/0bb10e4f56be5af08e4e5334376806bec6ecd622

diff --git a/src/binunitsview.h b/src/binunitsview.h
index 322eff7..0887c0f 100644
--- a/src/binunitsview.h
+++ b/src/binunitsview.h
@@ -1,6 +1,3 @@
-class BinUnitsModel;
-class Catalog;
-class Catalog;
 /* ****************************************************************************
   This file is part of Lokalize
 
@@ -24,8 +21,8 @@ class Catalog;
 
 **************************************************************************** */
 
-#ifndef BINUNITSWINDOW_H
-#define BINUNITSWINDOW_H
+#ifndef BINUNITSVIEW_H
+#define BINUNITSVIEW_H
 
 class Catalog;
 class BinUnitsModel;
@@ -95,4 +92,4 @@ private:
 
 };
 
-#endif // BINUNITSWINDOW_H
+#endif // BINUNITSVIEW_H
diff --git a/src/catalog/gettext/catalogfileplugin.h \
b/src/catalog/gettext/catalogfileplugin.h index 31ae353..356bd43 100644
--- a/src/catalog/gettext/catalogfileplugin.h
+++ b/src/catalog/gettext/catalogfileplugin.h
@@ -30,8 +30,8 @@
   you do not wish to do so, delete this exception statement from
   your version.
 **************************************************************************** */
-#ifndef KATALOGFILEPLUGIN_H
-#define KATALOGFILEPLUGIN_H
+#ifndef CATALOGFILEPLUGIN_H
+#define CATALOGFILEPLUGIN_H
 
 #include <QList>
 #include <QTextCodec>
diff --git a/src/filesearch/filesearchtab.cpp b/src/filesearch/filesearchtab.cpp
index 676c005..610f1d4 100644
--- a/src/filesearch/filesearchtab.cpp
+++ b/src/filesearch/filesearchtab.cpp
@@ -387,10 +387,10 @@ QVariant FileSearchModel::data(const QModelIndex& item, int \
role) const  return escaped;
             }
 
-            const QVector<StartLen>& occurences = item.column() == \
                FileSearchModel::Source ? sr.sourcePositions : sr.targetPositions;
-            int occ = occurences.count();
+            const QVector<StartLen>& occurrences = item.column() == \
FileSearchModel::Source ? sr.sourcePositions : sr.targetPositions; +            int \
occ = occurrences.count();  while (--occ >= 0) {
-                const StartLen& sl = occurences.at(occ);
+                const StartLen& sl = occurrences.at(occ);
                 result.insert(sl.start + sl.len, endBld);
                 result.insert(sl.start, startBld);
             }
diff --git a/src/nokde-stubs/kaboutdata.h b/src/nokde-stubs/kaboutdata.h
index 9e4d810..3fe6303 100644
--- a/src/nokde-stubs/kaboutdata.h
+++ b/src/nokde-stubs/kaboutdata.h
@@ -1,3 +1,6 @@
+#ifndef KABOUTDATA_H
+#define KABOUTDATA_H
+
 #include <QString>
 #include <QObject>
 #include <QVector>
@@ -23,4 +26,6 @@ public slots:
 private:
     QString name, version, description, copyright;
     QVector<Credit> credits;
-};
\ No newline at end of file
+};
+
+#endif
diff --git a/src/syntaxhighlighter.h b/src/syntaxhighlighter.h
index c0116f9..1abede4 100644
--- a/src/syntaxhighlighter.h
+++ b/src/syntaxhighlighter.h
@@ -34,7 +34,6 @@
 
 #include <QHash>
 #include <QTextCharFormat>
-#include <QSyntaxHighlighter>
 
 
 class QTextDocument;


[prev in list] [next in list] [prev in thread] [next in thread]