From 9a00b8ba27f2bfbe0ce9e09b8585822d9843e9f7 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen <erik.verbruggen@nokia.com> Date: Thu, 2 Sep 2010 15:17:57 +0200 Subject: [PATCH] C++: Renamed cppdeclfromdef.{cpp,h} to cppinsertdecldef.{cpp,h} --- src/plugins/cppeditor/cppeditor.pro | 4 ++-- .../cppeditor/{cppdeclfromdef.cpp => cppinsertdecldef.cpp} | 5 +---- .../cppeditor/{cppdeclfromdef.h => cppinsertdecldef.h} | 6 +++--- src/plugins/cppeditor/cppquickfix.cpp | 1 - src/plugins/cppeditor/cppquickfixes.cpp | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) rename src/plugins/cppeditor/{cppdeclfromdef.cpp => cppinsertdecldef.cpp} (98%) rename src/plugins/cppeditor/{cppdeclfromdef.h => cppinsertdecldef.h} (95%) diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index 4e370703003..0e86ffeb8e8 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -19,7 +19,7 @@ HEADERS += cppplugin.h \ cppchecksymbols.h \ cppsemanticinfo.h \ cppoutline.h \ - cppdeclfromdef.h \ + cppinsertdecldef.h \ cpplocalsymbols.h \ cpptypehierarchy.h \ cppelementevaluator.h @@ -35,7 +35,7 @@ SOURCES += cppplugin.cpp \ cppchecksymbols.cpp \ cppsemanticinfo.cpp \ cppoutline.cpp \ - cppdeclfromdef.cpp \ + cppinsertdecldef.cpp \ cpplocalsymbols.cpp \ cpptypehierarchy.cpp \ cppelementevaluator.cpp diff --git a/src/plugins/cppeditor/cppdeclfromdef.cpp b/src/plugins/cppeditor/cppinsertdecldef.cpp similarity index 98% rename from src/plugins/cppeditor/cppdeclfromdef.cpp rename to src/plugins/cppeditor/cppinsertdecldef.cpp index f0ede56f5e4..97ee79a640b 100644 --- a/src/plugins/cppeditor/cppdeclfromdef.cpp +++ b/src/plugins/cppeditor/cppinsertdecldef.cpp @@ -27,10 +27,7 @@ ** **************************************************************************/ -#include "cppdeclfromdef.h" - -#include <Literals.h> //### remove -#include <QDebug> //###remove +#include "cppinsertdecldef.h" #include <AST.h> #include <ASTVisitor.h> diff --git a/src/plugins/cppeditor/cppdeclfromdef.h b/src/plugins/cppeditor/cppinsertdecldef.h similarity index 95% rename from src/plugins/cppeditor/cppdeclfromdef.h rename to src/plugins/cppeditor/cppinsertdecldef.h index 8b71ef78c04..024359d0865 100644 --- a/src/plugins/cppeditor/cppdeclfromdef.h +++ b/src/plugins/cppeditor/cppinsertdecldef.h @@ -27,8 +27,8 @@ ** **************************************************************************/ -#ifndef CPPDECLFROMDEF_H -#define CPPDECLFROMDEF_H +#ifndef CPPINSERTDECLDEF_H +#define CPPINSERTDECLDEF_H #include "cppquickfix.h" @@ -56,4 +56,4 @@ protected: } // namespace Internal } // namespace CppEditor -#endif // CPPDECLFROMDEF_H +#endif // CPPINSERTDECLDEF_H diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp index 9d1c0806093..eb5dce7a114 100644 --- a/src/plugins/cppeditor/cppquickfix.cpp +++ b/src/plugins/cppeditor/cppquickfix.cpp @@ -29,7 +29,6 @@ #include "cppquickfix.h" #include "cppeditor.h" -#include "cppdeclfromdef.h" #include <AST.h> #include <TranslationUnit.h> diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp index 56709c1cf6f..9434dcf0555 100644 --- a/src/plugins/cppeditor/cppquickfixes.cpp +++ b/src/plugins/cppeditor/cppquickfixes.cpp @@ -29,7 +29,7 @@ #include "cppeditor.h" #include "cppquickfix.h" -#include "cppdeclfromdef.h" +#include "cppinsertdecldef.h" #include <ASTVisitor.h> #include <AST.h> -- GitLab