diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:15:55 -0600 |
| commit | 1d061b286a8b183b39be60fe531f2b1c2915f03a (patch) | |
| tree | 0a4c6ee79918e366077094fb59e9c1196d7f4156 /kfind | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kfind')
| -rw-r--r-- | kfind/kfindpart.cpp | 4 | ||||
| -rw-r--r-- | kfind/kfindpart.h | 4 | ||||
| -rw-r--r-- | kfind/main.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 92082019f..913a915a7 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -76,9 +76,9 @@ KFindPart::~KFindPart() { } -KAboutData *KFindPart::createAboutData() +TDEAboutData *KFindPart::createAboutData() { - return new KAboutData( "kfindpart", I18N_NOOP( "Find Component" ), "1.0" ); + return new TDEAboutData( "kfindpart", I18N_NOOP( "Find Component" ), "1.0" ); } bool KFindPart::doOpenURL( const KURL &url ) diff --git a/kfind/kfindpart.h b/kfind/kfindpart.h index 19bdb73be..b2a8156c5 100644 --- a/kfind/kfindpart.h +++ b/kfind/kfindpart.h @@ -28,7 +28,7 @@ #include <konq_dirpart.h> class KQuery; -class KAboutData; +class TDEAboutData; //added class KonqPropsView; class KAction; @@ -48,7 +48,7 @@ public: TQObject *parent, const char *name, const TQStringList & /*args*/ ); virtual ~KFindPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); virtual bool doOpenURL( const KURL &url ); virtual bool doCloseURL() { return true; } diff --git a/kfind/main.cpp b/kfind/main.cpp index b57177cb0..ece886956 100644 --- a/kfind/main.cpp +++ b/kfind/main.cpp @@ -22,8 +22,8 @@ static KCmdLineOptions options[] = int main( int argc, char ** argv ) { KLocale::setMainCatalogue("kfindpart"); - KAboutData aboutData( "kfind", I18N_NOOP("KFind"), - KFIND_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kfind", I18N_NOOP("KFind"), + KFIND_VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1998-2003, The KDE Developers")); aboutData.addAuthor("Eric Coquelle", I18N_NOOP("Current Maintainer"), "[email protected]"); |