diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:18:58 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:18:58 -0600 |
commit | 6d3902bd20c24613b2f13f5c04294ff83f104006 (patch) | |
tree | 6cf224cc11b6dfd4ebf884b1045ff7e95de7c8e7 /src/dolphinsettings.cpp | |
parent | 87346b386fec7055f53b607d9cad63f48fbb8e28 (diff) | |
download | dolphin-6d3902bd20c24613b2f13f5c04294ff83f104006.tar.gz dolphin-6d3902bd20c24613b2f13f5c04294ff83f104006.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'src/dolphinsettings.cpp')
-rw-r--r-- | src/dolphinsettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dolphinsettings.cpp b/src/dolphinsettings.cpp index 1b13d2b..8c26889 100644 --- a/src/dolphinsettings.cpp +++ b/src/dolphinsettings.cpp @@ -109,7 +109,7 @@ DolphinIconsViewSettings* DolphinSettings::iconsView(DolphinIconsView::LayoutMod KBookmarkManager* DolphinSettings::bookmarkManager() const { - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/bookmarks.xml"); const TQString file = locateLocal("data", basePath); @@ -133,7 +133,7 @@ void DolphinSettings::save() m_leftsidebar->save(); m_rightsidebar->save(); - TQString basePath = KGlobal::instance()->instanceName(); + TQString basePath = TDEGlobal::instance()->instanceName(); basePath.append("/bookmarks.xml"); const TQString file = locateLocal( "data", basePath); |