From 28edc0aa2ab09297288186f5bc15765eb7be58c0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:47:22 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- tdeprint/management/kmpropertypage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tdeprint/management/kmpropertypage.cpp') diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index e0526ad5a..5586f110f 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -57,7 +57,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) ctn->setWidget(w); connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); - TQPixmap icon = KGlobal::instance()->iconLoader()->loadIcon( + TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), KIcon::NoGroup, KIcon::SizeMedium -- cgit v1.2.1 From f2bfcad7ffdd09911f282afe2a2051b3708601c9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:16:51 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- tdeprint/management/kmpropertypage.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeprint/management/kmpropertypage.cpp') diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index 5586f110f..c38b399c6 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -59,8 +59,8 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), - KIcon::NoGroup, - KIcon::SizeMedium + TDEIcon::NoGroup, + TDEIcon::SizeMedium ); addPage(ctn,w->title(),w->header(),icon); } -- cgit v1.2.1