summaryrefslogtreecommitdiffstats
path: root/parts/documentation/protocols/chm/kchmpart.cpp
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/protocols/chm/kchmpart.cpp
parent5c0390ebaa2be82d8684af5a6bc2b16740f4cc1b (diff)
downloadtdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.tar.gz
tdevelop-3a044decb0a5d7be822c888b2d5374573d7df96e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'parts/documentation/protocols/chm/kchmpart.cpp')
-rw-r--r--parts/documentation/protocols/chm/kchmpart.cpp12
1 files changed, 6 insertions, 6 deletions
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);