diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /kmobile | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kmobile')
| -rw-r--r-- | kmobile/kioslave/kio_mobile.cpp | 2 | ||||
| -rw-r--r-- | kmobile/main.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kmobile/kioslave/kio_mobile.cpp b/kmobile/kioslave/kio_mobile.cpp index e359b9025..8c4e3853f 100644 --- a/kmobile/kioslave/kio_mobile.cpp +++ b/kmobile/kioslave/kio_mobile.cpp @@ -47,7 +47,7 @@ extern "C" { KDE_EXPORT int kdemain(int argc, char **argv); } */ int kdemain(int argc, char **argv) { - KInstance instance( "kio_mobile" ); + TDEInstance instance( "kio_mobile" ); PRINT_DEBUG << "Starting " << getpid() << endl; diff --git a/kmobile/main.cpp b/kmobile/main.cpp index be36a08c9..1318352be 100644 --- a/kmobile/main.cpp +++ b/kmobile/main.cpp @@ -37,8 +37,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { - KAboutData about("kmobile", I18N_NOOP("KMobile"), version, description, - KAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org"); + TDEAboutData about("kmobile", I18N_NOOP("KMobile"), version, description, + TDEAboutData::License_GPL, "(C) 2003-2005 Helge Deller", 0, 0, "deller@kde.org"); about.addAuthor( "Helge Deller", 0, "deller@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions(options); |