diff options
| author | Timothy Pearson <[email protected]> | 2013-01-22 20:22:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-22 20:22:15 -0600 |
| commit | 5fc6f26e12b596addd235f87320c31761bd5a84d (patch) | |
| tree | 0a1ff964c23fce07fc088017df4ad537d57e62e5 /kresources/groupwise | |
| parent | 12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff) | |
| download | tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kresources/groupwise')
| -rw-r--r-- | kresources/groupwise/kioslave/groupwise.cpp | 2 | ||||
| -rw-r--r-- | kresources/groupwise/soap/soapdebug.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp index e257ba71e..e22d95dd5 100644 --- a/kresources/groupwise/kioslave/groupwise.cpp +++ b/kresources/groupwise/kioslave/groupwise.cpp @@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv ); int kdemain( int argc, char **argv ) { - KInstance instance( "kio_groupwise" ); + TDEInstance instance( "kio_groupwise" ); kdDebug(7000) << "Starting kio_groupwise(pid: " << getpid() << ")" << endl; diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp index e47dd7476..415021a78 100644 --- a/kresources/groupwise/soap/soapdebug.cpp +++ b/kresources/groupwise/soap/soapdebug.cpp @@ -46,7 +46,7 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" ); + TDEAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "[email protected]" ); TDECmdLineArgs::init( argc, argv, &aboutData ); |