more file cosmetics

src/plugins/cpptools/cppcodecompletion.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppcodecompletion.h"
 #include "cppmodelmanager.h"
 

src/plugins/cpptools/cppcodecompletion.h

@@ -30,13 +30,10 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPCODECOMPLETION_H
 #define CPPCODECOMPLETION_H
 
-// Qt
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-
 // C++ front-end
 #include <ASTfwd.h>
 #include <FullySpecifiedType.h>
@@ -47,6 +44,10 @@
 // Qt Creator
 #include <texteditor/icompletioncollector.h>
 
+// Qt
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
+
 namespace Core {
 class ICore;
 }

src/plugins/cpptools/cpphoverhandler.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpphoverhandler.h"
 #include "cppmodelmanager.h"
 

src/plugins/cpptools/cpphoverhandler.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPHOVERHANDLER_H
 #define CPPHOVERHANDLER_H
 

src/plugins/cpptools/cppmodelmanager.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #define _SCL_SECURE_NO_WARNINGS 1
 #include "pp.h"
 

src/plugins/cpptools/cppmodelmanager.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPMODELMANAGER_H
 #define CPPMODELMANAGER_H
 

src/plugins/cpptools/cppmodelmanagerinterface.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPMODELMANAGERINTERFACE_H
 #define CPPMODELMANAGERINTERFACE_H
 

src/plugins/cpptools/cppquickopenfilter.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cppquickopenfilter.h"
 
 #include <Literals.h>

src/plugins/cpptools/cppquickopenfilter.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPQUICKOPENFILTER_H
 #define CPPQUICKOPENFILTER_H
 

src/plugins/cpptools/cpptools.cpp

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #include "cpptools.h"
 #include "cppcodecompletion.h"
 #include "cpphoverhandler.h"

src/plugins/cpptools/cpptools.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLS_H
 #define CPPTOOLS_H
 

src/plugins/cpptools/cpptools_global.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLS_GLOBAL_H
 #define CPPTOOLS_GLOBAL_H
 

src/plugins/cpptools/cpptoolsconstants.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLSCONSTANTS_H
 #define CPPTOOLSCONSTANTS_H
 
@@ -43,7 +44,8 @@ const char * const C_SOURCE_MIMETYPE = "text/x-csrc";
 const char * const C_HEADER_MIMETYPE = "text/x-chdr";
 const char * const CPP_SOURCE_MIMETYPE = "text/x-c++src";
 const char * const CPP_HEADER_MIMETYPE = "text/x-c++hdr";
-}
-}
 
-#endif //CPPTOOLSCONSTANTS_H
+} // namespace Constants
+} // namespace CppTools
+
+#endif // CPPTOOLSCONSTANTS_H

src/plugins/cpptools/cpptoolseditorsupport.cpp

@@ -35,6 +35,7 @@
 #include "cppmodelmanager.h"
 
 #include <texteditor/itexteditor.h>
+
 #include <QTimer>
 
 using namespace CppTools::Internal;

src/plugins/cpptools/cpptoolseditorsupport.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef CPPTOOLSEDITORSUPPORT_H
 #define CPPTOOLSEDITORSUPPORT_H
 
@@ -81,7 +82,7 @@ private:
     QFuture<void> _documentParser;
 };
 
-} // end of namespace Internal
-} // end of namespace CppTools
+} // namespace Internal
+} // namespace CppTools
 
 #endif // CPPTOOLSEDITORSUPPORT_H

src/plugins/cpptools/rpp/pp-cctype.h

@@ -72,5 +72,3 @@ inline bool pp_isspace (int __ch)
 } // namespace rpp
 
 #endif // PP_CCTYPE_H
-
-// kate: space-indent on; indent-width 2; replace-tabs on;

src/plugins/cpptools/rpp/pp-client.h

@@ -30,6 +30,7 @@
 ** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
+
 #ifndef PP_CLIENT_H
 #define PP_CLIENT_H
 
@@ -64,6 +65,6 @@ public:
   virtual void stopSkippingBlocks(unsigned offset) = 0;
 };
 
-} // end of namespace rpp
+} // namespace rpp
 
 #endif // PP_CLIENT_H

src/plugins/cpptools/rpp/pp-engine.cpp

@@ -51,6 +51,7 @@
 */
 
 #include "pp.h"
+
 #include <Lexer.h>
 #include <Token.h>
 #include <QtDebug>

src/plugins/cpptools/rpp/pp-engine.h

@@ -54,6 +54,7 @@
 #define PP_ENGINE_H
 
 #include "pp-client.h"
+
 #include <Token.h>
 #include <QVector>
 

src/plugins/cpptools/rpp/pp-internal.h

@@ -56,26 +56,23 @@
 #include <QByteArray>
 
 namespace rpp {
+namespace _PP_internal {
 
-    namespace _PP_internal
-    {
+inline bool comment_p (const char *__first, const char *__last)
+{
+    if (__first == __last)
+        return false;
 
-        inline bool comment_p (const char *__first, const char *__last)
-        {
-            if (__first == __last)
-                return false;
+    if (*__first != '/')
+        return false;
 
-            if (*__first != '/')
-                return false;
+    if (++__first == __last)
+        return false;
 
-            if (++__first == __last)
-                return false;
-
-            return (*__first == '/' || *__first == '*');
-        }
-
-    } // _PP_internal
+    return (*__first == '/' || *__first == '*');
+}
 
+} // _PP_internal
 } // namespace rpp
 
 #endif // PP_INTERNAL_H

src/plugins/cpptools/rpp/pp-macro-expander.cpp

@@ -38,11 +38,11 @@
 using namespace rpp;
 
 MacroExpander::MacroExpander (Environment &env, pp_frame *frame)
-    : env (env), frame (frame),
-      lines (0), generated_lines (0)
+    : env(env), frame(frame),
+      lines(0), generated_lines(0)
 { }
 
-const QByteArray *MacroExpander::resolve_formal (const QByteArray &__name)
+const QByteArray *MacroExpander::resolve_formal(const QByteArray &__name)
 {
     if (! (frame && frame->expanding_macro))
         return 0;