From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:20:05 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kresources/kcmkresources.cpp | 6 +++--- kresources/testresources.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kresources') diff --git a/kresources/kcmkresources.cpp b/kresources/kcmkresources.cpp index f517b5eac..ec6a7be48 100644 --- a/kresources/kcmkresources.cpp +++ b/kresources/kcmkresources.cpp @@ -40,10 +40,10 @@ KCMKResources::KCMKResources( TQWidget *parent, const char *name, const TQString layout->addWidget( mConfigPage ); connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); setButtons( Help | Apply ); - KAboutData *about = - new KAboutData( I18N_NOOP( "kcmkresources" ), + TDEAboutData *about = + new TDEAboutData( I18N_NOOP( "kcmkresources" ), I18N_NOOP( "TDE Resources configuration module" ), - 0, 0, KAboutData::License_GPL, + 0, 0, TDEAboutData::License_GPL, I18N_NOOP( "(c) 2003 Tobias Koenig" ) ); about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kresources/testresources.cpp b/kresources/testresources.cpp index 6624b9ffe..515563172 100644 --- a/kresources/testresources.cpp +++ b/kresources/testresources.cpp @@ -29,7 +29,7 @@ class TestSubResource : public TestResource int main( int argc, char **argv ) { - KAboutData aboutData( "testresources", "Kresource Test", "0" ); + TDEAboutData aboutData( "testresources", "Kresource Test", "0" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDEApplication app; -- cgit v1.2.1