summaryrefslogtreecommitdiffstats
path: root/khexedit/parts/kpart
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:23:08 -0600
commit8856e75c203aa69be210b2fee1095ab9761aca7e (patch)
treed59810016bc093e8dd7f2f886f07c45fa25447a5 /khexedit/parts/kpart
parented70cd1b539ac2e02319b55183a5be7a28f2d116 (diff)
downloadtdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz
tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/parts/kpart')
-rw-r--r--khexedit/parts/kpart/khepartfactory.cpp12
-rw-r--r--khexedit/parts/kpart/khepartfactory.h10
2 files changed, 11 insertions, 11 deletions
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index d3bac6c..4f6cd8f 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -38,8 +38,8 @@ static const char FWHKEmailAddress[] = "Friedrich.W.H@Kossebau.de";
// static const char FWHKWebAddress[] = "http://www.kossebau.de";
-KInstance* KHexEditPartFactory::s_instance = 0L;
-KAboutData* KHexEditPartFactory::s_about = 0L;
+TDEInstance* KHexEditPartFactory::s_instance = 0L;
+TDEAboutData* KHexEditPartFactory::s_about = 0L;
KHexEditPartFactory::KHexEditPartFactory()
@@ -72,14 +72,14 @@ KParts::Part* KHexEditPartFactory::createPartObject( TQWidget *ParentWidget, con
}
-KInstance* KHexEditPartFactory::instance()
+TDEInstance* KHexEditPartFactory::instance()
{
if( !s_instance )
{
- s_about = new KAboutData( PartId, PartName, PartVersion, PartDescription,
- KAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress );
+ s_about = new TDEAboutData( PartId, PartName, PartVersion, PartDescription,
+ TDEAboutData::License_GPL_V2, PartCopyright, 0, 0, FWHKEmailAddress );
s_about->addAuthor( FWHKName, FWHKTask, FWHKEmailAddress );
- s_instance = new KInstance( s_about );
+ s_instance = new TDEInstance( s_about );
}
return s_instance;
}
diff --git a/khexedit/parts/kpart/khepartfactory.h b/khexedit/parts/kpart/khepartfactory.h
index 0883caa..a411acb 100644
--- a/khexedit/parts/kpart/khepartfactory.h
+++ b/khexedit/parts/kpart/khepartfactory.h
@@ -20,8 +20,8 @@
#include <kparts/factory.h>
-class KInstance;
-class KAboutData;
+class TDEInstance;
+class TDEAboutData;
class KHexEditPartFactory : public KParts::Factory
@@ -37,12 +37,12 @@ class KHexEditPartFactory : public KParts::Factory
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
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;
};
#endif