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 /kgpg | |
| parent | ed70cd1b539ac2e02319b55183a5be7a28f2d116 (diff) | |
| download | tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.tar.gz tdeutils-8856e75c203aa69be210b2fee1095ab9761aca7e.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kgpg')
| -rw-r--r-- | kgpg/kgpg.h | 4 | ||||
| -rw-r--r-- | kgpg/main.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kgpg/kgpg.h b/kgpg/kgpg.h index 2c3d682..973296b 100644 --- a/kgpg/kgpg.h +++ b/kgpg/kgpg.h @@ -35,7 +35,7 @@ class TQPopupMenu; class KTempFile; -class KAboutData; +class TDEAboutData; class KPassivePopup; class KgpgWizard; class popupPublic; @@ -58,7 +58,7 @@ public: private: TQPopupMenu *droppopup,*udroppopup; - KAboutData *_aboutData; + TDEAboutData *_aboutData; TQStringList customDecrypt; KgpgWizard *wiz; KPassivePopup *pop; diff --git a/kgpg/main.cpp b/kgpg/main.cpp index f7715a4..a440b32 100644 --- a/kgpg/main.cpp +++ b/kgpg/main.cpp @@ -47,8 +47,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, - KAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); + TDEAboutData about("kgpg", I18N_NOOP("KGpg"), version, description, + TDEAboutData::License_GPL, "(C) 2003 Jean-Baptiste Mardelle"); about.addAuthor( "Jean-Baptiste Mardelle", 0, "bj@altern.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); |