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

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

diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt
index 09d0bc52..9aa12a42 100644
--- a/languages/cpp/app_templates/win32gui/CMakeLists.txt
+++ b/languages/cpp/app_templates/win32gui/CMakeLists.txt
@@ -13,7 +13,7 @@ add_custom_target( win32gui.tar.gz ALL
   COMMAND tar zcf win32gui.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
     app.cpp src-Makefile.am win32gui-Makefile.am
     win32gui-Makefile.cvs win32gui-configure.in win32gui.png
-    app.tdevelop
+    app.kdevelop
 )
 
 
diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am
index a29fa6a8..66931bfd 100644
--- a/languages/cpp/app_templates/win32gui/Makefile.am
+++ b/languages/cpp/app_templates/win32gui/Makefile.am
@@ -1,5 +1,5 @@
 dataFiles = app.cpp src-Makefile.am win32gui-Makefile.am win32gui-Makefile.cvs \
-	win32gui-configure.in win32gui.png app.tdevelop
+	win32gui-configure.in win32gui.png app.kdevelop
 
 templateName = win32gui
 
diff --git a/languages/cpp/app_templates/win32gui/app.kdevelop b/languages/cpp/app_templates/win32gui/app.kdevelop
new file mode 100644
index 00000000..d219ec2c
--- /dev/null
+++ b/languages/cpp/app_templates/win32gui/app.kdevelop
@@ -0,0 +1,192 @@
+<?xml version = '1.0'?>
+<kdevelop>
+  <general>
+    <author>%{AUTHOR}</author>
+    <email>%{EMAIL}</email>
+    <version>%{VERSION}</version>
+    <projectmanagement>KDevAutoProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>C++</keyword>
+      <keyword>Code</keyword>
+    </keywords>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description></description>
+    <ignoreparts/>
+    <secondaryLanguages/>
+  </general>
+  <kdevautoproject>
+    <general>
+      <activetarget>src/%{APPNAMELC}</activetarget>
+      <useconfiguration>debug</useconfiguration>
+    </general>
+    <run>
+      <mainprogram>src/%{APPNAMELC}.exe</mainprogram>
+      <terminal>false</terminal>
+      <directoryradio>executable</directoryradio>
+      <customdirectory>/</customdirectory>
+      <programargs></programargs>
+      <autocompile>true</autocompile>
+      <envvars/>
+    </run>
+    <configurations>
+      <optimized>
+        <builddir>optimized</builddir>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevg77options</f77compiler>
+        <cxxflags>-O2 -g0</cxxflags>
+        <envvars>
+          <envvar value="i586-mingw32msvc-c" name="CC" />
+          <envvar value="i586-mingw32msvc-c++" name="CXX" />
+          <envvar value="i586-mingw32msvc-ld" name="LD" />
+        </envvars>
+        <configargs></configargs>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <f77flags></f77flags>
+      </optimized>
+      <debug>
+        <configargs>--enable-debug=full</configargs>
+        <builddir>debug</builddir>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevg77options</f77compiler>
+        <cxxflags>-O0 -g3</cxxflags>
+        <envvars>
+          <envvar value="i586-mingw32msvc-c" name="CC" />
+          <envvar value="i586-mingw32msvc-c++" name="CXX" />
+          <envvar value="i586-mingw32msvc-ld" name="LD" />
+        </envvars>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <f77flags></f77flags>
+      </debug>
+      <default>
+        <envvars>
+          <envvar value="i586-mingw32msvc-c" name="CC" />
+          <envvar value="i586-mingw32msvc-c++" name="CXX" />
+          <envvar value="i586-mingw32msvc-ld" name="LD" />
+        </envvars>
+        <configargs></configargs>
+        <builddir></builddir>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <cxxflags></cxxflags>
+        <f77flags></f77flags>
+      </default>
+    </configurations>
+    <make>
+      <envvars>
+        <envvar value="1" name="WANT_AUTOCONF_2_5" />
+        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
+      </envvars>
+      <abortonerror>true</abortonerror>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <prio>0</prio>
+    </make>
+  </kdevautoproject>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>clanlib</toc>
+      <toc>opengl</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>Guide to the Qt Translation Tools</toc>
+      <toc>Qt Assistant Manual</toc>
+      <toc>Qt Designer Manual</toc>
+      <toc>Qt Reference Documentation</toc>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+    <ignoredoxygen>
+      <toc>TDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+  </kdevdoctreeview>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.h" name="Header files" />
+      <group pattern="*.cpp" name="Source files" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+    </tree>
+  </kdevfileview>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevcppsupport>
+    <codecompletion>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
+      <automaticCodeCompletion>true</automaticCodeCompletion>
+      <automaticArgumentsHint>true</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+      <headerCompletionDelay>250</headerCompletionDelay>
+    </codecompletion>
+    <references>
+      <pcs>Qt</pcs>
+      <pcs>TDElibs</pcs>
+      <pcs>ksjembed</pcs>
+    </references>
+  </kdevcppsupport>
+  <kdevdebugger>
+    <general>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
+      <dbgshell></dbgshell>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>false</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>%{APPNAMELC}.tag</docurl>
+    </projectdoc>
+  </kdevdocumentation>
+</kdevelop>
diff --git a/languages/cpp/app_templates/win32gui/app.tdevelop b/languages/cpp/app_templates/win32gui/app.tdevelop
deleted file mode 100644
index eb9bbdbd..00000000
--- a/languages/cpp/app_templates/win32gui/app.tdevelop
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
-  <general>
-    <author>%{AUTHOR}</author>
-    <email>%{EMAIL}</email>
-    <version>%{VERSION}</version>
-    <projectmanagement>KDevAutoProject</projectmanagement>
-    <primarylanguage>C++</primarylanguage>
-    <keywords>
-      <keyword>C++</keyword>
-      <keyword>Code</keyword>
-    </keywords>
-    <projectdirectory>.</projectdirectory>
-    <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
-    <ignoreparts/>
-    <secondaryLanguages/>
-  </general>
-  <kdevautoproject>
-    <general>
-      <activetarget>src/%{APPNAMELC}</activetarget>
-      <useconfiguration>debug</useconfiguration>
-    </general>
-    <run>
-      <mainprogram>src/%{APPNAMELC}.exe</mainprogram>
-      <terminal>false</terminal>
-      <directoryradio>executable</directoryradio>
-      <customdirectory>/</customdirectory>
-      <programargs></programargs>
-      <autocompile>true</autocompile>
-      <envvars/>
-    </run>
-    <configurations>
-      <optimized>
-        <builddir>optimized</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
-        <cxxflags>-O2 -g0</cxxflags>
-        <envvars>
-          <envvar value="i586-mingw32msvc-c" name="CC" />
-          <envvar value="i586-mingw32msvc-c++" name="CXX" />
-          <envvar value="i586-mingw32msvc-ld" name="LD" />
-        </envvars>
-        <configargs></configargs>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cflags></cflags>
-        <f77flags></f77flags>
-      </optimized>
-      <debug>
-        <configargs>--enable-debug=full</configargs>
-        <builddir>debug</builddir>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevg77options</f77compiler>
-        <cxxflags>-O0 -g3</cxxflags>
-        <envvars>
-          <envvar value="i586-mingw32msvc-c" name="CC" />
-          <envvar value="i586-mingw32msvc-c++" name="CXX" />
-          <envvar value="i586-mingw32msvc-ld" name="LD" />
-        </envvars>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cflags></cflags>
-        <f77flags></f77flags>
-      </debug>
-      <default>
-        <envvars>
-          <envvar value="i586-mingw32msvc-c" name="CC" />
-          <envvar value="i586-mingw32msvc-c++" name="CXX" />
-          <envvar value="i586-mingw32msvc-ld" name="LD" />
-        </envvars>
-        <configargs></configargs>
-        <builddir></builddir>
-        <topsourcedir></topsourcedir>
-        <cppflags></cppflags>
-        <ccompiler>kdevgccoptions</ccompiler>
-        <cxxcompiler>kdevgppoptions</cxxcompiler>
-        <f77compiler>kdevpgf77options</f77compiler>
-        <ccompilerbinary></ccompilerbinary>
-        <cxxcompilerbinary></cxxcompilerbinary>
-        <f77compilerbinary></f77compilerbinary>
-        <cflags></cflags>
-        <cxxflags></cxxflags>
-        <f77flags></f77flags>
-      </default>
-    </configurations>
-    <make>
-      <envvars>
-        <envvar value="1" name="WANT_AUTOCONF_2_5" />
-        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
-      </envvars>
-      <abortonerror>true</abortonerror>
-      <numberofjobs>1</numberofjobs>
-      <dontact>false</dontact>
-      <makebin/>
-      <prio>0</prio>
-    </make>
-  </kdevautoproject>
-  <kdevdoctreeview>
-    <ignoretocs>
-      <toc>clanlib</toc>
-      <toc>opengl</toc>
-      <toc>wxwidgets_bugs</toc>
-    </ignoretocs>
-    <ignoreqt_xml>
-      <toc>Guide to the Qt Translation Tools</toc>
-      <toc>Qt Assistant Manual</toc>
-      <toc>Qt Designer Manual</toc>
-      <toc>Qt Reference Documentation</toc>
-      <toc>qmake User Guide</toc>
-    </ignoreqt_xml>
-    <ignoredoxygen>
-      <toc>TDE Libraries (Doxygen)</toc>
-    </ignoredoxygen>
-  </kdevdoctreeview>
-  <kdevfilecreate>
-    <filetypes/>
-    <useglobaltypes>
-      <type ext="cpp" />
-      <type ext="h" />
-    </useglobaltypes>
-  </kdevfilecreate>
-  <kdevfileview>
-    <groups>
-      <group pattern="*.h" name="Header files" />
-      <group pattern="*.cpp" name="Source files" />
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidenonlocation>false</hidenonlocation>
-    </groups>
-    <tree>
-      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
-      <hidenonprojectfiles>false</hidenonprojectfiles>
-    </tree>
-  </kdevfileview>
-  <cppsupportpart>
-    <filetemplates>
-      <interfacesuffix>.h</interfacesuffix>
-      <implementationsuffix>.cpp</implementationsuffix>
-    </filetemplates>
-  </cppsupportpart>
-  <kdevcppsupport>
-    <codecompletion>
-      <includeGlobalFunctions>true</includeGlobalFunctions>
-      <includeTypes>true</includeTypes>
-      <includeEnums>true</includeEnums>
-      <includeTypedefs>false</includeTypedefs>
-      <automaticCodeCompletion>true</automaticCodeCompletion>
-      <automaticArgumentsHint>true</automaticArgumentsHint>
-      <automaticHeaderCompletion>true</automaticHeaderCompletion>
-      <codeCompletionDelay>250</codeCompletionDelay>
-      <argumentsHintDelay>400</argumentsHintDelay>
-      <headerCompletionDelay>250</headerCompletionDelay>
-    </codecompletion>
-    <references>
-      <pcs>Qt</pcs>
-      <pcs>TDElibs</pcs>
-      <pcs>ksjembed</pcs>
-    </references>
-  </kdevcppsupport>
-  <kdevdebugger>
-    <general>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <dbgshell></dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
-      <breakonloadinglibs>true</breakonloadinglibs>
-      <separatetty>false</separatetty>
-      <floatingtoolbar>false</floatingtoolbar>
-    </general>
-    <display>
-      <staticmembers>false</staticmembers>
-      <demanglenames>true</demanglenames>
-      <outputradix>10</outputradix>
-    </display>
-  </kdevdebugger>
-  <kdevdocumentation>
-    <projectdoc>
-      <docsystem>Doxygen Documentation Collection</docsystem>
-      <docurl>%{APPNAMELC}.tag</docurl>
-    </projectdoc>
-  </kdevdocumentation>
-</tdevelop>
diff --git a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
index dec00262..31f528d3 100644
--- a/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
+++ b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate
@@ -73,8 +73,8 @@ File=%{tdevelop}/template-common/gnu.kdevtemplate
 [FILE1]
 Type=install
 EscapeXML=true
-Source=%{src}/app.tdevelop
-Dest=%{dest}/%{APPNAMELC}.tdevelop
+Source=%{src}/app.kdevelop
+Dest=%{dest}/%{APPNAMELC}.kdevelop
 
 [FILE2]
 Type=install
-- 
cgit v1.2.1