summaryrefslogtreecommitdiffstats
path: root/kio/bookmarks/kbookmarkmanager.cc
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /kio/bookmarks/kbookmarkmanager.cc
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kio/bookmarks/kbookmarkmanager.cc')
-rw-r--r--kio/bookmarks/kbookmarkmanager.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/kio/bookmarks/kbookmarkmanager.cc b/kio/bookmarks/kbookmarkmanager.cc
index 96ce12896..9e6d711d2 100644
--- a/kio/bookmarks/kbookmarkmanager.cc
+++ b/kio/bookmarks/kbookmarkmanager.cc
@@ -311,7 +311,7 @@ void KBookmarkManager::convertAttribute( TQDomElement elem, const TQString & old
void KBookmarkManager::importDesktopFiles()
{
KBookmarkImporter importer( const_cast<TQDomDocument *>(&internalDocument()) );
- TQString path(KGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
+ TQString path(TDEGlobal::dirs()->saveLocation("data", "kfm/bookmarks", true));
importer.import( path );
//kdDebug(7043) << internalDocument().toCString() << endl;
@@ -613,23 +613,23 @@ void KBookmarkManager::setEditorOptions( const TQString& caption, bool browser )
void KBookmarkManager::slotEditBookmarks()
{
- KProcess proc;
+ TDEProcess proc;
proc << TQString::fromLatin1("keditbookmarks");
if (!dptr()->m_editorCaption.isNull())
proc << TQString::fromLatin1("--customcaption") << dptr()->m_editorCaption;
if (!dptr()->m_browserEditor)
proc << TQString::fromLatin1("--nobrowser");
proc << m_bookmarksFile;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
void KBookmarkManager::slotEditBookmarksAtAddress( const TQString& address )
{
- KProcess proc;
+ TDEProcess proc;
proc << TQString::fromLatin1("keditbookmarks")
<< TQString::fromLatin1("--address") << address
<< m_bookmarksFile;
- proc.start(KProcess::DontCare);
+ proc.start(TDEProcess::DontCare);
}
///////