diff options
| author |  Andreas Krennmair <ak@synflood.at>
| 2007-01-16 18:52:07 +0000 |
|---|---|---|
| committer | Andreas Krennmair <ak@synflood.at>
| 2007-01-16 18:52:07 +0000 |
| commit | 34758b994557f712ffcf698a77792d4adeafb23e (patch) | |
| tree | d311dc4fc9f7ff09429b2b569eae4245299a525e | |
| parent | baac6b122e4286ad544593720c8f35bbe93a976a (diff) | |
| download | newsboat-34758b994557f712ffcf698a77792d4adeafb23e.tar.gz newsboat-34758b994557f712ffcf698a77792d4adeafb23e.tar.zst newsboat-34758b994557f712ffcf698a77792d4adeafb23e.zip | |
Andreas Krennmair:
rebranded noos to newsbeuter
38 files changed, 162 insertions, 151 deletions
@@ -2,7 +2,7 @@ CXX=c++ CXXFLAGS=-g -I./include -I./stfl -I. -I/usr/local/include -I/sw/include -Wall LDFLAGS=-L/usr/local/lib -L/sw/lib LIBS=-lstfl -lmrss -lnxml -lncurses -lsqlite3 -lidn -OUTPUT=noos +OUTPUT=newsbeuter SRC=$(wildcard *.cpp) $(wildcard src/*.cpp) OBJS=$(patsubst %.cpp,%.o,$(SRC)) prefix=/usr/local @@ -1,20 +1,20 @@ -README for noos: +README for newsbeuter: == Introduction == -noos is an RSS feed reader for the text console. It is designed to run +Newsbeuter is an RSS feed reader for the text console. It is designed to run Unix-like operating systems such as Linux. == Downloading == -You can download the latest version of noos from the following website: -http://synflood.at/noos.html +You can download the latest version of newsbeuter from the following website: +http://synflood.at/newsbeuter.html -Alternatively, you can check out the latest version from the noos +Alternatively, you can check out the latest version from the newsbeuter Subversion repository: http://bereshit.synflood.at/svn/noos/trunk/ == Dependencies == -noos depends on a number of libraries, which need to be installed -before noos can be compiled. +Newsbeuter depends on a number of libraries, which need to be installed before +newsbeuter can be compiled. libnXml: http://www2.autistici.org/bakunin/libnxml/ libmRss: http://www2.autistici.org/bakunin/libmrss/ @@ -25,7 +25,7 @@ libidn: http://www.gnu.org/software/libidn/ Debian unstable comes with ready-to-use packages for these dependencies. == Installation == -Compiling and installing noos is as simple as: +Compiling and installing newsbeuter is as simple as: make make install @@ -33,5 +33,5 @@ make install Andreas Krennmair <ak@synflood.at> == License == -noos is licensed under the MIT/X Consortium License. See the file -LICENSE for further details. +Newsbeuter is licensed under the MIT/X Consortium License. See the file LICENSE +for further details. @@ -1,12 +1,12 @@ -#ifndef NOOS_CONFIG__H -#define NOOS_CONFIG__H +#ifndef NEWSBEUTER_CONFIG__H +#define NEWSBEUTER_CONFIG__H -#define PROGRAM_NAME "noos" -#define PROGRAM_VERSION "0.2" -#define PROGRAM_URL "http://synflood.at/noos.html" +#define PROGRAM_NAME "newsbeuter" +#define PROGRAM_VERSION "0.1" +#define PROGRAM_URL "http://synflood.at/newsbeuter.html" #define USER_AGENT PROGRAM_NAME " rss feedreader " PROGRAM_VERSION " (" PROGRAM_URL ")" -#define NOOS_PATH_SEP "/" -#define NOOS_CONFIG_SUBDIR ".noos" +#define NEWSBEUTER_PATH_SEP "/" +#define NEWSBEUTER_CONFIG_SUBDIR ".newsbeuter" #endif diff --git a/doc/noos.1 b/doc/newsbeuter.1 index 88517601..4100b35d 100644 --- a/doc/noos.1 +++ b/doc/newsbeuter.1 @@ -1,13 +1,13 @@ .\" (c) 2006 Andreas Krennmair <ak@synflood.at> -.\" run groff -T ps -man noos.1 > manpage.ps to generate nice PostScript output +.\" run groff -T ps -man newsbeuter.1 > manpage.ps to generate nice PostScript output .Dd Dec 20, 2006 -.Dt NOOS 1 -.Os "noos" +.Dt NEWSBEUTER 1 +.Os "newsbeuter" .Sh NAME -.Nm noos +.Nm newsbeuter .Nd an RSS feed reader for text terminals .Sh SYNOPSIS -.Nm noos +.Nm newsbeuter .Op Fl r .Op Fl e .Op Fl i Ar opmlfile @@ -18,9 +18,9 @@ .Sh DESCRIPTION .Nm is an RSS feed reader for text terminals. RSS is a number of widely-used XML formats -to transmit, publish and syndicate articles, for example news or blog articles. Noos -is designed to be used on text terminals on Unix or Unix-like systems such as Linux, -BSD or Mac OS X. +to transmit, publish and syndicate articles, for example news or blog articles. +Newsbeuter is designed to be used on text terminals on Unix or Unix-like systems +such as Linux, BSD or Mac OS X. .Sh OPTIONS .Nm accepts the following commandline switches: @@ -43,13 +43,13 @@ Use an alternative configuration file .Sh FILES .Bl -item .It -.Pa $HOME/.noos/config +.Pa $HOME/.newsbeuter/config .It -.Pa $HOME/.noos/urls +.Pa $HOME/.newsbeuter/urls .El .Sh SEE ALSO -The documentation that comes with noos is a good source about the general use and -configuration of noos. +The documentation that comes with newsbeuter is a good source about the general use and +configuration of newsbeuter. .Sh AUTHORS .Bd -literal .An Andreas Krennmair <ak@synflood.at>, for contributors see AUTHORS file. diff --git a/doc/noos.txt b/doc/newsbeuter.txt index 19afe044..6749f23e 100644 --- a/doc/noos.txt +++ b/doc/newsbeuter.txt @@ -1,36 +1,44 @@ -The Noos RSS Feedreader -======================= +The Newsbeuter RSS Feedreader +============================= Andreas Krennmair <ak@synflood.at> Introduction ------------ -Noos is an RSS feedreader. RSS is a number of widely-used XML formats -to transmit, publish and syndicate articles, for example news or blog -articles. Noos is designed to be used on text terminals on Unix or Unix-like +Newsbeuter is an RSS feedreader. RSS is a number of widely-used XML formats to +transmit, publish and syndicate articles, for example news or blog articles. +Newsbeuter is designed to be used on text terminals on Unix or Unix-like systems such as Linux, BSD or Mac OS X. +Why "Newsbeuter"? +~~~~~~~~~~~~~~~~ +"Newsbeuter" is a pun on the German word "Wildbeuter", which means +"hunter-gatherer". During the stone age, people hunted and gathered their food, +and these days, they hunt and gather news and information. Credits for this +idea goes to Clifford Wolf, who submitted it to a little competiton that was +started when I got aware that the original name would violate French and +European registered trademarks. + Installation ------------ -This chapter describes how to compile and install noos from source. +This chapter describes how to compile and install newsbeuter from source. -Downloading Noos -~~~~~~~~~~~~~~~~ - -Noos is available as source package. Simply go to http://synflood.at/noos.html[] -and download the latest source package, which is usually in the .tar.gz file -format. Alternatively, you can check out the latest development source tree -from the Noos SVN repository by running the following command on the -commandline: +Downloading Newsbeuter +~~~~~~~~~~~~~~~~~~~~~~ +Newsbeuter is available as source package. Simply go to +http://synflood.at/newsbeuter.html[] and download the latest source package, +which is usually in the .tar.gz file format. Alternatively, you can check out +the latest development source tree from the newsbeuter SVN repository by +running the following command on the commandline: svn co http://bereshit.synflood.at/svn/noos/trunk Dependencies ~~~~~~~~~~~~ -Noos depends on a number of libraries to function correctly. This table lists -these dependencies. Please be aware that the list libraries may themselves -depend on other libraries. These dependencies are not listed here. Please also -be aware that you need a recent C++ compiler. Currently, noos has only been -tested with GCC. +Newsbeuter depends on a number of libraries to function correctly. This table +lists these dependencies. Please be aware that the list libraries may +themselves depend on other libraries. These dependencies are not listed here. +Please also be aware that you need a recent C++ compiler. Currently, newsbeuter +has only been tested with GCC. - Libidn: http://www.gnu.org/software/libidn/[] - STFL: http://www.clifford.at/stfl/[] @@ -40,25 +48,24 @@ tested with GCC. Compiling and Installing ~~~~~~~~~~~~~~~~~~~~~~~~ - After you've downloaded and installed the dependencies mentioned above, you can -start compiling and installing noos. To compile noos, simply run "make" in the -source tree. After a short time, this should complete successfully, and you can -go on with installation by running "make install". By default, this will -install the "noos" binary to the /usr/local/bin directory. You can provide an -alternative installation path using the prefix parameter, e.g. running "make -install prefix=/opt/noos" will install the binary to the directory -/opt/noos/bin. +start compiling and installing newsbeuter. To compile newsbeuter, simply run +"make" in the source tree. After a short time, this should complete +successfully, and you can go on with installation by running "make install". By +default, this will install the "newsbeuter" binary to the /usr/local/bin +directory. You can provide an alternative installation path using the prefix +parameter, e.g. running "make install prefix=/opt/newsbeuter" will install the +binary to the directory /opt/newsbeuter/bin. First Steps ----------- -After you've installed noos, you can run it for the first time by typing "noos" on -your command prompt. This will bring you the following message: +After you've installed newsbeuter, you can run it for the first time by typing +"newsbeuter" on your command prompt. This will bring you the following message: Error: no URLs configured. Please fill the file /Users/ak/.nos/urls with RSS feed URLs or import an OPML file. - noos 0.2 - usage: ./noos [-i <file>|-e] [-u <urlfile>] [-c <cachefile>] [-h] + newsbeuter 0.1 + usage: ./newsbeuter [-i <file>|-e] [-u <urlfile>] [-c <cachefile>] [-h] -r refresh feeds on start -e export OPML feed to stdout -i <file> import OPML file @@ -68,13 +75,14 @@ your command prompt. This will bring you the following message: -h this help -This means that noos can't start without any configured feeds. To add feeds to -noos, you can either add URLs to the configuration file $HOME/.noos/urls or you -can import an OPML file by running "noos -i blogroll.opml". +This means that newsbeuter can't start without any configured feeds. To add +feeds to newsbeuter, you can either add URLs to the configuration file +$HOME/.newsbeuter/urls or you can import an OPML file by running "newsbeuter -i +blogroll.opml". -Now you can run noos again, and it will present you with a navigatable list of -the URLs that you configured previously. You can now start downloading the -feeds, either by pressing "R" to download all feeds, or by pressing "r" to +Now you can run newsbeuter again, and it will present you with a navigatable +list of the URLs that you configured previously. You can now start downloading +the feeds, either by pressing "R" to download all feeds, or by pressing "r" to download the currently selected feed. You can then select a feed you want to read, and by pressing "Enter", you can go to the article list for this feed. This works even while the downloading is still in progress. You can now see @@ -84,18 +92,19 @@ article. You can scroll through this text, and also run a browser (default: lynx) to view the complete article if the content is empty or just an abstract or a short description. Pressing "q" brings you back to the article list, and pressing "q" again brings you back to the feed list. Pressing "q" a third time -then closes noos. +then closes newsbeuter. -Noos caches the article that it downloads. This means that when you start -noos again and reload a feed, the old articles can still be read even if they -aren't in the current RSS feeds anymore. Optionally you can configure how many -articles shall be preserved by feed so that the article backlog doesn't +Newsbeuter caches the article that it downloads. This means that when you start +newsbeuter again and reload a feed, the old articles can still be read even if +they aren't in the current RSS feeds anymore. Optionally you can configure how +many articles shall be preserved by feed so that the article backlog doesn't grow endlessly (see below). -Several aspects of noos' behaviour can be configured via a configuration file, -by default $HOME/.noos/config. This configuration files contains lines in the -form "<config-command> <arg1> ...". The configuration file can also contain -comments, which start with the '#' character and go as far as the end of line. +Several aspects of newsbeuter's behaviour can be configured via a configuration +file, by default $HOME/.newsbeuter/config. This configuration files contains +lines in the form "<config-command> <arg1> ...". The configuration file can +also contain comments, which start with the '#' character and go as far as the +end of line. .Configuration Commands @@ -132,11 +141,13 @@ help:?:Runs the help screen. ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Keys, as used in the bind-key configuration command, use a special syntax. Lowercase keys, uppercase -keys and special characters are written literally. The Enter key is written as "enter", while the -ESC key is written as "esc". The function keys F1 to F12 are written as "F1" to "F12". Key combinations -with the Ctrl key, such as Ctrl-R, are written as ^r. Please be aware that all Ctrl-related key -combinations need to be written in lowercase ^R for Ctrl-Shift-R does not work. +Keys, as used in the bind-key configuration command, use a special syntax. +Lowercase keys, uppercase keys and special characters are written literally. +The Enter key is written as "enter", while the ESC key is written as "esc". The +function keys F1 to F12 are written as "F1" to "F12". Key combinations with the +Ctrl key, such as Ctrl-R, are written as ^r. Please be aware that all +Ctrl-related key combinations need to be written in lowercase ^R for +Ctrl-Shift-R does not work. Example Configuration @@ -156,20 +167,20 @@ MIT/X Consortium License (C)opyright 2006-2007 Andreas Krennmair <ak@synflood.at> -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/include/cache.h b/include/cache.h index 70d0e331..7459aa13 100644 --- a/include/cache.h +++ b/include/cache.h @@ -1,12 +1,12 @@ -#ifndef NOOS_CACHE__H -#define NOOS_CACHE__H +#ifndef NEWSBEUTER_CACHE__H +#define NEWSBEUTER_CACHE__H #include <sqlite3.h> #include <rss.h> #include <configcontainer.h> #include <mutex.h> -namespace noos { +namespace newsbeuter { class cache { public: diff --git a/include/configcontainer.h b/include/configcontainer.h index f9725ace..91e0202e 100644 --- a/include/configcontainer.h +++ b/include/configcontainer.h @@ -3,7 +3,7 @@ #include <configparser.h> -namespace noos +namespace newsbeuter { class configcontainer : public config_action_handler diff --git a/include/configparser.h b/include/configparser.h index 1058a13d..1a3e94c5 100644 --- a/include/configparser.h +++ b/include/configparser.h @@ -1,11 +1,11 @@ -#ifndef NOOS_CONFIGPARSER__H -#define NOOS_CONFIGPARSER__H +#ifndef NEWSBEUTER_CONFIGPARSER__H +#define NEWSBEUTER_CONFIGPARSER__H #include <vector> #include <string> #include <map> -namespace noos { +namespace newsbeuter { enum action_handler_status { AHS_OK = 0, AHS_INVALID_PARAMS, AHS_TOO_FEW_PARAMS, AHS_INVALID_COMMAND }; diff --git a/include/controller.h b/include/controller.h index db54065a..09b80b70 100644 --- a/include/controller.h +++ b/include/controller.h @@ -1,12 +1,12 @@ -#ifndef NOOS_CONTROLLER__H -#define NOOS_CONTROLLER__H +#ifndef NEWSBEUTER_CONTROLLER__H +#define NEWSBEUTER_CONTROLLER__H #include <urlreader.h> #include <rss.h> #include <cache.h> #include <nxml.h> -namespace noos { +namespace newsbeuter { class view; diff --git a/include/downloadthread.h b/include/downloadthread.h index e4817bdb..3d3724f4 100644 --- a/include/downloadthread.h +++ b/include/downloadthread.h @@ -4,7 +4,7 @@ #include <thread.h> #include <controller.h> -namespace noos +namespace newsbeuter { class controller; diff --git a/include/exception.h b/include/exception.h index e2e665fc..5881cabe 100644 --- a/include/exception.h +++ b/include/exception.h @@ -3,7 +3,7 @@ #include <exception> -namespace noos { +namespace newsbeuter { class exception : public std::exception { public: diff --git a/include/exceptions.h b/include/exceptions.h index 2bbad247..b236957f 100644 --- a/include/exceptions.h +++ b/include/exceptions.h @@ -4,7 +4,7 @@ #include <stdexcept> #include <string> -namespace noos { +namespace newsbeuter { class xmlexception : public std::exception { public: diff --git a/include/htmlrenderer.h b/include/htmlrenderer.h index bc273585..050b4fbb 100644 --- a/include/htmlrenderer.h +++ b/include/htmlrenderer.h @@ -1,11 +1,11 @@ -#ifndef NOOS_HTMLRENDERER__H -#define NOOS_HTMLRENDERER__H +#ifndef NEWSBEUTER_HTMLRENDERER__H +#define NEWSBEUTER_HTMLRENDERER__H #include <vector> #include <string> #include <istream> -namespace noos { +namespace newsbeuter { class htmlrenderer { public: diff --git a/include/keymap.h b/include/keymap.h index f47f448c..a29b8bf5 100644 --- a/include/keymap.h +++ b/include/keymap.h @@ -1,5 +1,5 @@ -#ifndef NOOS_KEYMAP__H -#define NOOS_KEYMAP__H +#ifndef NEWSBEUTER_KEYMAP__H +#define NEWSBEUTER_KEYMAP__H #include <string> #include <map> @@ -10,7 +10,7 @@ // in configuration: bind-key <key> <operation> -namespace noos { +namespace newsbeuter { enum operation { OP_NIL = 0, OP_QUIT, OP_RELOAD, OP_RELOADALL, OP_MARKFEEDREAD, OP_MARKALLFEEDSREAD, OP_OPEN, OP_SAVE, OP_NEXTUNREAD, OP_OPENINBROWSER, diff --git a/include/mutex.h b/include/mutex.h index a711ae98..11502c7b 100644 --- a/include/mutex.h +++ b/include/mutex.h @@ -3,7 +3,7 @@ #include <pthread.h> -namespace noos { +namespace newsbeuter { class mutex { public: diff --git a/include/rss.h b/include/rss.h index 37417350..adb31de2 100644 --- a/include/rss.h +++ b/include/rss.h @@ -1,5 +1,5 @@ -#ifndef NOOS_RSS__H -#define NOOS_RSS__H +#ifndef NEWSBEUTER_RSS__H +#define NEWSBEUTER_RSS__H #include <string> #include <vector> @@ -9,7 +9,7 @@ extern "C" { #include <mrss.h> } -namespace noos { +namespace newsbeuter { class cache; diff --git a/include/thread.h b/include/thread.h index f3b936c0..d9449293 100644 --- a/include/thread.h +++ b/include/thread.h @@ -3,7 +3,7 @@ #include <pthread.h> -namespace noos { +namespace newsbeuter { // TODO: implement an option to provide attributes diff --git a/include/urlreader.h b/include/urlreader.h index eaa9b2de..341d659c 100644 --- a/include/urlreader.h +++ b/include/urlreader.h @@ -1,10 +1,10 @@ -#ifndef NOOS_CONFIGREADER__H -#define NOOS_CONFIGREADER__H +#ifndef NEWSBEUTER_CONFIGREADER__H +#define NEWSBEUTER_CONFIGREADER__H #include <vector> #include <string> -namespace noos { +namespace newsbeuter { class urlreader { public: diff --git a/include/utils.h b/include/utils.h index 8407d3b0..2383de9b 100644 --- a/include/utils.h +++ b/include/utils.h @@ -4,7 +4,7 @@ #include <vector> #include <string> -namespace noos { +namespace newsbeuter { class utils { public: diff --git a/include/view.h b/include/view.h index 732986d2..dd6b93e6 100644 --- a/include/view.h +++ b/include/view.h @@ -1,5 +1,5 @@ -#ifndef NOOS_VIEW__H -#define NOOS_VIEW__H +#ifndef NEWSBEUTER_VIEW__H +#define NEWSBEUTER_VIEW__H #include <controller.h> #include <configcontainer.h> @@ -14,7 +14,7 @@ extern "C" { #include <stfl.h> } -namespace noos { +namespace newsbeuter { class view { public: diff --git a/include/xmlpullparser.h b/include/xmlpullparser.h index 38c27e10..18c26cd8 100644 --- a/include/xmlpullparser.h +++ b/include/xmlpullparser.h @@ -5,7 +5,7 @@ #include <utility> #include <vector> -namespace noos +namespace newsbeuter { class xmlpullparser diff --git a/noos.cpp b/newsbeuter.cpp index 37a14e14..87286b66 100644 --- a/noos.cpp +++ b/newsbeuter.cpp @@ -6,7 +6,7 @@ #include <cache.h> #include <locale.h> -using namespace noos; +using namespace newsbeuter; int main(int argc, char * argv[]) { 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) @@ -3,7 +3,7 @@ #include <iostream> using namespace std; -using namespace noos; +using namespace newsbeuter; #ifdef _TESTPP int main(int argc, char * argv[]) { |