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/opieapp/CMakeLists.txt |   2 +-
 languages/cpp/app_templates/opieapp/Makefile.am    |   2 +-
 languages/cpp/app_templates/opieapp/app.kdevelop   | 143 +++++++++++++++++++++
 languages/cpp/app_templates/opieapp/app.tdevelop   | 143 ---------------------
 .../cpp/app_templates/opieapp/opieapp.kdevtemplate |   4 +-
 5 files changed, 147 insertions(+), 147 deletions(-)
 create mode 100644 languages/cpp/app_templates/opieapp/app.kdevelop
 delete mode 100644 languages/cpp/app_templates/opieapp/app.tdevelop

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

diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt
index 4f2b2824..1e8ce9db 100644
--- a/languages/cpp/app_templates/opieapp/CMakeLists.txt
+++ b/languages/cpp/app_templates/opieapp/CMakeLists.txt
@@ -11,7 +11,7 @@
 
 add_custom_target( opieapp.tar.gz ALL
   COMMAND tar zcf opieapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
-    Example.png app.tdevelop example.desktop Makefile.am
+    Example.png app.kdevelop example.desktop Makefile.am
     app.pro example.cpp example.h examplebase.ui
 )
 
diff --git a/languages/cpp/app_templates/opieapp/Makefile.am b/languages/cpp/app_templates/opieapp/Makefile.am
index 10a1f2a1..643a1c29 100644
--- a/languages/cpp/app_templates/opieapp/Makefile.am
+++ b/languages/cpp/app_templates/opieapp/Makefile.am
@@ -1,4 +1,4 @@
-dataFiles = Example.png  app.tdevelop  example.desktop   Makefile.am  \
+dataFiles = Example.png  app.kdevelop  example.desktop   Makefile.am  \
 	app.pro example.cpp example.h examplebase.ui
 
 templateName = opieapp
diff --git a/languages/cpp/app_templates/opieapp/app.kdevelop b/languages/cpp/app_templates/opieapp/app.kdevelop
new file mode 100644
index 00000000..69b6f2bc
--- /dev/null
+++ b/languages/cpp/app_templates/opieapp/app.kdevelop
@@ -0,0 +1,143 @@
+<?xml version="1.0"?>
+<kdevelop>
+  <general>
+    <author>%{AUTHOR}</author>
+    <email>%{EMAIL}</email>
+    <version>%{VERSION}</version>
+    <projectmanagement>KDevTrollProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>Qt</keyword>
+      <keyword>C++</keyword>
+      <keyword>Code</keyword>
+    </keywords>
+    <ignoreparts/>
+  </general>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.ui" name="User Interface" />
+      <group pattern="*.png" name="Icons" />
+      <group pattern="*" name="Others" />
+    </groups>
+    <tree>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+    </tree>
+  </kdevfileview>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>gtk</toc>
+      <toc>gnustep</toc>
+      <toc>python</toc>
+      <toc>php</toc>
+      <toc>perl</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>kdev3api</toc>
+      <toc>sdl</toc>
+      <toc>w3c-svg</toc>
+      <toc>w3c-uaag10</toc>
+    </ignoretocs>
+      <ignoreqt_xml>
+      <toc>Guide to the Qt Translation Tools</toc>
+      <toc>qmake User Guide</toc>
+      <toc>Qt Assistant Manual</toc>
+      <toc>Qt Designer Manual</toc>
+      <toc>Qt Referrence Documentation</toc>
+    </ignoreqt_xml>
+    <ignoredevhelp>
+      <toc>bonobo-activation</toc>
+      <toc>gconf</toc>
+      <toc>gtksourceview</toc>
+      <toc>libbonobo</toc>
+      <toc>libbonoboui</toc>
+    </ignoredevhelp>
+  </kdevdoctreeview>
+  <kdevdebugger>
+    <general>
+      <dbgshell></dbgshell>
+      <programargs>-qws</programargs>
+      <gdbpath/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+    </display>
+  </kdevdebugger>
+  <kdevtrollproject>
+    <opie>
+	<quick_app>true</quick_app>
+    </opie>
+    <packaging>
+	<template>0</template>
+ 	<appcategory>Applications</appcategory>
+	<owner>
+		<package>%{APPNAMELC}</package>
+        	<prio>0</prio>
+	        <section>opie/application</section>
+        	<maintainer>%{AUTHOR} %{EMAIL}</maintainer>
+	        <arch>arm</arch>
+	        <depends>task-opie-minimal</depends>
+	        <version>%{VERSION}</version>
+	        <desc>Empty</desc>
+	</owner>
+    </packaging>
+    <general>
+      <activedir></activedir>
+    </general>
+    <run>
+      <mainprogram>./%{APPNAMELC}</mainprogram>
+      <programargs>-qws</programargs>
+    </run>
+    <envvars/>
+  </kdevtrollproject>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+	<type ext="ui" />
+	<type ext="cpp" />
+	<type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <cppsupportpart>
+    <codecompletion>
+      <codehinting outputview="1" enablech="0" selectview="0" />
+    </codecompletion>
+    <classstore>
+      <enablepcs>false</enablepcs>
+      <enablepp>false</enablepp>
+      <preparsing/>
+    </classstore>
+    <filetemplates>
+      <choosefiles>false</choosefiles>
+      <interfaceURL></interfaceURL>
+      <implementationURL></implementationURL>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+      <lowercasefilenames>true</lowercasefilenames>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevclassview>
+    <folderhierarchy>true</folderhierarchy>
+    <depthoffolders>2</depthoffolders>
+  </kdevclassview>
+  <kdevcvs>
+    <cvsoptions>-f</cvsoptions>
+    <commitoptions></commitoptions>
+    <updateoptions>-dP</updateoptions>
+    <addoptions></addoptions>
+    <removeoptions>-f</removeoptions>
+    <diffoptions>-u3 -p</diffoptions>
+    <logoptions></logoptions>
+    <rshoptions></rshoptions>
+  </kdevcvs>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/opieapp/app.tdevelop b/languages/cpp/app_templates/opieapp/app.tdevelop
deleted file mode 100644
index 9bdb127e..00000000
--- a/languages/cpp/app_templates/opieapp/app.tdevelop
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-<tdevelop>
-  <general>
-    <author>%{AUTHOR}</author>
-    <email>%{EMAIL}</email>
-    <version>%{VERSION}</version>
-    <projectmanagement>KDevTrollProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>Qt</keyword>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-    </keywords>
-    <ignoreparts/>
-  </general>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
-      <group pattern="*.ui" name="User Interface" />
-      <group pattern="*.png" name="Icons" />
-      <group pattern="*" name="Others" />
-    </groups>
-    <tree>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-    </tree>
-  </kdevfileview>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>gtk</toc>
-      <toc>gnustep</toc>
-      <toc>python</toc>
-      <toc>php</toc>
-      <toc>perl</toc>
-      <toc>w3c-dom-level2-html</toc>
-      <toc>kdev3api</toc>
-      <toc>sdl</toc>
-      <toc>w3c-svg</toc>
-      <toc>w3c-uaag10</toc>
-    </ignoretocs>
-      <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>qmake User Guide</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Referrence Documentation</toc>
-    </ignoreqt_xml>
-    <ignoredevhelp>
-      <toc>bonobo-activation</toc>
-      <toc>gconf</toc>
-      <toc>gtksourceview</toc>
-      <toc>libbonobo</toc>
-      <toc>libbonoboui</toc>
-    </ignoredevhelp>
-  </kdevdoctreeview>
-  <kdevdebugger>
-    <general>
-      <dbgshell></dbgshell>
-      <programargs>-qws</programargs>
-      <gdbpath/>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-    </display>
-  </kdevdebugger>
-  <kdevtrollproject>
-    <opie>
-	<quick_app>true</quick_app>
-    </opie>
-    <packaging>
-	<template>0</template>
- 	<appcategory>Applications</appcategory>
-	<owner>
-		<package>%{APPNAMELC}</package>
-        	<prio>0</prio>
-	        <section>opie/application</section>
-        	<maintainer>%{AUTHOR} %{EMAIL}</maintainer>
-	        <arch>arm</arch>
-	        <depends>task-opie-minimal</depends>
-	        <version>%{VERSION}</version>
-	        <desc>Empty</desc>
-	</owner>
-    </packaging>
-    <general>
-      <activedir></activedir>
-    </general>
-    <run>
-      <mainprogram>./%{APPNAMELC}</mainprogram>
-      <programargs>-qws</programargs>
-    </run>
-    <envvars/>
-  </kdevtrollproject>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-	<type ext="ui" />
-	<type ext="cpp" />
-	<type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <cppsupportpart>
-    <codecompletion>
-      <codehinting outputview="1" enablech="0" selectview="0" />
-    </codecompletion>
-    <classstore>
-      <enablepcs>false</enablepcs>
-      <enablepp>false</enablepp>
-      <preparsing/>
-    </classstore>
-    <filetemplates>
-      <choosefiles>false</choosefiles>
-      <interfaceURL></interfaceURL>
-      <implementationURL></implementationURL>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-      <lowercasefilenames>true</lowercasefilenames>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevclassview>
-    <folderhierarchy>true</folderhierarchy>
-    <depthoffolders>2</depthoffolders>
-  </kdevclassview>
-  <kdevcvs>
-    <cvsoptions>-f</cvsoptions>
-    <commitoptions></commitoptions>
-    <updateoptions>-dP</updateoptions>
-    <addoptions></addoptions>
-    <removeoptions>-f</removeoptions>
-    <diffoptions>-u3 -p</diffoptions>
-    <logoptions></logoptions>
-    <rshoptions></rshoptions>
-  </kdevcvs>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
index fc492b55..ee99b7b6 100644
--- a/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
+++ b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate
@@ -69,8 +69,8 @@ Archive=opieapp.tar.gz
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [MkDir0]
 Type=mkdir
-- 
cgit v1.2.3