C++: Renamed cppdeclfromdef.{cpp,h} to cppinsertdecldef.{cpp,h}

5 files changed, 7 insertions, 11 deletions

diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro
index 4e37070300..0e86ffeb8e 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
index f0ede56f5e..97ee79a640 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
index 8b71ef78c0..024359d086 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 9d1c080609..eb5dce7a11 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 56709c1cf6..9434dcf055 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>