summaryrefslogtreecommitdiffstats
path: root/parts/documentation
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 12:00:13 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-10-23 12:00:13 +0900
commit3a0f0172fb45826b6de854bd4f7c5a064b3c1cb5 (patch)
tree8de17bd08e5b6445a0355fccee7fb552b31a82ca /parts/documentation
parent0ffe0dfb29f3be5bb87b977b3a8ae1d9cd4346d5 (diff)
downloadtdevelop-3a0f0172fb45826b6de854bd4f7c5a064b3c1cb5.tar.gz
tdevelop-3a0f0172fb45826b6de854bd4f7c5a064b3c1cb5.zip
Removed 'CustomDocumentationTitles' option and made it active by default for all plugins. This relates to bug 1859.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'parts/documentation')
-rw-r--r--parts/documentation/addcatalogdlg.cpp8
-rw-r--r--parts/documentation/editcatalogdlg.cpp7
-rw-r--r--parts/documentation/interfaces/kdevdocumentationplugin.h1
-rw-r--r--parts/documentation/plugins/chm/docchmplugin.cpp1
-rw-r--r--parts/documentation/plugins/custom/doccustomplugin.cpp2
-rw-r--r--parts/documentation/plugins/doxygen/docdoxygenplugin.cpp2
-rw-r--r--parts/documentation/plugins/qt/docqtplugin.cpp2
7 files changed, 9 insertions, 14 deletions
diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp
index 21913089..6dfb6c07 100644
--- a/parts/documentation/addcatalogdlg.cpp
+++ b/parts/documentation/addcatalogdlg.cpp
@@ -99,10 +99,10 @@ void AddCatalogDlg::docTypeChanged( const TQString & )
DocumentationPlugin * plugin = this->plugin();
if ( plugin )
{
- titleLabel->setEnabled( plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles) );
- titleEdit->setEnabled( plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles) );
- locationURL->setMode( plugin->catalogLocatorProps().first );
- locationURL->setFilter( plugin->catalogLocatorProps().second );
+ titleLabel->setEnabled(true);
+ titleEdit->setEnabled(true);
+ locationURL->setMode(plugin->catalogLocatorProps().first);
+ locationURL->setFilter(plugin->catalogLocatorProps().second);
}
}
diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp
index 8bdc19d5..25a5b588 100644
--- a/parts/documentation/editcatalogdlg.cpp
+++ b/parts/documentation/editcatalogdlg.cpp
@@ -32,11 +32,8 @@ EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
const char* name, bool modal, WFlags fl)
:EditCatalogBase(parent,name, modal,fl), m_plugin(plugin)
{
- if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles))
- {
- titleLabel->setEnabled(true);
- titleEdit->setEnabled(true);
- }
+ titleLabel->setEnabled(true);
+ titleEdit->setEnabled(true);
locationURL->setMode(m_plugin->catalogLocatorProps().first);
locationURL->setFilter(m_plugin->catalogLocatorProps().second);
}
diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h
index dcdc3f9a..00ba207d 100644
--- a/parts/documentation/interfaces/kdevdocumentationplugin.h
+++ b/parts/documentation/interfaces/kdevdocumentationplugin.h
@@ -222,7 +222,6 @@ public:
/**Capability of documentation plugin.*/
enum Capability { Index=1 /**<index can be built for catalogs*/,
FullTextSearch=2 /**<full text search is possible in catalog locations*/,
- CustomDocumentationTitles=4 /**<user can specify titles for documentation catalogs*/,
ProjectDocumentation=8 /**<plugin can handle project API documentation*/,
ProjectUserManual=16 /**<plugin can handle project user manual*/ };
/**Possible project documentation types.*/
diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp
index 753705bd..cbd89a60 100644
--- a/parts/documentation/plugins/chm/docchmplugin.cpp
+++ b/parts/documentation/plugins/chm/docchmplugin.cpp
@@ -42,7 +42,6 @@ DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // a
)
:DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name)
{
- setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation
autoSetup();
}
diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp
index fa2b14a6..110b0cb0 100644
--- a/parts/documentation/plugins/custom/doccustomplugin.cpp
+++ b/parts/documentation/plugins/custom/doccustomplugin.cpp
@@ -36,7 +36,7 @@ DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStr
)
:DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name)
{
- setCapabilities(CustomDocumentationTitles | ProjectUserManual);
+ setCapabilities(ProjectUserManual);
autoSetup();
}
diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
index 0359bb22..1a6c98c5 100644
--- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
+++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp
@@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
:DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name)
{
- setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles );
+ setCapabilities(Index | FullTextSearch | ProjectDocumentation);
autoSetup();
}
diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp
index 8ee2a139..2a7ddae8 100644
--- a/parts/documentation/plugins/qt/docqtplugin.cpp
+++ b/parts/documentation/plugins/qt/docqtplugin.cpp
@@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
:DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name)
{
- setCapabilities(Index | FullTextSearch | CustomDocumentationTitles);
+ setCapabilities(Index | FullTextSearch);
autoSetup();
}