From 7468e7a36c8fbb1f6025368322dd5d6484fc5d7c Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Wed, 12 Feb 2014 16:30:49 +0000 Subject: [PATCH] added: namespace Winix over all *.h/*.cpp files git-svn-id: svn://ttmath.org/publicrep/winix/trunk@948 e52654a7-88a9-db11-a3e9-0013d4bc506e --- Makefile | 2 +- core/acceptbaseparser.cpp | 11 +++++++++- core/acceptbaseparser.h | 10 ++++++++- core/acceptencodingparser.h | 10 ++++++++- core/app.cpp | 9 +++++++++ core/app.h | 12 ++++++++++- core/basethread.cpp | 9 ++++++++- core/basethread.h | 10 ++++++++- core/bbcodeparser.cpp | 11 +++++++++- core/bbcodeparser.h | 9 ++++++++- core/compress.cpp | 10 ++++++++- core/compress.h | 9 ++++++++- core/config.cpp | 9 ++++++++- core/config.h | 9 ++++++++- core/cookieparser.h | 9 ++++++++- core/crypt.cpp | 11 +++++++++- core/crypt.h | 11 ++++++++-- core/cur.h | 9 ++++++++- core/dircontainer.cpp | 12 ++++++++++- core/dircontainer.h | 10 ++++++++- core/dirs.cpp | 8 +++++++- core/dirs.h | 11 +++++++++- core/error.h | 8 +++++++- core/group.h | 8 +++++++- core/groups.cpp | 25 +++++------------------ core/groups.h | 9 ++++++--- core/htmlfilter.cpp | 8 +++++++- core/htmlfilter.h | 9 ++++++++- core/httpsimpleparser.cpp | 18 ++++++++--------- core/httpsimpleparser.h | 10 +++++++-- core/image.cpp | 13 ++++++++++-- core/image.h | 10 ++++++++- core/ipban.h | 12 ++++++++++- core/ipbancontainer.cpp | 9 ++++++++- core/ipbancontainer.h | 9 ++++++++- core/item.cpp | 10 ++++++++- core/item.h | 8 +++++++- core/job.cpp | 10 ++++++++- core/job.h | 10 ++++++++- core/lastcontainer.cpp | 13 +++++++++++- core/lastcontainer.h | 11 +++++++++- core/loadavg.cpp | 11 +++++++++- core/loadavg.h | 9 ++++++++- core/lock.cpp | 10 ++++++++- core/lock.h | 11 +++++++++- core/log.cpp | 32 +++++++---------------------- core/log.h | 13 +++++++++++- core/logmanipulators.h | 12 ++++++++++- core/misc.cpp | 10 ++++++++- core/misc.h | 8 ++++++-- core/mount.cpp | 11 +++++++++- core/mount.h | 9 ++++++++- core/mountparser.cpp | 13 ++++++------ core/mountparser.h | 11 +++++++++- core/mounts.cpp | 11 +++++++++- core/mounts.h | 10 ++++++++- core/plugin.cpp | 8 +++++++- core/plugin.h | 13 ++++++++++-- core/plugindata.cpp | 11 +++++++++- core/plugindata.h | 10 ++++++++- core/pluginmsg.h | 12 ++++++++++- core/postmultiparser.cpp | 13 +++++++++++- core/postmultiparser.h | 10 ++++++++- core/postparser.h | 10 ++++++++- core/rebus.cpp | 13 ++++++------ core/rebus.h | 13 ++++++++++-- core/request.cpp | 8 +++++++- core/request.h | 10 ++++++++- core/requesttypes.h | 11 +++++++++- core/run.cpp | 11 +++++++++- core/run.h | 11 +++++++++- core/session.cpp | 9 ++++++++- core/session.h | 9 ++++++++- core/sessioncontainer.cpp | 10 ++++++++- core/sessioncontainer.h | 11 +++++++++- core/sessionmanager.cpp | 8 +++++++- core/sessionmanager.h | 10 ++++++++- core/sessionparser.cpp | 10 ++++++++- core/sessionparser.h | 10 ++++++++- core/slog.cpp | 9 ++++++++- core/slog.h | 11 +++++++++- core/synchro.cpp | 8 +++++++- core/synchro.h | 9 ++++++++- core/system.cpp | 12 ++++++++++- core/system.h | 11 +++++++++- core/textstream.h | 10 ++++++++- core/threadmanager.cpp | 11 +++++++++- core/threadmanager.h | 11 +++++++++- core/timezone.cpp | 10 ++++++++- core/timezone.h | 13 +++++++----- core/timezones.cpp | 8 ++++++-- core/timezones.h | 10 ++++++++- core/ugcontainer.h | 10 ++++++++- core/user.cpp | 22 +++++++------------- core/user.h | 10 ++++++++- core/users.cpp | 9 ++++++++- core/users.h | 10 +++++++-- core/version.h | 14 ++++++++++--- db/db.cpp | 8 +++++++- db/db.h | 11 +++++++--- db/dbbase.cpp | 9 ++++++++- db/dbbase.h | 9 ++++++++- db/dbconn.cpp | 9 ++++++++- db/dbconn.h | 6 +++++- db/dbitemcolumns.cpp | 8 +++++++- db/dbitemcolumns.h | 10 +++++++-- db/dbitemquery.cpp | 9 ++++++++- db/dbitemquery.h | 11 ++++++++-- db/dbtextstream.cpp | 9 ++++++++- db/dbtextstream.h | 9 ++++++++- functions/account.cpp | 10 ++++++++- functions/account.h | 7 ++++++- functions/adduser.cpp | 11 +++++++++- functions/adduser.h | 7 ++++++- functions/cat.cpp | 8 +++++++- functions/cat.h | 6 +++++- functions/chmod.cpp | 9 ++++++++- functions/chmod.h | 6 +++++- functions/chown.cpp | 9 ++++++++- functions/chown.h | 6 +++++- functions/ckeditor.cpp | 9 ++++++++- functions/ckeditor.h | 6 +++++- functions/cp.cpp | 12 +++++++++-- functions/cp.h | 6 +++++- functions/default.cpp | 8 +++++++- functions/default.h | 6 +++++- functions/download.cpp | 9 ++++++++- functions/download.h | 6 +++++- functions/emacs.cpp | 9 ++++++++- functions/emacs.h | 6 +++++- functions/env.cpp | 9 ++++++++- functions/env.h | 7 ++++++- functions/functionbase.cpp | 8 +++++++- functions/functionbase.h | 6 +++++- functions/functionparser.cpp | 9 ++++++++- functions/functionparser.h | 7 ++++++- functions/functions.cpp | 11 +++++++++- functions/functions.h | 8 +++++++- functions/imgcrop.cpp | 10 ++++++++- functions/imgcrop.h | 6 +++++- functions/ipban.cpp | 9 ++++++++- functions/ipban.h | 6 +++++- functions/last.cpp | 10 ++++++++- functions/last.h | 6 +++++- functions/ln.cpp | 10 ++++++++- functions/ln.h | 6 +++++- functions/locale.cpp | 8 +++++++- functions/locale.h | 6 +++++- functions/login.cpp | 9 ++++++++- functions/login.h | 6 +++++- functions/logout.cpp | 10 ++++++++- functions/logout.h | 6 +++++- functions/ls.cpp | 8 +++++++- functions/ls.h | 6 +++++- functions/man.cpp | 9 ++++++++- functions/man.h | 6 +++++- functions/meta.cpp | 9 ++++++++- functions/meta.h | 7 ++++++- functions/mkdir.cpp | 10 ++++++++- functions/mkdir.h | 6 +++++- functions/mount.cpp | 10 ++++++++- functions/mount.h | 6 +++++- functions/mv.cpp | 9 ++++++++- functions/mv.h | 6 +++++- functions/nicedit.cpp | 9 ++++++++- functions/nicedit.h | 6 +++++- functions/node.cpp | 10 ++++++++- functions/node.h | 6 +++++- functions/passwd.cpp | 11 +++++++++- functions/passwd.h | 7 ++++++- functions/priv.cpp | 10 ++++++++- functions/priv.h | 7 ++++++- functions/privchanger.cpp | 11 +++++++++- functions/privchanger.h | 7 +++++-- functions/pw.cpp | 9 ++++++++- functions/pw.h | 7 ++++++- functions/reload.cpp | 9 ++++++++- functions/reload.h | 6 +++++- functions/rm.cpp | 11 ++++++++-- functions/rm.h | 6 +++++- functions/rmuser.cpp | 9 ++++++++- functions/rmuser.h | 6 +++++- functions/run.cpp | 9 ++++++++- functions/run.h | 6 +++++- functions/sort.cpp | 9 ++++++++- functions/sort.h | 6 +++++- functions/specialdefault.cpp | 10 ++++++++- functions/specialdefault.h | 6 +++++- functions/stat.cpp | 9 ++++++++- functions/stat.h | 6 +++++- functions/subject.cpp | 10 ++++++++- functions/subject.h | 6 +++++- functions/template.cpp | 9 ++++++++- functions/template.h | 6 +++++- functions/timezone.cpp | 9 ++++++++- functions/timezone.h | 6 +++++- functions/tinymce.cpp | 8 +++++++- functions/tinymce.h | 7 ++++++- functions/uname.cpp | 11 +++++++++- functions/uname.h | 6 +++++- functions/upload.cpp | 10 ++++++++- functions/upload.h | 7 ++++++- functions/uptime.cpp | 9 ++++++++- functions/uptime.h | 6 +++++- functions/vim.cpp | 10 ++++++++- functions/vim.h | 6 +++++- functions/who.cpp | 11 +++++++++- functions/who.h | 6 +++++- main/main.cpp | 36 ++++++++++++++++++++------------- notify/notify.cpp | 7 ++++++- notify/notify.h | 6 +++++- notify/notifypool.cpp | 17 ++++------------ notify/notifypool.h | 6 +++++- notify/notifythread.cpp | 12 +++++------ notify/notifythread.h | 6 ++++-- notify/templatesnotify.cpp | 22 ++++---------------- notify/templatesnotify.h | 7 ++++++- plugins/export/edb.cpp | 8 +++++++- plugins/export/edb.h | 6 +++++- plugins/export/export.h | 7 ++++++- plugins/export/exportinfo.cpp | 8 +++++++- plugins/export/exportinfo.h | 8 +++++++- plugins/export/exportthread.cpp | 8 +++++++- plugins/export/exportthread.h | 8 +++++++- plugins/export/funexport.cpp | 9 +++++++-- plugins/export/funexport.h | 7 ++++++- plugins/export/init.cpp | 8 +++++++- plugins/export/message.h | 8 +++++++- plugins/gallery/gallery.cpp | 8 +++++++- plugins/gallery/gallery.h | 6 +++++- plugins/gallery/galleryinfo.cpp | 8 +++++++- plugins/gallery/galleryinfo.h | 6 +++++- plugins/gallery/init.cpp | 8 +++++++- plugins/gallery/templates.cpp | 8 +++++++- plugins/group/groupinfo.cpp | 7 ++++++- plugins/group/groupinfo.h | 6 +++++- plugins/group/groups.cpp | 8 +++++++- plugins/group/groups.h | 8 ++++++-- plugins/group/init.cpp | 8 +++++++- plugins/group/templates.cpp | 8 +++++++- plugins/menu/cache.cpp | 8 +++++++- plugins/menu/cache.h | 6 +++++- plugins/menu/init.cpp | 9 +++++++-- plugins/menu/templates.cpp | 9 ++++++++- plugins/stats/bot.cpp | 9 ++++++++- plugins/stats/bot.h | 6 +++++- plugins/stats/init.cpp | 10 +++++++-- plugins/stats/stats.cpp | 9 ++++++++- plugins/stats/stats.h | 6 +++++- plugins/stats/statssession.h | 6 +++++- plugins/stats/templates.cpp | 9 ++++++++- plugins/stats/templates.h | 6 ++++-- plugins/thread/createthread.cpp | 8 +++++++- plugins/thread/createthread.h | 6 +++++- plugins/thread/funthread.cpp | 9 ++++++++- plugins/thread/funthread.h | 6 +++++- plugins/thread/init.cpp | 8 +++++++- plugins/thread/pluginmsg.h | 8 +++++++- plugins/thread/reply.cpp | 8 +++++++- plugins/thread/reply.h | 6 +++++- plugins/thread/showthreads.cpp | 8 +++++++- plugins/thread/showthreads.h | 7 ++++++- plugins/thread/tdb.cpp | 8 +++++++- plugins/thread/tdb.h | 7 +++++-- plugins/thread/templates.cpp | 8 +++++++- plugins/thread/templates.h | 6 +++++- plugins/thread/thread.h | 7 ++++++- plugins/thread/threadinfo.cpp | 8 +++++++- plugins/thread/threadinfo.h | 6 +++++- plugins/ticket/createticket.cpp | 8 +++++++- plugins/ticket/createticket.h | 7 ++++++- plugins/ticket/editticket.cpp | 8 +++++++- plugins/ticket/editticket.h | 6 +++++- plugins/ticket/funticket.cpp | 8 +++++++- plugins/ticket/funticket.h | 7 ++++++- plugins/ticket/init.cpp | 8 +++++++- plugins/ticket/pluginmsg.h | 7 ++++++- plugins/ticket/sessiondata.cpp | 8 +++++++- plugins/ticket/sessiondata.h | 6 +++++- plugins/ticket/showtickets.cpp | 9 ++++++++- plugins/ticket/showtickets.h | 7 ++++++- plugins/ticket/tdb.cpp | 8 +++++++- plugins/ticket/tdb.h | 7 +++++-- plugins/ticket/templates.cpp | 8 +++++++- plugins/ticket/ticket.h | 7 ++++++- plugins/ticket/ticketinfo.cpp | 8 +++++++- plugins/ticket/ticketinfo.h | 7 +++++-- templates/adduser.cpp | 9 ++++++++- templates/changepatterns.cpp | 9 ++++++++- templates/changepatterns.h | 8 +++++++- templates/config.cpp | 6 +++++- templates/dir.cpp | 9 +++++++-- templates/doc.cpp | 6 +++++- templates/env.cpp | 8 +++++++- templates/filters.cpp | 8 +++++++- templates/htmltextstream.cpp | 11 +++++++++- templates/htmltextstream.h | 6 +++++- templates/indexpatterns.cpp | 10 ++++++++- templates/indexpatterns.h | 6 +++++- templates/insert.cpp | 8 +++++--- templates/ipban.cpp | 12 ++++++++++- templates/item.cpp | 6 ++++-- templates/last.cpp | 8 +++++++- templates/locale.cpp | 10 ++++++++- templates/locale.h | 6 +++++- templates/localefilter.cpp | 9 ++++++++- templates/localefilter.h | 7 ++++--- templates/login.cpp | 8 ++++++-- templates/ls.cpp | 7 ++++++- templates/man.cpp | 7 ++++++- templates/misc.cpp | 8 ++++++-- templates/misc.h | 9 +++++++-- templates/miscspace.cpp | 8 +++++++- templates/miscspace.h | 6 +++++- templates/mount.cpp | 8 +++++++- templates/passwd.cpp | 7 +++++-- templates/patterncacher.cpp | 9 +++++++-- templates/patterncacher.h | 7 ++++++- templates/patterns.cpp | 10 ++++++++- templates/patterns.h | 8 +++++++- templates/priv.cpp | 10 ++++----- templates/rebus.cpp | 8 ++++++-- templates/slog.cpp | 6 +++++- templates/stat.cpp | 9 ++++++++- templates/sys.cpp | 6 +++++- templates/template.cpp | 9 ++++++++- templates/templates.cpp | 6 +++++- templates/templates.h | 7 ++++++- templates/textextstream.cpp | 9 ++++++++- templates/textextstream.h | 6 +++++- templates/upload.cpp | 8 +++++++- templates/uptime.cpp | 10 ++++++++- templates/user.cpp | 9 ++++++++- templates/who.cpp | 8 +++++++- templates/winix.cpp | 7 ++++++- 335 files changed, 2452 insertions(+), 505 deletions(-) diff --git a/Makefile b/Makefile index 0c6544f..e186638 100755 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ winix.so: $(winix.src.files) winix: winix.so $(winix.src.files) @cd main ; $(MAKE) -e - $(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) main/*.o winix.so + $(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) main/*.o winix.so -lfcgi diff --git a/core/acceptbaseparser.cpp b/core/acceptbaseparser.cpp index 3709b11..b429b98 100755 --- a/core/acceptbaseparser.cpp +++ b/core/acceptbaseparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ #include "acceptbaseparser.h" +namespace Winix +{ + + + bool AcceptBaseParser::IsWhite(int c) { @@ -112,3 +117,7 @@ void AcceptBaseParser::Parse(const char * str) } + + +} // namespace Winix + diff --git a/core/acceptbaseparser.h b/core/acceptbaseparser.h index e94ae39..9dd81bb 100755 --- a/core/acceptbaseparser.h +++ b/core/acceptbaseparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,11 @@ #include +namespace Winix +{ + + + // sample (you must create your own class derived from this one): // object.Parse(" text/html ; , ; q = 45, application / xhtml+xml ; q = 0.4 , application/xml ; q = 0.9 , */* ; q = 0.8 "); @@ -43,5 +48,8 @@ private: +} // namespace Winix + + #endif diff --git a/core/acceptencodingparser.h b/core/acceptencodingparser.h index 75cea30..437921a 100755 --- a/core/acceptencodingparser.h +++ b/core/acceptencodingparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,11 @@ #include "log.h" +namespace Winix +{ + + + class AcceptEncodingParser : public AcceptBaseParser { public: @@ -82,4 +87,7 @@ private: +} // namespace Winix + + #endif diff --git a/core/app.cpp b/core/app.cpp index 79531d8..00bf6b2 100755 --- a/core/app.cpp +++ b/core/app.cpp @@ -23,6 +23,10 @@ #include "utf8/utf8.h" +namespace Winix +{ + + App::App() @@ -1727,3 +1731,8 @@ void App::CreateStaticTree() CreateDirs(config.upload_dir.c_str(), L"tmp", config.upload_dirs_chmod); } + + + +} // namespace Winix + diff --git a/core/app.h b/core/app.h index 0790882..d618e04 100755 --- a/core/app.h +++ b/core/app.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -37,6 +37,12 @@ +namespace Winix +{ + + + + class App { public: @@ -198,6 +204,10 @@ private: time_t last_sessions_save; }; + +} // namespace Winix + + #endif diff --git a/core/basethread.cpp b/core/basethread.cpp index 7968c19..d2f999f 100755 --- a/core/basethread.cpp +++ b/core/basethread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "basethread.h" +namespace Winix +{ + BaseThread::BaseThread() : thread_signal(PTHREAD_COND_INITIALIZER) { @@ -237,3 +240,7 @@ pthread_attr_t attr; return res == 0; } + +} // namespace Winix + + diff --git a/core/basethread.h b/core/basethread.h index 10f3833..40b72af 100755 --- a/core/basethread.h +++ b/core/basethread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,11 @@ #include "synchro.h" +namespace Winix +{ + + + class BaseThread { @@ -120,6 +125,9 @@ protected: +} // namespace Winix + + #endif diff --git a/core/bbcodeparser.cpp b/core/bbcodeparser.cpp index 13ff712..27ee9a0 100755 --- a/core/bbcodeparser.cpp +++ b/core/bbcodeparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "bbcodeparser.h" +namespace Winix +{ + + bool BBCODEParser::Equal(const wchar_t * str1, const wchar_t * str2) @@ -590,3 +594,8 @@ void BBCODEParser::Uninit() if( has_open_ul_tag ) (*out_string) += L"\n"; } + + + +} // namespace Winix + diff --git a/core/bbcodeparser.h b/core/bbcodeparser.h index 792a710..1ed814e 100755 --- a/core/bbcodeparser.h +++ b/core/bbcodeparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "htmlfilter.h" +namespace Winix +{ + class BBCODEParser : public HTMLFilter @@ -90,4 +93,8 @@ class BBCODEParser : public HTMLFilter bool has_open_li_tag; // has open html
  • tag }; + +} // namespace Winix + + #endif diff --git a/core/compress.cpp b/core/compress.cpp index ffacd85..b92d0ee 100755 --- a/core/compress.cpp +++ b/core/compress.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "log.h" +namespace Winix +{ + + Compress::Compress() @@ -398,3 +402,7 @@ z_stream * pstrm; return ret; } + + +} // namespace Winix + diff --git a/core/compress.h b/core/compress.h index d01364c..8794835 100755 --- a/core/compress.h +++ b/core/compress.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "requesttypes.h" +namespace Winix +{ + + class Compress { @@ -66,4 +70,7 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/config.cpp b/core/config.cpp index 7e4533f..bf8fcd3 100755 --- a/core/config.cpp +++ b/core/config.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include "crypt.h" +namespace Winix +{ + + Config::Config() { @@ -468,5 +472,8 @@ void Config::Print(std::wostream & out) +} // namespace Winix + + diff --git a/core/config.h b/core/config.h index 98a54c6..92c126a 100755 --- a/core/config.h +++ b/core/config.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "htmlfilter.h" +namespace Winix +{ + + @@ -654,6 +658,9 @@ private: +} // namespace Winix + + #endif diff --git a/core/cookieparser.h b/core/cookieparser.h index 3a43139..167e03c 100755 --- a/core/cookieparser.h +++ b/core/cookieparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,10 @@ #include "log.h" +namespace Winix +{ + + class CookieParser : public HttpSimpleParser { @@ -98,4 +102,7 @@ public: +} // namespace Winix + + #endif diff --git a/core/crypt.cpp b/core/crypt.cpp index 0939c9c..abe68ba 100755 --- a/core/crypt.cpp +++ b/core/crypt.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,11 @@ +namespace Winix +{ + + + void Crypt::SetConfig(Config * pconfig) { config = pconfig; @@ -312,3 +317,7 @@ void Crypt::PassHashCrypt(UserPass & up) PassCrypt(config->pass_rsa_private_key, up); } + + +} // namespace Winix + diff --git a/core/crypt.h b/core/crypt.h index 94e357a..5e44933 100755 --- a/core/crypt.h +++ b/core/crypt.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,13 +10,17 @@ #ifndef headerfile_winix_core_crypt #define headerfile_winix_core_crypt - #include #include "run.h" #include "config.h" #include "user.h" +namespace Winix +{ + + + /* the kind of hashes we are able to obtain in winix */ @@ -258,5 +262,8 @@ void Crypt::ConvertToHexForm(const std::string & in, StringType & out) +} // namespace Winix + + #endif diff --git a/core/cur.h b/core/cur.h index f54a5ca..f662fee 100755 --- a/core/cur.h +++ b/core/cur.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,11 @@ #include "mount.h" +namespace Winix +{ + + + /* current request and session */ @@ -31,6 +36,8 @@ struct Cur +} // namespace Winix + #endif diff --git a/core/dircontainer.cpp b/core/dircontainer.cpp index bff1273..d0fac74 100755 --- a/core/dircontainer.cpp +++ b/core/dircontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ #include "log.h" +namespace Winix +{ + + + std::wstring DirContainer::dir_etc = L"etc"; std::wstring DirContainer::dir_var = L"var"; @@ -328,3 +333,8 @@ bool DirContainer::DelById(long id) return true; } + + + +} // namespace Winix + diff --git a/core/dircontainer.h b/core/dircontainer.h index 27de147..8d2cd0d 100755 --- a/core/dircontainer.h +++ b/core/dircontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "item.h" +namespace Winix +{ + + class DirContainer { @@ -92,4 +96,8 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/dirs.cpp b/core/dirs.cpp index 2beeb37..2f99280 100755 --- a/core/dirs.cpp +++ b/core/dirs.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "log.h" +namespace Winix +{ + void Dirs::SetDb(Db * pdb) @@ -756,3 +759,6 @@ void Dirs::LogDir(const std::vector & dir_tab) + +} // namespace Winix + diff --git a/core/dirs.h b/core/dirs.h index d2e66c5..3b54d70 100755 --- a/core/dirs.h +++ b/core/dirs.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -22,7 +22,13 @@ #include "notify/notify.h" +namespace Winix +{ + + +// !! IMPROVE ME // we do not support '..' in a path (for simplicity and security reasons) +// (we will support '..' in the future) class Dirs @@ -115,4 +121,7 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/error.h b/core/error.h index 5999f63..303ba25 100755 --- a/core/error.h +++ b/core/error.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #define headerfile_winix_core_error +namespace Winix +{ + #define WINIX_ERR_OK 0 @@ -77,4 +80,7 @@ typedef int Error; +} // namespace Winix + + #endif diff --git a/core/group.h b/core/group.h index 2bee7b2..72f3071 100755 --- a/core/group.h +++ b/core/group.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include +namespace Winix +{ + + struct Group { @@ -38,6 +42,8 @@ struct Group +} // namespace Winix + #endif diff --git a/core/groups.cpp b/core/groups.cpp index 221d113..4283e8e 100755 --- a/core/groups.cpp +++ b/core/groups.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "groups.h" +namespace Winix +{ + Groups::Groups() @@ -94,23 +97,5 @@ bool Groups::Remove(long group_id) - - - - - - - - - - - - - - - - - - - +} // namespace Winix diff --git a/core/groups.h b/core/groups.h index f24d4ef..86e3f62 100755 --- a/core/groups.h +++ b/core/groups.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,10 @@ #include "db/db.h" +namespace Winix +{ + + class Groups { @@ -45,8 +49,7 @@ public: - - +} // namespace Winix diff --git a/core/htmlfilter.cpp b/core/htmlfilter.cpp index 4d0589e..527fa48 100755 --- a/core/htmlfilter.cpp +++ b/core/htmlfilter.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "htmlfilter.h" +namespace Winix +{ + + + void HTMLFilter::Item::Clear() { @@ -1397,4 +1402,5 @@ void HTMLFilter::Read() +} // namespace Winix diff --git a/core/htmlfilter.h b/core/htmlfilter.h index 9913011..8b1eeb6 100755 --- a/core/htmlfilter.h +++ b/core/htmlfilter.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,10 @@ #include +namespace Winix +{ + + // max length of a name of a html tag (with terminating null) @@ -295,5 +299,8 @@ protected: +} // namespace Winix + + #endif diff --git a/core/httpsimpleparser.cpp b/core/httpsimpleparser.cpp index eb803f9..bfd7029 100755 --- a/core/httpsimpleparser.cpp +++ b/core/httpsimpleparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,12 @@ #include "httpsimpleparser.h" +namespace Winix +{ + + + + void HttpSimpleParser::ToLower(std::string & s) { std::string::iterator i; @@ -223,13 +229,5 @@ void HttpSimpleParser::Parse() - - - - - - - - - +} // namespace Winix diff --git a/core/httpsimpleparser.h b/core/httpsimpleparser.h index 0bd4d25..1b357ae 100755 --- a/core/httpsimpleparser.h +++ b/core/httpsimpleparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,10 +10,13 @@ #ifndef headerfile_winix_core_httpsimpleparser #define headerfile_winix_core_httpsimpleparser - #include +namespace Winix +{ + + class HttpSimpleParser { @@ -65,4 +68,7 @@ public: +} // namespace Winix + + #endif diff --git a/core/image.cpp b/core/image.cpp index a6e6c4f..0adaa67 100755 --- a/core/image.cpp +++ b/core/image.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,11 @@ +namespace Winix +{ + + + void Image::SetDb(Db * pdb) { @@ -520,7 +525,7 @@ void Image::SaveImage() log << log1 << "Image: cannot move a temporary file: " << stream_tmp_path.Str() << ", to: " << dst_path << logend; - ::RemoveFile(stream_tmp_path.Str()); + Winix::RemoveFile(stream_tmp_path.Str()); } } else @@ -592,3 +597,7 @@ void Image::CreateThumbnail() */ + + +} // namespace Winix + diff --git a/core/image.h b/core/image.h index 6bd11b1..ddb6d4b 100755 --- a/core/image.h +++ b/core/image.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -19,6 +19,11 @@ #include "core/config.h" +namespace Winix +{ + + + class System; @@ -179,4 +184,7 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/ipban.h b/core/ipban.h index 8b8ae01..5ba5554 100644 --- a/core/ipban.h +++ b/core/ipban.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,12 @@ #include +namespace Winix +{ + + + + // telling if the IPBan record is active // we have two records: active and non active // non active records is something like a history @@ -147,4 +153,8 @@ struct IPBan }; + +} // namespace Winix + + #endif diff --git a/core/ipbancontainer.cpp b/core/ipbancontainer.cpp index 2abbaf4..0f1dba9 100644 --- a/core/ipbancontainer.cpp +++ b/core/ipbancontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include "date/date.h" +namespace Winix +{ + + IPBanContainer::IPBanContainer() { @@ -216,6 +220,9 @@ bool IPBanContainer::SortIPBansFunction(const IPBan & ip1, const IPBan & ip2) +} // namespace Winix + + diff --git a/core/ipbancontainer.h b/core/ipbancontainer.h index f8f2228..be83afc 100644 --- a/core/ipbancontainer.h +++ b/core/ipbancontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include "ipban.h" +namespace Winix +{ + + class IPBanContainer { @@ -54,5 +58,8 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/item.cpp b/core/item.cpp index f22851c..a354cfc 100755 --- a/core/item.cpp +++ b/core/item.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ #include "crypt.h" +namespace Winix +{ + + + Item::Item() { @@ -80,3 +85,6 @@ void Item::Clear() } + +} // namespace Winix + diff --git a/core/item.h b/core/item.h index d30bd74..d82e020 100755 --- a/core/item.h +++ b/core/item.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "date/date.h" +namespace Winix +{ + #define WINIX_ITEM_FILETYPE_NONE 0 #define WINIX_ITEM_FILETYPE_IMAGE 1 @@ -118,5 +121,8 @@ friend struct DbItemColumns; }; +} // namespace Winix + + #endif diff --git a/core/job.cpp b/core/job.cpp index 4c53ae9..655897f 100755 --- a/core/job.cpp +++ b/core/job.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ #include "log.h" +namespace Winix +{ + + + Job::Job() { @@ -162,4 +167,7 @@ void Job::DoWinixJob(PT::Space & job) +} // namespace Winix + + diff --git a/core/job.h b/core/job.h index 8c68d91..a6d65cd 100755 --- a/core/job.h +++ b/core/job.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,10 @@ #include "space/space.h" +namespace Winix +{ + + #define WINIX_JOBS_HOW_MANY_PRIORITIES 32 @@ -78,5 +82,9 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/lastcontainer.cpp b/core/lastcontainer.cpp index 200ebfc..1ef67ea 100755 --- a/core/lastcontainer.cpp +++ b/core/lastcontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,12 @@ #include "misc.h" +namespace Winix +{ + + + + LastItem::LastItem() { user_id = 0; @@ -106,3 +112,8 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id); << user_id << " ses_id: " << session_id << logend; } } + + + +} // namespace Winix + diff --git a/core/lastcontainer.h b/core/lastcontainer.h index ea4847b..cfed14f 100755 --- a/core/lastcontainer.h +++ b/core/lastcontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -18,6 +18,11 @@ +namespace Winix +{ + + + // how many items we store in the 'last' function #define WINIX_LASTCONTAINER_TABLE_SIZE 100 @@ -75,4 +80,8 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/loadavg.cpp b/core/loadavg.cpp index fd532e2..0c18bb5 100755 --- a/core/loadavg.cpp +++ b/core/loadavg.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ #include "log.h" +namespace Winix +{ + + LoadAvg::LoadAvg() { @@ -370,3 +374,8 @@ double LoadAvg::ReqPerSec15() return cache_req_per_sec15; } + + + +} // namespace Winix + diff --git a/core/loadavg.h b/core/loadavg.h index d84e413..ca844f5 100755 --- a/core/loadavg.h +++ b/core/loadavg.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include +namespace Winix +{ + + // in seconds @@ -110,5 +114,8 @@ private: +} // namespace Winix + + #endif diff --git a/core/lock.cpp b/core/lock.cpp index 70dfa7a..c123ecf 100755 --- a/core/lock.cpp +++ b/core/lock.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "lock.h" +namespace Winix +{ + + + Lock::Lock() { @@ -47,3 +52,6 @@ void Lock::Unlock() } + +} // namespace Winix + diff --git a/core/lock.h b/core/lock.h index c72c5b2..fba9b1b 100755 --- a/core/lock.h +++ b/core/lock.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,11 @@ #include "synchro.h" +namespace Winix +{ + + + class Lock { public: @@ -34,4 +39,8 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/log.cpp b/core/log.cpp index 2d66545..9576843 100755 --- a/core/log.cpp +++ b/core/log.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,11 @@ #include "timezones.h" +namespace Winix +{ + + + Log::Log() { log_level = 1; @@ -453,28 +458,5 @@ void Log::SaveLog() - - - - - - - - - - - - - - - - - - - - - - - - +} // namespace Winix diff --git a/core/log.h b/core/log.h index fd1e1f4..285eb76 100755 --- a/core/log.h +++ b/core/log.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,11 @@ #include "textstream/textstream.h" +namespace Winix +{ + + + class TimeZones; @@ -155,6 +160,12 @@ return *this; extern Log log; extern Log nlog; + +} // namespace Winix + + + + // for convenience, we have to use only #include "log.h" in the winix #include "slog.h" diff --git a/core/logmanipulators.h b/core/logmanipulators.h index bca3c62..dba047e 100755 --- a/core/logmanipulators.h +++ b/core/logmanipulators.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,12 @@ #define headerfile_winix_core_logmanipulators +namespace Winix +{ + + + + /* log1 - the first level log2 @@ -44,5 +50,9 @@ enum LogManipulators }; + +} // namespace Winix + + #endif diff --git a/core/misc.cpp b/core/misc.cpp index bf590bc..cadd0ca 100755 --- a/core/misc.cpp +++ b/core/misc.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "templates/templates.h" +namespace Winix +{ + + + namespace misc_private { @@ -1156,3 +1161,6 @@ void RemovePostFileTmp(PostFileTab & post_file_tab) + +} // namespace Winix + diff --git a/core/misc.h b/core/misc.h index 133b209..81a0936 100755 --- a/core/misc.h +++ b/core/misc.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,7 +10,6 @@ #ifndef headerfile_winix_core_misc #define headerfile_winix_core_misc - #include #include #include @@ -22,6 +21,10 @@ #include "utf8/utf8.h" +namespace Winix +{ + + /* @@ -1042,6 +1045,7 @@ void JSONescape(Stream & out, const StringType & str) } +} // namespace Winix #endif diff --git a/core/mount.cpp b/core/mount.cpp index 6752ae5..469488a 100755 --- a/core/mount.cpp +++ b/core/mount.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009-2010, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ #include "misc.h" +namespace Winix +{ + + + Mount::Mount() { @@ -109,3 +114,7 @@ const std::wstring & Mount::FirstArg(int code) const return Arg(code, 0); } + + +} // namespace Winix + diff --git a/core/mount.h b/core/mount.h index e08f6d5..aa3daba 100755 --- a/core/mount.h +++ b/core/mount.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009-2010, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,10 @@ #include +namespace Winix +{ + + class Mount { @@ -67,5 +71,8 @@ private: +} // namespace Winix + + #endif diff --git a/core/mountparser.cpp b/core/mountparser.cpp index 4b9f67e..800f4a4 100755 --- a/core/mountparser.cpp +++ b/core/mountparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ #include "misc.h" +namespace Winix +{ + + + MountParser::MountParser() { dirs = 0; @@ -494,9 +499,5 @@ void MountParser::Parse(const std::wstring & input, std::map & outp - - - - - +} // namespace Winix diff --git a/core/mountparser.h b/core/mountparser.h index 64bab03..5d6627d 100755 --- a/core/mountparser.h +++ b/core/mountparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -22,6 +22,11 @@ +namespace Winix +{ + + + class MountParser { public: @@ -82,4 +87,8 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/mounts.cpp b/core/mounts.cpp index e055fc1..9dd24aa 100755 --- a/core/mounts.cpp +++ b/core/mounts.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009-2012, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ +namespace Winix +{ + + Mounts::Mounts() { @@ -321,3 +325,8 @@ Mount * Mounts::GetEmptyMount() { return &empty_mount; } + + + +} // namespace Winix + diff --git a/core/mounts.h b/core/mounts.h index baddf85..5f41f73 100755 --- a/core/mounts.h +++ b/core/mounts.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009-2012, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -23,6 +23,11 @@ #include "mountparser.h" +namespace Winix +{ + + + class Mounts { @@ -165,5 +170,8 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/plugin.cpp b/core/plugin.cpp index 83a28c9..d82458f 100755 --- a/core/plugin.cpp +++ b/core/plugin.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include "misc.h" +namespace Winix +{ + void Plugin::UnloadPlugins() @@ -500,3 +503,6 @@ const Plugin::Plugins * Plugin::GetPlugins() return &plugins; } + +} // namespace Winix + diff --git a/core/plugin.h b/core/plugin.h index de772d0..5d4b353 100755 --- a/core/plugin.h +++ b/core/plugin.h @@ -2,11 +2,10 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ - #ifndef headerfile_winix_core_plugin #define headerfile_winix_core_plugin @@ -26,6 +25,12 @@ #include "templates/templates.h" +namespace Winix +{ + + + + /* all your plugin functions can have signature either: void my_function(PluginInfo & info); or @@ -246,5 +251,9 @@ private: extern Plugin plugin; + +} // namespace Winix + + #endif diff --git a/core/plugindata.cpp b/core/plugindata.cpp index 1c40ebd..19dc1cb 100755 --- a/core/plugindata.cpp +++ b/core/plugindata.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include "session.h" +namespace Winix +{ + + PluginData::PluginData() @@ -153,3 +157,8 @@ size_t old_size = table.size(); for(size_t i = old_size ; i +#include + +namespace Winix +{ + struct Session; @@ -65,5 +70,8 @@ private: +} // namespace Winix + + #endif diff --git a/core/pluginmsg.h b/core/pluginmsg.h index e4b868b..ae962ea 100755 --- a/core/pluginmsg.h +++ b/core/pluginmsg.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,12 @@ #define headerfile_winix_core_pluginmsg +namespace Winix +{ + + + + // here you can add your own EZC functions ([function]) // PluginInfo.p1 is a pointer to Ezc::Functions object // session pointer is null @@ -292,5 +298,9 @@ // see plugins/ticket/pluginmsg.h +} // namespace Winix + + + #endif diff --git a/core/postmultiparser.cpp b/core/postmultiparser.cpp index f7b8b5c..805efae 100755 --- a/core/postmultiparser.cpp +++ b/core/postmultiparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,12 @@ +namespace Winix +{ + + + + PostMultiParser::PostMultiParser() { in_buffer = new unsigned char[WINIX_POSTMULTI_INPUT_BUFFER]; @@ -586,3 +592,8 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab return err; } + + + +} // namespace Winix + diff --git a/core/postmultiparser.h b/core/postmultiparser.h index 2c38703..a1d137a 100755 --- a/core/postmultiparser.h +++ b/core/postmultiparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -19,6 +19,11 @@ #include "misc.h" +namespace Winix +{ + + + // 2 MB #define WINIX_POSTMULTI_INPUT_BUFFER 2097152 #define WINIX_POSTMULTI_OUTPUT_BUFFER 2097152 @@ -128,5 +133,8 @@ return added; +} // namespace Winix + + #endif diff --git a/core/postparser.h b/core/postparser.h index b9198ff..205b132 100755 --- a/core/postparser.h +++ b/core/postparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -21,6 +21,10 @@ #include "plugin.h" +namespace Winix +{ + + class PostParser : public HttpSimpleParser { @@ -148,4 +152,8 @@ public: }; + +} // namespace Winix + + #endif diff --git a/core/rebus.cpp b/core/rebus.cpp index fb23c93..89d0684 100755 --- a/core/rebus.cpp +++ b/core/rebus.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,11 @@ #include "cur.h" +namespace Winix +{ + + + void Rebus::SetCur(Cur * pcur) { @@ -162,9 +167,5 @@ return false; - - - - - +} // namespace Winix diff --git a/core/rebus.h b/core/rebus.h index fbab5bb..3e87a6c 100755 --- a/core/rebus.h +++ b/core/rebus.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,11 +10,15 @@ #ifndef headerfile_winix_core_rebus #define headerfile_winix_core_rebus - #include #include +namespace Winix +{ + + + struct Cur; @@ -48,4 +52,9 @@ private: }; + + +} // namespace Winix + + #endif diff --git a/core/request.cpp b/core/request.cpp index 70a3efc..1f8b437 100755 --- a/core/request.cpp +++ b/core/request.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ +namespace Winix +{ + @@ -307,4 +310,7 @@ const std::wstring & Request::ParamValue(const std::wstring & param_name) +} // namespace Winix + + diff --git a/core/request.h b/core/request.h index e202833..7a575d8 100755 --- a/core/request.h +++ b/core/request.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -25,6 +25,11 @@ #include "textstream/textstream.h" +namespace Winix +{ + + + class FunctionBase; @@ -397,5 +402,8 @@ std::wstring & Request::AddCookie(const NameType & name, const ValueType & value + +} // namespace Winix + #endif diff --git a/core/requesttypes.h b/core/requesttypes.h index ffe7493..7586945 100755 --- a/core/requesttypes.h +++ b/core/requesttypes.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "textstream/textstream.h" +namespace Winix +{ + + + // !! IMPROVE ME // !! narazie uzywane tylko w post multi parserze // dodac do zwyklego parsera post @@ -50,4 +55,8 @@ typedef std::map CookieTab; typedef PT::TextStreamBase BinaryPage; + +} // namespace Winix + + #endif diff --git a/core/run.cpp b/core/run.cpp index d78fd61..b0b920c 100755 --- a/core/run.cpp +++ b/core/run.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,11 +11,17 @@ #include #include #include +#include #include "run.h" #include "log.h" +namespace Winix +{ + + + Run::Run() { @@ -384,3 +390,6 @@ int Run::Go(std::string & out) } + +} // namespace Winix + diff --git a/core/run.h b/core/run.h index 78a6310..1bf1055 100755 --- a/core/run.h +++ b/core/run.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,11 @@ #include +namespace Winix +{ + + + /* how many parameters and environment variables can be passed to a program */ @@ -160,5 +165,9 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/session.cpp b/core/session.cpp index 38308e4..ed73fee 100755 --- a/core/session.cpp +++ b/core/session.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "misc.h" +namespace Winix +{ + Session::Session() @@ -92,3 +95,7 @@ void Session::ClearAfterRequest() ip_ban = 0; } + + +} // namespace Winix + diff --git a/core/session.h b/core/session.h index d52ae02..047842f 100755 --- a/core/session.h +++ b/core/session.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -23,6 +23,10 @@ #include "ipban.h" +namespace Winix +{ + + struct Session { @@ -95,6 +99,9 @@ struct Session +} // namespace Winix + + #endif diff --git a/core/sessioncontainer.cpp b/core/sessioncontainer.cpp index 4ae8636..f04b0f6 100755 --- a/core/sessioncontainer.cpp +++ b/core/sessioncontainer.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ #include "misc.h" +namespace Winix +{ + + + SessionContainer::SessionContainer() { @@ -207,5 +212,8 @@ return false; +} // namespace Winix + + diff --git a/core/sessioncontainer.h b/core/sessioncontainer.h index 6c8fafe..eba4c21 100755 --- a/core/sessioncontainer.h +++ b/core/sessioncontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -19,6 +19,11 @@ #include "config.h" +namespace Winix +{ + + + class SessionContainer { @@ -71,4 +76,8 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/sessionmanager.cpp b/core/sessionmanager.cpp index 561254b..04d278d 100755 --- a/core/sessionmanager.cpp +++ b/core/sessionmanager.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,9 @@ +namespace Winix +{ + @@ -603,3 +606,6 @@ void SessionManager::DeleteSession(Session * del_session) + +} // namespace Winix + diff --git a/core/sessionmanager.h b/core/sessionmanager.h index 8fa46cb..063c7c7 100755 --- a/core/sessionmanager.h +++ b/core/sessionmanager.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -24,6 +24,11 @@ +namespace Winix +{ + + + class SessionManager : public BaseThread { public: @@ -102,4 +107,7 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/sessionparser.cpp b/core/sessionparser.cpp index c64c0ff..c173af5 100755 --- a/core/sessionparser.cpp +++ b/core/sessionparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ #include "misc.h" +namespace Winix +{ + + bool SessionParser::Parse(const std::string & path, SessionContainer & container) { @@ -166,3 +170,7 @@ bool is_sign = false; return res; } + + +} // namespace Winix + diff --git a/core/sessionparser.h b/core/sessionparser.h index d855907..a06ed3d 100755 --- a/core/sessionparser.h +++ b/core/sessionparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,10 @@ #include "users.h" +namespace Winix +{ + + class SessionParser { @@ -46,5 +50,9 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/slog.cpp b/core/slog.cpp index 54ddc2c..e9aa0a8 100755 --- a/core/slog.cpp +++ b/core/slog.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "slog.h" +namespace Winix +{ + + SLog::SLog() @@ -222,3 +226,6 @@ SLog & SLog::operator<<(TranslateTextHelper raw) + +} // namespace Winix + diff --git a/core/slog.h b/core/slog.h index 0ef1d1b..5cc045f 100755 --- a/core/slog.h +++ b/core/slog.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "textstream/textstream.h" +namespace Winix +{ + + + #define WINIX_SLOG_MAX_LOG_SIZE 10240 @@ -137,5 +142,9 @@ return *this; extern SLog slog; + +} // namespace Winix + + #endif diff --git a/core/synchro.cpp b/core/synchro.cpp index 81bd3d7..b8a5dbb 100755 --- a/core/synchro.cpp +++ b/core/synchro.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ #include "synchro.h" +namespace Winix +{ + + + Synchro::Synchro() : mutex(PTHREAD_MUTEX_INITIALIZER) { was_stop_signal = false; @@ -54,4 +59,5 @@ void Synchro::Unlock() +} // namespace Winix diff --git a/core/synchro.h b/core/synchro.h index 65056c1..60ae79f 100755 --- a/core/synchro.h +++ b/core/synchro.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include +namespace Winix +{ + + struct Synchro { @@ -38,6 +42,9 @@ private: }; +} // namespace Winix + + #endif diff --git a/core/system.cpp b/core/system.cpp index 2a76144..4dc3495 100755 --- a/core/system.cpp +++ b/core/system.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,12 @@ +namespace Winix +{ + + + + void System::SetCur(Cur * pcur) { cur = pcur; @@ -1369,3 +1375,7 @@ bool System::AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url, return AddFile(file_content_item, false) == WINIX_ERR_OK; } + + +} // namespace Winix + diff --git a/core/system.h b/core/system.h index 919b534..672db8a 100755 --- a/core/system.h +++ b/core/system.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -29,6 +29,11 @@ #include "timezones.h" +namespace Winix +{ + + + class Functions; class SessionManager; @@ -211,5 +216,9 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/textstream.h b/core/textstream.h index ce50f50..560bbb5 100755 --- a/core/textstream.h +++ b/core/textstream.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -18,6 +18,11 @@ #include "textstream/textstream.h" +namespace Winix +{ + + + /* a special class representing a stream buffer @@ -366,6 +371,9 @@ return *this; +} // namespace Winix + + #endif diff --git a/core/threadmanager.cpp b/core/threadmanager.cpp index bae9780..3b057df 100755 --- a/core/threadmanager.cpp +++ b/core/threadmanager.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,12 @@ #include "log.h" +namespace Winix +{ + + + + ThreadManager::ThreadManager() { were_started = false; @@ -134,3 +140,6 @@ void ThreadManager::StopAll() + +} // namespace Winix + diff --git a/core/threadmanager.h b/core/threadmanager.h index 58aaa05..96341be 100755 --- a/core/threadmanager.h +++ b/core/threadmanager.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "synchro.h" +namespace Winix +{ + + + class ThreadManager { @@ -61,5 +66,9 @@ private: }; + +} // namespace Winix + + #endif diff --git a/core/timezone.cpp b/core/timezone.cpp index f68a169..3bc8ff5 100644 --- a/core/timezone.cpp +++ b/core/timezone.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "misc.h" +namespace Winix +{ + + TimeZone::Dst::Dst() @@ -287,3 +291,7 @@ return result; } + +} // namespace Winix + + diff --git a/core/timezone.h b/core/timezone.h index aaddb84..cca0990 100644 --- a/core/timezone.h +++ b/core/timezone.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,12 @@ +namespace Winix +{ + + + + class TimeZone { public: @@ -132,10 +138,7 @@ private: - - - - +} // namespace Winix diff --git a/core/timezones.cpp b/core/timezones.cpp index ef9d8bd..bb5574d 100644 --- a/core/timezones.cpp +++ b/core/timezones.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ #include "log.h" +namespace Winix +{ + + TimeZones::TimeZones() { @@ -174,5 +178,5 @@ bool TimeZones::ReadTimeZones(const std::wstring & path) - +} // namespace Winix diff --git a/core/timezones.h b/core/timezones.h index 5e64dad..e44c988 100644 --- a/core/timezones.h +++ b/core/timezones.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "space/spaceparser.h" +namespace Winix +{ + + + class TimeZones { @@ -77,5 +82,8 @@ private: +} // namespace Winix + + #endif diff --git a/core/ugcontainer.h b/core/ugcontainer.h index b28287e..31ed966 100755 --- a/core/ugcontainer.h +++ b/core/ugcontainer.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "log.h" +namespace Winix +{ + + template class UGContainer @@ -274,4 +278,8 @@ return result; } + +} // namespace Winix + + #endif diff --git a/core/user.cpp b/core/user.cpp index 2831e46..6ed696b 100755 --- a/core/user.cpp +++ b/core/user.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "user.h" +namespace Winix +{ + + + User::User() { Clear(); @@ -47,19 +52,6 @@ return false; - - - - - - - - - - - - - - +} // namespace Winix diff --git a/core/user.h b/core/user.h index 6d70e63..81dba63 100755 --- a/core/user.h +++ b/core/user.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,11 @@ #include "date/date.h" +namespace Winix +{ + + + #define WINIX_ACCOUNT_MAX_LOGIN_SIZE 250 #define WINIX_ACCOUNT_MAX_PASSWORD_SIZE 250 #define WINIX_ACCOUNT_MAX_EMAIL_SIZE 250 @@ -105,4 +110,7 @@ struct User }; +} // namespace Winix + + #endif diff --git a/core/users.cpp b/core/users.cpp index f38545c..ff3d0b2 100755 --- a/core/users.cpp +++ b/core/users.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include "plugin.h" +namespace Winix +{ + + Users::Users() { @@ -292,3 +296,6 @@ long Users::HowManyLogged() +} // namespace Winix + + diff --git a/core/users.h b/core/users.h index d42f82b..6ee9273 100755 --- a/core/users.h +++ b/core/users.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,12 @@ #include "cur.h" #include "db/db.h" + +namespace Winix +{ + + + class SessionManager; @@ -71,7 +77,7 @@ private: - +} // namespace Winix diff --git a/core/version.h b/core/version.h index dd066f3..d176e6e 100755 --- a/core/version.h +++ b/core/version.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,9 +11,17 @@ #define headerfile_winix_core_version +namespace Winix +{ + + #define WINIX_VER_MAJOR 0 -#define WINIX_VER_MINOR 5 -#define WINIX_VER_REVISION 6 +#define WINIX_VER_MINOR 6 +#define WINIX_VER_REVISION 0 + + + +} // namespace Winix #endif diff --git a/db/db.cpp b/db/db.cpp index 5397cb7..a10ec16 100755 --- a/db/db.cpp +++ b/db/db.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/misc.h" +namespace Winix +{ + @@ -1732,3 +1735,6 @@ void Db::GetGroups(UGContainer & group_tab) } + +} // namespace Winix + diff --git a/db/db.h b/db/db.h index e18a476..234218b 100755 --- a/db/db.h +++ b/db/db.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,11 +15,9 @@ #include #include #include - #include "dbbase.h" #include "dbitemquery.h" #include "dbitemcolumns.h" - #include "core/item.h" #include "core/user.h" #include "core/group.h" @@ -27,6 +25,9 @@ #include "core/ugcontainer.h" +namespace Winix +{ + @@ -141,5 +142,9 @@ protected: }; + +} // namespace Winix + + #endif diff --git a/db/dbbase.cpp b/db/dbbase.cpp index ba682fa..9bd5836 100755 --- a/db/dbbase.cpp +++ b/db/dbbase.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,10 @@ #include "utf8/utf8.h" +namespace Winix +{ + + DbBase::DbBase() { @@ -592,4 +596,7 @@ void DbBase::UnescapeBin(const char * str, size_t len, std::string & out, bool c +} // namespace Winix + + diff --git a/db/dbbase.h b/db/dbbase.h index 4d9156f..fde17ef 100755 --- a/db/dbbase.h +++ b/db/dbbase.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,10 @@ #include "date/date.h" +namespace Winix +{ + + class DbBase { @@ -106,6 +110,9 @@ private: +} // namespace Winix + + #endif diff --git a/db/dbconn.cpp b/db/dbconn.cpp index aadd1d9..ee6287e 100755 --- a/db/dbconn.cpp +++ b/db/dbconn.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "core/error.h" +namespace Winix +{ + @@ -152,3 +155,7 @@ void DbConn::SetDbParameters() log << log1 << "Db: Can't set the proper client encoding" << logend; } + + +} // namespace Winix + diff --git a/db/dbconn.h b/db/dbconn.h index 163b915..29709c2 100755 --- a/db/dbconn.h +++ b/db/dbconn.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "dbtextstream.h" +namespace Winix +{ + class DbConn @@ -49,6 +52,7 @@ private: }; +} // namespace Winix #endif diff --git a/db/dbitemcolumns.cpp b/db/dbitemcolumns.cpp index 66c05f0..7214330 100755 --- a/db/dbitemcolumns.cpp +++ b/db/dbitemcolumns.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/log.h" +namespace Winix +{ + void DbItemColumns::SetColumns(PGresult * r) @@ -90,3 +93,6 @@ void DbItemColumns::SetItem(PGresult * r, long row, Item & item) +} // namespace Winix + + diff --git a/db/dbitemcolumns.h b/db/dbitemcolumns.h index 24acb39..6b673ac 100755 --- a/db/dbitemcolumns.h +++ b/db/dbitemcolumns.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,12 +10,15 @@ #ifndef headerfile_winix_db_dbitemcolumns #define headerfile_winix_db_dbitemcolumns - #include #include "core/item.h" #include "dbbase.h" +namespace Winix +{ + + struct DbItemColumns { @@ -65,6 +68,9 @@ private: +} // namespace Winix + + #endif diff --git a/db/dbitemquery.cpp b/db/dbitemquery.cpp index 220f688..c8791a9 100755 --- a/db/dbitemquery.cpp +++ b/db/dbitemquery.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "dbitemquery.h" +namespace Winix +{ + DbItemQuery::DbItemQuery() @@ -129,3 +132,7 @@ void DbItemQuery::Offset(long o) offset = o; } + + +} // namespace Winix + diff --git a/db/dbitemquery.h b/db/dbitemquery.h index b4b89e9..3f7328f 100755 --- a/db/dbitemquery.h +++ b/db/dbitemquery.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,11 +10,15 @@ #ifndef headerfile_winix_db_dbitemquery #define headerfile_winix_db_dbitemquery - #include #include "core/item.h" +namespace Winix +{ + + + struct DbItemQuery { @@ -73,6 +77,9 @@ struct DbItemQuery +} // namespace Winix + + #endif diff --git a/db/dbtextstream.cpp b/db/dbtextstream.cpp index bae8e49..a04b8b9 100755 --- a/db/dbtextstream.cpp +++ b/db/dbtextstream.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "utf8/utf8.h" +namespace Winix +{ + + DbTextStream::DbTextStream() { was_param = false; @@ -603,3 +607,6 @@ return *this; } + +} // namespace Winix + diff --git a/db/dbtextstream.h b/db/dbtextstream.h index cffea58..30e165e 100755 --- a/db/dbtextstream.h +++ b/db/dbtextstream.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "textstream/textstream.h" +namespace Winix +{ + + /* DbTextStream is used as a buffer for creating a database's query @@ -205,5 +209,8 @@ return *this; } +} // namespace Winix + + #endif diff --git a/functions/account.cpp b/functions/account.cpp index 6e60a95..2a976b9 100755 --- a/functions/account.cpp +++ b/functions/account.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2013, Tomasz Sowa + * Copyright (c) 2013-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,11 @@ #include "functions/functions.h" + +namespace Winix +{ + + namespace Fun { @@ -132,3 +137,6 @@ void Account::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/account.h b/functions/account.h index 7eceb01..3985dc6 100755 --- a/functions/account.h +++ b/functions/account.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2013, Tomasz Sowa + * Copyright (c) 2013-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "functionbase.h" +namespace Winix +{ + namespace Fun { @@ -38,4 +41,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/adduser.cpp b/functions/adduser.cpp index b4d1c42..32a5e98 100755 --- a/functions/adduser.cpp +++ b/functions/adduser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,12 @@ #include "functions/functions.h" + +namespace Winix +{ + + + namespace Fun { @@ -258,3 +264,6 @@ void AddUser::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/adduser.h b/functions/adduser.h index f02f349..ced9479 100755 --- a/functions/adduser.h +++ b/functions/adduser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "functionbase.h" #include "core/user.h" +namespace Winix +{ + namespace Fun { @@ -49,4 +52,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/cat.cpp b/functions/cat.cpp index c090246..05be42d 100755 --- a/functions/cat.cpp +++ b/functions/cat.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "cat.h" +namespace Winix +{ + namespace Fun { @@ -41,3 +44,6 @@ void Cat::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/cat.h b/functions/cat.h index d1e8419..32a5644 100755 --- a/functions/cat.h +++ b/functions/cat.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -30,4 +32,6 @@ public: } // namespace Fun +} // namespace Winix + #endif diff --git a/functions/chmod.cpp b/functions/chmod.cpp index 3099496..cbe82b4 100755 --- a/functions/chmod.cpp +++ b/functions/chmod.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "chmod.h" +namespace Winix +{ + + namespace Fun { @@ -43,3 +47,6 @@ void Chmod::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/chmod.h b/functions/chmod.h index 5abf208..6b61280 100755 --- a/functions/chmod.h +++ b/functions/chmod.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functionbase.h" #include "privchanger.h" +namespace Winix +{ namespace Fun @@ -35,4 +37,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/chown.cpp b/functions/chown.cpp index b296f2c..29f6611 100755 --- a/functions/chown.cpp +++ b/functions/chown.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "chown.h" +namespace Winix +{ + + namespace Fun { @@ -43,3 +47,6 @@ void Chown::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/chown.h b/functions/chown.h index 806faa3..08de263 100755 --- a/functions/chown.h +++ b/functions/chown.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functionbase.h" #include "privchanger.h" +namespace Winix +{ namespace Fun @@ -35,4 +37,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/ckeditor.cpp b/functions/ckeditor.cpp index 6da089c..524c9d7 100755 --- a/functions/ckeditor.cpp +++ b/functions/ckeditor.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ +namespace Winix +{ + + namespace Fun { @@ -51,3 +55,6 @@ void Ckeditor::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/ckeditor.h b/functions/ckeditor.h index b9c33d0..f3506b6 100755 --- a/functions/ckeditor.h +++ b/functions/ckeditor.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -33,4 +35,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/cp.cpp b/functions/cp.cpp index e13aa12..9e9c75e 100755 --- a/functions/cp.cpp +++ b/functions/cp.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -88,7 +93,7 @@ bool Cp::CopyStaticFile(const std::wstring & from, const std::wstring & to) return true; } - if( ::CopyFile(from, to) ) + if( Winix::CopyFile(from, to) ) { log << log2 << "Cp: copied a static file from: " << from << ", to: " << to << logend; return true; @@ -394,3 +399,6 @@ void Cp::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/cp.h b/functions/cp.h index 309ae7e..379f9b5 100755 --- a/functions/cp.h +++ b/functions/cp.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -76,4 +78,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/default.cpp b/functions/default.cpp index 6ce6492..e80ce7c 100755 --- a/functions/default.cpp +++ b/functions/default.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "default.h" +namespace Winix +{ + namespace Fun { @@ -50,3 +53,6 @@ void Default::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/default.h b/functions/default.h index 1685086..7c973b7 100755 --- a/functions/default.h +++ b/functions/default.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -31,4 +33,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/download.cpp b/functions/download.cpp index c852c67..c16618a 100755 --- a/functions/download.cpp +++ b/functions/download.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ +namespace Winix +{ + + namespace Fun { @@ -52,3 +56,6 @@ void Download::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/download.h b/functions/download.h index dbbf2f2..a4c2679 100755 --- a/functions/download.h +++ b/functions/download.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -32,4 +34,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/emacs.cpp b/functions/emacs.cpp index 713db92..50e0940 100755 --- a/functions/emacs.cpp +++ b/functions/emacs.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ +namespace Winix +{ + + namespace Fun { @@ -154,3 +158,6 @@ void Emacs::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/emacs.h b/functions/emacs.h index 1ef9104..be9cda4 100755 --- a/functions/emacs.h +++ b/functions/emacs.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -40,4 +42,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/env.cpp b/functions/env.cpp index 767c34c..fb545f5 100755 --- a/functions/env.cpp +++ b/functions/env.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "core/log.h" +namespace Winix +{ + + namespace Fun { @@ -187,3 +191,6 @@ void Env::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/env.h b/functions/env.h index f4636d6..16369fb 100755 --- a/functions/env.h +++ b/functions/env.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "functionbase.h" #include "space/spaceparser.h" +namespace Winix +{ + namespace Fun { @@ -50,4 +53,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/functionbase.cpp b/functions/functionbase.cpp index 90678cc..0330b8b 100755 --- a/functions/functionbase.cpp +++ b/functions/functionbase.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "functions.h" +namespace Winix +{ + FunctionBase::FunctionBase() { @@ -106,3 +109,6 @@ void FunctionBase::MakeGet() +} // namespace Winix + + diff --git a/functions/functionbase.h b/functions/functionbase.h index ae7addb..c71f14b 100755 --- a/functions/functionbase.h +++ b/functions/functionbase.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,8 @@ #include "core/synchro.h" #include "notify/notify.h" +namespace Winix +{ class Functions; @@ -78,4 +80,6 @@ protected: }; +} // namespace Winix + #endif diff --git a/functions/functionparser.cpp b/functions/functionparser.cpp index ea50cc4..a2744ea 100755 --- a/functions/functionparser.cpp +++ b/functions/functionparser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,10 @@ +namespace Winix +{ + + FunctionParser::FunctionParser() { @@ -401,3 +405,6 @@ void FunctionParser::ReadWinixParValue() + +} // namespace Winix + diff --git a/functions/functionparser.h b/functions/functionparser.h index 7cec305..43561ab 100755 --- a/functions/functionparser.h +++ b/functions/functionparser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "core/cur.h" #include "core/system.h" +namespace Winix +{ + class Functions; @@ -71,5 +74,7 @@ private: +} // namespace Winix + #endif diff --git a/functions/functions.cpp b/functions/functions.cpp index 39cae73..c57a6d4 100755 --- a/functions/functions.cpp +++ b/functions/functions.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,11 @@ +namespace Winix +{ + + + void Functions::SetConfig(Config * pconfig) { config = pconfig; @@ -603,3 +608,7 @@ void Functions::SetUser(Item & item) item.group_id = cur->request->dir_tab.back()->group_id; } + + +} // namespace Winix + diff --git a/functions/functions.h b/functions/functions.h index 0df54f2..8000208 100755 --- a/functions/functions.h +++ b/functions/functions.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -61,6 +61,10 @@ #include "core/htmlfilter.h" +namespace Winix +{ + + class Templates; @@ -195,4 +199,6 @@ private: }; +} // namespace Winix + #endif diff --git a/functions/imgcrop.cpp b/functions/imgcrop.cpp index 7093879..4a936c0 100755 --- a/functions/imgcrop.cpp +++ b/functions/imgcrop.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2013, Tomasz Sowa + * Copyright (c) 2013-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -103,3 +108,6 @@ void ImgCrop::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/imgcrop.h b/functions/imgcrop.h index 6404371..26a62cf 100755 --- a/functions/imgcrop.h +++ b/functions/imgcrop.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2013, Tomasz Sowa + * Copyright (c) 2013-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -39,4 +41,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/ipban.cpp b/functions/ipban.cpp index 8088bc6..6621c35 100755 --- a/functions/ipban.cpp +++ b/functions/ipban.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,10 @@ +namespace Winix +{ + + namespace Fun { @@ -71,3 +75,6 @@ void IPBanFun::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/ipban.h b/functions/ipban.h index 7e282a8..fc22933 100755 --- a/functions/ipban.h +++ b/functions/ipban.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -37,4 +39,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/last.cpp b/functions/last.cpp index 0615076..b371dde 100755 --- a/functions/last.cpp +++ b/functions/last.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "last.h" + +namespace Winix +{ + + namespace Fun { @@ -27,3 +32,6 @@ bool Last::HasAccess() } // namespace + +} // namespace Winix + diff --git a/functions/last.h b/functions/last.h index e54fc9c..bbca918 100755 --- a/functions/last.h +++ b/functions/last.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -33,4 +35,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/ln.cpp b/functions/ln.cpp index 018153d..927a740 100755 --- a/functions/ln.cpp +++ b/functions/ln.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -140,3 +145,6 @@ void Ln::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/ln.h b/functions/ln.h index 7b4292f..d9d2d79 100755 --- a/functions/ln.h +++ b/functions/ln.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -45,4 +47,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/locale.cpp b/functions/locale.cpp index e9c694d..1911666 100755 --- a/functions/locale.cpp +++ b/functions/locale.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "templates/templates.h" +namespace Winix +{ + namespace Fun { @@ -58,3 +61,6 @@ void Locale::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/locale.h b/functions/locale.h index b101c18..daa47d9 100755 --- a/functions/locale.h +++ b/functions/locale.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -35,4 +37,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/login.cpp b/functions/login.cpp index 2c4b5c0..393aeae 100755 --- a/functions/login.cpp +++ b/functions/login.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ +namespace Winix +{ + + namespace Fun { @@ -278,3 +282,6 @@ void Login::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/login.h b/functions/login.h index 11fc2de..325f552 100755 --- a/functions/login.h +++ b/functions/login.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functionbase.h" #include "core/user.h" +namespace Winix +{ namespace Fun @@ -56,4 +58,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/logout.cpp b/functions/logout.cpp index 2564fad..2d836c7 100755 --- a/functions/logout.cpp +++ b/functions/logout.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -33,3 +38,6 @@ void Logout::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/logout.h b/functions/logout.h index 8040c9e..3ae77ce 100755 --- a/functions/logout.h +++ b/functions/logout.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -32,4 +34,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/ls.cpp b/functions/ls.cpp index 94b4ff0..d55baac 100755 --- a/functions/ls.cpp +++ b/functions/ls.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ +namespace Winix +{ + namespace Fun { @@ -52,3 +55,6 @@ void Ls::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/ls.h b/functions/ls.h index 7d66599..5bf5f99 100755 --- a/functions/ls.h +++ b/functions/ls.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -34,4 +36,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/man.cpp b/functions/man.cpp index 2ab0e63..1c0ab5f 100755 --- a/functions/man.cpp +++ b/functions/man.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "functions.h" +namespace Winix +{ + namespace Fun { @@ -25,3 +28,7 @@ Man::Man() } // namespace + + +} // namespace Winix + diff --git a/functions/man.h b/functions/man.h index c0e70ec..363b13d 100755 --- a/functions/man.h +++ b/functions/man.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -29,4 +31,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/meta.cpp b/functions/meta.cpp index 8ebd424..3fe4b6c 100755 --- a/functions/meta.cpp +++ b/functions/meta.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "core/log.h" +namespace Winix +{ + + namespace Fun { @@ -135,3 +139,6 @@ void Meta::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/meta.h b/functions/meta.h index 17bb08a..4134740 100755 --- a/functions/meta.h +++ b/functions/meta.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "functionbase.h" #include "space/spaceparser.h" +namespace Winix +{ + namespace Fun { @@ -44,4 +47,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/mkdir.cpp b/functions/mkdir.cpp index 2099f4e..aea7c78 100755 --- a/functions/mkdir.cpp +++ b/functions/mkdir.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -94,3 +99,6 @@ void Mkdir::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/mkdir.h b/functions/mkdir.h index b36809a..e5a7464 100755 --- a/functions/mkdir.h +++ b/functions/mkdir.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -36,4 +38,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/mount.cpp b/functions/mount.cpp index 3abaa3a..dacbaa1 100755 --- a/functions/mount.cpp +++ b/functions/mount.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -39,3 +44,6 @@ void Mount::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/mount.h b/functions/mount.h index 85e8a06..d6e761b 100755 --- a/functions/mount.h +++ b/functions/mount.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -31,4 +33,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/mv.cpp b/functions/mv.cpp index 48bb5b8..68e78cc 100755 --- a/functions/mv.cpp +++ b/functions/mv.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ +namespace Winix +{ + + namespace Fun { @@ -684,3 +688,6 @@ void Mv::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/mv.h b/functions/mv.h index 3787ad9..dbbdda3 100755 --- a/functions/mv.h +++ b/functions/mv.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ @@ -102,4 +104,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/nicedit.cpp b/functions/nicedit.cpp index db170e7..84ff7ad 100755 --- a/functions/nicedit.cpp +++ b/functions/nicedit.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ +namespace Winix +{ + + namespace Fun { @@ -36,3 +40,6 @@ void Nicedit::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/nicedit.h b/functions/nicedit.h index e522c1a..a0230da 100755 --- a/functions/nicedit.h +++ b/functions/nicedit.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -31,4 +33,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/node.cpp b/functions/node.cpp index 69710f1..6c581f2 100755 --- a/functions/node.cpp +++ b/functions/node.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "node.h" +namespace Winix +{ + + + namespace Fun { @@ -35,3 +40,6 @@ void Node::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/node.h b/functions/node.h index 93c79ae..bd7f5e7 100755 --- a/functions/node.h +++ b/functions/node.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -33,4 +35,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/passwd.cpp b/functions/passwd.cpp index 9412db7..ed3dc5e 100755 --- a/functions/passwd.cpp +++ b/functions/passwd.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,12 @@ #include "functions/functions.h" + +namespace Winix +{ + + + namespace Fun { @@ -292,3 +298,6 @@ void Passwd::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/passwd.h b/functions/passwd.h index a91d3b9..0b0dbb3 100755 --- a/functions/passwd.h +++ b/functions/passwd.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "functionbase.h" #include "core/user.h" +namespace Winix +{ + namespace Fun { @@ -48,4 +51,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/priv.cpp b/functions/priv.cpp index d6923db..220b1e0 100755 --- a/functions/priv.cpp +++ b/functions/priv.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -43,3 +48,6 @@ void Priv::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/priv.h b/functions/priv.h index ea7d73e..13848c2 100755 --- a/functions/priv.h +++ b/functions/priv.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functionbase.h" #include "privchanger.h" +namespace Winix +{ namespace Fun @@ -35,4 +37,7 @@ private: } // namespace +} // namespace Winix + + #endif diff --git a/functions/privchanger.cpp b/functions/privchanger.cpp index 7233f7b..27f4f25 100755 --- a/functions/privchanger.cpp +++ b/functions/privchanger.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,12 @@ #include "privchanger.h" + +namespace Winix +{ + + + void PrivChanger::SetCur(Cur * pcur) { cur = pcur; @@ -299,3 +305,6 @@ void PrivChanger::Change(bool change_owner_, bool change_priv_) + +} // namespace Winix + diff --git a/functions/privchanger.h b/functions/privchanger.h index 3e31b50..773327c 100755 --- a/functions/privchanger.h +++ b/functions/privchanger.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,11 +10,12 @@ #ifndef headerfile_winix_functions_privchanger #define headerfile_winix_functions_privchanger - #include "core/request.h" #include "core/system.h" #include "db/db.h" +namespace Winix +{ class PrivChanger @@ -54,4 +55,6 @@ private: +} // namespace Winix + #endif diff --git a/functions/pw.cpp b/functions/pw.cpp index 3a11111..72c734c 100755 --- a/functions/pw.cpp +++ b/functions/pw.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ +namespace Winix +{ + + namespace Fun { @@ -47,3 +51,6 @@ void Pw::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/pw.h b/functions/pw.h index ec7497b..0708e10 100755 --- a/functions/pw.h +++ b/functions/pw.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "functionbase.h" +namespace Winix +{ + namespace Fun { @@ -36,4 +39,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/reload.cpp b/functions/reload.cpp index d25ccc6..f3985dd 100755 --- a/functions/reload.cpp +++ b/functions/reload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "templates/templates.h" +namespace Winix +{ + + namespace Fun { @@ -60,3 +64,6 @@ void Reload::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/reload.h b/functions/reload.h index 0b3e211..9128da3 100755 --- a/functions/reload.h +++ b/functions/reload.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -35,4 +37,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/rm.cpp b/functions/rm.cpp index 318cbcd..a737109 100755 --- a/functions/rm.cpp +++ b/functions/rm.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include "templates/templates.h" +namespace Winix +{ + + namespace Fun { @@ -118,7 +122,7 @@ void Rm::Prepare() void Rm::RemoveStaticFile(const std::wstring & path) { - if( ::RemoveFile(path) ) + if( Winix::RemoveFile(path) ) { log << log2 << "Rm: static file removed: " << path << logend; } @@ -502,3 +506,6 @@ void Rm::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/rm.h b/functions/rm.h index bf6cd92..7f1cb2f 100755 --- a/functions/rm.h +++ b/functions/rm.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -80,4 +82,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/rmuser.cpp b/functions/rmuser.cpp index 5c5817e..f19a3bd 100755 --- a/functions/rmuser.cpp +++ b/functions/rmuser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include "functions/functions.h" +namespace Winix +{ + + namespace Fun { @@ -80,3 +84,6 @@ void RmUser::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/rmuser.h b/functions/rmuser.h index ab8aab4..490b805 100755 --- a/functions/rmuser.h +++ b/functions/rmuser.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun { @@ -39,4 +41,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/run.cpp b/functions/run.cpp index 0d8dee5..0d7e9b7 100755 --- a/functions/run.cpp +++ b/functions/run.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ +namespace Winix +{ + + namespace Fun { @@ -45,3 +49,6 @@ void Run::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/run.h b/functions/run.h index 3cfe6c6..f15b108 100755 --- a/functions/run.h +++ b/functions/run.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -34,4 +36,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/sort.cpp b/functions/sort.cpp index e6bd7c7..f7dfac7 100755 --- a/functions/sort.cpp +++ b/functions/sort.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ +namespace Winix +{ + + namespace Fun { @@ -175,3 +179,6 @@ void Sort::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/sort.h b/functions/sort.h index 775e876..1cd20e0 100755 --- a/functions/sort.h +++ b/functions/sort.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -63,4 +65,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/specialdefault.cpp b/functions/specialdefault.cpp index 9a16568..5e3570d 100755 --- a/functions/specialdefault.cpp +++ b/functions/specialdefault.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,11 @@ #include "specialdefault.h" + +namespace Winix +{ + + namespace Fun { @@ -23,3 +28,6 @@ SpecialDefault::SpecialDefault() } // namespace + +} // namespace Winix + diff --git a/functions/specialdefault.h b/functions/specialdefault.h index 028898a..4582d57 100755 --- a/functions/specialdefault.h +++ b/functions/specialdefault.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -28,4 +30,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/stat.cpp b/functions/stat.cpp index 071a58f..e0388a8 100755 --- a/functions/stat.cpp +++ b/functions/stat.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "stat.h" +namespace Winix +{ + + namespace Fun { @@ -22,3 +26,6 @@ Stat::Stat() } // namespace + +} // namespace Winix + diff --git a/functions/stat.h b/functions/stat.h index 527a33c..fb23e9b 100755 --- a/functions/stat.h +++ b/functions/stat.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -31,4 +33,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/subject.cpp b/functions/subject.cpp index c39ebc3..6686d69 100755 --- a/functions/subject.cpp +++ b/functions/subject.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,11 @@ #include "core/plugin.h" + +namespace Winix +{ + + namespace Fun { @@ -93,3 +98,6 @@ void Subject::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/subject.h b/functions/subject.h index ab80738..1e0c732 100755 --- a/functions/subject.h +++ b/functions/subject.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -37,4 +39,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/template.cpp b/functions/template.cpp index 2cf0387..5ee3181 100755 --- a/functions/template.cpp +++ b/functions/template.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ +namespace Winix +{ + + namespace Fun { @@ -105,3 +109,6 @@ void Template::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/template.h b/functions/template.h index c7c97e5..ca81200 100755 --- a/functions/template.h +++ b/functions/template.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -37,4 +39,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/timezone.cpp b/functions/timezone.cpp index 31e4d50..c53aa13 100755 --- a/functions/timezone.cpp +++ b/functions/timezone.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "timezone.h" +namespace Winix +{ + + namespace Fun { @@ -54,3 +58,6 @@ void TimeZone::MakeGet() } // namespace + +} // namespace Winix + diff --git a/functions/timezone.h b/functions/timezone.h index 27578b2..25d90bc 100755 --- a/functions/timezone.h +++ b/functions/timezone.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -36,4 +38,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/tinymce.cpp b/functions/tinymce.cpp index 963a7e0..ad478d9 100755 --- a/functions/tinymce.cpp +++ b/functions/tinymce.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "functions.h" +namespace Winix +{ + namespace Fun { @@ -53,3 +56,6 @@ void Tinymce::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/tinymce.h b/functions/tinymce.h index c104d6a..04d97e9 100755 --- a/functions/tinymce.h +++ b/functions/tinymce.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "functionbase.h" +namespace Winix +{ + namespace Fun { @@ -32,4 +35,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/uname.cpp b/functions/uname.cpp index 5cee6c9..c9cfbb7 100755 --- a/functions/uname.cpp +++ b/functions/uname.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,12 @@ #include "uname.h" + +namespace Winix +{ + + + namespace Fun { @@ -23,3 +29,6 @@ Uname::Uname() } // namespace + +} // namespace Winix + diff --git a/functions/uname.h b/functions/uname.h index 7c263f2..e60aaf1 100755 --- a/functions/uname.h +++ b/functions/uname.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun { @@ -31,4 +33,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/upload.cpp b/functions/upload.cpp index af2f3fb..ba6a7b8 100755 --- a/functions/upload.cpp +++ b/functions/upload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,10 @@ +namespace Winix +{ + + namespace Fun { @@ -313,3 +317,7 @@ void Upload::MakeGet() } // namespace + + +} // namespace Winix + diff --git a/functions/upload.h b/functions/upload.h index bf32840..574c56e 100755 --- a/functions/upload.h +++ b/functions/upload.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "functionbase.h" #include "space/spacetojson.h" +namespace Winix +{ + namespace Fun { @@ -55,4 +58,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/uptime.cpp b/functions/uptime.cpp index 37811d8..9d54cd7 100755 --- a/functions/uptime.cpp +++ b/functions/uptime.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "uptime.h" +namespace Winix +{ + + namespace Fun { @@ -23,3 +27,6 @@ Uptime::Uptime() } // namespace + +} // namespace Winix + diff --git a/functions/uptime.h b/functions/uptime.h index 22e4ebd..c0470d2 100755 --- a/functions/uptime.h +++ b/functions/uptime.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -31,4 +33,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/functions/vim.cpp b/functions/vim.cpp index 13ef5f8..49d1c2e 100755 --- a/functions/vim.cpp +++ b/functions/vim.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,11 @@ +namespace Winix +{ + + + namespace Fun { @@ -46,3 +51,6 @@ void Vim::MakePost() } // namespace + +} // namespace Winix + diff --git a/functions/vim.h b/functions/vim.h index 33551da..c1ade91 100755 --- a/functions/vim.h +++ b/functions/vim.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -32,4 +34,6 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/functions/who.cpp b/functions/who.cpp index 2509904..ec09488 100755 --- a/functions/who.cpp +++ b/functions/who.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,12 @@ #include "who.h" + +namespace Winix +{ + + + namespace Fun { @@ -27,3 +33,6 @@ bool Who::HasAccess() } // namespace + +} // namespace Winix + diff --git a/functions/who.h b/functions/who.h index 0beb339..8a6ee88 100755 --- a/functions/who.h +++ b/functions/who.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "functionbase.h" +namespace Winix +{ namespace Fun @@ -32,4 +34,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/main/main.cpp b/main/main.cpp index 53eaf96..e83bd33 100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -20,6 +20,10 @@ #include "core/version.h" + +namespace Winix +{ + Log log; Log nlog; // notify log (used by a notification thread) SLog slog; // session logger @@ -90,14 +94,18 @@ void LogInfo(LogManipulators log_level, const char * msg, bool put_version, cons } +} // namespace Winix + int main(int argv, char ** argc) { +using Winix::app; + std::srand(std::time(0)); if( argv != 2 ) { - print_syntax(); + Winix::print_syntax(); return 1; } @@ -111,19 +119,19 @@ int main(int argv, char ** argc) app.config.log_stdout = false; if( !app.config.log_stdout ) - CloseDescriptors(); + Winix::CloseDescriptors(); if( app.config.demonize && !app.Demonize() ) return 4; - log.SetTimeZones(&app.system.time_zones); + Winix::log.SetTimeZones(&app.system.time_zones); - log.Init(app.config.log_level, app.config.log_save_each_line, app.config.log_file, - app.config.log_stdout, app.config.log_request); + Winix::log.Init(app.config.log_level, app.config.log_save_each_line, app.config.log_file, + app.config.log_stdout, app.config.log_request); - nlog.Init(app.config.log_level, true, app.config.log_notify_file, false, 1); + Winix::nlog.Init(app.config.log_level, true, app.config.log_notify_file, false, 1); - LogInfo(log3, "booting Winix", true, ""); + Winix::LogInfo(Winix::log3, "booting Winix", true, ""); if( !app.InitFCGI() ) return 5; @@ -133,11 +141,11 @@ int main(int argv, char ** argc) app.LogUserGroups(); - log << log3 << "base_url: " << app.config.base_url << logend; + Winix::log << Winix::log3 << "base_url: " << app.config.base_url << Winix::logend; // load plugins before loading sessions - session_manager.LoadSessions() // because some of the plugins can init its own sessions dates - plugin.LoadPlugins(app.config.plugins_dir, app.config.plugin_file); + Winix::plugin.LoadPlugins(app.config.plugins_dir, app.config.plugin_file); // app.Init() starts other threads as well (they will be waiting on the lock) if( !app.Init() ) @@ -148,15 +156,15 @@ int main(int argv, char ** argc) // saving all starting logs app.Lock(); - LogInfo(log1, "Winix", true, "started"); - log << logsave; + Winix::LogInfo(Winix::log1, "Winix", true, "started"); + Winix::log << Winix::logsave; app.Unlock(); // main loop app.Start(); app.Lock(); - plugin.Call((Session*)0, WINIX_CLOSE); + Winix::plugin.Call((Winix::Session*)0, WINIX_CLOSE); app.Close(); // now all sessions are cleared app.Unlock(); @@ -164,7 +172,7 @@ int main(int argv, char ** argc) app.WaitForThreads(); // now all others threads are terminated - LogInfo(log1, "Winix", true, "stopped"); + Winix::LogInfo(Winix::log1, "Winix", true, "stopped"); return 0; } diff --git a/notify/notify.cpp b/notify/notify.cpp index 70e6be6..ccf1bc3 100755 --- a/notify/notify.cpp +++ b/notify/notify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "core/dirs.h" #include "core/plugin.h" +namespace Winix +{ Notify::Notify() @@ -195,3 +197,6 @@ wchar_t buff[50]; Toa(code, buff, sizeof(buff)/sizeof(wchar_t)); link += buff; } + +} // namespace Winix + diff --git a/notify/notify.h b/notify/notify.h index b9bf2ee..5226a9a 100755 --- a/notify/notify.h +++ b/notify/notify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,9 @@ #include "templates/patterns.h" #include "notifythread.h" +namespace Winix +{ + struct Request; class Config; @@ -73,5 +76,6 @@ private: +} // namespace Winix #endif diff --git a/notify/notifypool.cpp b/notify/notifypool.cpp index 0f5cb52..72e4c28 100755 --- a/notify/notifypool.cpp +++ b/notify/notifypool.cpp @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ #include "notifypool.h" +namespace Winix +{ bool NotifyPool::Empty() const @@ -44,16 +46,5 @@ void NotifyPool::Add(const NotifyMsg & msg) } - - - - - - - - - - - - +} // namespace Winix diff --git a/notify/notifypool.h b/notify/notifypool.h index 1c115f1..4e586ff 100755 --- a/notify/notifypool.h +++ b/notify/notifypool.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include #include "templates/locale.h" +namespace Winix +{ + #define WINIX_NOTIFY_CODE_ADD 1 #define WINIX_NOTIFY_CODE_EDIT 2 @@ -90,5 +93,6 @@ private: +} // namespace Winix #endif diff --git a/notify/notifythread.cpp b/notify/notifythread.cpp index edc3c12..5dfa6ac 100755 --- a/notify/notifythread.cpp +++ b/notify/notifythread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include "notifythread.h" +namespace Winix +{ + + // first thread (objects are locked) NotifyThread::NotifyThread() { @@ -251,9 +255,5 @@ size_t len; - - - - - +} // namespace Winix diff --git a/notify/notifythread.h b/notify/notifythread.h index 04b6a57..421c532 100755 --- a/notify/notifythread.h +++ b/notify/notifythread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,8 @@ #include "core/users.h" #include "templates/patterns.h" +namespace Winix +{ // we have set following pointers: request, config, system (from BaseThread) @@ -61,6 +63,6 @@ private: - +} // namespace Winix #endif diff --git a/notify/templatesnotify.cpp b/notify/templatesnotify.cpp index 89a2f4f..b79e52b 100755 --- a/notify/templatesnotify.cpp +++ b/notify/templatesnotify.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/plugin.h" #include "core/misc.h" +namespace Winix +{ namespace TemplatesNotifyFunctions @@ -112,21 +114,5 @@ void CreateFunctions() } // namespace TemplatesNotifyFunctions - - - - - - - - - - - - - - - - - +} // namespace Winix diff --git a/notify/templatesnotify.h b/notify/templatesnotify.h index 60215cd..4d660c0 100755 --- a/notify/templatesnotify.h +++ b/notify/templatesnotify.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,8 @@ #include "core/textstream.h" #include "notifypool.h" +namespace Winix +{ namespace TemplatesNotifyFunctions @@ -29,4 +31,7 @@ namespace TemplatesNotifyFunctions } + +} // namespace Winix + #endif diff --git a/plugins/export/edb.cpp b/plugins/export/edb.cpp index 7d8799c..39612a4 100755 --- a/plugins/export/edb.cpp +++ b/plugins/export/edb.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "edb.h" #include "core/log.h" +namespace Winix +{ + namespace Export { @@ -205,3 +208,6 @@ return result; } + +} // namespace Winix + diff --git a/plugins/export/edb.h b/plugins/export/edb.h index a3e8e5e..e011247 100755 --- a/plugins/export/edb.h +++ b/plugins/export/edb.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "export.h" #include "core/dirs.h" +namespace Winix +{ namespace Export @@ -63,4 +65,6 @@ private: } +} // namespace Winix + #endif diff --git a/plugins/export/export.h b/plugins/export/export.h index 20c6afe..291774c 100755 --- a/plugins/export/export.h +++ b/plugins/export/export.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include +namespace Winix +{ + namespace Export @@ -75,4 +78,6 @@ struct Export } +} // namespace Winix + #endif diff --git a/plugins/export/exportinfo.cpp b/plugins/export/exportinfo.cpp index 478ee4f..06ba1b8 100755 --- a/plugins/export/exportinfo.cpp +++ b/plugins/export/exportinfo.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "core/log.h" #include "exportinfo.h" +namespace Winix +{ + namespace Export @@ -334,3 +337,6 @@ void ExportInfo::AdditionalExport(const std::wstring & path) } // namespace + +} // namespace Winix + diff --git a/plugins/export/exportinfo.h b/plugins/export/exportinfo.h index 0a69a49..e2ea2a1 100755 --- a/plugins/export/exportinfo.h +++ b/plugins/export/exportinfo.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,9 @@ #include "message.h" #include "exportthread.h" +namespace Winix +{ + namespace Export @@ -80,7 +83,10 @@ private: bool HasRecurrenceId(long id); }; + } +} // namespace Winix + #endif diff --git a/plugins/export/exportthread.cpp b/plugins/export/exportthread.cpp index 6fd0944..a8c09c6 100755 --- a/plugins/export/exportthread.cpp +++ b/plugins/export/exportthread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,9 @@ #include "core/misc.h" #include "utf8/utf8.h" +namespace Winix +{ + namespace Export @@ -561,3 +564,6 @@ void ExportThread::ChangeAdresses(std::string & buf) } // namespace + +} // namespace Winix + diff --git a/plugins/export/exportthread.h b/plugins/export/exportthread.h index 734d1f7..16f83c8 100755 --- a/plugins/export/exportthread.h +++ b/plugins/export/exportthread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,8 @@ #include "core/basethread.h" #include "message.h" +namespace Winix +{ namespace Export @@ -89,6 +91,10 @@ private: }; + + } // namespace +} // namespace Winix + #endif diff --git a/plugins/export/funexport.cpp b/plugins/export/funexport.cpp index 167e5ae..ca75ac7 100755 --- a/plugins/export/funexport.cpp +++ b/plugins/export/funexport.cpp @@ -2,14 +2,16 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ - #include "funexport.h" +namespace Winix +{ + @@ -119,3 +121,6 @@ void FunExport::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/export/funexport.h b/plugins/export/funexport.h index a5d2011..7c5a0a0 100755 --- a/plugins/export/funexport.h +++ b/plugins/export/funexport.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include "db/db.h" #include "exportinfo.h" +namespace Winix +{ + namespace Export { @@ -50,5 +53,7 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/export/init.cpp b/plugins/export/init.cpp index 97df046..4902579 100755 --- a/plugins/export/init.cpp +++ b/plugins/export/init.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "edb.h" #include "funexport.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -265,3 +268,6 @@ using namespace Export; } + +} // namespace Winix + diff --git a/plugins/export/message.h b/plugins/export/message.h index d3eada4..dc42064 100755 --- a/plugins/export/message.h +++ b/plugins/export/message.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include +namespace Winix +{ // message types @@ -69,4 +71,8 @@ struct Message }; + + +} // namespace Winix + #endif diff --git a/plugins/gallery/gallery.cpp b/plugins/gallery/gallery.cpp index 01783a3..ee9b7a7 100755 --- a/plugins/gallery/gallery.cpp +++ b/plugins/gallery/gallery.cpp @@ -2,13 +2,16 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ #include "gallery.h" +namespace Winix +{ + namespace Gallery @@ -90,3 +93,6 @@ void Gallery::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/gallery/gallery.h b/plugins/gallery/gallery.h index f39a757..7f478ca 100755 --- a/plugins/gallery/gallery.h +++ b/plugins/gallery/gallery.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "functions/functionbase.h" #include "galleryinfo.h" +namespace Winix +{ namespace Gallery @@ -43,4 +45,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/gallery/galleryinfo.cpp b/plugins/gallery/galleryinfo.cpp index b1b1aaa..6d9cb40 100755 --- a/plugins/gallery/galleryinfo.cpp +++ b/plugins/gallery/galleryinfo.cpp @@ -2,13 +2,16 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ #include "galleryinfo.h" +namespace Winix +{ + namespace Gallery @@ -29,6 +32,9 @@ void GalleryInfo::Clear() } // namespace +} // namespace Winix + + diff --git a/plugins/gallery/galleryinfo.h b/plugins/gallery/galleryinfo.h index c79f166..6d13c9e 100755 --- a/plugins/gallery/galleryinfo.h +++ b/plugins/gallery/galleryinfo.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include #include "core/item.h" +namespace Winix +{ namespace Gallery @@ -55,6 +57,8 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/gallery/init.cpp b/plugins/gallery/init.cpp index 7cdda49..7213af5 100755 --- a/plugins/gallery/init.cpp +++ b/plugins/gallery/init.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/log.h" #include "core/plugin.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -88,3 +91,6 @@ using namespace Gallery; } + +} // namespace Winix + diff --git a/plugins/gallery/templates.cpp b/plugins/gallery/templates.cpp index 83c2a0a..4f74897 100755 --- a/plugins/gallery/templates.cpp +++ b/plugins/gallery/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "functions/functions.h" #include "templates/miscspace.h" +namespace Winix +{ + namespace Gallery @@ -229,4 +232,7 @@ void AddEzcFunctions(PluginInfo & info) +} // namespace Winix + + diff --git a/plugins/group/groupinfo.cpp b/plugins/group/groupinfo.cpp index bb3b0ef..424c985 100755 --- a/plugins/group/groupinfo.cpp +++ b/plugins/group/groupinfo.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/log.h" #include "core/system.h" +namespace Winix +{ namespace GroupItem @@ -176,3 +178,6 @@ void GroupInfo::ReadGroupsConfigs(bool skip_existing_configs) } + +} // namespace Winix + diff --git a/plugins/group/groupinfo.h b/plugins/group/groupinfo.h index 4d31d77..dad14c9 100755 --- a/plugins/group/groupinfo.h +++ b/plugins/group/groupinfo.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -18,6 +18,8 @@ #include "core/system.h" #include "core/config.h" +namespace Winix +{ @@ -82,5 +84,7 @@ private: } +} // namespace Winix + #endif diff --git a/plugins/group/groups.cpp b/plugins/group/groups.cpp index 76f9a54..24a9a18 100755 --- a/plugins/group/groups.cpp +++ b/plugins/group/groups.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "groups.h" #include "core/log.h" +namespace Winix +{ + namespace GroupItem { @@ -221,3 +224,6 @@ void Groups::Clear() } + +} // namespace Winix + diff --git a/plugins/group/groups.h b/plugins/group/groups.h index 6b1e700..def136f 100755 --- a/plugins/group/groups.h +++ b/plugins/group/groups.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,7 +15,8 @@ #include #include "space/spaceparser.h" - +namespace Winix +{ namespace GroupItem { @@ -124,7 +125,10 @@ private: void SortValues(PT::Space & group); }; + } +} // namespace Winix + #endif diff --git a/plugins/group/init.cpp b/plugins/group/init.cpp index f0b3649..84b0081 100755 --- a/plugins/group/init.cpp +++ b/plugins/group/init.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/plugin.h" #include "groupinfo.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -74,3 +77,6 @@ using namespace GroupItem; } + +} // namespace Winix + diff --git a/plugins/group/templates.cpp b/plugins/group/templates.cpp index 98f6a27..f26dfa2 100755 --- a/plugins/group/templates.cpp +++ b/plugins/group/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "groupinfo.h" #include "core/misc.h" +namespace Winix +{ + namespace GroupItem @@ -153,4 +156,7 @@ void AddEzcFunctions(PluginInfo & info) +} // namespace Winix + + diff --git a/plugins/menu/cache.cpp b/plugins/menu/cache.cpp index 529c42f..c2564a6 100755 --- a/plugins/menu/cache.cpp +++ b/plugins/menu/cache.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "cache.h" #include "core/misc.h" +namespace Winix +{ + namespace Menu @@ -94,3 +97,6 @@ void Cache::Clear() } // namespace + +} // namespace Winix + diff --git a/plugins/menu/cache.h b/plugins/menu/cache.h index f000f13..faf142f 100755 --- a/plugins/menu/cache.h +++ b/plugins/menu/cache.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012-2013, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,8 @@ #include "core/item.h" #include "core/dirs.h" +namespace Winix +{ namespace Menu @@ -73,4 +75,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/menu/init.cpp b/plugins/menu/init.cpp index 12d2d62..5b76cb8 100755 --- a/plugins/menu/init.cpp +++ b/plugins/menu/init.cpp @@ -2,16 +2,18 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ - #include "core/log.h" #include "core/plugin.h" #include "cache.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -140,3 +142,6 @@ using namespace Menu; } + +} // namespace Winix + diff --git a/plugins/menu/templates.cpp b/plugins/menu/templates.cpp index 8d01792..96ab9cd 100755 --- a/plugins/menu/templates.cpp +++ b/plugins/menu/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,10 @@ #include "cache.h" #include "templates/miscspace.h" +namespace Winix +{ + + #define WINIX_PL_MENU_PARAM_NONE 0 #define WINIX_PL_MENU_PARAM_IMAGES 1 @@ -532,4 +536,7 @@ void AddEzcFunctions(PluginInfo & info) +} // namespace Winix + + diff --git a/plugins/stats/bot.cpp b/plugins/stats/bot.cpp index cc78961..910e2ba 100755 --- a/plugins/stats/bot.cpp +++ b/plugins/stats/bot.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,10 @@ #include #include "bot.h" +namespace Winix +{ + + namespace Stats { @@ -52,3 +56,6 @@ bool Bot::IsBing() } // namespace + +} // namespace Winix + diff --git a/plugins/stats/bot.h b/plugins/stats/bot.h index 53b95ba..4265e65 100755 --- a/plugins/stats/bot.h +++ b/plugins/stats/bot.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,8 @@ #ifndef headerfile_winix_plugins_stats_bot #define headerfile_winix_plugins_stats_bot +namespace Winix +{ namespace Stats { @@ -37,4 +39,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/stats/init.cpp b/plugins/stats/init.cpp index 460e16a..766ba4e 100755 --- a/plugins/stats/init.cpp +++ b/plugins/stats/init.cpp @@ -2,11 +2,10 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ - #include "core/log.h" #include "core/request.h" @@ -18,6 +17,10 @@ #include "templates.h" #include "statssession.h" +namespace Winix +{ + + extern "C" void Init(PluginInfo &); static const wchar_t plugin_name[] = L"stats"; @@ -212,3 +215,6 @@ using namespace Stats; } + +} // namespace Winix + diff --git a/plugins/stats/stats.cpp b/plugins/stats/stats.cpp index a49885e..cc862e3 100755 --- a/plugins/stats/stats.cpp +++ b/plugins/stats/stats.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,10 @@ #include "core/log.h" #include "utf8/utf8.h" +namespace Winix +{ + + namespace Stats { @@ -179,3 +183,6 @@ void Stats::RemoveItem(long id) } // namespace + +} // namespace Winix + diff --git a/plugins/stats/stats.h b/plugins/stats/stats.h index 2492948..0bdffb9 100755 --- a/plugins/stats/stats.h +++ b/plugins/stats/stats.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include #include "core/config.h" +namespace Winix +{ namespace Stats { @@ -89,4 +91,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/stats/statssession.h b/plugins/stats/statssession.h index cc9c8e8..b894bb3 100755 --- a/plugins/stats/statssession.h +++ b/plugins/stats/statssession.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "core/plugindata.h" +namespace Winix +{ namespace Stats { @@ -36,4 +38,6 @@ struct StatsSession : public PluginDataBase } // namespace +} // namespace Winix + #endif diff --git a/plugins/stats/templates.cpp b/plugins/stats/templates.cpp index 70dd3bc..e447612 100755 --- a/plugins/stats/templates.cpp +++ b/plugins/stats/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,10 @@ #include "stats.h" #include "templates/misc.h" +namespace Winix +{ + + namespace Stats { @@ -105,3 +109,6 @@ void CreateFunctions(PluginInfo & info) } // namespace + +} // namespace Winix + diff --git a/plugins/stats/templates.h b/plugins/stats/templates.h index ee75ad9..e30a4de 100755 --- a/plugins/stats/templates.h +++ b/plugins/stats/templates.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "core/plugin.h" +namespace Winix +{ namespace Stats @@ -24,6 +26,6 @@ void CreateFunctions(PluginInfo & info); } // namespace - +} // namespace Winix #endif diff --git a/plugins/thread/createthread.cpp b/plugins/thread/createthread.cpp index 9ce211d..4808f00 100755 --- a/plugins/thread/createthread.cpp +++ b/plugins/thread/createthread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "functions.h" #include "functions/functions.h" +namespace Winix +{ + namespace Thread @@ -107,3 +110,6 @@ void CreateThread::MakePost() } // namespace + +} // namespace Winix + diff --git a/plugins/thread/createthread.h b/plugins/thread/createthread.h index 4c07dc3..e7ff269 100755 --- a/plugins/thread/createthread.h +++ b/plugins/thread/createthread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "threadinfo.h" #include "notify/notify.h" +namespace Winix +{ namespace Thread { @@ -44,4 +46,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/thread/funthread.cpp b/plugins/thread/funthread.cpp index 86bf58a..d7a4996 100755 --- a/plugins/thread/funthread.cpp +++ b/plugins/thread/funthread.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/misc.h" #include "funthread.h" +namespace Winix +{ + namespace Thread { @@ -84,3 +87,7 @@ void FunThread::MakeGet() } // namespace + + +} // namespace Winix + diff --git a/plugins/thread/funthread.h b/plugins/thread/funthread.h index 9615963..b31ce06 100755 --- a/plugins/thread/funthread.h +++ b/plugins/thread/funthread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,8 @@ #include "tdb.h" #include "threadinfo.h" +namespace Winix +{ namespace Thread @@ -43,4 +45,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/thread/init.cpp b/plugins/thread/init.cpp index 047ffbb..35d3d96 100755 --- a/plugins/thread/init.cpp +++ b/plugins/thread/init.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,9 @@ #include "pluginmsg.h" #include "templates.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -199,3 +202,6 @@ using namespace Thread; } + +} // namespace Winix + diff --git a/plugins/thread/pluginmsg.h b/plugins/thread/pluginmsg.h index b78e763..a4d58c9 100755 --- a/plugins/thread/pluginmsg.h +++ b/plugins/thread/pluginmsg.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #ifndef headerfile_winix_plugins_thread_pluginmsg #define headerfile_winix_plugins_thread_pluginmsg +namespace Winix +{ + // values from 4000 - 4099 reserved for 'thread' plugin @@ -31,6 +34,9 @@ #define WINIX_PL_THREAD_PREPARE_TO_REPLY_IN_THREAD 4006 +} // namespace Winix + + #endif diff --git a/plugins/thread/reply.cpp b/plugins/thread/reply.cpp index 965418b..98c6a2a 100755 --- a/plugins/thread/reply.cpp +++ b/plugins/thread/reply.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include "core/plugin.h" #include "pluginmsg.h" +namespace Winix +{ + namespace Thread @@ -132,3 +135,6 @@ void Reply::MakePost() } // namespace + +} // namespace Winix + diff --git a/plugins/thread/reply.h b/plugins/thread/reply.h index 839ab51..a4f883e 100755 --- a/plugins/thread/reply.h +++ b/plugins/thread/reply.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "threadinfo.h" #include "notify/notify.h" +namespace Winix +{ namespace Thread @@ -48,4 +50,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/thread/showthreads.cpp b/plugins/thread/showthreads.cpp index a459350..c217a24 100755 --- a/plugins/thread/showthreads.cpp +++ b/plugins/thread/showthreads.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "showthreads.h" #include "functions.h" +namespace Winix +{ + namespace Thread @@ -142,3 +145,6 @@ void ShowThreads::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/thread/showthreads.h b/plugins/thread/showthreads.h index 8f8c9dd..fa89e73 100755 --- a/plugins/thread/showthreads.h +++ b/plugins/thread/showthreads.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,8 @@ #include "tdb.h" #include "threadinfo.h" +namespace Winix +{ namespace Thread @@ -59,4 +61,7 @@ private: } // namespace +} // namespace Winix + + #endif diff --git a/plugins/thread/tdb.cpp b/plugins/thread/tdb.cpp index 7b3003d..57d6351 100755 --- a/plugins/thread/tdb.cpp +++ b/plugins/thread/tdb.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "tdb.h" #include "core/log.h" +namespace Winix +{ + namespace Thread @@ -469,3 +472,6 @@ void TDb::GetAllThreadsId(std::vector & file_id) } // namespace + +} // namespace Winix + diff --git a/plugins/thread/tdb.h b/plugins/thread/tdb.h index 09418e8..1425bee 100755 --- a/plugins/thread/tdb.h +++ b/plugins/thread/tdb.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,12 +10,13 @@ #ifndef headerfile_winix_plugins_thread_tdb #define headerfile_winix_plugins_thread_tdb - #include #include "thread.h" #include "db/dbbase.h" #include "core/error.h" +namespace Winix +{ namespace Thread @@ -79,8 +80,10 @@ private: }; + } // namespace +} // namespace Winix #endif diff --git a/plugins/thread/templates.cpp b/plugins/thread/templates.cpp index b76a918..af2a3ee 100755 --- a/plugins/thread/templates.cpp +++ b/plugins/thread/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -18,6 +18,9 @@ #include "templates/templates.h" #include "functions/functions.h" +namespace Winix +{ + namespace Thread @@ -535,4 +538,7 @@ void AddEzcFunctions(PluginInfo & info) +} // namespace Winix + + diff --git a/plugins/thread/templates.h b/plugins/thread/templates.h index fe60915..a2022d7 100755 --- a/plugins/thread/templates.h +++ b/plugins/thread/templates.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "core/plugin.h" +namespace Winix +{ namespace Thread @@ -27,5 +29,7 @@ void AddEzcFunctions(PluginInfo & info); } // namespace +} // namespace Winix + #endif diff --git a/plugins/thread/thread.h b/plugins/thread/thread.h index b132944..e0355ab 100755 --- a/plugins/thread/thread.h +++ b/plugins/thread/thread.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2009-2012, Tomasz Sowa + * Copyright (c) 2009-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include #include "date/date.h" +namespace Winix +{ + namespace Thread { @@ -56,6 +59,8 @@ public: } // namespace +} // namespace Winix + #endif diff --git a/plugins/thread/threadinfo.cpp b/plugins/thread/threadinfo.cpp index bf6bca2..d9c9102 100755 --- a/plugins/thread/threadinfo.cpp +++ b/plugins/thread/threadinfo.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/plugin.h" #include "pluginmsg.h" +namespace Winix +{ + namespace Thread @@ -160,5 +163,8 @@ void ThreadInfo::MakeRedirectIfPossible(const Item & item) +} // namespace Winix + + diff --git a/plugins/thread/threadinfo.h b/plugins/thread/threadinfo.h index 87b1439..3f6b453 100755 --- a/plugins/thread/threadinfo.h +++ b/plugins/thread/threadinfo.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,8 @@ #include "thread.h" #include "tdb.h" +namespace Winix +{ namespace Thread @@ -91,6 +93,8 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/ticket/createticket.cpp b/plugins/ticket/createticket.cpp index 0812865..dabb2d2 100755 --- a/plugins/ticket/createticket.cpp +++ b/plugins/ticket/createticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "sessiondata.h" #include "pluginmsg.h" +namespace Winix +{ + namespace Ticket @@ -194,3 +197,6 @@ void CreateTicket::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/createticket.h b/plugins/ticket/createticket.h index 7b9d40e..f6de85b 100755 --- a/plugins/ticket/createticket.h +++ b/plugins/ticket/createticket.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "ticketinfo.h" #include "notify/notify.h" +namespace Winix +{ + namespace Ticket { @@ -48,4 +51,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/ticket/editticket.cpp b/plugins/ticket/editticket.cpp index 9873cef..6723463 100755 --- a/plugins/ticket/editticket.cpp +++ b/plugins/ticket/editticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,9 @@ #include "core/plugin.h" #include "pluginmsg.h" +namespace Winix +{ + namespace Ticket @@ -245,3 +248,6 @@ void EditTicket::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/editticket.h b/plugins/ticket/editticket.h index f5963dc..2314acc 100755 --- a/plugins/ticket/editticket.h +++ b/plugins/ticket/editticket.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,8 @@ #include "functions/functionbase.h" #include "notify/notify.h" +namespace Winix +{ namespace Ticket @@ -53,4 +55,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/ticket/funticket.cpp b/plugins/ticket/funticket.cpp index ffd7e90..dfe4c64 100755 --- a/plugins/ticket/funticket.cpp +++ b/plugins/ticket/funticket.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/plugin.h" #include "plugins/thread/pluginmsg.h" +namespace Winix +{ + namespace Ticket @@ -57,3 +60,6 @@ void FunTicket::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/funticket.h b/plugins/ticket/funticket.h index c94d164..fb6c462 100755 --- a/plugins/ticket/funticket.h +++ b/plugins/ticket/funticket.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include "ticketinfo.h" #include "functions/functionbase.h" +namespace Winix +{ + namespace Ticket { @@ -41,4 +44,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/ticket/init.cpp b/plugins/ticket/init.cpp index 15f903a..9ba0edc 100755 --- a/plugins/ticket/init.cpp +++ b/plugins/ticket/init.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -19,6 +19,9 @@ #include "plugins/thread/pluginmsg.h" #include "pluginmsg.h" +namespace Winix +{ + extern "C" void Init(PluginInfo &); @@ -202,3 +205,6 @@ using namespace Ticket; } + +} // namespace Winix + diff --git a/plugins/ticket/pluginmsg.h b/plugins/ticket/pluginmsg.h index 319b0fe..ef1f412 100755 --- a/plugins/ticket/pluginmsg.h +++ b/plugins/ticket/pluginmsg.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2013, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #ifndef headerfile_winix_plugins_ticket_pluginmsg #define headerfile_winix_plugins_ticket_pluginmsg +namespace Winix +{ + // values from 4100 - 4199 reserved for 'ticket' plugin @@ -70,6 +73,8 @@ +} // namespace Winix + #endif diff --git a/plugins/ticket/sessiondata.cpp b/plugins/ticket/sessiondata.cpp index 5a2df72..3b9d50b 100755 --- a/plugins/ticket/sessiondata.cpp +++ b/plugins/ticket/sessiondata.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include #include "sessiondata.h" +namespace Winix +{ + namespace Ticket { @@ -186,3 +189,6 @@ return res.first->second.new_space; +} // namespace Winix + + diff --git a/plugins/ticket/sessiondata.h b/plugins/ticket/sessiondata.h index 228d104..f1bf8e3 100755 --- a/plugins/ticket/sessiondata.h +++ b/plugins/ticket/sessiondata.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -18,6 +18,9 @@ #include "functions/rm.h" #include "space/space.h" +namespace Winix +{ + namespace Ticket { @@ -87,5 +90,6 @@ private: } // namespace +} // namespace Winix #endif diff --git a/plugins/ticket/showtickets.cpp b/plugins/ticket/showtickets.cpp index f003492..cd0c071 100755 --- a/plugins/ticket/showtickets.cpp +++ b/plugins/ticket/showtickets.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,10 @@ #include "plugins/thread/pluginmsg.h" #include "core/plugin.h" +namespace Winix +{ + + namespace Ticket { @@ -160,3 +164,6 @@ void ShowTickets::MakeGet() } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/showtickets.h b/plugins/ticket/showtickets.h index 681ca52..aed7396 100755 --- a/plugins/ticket/showtickets.h +++ b/plugins/ticket/showtickets.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,9 @@ #include "core/item.h" #include "functions/functionbase.h" +namespace Winix +{ + namespace Ticket { @@ -57,4 +60,6 @@ private: } // namespace +} // namespace Winix + #endif diff --git a/plugins/ticket/tdb.cpp b/plugins/ticket/tdb.cpp index ba3e936..753b34b 100755 --- a/plugins/ticket/tdb.cpp +++ b/plugins/ticket/tdb.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "tdb.h" #include "core/log.h" +namespace Winix +{ + namespace Ticket @@ -256,3 +259,6 @@ return status; } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/tdb.h b/plugins/ticket/tdb.h index a949c6f..5e258ef 100755 --- a/plugins/ticket/tdb.h +++ b/plugins/ticket/tdb.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,12 +10,14 @@ #ifndef headerfile_winix_plugins_ticket_tdb #define headerfile_winix_plugins_ticket_tdb - #include #include "ticket.h" #include "db/dbbase.h" #include "core/error.h" +namespace Winix +{ + namespace Ticket { @@ -52,6 +54,7 @@ private: } // namespace +} // namespace Winix #endif diff --git a/plugins/ticket/templates.cpp b/plugins/ticket/templates.cpp index 60a3976..16c02d5 100755 --- a/plugins/ticket/templates.cpp +++ b/plugins/ticket/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -22,6 +22,9 @@ #include "space/space.h" #include "pluginmsg.h" +namespace Winix +{ + namespace Ticket @@ -1226,4 +1229,7 @@ using namespace ns_ticket_tab; } // namespace Ticket +} // namespace Winix + + diff --git a/plugins/ticket/ticket.h b/plugins/ticket/ticket.h index 36bbb2a..5db9e21 100755 --- a/plugins/ticket/ticket.h +++ b/plugins/ticket/ticket.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,9 @@ #include #include +namespace Winix +{ + namespace Ticket { @@ -72,7 +75,9 @@ struct Ticket }; + } // namespace +} // namespace Winix #endif diff --git a/plugins/ticket/ticketinfo.cpp b/plugins/ticket/ticketinfo.cpp index a58496e..ccb194a 100755 --- a/plugins/ticket/ticketinfo.cpp +++ b/plugins/ticket/ticketinfo.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,9 @@ #include "pluginmsg.h" #include "sessiondata.h" +namespace Winix +{ + namespace Ticket @@ -601,3 +604,6 @@ void TicketInfo::MakeRedirectIfPossible(const Item & item) } // namespace + +} // namespace Winix + diff --git a/plugins/ticket/ticketinfo.h b/plugins/ticket/ticketinfo.h index 1d36fe6..77a5fe0 100755 --- a/plugins/ticket/ticketinfo.h +++ b/plugins/ticket/ticketinfo.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2013, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,7 +10,6 @@ #ifndef headerfile_winix_plugins_ticket_ticketinfo #define headerfile_winix_plugins_ticket_ticketinfo - #include #include "ticket.h" #include "core/item.h" @@ -20,6 +19,8 @@ #include "tdb.h" #include "space/spaceparser.h" +namespace Winix +{ namespace Ticket @@ -166,4 +167,6 @@ private: } +} // namespace Winix + #endif diff --git a/templates/adduser.cpp b/templates/adduser.cpp index 794b2a8..43f3beb 100755 --- a/templates/adduser.cpp +++ b/templates/adduser.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,10 @@ #include "templates.h" #include "core/request.h" +namespace Winix +{ + + namespace TemplatesFunctions { @@ -29,3 +33,6 @@ void adduser_last_email(Info & i) } // namespace + +} // namespace Winix + diff --git a/templates/changepatterns.cpp b/templates/changepatterns.cpp index 36c5442..26d9d68 100755 --- a/templates/changepatterns.cpp +++ b/templates/changepatterns.cpp @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ #include "changepatterns.h" +namespace Winix +{ @@ -106,3 +108,8 @@ void ChangePatterns::Clear() pat_tab.clear(); } + + + +} // namespace Winix + diff --git a/templates/changepatterns.h b/templates/changepatterns.h index 4919fb0..cb0bf08 100755 --- a/templates/changepatterns.h +++ b/templates/changepatterns.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include #include "patterns.h" +namespace Winix +{ class ChangePatterns @@ -72,4 +74,8 @@ private: }; + + +} // namespace Winix + #endif diff --git a/templates/config.cpp b/templates/config.cpp index c1fa6f5..46638f3 100755 --- a/templates/config.cpp +++ b/templates/config.cpp @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +namespace Winix +{ namespace TemplatesFunctions @@ -71,4 +73,6 @@ void config_base_url_common(Info & i) } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/dir.cpp b/templates/dir.cpp index a959768..df14ec2 100755 --- a/templates/dir.cpp +++ b/templates/dir.cpp @@ -2,16 +2,19 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ - + #include "templates.h" #include "core/misc.h" #include "functions/functions.h" #include "miscspace.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -501,3 +504,5 @@ void dir_last_admin_meta_tab_has_next(Info & i) } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/doc.cpp b/templates/doc.cpp index 6dcf4f1..4b48700 100755 --- a/templates/doc.cpp +++ b/templates/doc.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/request.h" #include "core/misc.h" +namespace Winix +{ namespace TemplatesFunctions @@ -172,4 +174,6 @@ void doc_css_more_than_one(Info & i) } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/env.cpp b/templates/env.cpp index 6401f85..f749d42 100755 --- a/templates/env.cpp +++ b/templates/env.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,9 @@ #include "core/misc.h" #include "functions/functions.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -122,7 +125,10 @@ void env_user_tab_is_current(Info & i) + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/filters.cpp b/templates/filters.cpp index f15d583..13c5a1e 100755 --- a/templates/filters.cpp +++ b/templates/filters.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,9 @@ #include "templates.h" #include "core/misc.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -154,3 +157,6 @@ void fil_new_line_to_br(Info & i) } // namespace + +} // namespace Winix + diff --git a/templates/htmltextstream.cpp b/templates/htmltextstream.cpp index 7a69029..6513c96 100755 --- a/templates/htmltextstream.cpp +++ b/templates/htmltextstream.cpp @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ #include "htmltextstream.h" +namespace Winix +{ @@ -446,3 +448,10 @@ HtmlTextStream & HtmlTextStream::operator<<(const PT::Date & date) return *this; } + + + +} // namespace Winix + + + diff --git a/templates/htmltextstream.h b/templates/htmltextstream.h index d76a68e..a3f76df 100755 --- a/templates/htmltextstream.h +++ b/templates/htmltextstream.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include #include "core/textstream.h" +namespace Winix +{ /* @@ -188,5 +190,7 @@ return *this; } +} // namespace Winix + #endif diff --git a/templates/indexpatterns.cpp b/templates/indexpatterns.cpp index 06820f8..d483da6 100755 --- a/templates/indexpatterns.cpp +++ b/templates/indexpatterns.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,8 @@ #include "indexpatterns.h" #include "core/log.h" +namespace Winix +{ @@ -83,3 +85,9 @@ void IndexPatterns::Clear() { tab.clear(); } + + + + +} // namespace Winix + diff --git a/templates/indexpatterns.h b/templates/indexpatterns.h index 58d8a87..8cdddfe 100755 --- a/templates/indexpatterns.h +++ b/templates/indexpatterns.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2011, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -16,6 +16,8 @@ #include "ezc.h" #include "patterns.h" +namespace Winix +{ class IndexPatterns @@ -74,4 +76,6 @@ private: }; +} // namespace Winix + #endif diff --git a/templates/insert.cpp b/templates/insert.cpp index cf8979c..e40cbeb 100755 --- a/templates/insert.cpp +++ b/templates/insert.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/request.h" #include "core/misc.h" +namespace Winix +{ + // max 20 nested insert_page ezc functions allowed #define WINIX_TEMPLATES_INSERT_PAGE_MAX 20 @@ -103,7 +106,6 @@ void insert_page(Info & i) } // namespace TemplatesFunctions - - +} // namespace Winix diff --git a/templates/ipban.cpp b/templates/ipban.cpp index 43cec82..709f550 100755 --- a/templates/ipban.cpp +++ b/templates/ipban.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/misc.h" #include "functions/functions.h" +namespace Winix +{ + namespace TemplatesFunctions @@ -117,7 +120,14 @@ void ipban_tab_is_logging_allowed(Info & i) } } + + + + } // namespace TemplatesFunctions +} // namespace Winix + + diff --git a/templates/item.cpp b/templates/item.cpp index 0cd69f1..7021d36 100755 --- a/templates/item.cpp +++ b/templates/item.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "core/textstream.h" #include "miscspace.h" +namespace Winix +{ namespace TemplatesFunctions @@ -847,7 +849,7 @@ void item_tab_meta_tab_has_next(Info & i) } // namespace TemplatesFunctions - +} // namespace Winix diff --git a/templates/last.cpp b/templates/last.cpp index 0ae9352..9790d9d 100755 --- a/templates/last.cpp +++ b/templates/last.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "../core/request.h" #include "../core/misc.h" +namespace Winix +{ @@ -82,7 +84,11 @@ void last_tab_end(Info & i) } + + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/locale.cpp b/templates/locale.cpp index 83580fa..f456f02 100755 --- a/templates/locale.cpp +++ b/templates/locale.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "core/misc.h" #include "utf8/utf8.h" +namespace Winix +{ Locale::Locale() @@ -848,3 +850,9 @@ int Locale::Compare(const std::wstring & str1, const std::wstring & str2) return 0; } + + + + +} // namespace Winix + diff --git a/templates/locale.h b/templates/locale.h index 5970865..ad846b4 100755 --- a/templates/locale.h +++ b/templates/locale.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010-2012, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "space/spaceparser.h" #include "textstream/textstream.h" +namespace Winix +{ class Locale @@ -237,4 +239,6 @@ const std::wstring & Locale::Get(const PT::TextStreamBase #include #include "localefilter.h" #include "ezc.h" #include "htmltextstream.h" +namespace Winix +{ + + struct User; @@ -61,5 +64,7 @@ void print_user_name(Info & i, User * puser, const std::wstring & guest_name); } // namespace TemplatesFunctions +} // namespace Winix + #endif diff --git a/templates/miscspace.cpp b/templates/miscspace.cpp index 0efc3e3..cdcedf7 100755 --- a/templates/miscspace.cpp +++ b/templates/miscspace.cpp @@ -2,13 +2,16 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -367,7 +370,10 @@ void spaces_tab_has_next(Info & i, PT::Space & space) } + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/miscspace.h b/templates/miscspace.h index ad5cdd2..29d15b0 100755 --- a/templates/miscspace.h +++ b/templates/miscspace.h @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ #include "templates.h" +namespace Winix +{ namespace TemplatesFunctions @@ -30,4 +32,6 @@ void spaces_tab_has_next(Info & i, PT::Space & space); } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/mount.cpp b/templates/mount.cpp index 00cfe79..7685fda 100755 --- a/templates/mount.cpp +++ b/templates/mount.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/misc.h" #include "core/mounts.h" +namespace Winix +{ namespace TemplatesFunctions @@ -277,7 +279,11 @@ void mount_tab_parlist(Info & i) + + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/passwd.cpp b/templates/passwd.cpp index c748079..2752d05 100755 --- a/templates/passwd.cpp +++ b/templates/passwd.cpp @@ -2,15 +2,16 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2013, Tomasz Sowa + * Copyright (c) 2013-2014, Tomasz Sowa * All rights reserved. * */ - #include "core/request.h" #include "templates.h" +namespace Winix +{ @@ -45,4 +46,6 @@ void passwd_resetpass_code(Info & i) } // namespace +} // namespace Winix + diff --git a/templates/patterncacher.cpp b/templates/patterncacher.cpp index bc3f661..7d71391 100755 --- a/templates/patterncacher.cpp +++ b/templates/patterncacher.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,7 +10,8 @@ #include "patterncacher.h" #include "core/log.h" - +namespace Winix +{ PatternCacher::PatternCacher() { @@ -160,3 +161,7 @@ size_t PatternCacher::Size() } + + +} // namespace Winix + diff --git a/templates/patterncacher.h b/templates/patterncacher.h index 8c72636..80a7bcc 100755 --- a/templates/patterncacher.h +++ b/templates/patterncacher.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -17,6 +17,8 @@ #include "misc.h" #include "ezc.h" +namespace Winix +{ @@ -96,4 +98,7 @@ private: }; + +} // namespace Winix + #endif diff --git a/templates/patterns.cpp b/templates/patterns.cpp index df00c92..1ee8987 100755 --- a/templates/patterns.cpp +++ b/templates/patterns.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,8 @@ #include "patterns.h" #include "core/log.h" +namespace Winix +{ @@ -177,3 +179,9 @@ size_t Patterns::Size() { return pat_tab.size(); } + + + + +} // namespace Winix + diff --git a/templates/patterns.h b/templates/patterns.h index 66801cd..a6e0659 100755 --- a/templates/patterns.h +++ b/templates/patterns.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011-2012, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -15,6 +15,8 @@ #include "localefilter.h" #include "misc.h" +namespace Winix +{ class Patterns @@ -126,4 +128,8 @@ private: }; + + +} // namespace Winix + #endif diff --git a/templates/priv.cpp b/templates/priv.cpp index a5b710f..5b6d1a6 100755 --- a/templates/priv.cpp +++ b/templates/priv.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/misc.h" #include "functions/functions.h" +namespace Winix +{ + namespace TemplatesFunctions @@ -279,8 +282,5 @@ void priv_show_form_chmod(Info & i) } // namespace TemplatesFunctions - - - - +} // namespace Winix diff --git a/templates/rebus.cpp b/templates/rebus.cpp index 62599c9..281346b 100755 --- a/templates/rebus.cpp +++ b/templates/rebus.cpp @@ -2,15 +2,17 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ - #include "core/request.h" #include "templates.h" +namespace Winix +{ + @@ -49,4 +51,6 @@ void rebus_question(Info & i) } // namespace +} // namespace Winix + diff --git a/templates/slog.cpp b/templates/slog.cpp index 6b8464d..2792486 100755 --- a/templates/slog.cpp +++ b/templates/slog.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2011, Tomasz Sowa + * Copyright (c) 2011-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,8 @@ #include "core/slog.h" #include "templates.h" +namespace Winix +{ namespace TemplatesFunctions @@ -131,3 +133,5 @@ void slog_tab_print(Info & i) } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/stat.cpp b/templates/stat.cpp index 1d02504..86aa22a 100755 --- a/templates/stat.cpp +++ b/templates/stat.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2010, Tomasz Sowa + * Copyright (c) 2010-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "core/request.h" #include "core/misc.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -98,7 +101,11 @@ void stat_item_is_template_from_mount_point(Info & i) } + + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/sys.cpp b/templates/sys.cpp index 5f9e320..21ccdce 100755 --- a/templates/sys.cpp +++ b/templates/sys.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "core/version.h" #include "core/plugin.h" +namespace Winix +{ @@ -71,4 +73,6 @@ void sys_plugin_tab_name(Info & i) } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/template.cpp b/templates/template.cpp index 8c0aefa..272e216 100755 --- a/templates/template.cpp +++ b/templates/template.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,8 @@ #include "templates.h" #include "core/misc.h" +namespace Winix +{ namespace TemplatesFunctions @@ -115,4 +117,9 @@ void template_tab_file_name(Info & i) + + } // namespace + +} // namespace Winix + diff --git a/templates/templates.cpp b/templates/templates.cpp index a0a9484..86fd6fb 100755 --- a/templates/templates.cpp +++ b/templates/templates.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -13,6 +13,8 @@ #include "core/textstream.h" #include "functions/functions.h" +namespace Winix +{ namespace TemplatesFunctions @@ -1037,3 +1039,5 @@ Templates::Templates() +} // namespace Winix + diff --git a/templates/templates.h b/templates/templates.h index dac25ca..598b337 100755 --- a/templates/templates.h +++ b/templates/templates.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2013, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -28,6 +28,9 @@ #include "core/htmlfilter.h" #include "db/db.h" +namespace Winix +{ + class Functions; @@ -615,4 +618,6 @@ private: +} // namespace Winix + #endif diff --git a/templates/textextstream.cpp b/templates/textextstream.cpp index 5d15dc3..123ccb3 100755 --- a/templates/textextstream.cpp +++ b/templates/textextstream.cpp @@ -2,13 +2,15 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ #include "textextstream.h" +namespace Winix +{ @@ -470,3 +472,8 @@ TexTextStream & TexTextStream::operator<<(const PT::Date & date) return *this; } + + + +} // namespace Winix + diff --git a/templates/textextstream.h b/templates/textextstream.h index f454fdb..a12b45e 100755 --- a/templates/textextstream.h +++ b/templates/textextstream.h @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2012, Tomasz Sowa + * Copyright (c) 2012-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,8 @@ #include "core/textstream.h" #include "textstream/textstream.h" +namespace Winix +{ /* @@ -183,5 +185,7 @@ return *this; +} // namespace Winix + #endif diff --git a/templates/upload.cpp b/templates/upload.cpp index 031a2a6..e3ba298 100755 --- a/templates/upload.cpp +++ b/templates/upload.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2011, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -12,6 +12,9 @@ #include "templates.h" #include "misc.h" +namespace Winix +{ + namespace TemplatesFunctions { @@ -35,3 +38,6 @@ void upload_ckeditor_funnum(Info & i) } // namespace + +} // namespace Winix + diff --git a/templates/uptime.cpp b/templates/uptime.cpp index e5dc0a3..1b33dea 100755 --- a/templates/uptime.cpp +++ b/templates/uptime.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -10,6 +10,8 @@ #include #include "templates.h" +namespace Winix +{ namespace TemplatesFunctions @@ -52,4 +54,10 @@ char buf[50]; } + + + } // namespace + +} // namespace Winix + diff --git a/templates/user.cpp b/templates/user.cpp index f3b8ea8..7d96d96 100755 --- a/templates/user.cpp +++ b/templates/user.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/request.h" #include "core/misc.h" +namespace Winix +{ @@ -267,7 +269,12 @@ void user_tab_is_current(Info & i) i.res = (user_iter->id == cur->session->puser->id); } + + + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/who.cpp b/templates/who.cpp index 820c7bb..b41fd6b 100755 --- a/templates/who.cpp +++ b/templates/who.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2010, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -11,6 +11,8 @@ #include "core/request.h" #include "core/misc.h" +namespace Winix +{ namespace TemplatesFunctions @@ -99,7 +101,11 @@ void who_tab_last_time(Info & i) } + + } // namespace TemplatesFunctions +} // namespace Winix + diff --git a/templates/winix.cpp b/templates/winix.cpp index fa99a1f..7f1d841 100755 --- a/templates/winix.cpp +++ b/templates/winix.cpp @@ -2,7 +2,7 @@ * This file is a part of Winix * and is not publicly distributed * - * Copyright (c) 2008-2012, Tomasz Sowa + * Copyright (c) 2008-2014, Tomasz Sowa * All rights reserved. * */ @@ -14,6 +14,8 @@ #include "core/misc.h" #include "functions/functions.h" +namespace Winix +{ namespace TemplatesFunctions @@ -380,3 +382,6 @@ void winix_locale_tab_name(Info & i) } // namespace + +} // namespace Winix +