summaryrefslogtreecommitdiffstats
path: root/ksplashml
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:15:55 -0600
commit1d061b286a8b183b39be60fe531f2b1c2915f03a (patch)
tree0a4c6ee79918e366077094fb59e9c1196d7f4156 /ksplashml
parent1e0a98b8623428064963b1627e4e09ea02c1e87e (diff)
downloadtdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.tar.gz
tdebase-1d061b286a8b183b39be60fe531f2b1c2915f03a.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml')
-rw-r--r--ksplashml/kcmksplash/main.cpp4
-rw-r--r--ksplashml/main.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index 959b9128..53c5d45f 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -60,11 +60,11 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt
box->addWidget(mInstaller);
#endif
connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
- KAboutData *about = new KAboutData( "kcmksplash"
+ TDEAboutData *about = new TDEAboutData( "kcmksplash"
,I18N_NOOP("TDE splash screen theme manager")
,"0.1"
,0
- ,KAboutData::License_GPL
+ ,TDEAboutData::License_GPL
,I18N_NOOP("(c) 2003 KDE developers") );
about->addAuthor("Ravikiran Rajagopal", 0, "ravi@ee.eng.ohio-state.edu");
about->addCredit("Brian Ledbetter", I18N_NOOP("Original KSplash/ML author"), "brian@shadowcom.net");
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index e4f28855..f184fb7a 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -39,12 +39,12 @@ static KCmdLineOptions options[] = {
int main( int argc, char **argv )
{
- KAboutData about(
+ TDEAboutData about(
"ksplash",
I18N_NOOP("KSplash"),
VERSION,
I18N_NOOP("Trinity splash screen"),
- KAboutData::License_GPL,
+ TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001 - 2003, Flaming Sword Productions\n (c) 2003 KDE developers"),
"http://www.kde.org");
about.addAuthor( "Ravikiran Rajagopal", I18N_NOOP("Author and maintainer"), "ravi@ee.eng.ohio-state.edu" );