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/basictab.cpp | 2 +- kmenuedit/kmenuedit.cpp | 4 ++-- kmenuedit/menufile.cpp | 2 +- kmenuedit/treeview.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kmenuedit') diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp index aac5d78d6..9687384d9 100644 --- a/kmenuedit/basictab.cpp +++ b/kmenuedit/basictab.cpp @@ -460,7 +460,7 @@ void BasicTab::slotExecSelected() { TQString path = _execEdit->lineEdit()->text(); if (!path.startsWith("'")) - _execEdit->lineEdit()->setText(KProcess::quote(path)); + _execEdit->lineEdit()->setText(TDEProcess::quote(path)); } void BasicTab::slotCapturedShortcut(const KShortcut& cut) diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 0f518f065..f0903d70b 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/kmenuedit/kmenuedit.cpp @@ -53,7 +53,7 @@ KMenuEdit::KMenuEdit (bool controlCenter, TQWidget *, const char *name) KMenuEdit::~KMenuEdit() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("General"); config->writeEntry("SplitterSizes", m_splitter->sizes()); @@ -101,7 +101,7 @@ void KMenuEdit::setupView() m_tree, TQT_SLOT(findServiceShortcut(const KShortcut&, KService::Ptr &))); // restore splitter sizes - KConfig* config = KGlobal::config(); + KConfig* config = TDEGlobal::config(); TQValueList sizes = config->readIntListEntry("SplitterSizes"); if (sizes.isEmpty()) diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp index 162464a94..38f02ddc8 100644 --- a/kmenuedit/menufile.cpp +++ b/kmenuedit/menufile.cpp @@ -194,7 +194,7 @@ static TQString entryToDirId(const TQString &path) { // XDG Desktop menu items come with absolute paths, we need to // extract their relative path and then build a local path. - local = KGlobal::dirs()->relativeLocation("xdgdata-dirs", path); + local = TDEGlobal::dirs()->relativeLocation("xdgdata-dirs", path); } if (local.isEmpty() || local.startsWith("/")) 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.1