diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-20 00:21:02 -0600 |
| commit | 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch) | |
| tree | 19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /kresources | |
| parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
| download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip | |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kresources')
| -rw-r--r-- | kresources/managerimpl.cpp | 2 | ||||
| -rw-r--r-- | kresources/resource.cpp | 2 | ||||
| -rw-r--r-- | kresources/testresources.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kresources/managerimpl.cpp b/kresources/managerimpl.cpp index b5d9ec32f..8fa2e03c0 100644 --- a/kresources/managerimpl.cpp +++ b/kresources/managerimpl.cpp @@ -45,7 +45,7 @@ ManagerImpl::ManagerImpl( ManagerNotifier *notifier, const TQString &family ) { kdDebug(5650) << "ManagerImpl::ManagerImpl()" << endl; - mId = KApplication::randomString( 8 ); + mId = TDEApplication::randomString( 8 ); // Register with DCOP if ( !kapp->dcopClient()->isRegistered() ) { diff --git a/kresources/resource.cpp b/kresources/resource.cpp index b9cdd95c4..83d24cbf5 100644 --- a/kresources/resource.cpp +++ b/kresources/resource.cpp @@ -61,7 +61,7 @@ Resource::Resource( const KConfig* config ) d->mName = i18n("resource"); d->mReadOnly = false; d->mActive = true; - d->mIdentifier = KApplication::randomString( 10 ); + d->mIdentifier = TDEApplication::randomString( 10 ); } } diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp index 452d9cf27..6624b9ffe 100644 --- a/kresources/testresources.cpp +++ b/kresources/testresources.cpp @@ -32,7 +32,7 @@ int main( int argc, char **argv ) KAboutData aboutData( "testresources", "Kresource Test", "0" ); TDECmdLineArgs::init( argc, argv, &aboutData ); - KApplication app; + TDEApplication app; Manager<TestResource> manager( "test" ); |