summaryrefslogtreecommitdiffstats
path: root/parts/documentation
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:50 -0600
commit3a044decb0a5d7be822c888b2d5374573d7df96e (patch)
treeddf4681e0233c25203fc927596aa7b3bdb5f2efa /parts/documentation
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'parts/documentation')
-rw-r--r--parts/documentation/plugins/djvu/docdjvuplugin.cpp2
-rw-r--r--parts/documentation/plugins/pdb/docpdbplugin.cpp2
-rw-r--r--parts/documentation/plugins/pdf/docpdfplugin.cpp2
-rw-r--r--parts/documentation/protocols/chm/chm.cpp2
-rw-r--r--parts/documentation/protocols/chm/kchmpart.cpp12
-rw-r--r--parts/documentation/protocols/chm/kchmpart.h12
-rw-r--r--parts/documentation/tools/htdig/htdigindex.cpp2
7 files changed, 17 insertions, 17 deletions
diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
index c93812ad..fca1b3b8 100644
--- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp
+++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp
@@ -27,7 +27,7 @@
#include <kdevgenericfactory.h>
-static const KAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0");
+static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0");
typedef KDevGenericFactory<DocDjvuPlugin> DocDjvuPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) )
diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp
index cddc9106..f252c03e 100644
--- a/parts/documentation/plugins/pdb/docpdbplugin.cpp
+++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp
@@ -27,7 +27,7 @@
#include <kdevgenericfactory.h>
-static const KAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0");
+static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0");
typedef KDevGenericFactory<DocPDBPlugin> DocPDBPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) )
diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp
index 898fcc0e..c6dcb8ee 100644
--- a/parts/documentation/plugins/pdf/docpdfplugin.cpp
+++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp
@@ -27,7 +27,7 @@
#include <kdevgenericfactory.h>
-static const KAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0");
+static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0");
typedef KDevGenericFactory<DocPDFPlugin> DocPDFPluginFactory;
K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) )
diff --git a/parts/documentation/protocols/chm/chm.cpp b/parts/documentation/protocols/chm/chm.cpp
index 1d7543c3..3f0fbc54 100644
--- a/parts/documentation/protocols/chm/chm.cpp
+++ b/parts/documentation/protocols/chm/chm.cpp
@@ -41,7 +41,7 @@ extern "C"
{
int kdemain( int argc, char **argv )
{
- KInstance instance( "kio_chm" );
+ TDEInstance instance( "kio_chm" );
kdDebug() << "*** Starting kio_chm " << endl;
diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp
index b1d9d166..c9c5f58e 100644
--- a/parts/documentation/protocols/chm/kchmpart.cpp
+++ b/parts/documentation/protocols/chm/kchmpart.cpp
@@ -32,8 +32,8 @@ extern "C"
}
}
-KInstance* KChmPartFactory::s_instance = 0L;
-KAboutData* KChmPartFactory::s_about = 0L;
+TDEInstance* KChmPartFactory::s_instance = 0L;
+TDEAboutData* KChmPartFactory::s_about = 0L;
KChmPartFactory::KChmPartFactory( TQObject* parent, const char* name )
: KParts::Factory( parent, name )
@@ -54,13 +54,13 @@ KParts::Part* KChmPartFactory::createPartObject( TQWidget *parentWidget, const c
return part;
}
-KInstance* KChmPartFactory::instance()
+TDEInstance* KChmPartFactory::instance()
{
if( !s_instance )
{
- s_about = new KAboutData( "kchmpart",
+ s_about = new TDEAboutData( "kchmpart",
I18N_NOOP( "KChm" ), "1.0pre" );
- s_instance = new KInstance( s_about );
+ s_instance = new TDEInstance( s_about );
}
return s_instance;
}
@@ -69,7 +69,7 @@ KInstance* KChmPartFactory::instance()
KChmPart::KChmPart( TQWidget * parent, const char * name )
: KDevHTMLPart( ), m_job(0)
{
- KInstance * instance = new KInstance( "kchmpart" );
+ TDEInstance * instance = new TDEInstance( "kchmpart" );
setInstance( instance );
m_extension=new KParts::BrowserExtension(this);
setOptions(-1);
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 5c4369c3..3ed054fe 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -27,8 +27,8 @@
#include <tqcstring.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KChmPartFactory: public KParts::Factory
{
@@ -43,11 +43,11 @@ class KChmPartFactory: public KParts::Factory
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
- static KInstance *instance();
+ static TDEInstance *instance();
private:
- static KInstance *s_instance;
- static KAboutData *s_about;
+ static TDEInstance *s_instance;
+ static TDEAboutData *s_about;
};
@@ -69,7 +69,7 @@ class KChmPart : public KDevHTMLPart
*/
protected:
//virtual bool openFile();
- KInstance *m_instance;
+ TDEInstance *m_instance;
KParts::BrowserExtension *m_extension;
KIO::TransferJob *m_job;
TQCString m_htmlData;
diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp
index a728da7b..328a0387 100644
--- a/parts/documentation/tools/htdig/htdigindex.cpp
+++ b/parts/documentation/tools/htdig/htdigindex.cpp
@@ -450,7 +450,7 @@ int main(int argc, char *argv[])
KCmdLineLastOption
};
- KAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),
+ TDEAboutData aboutData("tdevelop-htdig", I18N_NOOP("TDevelop ht://Dig Indexer"),
"0.2", I18N_NOOP("TDE Index generator for documentation files."));
TDECmdLineArgs::init(argc, argv, &aboutData);