diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:23:08 -0600 |
| commit | 8856e75c203aa69be210b2fee1095ab9761aca7e (patch) | |
| tree | d59810016bc093e8dd7f2f886f07c45fa25447a5 /khexedit | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khexedit')
| -rw-r--r-- | khexedit/main.cc | 4 | ||||
| -rw-r--r-- | khexedit/parts/kpart/khepartfactory.cpp | 12 | ||||
| -rw-r--r-- | khexedit/parts/kpart/khepartfactory.h | 10 |
3 files changed, 13 insertions, 13 deletions
diff --git a/khexedit/main.cc b/khexedit/main.cc index 89d8203..0f5e644 100644 --- a/khexedit/main.cc +++ b/khexedit/main.cc @@ -46,8 +46,8 @@ static uint parseDecimalOrHexadecimal( char *buf ); int main( int argc, char **argv ) { - KAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"), - version, description, KAboutData::License_GPL_V2, + TDEAboutData aboutData("khexedit", I18N_NOOP("KHexEdit"), + version, description, TDEAboutData::License_GPL_V2, "(c) 1999-2000, Espen Sand"); aboutData.addAuthor("Espen Sand",0, "espensa@online.no", "http://home.online.no/~espensa/khexedit/" ); 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 |