diff options
| author | 2008-09-18 14:11:40 +0000 | |
|---|---|---|
| committer | 2008-09-18 14:11:40 +0000 | |
| commit | ac2059e9677af0b978816d2e9d543398a27f3915 (patch) | |
| tree | dd2e6ffd4e16b6aee757d8275738b9dd441df2e1 /src/modules | |
| parent | fixed license template for modules from a to f (diff) | |
| download | KVIrc-ac2059e9677af0b978816d2e9d543398a27f3915.tar.gz KVIrc-ac2059e9677af0b978816d2e9d543398a27f3915.tar.bz2 KVIrc-ac2059e9677af0b978816d2e9d543398a27f3915.zip | |
fixed license template for modules from h to m
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2483 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
56 files changed, 407 insertions, 317 deletions
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 261f63afe..df4badcd3 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : helpwidget.cpp // Creation date : Thu Aug 10 2000 17:42:12 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "helpwidget.h" #include "helpwindow.h" diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h index 8d7e35199..f4ba18f74 100644 --- a/src/modules/help/helpwidget.h +++ b/src/modules/help/helpwidget.h @@ -1,11 +1,12 @@ #ifndef _HELPWIDGET_H_ #define _HELPWIDGET_H_ +//============================================================================= // // File : helpwidget.h // Creation date : Thu Aug 10 2000 17:26:20 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "index.h" diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index a23946bf1..0c5250c42 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : helpwindow.cpp // Creation date : Tue Aug 11 2000 18:08:22 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the m_terms of the GNU General Public License @@ -19,7 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - +//============================================================================= #include "helpwindow.h" #include "helpwidget.h" diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h index 888116d41..9b94e3913 100644 --- a/src/modules/help/helpwindow.h +++ b/src/modules/help/helpwindow.h @@ -1,11 +1,12 @@ #ifndef _HELPWINDOW_H_ #define _HELPWINDOW_H_ +//============================================================================= // // File : helpwindow.h // Creation date : Fri Aug 11 2000 18:05:59 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_window.h" #include "kvi_string.h" diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index 8ab14e65c..6092bdf19 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkvihelp.cpp // Creation date : Sun Aug 13 2000 03:00:00 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "helpwidget.h" #include "helpwindow.h" diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp index 2e03ffd1b..4e2cd62a7 100644 --- a/src/modules/http/httpfiletransfer.cpp +++ b/src/modules/http/httpfiletransfer.cpp @@ -1,10 +1,10 @@ -//================================================================================== +//============================================================================= // // File : httpfiletransfer.h // Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek // // This config is part of the KVirc irc client distribution -// Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -20,7 +20,8 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -//================================================================================== +//============================================================================= + #include "httpfiletransfer.h" #include "kvi_app.h" diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h index 85a2b702e..2983ef43e 100644 --- a/src/modules/http/httpfiletransfer.h +++ b/src/modules/http/httpfiletransfer.h @@ -1,12 +1,12 @@ #ifndef _HTTPFILETRANSFER_H_ #define _HTTPFILETRANSFER_H_ -//================================================================================== +//============================================================================= // // File : httpfiletransfer.h // Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek // // This config is part of the KVirc irc client distribution -// Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -22,7 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -//================================================================================== +//============================================================================= #include "kvi_filetransfer.h" #include "kvi_http.h" diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp index 017107422..ff25ae6f9 100644 --- a/src/modules/http/libkvihttp.cpp +++ b/src/modules/http/libkvihttp.cpp @@ -1,10 +1,10 @@ -//================================================================================== +//============================================================================= // // File : libkvihttp.cpp // Creation date : Tue Apr 22 2003 02:00:12 GMT by Szymon Stefanek // // This config is part of the KVirc irc client distribution -// Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2003-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -20,7 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -//================================================================================== +//============================================================================= #include "httpfiletransfer.h" diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp index 54c55a63c..15970d501 100644 --- a/src/modules/ident/libkviident.cpp +++ b/src/modules/ident/libkviident.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkviident.cpp // Creation date : Tue Oct 2 18:22:04 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "libkviident.h" diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h index 64725fe87..67c5da754 100644 --- a/src/modules/ident/libkviident.h +++ b/src/modules/ident/libkviident.h @@ -1,11 +1,12 @@ #ifndef _LIBKVIIDENT_H_ #define _LIBKVIIDENT_H_ +//============================================================================= // // File : libkviident.h // Creation date : Tue Oct 2 18:22:05 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_thread.h" #include "kvi_sockettype.h" diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 6ebe6efae..8918554b3 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : kvi_iograph.cpp // Creation date : Tue Oct 31 2000 00:14:12 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,7 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - +//============================================================================= #include "libkviiograph.h" #include "kvi_module.h" diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h index f68dbef82..a39ea75f1 100644 --- a/src/modules/iograph/libkviiograph.h +++ b/src/modules/iograph/libkviiograph.h @@ -1,12 +1,12 @@ #ifndef _LIBKVIIOGRAPH_H_ #define _LIBKVIIOGRAPH_H_ - +//============================================================================= // // File : kvi_iograph.cpp // Creation date : Tue Oct 31 2000 00:14:12 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -22,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #if 0 diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp index 0891aefb7..5055c1f0d 100644 --- a/src/modules/lamerizer/libkvilamerizer.cpp +++ b/src/modules/lamerizer/libkvilamerizer.cpp @@ -4,7 +4,7 @@ // Creation date : Sat Jan 20 2002 17:06:12 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/lamerizer/libkvilamerizer.h b/src/modules/lamerizer/libkvilamerizer.h index 1f13f7576..fd2911d8f 100644 --- a/src/modules/lamerizer/libkvilamerizer.h +++ b/src/modules/lamerizer/libkvilamerizer.h @@ -1,11 +1,13 @@ #ifndef _LIBKVILAMERIZER_H_ #define _LIBKVILAMERIZER_H_ +//============================================================================= // // File : libkvilamerizer.h // Creation date : Sat Now 4 2000 15:41:41 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Till Bush (buti@geocities.com) +// Copyright (C) 2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Till Bush (buti@geocities.com) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +23,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_settings.h" diff --git a/src/modules/language/detector.h b/src/modules/language/detector.h index 6131af8ff..6e0b6a86a 100644 --- a/src/modules/language/detector.h +++ b/src/modules/language/detector.h @@ -1,8 +1,9 @@ #ifndef _DETECTOR_H_ #define _DETECTOR_H_ +//============================================================================= // // File : detector.h -// Creation date : Sun May 11 2008 00:07:20 CET by Szymon Stefanek +// Creation date : Sun May 11 1999 00:07:20 CET by Szymon Stefanek // // This file is part of the KVirc irc client distribution // Copyright (C) 1999-2008 Szymon Stefanek (pragma at kvirc dot net) @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #define DLE_NUM_BEST_MATCHES 4 #define DLE_STRICT_UTF8_CHECKING 1 diff --git a/src/modules/language/detector/build_detector.pl b/src/modules/language/detector/build_detector.pl index 9f2a073ae..17d3bb190 100755 --- a/src/modules/language/detector/build_detector.pl +++ b/src/modules/language/detector/build_detector.pl @@ -73,7 +73,7 @@ print OUTPUT "//================================================================ print OUTPUT "//\n"; print OUTPUT "// A Simple statistical language/encoding detector\n"; print OUTPUT "// This file is part of the KVirc irc client distribution\n"; -print OUTPUT "// Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net)\n"; +print OUTPUT "// Copyright (C) 2008 Szymon Stefanek (pragma at kvirc dot net)\n"; print OUTPUT "//\n"; print OUTPUT "// This program is FREE software. You can redistribute it and/or\n"; print OUTPUT "// modify it under the terms of the GNU General Public License\n"; diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp index 09c75bee6..ed56bcd35 100644 --- a/src/modules/language/libkvilanguage.cpp +++ b/src/modules/language/libkvilanguage.cpp @@ -4,7 +4,7 @@ // Creation date : Fri 25 Dec 20:16:49 2004 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2004 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2004-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp index 67869634e..731cf4b02 100644 --- a/src/modules/links/libkvilinks.cpp +++ b/src/modules/links/libkvilinks.cpp @@ -1,8 +1,9 @@ +//============================================================================= // // File : libkvilinks.cpp // Creation date : Thu Dec 21 2000 12:39:12 CEST by Szymon Stefanek // -// Copyright (C) 1999-2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -18,6 +19,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "linkswindow.h" diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp index 227dee3eb..f93b1cab4 100644 --- a/src/modules/links/linkswindow.cpp +++ b/src/modules/links/linkswindow.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : linkswindow.cpp // Creation date : Thu Dec 21 2001 12:41:18 by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,8 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= + #include "linkswindow.h" #include "kvi_debug.h" diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h index 7962abd76..b3b5efc06 100644 --- a/src/modules/links/linkswindow.h +++ b/src/modules/links/linkswindow.h @@ -1,11 +1,12 @@ #ifndef _LINKSWINDOW_H_ #define _LINKSWINDOW_H_ +//============================================================================= // // File : linkswindow.h // Creation date : Thu Dec 21 2000 12:42:55 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the linkss of the GNU General Public License @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_window.h" #include "kvi_string.h" diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp index 52450aeee..c36893af4 100644 --- a/src/modules/list/libkvilist.cpp +++ b/src/modules/list/libkvilist.cpp @@ -1,8 +1,9 @@ +//============================================================================= // // File : libkvilist.cpp // Creation date : Sun Oct 21 2001 13:29:12 CEST by Szymon Stefanek // -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -18,6 +19,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "listwindow.h" diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 6bcbf5ddf..23383c16c 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -4,7 +4,7 @@ // Creation date : Thu Oct 7 2001 13:27:55 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2004 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the lists of the GNU General Public License diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h index ecedab507..c7987dddb 100644 --- a/src/modules/list/listwindow.h +++ b/src/modules/list/listwindow.h @@ -6,7 +6,7 @@ // Creation date : Thu Oct 7 2001 13:27:55 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2004 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the lists of the GNU General Public License diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp index 3f3410c29..5a28a08c6 100644 --- a/src/modules/log/libkvilog.cpp +++ b/src/modules/log/libkvilog.cpp @@ -4,7 +4,7 @@ // Creation date : Sat Jan 06 2001 13:28:02 CEST by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp index f6c03d335..0afe2d7f1 100644 --- a/src/modules/logview/libkvilogview.cpp +++ b/src/modules/logview/libkvilogview.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkvilogview.cpp // Creation date : Sun Feb 10 2000 23:25:10 CEST by Juanjo �varez // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2000-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "logviewwidget.h" #include "logviewmdiwindow.h" diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 78a04093e..f52342c21 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -1,9 +1,11 @@ +//============================================================================= // // File : logviewmdiwindow.cpp -// Creation date : Tue Apr 23 2002 18:08:22 by Juanjo �varez +// Creation date : Tue Apr 23 2002 18:08:22 by Juanjo Alvarez // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002 Juanjo Alvarez +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +21,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "logviewmdiwindow.h" #include "logviewwidget.h" diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h index 4c6b7832e..a3b2fd321 100644 --- a/src/modules/logview/logviewmdiwindow.h +++ b/src/modules/logview/logviewmdiwindow.h @@ -1,11 +1,13 @@ #ifndef _LOGVIEWMDIWINDOW_H_ #define _LOGVIEWMDIWINDOW_H_ +//============================================================================= // // File : logviewmdiwindow.h -// Creation date : Tue Apr 23 2002 18:05:59 by Juanjo �varez +// Creation date : Tue Apr 23 2002 18:05:59 by Juanjo Alvarez // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2007 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002 Juanjo Alvarez +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +23,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_settings.h" #include "kvi_window.h" diff --git a/src/modules/logview/logviewwidget.cpp b/src/modules/logview/logviewwidget.cpp index 18e9a5991..bcf6d82c7 100644 --- a/src/modules/logview/logviewwidget.cpp +++ b/src/modules/logview/logviewwidget.cpp @@ -1,9 +1,11 @@ +//============================================================================= // // File : logviewwidget.cpp -// Creation date : Thu Apr 23 2002 17:42:12 by Juanjo �varez +// Creation date : Thu Apr 23 2002 17:42:12 by Juanjo Alvarez // // This file is part of the KVirc irc client distribution -// Copyright (C) 1999-2000 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002 Juanjo Alvarez +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +21,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "logviewwidget.h" diff --git a/src/modules/logview/logviewwidget.h b/src/modules/logview/logviewwidget.h index bfbd99335..03f28abaf 100644 --- a/src/modules/logview/logviewwidget.h +++ b/src/modules/logview/logviewwidget.h @@ -1,12 +1,13 @@ #ifndef _LOGVIEWWIDGET_H_ #define _LOGVIEWWIDGET_H_ - +//============================================================================= // // File : logviewwidget.h -// Creation date : Thue Apr 23 2002 03:01:53 CET by Juanjo �varez +// Creation date : Thue Apr 23 2002 03:01:53 CET by Juanjo Alvarez // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002-2003 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002 Juanjo Alvarez +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -22,6 +23,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "logviewmdiwindow.h" diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp index c993e95da..da0783727 100644 --- a/src/modules/mask/libkvimask.cpp +++ b/src/modules/mask/libkvimask.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkvistr.cpp // Creation date : Thu Dec 27 2001 17:13:12 GMT by Szymon Stefanek // // This str is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,7 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // - +//============================================================================= #include "kvi_module.h" #include "kvi_locale.h" diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp index a7c848c12..1a9469af9 100644 --- a/src/modules/math/libkvimath.cpp +++ b/src/modules/math/libkvimath.cpp @@ -4,7 +4,7 @@ // Creation date : Sat Jan 13 14:00:12 2006 GMT by Szymon Stefanek // // This math is part of the KVirc irc client distribution -// Copyright (C) 2006 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2006-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index ad41e9a27..b18283cf7 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -5,7 +5,8 @@ // Renamed to file : libkvimediaplayer.cpp on Fri Mar 25 2005 // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001-2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2008 Tomasz Moń (desowin at gmail dot com) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp index 8fc62e973..e958e8fc5 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.cpp +++ b/src/modules/mediaplayer/mp_amarokinterface.cpp @@ -1,10 +1,10 @@ //============================================================================= // // File : mp_amarokinterface.cpp -// Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek +// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h index 0503314fb..df6b569b2 100644 --- a/src/modules/mediaplayer/mp_amarokinterface.h +++ b/src/modules/mediaplayer/mp_amarokinterface.h @@ -3,7 +3,7 @@ //============================================================================= // // File : mp_amarokinterface.h -// Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek +// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution // Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> diff --git a/src/modules/mediaplayer/mp_amipinterface.cpp b/src/modules/mediaplayer/mp_amipinterface.cpp index f21f76369..616e6c7b9 100644 --- a/src/modules/mediaplayer/mp_amipinterface.cpp +++ b/src/modules/mediaplayer/mp_amipinterface.cpp @@ -1,3 +1,27 @@ +//============================================================================= +// +// File : mp_amipinterface.cpp +// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek +// +// This file is part of the KVIrc IRC client distribution +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> +// +// 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 2 +// of the License, or (at your opinion) 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, write to the Free Software Foundation, +// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +//============================================================================= + #include "mp_amipinterface.h" #include "kvi_options.h" @@ -32,15 +56,15 @@ enum ac_ErrorCode static HINSTANCE amip_dll = NULL; #define MP_AC_DYNPTR(__rettype,__func,__args) \ - typedef __rettype (CALLBACK* lp_##__func)(__args); \ - lp_##__func __func + typedef __rettype (CALLBACK* lp_##__func)(__args); \ + lp_##__func __func #define MP_AC_FUNC(__func) \ - __func = (lp_##__func)GetProcAddress(amip_dll,#__func); \ - if(!__func) { \ - FreeLibrary(amip_dll); \ - return false; \ - } + __func = (lp_##__func)GetProcAddress(amip_dll,#__func); \ + if(!__func) { \ + FreeLibrary(amip_dll); \ + return false; \ + } #define COMMA() , @@ -55,38 +79,39 @@ MP_AC_DYNPTR(int, ac_eval, const char *cmd COMMA() char *result); static bool loadAmipDll() { - amip_dll = LoadLibrary("ac.dll"); - if (!amip_dll) return false; - - MP_AC_FUNC(ac_init); - MP_AC_FUNC(ac_uninit); - MP_AC_FUNC(ac_getDestHost); - MP_AC_FUNC(ac_getDestPort); - MP_AC_FUNC(ac_pingServer); - MP_AC_FUNC(ac_eval); - MP_AC_FUNC(ac_exec); - - return true; + amip_dll = LoadLibrary("ac.dll"); + if (!amip_dll) return false; + + MP_AC_FUNC(ac_init); + MP_AC_FUNC(ac_uninit); + MP_AC_FUNC(ac_getDestHost); + MP_AC_FUNC(ac_getDestPort); + MP_AC_FUNC(ac_pingServer); + MP_AC_FUNC(ac_eval); + MP_AC_FUNC(ac_exec); + + return true; }; static QTextCodec * mediaplayer_get_codec() { -QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); - if(!c)c = QTextCodec::codecForLocale(); - return c; + QTextCodec * c= QTextCodec::codecForName(KVI_OPTION_STRING(KviOption_stringWinampTextEncoding).toAscii()); + if(!c) + c = QTextCodec::codecForLocale(); + return c; } MP_IMPLEMENT_DESCRIPTOR( - KviAmipInterface, - "amip", - __tr2qs_ctx( - "An interface to the AMIP plug-in.\n" \ - "You can download it from http://amip.tools-for.net.\n" \ - "To use this interface you must " \ - "install AMIP plug-in for your player." - , - "mediaplayer" - ) + KviAmipInterface, + "amip", + __tr2qs_ctx( + "An interface to the AMIP plug-in.\n" \ + "You can download it from http://amip.tools-for.net.\n" \ + "To use this interface you must " \ + "install AMIP plug-in for your player." + , + "mediaplayer" + ) ) @@ -94,39 +119,39 @@ MP_IMPLEMENT_DESCRIPTOR( KviAmipInterface::KviAmipInterface() : KviMediaPlayerInterface() { - if(!amip_dll) { - bool res = loadAmipDll(); - if(!res) { - amip_dll = NULL; - return; - } - ac_init(AC_START_CLIENT); - } + if(!amip_dll) { + bool res = loadAmipDll(); + if(!res) { + amip_dll = NULL; + return; + } + ac_init(AC_START_CLIENT); + } } KviAmipInterface::~KviAmipInterface() { - if(!amip_dll) return; - ac_uninit(); - FreeLibrary(amip_dll); - amip_dll = NULL; + if(!amip_dll) return; + ac_uninit(); + FreeLibrary(amip_dll); + amip_dll = NULL; } int KviAmipInterface::detect(bool bStart) { - if(!amip_dll) return 0; - char host[AC_BUFFER_SIZE]; - ac_getDestHost(host); - if(ac_pingServer(host, ac_getDestPort(), 5000)) return 99; - return 1; + if(!amip_dll) return 0; + char host[AC_BUFFER_SIZE]; + ac_getDestHost(host); + if(ac_pingServer(host, ac_getDestPort(), 5000)) return 99; + return 1; } #define MP_AMIP_COMMAND(__cmdname,__acmd) \ - bool KviAmipInterface::__cmdname() \ - { \ - return (ac_exec(__acmd) == AC_ERR_NOERROR); \ - } + bool KviAmipInterface::__cmdname() \ + { \ + return (ac_exec(__acmd) == AC_ERR_NOERROR); \ + } MP_AMIP_COMMAND(play,"control play") MP_AMIP_COMMAND(stop,"control stop") @@ -138,263 +163,253 @@ MP_AMIP_COMMAND(quit,"control exit") // helper function for evaluating variables returning integers int eval_int(const char *var) { - if(!amip_dll) return -1; - char buff[AC_BUFFER_SIZE]; - int res = -1; - if (AC_ERR_NOERROR == ac_eval(var, buff)) { - res = atoi(buff); - } - return res; + if(!amip_dll) return -1; + char buff[AC_BUFFER_SIZE]; + int res = -1; + if (AC_ERR_NOERROR == ac_eval(var, buff)) + res = atoi(buff); + return res; } QString eval_str(const char *var) { - QString res; - if(!amip_dll) return res; - char buff[AC_BUFFER_SIZE]; - if (AC_ERR_NOERROR == ac_eval(var, buff)) { - res.append(buff); - } - return res; + QString res; + if(!amip_dll) return res; + char buff[AC_BUFFER_SIZE]; + if (AC_ERR_NOERROR == ac_eval(var, buff)) + res.append(buff); + return res; } int KviAmipInterface::length() { - return eval_int("var_sl") * 1000; + return eval_int("var_sl") * 1000; } int KviAmipInterface::position() { - return eval_int("var_psec") * 1000; + return eval_int("var_psec") * 1000; } int KviAmipInterface::bitRate() { - return eval_int("var_br"); + return eval_int("var_br"); } int KviAmipInterface::sampleRate() { - return eval_int("var_sr"); + return eval_int("var_sr"); } int KviAmipInterface::channels() { - int ret = -1; - if(eval_str("var_typ").startsWith("Stereo")) { - ret = 2; - } else if(eval_str("var_typ").startsWith("Mono")) { - ret = 1; - } - return ret; + int ret = -1; + if(eval_str("var_typ").startsWith("Stereo")) + ret = 2; + else if(eval_str("var_typ").startsWith("Mono")) + ret = 1; + return ret; } KviMediaPlayerInterface::PlayerStatus KviAmipInterface::status() { - int ret = eval_int("var_stat"); - switch(ret) - { - case 0: - return KviMediaPlayerInterface::Stopped; - break; - case 3: - return KviMediaPlayerInterface::Paused; - break; - case 1: - return KviMediaPlayerInterface::Playing; - break; - default: - return KviMediaPlayerInterface::Unknown; - break; - } - return KviMediaPlayerInterface::Unknown; + int ret = eval_int("var_stat"); + switch(ret) + { + case 0: + return KviMediaPlayerInterface::Stopped; + break; + case 3: + return KviMediaPlayerInterface::Paused; + break; + case 1: + return KviMediaPlayerInterface::Playing; + break; + default: + return KviMediaPlayerInterface::Unknown; + break; + } + return KviMediaPlayerInterface::Unknown; } QString KviAmipInterface::mrl() { - QString ret; - QString fn = eval_str("var_fn"); - QTextCodec *c=mediaplayer_get_codec(); - if (c) ret = c->toUnicode(fn.toAscii()); - else ret=fn; - if(!ret.startsWith("http://",Qt::CaseInsensitive)) - ret.prepend("file://"); - - return ret; + QString ret; + QString fn = eval_str("var_fn"); + QTextCodec *c=mediaplayer_get_codec(); + if (c) ret = c->toUnicode(fn.toAscii()); + else ret=fn; + if(!ret.startsWith("http://",Qt::CaseInsensitive)) + ret.prepend("file://"); + + return ret; } -QString getAmipString(const char * var) { - QString ret; - QString s = eval_str(var); - QTextCodec *c=mediaplayer_get_codec(); - if (c) ret = c->toUnicode(s.toAscii()); - else ret=s; - return ret; +QString getAmipString(const char * var) +{ + QString ret; + QString s = eval_str(var); + QTextCodec *c=mediaplayer_get_codec(); + if (c) ret = c->toUnicode(s.toAscii()); + else ret=s; + return ret; } QString KviAmipInterface::nowPlaying() { - return getAmipString("var_s"); + return getAmipString("var_s"); } QString KviAmipInterface::artist() { - return getAmipString("var_1"); + return getAmipString("var_1"); } QString KviAmipInterface::title() { - return getAmipString("var_2"); + return getAmipString("var_2"); } QString KviAmipInterface::album() { - return getAmipString("var_4"); + return getAmipString("var_4"); } QString KviAmipInterface::year() { - return getAmipString("var_5"); + return getAmipString("var_5"); } QString KviAmipInterface::comment() { - return getAmipString("var_6"); + return getAmipString("var_6"); } QString KviAmipInterface::genre() { - return getAmipString("var_7"); + return getAmipString("var_7"); } bool KviAmipInterface::setVol(kvs_int_t &iVol) { - if(!amip_dll) return false; - char volcmd[AC_BUFFER_SIZE]; - sprintf(volcmd, "control vol %d", iVol); - return (ac_exec(volcmd) == AC_ERR_NOERROR); + if(!amip_dll) return false; + char volcmd[AC_BUFFER_SIZE]; + sprintf(volcmd, "control vol %d", iVol); + return (ac_exec(volcmd) == AC_ERR_NOERROR); } int KviAmipInterface::getVol() { - return eval_int("var_vol"); + return eval_int("var_vol"); } bool KviAmipInterface::jumpTo(kvs_int_t &iPos) { - if(!amip_dll) return false; - char jmpcmd[AC_BUFFER_SIZE]; - sprintf(jmpcmd, "jumptotime %d", iPos/1000); - return (ac_exec(jmpcmd) == AC_ERR_NOERROR); + if(!amip_dll) return false; + char jmpcmd[AC_BUFFER_SIZE]; + sprintf(jmpcmd, "jumptotime %d", iPos/1000); + return (ac_exec(jmpcmd) == AC_ERR_NOERROR); } bool KviAmipInterface::hide() { - HWND hWinamp = (HWND)eval_int("var_phwnd"); - if(hWinamp && hWinamp != (HWND)-1) - { - ShowWindow(hWinamp, SW_HIDE); - return true; - } - return false; + HWND hWinamp = (HWND)eval_int("var_phwnd"); + if(hWinamp && hWinamp != (HWND)-1) + { + ShowWindow(hWinamp, SW_HIDE); + return true; + } + return false; } bool KviAmipInterface::show() { - HWND hWinamp = (HWND)eval_int("var_phwnd"); - if(hWinamp && hWinamp != (HWND)-1) - { - ShowWindow(hWinamp, SW_SHOW); - return true; - } - return false; + HWND hWinamp = (HWND)eval_int("var_phwnd"); + if(hWinamp && hWinamp != (HWND)-1) + { + ShowWindow(hWinamp, SW_SHOW); + return true; + } + return false; } bool KviAmipInterface::minimize() { - if(!amip_dll) return false; - return (ac_exec("control mimimize") == AC_ERR_NOERROR); + if(!amip_dll) return false; + return (ac_exec("control mimimize") == AC_ERR_NOERROR); } bool KviAmipInterface::setPlayListPos(kvs_int_t &iPos) { - if(!amip_dll) return false; - char jmpcmd[AC_BUFFER_SIZE]; - sprintf(jmpcmd, "setplpos %d", iPos + 1); - return (ac_exec(jmpcmd) == AC_ERR_NOERROR); + if(!amip_dll) return false; + char jmpcmd[AC_BUFFER_SIZE]; + sprintf(jmpcmd, "setplpos %d", iPos + 1); + return (ac_exec(jmpcmd) == AC_ERR_NOERROR); } int KviAmipInterface::getPlayListPos() { - return eval_int("var_pos"); + return eval_int("var_pos"); } int KviAmipInterface::getListLength() { - return eval_int("var_ll"); + return eval_int("var_ll"); } bool KviAmipInterface::getRepeat() { - return eval_str("var_repeat").startsWith("on"); + return eval_str("var_repeat").startsWith("on"); } bool KviAmipInterface::getShuffle() { - return eval_str("var_shuffle").startsWith("on"); + return eval_str("var_shuffle").startsWith("on"); } bool KviAmipInterface::setShuffle(bool &bVal) { - if(!amip_dll) return false; - bool res; - if (bVal) - { - res = (ac_exec("setshuffle on") == AC_ERR_NOERROR); - } - else - { - res = (ac_exec("setshuffle off") == AC_ERR_NOERROR); - } - return res; + if(!amip_dll) return false; + bool res; + if (bVal) + res = (ac_exec("setshuffle on") == AC_ERR_NOERROR); + else + res = (ac_exec("setshuffle off") == AC_ERR_NOERROR); + return res; } bool KviAmipInterface::setRepeat(bool &bVal) { - if(!amip_dll) return false; - bool res; - if (bVal) - { - res = (ac_exec("setrepeat on") == AC_ERR_NOERROR); - } - else - { - res = (ac_exec("setrepeat off") == AC_ERR_NOERROR); - } - return res; + if(!amip_dll) return false; + bool res; + if (bVal) + res = (ac_exec("setrepeat on") == AC_ERR_NOERROR); + else + res = (ac_exec("setrepeat off") == AC_ERR_NOERROR); + return res; } bool KviAmipInterface::amipExec(const QString &cmd) { - if(!amip_dll) return false; - QTextCodec *c=mediaplayer_get_codec(); - KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8(); - return (ac_exec(szCmd) == AC_ERR_NOERROR); + if(!amip_dll) return false; + QTextCodec *c=mediaplayer_get_codec(); + KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8(); + return (ac_exec(szCmd) == AC_ERR_NOERROR); } QString KviAmipInterface::amipEval(const QString &cmd) { - QString ret; - if(!amip_dll) return ret; - QTextCodec *c=mediaplayer_get_codec(); - KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8(); - char buff[AC_BUFFER_SIZE]; - if((ac_eval(szCmd, buff) == AC_ERR_NOERROR)) { - QString s = buff; - QTextCodec *c=mediaplayer_get_codec(); - if (c) ret = c->toUnicode(s.toAscii()); - else ret=s; - } - return ret; + QString ret; + if(!amip_dll) return ret; + QTextCodec *c=mediaplayer_get_codec(); + KviStr szCmd = c ? c->fromUnicode(cmd) : cmd.toUtf8(); + char buff[AC_BUFFER_SIZE]; + if((ac_eval(szCmd, buff) == AC_ERR_NOERROR)) { + QString s = buff; + QTextCodec *c=mediaplayer_get_codec(); + if (c) ret = c->toUnicode(s.toAscii()); + else ret=s; + } + return ret; } #endif //COMPILE_ON_WINDOWS diff --git a/src/modules/mediaplayer/mp_amipinterface.h b/src/modules/mediaplayer/mp_amipinterface.h index a685b435f..1207d3e04 100644 --- a/src/modules/mediaplayer/mp_amipinterface.h +++ b/src/modules/mediaplayer/mp_amipinterface.h @@ -1,58 +1,81 @@ #ifndef _MP_AMIPINTERFACE_H_ #define _MP_AMIPINTERFACE_H_ +//============================================================================= +// +// File : mp_amipinterface.cpp +// Creation date : Sun 27 Mar 2005 16:55:09 by Szymon Stefanek +// +// This file is part of the KVIrc IRC client distribution +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> +// +// 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 2 +// of the License, or (at your opinion) 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, write to the Free Software Foundation, +// Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// +//============================================================================= #include "kvi_settings.h" #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) - #include "mp_interface.h" + #include "mp_interface.h" + + class KviAmipInterface : public KviMediaPlayerInterface + { + public: + KviAmipInterface(); + ~KviAmipInterface(); + public: + virtual int detect(bool bStart); + virtual bool prev(); + virtual bool next(); + virtual bool play(); + virtual bool stop(); + virtual bool pause(); + virtual bool quit(); + virtual QString nowPlaying(); + virtual QString artist(); + virtual QString title(); + virtual QString genre(); + virtual QString comment(); + virtual QString album(); + virtual QString year(); + virtual QString mrl(); + virtual int position(); + virtual int length(); + virtual bool setVol(kvs_int_t &iVol); + virtual int getVol(); + virtual bool jumpTo(kvs_int_t &iPos); + virtual int sampleRate(); + virtual int bitRate(); + virtual int channels(); + virtual bool hide(); + virtual bool show(); + virtual bool minimize(); + virtual int getPlayListPos(); + virtual bool setPlayListPos(kvs_int_t &iPos); + virtual int getListLength(); + virtual bool getRepeat(); + virtual bool getShuffle(); + virtual bool setRepeat(bool &bVal); + virtual bool setShuffle(bool &bVal); + virtual bool amipExec(const QString &cmd); + virtual QString amipEval(const QString &cmd); + virtual KviMediaPlayerInterface::PlayerStatus status(); + }; + + MP_DECLARE_DESCRIPTOR(KviAmipInterface) - class KviAmipInterface : public KviMediaPlayerInterface - { - public: - KviAmipInterface(); - ~KviAmipInterface(); - public: - virtual int detect(bool bStart); - virtual bool prev(); - virtual bool next(); - virtual bool play(); - virtual bool stop(); - virtual bool pause(); - virtual bool quit(); - virtual QString nowPlaying(); - virtual QString artist(); - virtual QString title(); - virtual QString genre(); - virtual QString comment(); - virtual QString album(); - virtual QString year(); - virtual QString mrl(); - virtual int position(); - virtual int length(); - virtual bool setVol(kvs_int_t &iVol); - virtual int getVol(); - virtual bool jumpTo(kvs_int_t &iPos); - virtual int sampleRate(); - virtual int bitRate(); - virtual int channels(); - virtual bool hide(); - virtual bool show(); - virtual bool minimize(); - virtual int getPlayListPos(); - virtual bool setPlayListPos(kvs_int_t &iPos); - virtual int getListLength(); - virtual bool getRepeat(); - virtual bool getShuffle(); - virtual bool setRepeat(bool &bVal); - virtual bool setShuffle(bool &bVal); - virtual bool amipExec(const QString &cmd); - virtual QString amipEval(const QString &cmd); - virtual KviMediaPlayerInterface::PlayerStatus status(); - }; - - MP_DECLARE_DESCRIPTOR(KviAmipInterface) - #endif //COMPILE_ON_WINDOWS #endif //!_MP_AMIPINTERFACE_H_ diff --git a/src/modules/mediaplayer/mp_dcopinterface.cpp b/src/modules/mediaplayer/mp_dcopinterface.cpp index c2b612658..e21d53809 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.cpp +++ b/src/modules/mediaplayer/mp_dcopinterface.cpp @@ -1,10 +1,10 @@ //============================================================================= // // File : mp_dcopinterface.cpp -// Created on Sun 27 Mar 2005 16:56:21 by Szymon Stefanek +// Creation date : Sun 27 Mar 2005 16:56:21 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_dcopinterface.h b/src/modules/mediaplayer/mp_dcopinterface.h index 2efd5b4ab..eea0f0f06 100644 --- a/src/modules/mediaplayer/mp_dcopinterface.h +++ b/src/modules/mediaplayer/mp_dcopinterface.h @@ -3,10 +3,10 @@ //============================================================================= // // File : mp_dcopinterface.h -// Created on Sun 27 Mar 2005 16:56:21 by Szymon Stefanek +// Creation date : Sun 27 Mar 2005 16:56:21 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_interface.cpp b/src/modules/mediaplayer/mp_interface.cpp index df8f4a3c2..b41e05d59 100644 --- a/src/modules/mediaplayer/mp_interface.cpp +++ b/src/modules/mediaplayer/mp_interface.cpp @@ -4,7 +4,7 @@ // Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -43,7 +43,6 @@ void KviMediaPlayerInterface::notImplemented() setLastError(__tr2qs_ctx("Function not implemented","mediaplayer")); } - int KviMediaPlayerInterface::position() { notImplemented(); diff --git a/src/modules/mediaplayer/mp_interface.h b/src/modules/mediaplayer/mp_interface.h index 7142b501d..bf7ef2c4f 100644 --- a/src/modules/mediaplayer/mp_interface.h +++ b/src/modules/mediaplayer/mp_interface.h @@ -6,7 +6,7 @@ // Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_jukinterface.cpp b/src/modules/mediaplayer/mp_jukinterface.cpp index 45c54c218..184d8f5d6 100644 --- a/src/modules/mediaplayer/mp_jukinterface.cpp +++ b/src/modules/mediaplayer/mp_jukinterface.cpp @@ -1,10 +1,10 @@ //============================================================================= // // File : mp_jukinterface.cpp -// Created on Tue 29 Mar 2005 01:38:34 by Szymon Stfeanek +// Creation date : Tue 29 Mar 2005 01:38:34 by Szymon Stfeanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stfeanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stfeanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_jukinterface.h b/src/modules/mediaplayer/mp_jukinterface.h index b8abdcfca..bee81513b 100644 --- a/src/modules/mediaplayer/mp_jukinterface.h +++ b/src/modules/mediaplayer/mp_jukinterface.h @@ -3,10 +3,10 @@ //============================================================================= // // File : mp_jukinterface.h -// Created on Tue 29 Mar 2005 01:38:34 by Szymon Stfeanek +// Creation date : Tue 29 Mar 2005 01:38:34 by Szymon Stfeanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stfeanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stfeanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_mp3.cpp b/src/modules/mediaplayer/mp_mp3.cpp index fdc7996a2..1516e006f 100644 --- a/src/modules/mediaplayer/mp_mp3.cpp +++ b/src/modules/mediaplayer/mp_mp3.cpp @@ -4,7 +4,7 @@ // Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net) // // This file is based on the mp3tech.c. It is released under the original // license and the original copyright notice follows. diff --git a/src/modules/mediaplayer/mp_mp3.h b/src/modules/mediaplayer/mp_mp3.h index afc19ebab..9047c1611 100644 --- a/src/modules/mediaplayer/mp_mp3.h +++ b/src/modules/mediaplayer/mp_mp3.h @@ -4,7 +4,7 @@ // Creation date : Fri Mar 25 20:01:25 2005 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2005 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2005-2008 Szymon Stefanek (pragma at kvirc dot net) // // This file is based on the mp3tech.h. It is released under the original // license and the original copyright notice follows. diff --git a/src/modules/mediaplayer/mp_mprisinterface.cpp b/src/modules/mediaplayer/mp_mprisinterface.cpp index 0c164a840..817db5800 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.cpp +++ b/src/modules/mediaplayer/mp_mprisinterface.cpp @@ -1,7 +1,7 @@ //============================================================================= // // File : mp_mprisinterface.cpp -// Created on Thu 06 Dec 2007 14:20:02 by Tomasz Moń +// Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz Moń // // This file is part of the KVIrc IRC client distribution // Copyright (C) 2007-2008 Tomasz Moń <desowin@gmail.com> diff --git a/src/modules/mediaplayer/mp_mprisinterface.h b/src/modules/mediaplayer/mp_mprisinterface.h index 6b03050bb..3c12c2a7c 100644 --- a/src/modules/mediaplayer/mp_mprisinterface.h +++ b/src/modules/mediaplayer/mp_mprisinterface.h @@ -3,7 +3,7 @@ //============================================================================= // // File : mp_mprisinterface.h -// Created on Thu 06 Dec 2007 14:20:02 by Tomasz Moń +// Creation date : Thu 06 Dec 2007 14:20:02 by Tomasz MoÅ // // This file is part of the KVIrc IRC client distribution // Copyright (C) 2007-2008 Tomasz Moń <desowin@gmail.com> diff --git a/src/modules/mediaplayer/mp_winampinterface.cpp b/src/modules/mediaplayer/mp_winampinterface.cpp index 8f8a8f84e..686b176e8 100644 --- a/src/modules/mediaplayer/mp_winampinterface.cpp +++ b/src/modules/mediaplayer/mp_winampinterface.cpp @@ -1,10 +1,10 @@ //============================================================================= // // File : mp_winampinterface.cpp -// Created on Mon 28 Mar 2005 23:41:50 by Szymon Stefanek +// Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_winampinterface.h b/src/modules/mediaplayer/mp_winampinterface.h index 5ddf142c2..ed9d00838 100644 --- a/src/modules/mediaplayer/mp_winampinterface.h +++ b/src/modules/mediaplayer/mp_winampinterface.h @@ -3,10 +3,10 @@ //============================================================================= // // File : mp_winampinterface.h -// Created on Mon 28 Mar 2005 23:41:50 by Szymon Stefanek +// Creation date : Mon 28 Mar 2005 23:41:50 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_xmms2interface.cpp b/src/modules/mediaplayer/mp_xmms2interface.cpp index 8c6d865c5..f61fc85fc 100644 --- a/src/modules/mediaplayer/mp_xmms2interface.cpp +++ b/src/modules/mediaplayer/mp_xmms2interface.cpp @@ -1,7 +1,7 @@ //============================================================================= // -// File : mp_audaciousinterface.cpp -// Created on Thu 06 Dec 2007 14:20:02 by Tomasz Moń +// File : mp_xmms2interface.cpp +// Creation date : Thu 06 Dec 2007 14:20:02 by Elvio Basello // // This file is part of the KVIrc IRC client distribution // Copyright (C) 2008 Elvio Basello <hellvis69 at netsons dot org> diff --git a/src/modules/mediaplayer/mp_xmms2interface.h b/src/modules/mediaplayer/mp_xmms2interface.h index 117d14ff8..ef6c3f30c 100644 --- a/src/modules/mediaplayer/mp_xmms2interface.h +++ b/src/modules/mediaplayer/mp_xmms2interface.h @@ -2,8 +2,8 @@ #define _MP_XMMS2INTERFACE_H_ //============================================================================= // -// File : mp_audaciousinterface.h -// Created on Thu 06 Dec 2007 14:20:02 by Tomasz Moń +// File : mp_xmms2interface.h +// Creation date : Thu 06 Dec 2007 14:20:02 by Elvio Basello // // This file is part of the KVIrc IRC client distribution // Copyright (C) 2008 Elvio Basello <hellvis69 at netsons dot org> diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index 338fe429d..f12d5365d 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -1,10 +1,10 @@ //============================================================================= // // File : mp_xmmsinterface.cpp -// Created on Fri 25 Mar 2005 20:04:54 by Szymon Stefanek +// Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005-2007 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/mp_xmmsinterface.h b/src/modules/mediaplayer/mp_xmmsinterface.h index cf490fb44..4e0ae0899 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.h +++ b/src/modules/mediaplayer/mp_xmmsinterface.h @@ -3,10 +3,10 @@ //============================================================================= // // File : mp_xmmsinterface.h -// Created on Fri 25 Mar 2005 20:04:54 by Szymon Stefanek +// Creation date : Fri 25 Mar 2005 20:04:54 by Szymon Stefanek // // This file is part of the KVIrc IRC client distribution -// Copyright (C) 2005-2007 Szymon Stefanek <pragma at kvirc dot net> +// Copyright (C) 2005-2008 Szymon Stefanek <pragma at kvirc dot net> // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp index 02b32ee5f..4f02f2edc 100644 --- a/src/modules/mediaplayer/winamp.cpp +++ b/src/modules/mediaplayer/winamp.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : winamp.cpp // Creation date : Tue Nov 6 23:01:12 2001 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include <windows.h> #include <process.h> diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index d53c8aa46..435fc699d 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkvimircimport.cpp // Creation date : Tue Aug 27 01:20:35 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "libkvimircimport.h" diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h index 53fd71b6d..faf2e6014 100644 --- a/src/modules/mircimport/libkvimircimport.h +++ b/src/modules/mircimport/libkvimircimport.h @@ -1,11 +1,12 @@ #ifndef _LIBKVIMIRCIMPORT_H_ #define _LIBKVIMIRCIMPORT_H_ +//============================================================================= // // File : libkvimircimport.h // Creation date : Tue Aug 27 01:28:02 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -21,6 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_mexserverimport.h" #include "kvi_string.h" diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp index adfeb713f..6d029c887 100644 --- a/src/modules/my/libkvimy.cpp +++ b/src/modules/my/libkvimy.cpp @@ -1,9 +1,10 @@ +//============================================================================= // // File : libkvimy.cpp // Creation date : Mon Jul 1 02:46:49 2002 GMT by Szymon Stefanek // // This file is part of the KVirc irc client distribution -// Copyright (C) 2001 Szymon Stefanek (pragma at kvirc dot net) +// Copyright (C) 2002-2008 Szymon Stefanek (pragma at kvirc dot net) // // This program is FREE software. You can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -19,6 +20,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // +//============================================================================= #include "kvi_module.h" #include "kvi_console.h" |
