5 files changed, 11 insertions, 13 deletions

diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 8ad87e79b8..f342cb8dd4 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -812,13 +812,13 @@ void EditorManager::closeOtherEditorsFromContextMenu()
 void EditorManager::showInGraphicalShell()
 {
     const QString path = m_d->m_contextMenuEditorIndex.data(Qt::UserRole + 1).toString();
-    Core::Internal::FileUtils::showInGraphicalShell(ICore::instance()->mainWindow(), path);
+    Core::FileUtils::showInGraphicalShell(ICore::instance()->mainWindow(), path);
 }
 
 void EditorManager::openTerminal()
 {
     const QString path = QFileInfo(m_d->m_contextMenuEditorIndex.data(Qt::UserRole + 1).toString()).path();
-    Core::Internal::FileUtils::openTerminal(path);
+    Core::FileUtils::openTerminal(path);
 }
 
 void EditorManager::closeEditor(Core::IEditor *editor)
diff --git a/src/plugins/coreplugin/fileutils.cpp b/src/plugins/coreplugin/fileutils.cpp
index 3bbb5a2066..9cbb308ecc 100644
--- a/src/plugins/coreplugin/fileutils.cpp
+++ b/src/plugins/coreplugin/fileutils.cpp
@@ -52,7 +52,7 @@
 #endif
 #endif
 
-using namespace Core::Internal;
+using namespace Core;
 
 #if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
 // Show error with option to open settings.
diff --git a/src/plugins/coreplugin/fileutils.h b/src/plugins/coreplugin/fileutils.h
index 5050a77076..195ac20e7a 100644
--- a/src/plugins/coreplugin/fileutils.h
+++ b/src/plugins/coreplugin/fileutils.h
@@ -40,7 +40,6 @@ class QWidget;
 QT_END_NAMESPACE
 
 namespace Core {
-namespace Internal {
 
 struct CORE_EXPORT FileUtils
 {
@@ -52,7 +51,6 @@ struct CORE_EXPORT FileUtils
     static QString msgTerminalAction();
 };
 
-} // namespace Internal
 } // namespace Core
 
 #endif // FILEUTILS_H
diff --git a/src/plugins/projectexplorer/foldernavigationwidget.cpp b/src/plugins/projectexplorer/foldernavigationwidget.cpp
index 9c43dbdb71..374bf17a52 100644
--- a/src/plugins/projectexplorer/foldernavigationwidget.cpp
+++ b/src/plugins/projectexplorer/foldernavigationwidget.cpp
@@ -307,9 +307,9 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
     QAction *actionOpen = menu.addAction(actionOpenText(m_fileSystemModel, current));
     actionOpen->setEnabled(hasCurrentItem);
     // Explorer & teminal
-    QAction *actionExplorer = menu.addAction(Core::Internal::FileUtils::msgGraphicalShellAction());
+    QAction *actionExplorer = menu.addAction(Core::FileUtils::msgGraphicalShellAction());
     actionExplorer->setEnabled(hasCurrentItem);
-    QAction *actionTerminal = menu.addAction(Core::Internal::FileUtils::msgTerminalAction());
+    QAction *actionTerminal = menu.addAction(Core::FileUtils::msgTerminalAction());
     actionTerminal->setEnabled(hasCurrentItem);
 
     // open with...
@@ -338,11 +338,11 @@ void FolderNavigationWidget::contextMenuEvent(QContextMenuEvent *ev)
         return;
     }
     if (action == actionTerminal) {
-        Core::Internal::FileUtils::openTerminal(m_fileSystemModel->filePath(current));
+        Core::FileUtils::openTerminal(m_fileSystemModel->filePath(current));
         return;
     }
     if (action == actionExplorer) {
-        Core::Internal::FileUtils::showInGraphicalShell(this, m_fileSystemModel->filePath(current));
+        Core::FileUtils::showInGraphicalShell(this, m_fileSystemModel->filePath(current));
         return;
     }
     ProjectExplorerPlugin::openEditorFromAction(action,
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index d5b489b40f..8af89cb4d0 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -584,13 +584,13 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
 
-    d->m_showInGraphicalShell = new QAction(Core::Internal::FileUtils::msgGraphicalShellAction(), this);
+    d->m_showInGraphicalShell = new QAction(Core::FileUtils::msgGraphicalShellAction(), this);
     cmd = am->registerAction(d->m_showInGraphicalShell, ProjectExplorer::Constants::SHOWINGRAPHICALSHELL,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
     mfolderContextMenu->addAction(cmd, Constants::G_FOLDER_FILES);
 
-    d->m_openTerminalHere = new QAction(Core::Internal::FileUtils::msgTerminalAction(), this);
+    d->m_openTerminalHere = new QAction(Core::FileUtils::msgTerminalAction(), this);
     cmd = am->registerAction(d->m_openTerminalHere, ProjectExplorer::Constants::OPENTERMIANLHERE,
                        projecTreeContext);
     mfileContextMenu->addAction(cmd, Constants::G_FILE_OPEN);
@@ -2525,14 +2525,14 @@ void ProjectExplorerPlugin::openFile()
 void ProjectExplorerPlugin::showInGraphicalShell()
 {
     QTC_ASSERT(d->m_currentNode, return)
-    Core::Internal::FileUtils::showInGraphicalShell(Core::ICore::instance()->mainWindow(),
+    Core::FileUtils::showInGraphicalShell(Core::ICore::instance()->mainWindow(),
                                                     pathFor(d->m_currentNode));
 }
 
 void ProjectExplorerPlugin::openTerminalHere()
 {
     QTC_ASSERT(d->m_currentNode, return)
-    Core::Internal::FileUtils::openTerminal(directoryFor(d->m_currentNode));
+    Core::FileUtils::openTerminal(directoryFor(d->m_currentNode));
 }
 
 void ProjectExplorerPlugin::removeFile()