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 /ark | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ark')
| -rw-r--r-- | ark/ark_part.cpp | 6 | ||||
| -rw-r--r-- | ark/ark_part.h | 4 | ||||
| -rw-r--r-- | ark/arkfactory.cpp | 8 | ||||
| -rw-r--r-- | ark/arkfactory.h | 6 | ||||
| -rw-r--r-- | ark/main.cpp | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 456e397..77d329b 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -42,12 +42,12 @@ #include <tqfile.h> #include <tqtimer.h> -KAboutData *ArkPart::createAboutData() +TDEAboutData *ArkPart::createAboutData() { - KAboutData *about = new KAboutData("ark", I18N_NOOP("ark"), + TDEAboutData *about = new TDEAboutData("ark", I18N_NOOP("ark"), "1.0", I18N_NOOP("Ark KParts Component"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP( "(c) 1997-2003, The Various Ark Developers" )); about->addAuthor("Robert Palmbos",0, "palm9744@kettering.edu"); about->addAuthor("Francois-Xavier Duranceau",0, "duranceau@kde.org"); diff --git a/ark/ark_part.h b/ark/ark_part.h index 1fa6166..5dce97c 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -32,7 +32,7 @@ #include <tqlabel.h> -class KAboutData; +class TDEAboutData; class KPushButton; class ArkWidget; @@ -94,7 +94,7 @@ public: const char *name, const TQStringList &, bool readWrite ); virtual ~ArkPart(); - static KAboutData* createAboutData(); + static TDEAboutData* createAboutData(); public slots: void fixEnables();//rename to slotFixEnables()... diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp index 3e17e7a..b92b4aa 100644 --- a/ark/arkfactory.cpp +++ b/ark/arkfactory.cpp @@ -25,8 +25,8 @@ #include "ark_part.h" #include "arkfactory.h" -KInstance* ArkFactory::s_instance = 0L; -KAboutData* ArkFactory::s_about = 0L; +TDEInstance* ArkFactory::s_instance = 0L; +TDEAboutData* ArkFactory::s_about = 0L; int ArkFactory::instanceNumber = 0; K_EXPORT_COMPONENT_FACTORY( libarkpart, ArkFactory ) @@ -55,13 +55,13 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget, return obj; } -KInstance* ArkFactory::instance() +TDEInstance* ArkFactory::instance() { instanceNumber++; if( !s_instance ) { s_about = ArkPart::createAboutData(); - s_instance = new KInstance( s_about ); + s_instance = new TDEInstance( s_about ); } return s_instance; } diff --git a/ark/arkfactory.h b/ark/arkfactory.h index 2b5514b..51b4933 100644 --- a/ark/arkfactory.h +++ b/ark/arkfactory.h @@ -33,10 +33,10 @@ public: TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList() ); - static KInstance* instance(); + static TDEInstance* instance(); private: - static KInstance* s_instance; - static KAboutData* s_about; + static TDEInstance* s_instance; + static TDEAboutData* s_about; static int instanceNumber; }; diff --git a/ark/main.cpp b/ark/main.cpp index 10449c2..f5281c8 100644 --- a/ark/main.cpp +++ b/ark/main.cpp @@ -64,9 +64,9 @@ static KCmdLineOptions option[] = extern "C" KDE_EXPORT int kdemain( int argc, char *argv[] ) { - KAboutData aboutData( "ark", I18N_NOOP( "Ark" ), + TDEAboutData aboutData( "ark", I18N_NOOP( "Ark" ), "2.6.4", I18N_NOOP( "TDE Archiving tool" ), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP( "(c) 1997-2006, The Various Ark Developers" ) ); |