summaryrefslogtreecommitdiffstats
path: root/tdeui/kguiitem.h
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
committerTimothy Pearson <[email protected]>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /tdeui/kguiitem.h
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/kguiitem.h')
-rw-r--r--tdeui/kguiitem.h4
1 files changed, 2 insertions, 2 deletions
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;