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 /khelpcenter | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'khelpcenter')
| -rw-r--r-- | khelpcenter/application.cpp | 4 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/index.cpp | 2 | ||||
| -rw-r--r-- | khelpcenter/kcmhelpcenter.h | 4 | ||||
| -rw-r--r-- | khelpcenter/khc_indexbuilder.cpp | 4 | ||||
| -rw-r--r-- | khelpcenter/testmetainfo.cpp | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index 506a6eda5..6fa5aeca5 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -60,10 +60,10 @@ static KCmdLineOptions options[] = extern "C" int KDE_EXPORT kdemain( int argc, char **argv ) { - KAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), + TDEAboutData aboutData( "khelpcenter", I18N_NOOP("Trinity Help Center"), HELPCENTER_VERSION, I18N_NOOP("The Trinity Help Center"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2003, The KHelpCenter developers") ); aboutData.addAuthor( "Timothy Pearson", 0, "[email protected]" ); diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index eb73d11cd..c7b5bce41 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -15,7 +15,7 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), + TDEAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), "", I18N_NOOP("TDE Index generator for help files.")); diff --git a/khelpcenter/kcmhelpcenter.h b/khelpcenter/kcmhelpcenter.h index 8bf2f3b6c..a5a336afc 100644 --- a/khelpcenter/kcmhelpcenter.h +++ b/khelpcenter/kcmhelpcenter.h @@ -34,7 +34,7 @@ class TQLabel; class KProcess; class KConfig; -class KAboutData; +class TDEAboutData; class KTempFile; class KURLRequester; class KListView; @@ -164,7 +164,7 @@ class KCMHelpCenter : public KDialogBase, virtual public KCMHelpCenterIface KConfig *mConfig; - KAboutData *mAboutData; + TDEAboutData *mAboutData; KHC::HtmlSearchConfig *mHtmlSearchTab; TQWidget *mScopeTab; diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index 03a076651..3759b3048 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/khelpcenter/khc_indexbuilder.cpp @@ -170,11 +170,11 @@ static KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "khc_indexbuilder", + TDEAboutData aboutData( "khc_indexbuilder", I18N_NOOP("KHelpCenter Index Builder"), HELPCENTER_VERSION, I18N_NOOP("The TDE Help Center"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(c) 2003, The KHelpCenter developers") ); aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" ); diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index e5d204461..a6fed9e09 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -88,7 +88,7 @@ class AsyncTraverser : public DocEntryTraverser int main(int argc,char **argv) { - KAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); + TDEAboutData aboutData("testmetainfo","TestDocMetaInfo","0.1"); TDECmdLineArgs::init(argc,argv,&aboutData); TDEApplication app; |