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 /kstyles | |
parent | 5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff) | |
download | tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip |
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'kstyles')
-rw-r--r-- | kstyles/asteroid/asteroid.cpp | 2 | ||||
-rw-r--r-- | kstyles/kthemestyle/kthemebase.cpp | 2 | ||||
-rw-r--r-- | kstyles/kthemestyle/kthemebase.h | 2 | ||||
-rw-r--r-- | kstyles/utils/installtheme/main.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 11a06f29a..4302976c8 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -93,7 +93,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency) { - if (tqApp->inherits("KApplication")) { + if (tqApp->inherits("TDEApplication")) { connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); } diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 56cbeb09f..544f692e0 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -7,7 +7,7 @@ KDE3 port (C) 2001-2002 Maksim Orlovich <mo002j@mail.rochester.edu> Port version 0.9.7 - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (C) 1998, 1999, 2000 KDE Team diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 3e2019383..1e002cd4a 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -6,7 +6,7 @@ KDE3 port (C) 2001 Maksim Orlovich <mo002j@mail.rochester.edu> - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer (kalle@kde.org) Copyright (C) 1998, 1999, 2000 KDE Team diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index 22986730f..e6ffce721 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -38,7 +38,7 @@ static const char ver[] = "0.9.1"; int main(int argc, char **argv) { TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); - KApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? + TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc"); |