From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kmenuedit/treeview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'kmenuedit/treeview.cpp') diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 693ba568c..41740499c 100644 --- a/kmenuedit/treeview.cpp +++ b/kmenuedit/treeview.cpp @@ -134,7 +134,7 @@ void TreeItem::setup() static TQPixmap appIcon(const TQString &iconName) { - TQPixmap normal = KGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); + TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, 0L, true); // make sure they are not larger than 20x20 if (normal.width() > 20 || normal.height() > 20) { @@ -329,7 +329,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted) TQString res = df->resource(); bool isLocal = true; - TQStringList files = KGlobal::dirs()->findAllResources(res.latin1(), file); + TQStringList files = TDEGlobal::dirs()->findAllResources(res.latin1(), file); for(TQStringList::ConstIterator it = files.begin(); it != files.end(); ++it) @@ -598,7 +598,7 @@ TQStringList TreeView::fileList(const TQString& rPath) TQStringList filelist; // loop through all resource dirs and build a file list - TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps"); for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { TQDir dir((*it) + "/" + relativePath); @@ -637,7 +637,7 @@ TQStringList TreeView::dirList(const TQString& rPath) TQStringList dirlist; // loop through all resource dirs and build a subdir list - TQStringList resdirlist = KGlobal::dirs()->resourceDirs("apps"); + TQStringList resdirlist = TDEGlobal::dirs()->resourceDirs("apps"); for (TQStringList::ConstIterator it = resdirlist.begin(); it != resdirlist.end(); ++it) { TQDir dir((*it) + "/" + relativePath); -- cgit v1.2.3