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 /kdepasswd | |
| parent | 1e0a98b8623428064963b1627e4e09ea02c1e87e (diff) | |
| download | tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kdepasswd')
| -rw-r--r-- | kdepasswd/kcm/main.cpp | 4 | ||||
| -rw-r--r-- | kdepasswd/kcm/main.h | 2 | ||||
| -rw-r--r-- | kdepasswd/kdepasswd.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index 5192c9d1d..11ac07242 100644 --- a/kdepasswd/kcm/main.cpp +++ b/kdepasswd/kcm/main.cpp @@ -78,9 +78,9 @@ KCMUserAccount::KCMUserAccount( TQWidget *parent, const char *name, _mw->lblUsername->setText( _ku->loginName() ); _mw->lblUID->setText( TQString().number(_ku->uid()) ); - KAboutData *about = new KAboutData(I18N_NOOP("kcm_useraccount"), + TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcm_useraccount"), I18N_NOOP("Password & User Information"), 0, 0, - KAboutData::License_GPL, + TDEAboutData::License_GPL, I18N_NOOP("(C) 2002, Braden MacDonald, " "(C) 2004 Ravikiran Rajagopal")); diff --git a/kdepasswd/kcm/main.h b/kdepasswd/kcm/main.h index c39f69184..4ca6c77f9 100644 --- a/kdepasswd/kcm/main.h +++ b/kdepasswd/kcm/main.h @@ -23,7 +23,7 @@ #include "main_widget.h" -class KAboutData; +class TDEAboutData; class KUser; class KEmailSettings; class TQEvent; diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index 19e583659..47dbab6de 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -28,9 +28,9 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"), + TDEAboutData aboutData("kdepasswd", I18N_NOOP("TDE passwd"), VERSION, I18N_NOOP("Changes a UNIX password."), - KAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen"); + TDEAboutData::License_Artistic, "Copyright (c) 2000 Geert Jansen"); aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), "[email protected]", "http://www.stack.nl/~geertj/"); |