From 8b9c0d28fe084e8c7912a55f29052052edcfdd6e Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Wed, 17 Jun 2015 15:33:10 +0900
Subject: Revert to .kdevelop files with <kdevelop> entity name for project
 files. This resolves bug 2308.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit e044c5463329652f28565dfc7de24ef8b0edaa6f)
---
 languages/cpp/app_templates/kde4app/CMakeLists.txt |   4 +-
 languages/cpp/app_templates/kde4app/Makefile.am    |   2 +-
 .../cpp/app_templates/kde4app/kde4app.kdevelop     | 205 +++++++++++++++++++++
 .../kde4app/kde4app.kdevelop.filelist              |  13 ++
 .../cpp/app_templates/kde4app/kde4app.kdevtemplate |   8 +-
 .../cpp/app_templates/kde4app/kde4app.tdevelop     | 205 ---------------------
 .../kde4app/kde4app.tdevelop.filelist              |  13 --
 7 files changed, 225 insertions(+), 225 deletions(-)
 create mode 100644 languages/cpp/app_templates/kde4app/kde4app.kdevelop
 create mode 100644 languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist
 delete mode 100644 languages/cpp/app_templates/kde4app/kde4app.tdevelop
 delete mode 100644 languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist

(limited to 'languages/cpp/app_templates/kde4app')

diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt
index 0399f045..078366fe 100644
--- a/languages/cpp/app_templates/kde4app/CMakeLists.txt
+++ b/languages/cpp/app_templates/kde4app/CMakeLists.txt
@@ -14,8 +14,8 @@ add_custom_target( kde4app.tar.gz ALL
     kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp
     kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc
     kde4app-CMakeLists.txt kapp4.desktop kapp4.kcfg
-    settings.kcfgc kde4app.png README kde4app.tdevelop
-    kde4app.tdevelop.filelist
+    settings.kcfgc kde4app.png README kde4app.kdevelop
+    kde4app.kdevelop.filelist
 )
 
 
diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am
index 455acd8d..2b39fcb4 100644
--- a/languages/cpp/app_templates/kde4app/Makefile.am
+++ b/languages/cpp/app_templates/kde4app/Makefile.am
@@ -1,6 +1,6 @@
 dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \
 	main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \
-	kde4app.png README kde4app.tdevelop kde4app.tdevelop.filelist
+	kde4app.png README kde4app.kdevelop kde4app.kdevelop.filelist
 
 templateName = kde4app
 
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
new file mode 100644
index 00000000..5168efbe
--- /dev/null
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevelop
@@ -0,0 +1,205 @@
+<?xml version = '1.0'?>
+<kdevelop>
+  <general>
+    <author>%{AUTHOR}</author>
+    <email>%{EMAIL}</email>
+    <version>%{VERSION}</version>
+    <projectmanagement>KDevCustomProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>C++</keyword>
+      <keyword>Code</keyword>
+      <keyword>Qt</keyword>
+      <keyword>KDE</keyword>
+    </keywords>
+    <projectname>%{APPNAMELC}</projectname>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description/>
+    <ignoreparts/>
+  </general>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.ui" name="User Interface" />
+      <group pattern="*.png" name="Icons" />
+      <group pattern="*.po;*.ts" name="Translations" />
+      <group pattern="*" name="Others" />
+    </groups>
+    <tree>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell>libtool</dbgshell>
+      <programargs/>
+      <gdbpath/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+      <runappinappdirectory>true</runappinappdirectory>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+    </display>
+  </kdevdebugger>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+      <type ext="ui" />
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevcvs>
+    <cvsoptions>-f</cvsoptions>
+    <commitoptions/>
+    <updateoptions>-dP</updateoptions>
+    <addoptions/>
+    <removeoptions>-f</removeoptions>
+    <diffoptions>-u3 -p</diffoptions>
+    <logoptions/>
+    <rshoptions/>
+  </kdevcvs>
+  <cppsupportpart>
+    <codecompletion/>
+    <filetemplates>
+      <choosefiles>false</choosefiles>
+      <interfaceURL/>
+      <implementationURL/>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+      <lowercasefilenames>true</lowercasefilenames>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevcustomproject>
+    <run>
+      <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram>
+      <programargs/>
+      <terminal>false</terminal>
+      <autocompile>false</autocompile>
+      <envvars>
+        <envvar value="" name="TDEDIRS" />
+        <envvar value="" name="TDEHOME" />
+        <envvar value="" name="LD_LIBRARY_PATH" />
+        <envvar value="" name="PATH" />
+        <envvar value="" name="PKG_CONFIG_PATH" />
+        <envvar value="" name="QT_PLUGIN_PATH" />
+      </envvars>
+      <autoinstall>false</autoinstall>
+      <autotdesu>false</autotdesu>
+      <globaldebugarguments/>
+      <useglobalprogram>true</useglobalprogram>
+      <globalcwd>%{dest}</globalcwd>
+      <directoryradio>executable</directoryradio>
+    </run>
+    <build>
+      <buildtool>make</buildtool>
+      <builddir>%{dest}/build</builddir>
+    </build>
+    <make>
+      <abortonerror>false</abortonerror>
+      <numberofjobs>1</numberofjobs>
+      <prio>0</prio>
+      <dontact>false</dontact>
+      <makebin>make</makebin>
+      <defaulttarget/>
+      <makeoptions/>
+      <selectedenvironment>default</selectedenvironment>
+      <environments>
+        <default>
+          <envvar value="" name="TDEDIRS" />
+          <envvar value="" name="TDEHOME" />
+          <envvar value="" name="LD_LIBRARY_PATH" />
+          <envvar value="" name="PATH" />
+          <envvar value="" name="PKG_CONFIG_PATH" />
+          <envvar value="" name="QT_PLUGIN_PATH" />
+        </default>
+      </environments>
+    </make>
+    <filetypes>
+      <filetype>*.h</filetype>
+      <filetype>*.cpp</filetype>
+      <filetype>CMakeLists.txt</filetype>
+      <filetype>*.desktop</filetype>
+      <filetype>*.kcfg*</filetype>
+      <filetype>*.ui</filetype>
+      <filetype>Doxyfile</filetype>
+      <filetype>*.dox</filetype>
+      <filetype>*.rc</filetype>
+      <filetype>*.cmake</filetype>
+    </filetypes>
+    <other>
+      <prio>0</prio>
+      <otherbin/>
+      <defaulttarget/>
+      <otheroptions/>
+      <selectedenvironment>default</selectedenvironment>
+      <environments>
+        <default/>
+      </environments>
+    </other>
+    <blacklist>
+        <path>build</path>
+    </blacklist>
+  </kdevcustomproject>
+  <kdevcppsupport>
+    <qt>
+      <used>true</used>
+      <version>4</version>
+      <includestyle>4</includestyle>
+      <designerintegration>ExternalDesigner</designerintegration>
+      <designer>/usr/bin/designer-qt4</designer>
+      <root>/usr/lib/qt4</root>
+    </qt>
+  </kdevcppsupport>
+  <kdevclassview>
+    <folderhierarchy>true</folderhierarchy>
+    <depthoffolders>2</depthoffolders>
+  </kdevclassview>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist
new file mode 100644
index 00000000..5235563f
--- /dev/null
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevelop.filelist
@@ -0,0 +1,13 @@
+# KDevelop Custom Project File List
+CMakeLists.txt
+main.cpp
+prefs_base.ui
+settings.kcfgc
+%{APPNAMELC}.cpp
+%{APPNAMELC}.desktop
+%{APPNAMELC}.h
+%{APPNAMELC}.kcfg
+%{APPNAMELC}ui.rc
+%{APPNAMELC}view.cpp
+%{APPNAMELC}view.h
+%{APPNAMELC}view_base.ui
diff --git a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
index 1516e92e..2a7269fd 100644
--- a/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
+++ b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate
@@ -119,13 +119,13 @@ Dest=%{dest}/README
 
 [FILE14]
 Type=install
-Source=%{src}/kde4app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/kde4app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE15]
 Type=install
-Source=%{src}/kde4app.tdevelop.filelist
-Dest=%{dest}/%{APPNAMELC}.tdevelop.filelist
+Source=%{src}/kde4app.kdevelop.filelist
+Dest=%{dest}/%{APPNAMELC}.kdevelop.filelist
 
 [MKDIR1]
 Type=mkdir
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.tdevelop
deleted file mode 100644
index d332fa06..00000000
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop
+++ /dev/null
@@ -1,205 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
-  <general>
-    <author>%{AUTHOR}</author>
-    <email>%{EMAIL}</email>
-    <version>%{VERSION}</version>
-    <projectmanagement>KDevCustomProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-      <keyword>Qt</keyword>
-      <keyword>KDE</keyword>
-    </keywords>
-    <projectname>%{APPNAMELC}</projectname>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
-    <ignoreparts/>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*.po;*.ts" name="Translations" />
-      <group pattern="*" name="Others" />
-    </groups>
-    <tree>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>ada</toc>
-      <toc>ada_bugs_gcc</toc>
-      <toc>bash</toc>
-      <toc>bash_bugs</toc>
-      <toc>clanlib</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>fortran_bugs_gcc</toc>
-      <toc>gnome1</toc>
-      <toc>gnustep</toc>
-      <toc>gtk</toc>
-      <toc>gtk_bugs</toc>
-      <toc>haskell</toc>
-      <toc>haskell_bugs_ghc</toc>
-      <toc>java_bugs_gcc</toc>
-      <toc>java_bugs_sun</toc>
-      <toc>pascal_bugs_fp</toc>
-      <toc>php</toc>
-      <toc>php_bugs</toc>
-      <toc>perl</toc>
-      <toc>perl_bugs</toc>
-      <toc>python</toc>
-      <toc>python_bugs</toc>
-      <toc>ruby</toc>
-      <toc>ruby_bugs</toc>
-      <toc>sdl</toc>
-      <toc>w3c-svg</toc>
-      <toc>sw</toc>
-      <toc>w3c-uaag10</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell>libtool</dbgshell>
-      <programargs/>
-      <gdbpath/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-      <runappinappdirectory>true</runappinappdirectory>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-    </display>
-  </kdevdebugger>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="ui" />
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevcvs>
-    <cvsoptions>-f</cvsoptions>
-    <commitoptions/>
-    <updateoptions>-dP</updateoptions>
-    <addoptions/>
-    <removeoptions>-f</removeoptions>
-    <diffoptions>-u3 -p</diffoptions>
-    <logoptions/>
-    <rshoptions/>
-  </kdevcvs>
-  <cppsupportpart>
-    <codecompletion/>
-    <filetemplates>
-      <choosefiles>false</choosefiles>
-      <interfaceURL/>
-      <implementationURL/>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-      <lowercasefilenames>true</lowercasefilenames>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcustomproject>
-    <run>
-      <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram>
-      <programargs/>
-      <terminal>false</terminal>
-      <autocompile>false</autocompile>
-      <envvars>
-        <envvar value="" name="TDEDIRS" />
-        <envvar value="" name="TDEHOME" />
-        <envvar value="" name="LD_LIBRARY_PATH" />
-        <envvar value="" name="PATH" />
-        <envvar value="" name="PKG_CONFIG_PATH" />
-        <envvar value="" name="QT_PLUGIN_PATH" />
-      </envvars>
-      <autoinstall>false</autoinstall>
-      <autotdesu>false</autotdesu>
-      <globaldebugarguments/>
-      <useglobalprogram>true</useglobalprogram>
-      <globalcwd>%{dest}</globalcwd>
-      <directoryradio>executable</directoryradio>
-    </run>
-    <build>
-      <buildtool>make</buildtool>
-      <builddir>%{dest}/build</builddir>
-    </build>
-    <make>
-      <abortonerror>false</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <prio>0</prio>
-      <dontact>false</dontact>
-      <makebin>make</makebin>
-      <defaulttarget/>
-      <makeoptions/>
-      <selectedenvironment>default</selectedenvironment>
-      <environments>
-        <default>
-          <envvar value="" name="TDEDIRS" />
-          <envvar value="" name="TDEHOME" />
-          <envvar value="" name="LD_LIBRARY_PATH" />
-          <envvar value="" name="PATH" />
-          <envvar value="" name="PKG_CONFIG_PATH" />
-          <envvar value="" name="QT_PLUGIN_PATH" />
-        </default>
-      </environments>
-    </make>
-    <filetypes>
-      <filetype>*.h</filetype>
-      <filetype>*.cpp</filetype>
-      <filetype>CMakeLists.txt</filetype>
-      <filetype>*.desktop</filetype>
-      <filetype>*.kcfg*</filetype>
-      <filetype>*.ui</filetype>
-      <filetype>Doxyfile</filetype>
-      <filetype>*.dox</filetype>
-      <filetype>*.rc</filetype>
-      <filetype>*.cmake</filetype>
-    </filetypes>
-    <other>
-      <prio>0</prio>
-      <otherbin/>
-      <defaulttarget/>
-      <otheroptions/>
-      <selectedenvironment>default</selectedenvironment>
-      <environments>
-        <default/>
-      </environments>
-    </other>
-    <blacklist>
-        <path>build</path>
-    </blacklist>
-  </kdevcustomproject>
-  <kdevcppsupport>
-    <qt>
-      <used>true</used>
-      <version>4</version>
-      <includestyle>4</includestyle>
-      <designerintegration>ExternalDesigner</designerintegration>
-      <designer>/usr/bin/designer-qt4</designer>
-      <root>/usr/lib/qt4</root>
-    </qt>
-  </kdevcppsupport>
-  <kdevclassview>
-    <folderhierarchy>true</folderhierarchy>
-    <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist
deleted file mode 100644
index 5235563f..00000000
--- a/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist
+++ /dev/null
@@ -1,13 +0,0 @@
-# KDevelop Custom Project File List
-CMakeLists.txt
-main.cpp
-prefs_base.ui
-settings.kcfgc
-%{APPNAMELC}.cpp
-%{APPNAMELC}.desktop
-%{APPNAMELC}.h
-%{APPNAMELC}.kcfg
-%{APPNAMELC}ui.rc
-%{APPNAMELC}view.cpp
-%{APPNAMELC}view.h
-%{APPNAMELC}view_base.ui
-- 
cgit v1.2.1