6 files changed, 17 insertions, 17 deletions
diff --git a/dcop/dcopidl/CMakeLists.txt b/dcop/dcopidl/CMakeLists.txt
index f3a8c5049..989a959be 100644
--- a/dcop/dcopidl/CMakeLists.txt
+++ b/dcop/dcopidl/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 set( target dcopidl )
 
 set( ${target}_SRCS
-  main.cpp yacc.cc scanner.cc
+  main.cpp yacc.cpp scanner.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/dcop/dcopidl/Makefile.am b/dcop/dcopidl/Makefile.am
index d896a4a34..7b071dd6a 100644
--- a/dcop/dcopidl/Makefile.am
+++ b/dcop/dcopidl/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = -DYYDEBUG
 
 bin_PROGRAMS = dcopidl
 
-dcopidl_SOURCES = main.cpp yacc.cc scanner.cc
-noinst_HEADERS = yacc.cc.h
+dcopidl_SOURCES = main.cpp yacc.cpp scanner.cpp
+noinst_HEADERS = yacc.cpp.h
 
 dcopidl_LDADD = $(LIB_TQT)
 dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
@@ -16,12 +16,12 @@ dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
 ####### Build rules
 
 parser:
-	cd $(srcdir) && flex -B -8 -oscanner.cc scanner.ll  ;\
-	bison -t -d -v -o yacc.cc yacc.yy && mv yacc.hh yacc.cc.h
+	cd $(srcdir) && flex -B -8 -oscanner.cpp scanner.ll  ;\
+	bison -t -d -v -o yacc.cpp yacc.yy && mv yacc.hh yacc.cpp.h
 
 check-local: 
 	$(srcdir)/run_test.sh $(srcdir)
 
 EXTRA_DIST = dcopidl_test.h scanner.ll yacc.yy
 
-MAINTAINERCLEANFILES = yacc.cc.output
+MAINTAINERCLEANFILES = yacc.cpp.output
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cpp
index 55a20aba3..4ff8d1ac3 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cpp
@@ -1,6 +1,6 @@
-#line 2 "scanner.cc"
+#line 2 "scanner.cpp"
 
-#line 4 "scanner.cc"
+#line 4 "scanner.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -940,7 +940,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
@@ -1026,7 +1026,7 @@ static char translate_char( const char *s )
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
-#line 1030 "scanner.cc"
+#line 1030 "scanner.cpp"
 
 #define INITIAL 0
 
@@ -1216,7 +1216,7 @@ YY_DECL
 #line 148 "scanner.ll"
 
 
-#line 1220 "scanner.cc"
+#line 1220 "scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -1767,7 +1767,7 @@ YY_RULE_SETUP
 #line 288 "scanner.ll"
 ECHO;
 	YY_BREAK
-#line 1771 "scanner.cc"
+#line 1771 "scanner.cpp"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index ad0f564e9..302da3e14 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cpp
index 615af46ef..4be32edd0 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cpp
@@ -134,7 +134,7 @@ void yyerror( const char *s )
 
 
 /* Line 189 of yacc.c  */
-#line 138 "yacc.cc"
+#line 138 "yacc.cpp"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -245,7 +245,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 249 "yacc.cc"
+#line 249 "yacc.cpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -257,7 +257,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 261 "yacc.cc"
+#line 261 "yacc.cpp"
 
 #ifdef short
 # undef short
@@ -3167,7 +3167,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 3171 "yacc.cc"
+#line 3171 "yacc.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/dcop/dcopidl/yacc.cc.h b/dcop/dcopidl/yacc.cpp.h
index 2a6c1b403..2a6c1b403 100644
--- a/dcop/dcopidl/yacc.cc.h
+++ b/dcop/dcopidl/yacc.cpp.h