From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sun, 7 May 2017 05:24:04 +0000 (+0000)
Subject: minor moc cleanup
X-Git-Tag: 4.12.0~6357
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=09cfa4c936866fa3c29893e9f92fa61e7b1feb16;p=kde%2FKatie.git

minor moc cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/tools/moc/mocmain.cpp b/src/tools/moc/mocmain.cpp
index 9b4eef558..0052de558 100644
--- a/src/tools/moc/mocmain.cpp
+++ b/src/tools/moc/mocmain.cpp
@@ -257,9 +257,9 @@ int runMoc(int _argc, char **_argv)
             if (!more) {
                 if (!(n < argc-1))
                     error("Missing path name for the -I option.");
-                pp.includes += Preprocessor::IncludePath(argv[++n]);
+                pp.includes += IncludePath(argv[++n]);
             } else {
-                pp.includes += Preprocessor::IncludePath(opt.mid(1));
+                pp.includes += IncludePath(opt.mid(1));
             }
             break;
         case 'D': // define macro
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index ddf36d882..b9447b3bf 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -801,7 +801,7 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed)
                 fi.setFile(QFileInfo(QString::fromLocal8Bit(filename.constData())).dir(), QString::fromLocal8Bit(include.constData()));
             for (int j = 0; j < Preprocessor::includes.size() && !fi.exists(); ++j) {
                 const IncludePath &p = Preprocessor::includes.at(j);
-                fi.setFile(QString::fromLocal8Bit(p.path.constData()), QString::fromLocal8Bit(include.constData()));
+                fi.setFile(QString::fromLocal8Bit(p.constData()), QString::fromLocal8Bit(include.constData()));
                 // try again, maybe there's a file later in the include paths with the same name
                 // (186067)
                 if (fi.isDir()) {
diff --git a/src/tools/moc/preprocessor.h b/src/tools/moc/preprocessor.h
index 110b6ebb5..c1f5344c0 100644
--- a/src/tools/moc/preprocessor.h
+++ b/src/tools/moc/preprocessor.h
@@ -62,20 +62,14 @@ typedef SubArray MacroName;
 typedef QHash<MacroName, Macro> Macros;
 typedef QVector<MacroName> MacroSafeSet;
 
+typedef QByteArray IncludePath;
 
 class Preprocessor : public Parser
 {
 public:
     Preprocessor(){}
     static bool preprocessOnly;
-    struct IncludePath
-    {
-        inline explicit IncludePath(const QByteArray &_path)
-            : path(_path) {}
-        QByteArray path;
-    };
     QList<IncludePath> includes;
-    QList<QByteArray> frameworks;
     QSet<QByteArray> preprocessedIncludes;
     Macros macros;
     Symbols preprocessed(const QByteArray &filename, FILE *file);
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index a4fe8f132..2677cdd60 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -78,7 +78,6 @@ inline uint qHash(const SubArray &key)
 
 struct Symbol
 {
-
 #ifdef USE_LEXEM_STORE
     typedef QHash<SubArray, QHashDummyValue> LexemStore;
     static LexemStore lexemStore;