1 files changed, 29 insertions, 30 deletions

diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 2b1782cea0..d8b0bfdac1 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -61,6 +61,7 @@
 #include <utils/reloadpromptutils.h>
 #include <utils/qtcassert.h>
 
+using namespace Utils;
 using namespace Core;
 
 namespace BinEditor {
@@ -90,7 +91,7 @@ public:
 
 namespace Internal {
 
-class BinEditorFind : public Core::IFindSupport
+class BinEditorFind : public IFindSupport
 {
     Q_OBJECT
 
@@ -106,7 +107,7 @@ public:
     QString currentFindString() const { return QString(); }
     QString completedFindString() const { return QString(); }
 
-    Core::FindFlags supportedFindFlags() const
+    FindFlags supportedFindFlags() const
     {
         return FindBackward | FindCaseSensitively;
     }
@@ -117,7 +118,7 @@ public:
         m_incrementalWrappedState = false;
     }
 
-    virtual void highlightAll(const QString &txt, Core::FindFlags findFlags)
+    virtual void highlightAll(const QString &txt, FindFlags findFlags)
     {
         m_widget->highlightSearchResults(txt.toLatin1(), textDocumentFlagsForFindFlags(findFlags));
     }
@@ -127,7 +128,7 @@ public:
         m_widget->highlightSearchResults(QByteArray());
     }
 
-    int find(const QByteArray &pattern, int pos, Core::FindFlags findFlags, bool *wrapped)
+    int find(const QByteArray &pattern, int pos, FindFlags findFlags, bool *wrapped)
     {
         if (wrapped)
             *wrapped = false;
@@ -148,7 +149,7 @@ public:
         return res;
     }
 
-    Result findIncremental(const QString &txt, Core::FindFlags findFlags) {
+    Result findIncremental(const QString &txt, FindFlags findFlags) {
         QByteArray pattern = txt.toLatin1();
         if (pattern != m_lastPattern)
             resetIncrementalSearch(); // Because we don't search for nibbles.
@@ -183,7 +184,7 @@ public:
         return result;
     }
 
-    Result findStep(const QString &txt, Core::FindFlags findFlags) {
+    Result findStep(const QString &txt, FindFlags findFlags) {
         QByteArray pattern = txt.toLatin1();
         bool wasReset = (m_incrementalStartPos < 0);
         if (m_contPos == -1) {
@@ -223,12 +224,12 @@ private:
 };
 
 
-class BinEditorDocument : public Core::IDocument
+class BinEditorDocument : public IDocument
 {
     Q_OBJECT
 public:
     BinEditorDocument(BinEditorWidget *parent) :
-        Core::IDocument(parent)
+        IDocument(parent)
     {
         setId(Core::Constants::K_DEFAULT_BINARY_EDITOR_ID);
         setMimeType(QLatin1String(BinEditor::Constants::C_BINEDITOR_MIMETYPE));
@@ -256,9 +257,8 @@ public:
     bool save(QString *errorString, const QString &fn, bool autoSave)
     {
         QTC_ASSERT(!autoSave, return true); // bineditor does not support autosave - it would be a bit expensive
-        const QString fileNameToUse
-                = fn.isEmpty() ? filePath() : fn;
-        if (m_widget->save(errorString, filePath(), fileNameToUse)) {
+        const FileName fileNameToUse = fn.isEmpty() ? filePath() : FileName::fromString(fn);
+        if (m_widget->save(errorString, filePath().toString(), fileNameToUse.toString())) {
             setFilePath(fileNameToUse);
             return true;
         } else {
@@ -274,14 +274,14 @@ public:
             if (errorString)
                 *errorString = msg;
             else
-                QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), msg);
+                QMessageBox::critical(ICore::mainWindow(), tr("File Error"), msg);
             return false;
         }
         if (offset >= size)
             return false;
         if (file.open(QIODevice::ReadOnly)) {
             file.close();
-            setFilePath(fileName);
+            setFilePath(FileName::fromString(fileName));
             m_widget->setSizes(offset, file.size());
             return true;
         }
@@ -290,17 +290,17 @@ public:
         if (errorString)
             *errorString = errStr;
         else
-            QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"), errStr);
+            QMessageBox::critical(ICore::mainWindow(), tr("File Error"), errStr);
         return false;
     }
 
 private slots:
     void provideData(quint64 block)
     {
-        const QString fn = filePath();
+        const FileName fn = filePath();
         if (fn.isEmpty())
             return;
-        QFile file(fn);
+        QFile file(fn.toString());
         if (file.open(QIODevice::ReadOnly)) {
             int blockSize = m_widget->dataBlockSize();
             file.seek(block * blockSize);
@@ -311,15 +311,15 @@ private slots:
                 data += QByteArray(blockSize - dataSize, 0);
             m_widget->addData(block, data);
         } else {
-            QMessageBox::critical(Core::ICore::mainWindow(), tr("File Error"),
+            QMessageBox::critical(ICore::mainWindow(), tr("File Error"),
                                   tr("Cannot open %1: %2").arg(
-                                        QDir::toNativeSeparators(fn), file.errorString()));
+                                        fn.toUserOutput(), file.errorString()));
         }
     }
 
     void provideNewRange(quint64 offset)
     {
-        open(0, filePath(), offset);
+        open(0, filePath().toString(), offset);
     }
 
 public:
@@ -332,11 +332,10 @@ public:
                                                                        : m_widget->isModified(); }
 
     bool isFileReadOnly() const {
-        const QString fn = filePath();
+        const FileName fn = filePath();
         if (fn.isEmpty())
             return false;
-        const QFileInfo fi(fn);
-        return !fi.isWritable();
+        return !fn.toFileInfo().isWritable();
     }
 
     bool isSaveAsAllowed() const { return true; }
@@ -350,7 +349,7 @@ public:
             emit aboutToReload();
             int cPos = m_widget->cursorPosition();
             m_widget->clear();
-            const bool success = open(errorString, filePath());
+            const bool success = open(errorString, filePath().toString());
             m_widget->setCursorPosition(cPos);
             emit reloadFinished(success);
             return success;
@@ -362,7 +361,7 @@ private:
     BinEditorWidget *m_widget;
 };
 
-class BinEditor : public Core::IEditor
+class BinEditor : public IEditor
 {
     Q_OBJECT
 public:
@@ -407,7 +406,7 @@ public:
         QTC_ASSERT(fileName == realFileName, return false); // The bineditor can do no autosaving
         return m_file->open(errorString, fileName);
     }
-    Core::IDocument *document() { return m_file; }
+    IDocument *document() { return m_file; }
 
     QWidget *toolBar() { return m_toolBar; }
 
@@ -446,7 +445,7 @@ BinEditorFactory::BinEditorFactory(BinEditorPlugin *owner) :
     addMimeType(Constants::C_BINEDITOR_MIMETYPE);
 }
 
-Core::IEditor *BinEditorFactory::createEditor()
+IEditor *BinEditorFactory::createEditor()
 {
     BinEditorWidget *widget = new BinEditorWidget();
     BinEditor *editor = new BinEditor(widget);
@@ -467,14 +466,14 @@ BinEditorPlugin::~BinEditorPlugin()
 {
 }
 
-QAction *BinEditorPlugin::registerNewAction(Core::Id id, const QString &title)
+QAction *BinEditorPlugin::registerNewAction(Id id, const QString &title)
 {
     QAction *result = new QAction(title, this);
-    Core::ActionManager::registerAction(result, id, m_context);
+    ActionManager::registerAction(result, id, m_context);
     return result;
 }
 
-QAction *BinEditorPlugin::registerNewAction(Core::Id id,
+QAction *BinEditorPlugin::registerNewAction(Id id,
                                             QObject *receiver,
                                             const char *slot,
                                             const QString &title)
@@ -523,7 +522,7 @@ void BinEditorPlugin::extensionsInitialized()
 {
 }
 
-void BinEditorPlugin::updateCurrentEditor(Core::IEditor *editor)
+void BinEditorPlugin::updateCurrentEditor(IEditor *editor)
 {
     BinEditorWidget *binEditor = 0;
     if (editor)