summaryrefslogtreecommitdiffstats
path: root/kiconedit
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
commit6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch)
tree44659d1cc0c37eb995e572bc1b979e75a74210fb /kiconedit
parente2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff)
downloadtdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz
tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kiconedit')
-rw-r--r--kiconedit/kiconconfig.cpp2
-rw-r--r--kiconedit/knew.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index 207629b4..1a2d7bf2 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -48,7 +48,7 @@
// little helper:
static inline TQPixmap loadIcon( const char * name )
{
- return KGlobal::instance()->iconLoader()
+ return TDEGlobal::instance()->iconLoader()
->loadIcon( TQString::fromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index 4f4bdb89..c48e11cc 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -37,7 +37,7 @@ KIconTemplateContainer* KIconTemplateContainer::instance = 0;
void createStandardTemplates(KIconTemplateContainer *list)
{
- KIconLoader *kil = KGlobal::iconLoader();
+ KIconLoader *kil = TDEGlobal::iconLoader();
KIconTemplate it;
it.path = kil->iconPath("standard", KIcon::User);