9 files changed, 34 insertions, 38 deletions
diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
index 0a78898d..f152b532 100644
--- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt
@@ -10,10 +10,10 @@
 #################################################
 
 set( _tarball_content
-    acconfig.h autogen.sh gtk2mm.glade main_window.cc
-    main_window_glade.hh Makefile.am app-Makefile.am
-    configure.in gtk2mm.gladep main_window.hh app.kdevelop
-    gtk2mm.cc main_window_glade.cc src-Makefile.am config.h
+    acconfig.h autogen.sh gtk2mm.glade main_window.cpp
+    main_window_glade.h Makefile.am app-Makefile.am
+    configure.in gtk2mm.gladep main_window.h app.kdevelop
+    gtk2mm.cpp main_window_glade.cpp src-Makefile.am config.h
     gtk2mmapp.png
 )
 list( SORT _tarball_content )
diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
index 2069ade7..16978c39 100644
--- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am
@@ -1,7 +1,7 @@
-dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \
-	main_window_glade.hh Makefile.am app-Makefile.am \
-	configure.in gtk2mm.gladep main_window.hh \
-	app.kdevelop gtk2mm.cc main_window_glade.cc\
+dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cpp \
+	main_window_glade.h Makefile.am app-Makefile.am \
+	configure.in gtk2mm.gladep main_window.h \
+	app.kdevelop gtk2mm.cpp main_window_glade.cpp\
 	src-Makefile.am config.h gtk2mmapp.png
 
 templateName = gtk2mmapp
@@ -18,4 +18,4 @@ $(templateName).tar.gz: ${dataFiles}
 archivedir = ${appwizarddatadir}
 archive_DATA = $(templateName).tar.gz ${templateName}.png
 
-CLEANFILES = *.tar.gz
-\ No newline at end of file
+CLEANFILES = *.tar.gz
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp
index 9845fede..30f39adf 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mm.cpp
@@ -2,7 +2,7 @@
 
 #include <gtkmm/main.h>
 
-#include "main_window.hh"
+#include "main_window.h"
 
 int main(int argc, char **argv)
 {  
diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
index 35b51993..68b119a2 100644
--- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
+++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate
@@ -71,28 +71,28 @@ Dest=%{dest}/src/Makefile.am
 
 [FILE10]
 Type=install
-Source=%{src}/gtk2mm.cc
-Dest=%{dest}/src/%{APPNAMELC}.cc
+Source=%{src}/gtk2mm.cpp
+Dest=%{dest}/src/%{APPNAMELC}.cpp
 
 [FILE11]
 Type=install
-Source=%{src}/main_window.hh
-Dest=%{dest}/src/main_window.hh
+Source=%{src}/main_window.h
+Dest=%{dest}/src/main_window.h
 
 [FILE12]
 Type=install
-Source=%{src}/main_window.cc
-Dest=%{dest}/src/main_window.cc
+Source=%{src}/main_window.cpp
+Dest=%{dest}/src/main_window.cpp
 
 [FILE13]
 Type=install
-Source=%{src}/main_window_glade.hh
-Dest=%{dest}/src/main_window_glade.hh
+Source=%{src}/main_window_glade.h
+Dest=%{dest}/src/main_window_glade.h
 
 [FILE14]
 Type=install
-Source=%{src}/main_window_glade.cc
-Dest=%{dest}/src/main_window_glade.cc
+Source=%{src}/main_window_glade.cpp
+Dest=%{dest}/src/main_window_glade.cpp
 
 [MSG]
 Type=message
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.cc b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp
index ad36b327..3a7df9cf 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.cpp
@@ -1,11 +1,9 @@
 %{CC_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.cc_new
-
 // This file is for your program, I won't touch it again!
 
 #include "config.h"
-#include "main_window.hh"
+#include "main_window.h"
 
 bool main_window::quit(GdkEventAny *ev)
 {  return 0;
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window.hh b/languages/cpp/app_templates/gtk2mmapp/main_window.h
index 640e1461..85daad4b 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window.h
@@ -1,16 +1,14 @@
 %{HH_TEMPLATE}
 
-// newer (non customized) versions of this file go to main_window.hh_new
-
 // you might replace
 //    class foo : public foo_glade { ... };
 // by
 //    typedef foo_glade foo;
 // if you didn't make any modifications to the widget
 
-#ifndef _MAIN_WINDOW_HH
-#  include "main_window_glade.hh"
-#  define _MAIN_WINDOW_HH
+#ifndef _MAIN_WINDOW_H
+#  include "main_window_glade.h"
+#  define _MAIN_WINDOW_H
 class main_window : public main_window_glade
 {
 
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp
index 829855a8..5bed4679 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cc
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.cpp
@@ -3,7 +3,7 @@
 // DO NOT EDIT THIS FILE ! It was created using glade-- 
 // for gtk 2.8.3 and gtkmm 2.8.0
 //
-// Please modify the corresponding derived classes in ./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.cpp
 
 
 #if defined __GNUC__ && __GNUC__ < 3
@@ -18,7 +18,7 @@
 #else //gtkmm 2.2
 #define GMM_GTKMM_22_24(a,b) a
 #endif //
-#include "main_window_glade.hh"
+#include "main_window_glade.h"
 #include <gdk/gdkkeysyms.h>
 #include <gtkmm/accelgroup.h>
 
diff --git a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h
index 3c0cc27a..726409b4 100644
--- a/languages/cpp/app_templates/gtk2mmapp/main_window_glade.hh
+++ b/languages/cpp/app_templates/gtk2mmapp/main_window_glade.h
@@ -3,10 +3,10 @@
 // DO NOT EDIT THIS FILE ! It was created using glade--
 // for gtk 2.8.3 and gtkmm 2.8.0
 //
-// Please modify the corresponding derived classes in ./src/main_window.hh and./src/main_window.cc
+// Please modify the corresponding derived classes in ./src/main_window.h and./src/main_window.cpp
 
-#ifndef _MAIN_WINDOW_GLADE_HH
-#  define _MAIN_WINDOW_GLADE_HH
+#ifndef _MAIN_WINDOW_GLADE_H
+#  define _MAIN_WINDOW_GLADE_H
 
 
 #if !defined(GLADEMM_DATA)
diff --git a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
index a8c856e9..e61b92f5 100644
--- a/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
+++ b/languages/cpp/app_templates/gtk2mmapp/src-Makefile.am
@@ -1,13 +1,13 @@
 bin_PROGRAMS = %{APPNAMELC}
 
 %{APPNAMELC}_SOURCES = \
-	%{APPNAMELC}.cc\
-	main_window_glade.cc \
-	main_window.cc 
+	%{APPNAMELC}.cpp\
+	main_window_glade.cpp \
+	main_window.cpp 
 
 noinst_HEADERS = \
-	main_window_glade.hh \
-	main_window.hh 
+	main_window_glade.h \
+	main_window.h 
 
 AM_CXXFLAGS = @CXXFLAGS@ @GTKMM_CFLAGS@