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 --- tdeui/kguiitem.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tdeui/kguiitem.h') diff --git a/tdeui/kguiitem.h b/tdeui/kguiitem.h index 189dc1292..e7d53568a 100644 --- a/tdeui/kguiitem.h +++ b/tdeui/kguiitem.h @@ -61,10 +61,10 @@ public: TQString text() const; TQString plainText() const; #ifndef KDE_NO_COMPAT - TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; TQIconSet iconSet() const { return iconSet( KIcon::Small ); } #else - TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = KGlobal::instance()) const; + TQIconSet iconSet( KIcon::Group=KIcon::Small, int size = 0, TDEInstance* instance = TDEGlobal::instance()) const; #endif TQString iconName() const; -- cgit v1.2.3