From 3e3dd163677f00041a43c64aef695e965a7bfa8b Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Wed, 6 Jan 2010 19:45:19 -0800 Subject: [PATCH] Update modelines and stuff. --- src/audacious.cc | 4 ++-- src/audacious.h | 4 ++-- src/ccurl_thread.cc | 4 ++-- src/ccurl_thread.h | 3 ++- src/colours.h | 3 ++- src/combine.cc | 4 ++-- src/combine.h | 4 ++-- src/common.h | 25 +++++++++++++++++++++++-- src/conky.h | 4 ++-- src/core.cc | 4 ++-- src/core.h | 4 ++-- src/diskio.h | 3 ++- src/entropy.cc | 4 ++-- src/entropy.h | 4 ++-- src/exec.h | 4 ++-- src/hddtemp.h | 5 ----- src/ibm.cc | 4 ++-- src/ibm.h | 25 ++++++++++++++++++++++++- src/libtcp-portmon.cc | 2 +- src/libtcp-portmon.h | 4 ++-- src/linux.cc | 4 ++-- src/linux.h | 25 ++++++++++++++++++++++++- src/llua.cc | 4 ++-- src/llua.h | 3 ++- src/mail.h | 25 ++++++++++++++++++++++++- src/moc.cc | 4 ++-- src/moc.h | 3 ++- src/mpd.h | 25 ++++++++++++++++++++++++- src/nvidia.cc | 2 +- src/nvidia.h | 3 ++- src/rss.cc | 4 ++-- src/rss.h | 25 ++++++++++++++++++++++++- src/smapi.cc | 4 ++-- src/smapi.h | 3 ++- src/specials.cc | 4 ++-- src/specials.h | 3 ++- src/tailhead.cc | 4 ++-- src/tailhead.h | 3 ++- src/tcp-portmon.cc | 4 ++-- src/tcp-portmon.h | 3 ++- src/temphelper.cc | 4 ++-- src/temphelper.h | 3 ++- src/top.h | 3 ++- src/users.cc | 4 ++-- src/users.h | 4 ++-- src/weather.cc | 4 ++-- src/weather.h | 5 +++-- src/x11.cc | 4 ++-- src/x11.h | 25 ++++++++++++++++++++++++- 49 files changed, 248 insertions(+), 81 deletions(-) diff --git a/src/audacious.cc b/src/audacious.cc index 5876c426..283d68ed 100644 --- a/src/audacious.cc +++ b/src/audacious.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * audacious.c: conky support for audacious music player * diff --git a/src/audacious.h b/src/audacious.h index 11d45054..08e6f85d 100644 --- a/src/audacious.h +++ b/src/audacious.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * audacious.h: conky support for audacious music player * diff --git a/src/ccurl_thread.cc b/src/ccurl_thread.cc index a9b15073..bd95f943 100644 --- a/src/ccurl_thread.cc +++ b/src/ccurl_thread.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/ccurl_thread.h b/src/ccurl_thread.h index 29de68a5..e2e14855 100644 --- a/src/ccurl_thread.h +++ b/src/ccurl_thread.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/colours.h b/src/colours.h index 31c9a70b..9a07bc38 100644 --- a/src/colours.h +++ b/src/colours.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/combine.cc b/src/combine.cc index a5773853..f44f7dc6 100644 --- a/src/combine.cc +++ b/src/combine.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/combine.h b/src/combine.h index 7f0275dc..1eb0a0d4 100644 --- a/src/combine.h +++ b/src/combine.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/common.h b/src/common.h index 2f270334..daa81009 100644 --- a/src/common.h +++ b/src/common.h @@ -1,5 +1,26 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * */ #ifndef _COMMON_H diff --git a/src/conky.h b/src/conky.h index 81eb7e2c..306b3766 100644 --- a/src/conky.h +++ b/src/conky.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/core.cc b/src/core.cc index bcb7f492..23519ce3 100644 --- a/src/core.cc +++ b/src/core.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/core.h b/src/core.h index 8da6d4ec..ed4ff091 100644 --- a/src/core.h +++ b/src/core.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/diskio.h b/src/diskio.h index fda5a2c5..f8bbd3ed 100644 --- a/src/diskio.h +++ b/src/diskio.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/entropy.cc b/src/entropy.cc index 47e4aeea..86fdadea 100644 --- a/src/entropy.cc +++ b/src/entropy.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/entropy.h b/src/entropy.h index e9eebf61..d508a042 100644 --- a/src/entropy.h +++ b/src/entropy.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/exec.h b/src/exec.h index c08e0852..6546c5d9 100644 --- a/src/exec.h +++ b/src/exec.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/hddtemp.h b/src/hddtemp.h index 46f0997c..f84df705 100644 --- a/src/hddtemp.h +++ b/src/hddtemp.h @@ -3,13 +3,8 @@ * * Conky, a system monitor, based on torsmo * - * Any original torsmo code is licensed under the BSD license - * - * All code written since the fork of torsmo is licensed under the GPL - * * Please see COPYING for details * - * Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen * Copyright (c) 2007 Toni Spets * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. * (see AUTHORS) diff --git a/src/ibm.cc b/src/ibm.cc index 47b0d330..534db16e 100644 --- a/src/ibm.cc +++ b/src/ibm.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/ibm.h b/src/ibm.h index 94f5f3dd..ba272148 100644 --- a/src/ibm.h +++ b/src/ibm.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifndef _IBM_H #define _IBM_H diff --git a/src/libtcp-portmon.cc b/src/libtcp-portmon.cc index d7e76c86..048971af 100644 --- a/src/libtcp-portmon.cc +++ b/src/libtcp-portmon.cc @@ -1,4 +1,4 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * libtcp-portmon.c: tcp port monitoring library. diff --git a/src/libtcp-portmon.h b/src/libtcp-portmon.h index f9f2611b..9042c6fd 100644 --- a/src/libtcp-portmon.h +++ b/src/libtcp-portmon.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * libtcp-portmon.h: tcp port monitoring library. * diff --git a/src/linux.cc b/src/linux.cc index 341eebaf..66f14199 100644 --- a/src/linux.cc +++ b/src/linux.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/linux.h b/src/linux.h index f3c8e8b7..ef3d1837 100644 --- a/src/linux.h +++ b/src/linux.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifndef _LINUX_H #define _LINUX_H diff --git a/src/llua.cc b/src/llua.cc index db8c1bfe..d5639b29 100644 --- a/src/llua.cc +++ b/src/llua.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/llua.h b/src/llua.h index c1537244..e523532f 100644 --- a/src/llua.h +++ b/src/llua.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/mail.h b/src/mail.h index c4a4e5e6..ee35cfea 100644 --- a/src/mail.h +++ b/src/mail.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifndef _MAIL_H #define _MAIL_H diff --git a/src/moc.cc b/src/moc.cc index 4e2c3a6d..fe1a0a04 100644 --- a/src/moc.cc +++ b/src/moc.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * MOC Conky integration * diff --git a/src/moc.h b/src/moc.h index 68e606f6..7433e1d8 100644 --- a/src/moc.h +++ b/src/moc.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * MOC Conky integration * diff --git a/src/mpd.h b/src/mpd.h index 790dfffd..80c38e4c 100644 --- a/src/mpd.h +++ b/src/mpd.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifndef MPD_H_ #define MPD_H_ diff --git a/src/nvidia.cc b/src/nvidia.cc index 6db89ecb..59866782 100644 --- a/src/nvidia.cc +++ b/src/nvidia.cc @@ -1,4 +1,4 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo diff --git a/src/nvidia.h b/src/nvidia.h index 15a73515..e82eec97 100644 --- a/src/nvidia.h +++ b/src/nvidia.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/rss.cc b/src/rss.cc index 266e9754..c1f96ad2 100644 --- a/src/rss.cc +++ b/src/rss.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/rss.h b/src/rss.h index be5529ac..cd260857 100644 --- a/src/rss.h +++ b/src/rss.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifndef RSS_H_ #define RSS_H_ diff --git a/src/smapi.cc b/src/smapi.cc index 21d57299..14b6ffc7 100644 --- a/src/smapi.cc +++ b/src/smapi.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * smapi.c: conky support for IBM Thinkpad smapi * diff --git a/src/smapi.h b/src/smapi.h index 77f5d7ab..3c2b8cad 100644 --- a/src/smapi.h +++ b/src/smapi.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * smapi.h: conky support for IBM Thinkpad smapi * diff --git a/src/specials.cc b/src/specials.cc index d2cb5e61..8099181f 100644 --- a/src/specials.cc +++ b/src/specials.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/specials.h b/src/specials.h index 8da85447..743d157a 100644 --- a/src/specials.h +++ b/src/specials.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/tailhead.cc b/src/tailhead.cc index 0fe5e156..8adaf8fe 100644 --- a/src/tailhead.cc +++ b/src/tailhead.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/tailhead.h b/src/tailhead.h index 89ff1bd5..d23b5f7f 100644 --- a/src/tailhead.h +++ b/src/tailhead.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/tcp-portmon.cc b/src/tcp-portmon.cc index d0b2abb3..7677b2f6 100644 --- a/src/tcp-portmon.cc +++ b/src/tcp-portmon.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * tcp-portmon.c - libtcp-portmon hooks * diff --git a/src/tcp-portmon.h b/src/tcp-portmon.h index a97feaff..992a97c4 100644 --- a/src/tcp-portmon.h +++ b/src/tcp-portmon.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * tcp-portmon.h - libtcp-portmon hooks protoypes * diff --git a/src/temphelper.cc b/src/temphelper.cc index c577a1c2..d6fa1f27 100644 --- a/src/temphelper.cc +++ b/src/temphelper.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * temphelper.c: aid in converting temperature units * diff --git a/src/temphelper.h b/src/temphelper.h index 19f97af7..d0cdf767 100644 --- a/src/temphelper.h +++ b/src/temphelper.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * temphelper.h: aid in converting temperature units * diff --git a/src/top.h b/src/top.h index bc8a918e..4b64975b 100644 --- a/src/top.h +++ b/src/top.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/users.cc b/src/users.cc index 060762ae..9e3df172 100644 --- a/src/users.cc +++ b/src/users.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/users.h b/src/users.h index 9b59f0f8..49e7bfd4 100644 --- a/src/users.h +++ b/src/users.h @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/weather.cc b/src/weather.cc index cc6c2303..5efa626a 100644 --- a/src/weather.cc +++ b/src/weather.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/weather.h b/src/weather.h index 5fddda7b..e02c6d28 100644 --- a/src/weather.h +++ b/src/weather.h @@ -1,4 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * @@ -51,4 +52,4 @@ void free_weather(struct text_object *); } #endif -#endif /*WEATHER_H_*/ +#endif /* WEATHER_H_ */ diff --git a/src/x11.cc b/src/x11.cc index 4e0ddb15..ef865972 100644 --- a/src/x11.cc +++ b/src/x11.cc @@ -1,5 +1,5 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- - * vim: ts=4 sw=4 noet ai cindent syntax=c +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp * * Conky, a system monitor, based on torsmo * diff --git a/src/x11.h b/src/x11.h index e92fecc6..5faeda81 100644 --- a/src/x11.h +++ b/src/x11.h @@ -1,4 +1,27 @@ -/* -*- mode: c; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- */ +/* -*- mode: c++; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: t -*- + * vim: ts=4 sw=4 noet ai cindent syntax=cpp + * + * Conky, a system monitor, based on torsmo + * + * Please see COPYING for details + * + * Copyright (c) 2005-2010 Brenden Matthews, Philip Kovacs, et. al. + * (see AUTHORS) + * All rights reserved. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ #ifdef BUILD_X11 #ifndef X11_H_