diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:20:05 -0600 |
commit | b19ddece21e102b8e4b292037ca7578f60b128fe (patch) | |
tree | 6572ca25aba80849cdfa7578bbbc9121d23afbc3 /kded/khostname.cpp | |
parent | e729c6d549f12e27b358a1dad04ff254c033ac71 (diff) | |
download | tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.tar.gz tdelibs-b19ddece21e102b8e4b292037ca7578f60b128fe.zip |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kded/khostname.cpp')
-rw-r--r-- | kded/khostname.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kded/khostname.cpp b/kded/khostname.cpp index 0c1dd1b18..bd0980a2b 100644 --- a/kded/khostname.cpp +++ b/kded/khostname.cpp @@ -366,15 +366,15 @@ void KHostName::changeSessionManager() int main(int argc, char **argv) { KLocale::setMainCatalogue("tdelibs"); - KAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion, + TDEAboutData d(appName, I18N_NOOP("KDontChangeTheHostName"), appVersion, I18N_NOOP("Informs TDE about a change in hostname"), - KAboutData::License_GPL, "(c) 2001 Waldo Bastian"); + TDEAboutData::License_GPL, "(c) 2001 Waldo Bastian"); d.addAuthor("Waldo Bastian", I18N_NOOP("Author"), "bastian@kde.org"); TDECmdLineArgs::init(argc, argv, &d); TDECmdLineArgs::addCmdLineOptions(options); - KInstance k(&d); + TDEInstance k(&d); KHostName hn; |