summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/cache.cpp2
-rw-r--r--src/configcontainer.cpp2
-rw-r--r--src/configparser.cpp2
-rw-r--r--src/controller.cpp14
-rw-r--r--src/downloadthread.cpp2
-rw-r--r--src/exception.cpp2
-rw-r--r--src/htmlrenderer.cpp2
-rw-r--r--src/keymap.cpp2
-rw-r--r--src/mutex.cpp2
-rw-r--r--src/rss.cpp2
-rw-r--r--src/thread.cpp2
-rw-r--r--src/urlreader.cpp2
-rw-r--r--src/utils.cpp2
-rw-r--r--src/view.cpp6
-rw-r--r--src/xmlpullparser.cpp2
15 files changed, 23 insertions, 23 deletions
diff --git a/src/cache.cpp b/src/cache.cpp
index d5484de9..27967c90 100644
--- a/src/cache.cpp
+++ b/src/cache.cpp
@@ -8,7 +8,7 @@
#include <cassert>
#include <rss.h>
-using namespace noos;
+using namespace newsbeuter;
//-------------------------------------------
diff --git a/src/configcontainer.cpp b/src/configcontainer.cpp
index 9e06a95b..3f344bf9 100644
--- a/src/configcontainer.cpp
+++ b/src/configcontainer.cpp
@@ -3,7 +3,7 @@
#include <sstream>
#include <iostream>
-namespace noos
+namespace newsbeuter
{
configcontainer::configcontainer()
diff --git a/src/configparser.cpp b/src/configparser.cpp
index adec49bb..f977db6f 100644
--- a/src/configparser.cpp
+++ b/src/configparser.cpp
@@ -5,7 +5,7 @@
#include <fstream>
#include <sstream>
-namespace noos {
+namespace newsbeuter {
configparser::configparser(const char * file) : filename(file) { }
diff --git a/src/controller.cpp b/src/controller.cpp
index 043900cb..dd0d40c1 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -20,7 +20,7 @@
#include <config.h>
-using namespace noos;
+using namespace newsbeuter;
static std::string lock_file = "lock.pid";
@@ -47,14 +47,14 @@ controller::controller() : v(0), rsscache(0), url_file("urls"), cache_file("cach
config_dir = cfgdir;
- config_dir.append(NOOS_PATH_SEP);
- config_dir.append(NOOS_CONFIG_SUBDIR);
+ config_dir.append(NEWSBEUTER_PATH_SEP);
+ config_dir.append(NEWSBEUTER_CONFIG_SUBDIR);
mkdir(config_dir.c_str(),0700); // create configuration directory if it doesn't exist
- url_file = config_dir + std::string(NOOS_PATH_SEP) + url_file;
- cache_file = config_dir + std::string(NOOS_PATH_SEP) + cache_file;
- config_file = config_dir + std::string(NOOS_PATH_SEP) + config_file;
- lock_file = config_dir + std::string(NOOS_PATH_SEP) + lock_file;
+ url_file = config_dir + std::string(NEWSBEUTER_PATH_SEP) + url_file;
+ cache_file = config_dir + std::string(NEWSBEUTER_PATH_SEP) + cache_file;
+ config_file = config_dir + std::string(NEWSBEUTER_PATH_SEP) + config_file;
+ lock_file = config_dir + std::string(NEWSBEUTER_PATH_SEP) + lock_file;
reload_mutex = new mutex();
}
diff --git a/src/downloadthread.cpp b/src/downloadthread.cpp
index 23c54a3e..5c825f16 100644
--- a/src/downloadthread.cpp
+++ b/src/downloadthread.cpp
@@ -1,6 +1,6 @@
#include <downloadthread.h>
-namespace noos
+namespace newsbeuter
{
downloadthread::downloadthread(controller * c) : ctrl(c) {
diff --git a/src/exception.cpp b/src/exception.cpp
index 309a4e14..510dc4c0 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -2,7 +2,7 @@
#include <cerrno>
#include <cstring>
-using namespace noos;
+using namespace newsbeuter;
exception::exception(unsigned int error_code) : ecode(error_code) { }
diff --git a/src/htmlrenderer.cpp b/src/htmlrenderer.cpp
index 47620139..5b723ac9 100644
--- a/src/htmlrenderer.cpp
+++ b/src/htmlrenderer.cpp
@@ -5,7 +5,7 @@
#include <iostream>
#include <stdexcept>
-using namespace noos;
+using namespace newsbeuter;
htmlrenderer::htmlrenderer(unsigned int width) : w(width) { }
diff --git a/src/keymap.cpp b/src/keymap.cpp
index 24b286a2..7c94ea19 100644
--- a/src/keymap.cpp
+++ b/src/keymap.cpp
@@ -2,7 +2,7 @@
#include <vector>
#include <iostream>
-namespace noos {
+namespace newsbeuter {
struct op_desc {
operation op;
diff --git a/src/mutex.cpp b/src/mutex.cpp
index 6e466c07..2f772202 100644
--- a/src/mutex.cpp
+++ b/src/mutex.cpp
@@ -3,7 +3,7 @@
#include <cerrno>
-using namespace noos;
+using namespace newsbeuter;
mutex::mutex() {
pthread_mutex_init(&mtx, NULL);
diff --git a/src/rss.cpp b/src/rss.cpp
index 6f247aed..afa5899c 100644
--- a/src/rss.cpp
+++ b/src/rss.cpp
@@ -7,7 +7,7 @@
#include <sstream>
#include <iostream>
-using namespace noos;
+using namespace newsbeuter;
rss_parser::rss_parser(const char * uri, cache * c) : my_uri(uri), ch(c), mrss(0) { }
diff --git a/src/thread.cpp b/src/thread.cpp
index 2c569bd6..c93878e3 100644
--- a/src/thread.cpp
+++ b/src/thread.cpp
@@ -1,7 +1,7 @@
#include <thread.h>
#include <exception.h>
-using namespace noos;
+using namespace newsbeuter;
thread::thread() {
}
diff --git a/src/urlreader.cpp b/src/urlreader.cpp
index eb100423..c417df86 100644
--- a/src/urlreader.cpp
+++ b/src/urlreader.cpp
@@ -2,7 +2,7 @@
#include <urlreader.h>
-using namespace noos;
+using namespace newsbeuter;
urlreader::urlreader(const std::string& file) : filename(file) {
reload();
diff --git a/src/utils.cpp b/src/utils.cpp
index a5451daa..d960ad29 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,6 +1,6 @@
#include <utils.h>
-namespace noos {
+namespace newsbeuter {
std::vector<std::string> utils::tokenize_config(const std::string& str, std::string delimiters) {
std::vector<std::string> tokens = tokenize(str,delimiters);
diff --git a/src/view.cpp b/src/view.cpp
index fbdd4c4d..bb87be50 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -32,7 +32,7 @@ extern "C" {
#include <iostream>
#include <sstream>
-using namespace noos;
+using namespace newsbeuter;
view::view(controller * c) : ctrl(c), cfg(0), keys(0), mtx(0) {
feedlist_form = stfl_create(feedlist_str);
@@ -592,7 +592,7 @@ std::string view::filebrowser(filebrowser_type type, const std::string& default_
char cwdtmp[MAXPATHLEN];
::getcwd(cwdtmp,sizeof(cwdtmp));
std::string fn(cwdtmp);
- fn.append(NOOS_PATH_SEP);
+ fn.append(NEWSBEUTER_PATH_SEP);
const char * fnstr = stfl_get(filebrowser_form,"filenametext");
const char * base = strrchr(fnstr,'/');
if (!base)
@@ -607,7 +607,7 @@ std::string view::filebrowser(filebrowser_type type, const std::string& default_
char cwdtmp[MAXPATHLEN];
::getcwd(cwdtmp,sizeof(cwdtmp));
std::string fn(cwdtmp);
- fn.append(NOOS_PATH_SEP);
+ fn.append(NEWSBEUTER_PATH_SEP);
fn.append(filename);
stfl_set(filebrowser_form,"filenametext",fn.c_str());
stfl_set_focus(filebrowser_form,"filename");
diff --git a/src/xmlpullparser.cpp b/src/xmlpullparser.cpp
index 6a63a39d..f4645f81 100644
--- a/src/xmlpullparser.cpp
+++ b/src/xmlpullparser.cpp
@@ -7,7 +7,7 @@
#include <iostream>
#include <cstdlib>
-namespace noos
+namespace newsbeuter
{
xmlpullparser::xmlpullparser() : inputstream(0), current_event(START_DOCUMENT)
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-30 00:49:45 +0000