From 1a2f0b6d918c231501004d0fb4f99d11b97af6d3 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 8 Apr 2016 22:10:37 +0200 Subject: [PATCH] [DEV] update etk::FSNode --- sources/appl/BufferManager.cpp | 2 +- sources/appl/Gui/TextViewer.cpp | 2 +- sources/appl/HighlightManager.cpp | 2 +- sources/appl/init.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sources/appl/BufferManager.cpp b/sources/appl/BufferManager.cpp index 28d2230..15a6cae 100644 --- a/sources/appl/BufferManager.cpp +++ b/sources/appl/BufferManager.cpp @@ -60,7 +60,7 @@ std::shared_ptr appl::BufferManager::get(const std::string& _fileN } } if (_createIfNeeded == true) { - if (etk::FSNodeGetType(_fileName) == etk::FSN_FOLDER) { + if (etk::FSNodeGetType(_fileName) == etk::typeNode_folder) { APPL_WARNING("try open a folder : " << _fileName); APPL_CRITICAL("plop"); return nullptr; diff --git a/sources/appl/Gui/TextViewer.cpp b/sources/appl/Gui/TextViewer.cpp index 667b2f3..36a5201 100644 --- a/sources/appl/Gui/TextViewer.cpp +++ b/sources/appl/Gui/TextViewer.cpp @@ -96,7 +96,7 @@ void appl::TextViewer::onCallbackselectNewFile(const std::string& _value) { // reset scroll: if (m_buffer != nullptr) { - m_buffer->signalDisconnect(shared_from_this()); + m_buffer->signals.disconnect(shared_from_this()); bool needAdd = true; auto it = m_drawingRemenber.begin(); while (it != m_drawingRemenber.end()) { diff --git a/sources/appl/HighlightManager.cpp b/sources/appl/HighlightManager.cpp index fb90d01..efbf710 100644 --- a/sources/appl/HighlightManager.cpp +++ b/sources/appl/HighlightManager.cpp @@ -37,7 +37,7 @@ void appl::highlightManager::init() { if (it == nullptr) { continue; } - if (it->getNodeType() != etk::FSN_FOLDER) { + if (it->getNodeType() != etk::typeNode_folder) { continue; } std::string filename = it->getName() + "/highlight.xml"; diff --git a/sources/appl/init.cpp b/sources/appl/init.cpp index 39870c7..4ade3fa 100644 --- a/sources/appl/init.cpp +++ b/sources/appl/init.cpp @@ -119,7 +119,7 @@ class MainApplication : public ewol::context::Application { // nothing to do ... } else { etk::FSNode file(tmpppp); - if (file.getNodeType() == etk::FSN_FILE) { + if (file.getNodeType() == etk::typeNode_file) { std::string name = file.getName(); APPL_INFO("need load file : \"" << name << "\"" ); m_bufferManager->open(name);